summaryrefslogtreecommitdiffstats
path: root/WebKit/android/plugins/PluginWidgetAndroid.cpp
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-02-24 05:27:46 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-24 05:27:47 -0800
commitae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca (patch)
tree9b09533becaca8a2ab72c9f50b1062148f95944b /WebKit/android/plugins/PluginWidgetAndroid.cpp
parent52df3a88ee4d2299c8e84771a803e75dbadc2e8e (diff)
parentb33016812afef21c69df5ab3d5b85eab5fef7c5c (diff)
downloadexternal_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.zip
external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.tar.gz
external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.tar.bz2
Merge "Skia Merge (revision 808)"
Diffstat (limited to 'WebKit/android/plugins/PluginWidgetAndroid.cpp')
-rw-r--r--WebKit/android/plugins/PluginWidgetAndroid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index be89a68..d7d4fa7 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -95,7 +95,7 @@ PluginWidgetAndroid::~PluginWidgetAndroid() {
env->DeleteGlobalRef(m_embeddedView);
}
- m_flipPixelRef->safeUnref();
+ SkSafeUnref(m_flipPixelRef);
if (m_layer)
m_layer->unref();
@@ -148,7 +148,7 @@ void PluginWidgetAndroid::setWindow(NPWindow* window, bool isTransparent) {
layoutSurface(boundsChanged);
if (m_drawingModel != kSurface_ANPDrawingModel) {
- m_flipPixelRef->safeUnref();
+ SkSafeUnref(m_flipPixelRef);
m_flipPixelRef = new SkFlipPixelRef(computeConfig(isTransparent),
window->width, window->height);
}