[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 80c1aae2af5827638e26354b608b2ddadbf5cdd8
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 14:23:39 2010 +0000

    2010-11-16  Andreas Kling  <kling at webkit.org>
    
            Rubber-stamped by Simon Hausmann.
    
            Revert !ENABLE(INSPECTOR) fix- we don't need it right now,
            and it was less maintainable than I had though.
    
            * 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@72093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c56fda5..7c783f5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,19 @@
 2010-11-16  Andreas Kling  <kling at webkit.org>
 
+        Rubber-stamped by Simon Hausmann.
+
+        Revert !ENABLE(INSPECTOR) fix- we don't need it right now,
+        and it was less maintainable than I had though.
+
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toAPI):
+        (WebKit::toImpl):
+        * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+        * WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp:
+        * WebProcess/WebPage/WebInspector.cpp:
+
+2010-11-16  Andreas Kling  <kling at webkit.org>
+
         Reviewed by Simon Hausmann.
 
         Fix compilation with !ENABLE(INSPECTOR)
diff --git a/WebKit2/Shared/API/c/WKSharedAPICast.h b/WebKit2/Shared/API/c/WKSharedAPICast.h
index 8d5d43f..e95fb8b 100644
--- a/WebKit2/Shared/API/c/WKSharedAPICast.h
+++ b/WebKit2/Shared/API/c/WKSharedAPICast.h
@@ -355,10 +355,8 @@ 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:
@@ -533,10 +531,8 @@ 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 9463858..a6d3855 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp
@@ -25,8 +25,6 @@
 
 #include "WebInspectorClient.h"
 
-#if ENABLE(INSPECTOR)
-
 #include "WebInspectorFrontendClient.h"
 #include "WebInspector.h"
 #include "WebPage.h"
@@ -80,5 +78,3 @@ bool WebInspectorClient::sendMessageToFrontend(const String& message)
 }
 
 } // namespace WebKit
-
-#endif
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
index 320d2df..c44d8e4 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp
@@ -25,8 +25,6 @@
 
 #include "WebInspectorFrontendClient.h"
 
-#if ENABLE(INSPECTOR)
-
 #include "WebInspector.h"
 #include "WebPage.h"
 #include <WebCore/Page.h>
@@ -104,5 +102,3 @@ void WebInspectorFrontendClient::sendMessageToBackend(const String&)
 }
 
 } // namespace WebKit
-
-#endif
diff --git a/WebKit2/WebProcess/WebPage/WebInspector.cpp b/WebKit2/WebProcess/WebPage/WebInspector.cpp
index f6cd943..028de08 100644
--- a/WebKit2/WebProcess/WebPage/WebInspector.cpp
+++ b/WebKit2/WebProcess/WebPage/WebInspector.cpp
@@ -25,8 +25,6 @@
 
 #include "WebInspector.h"
 
-#if ENABLE(INSPECTOR)
-
 #include "WebInspectorProxyMessages.h"
 #include "WebPage.h"
 #include "WebPageCreationParameters.h"
@@ -125,5 +123,3 @@ void WebInspector::stopPageProfiling()
 }
 
 } // namespace WebKit
-
-#endif

-- 
WebKit Debian packaging