diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-20 18:58:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-20 18:58:19 -0800 |
| commit | 67c90537fc70147ad8943f0a2cd02def405bcf8f (patch) | |
| tree | 4abcb31c03323aa32bb87d4bfc9dcb207d2a8ad1 /WebKit/android/plugins/PluginWidgetAndroid.cpp | |
| parent | 9dabd572bcca8e38d72ee40eaf442a9bb0790508 (diff) | |
| parent | 72acb46d81f6f3c7015109c925762dcc7fa12802 (diff) | |
| download | external_webkit-67c90537fc70147ad8943f0a2cd02def405bcf8f.zip external_webkit-67c90537fc70147ad8943f0a2cd02def405bcf8f.tar.gz external_webkit-67c90537fc70147ad8943f0a2cd02def405bcf8f.tar.bz2 | |
am 72acb46d: Fix the crash of exiting full screen by checking null.
Merge commit '72acb46d81f6f3c7015109c925762dcc7fa12802' into eclair-mr2-plus-aosp
* commit '72acb46d81f6f3c7015109c925762dcc7fa12802':
Fix the crash of exiting full screen by checking null.
Diffstat (limited to 'WebKit/android/plugins/PluginWidgetAndroid.cpp')
| -rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp index 7a4b9a3..ac668d7 100644 --- a/WebKit/android/plugins/PluginWidgetAndroid.cpp +++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp @@ -65,7 +65,8 @@ PluginWidgetAndroid::~PluginWidgetAndroid() { m_core->removePlugin(this); if (m_isFullScreen) { exitFullScreen(true); - } else if (m_embeddedView) { + } + if (m_embeddedView) { m_core->destroySurface(m_embeddedView); } } |