Merge Webkit at r63859 : PluginWidget class has been renamed and moved to WebKit. See http://trac.webkit.org/changeset/63638

Change-Id: I97784c98b694f28804421637716afa649aa09a6e

2 files changed, 11 insertions, 6 deletions

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 9278bf8..e77dde8 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -54,7 +54,7 @@
 #include "PlatformString.h"
 #include "PluginDatabase.h"
 #include "PluginView.h"
-#include "PluginWidget.h"
+#include "PluginViewBase.h"
 #include "ProgressTracker.h"
 #include "RenderPart.h"
 #include "RenderView.h"
@@ -1014,15 +1014,18 @@ static bool isYouTubeInstalled() {
     return WebCore::packageNotifier().isPackageInstalled("com.google.android.youtube");
 }
 
-// Use PluginWidget as it is not used by Android for real plugins.
-class PluginToggleWidget : public PluginWidget {
+// Use PluginViewBase rather than an Android specific sub class as we do not require any
+// Android specific functionality; this just renders a placeholder which will later
+// activate the real plugin.
+class PluginToggleWidget : public PluginViewBase {
 public:
     PluginToggleWidget(Frame* parent, const IntSize& size,
             HTMLPlugInElement* elem, const KURL& url,
             const WTF::Vector<String>& paramNames,
             const WTF::Vector<String>& paramValues, const String& mimeType,
             bool loadManually)
-        : m_parent(parent)
+        : PluginViewBase(0)
+        , m_parent(parent)
         , m_size(size)
         , m_element(elem)
         , m_url(url)
@@ -1093,7 +1096,7 @@ public:
             for (; it != end; ++it) {
                 Widget* widget = (*it)->widget();
                 // PluginWidget is used only with PluginToggleWidget
-                if (widget->isPluginWidget()) {
+                if (widget->isPluginViewBase()) {
                     PluginToggleWidget* ptw =
                             static_cast<PluginToggleWidget*>(widget);
                     ptw->swapPlugin(*it);
@@ -1122,6 +1125,8 @@ public:
     }
 
 private:
+    void invalidateRect(const IntRect& rect) { }
+
     RefPtr<Frame>       m_parent;
     IntSize             m_size;
     HTMLPlugInElement*  m_element;
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 1c8af5e..5fddc48 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -905,7 +905,7 @@ static Node* OneAfter(Node* node)
 static bool checkForPluginViewThatWantsFocus(RenderObject* renderer) {
     if (renderer->isWidget()) {
         Widget* widget = static_cast<RenderWidget*>(renderer)->widget();
-        if (widget && (widget->isPluginView() || widget->isPluginWidget())) {
+        if (widget && (widget->isPluginView() || widget->isPluginViewBase())) {
             // check if this plugin really wants key events (TODO)
             return true;
         }