diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-19 00:34:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-19 00:34:36 -0800 |
| commit | 6b94858003959337be5bbea77dc00eb02299a16f (patch) | |
| tree | ae51873f9994284dc16864a4187030b563048de2 | |
| parent | fe45ba1d5e95021663cb6dc657ec77056fc87155 (diff) | |
| parent | 1a318d002f30c34f2a43bbd33897398ea2966f9c (diff) | |
| download | external_webkit-6b94858003959337be5bbea77dc00eb02299a16f.zip external_webkit-6b94858003959337be5bbea77dc00eb02299a16f.tar.gz external_webkit-6b94858003959337be5bbea77dc00eb02299a16f.tar.bz2 | |
am 1a318d00: am 336f436c: Don\'t call setNPWindowRect unless the plugin has started. Otherwise the plugin won\'t get the rect later as it thinks it is not changed.
Merge commit '1a318d002f30c34f2a43bbd33897398ea2966f9c'
* commit '1a318d002f30c34f2a43bbd33897398ea2966f9c':
Don't call setNPWindowRect unless the plugin has
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index 3f40000..afec228 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -127,7 +127,7 @@ void PluginView::setFrameRect(const IntRect& rect) return; #if defined(ANDROID_PLUGINS) - if (rect != frameRect()) { + if (m_isStarted && (rect != frameRect())) { Widget::setFrameRect(rect); setNPWindowRect(rect); // only call when it changes } |