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

mnaganov at chromium.org mnaganov at chromium.org
Wed Dec 22 15:33:41 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit da02b1bc2575d039cff01db25b0574429e0377fb
Author: mnaganov at chromium.org <mnaganov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 13:49:19 2010 +0000

    2010-11-08  Mikhail Naganov  <mnaganov at chromium.org>
    
            Unreviewed. Fix Qt build after r71511.
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::restoreInspectorStateFromCookie):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71513 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 81ab524..f5a9df8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-08  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Unreviewed. Fix Qt build after r71511.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::restoreInspectorStateFromCookie):
+
 2010-11-08  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 72dc5e1..7c7351a 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -237,8 +237,10 @@ void InspectorController::restoreInspectorStateFromCookie(const String& inspecto
     m_state->restoreFromInspectorCookie(inspectorStateCookie);
     if (m_state->getBoolean(InspectorState::timelineProfilerEnabled))
         startTimelineProfiler();
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     if (m_state->getBoolean(InspectorState::userInitiatedProfiling))
         startUserInitiatedProfiling();
+#endif    
 }
 
 void InspectorController::inspect(Node* node)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list