Fix plugin crashes due to bad ref counting.

bug: 5197948
Change-Id: Iece573a141feda56af2123b5fc9ace4cefa5139d

1 files changed, 3 insertions, 9 deletions

diff --git a/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp b/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 19433ab..c4c31e5 100644
--- a/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/Source/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -45,7 +45,7 @@
 #include "android_graphics.h"
 #include <JNIUtility.h>
 
-#define PLUGIN_DEBUG_LOCAL // controls the printing of log messages
+//#define PLUGIN_DEBUG_LOCAL // controls the printing of log messages
 #define DEBUG_EVENTS 0 // logs event contents, return value, and processing time
 #define DEBUG_VISIBLE_RECTS 0 // temporary debug printfs and fixes
 
@@ -97,9 +97,7 @@ PluginWidgetAndroid::~PluginWidgetAndroid() {
     }
 
     SkSafeUnref(m_flipPixelRef);
-
-    if (m_layer)
-        m_layer->unref();
+    SkSafeUnref(m_layer);
 }
 
 void PluginWidgetAndroid::init(android::WebViewCore* core) {
@@ -158,12 +156,8 @@ void PluginWidgetAndroid::setWindow(NPWindow* window, bool isTransparent) {
 bool PluginWidgetAndroid::setDrawingModel(ANPDrawingModel model) {
 
     if (model == kOpenGL_ANPDrawingModel && m_layer == 0) {
-        JNIEnv* env = JSC::Bindings::getJNIEnv();
         jobject webview = m_core->getWebViewJavaObject();
-        jobject weakWebViewRef = 0;
-        if (webview)
-            weakWebViewRef = env->NewWeakGlobalRef(webview);
-        m_layer = new WebCore::MediaLayer(weakWebViewRef);
+        m_layer = new WebCore::MediaLayer(webview);
     }
     else if (model != kOpenGL_ANPDrawingModel && m_layer != 0) {
         m_layer->unref();