diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-12 08:05:27 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-05-12 08:05:27 -0700 |
| commit | 555569c59ced09743507966f73d2d500c6deccec (patch) | |
| tree | 4bca3a3bcdd565b833c84eb3896f280dd50e9dda /WebKit/android/plugins | |
| parent | 80aad5eedfe9e84cabb8540f818f7d1971ecadc3 (diff) | |
| parent | eac91fe693799401095de9338c877d188e8cb8ae (diff) | |
| download | external_webkit-555569c59ced09743507966f73d2d500c6deccec.zip external_webkit-555569c59ced09743507966f73d2d500c6deccec.tar.gz external_webkit-555569c59ced09743507966f73d2d500c6deccec.tar.bz2 | |
Merge "Switch to SkSafeUnref for better portability"
Diffstat (limited to 'WebKit/android/plugins')
| -rw-r--r-- | WebKit/android/plugins/ANPTypefaceInterface.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/plugins/ANPTypefaceInterface.cpp b/WebKit/android/plugins/ANPTypefaceInterface.cpp index 4b2dda2..bd50850 100644 --- a/WebKit/android/plugins/ANPTypefaceInterface.cpp +++ b/WebKit/android/plugins/ANPTypefaceInterface.cpp @@ -50,7 +50,7 @@ static void anp_ref(ANPTypeface* tf) { } static void anp_unref(ANPTypeface* tf) { - tf->safeUnref(); + SkSafeUnref(tf); } static ANPTypefaceStyle anp_getStyle(const ANPTypeface* tf) { diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp index c5a1f5b..e699862 100644 --- a/WebKit/android/plugins/PluginWidgetAndroid.cpp +++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp @@ -92,7 +92,7 @@ PluginWidgetAndroid::~PluginWidgetAndroid() { env->DeleteGlobalRef(m_embeddedView); } - m_flipPixelRef->safeUnref(); + SkSafeUnref(m_flipPixelRef); } void PluginWidgetAndroid::init(android::WebViewCore* core) { @@ -128,7 +128,7 @@ void PluginWidgetAndroid::setWindow(NPWindow* window, bool isTransparent) { layoutSurface(m_pluginBounds != oldPluginBounds); if (m_drawingModel != kSurface_ANPDrawingModel) { - m_flipPixelRef->safeUnref(); + SkSafeUnref(m_flipPixelRef); m_flipPixelRef = new SkFlipPixelRef(computeConfig(isTransparent), window->width, window->height); } |