[webkit-changes] [100109] trunk/Source

Mon, 14 Nov 2011 01:14:55 -0800

Title: [100109] trunk/Source
Revision
100109
Author
[email protected]
Date
2011-11-14 01:14:44 -0800 (Mon, 14 Nov 2011)

Log Message

Build breaks with --no-_javascript_-debugger --no-inspector
https://bugs.webkit.org/show_bug.cgi?id=72228

Patch by Zalan Bujtas <[email protected]> on 2011-11-14
Reviewed by Simon Hausmann.

Source/WebCore:

* workers/WorkerMessagingProxy.cpp:
(WebCore::PostMessageToPageInspectorTask::performTask):
(WebCore::WorkerMessagingProxy::connectToInspector):
* workers/WorkerThread.cpp:
(WebCore::WorkerThread::workerThread):

Source/WebKit2:

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (100108 => 100109)


--- trunk/Source/WebCore/ChangeLog	2011-11-14 08:27:48 UTC (rev 100108)
+++ trunk/Source/WebCore/ChangeLog	2011-11-14 09:14:44 UTC (rev 100109)
@@ -1,3 +1,16 @@
+2011-11-14  Zalan Bujtas  <[email protected]>
+
+        Build breaks with --no-_javascript_-debugger --no-inspector
+        https://bugs.webkit.org/show_bug.cgi?id=72228
+
+        Reviewed by Simon Hausmann.
+
+        * workers/WorkerMessagingProxy.cpp:
+        (WebCore::PostMessageToPageInspectorTask::performTask):
+        (WebCore::WorkerMessagingProxy::connectToInspector):
+        * workers/WorkerThread.cpp:
+        (WebCore::WorkerThread::workerThread):
+
 2011-11-14  Kentaro Hara  <[email protected]>
 
         Remove all custom constructors of Events in V8

Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (100108 => 100109)


--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp	2011-11-14 08:27:48 UTC (rev 100108)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp	2011-11-14 09:14:44 UTC (rev 100109)
@@ -228,8 +228,10 @@
 
     virtual void performTask(ScriptExecutionContext*)
     {
+#if ENABLE(INSPECTOR)
         if (WorkerContextProxy::PageInspector* pageInspector = m_messagingProxy->m_pageInspector)
             pageInspector->dispatchMessageFromWorker(m_message);
+#endif
     }
 
     WorkerMessagingProxy* m_messagingProxy;
@@ -354,11 +356,13 @@
 }
 
 #if ENABLE(INSPECTOR)
+#if ENABLE(_javascript__DEBUGGER)
 static void connectToWorkerContextInspectorTask(ScriptExecutionContext* context, bool)
 {
     ASSERT(context->isWorkerContext());
     static_cast<WorkerContext*>(context)->workerInspectorController()->connectFrontend();
 }
+#endif
 
 void WorkerMessagingProxy::connectToInspector(WorkerContextProxy::PageInspector* pageInspector)
 {
@@ -366,14 +370,18 @@
         return;
     ASSERT(!m_pageInspector);
     m_pageInspector = pageInspector;
+#if ENABLE(_javascript__DEBUGGER)
     m_workerThread->runLoop().postTaskForMode(createCallbackTask(connectToWorkerContextInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
+#endif
 }
 
+#if ENABLE(_javascript__DEBUGGER)
 static void disconnectFromWorkerContextInspectorTask(ScriptExecutionContext* context, bool)
 {
     ASSERT(context->isWorkerContext());
     static_cast<WorkerContext*>(context)->workerInspectorController()->disconnectFrontend();
 }
+#endif
 
 void WorkerMessagingProxy::disconnectFromInspector()
 {
@@ -385,11 +393,13 @@
 #endif
 }
 
+#if ENABLE(_javascript__DEBUGGER)
 static void dispatchOnInspectorBackendTask(ScriptExecutionContext* context, const String& message)
 {
     ASSERT(context->isWorkerContext());
     static_cast<WorkerContext*>(context)->workerInspectorController()->dispatchMessageFromFrontend(message);
 }
+#endif
 
 void WorkerMessagingProxy::sendMessageToInspector(const String& message)
 {

Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (100108 => 100109)


--- trunk/Source/WebCore/workers/WorkerThread.cpp	2011-11-14 08:27:48 UTC (rev 100108)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp	2011-11-14 09:14:44 UTC (rev 100109)
@@ -138,7 +138,9 @@
     }
 
     WorkerScriptController* script = m_workerContext->script();
+#if ENABLE(INSPECTOR)
     InspectorInstrumentation::willEvaluateWorkerScript(workerContext(), m_startupData->m_startMode);
+#endif
     script->evaluate(ScriptSourceCode(m_startupData->m_sourceCode, m_startupData->m_scriptURL));
     // Free the startup data to cause its member variable deref's happen on the worker's thread (since
     // all ref/derefs of these objects are happening on the thread at this point). Note that

Modified: trunk/Source/WebKit2/ChangeLog (100108 => 100109)


--- trunk/Source/WebKit2/ChangeLog	2011-11-14 08:27:48 UTC (rev 100108)
+++ trunk/Source/WebKit2/ChangeLog	2011-11-14 09:14:44 UTC (rev 100109)
@@ -1,3 +1,13 @@
+2011-11-14  Zalan Bujtas  <[email protected]>
+
+        Build breaks with --no-_javascript_-debugger --no-inspector
+        https://bugs.webkit.org/show_bug.cgi?id=72228
+
+        Reviewed by Simon Hausmann.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
+
 2011-11-13  Mark Rowe  <[email protected]>
 
         Fix the 32-bit build.

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (100108 => 100109)


--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2011-11-14 08:27:48 UTC (rev 100108)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2011-11-14 09:14:44 UTC (rev 100109)
@@ -412,9 +412,11 @@
     if (!url.isLocalFile())
         return false;
 
+#if ENABLE(INSPECTOR)
     // Don't give the inspector full access to the file system.
     if (WebInspectorProxy::isInspectorPage(this))
         return false;
+#endif
 
     SandboxExtension::createHandle("/", SandboxExtension::ReadOnly, sandboxExtensionHandle);
     return true;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to