summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-03-18 11:01:14 -0400
committerCary Clark <cary@android.com>2010-03-18 11:01:14 -0400
commitc1c93b922f27f93a951dbf372a8e391ae89d5363 (patch)
tree02b815fa6477ed7c9f5cd1b7a5cbd4a35d267bb0
parent8026280044128436d8e89736519a0b32b6540201 (diff)
downloadexternal_webkit-c1c93b922f27f93a951dbf372a8e391ae89d5363.zip
external_webkit-c1c93b922f27f93a951dbf372a8e391ae89d5363.tar.gz
external_webkit-c1c93b922f27f93a951dbf372a8e391ae89d5363.tar.bz2
window may not be initialized when plugin is first called
Change-Id: I37ba49b9cbd5170613f0d8e694aa79b49585a8ee http://b/2524032
-rw-r--r--WebKit/android/plugins/PluginWidgetAndroid.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 115c712..c5a1f5b 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -230,7 +230,8 @@ void PluginWidgetAndroid::layoutSurface(bool pluginBoundsChanged) {
if (m_drawingModel != kSurface_ANPDrawingModel)
return;
-
+ if (!m_pluginWindow)
+ return;
bool displayPlugin = m_pluginView->isVisible() && !m_isSurfaceClippedOut;