BUILD FIX #3: <http://webkit.org/b/44285> Fix compilation with NETSCA…

…PE_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.

Canonical link: https://commits.webkit.org/56491@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@65711 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

@@ -1,3 +1,11 @@
+2010-08-19  David Kilzer  <ddkilzer@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@apple.com>
 
         BUILD FIX: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled

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)
 {

WebKit/qt/ChangeLog

@@ -1,3 +1,14 @@
+2010-08-19  David Kilzer  <ddkilzer@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@apple.com>
 
         BUILD FIX: FrameLoaderClientQt.h should include ResourceError.h

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;
 }