[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 fbf878f0613edb8daba87a83e94ca948b7c50d3a
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 12 18:32:15 2010 +0000

    Fix the Gtk and minimal builds.
    
    * plugins/PluginView.cpp:
    (WebCore::PluginView::npObject): Correct the #ifdefs.
    (WebCore::PluginView::bindingInstance): Moved npErr variable
    into npObject() function where it is used.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67338 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e5fd647..ad65803 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
 
+        Fix the Gtk and minimal builds.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::npObject): Correct the #ifdefs.
+        (WebCore::PluginView::bindingInstance): Moved npErr variable
+        into npObject() function where it is used.
+
+2010-09-12  Simon Hausmann  <simon.hausmann at nokia.com>
+
         [Qt] Prospective build fix for minimal build.
 
         * plugins/PluginView.cpp: Guard newly added function
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index bb691dc..b0bb7cc 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -755,9 +755,10 @@ NPObject* PluginView::npObject()
         PluginView::setCurrentPluginView(0);
     }
 
+    if (npErr != NPERR_NO_ERROR)
+        return 0;
+
     return object;
-#else
-    return 0;
 }
 #endif
 
@@ -776,9 +777,6 @@ PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
         return 0;
     }
 
-    if (npErr != NPERR_NO_ERROR || !object)
-        return 0;
-
     RefPtr<JSC::Bindings::RootObject> root = m_parentFrame->script()->createRootObject(this);
     RefPtr<JSC::Bindings::Instance> instance = JSC::Bindings::CInstance::create(object, root.release());
 

-- 
WebKit Debian packaging