diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-02-24 05:27:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-24 05:27:47 -0800 |
| commit | ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca (patch) | |
| tree | 9b09533becaca8a2ab72c9f50b1062148f95944b /WebKit/android/plugins | |
| parent | 52df3a88ee4d2299c8e84771a803e75dbadc2e8e (diff) | |
| parent | b33016812afef21c69df5ab3d5b85eab5fef7c5c (diff) | |
| download | external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.zip external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.tar.gz external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.tar.bz2 | |
Merge "Skia Merge (revision 808)"
Diffstat (limited to 'WebKit/android/plugins')
| -rw-r--r-- | WebKit/android/plugins/ANPTypefaceInterface.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/plugins/PluginWidgetAndroid.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/android/plugins/ANPTypefaceInterface.cpp b/WebKit/android/plugins/ANPTypefaceInterface.cpp index 4b2dda2..99734a7 100644 --- a/WebKit/android/plugins/ANPTypefaceInterface.cpp +++ b/WebKit/android/plugins/ANPTypefaceInterface.cpp @@ -46,11 +46,11 @@ static int32_t anp_getRefCount(const ANPTypeface* tf) { } static void anp_ref(ANPTypeface* tf) { - tf->safeRef(); + SkSafeRef(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 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); } |