summaryrefslogtreecommitdiffstats
path: root/WebKit/android/plugins/PluginWidgetAndroid.cpp
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-02-16 12:48:46 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-16 12:48:46 -0800
commit5ad675d34069bcdf6bcd983ae4941c0531216354 (patch)
treef04ba87adf01e537b817dff8e177e62bad0e495b /WebKit/android/plugins/PluginWidgetAndroid.cpp
parente9d5f570f22c46f9adaa4181c3fa1b715f15ccb3 (diff)
parent87a12aa24a87540251e0d2d0a223e761ceb31da2 (diff)
downloadexternal_webkit-5ad675d34069bcdf6bcd983ae4941c0531216354.zip
external_webkit-5ad675d34069bcdf6bcd983ae4941c0531216354.tar.gz
external_webkit-5ad675d34069bcdf6bcd983ae4941c0531216354.tar.bz2
Merge "Selectively enable and disable GL_BLEND for better performance."
Diffstat (limited to 'WebKit/android/plugins/PluginWidgetAndroid.cpp')
-rw-r--r--WebKit/android/plugins/PluginWidgetAndroid.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 06506ba..be89a68 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -164,8 +164,10 @@ bool PluginWidgetAndroid::setDrawingModel(ANPDrawingModel model) {
weakWebViewRef = env->NewWeakGlobalRef(webview);
m_layer = new WebCore::MediaLayer(weakWebViewRef);
}
- else if (model != kOpenGL_ANPDrawingModel && m_layer != 0)
+ else if (model != kOpenGL_ANPDrawingModel && m_layer != 0) {
m_layer->unref();
+ m_layer = 0;
+ }
if (m_drawingModel != model) {
// Trigger layer computation in RenderLayerCompositor