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

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fd584e13348ca12d1c7d68c93db4145a833fb96a
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 18:28:20 2010 +0000

    [Qt] Prospective build fix for minimal build.
    
    * plugins/PluginView.cpp: Guard newly added function
    by ENABLE_NETSCAPE_PLUGIN feature.
    (WebCore::PluginView::npObject):
    * plugins/PluginView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67337 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 09988a6..e5fd647 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
 
+        [Qt] Prospective build fix for minimal build.
+
+        * plugins/PluginView.cpp: Guard newly added function
+        by ENABLE_NETSCAPE_PLUGIN feature.
+        (WebCore::PluginView::npObject):
+        * plugins/PluginView.h:
+
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
         Reviewed by Andreas Kling.
 
         [Qt] Add support for binding QtWebKit to a QScriptEngine.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 9d13ff6..bb691dc 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -730,9 +730,9 @@ void PluginView::setJavaScriptPaused(bool paused)
         m_requestTimer.startOneShot(0);
 }
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
 NPObject* PluginView::npObject()
 {
-#if ENABLE(NETSCAPE_PLUGIN_API)
     NPObject* object = 0;
 
     if (!m_isStarted || !m_plugin || !m_plugin->pluginFuncs()->getvalue)
@@ -758,12 +758,13 @@ NPObject* PluginView::npObject()
     return object;
 #else
     return 0;
-#endif
 }
+#endif
 
 #if USE(JSC)
 PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     NPObject* object = npObject();
     if (!object)
         return 0;
@@ -784,6 +785,9 @@ PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
     _NPN_ReleaseObject(object);
 
     return instance.release();
+#else
+    return 0;
+#endif
 }
 #endif
 
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index fdaae25..88ec954 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -139,7 +139,9 @@ namespace WebCore {
         void setNPWindowRect(const IntRect&);
         static PluginView* currentPluginView();
 
+#if ENABLE(NETSCAPE_PLUGIN_API)
         NPObject* npObject();
+#endif
 #if USE(JSC)
         PassRefPtr<JSC::Bindings::Instance> bindingInstance();
 #endif

-- 
WebKit Debian packaging