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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5948b8945eaec0c57f7f8a3287ec4ce3d3cee75c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 21:45:55 2010 +0000

    2010-08-06  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Eric Seidel.
    
            Add PluginView::bindingInstance() to PluginViewNone
            https://bugs.webkit.org/show_bug.cgi?id=42936
    
            * bindings/js/ScriptControllerEfl.cpp:
            (WebCore::ScriptController::createScriptInstanceForWidget): Removed workaround.
            * plugins/PluginViewNone.cpp: Added property svn:eol-style.
            (WebCore::PluginView::bindingInstance): Added missing method and use it on WinCE.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a137261..742c60f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-06  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Eric Seidel.
+
+        Add PluginView::bindingInstance() to PluginViewNone
+        https://bugs.webkit.org/show_bug.cgi?id=42936
+
+        * bindings/js/ScriptControllerEfl.cpp:
+        (WebCore::ScriptController::createScriptInstanceForWidget): Removed workaround.
+        * plugins/PluginViewNone.cpp: Added property svn:eol-style.
+        (WebCore::PluginView::bindingInstance): Added missing method and use it on WinCE.
+
 2010-08-06  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/bindings/js/ScriptControllerEfl.cpp b/WebCore/bindings/js/ScriptControllerEfl.cpp
index 950c11e..fea172e 100644
--- a/WebCore/bindings/js/ScriptControllerEfl.cpp
+++ b/WebCore/bindings/js/ScriptControllerEfl.cpp
@@ -39,14 +39,10 @@ namespace WebCore {
 
 PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWidget(Widget* widget)
 {
-    return 0;
-
-#if 0 // FIXME: disabled until we have Plugin system done.
     if (!widget->isPluginView())
         return 0;
 
     return static_cast<PluginView*>(widget)->bindingInstance();
-#endif
 }
 
 }
diff --git a/WebCore/plugins/PluginViewNone.cpp b/WebCore/plugins/PluginViewNone.cpp
index a4cc358..eb32cd1 100644
--- a/WebCore/plugins/PluginViewNone.cpp
+++ b/WebCore/plugins/PluginViewNone.cpp
@@ -26,6 +26,10 @@
 #include "config.h"
 #include "PluginView.h"
 
+#if USE(JSC)
+#include "Bridge.h"
+#endif
+
 using namespace WTF;
 
 namespace WebCore {
@@ -135,13 +139,20 @@ 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)
+#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || OS(WINCE) && !PLATFORM(QT)
 #if ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::keepAlive(NPP)
 {
 }
 #endif
 
+#if USE(JSC)
+PassRefPtr<JSC::Bindings::Instance> PluginView::bindingInstance()
+{
+    return 0;
+}
+#endif
+
 void PluginView::privateBrowsingStateChanged(bool)
 {
 }

-- 
WebKit Debian packaging