[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

laszlo.1.gombos at nokia.com laszlo.1.gombos at nokia.com
Thu Apr 8 02:09:45 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 4c418e957fcedace58fd38645f20f00814c9d4c9
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 17:18:42 2010 +0000

    2010-03-04  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Unreviewed build fix.
    
            Build fix after r55464.
    
            No new tests, no new functionality.
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::populateScriptObjects):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2b743d9..6e7ca9b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-04  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Unreviewed build fix.
+
+        Build fix after r55464.
+
+        No new tests, no new functionality.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::populateScriptObjects):
+
 2010-03-04  Leandro Pereira  <leandro at profusion.mobi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 38a39b1..8ade477 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -695,8 +695,10 @@ void InspectorController::populateScriptObjects()
     for (WorkersMap::iterator it = m_workers.begin(); it != workersEnd; ++it)
         m_frontend->didCreateWorker(*it->second);
 #endif
+#if ENABLE(JAVASCRIPT_DEBUGGER) 
     if (m_profilerEnabled)
         m_frontend->profilerWasEnabled();
+#endif
 
     m_frontend->populateInterface();
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list