Skia Merge (revision 808)

This is a companion CL to the one found in /external/skia

Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa

1 files changed, 8 insertions, 8 deletions

diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp
index 87d1791..fce05f7 100644
--- a/WebKit/android/nav/SelectText.cpp
+++ b/WebKit/android/nav/SelectText.cpp
@@ -1208,7 +1208,7 @@ public:
     virtual void drawPath(const SkPath& path, const SkPaint& paint) {
     }
 
-    virtual void commonDrawBitmap(const SkBitmap& bitmap,
+    virtual void commonDrawBitmap(const SkBitmap& bitmap, const SkIRect* rect,
                               const SkMatrix& matrix, const SkPaint& paint) {
     }
 
@@ -1386,13 +1386,13 @@ SelectText::SelectText()
     paint.setShader(dropGradient);
     canvas->drawRect(endDropRect, paint);
     m_endControl.endRecording();
-    fillGradient->safeUnref();
-    dropGradient->safeUnref();
+    SkSafeUnref(fillGradient);
+    SkSafeUnref(dropGradient);
 }
 
 SelectText::~SelectText()
 {
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
 }
 
 void SelectText::draw(SkCanvas* canvas, LayerAndroid* layer, IntRect* inval)
@@ -1400,9 +1400,9 @@ void SelectText::draw(SkCanvas* canvas, LayerAndroid* layer, IntRect* inval)
     if (m_layerId != layer->uniqueId())
         return;
     // reset m_picture to match m_layerId
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
     m_picture = layer->picture();
-    m_picture->safeRef();
+    SkSafeRef(m_picture);
     DBG_NAV_LOGD("m_extendSelection=%d m_drawPointer=%d layer [%d]",
         m_extendSelection, m_drawPointer, layer->uniqueId());
     if (m_extendSelection)
@@ -1799,7 +1799,7 @@ void SelectText::reset()
     m_lastEnd.setEmpty();
     m_extendSelection = false;
     m_startSelection = false;
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
     m_picture = 0;
     m_layerId = 0;
 }
@@ -1858,7 +1858,7 @@ bool SelectText::startSelection(const CachedRoot* root, const IntRect& vis,
     m_wordSelection = false;
     m_startOffset.set(x, y);
     DBG_NAV_LOGD("x/y=(%d,%d)", x, y);
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
     m_picture = root->pictureAt(&x, &y, &m_layerId);
     DBG_NAV_LOGD("m_picture=%p m_layerId=%d x/y=(%d,%d)", m_picture, m_layerId,
         x, y);