Merge "Add on-demand plugin support."

2 files changed, 7 insertions, 3 deletions

diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp
index 9741ad5..6dac5ef 100644
--- a/WebCore/platform/android/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/android/TemporaryLinkStubs.cpp
@@ -67,6 +67,7 @@
 #include "Pasteboard.h"
 #include "Path.h"
 #include "PluginInfoStore.h"
+#include "PluginWidget.h"
 #include "ResourceError.h"
 #include "ResourceHandle.h"
 #include "ResourceLoader.h"
@@ -144,6 +145,10 @@ void refreshPlugins(bool)
 
 #endif // !defined(ANDROID_PLUGINS)
 
+// Needed to link with PluginWidget as a parent class of PluginToggleWidget. Mac
+// defines this in plugins/mac/PluginWidgetMac.mm
+void PluginWidget::invalidateRect(const IntRect&) {}
+
 // This function tells the bridge that a resource was loaded from the cache and thus
 // the app may update progress with the amount of data loaded.
 void CheckCacheObjectStatus(DocLoader*, CachedResource*)
diff --git a/WebCore/platform/android/WidgetAndroid.cpp b/WebCore/platform/android/WidgetAndroid.cpp
index d122ef7..9ab0b2c 100644
--- a/WebCore/platform/android/WidgetAndroid.cpp
+++ b/WebCore/platform/android/WidgetAndroid.cpp
@@ -49,9 +49,8 @@ Widget::~Widget()
 
 IntRect Widget::frameRect() const
 {
-    // FIXME: use m_frame instead?
     if (!platformWidget())
-        return IntRect(0, 0, 0, 0);
+        return m_frame;
     return platformWidget()->getBounds();
 }
 
@@ -95,7 +94,7 @@ void Widget::hide()
 
 void Widget::setFrameRect(const IntRect& rect)
 {
-    // FIXME: set m_frame instead?
+    m_frame = rect;
     // platformWidget() is 0 when called from Scrollbar
     if (!platformWidget())
         return;