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

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 5b71364d24395cd74e9fe83e7514c08d3a0d290c
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 19 22:09:41 2010 +0000

    BUILD FIX #3: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
    
    Still trying to make Qt Linux Release minimal buildbot happy.
    
    WebCore:
    
    * plugins/PluginViewNone.cpp: Compile missing methods for Qt.
    
    WebKit/qt:
    
    * WebCoreSupport/FrameLoaderClientQt.cpp:
    (WebCore::FrameLoaderClientQt::createPlugin): Wrap code that
    handles Netscape plugins in #if ENABLE(NETSCAPE_PLUGIN_API)
    and #endif.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65711 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4b71ba3..32065e2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-19  David Kilzer  <ddkilzer at apple.com>
 
+        BUILD FIX #3: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
+
+        Still trying to make Qt Linux Release minimal buildbot happy.
+
+        * plugins/PluginViewNone.cpp: Compile missing methods for Qt.
+
+2010-08-19  David Kilzer  <ddkilzer at apple.com>
+
         BUILD FIX: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
 
         Reviewed by Joseph Pecoraro.
diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp
index 26a63f4..ab8f620 100644
--- a/WebCore/plugins/PluginViewNone.cpp
+++ b/WebCore/plugins/PluginViewNone.cpp
@@ -141,7 +141,7 @@ void PluginView::handleFocusOutEvent()
 // ports using PluginView, but until then, if new functions like this are 
 // added, please make sure they have the proper platform #ifs so that changes
 // do not break ports who compile both this file and PluginView.cpp.   
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || OS(WINCE) && !PLATFORM(QT)
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE))
 #if ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::keepAlive(NPP)
 {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4ec88fc..498486b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,16 @@
 2010-08-19  David Kilzer  <ddkilzer at apple.com>
 
+        BUILD FIX #3: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
+
+        Still trying to make Qt Linux Release minimal buildbot happy.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createPlugin): Wrap code that
+        handles Netscape plugins in #if ENABLE(NETSCAPE_PLUGIN_API)
+        and #endif.
+
+2010-08-19  David Kilzer  <ddkilzer at apple.com>
+
         BUILD FIX: FrameLoaderClientQt.h should include ResourceError.h
 
         * WebCoreSupport/FrameLoaderClientQt.h: Include ResourceError.h.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index a877d48..2c1842a 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1456,7 +1456,9 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
 #endif
             // FIXME: make things work for widgetless plugins as well
             delete object;
-    } else { // NPAPI Plugins
+    }
+#if ENABLE(NETSCAPE_PLUGIN_API)
+    else { // NPAPI Plugins
         Vector<String> params = paramNames;
         Vector<String> values = paramValues;
         if (mimeType == "application/x-shockwave-flash") {
@@ -1480,6 +1482,7 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
             params, values, mimeType, loadManually);
         return pluginView;
     }
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
 
     return 0;
 }

-- 
WebKit Debian packaging