[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

commit-queue at webkit.org commit-queue at webkit.org
Sun Feb 20 23:09:44 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 3e34da8eff147f04e44cceaed51951837a9dd4fa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 12:44:53 2011 +0000

    2011-01-18  Konstantin Tokarev  <annulen at yandex.ru>
    
            Reviewed by Kent Tamura.
    
            Fixed compilation when Inspector is disabled
            https://bugs.webkit.org/show_bug.cgi?id=52564
    
            * page/Page.cpp:
            (WebCore::networkStateChanged): Added ENABLE(INSPECTOR) guard
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 60b8eb1..b8fd965 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-18  Konstantin Tokarev  <annulen at yandex.ru>
+
+        Reviewed by Kent Tamura.
+
+        Fixed compilation when Inspector is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=52564
+
+        * page/Page.cpp:
+        (WebCore::networkStateChanged): Added ENABLE(INSPECTOR) guard
+
 2011-01-18  MORITA Hajime  <morrita at google.com>
 
         Unreviewed, rolling out r76004, r76005, r76007, and r76011.
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index 012a9be..6097c56 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -112,7 +112,9 @@ static void networkStateChanged()
     for (HashSet<Page*>::iterator it = allPages->begin(); it != end; ++it) {
         for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext())
             frames.append(frame);
+#if ENABLE(INSPECTOR)
         InspectorInstrumentation::networkStateChanged(*it);
+#endif
     }
 
     AtomicString eventName = networkStateNotifier().onLine() ? eventNames().onlineEvent : eventNames().offlineEvent;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list