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

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit e3da65abcc6c7e3defe39a5472b03351d25650d8
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 11:02:02 2011 +0000

    2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: Qt build fix.
    
            * inspector/InspectorInstrumentation.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b11f784..0c40fda 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-17  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: Qt build fix.
+
+        * inspector/InspectorInstrumentation.h:
+
 2011-01-16  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
index d4bbe49..28867cb 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.h
+++ b/Source/WebCore/inspector/InspectorInstrumentation.h
@@ -161,8 +161,9 @@ public:
     static void didCloseWebSocket(ScriptExecutionContext*, unsigned long identifier);
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static void networkStateChanged(Page*);
+
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static void updateApplicationCacheStatus(Frame*);
 #endif
 
@@ -806,7 +807,6 @@ inline void InspectorInstrumentation::didCloseWebSocket(ScriptExecutionContext*
 }
 #endif
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 inline void InspectorInstrumentation::networkStateChanged(Page* page)
 {
 #if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -815,6 +815,7 @@ inline void InspectorInstrumentation::networkStateChanged(Page* page)
 #endif
 }
 
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)
 inline void InspectorInstrumentation::updateApplicationCacheStatus(Frame* frame)
 {
 #if ENABLE(INSPECTOR)

-- 
WebKit Debian packaging