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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fcd0a6ce458845ff8263e1fbd74eb2b05125525f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 08:22:19 2010 +0000

    2010-09-30  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Darin Adler.
    
            Build fix: Add ENABLE(INSPECTOR) guard
            https://bugs.webkit.org/show_bug.cgi?id=46852
    
            Page does not have inspectorController() when ENABLE(INSPECTOR) is 0.
    
            * inspector/InspectorController.h:
            (WebCore::InspectorController::inspectorControllerForDocument):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 898bf65..05da914 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-30  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Darin Adler.
+
+        Build fix: Add ENABLE(INSPECTOR) guard
+        https://bugs.webkit.org/show_bug.cgi?id=46852
+
+        Page does not have inspectorController() when ENABLE(INSPECTOR) is 0.
+
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::inspectorControllerForDocument):
+
 2010-09-30  Michael Nordman  <michaeln at google.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 9e63f01..c6f516d 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -506,12 +506,16 @@ inline InspectorController* InspectorController::inspectorControllerForDocument(
     Page* page = document->page();
     if (!page)
         return 0;
+#if ENABLE(INSPECTOR)
     InspectorController* inspectorController = page->inspectorController();
     if (!inspectorController)
         return 0;
     if (!inspectorController->hasFrontend())
         return 0;
     return inspectorController;
+#else
+    return 0;
+#endif
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging