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

[dbates at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 02d4d2671287a56ad2b0689cb5822234d46d86ea
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 23:27:30 2011 +0000

    2011-01-12  Daniel Bates  <dbates at rim.com>
                And Benjamin C Meyer  <bmeyer at rim.com>
    
            Build fix when building with Inspector disabled
            https://bugs.webkit.org/show_bug.cgi?id=52313
    
            After changeset 75604 <http://trac.webkit.org/changeset/75604> it's not
            possible to build when the Inspector is disabled.
    
            * inspector/InspectorInstrumentation.h:
            (WebCore::InspectorInstrumentation::updateApplicationCacheStatus): Fix build breakage when building
            with Inspector disabled and Offline Web Applications enabled by moving macro guard condition
            ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS) into function body. This makes us also
            consistent with the form we use for InspectorInstrumentation::networkStateChanged() and other
            InspectorInstrumentation functions.
            * loader/appcache/ApplicationCacheGroup.cpp:
            (WebCore::ApplicationCacheGroup::didReceiveData): Fix build breakage when building with Inspector
            disabled by adding ENABLE(INSPECTOR) guard around code that references the instance variable
            ApplicationCacheGroup::m_currentResourceIdentifier as this variable only exists when building
            with the Inspector.
            (WebCore::ApplicationCacheGroup::didFinishLoading): Ditto.
            (WebCore::ApplicationCacheGroup::didFail): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75645 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bc2921b..20271ad 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2011-01-12  Daniel Bates  <dbates at rim.com>
+            And Benjamin C Meyer  <bmeyer at rim.com>
+
+        Build fix when building with Inspector disabled
+        https://bugs.webkit.org/show_bug.cgi?id=52313
+
+        After changeset 75604 <http://trac.webkit.org/changeset/75604> it's not
+        possible to build when the Inspector is disabled.
+
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::updateApplicationCacheStatus): Fix build breakage when building
+        with Inspector disabled and Offline Web Applications enabled by moving macro guard condition
+        ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS) into function body. This makes us also
+        consistent with the form we use for InspectorInstrumentation::networkStateChanged() and other
+        InspectorInstrumentation functions.
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::didReceiveData): Fix build breakage when building with Inspector
+        disabled by adding ENABLE(INSPECTOR) guard around code that references the instance variable
+        ApplicationCacheGroup::m_currentResourceIdentifier as this variable only exists when building
+        with the Inspector.
+        (WebCore::ApplicationCacheGroup::didFinishLoading): Ditto.
+        (WebCore::ApplicationCacheGroup::didFail): Ditto.
+
 2011-01-12  Chris Marrin  <cmarrin at apple.com>
 
         Unreviewed.
diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
index 3b86b19..a037794 100644
--- a/Source/WebCore/inspector/InspectorInstrumentation.h
+++ b/Source/WebCore/inspector/InspectorInstrumentation.h
@@ -117,9 +117,7 @@ public:
     static void didCloseWebSocket(ScriptExecutionContext*, unsigned long identifier);
 #endif
     static void networkStateChanged(Page*);
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
     static void updateApplicationCacheStatus(Frame*);
-#endif
 #if ENABLE(INSPECTOR)
     static void frontendCreated() { s_frontendCounter += 1; }
     static void frontendDeleted() { s_frontendCounter -= 1; }
@@ -626,13 +624,13 @@ inline void InspectorInstrumentation::networkStateChanged(Page* page)
 #endif
 }
 
-#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
 inline void InspectorInstrumentation::updateApplicationCacheStatus(Frame* frame)
 {
+#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (InspectorController* inspectorController = inspectorControllerForFrame(frame))
         updateApplicationCacheStatusImpl(inspectorController, frame);
-}
 #endif
+}
 
 #if ENABLE(INSPECTOR)
 inline InspectorController* InspectorInstrumentation::inspectorControllerForContext(ScriptExecutionContext* context)
diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
index 8595638..514ef19 100644
--- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
@@ -555,7 +555,9 @@ void ApplicationCacheGroup::didReceiveResponse(ResourceHandle* handle, const Res
 
 void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* data, int length, int lengthReceived)
 {
+#if ENABLE(INSPECTOR)
     InspectorInstrumentation::didReceiveContentLength(m_frame, m_currentResourceIdentifier, lengthReceived);
+#endif
 
     if (handle == m_manifestHandle) {
         didReceiveManifestData(data, length);
@@ -572,7 +574,9 @@ void ApplicationCacheGroup::didReceiveData(ResourceHandle* handle, const char* d
 
 void ApplicationCacheGroup::didFinishLoading(ResourceHandle* handle, double finishTime)
 {
+#if ENABLE(INSPECTOR)
     InspectorInstrumentation::didFinishLoading(m_frame, m_currentResourceIdentifier, finishTime);
+#endif
 
     if (handle == m_manifestHandle) {
         didFinishLoadingManifest();
@@ -611,7 +615,9 @@ void ApplicationCacheGroup::didFinishLoading(ResourceHandle* handle, double fini
 
 void ApplicationCacheGroup::didFail(ResourceHandle* handle, const ResourceError& error)
 {
+#if ENABLE(INSPECTOR)
     InspectorInstrumentation::didFailLoading(m_frame, m_currentResourceIdentifier, error);
+#endif
 
     if (handle == m_manifestHandle) {
         cacheUpdateFailed();

-- 
WebKit Debian packaging