diff options
8 files changed, 20 insertions, 20 deletions
diff --git a/WebCore/platform/graphics/android/FontCustomPlatformData.cpp b/WebCore/platform/graphics/android/FontCustomPlatformData.cpp index ba37ce8..a4a741c 100644 --- a/WebCore/platform/graphics/android/FontCustomPlatformData.cpp +++ b/WebCore/platform/graphics/android/FontCustomPlatformData.cpp @@ -35,7 +35,7 @@ namespace WebCore { FontCustomPlatformData::FontCustomPlatformData(SkTypeface* face) { - face->safeRef(); + SkSafeRef(face); m_typeface = face; } diff --git a/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp b/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp index 795bbe8..a0a76bc 100644 --- a/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp +++ b/WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp @@ -73,7 +73,7 @@ FontPlatformData::FontPlatformData() FontPlatformData::FontPlatformData(const FontPlatformData& src) { if (hashTableDeletedFontValue() != src.mTypeface) { - src.mTypeface->safeRef(); + SkSafeRef(src.mTypeface); } mTypeface = src.mTypeface; @@ -90,7 +90,7 @@ FontPlatformData::FontPlatformData(SkTypeface* tf, float textSize, bool fakeBold : mTypeface(tf), mTextSize(textSize), mFakeBold(fakeBold), mFakeItalic(fakeItalic) { if (hashTableDeletedFontValue() != mTypeface) { - mTypeface->safeRef(); + SkSafeRef(mTypeface); } inc_count(); @@ -101,7 +101,7 @@ FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize) : mTypeface(src.mTypeface), mTextSize(textSize), mFakeBold(src.mFakeBold), mFakeItalic(src.mFakeItalic) { if (hashTableDeletedFontValue() != mTypeface) { - mTypeface->safeRef(); + SkSafeRef(mTypeface); } inc_count(); @@ -130,7 +130,7 @@ FontPlatformData::~FontPlatformData() FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src) { if (hashTableDeletedFontValue() != src.mTypeface) { - src.mTypeface->safeRef(); + SkSafeRef(src.mTypeface); } if (hashTableDeletedFontValue() != mTypeface) { SkSafeUnref(mTypeface); diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index 6f33b19..71f0a73 100644 --- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -116,7 +116,7 @@ public: State(const State& other) { memcpy(this, &other, sizeof(State)); mPath = deepCopyPtr<SkPath>(other.mPath); - mPathEffect->safeRef(); + SkSafeRef(mPathEffect); } ~State() { diff --git a/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp b/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp index 4626165..7e2fb52 100644 --- a/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp +++ b/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp @@ -71,7 +71,7 @@ FontPlatformData::FontPlatformData(const FontPlatformData& src) , m_fakeItalic(src.m_fakeItalic) , m_harfbuzzFace(src.m_harfbuzzFace) { - m_typeface->safeRef(); + SkSafeRef(m_typeface); } FontPlatformData::FontPlatformData(SkTypeface* tf, float textSize, bool fakeBold, bool fakeItalic) @@ -80,7 +80,7 @@ FontPlatformData::FontPlatformData(SkTypeface* tf, float textSize, bool fakeBold , m_fakeBold(fakeBold) , m_fakeItalic(fakeItalic) { - m_typeface->safeRef(); + SkSafeRef(m_typeface); } FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize) @@ -90,7 +90,7 @@ FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize) , m_fakeItalic(src.m_fakeItalic) , m_harfbuzzFace(src.m_harfbuzzFace) { - m_typeface->safeRef(); + SkSafeRef(m_typeface); } FontPlatformData::~FontPlatformData() diff --git a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp index 209d200..1adcb59 100644 --- a/WebCore/platform/graphics/skia/PlatformContextSkia.cpp +++ b/WebCore/platform/graphics/skia/PlatformContextSkia.cpp @@ -149,10 +149,10 @@ PlatformContextSkia::State::State(const State& other) #endif { // Up the ref count of these. saveRef does nothing if 'this' is NULL. - m_looper->safeRef(); - m_dash->safeRef(); - m_fillShader->safeRef(); - m_strokeShader->safeRef(); + SkSafeRef(m_looper); + SkSafeRef(m_dash); + SkSafeRef(m_fillShader); + SkSafeRef(m_strokeShader); } PlatformContextSkia::State::~State() @@ -305,7 +305,7 @@ void PlatformContextSkia::drawRect(SkRect rect) // setFillColor() will set the shader to NULL, so save a ref to it now. SkShader* oldFillShader = m_state->m_fillShader; - oldFillShader->safeRef(); + SkSafeRef(oldFillShader); setFillColor(m_state->m_strokeColor); paint.reset(); setupPaintForFilling(&paint); @@ -479,7 +479,7 @@ void PlatformContextSkia::setStrokeShader(SkShader* strokeShader) if (strokeShader != m_state->m_strokeShader) { SkSafeUnref(m_state->m_strokeShader); m_state->m_strokeShader = strokeShader; - m_state->m_strokeShader->safeRef(); + SkSafeRef(m_state->m_strokeShader); } } @@ -547,7 +547,7 @@ void PlatformContextSkia::setFillShader(SkShader* fillShader) if (fillShader != m_state->m_fillShader) { SkSafeUnref(m_state->m_fillShader); m_state->m_fillShader = fillShader; - m_state->m_fillShader->safeRef(); + SkSafeRef(m_state->m_fillShader); } } diff --git a/WebKit/android/jni/PictureSet.cpp b/WebKit/android/jni/PictureSet.cpp index 9bd1949..424547f 100644 --- a/WebKit/android/jni/PictureSet.cpp +++ b/WebKit/android/jni/PictureSet.cpp @@ -68,7 +68,7 @@ PictureSet::~PictureSet() void PictureSet::add(const Pictures* temp) { Pictures pictureAndBounds = *temp; - pictureAndBounds.mPicture->safeRef(); + SkSafeRef(pictureAndBounds.mPicture); pictureAndBounds.mWroteElapsed = false; mPictures.append(pictureAndBounds); } @@ -80,7 +80,7 @@ void PictureSet::add(const SkRegion& area, SkPicture* picture, area.getBounds().fLeft, area.getBounds().fTop, area.getBounds().fRight, area.getBounds().fBottom, picture, elapsed, split); - picture->safeRef(); + SkSafeRef(picture); /* if nothing is drawn beneath part of the new picture, mark it as a base */ SkRegion diff = SkRegion(area); Pictures* last = mPictures.end(); diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp index ac3deef..443df4c 100644 --- a/WebKit/android/nav/FindCanvas.cpp +++ b/WebKit/android/nav/FindCanvas.cpp @@ -54,7 +54,7 @@ MatchInfo::MatchInfo(const MatchInfo& src) { m_layerId = src.m_layerId; m_location = src.m_location; m_picture = src.m_picture; - m_picture->safeRef(); + SkSafeRef(m_picture); } void MatchInfo::set(const SkRegion& region, SkPicture* pic, int layerId) { diff --git a/WebKit/android/plugins/ANPTypefaceInterface.cpp b/WebKit/android/plugins/ANPTypefaceInterface.cpp index bd50850..99734a7 100644 --- a/WebKit/android/plugins/ANPTypefaceInterface.cpp +++ b/WebKit/android/plugins/ANPTypefaceInterface.cpp @@ -46,7 +46,7 @@ static int32_t anp_getRefCount(const ANPTypeface* tf) { } static void anp_ref(ANPTypeface* tf) { - tf->safeRef(); + SkSafeRef(tf); } static void anp_unref(ANPTypeface* tf) { |