diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-24 09:50:27 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-03-24 09:50:27 -0400 |
| commit | 3d2cfdc4c24631a2b60467b7dd03bb88f10be9b7 (patch) | |
| tree | 5b02fd5deb3e664f792ae0c854cb3378e0bc5b7e /WebKit | |
| parent | 4aa28f1f5940594c38e46f06d720f07852b17112 (diff) | |
| download | external_webkit-3d2cfdc4c24631a2b60467b7dd03bb88f10be9b7.zip external_webkit-3d2cfdc4c24631a2b60467b7dd03bb88f10be9b7.tar.gz external_webkit-3d2cfdc4c24631a2b60467b7dd03bb88f10be9b7.tar.bz2 | |
Do not redirect data to our placeholder.
Bug: 2539312
Change-Id: I952b854cc65c5481e9fed04d2169b0f01536d5a4
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 5fb7d29..677f0da 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -1165,7 +1165,10 @@ WTF::PassRefPtr<Widget> FrameLoaderClientAndroid::createPlugin( } void FrameLoaderClientAndroid::redirectDataToPlugin(Widget* pluginWidget) { - m_manualLoader = static_cast<PluginView*>(pluginWidget); + // Do not redirect data if the Widget is our plugin placeholder. + if (pluginWidget->isPluginView()) { + m_manualLoader = static_cast<PluginView*>(pluginWidget); + } } WTF::PassRefPtr<Widget> FrameLoaderClientAndroid::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, |