[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit e3efd79fed0176350337d360eecb0ad2555d376c
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 19 15:57:12 2010 +0000

    2010-12-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            WebKit does not build with worker but without the javascript debugger
            https://bugs.webkit.org/show_bug.cgi?id=51293
    
            Add missing guard for calls depending on the debugger.
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::populateScriptObjects):
            (WebCore::InspectorController::postWorkerNotificationToFrontend):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74323 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f60e4ab..00001a7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WebKit does not build with worker but without the javascript debugger
+        https://bugs.webkit.org/show_bug.cgi?id=51293
+
+        Add missing guard for calls depending on the debugger.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::populateScriptObjects):
+        (WebCore::InspectorController::postWorkerNotificationToFrontend):
+
 2010-12-18  Tom Sepez  <tsepez at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 46d1020..2332d87 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -640,7 +640,7 @@ void InspectorController::populateScriptObjects()
     for (DOMStorageResourcesMap::iterator it = m_domStorageResources.begin(); it != domStorageEnd; ++it)
         it->second->bind(m_frontend.get());
 #endif
-#if ENABLE(WORKERS)
+#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(WORKERS)
     WorkersMap::iterator workersEnd = m_workers.end();
     for (WorkersMap::iterator it = m_workers.begin(); it != workersEnd; ++it) {
         InspectorWorkerResource* worker = it->second.get();
@@ -998,6 +998,7 @@ void InspectorController::postWorkerNotificationToFrontend(const InspectorWorker
 {
     if (!m_frontend)
         return;
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     switch (action) {
     case InspectorController::WorkerCreated:
         m_frontend->didCreateWorker(worker.id(), worker.url(), worker.isSharedWorker());
@@ -1006,6 +1007,7 @@ void InspectorController::postWorkerNotificationToFrontend(const InspectorWorker
         m_frontend->didDestroyWorker(worker.id());
         break;
     }
+#endif
 }
 
 void InspectorController::didCreateWorker(intptr_t id, const String& url, bool isSharedWorker)

-- 
WebKit Debian packaging