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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 7edb35f94495f2653499de12914ff74f449de13c
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 13:44:43 2010 +0000

    2010-11-16  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            Fix compilation with !ENABLE(INSPECTOR)
    
            * Shared/API/c/WKSharedAPICast.h:
            (WebKit::toAPI):
            (WebKit::toImpl):
            * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
            * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
            * WebProcess/WebPage/WebInspector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72091 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 17a29e5..c56fda5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-16  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Fix compilation with !ENABLE(INSPECTOR)
+
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toAPI):
+        (WebKit::toImpl):
+        * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+        * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
+        * WebProcess/WebPage/WebInspector.cpp:
+
 2010-11-16  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/Shared/API/c/WKSharedAPICast.h b/WebKit2/Shared/API/c/WKSharedAPICast.h
index e95fb8b..8d5d43f 100644
--- a/WebKit2/Shared/API/c/WKSharedAPICast.h
+++ b/WebKit2/Shared/API/c/WKSharedAPICast.h
@@ -355,8 +355,10 @@ inline WKContextMenuItemTag toAPI(WebCore::ContextMenuAction action)
         return kWKContextMenuItemTagPDFSinglePageScrolling;
     case WebCore::ContextMenuItemTagPDFFacingPagesScrolling:
         return kWKContextMenuItemTagPDFFacingPagesScrolling;
+#if ENABLE(INSPECTOR)
     case WebCore::ContextMenuItemTagInspectElement:
         return kWKContextMenuItemTagInspectElement;
+#endif
     case WebCore::ContextMenuItemTagTextDirectionMenu:
         return kWKContextMenuItemTagTextDirectionMenu;
     case WebCore::ContextMenuItemTagTextDirectionDefault:
@@ -531,8 +533,10 @@ inline WebCore::ContextMenuAction toImpl(WKContextMenuItemTag tag)
         return WebCore::ContextMenuItemTagPDFSinglePageScrolling;
     case kWKContextMenuItemTagPDFFacingPagesScrolling:
         return WebCore::ContextMenuItemTagPDFFacingPagesScrolling;
+#if ENABLE(INSPECTOR)
     case kWKContextMenuItemTagInspectElement:
         return WebCore::ContextMenuItemTagInspectElement;
+#endif
     case kWKContextMenuItemTagTextDirectionMenu:
         return WebCore::ContextMenuItemTagTextDirectionMenu;
     case kWKContextMenuItemTagTextDirectionDefault:
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
index a6d3855..9463858 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
@@ -25,6 +25,8 @@
 
 #include "WebInspectorClient.h"
 
+#if ENABLE(INSPECTOR)
+
 #include "WebInspectorFrontendClient.h"
 #include "WebInspector.h"
 #include "WebPage.h"
@@ -78,3 +80,5 @@ bool WebInspectorClient::sendMessageToFrontend(const String& message)
 }
 
 } // namespace WebKit
+
+#endif
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
index c44d8e4..320d2df 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
@@ -25,6 +25,8 @@
 
 #include "WebInspectorFrontendClient.h"
 
+#if ENABLE(INSPECTOR)
+
 #include "WebInspector.h"
 #include "WebPage.h"
 #include <WebCore/Page.h>
@@ -102,3 +104,5 @@ void WebInspectorFrontendClient::sendMessageToBackend(const String&)
 }
 
 } // namespace WebKit
+
+#endif
diff --git a/WebKit2/WebProcess/WebPage/WebInspector.cpp b/WebKit2/WebProcess/WebPage/WebInspector.cpp
index 028de08..f6cd943 100644
--- a/WebKit2/WebProcess/WebPage/WebInspector.cpp
+++ b/WebKit2/WebProcess/WebPage/WebInspector.cpp
@@ -25,6 +25,8 @@
 
 #include "WebInspector.h"
 
+#if ENABLE(INSPECTOR)
+
 #include "WebInspectorProxyMessages.h"
 #include "WebPage.h"
 #include "WebPageCreationParameters.h"
@@ -123,3 +125,5 @@ void WebInspector::stopPageProfiling()
 }
 
 } // namespace WebKit
+
+#endif

-- 
WebKit Debian packaging