Skia Merge (revision 808)

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

Change-Id: I469b8845a88f24d972fd57ee5c9cab505a5b83aa

4 files changed, 18 insertions, 18 deletions

diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp
index 2662071..33e7b4f 100644
--- a/WebKit/android/nav/CachedRoot.cpp
+++ b/WebKit/android/nav/CachedRoot.cpp
@@ -160,11 +160,11 @@ public:
         INHERITED::drawPath(path, paint);
     }
 
-    virtual void commonDrawBitmap(const SkBitmap& bitmap,
+    virtual void commonDrawBitmap(const SkBitmap& bitmap, const SkIRect* rect,
                               const SkMatrix& matrix, const SkPaint& paint) {
         mBounder.setType(CommonCheck::kDrawBitmap_Type);
         mBounder.setIsOpaque(bitmap.isOpaque());
-        INHERITED::commonDrawBitmap(bitmap, matrix, paint);
+        INHERITED::commonDrawBitmap(bitmap, rect, matrix, paint);
     }
 
     virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
@@ -508,7 +508,7 @@ protected:
 // Currently webkit's bitmap draws always seem to be cull'd before this entry
 // point is called, so we assume that any bitmap that gets here is inside our
 // tiny clip (may not be true in the future)
-    virtual void commonDrawBitmap(const SkBitmap& bitmap,
+    virtual void commonDrawBitmap(const SkBitmap& bitmap, const SkIRect* rect,
                               const SkMatrix& , const SkPaint& ) {
         SkPixelRef* pixelRef = bitmap.pixelRef();
         if (pixelRef != NULL) {
diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp
index e1bfd82..2d310b3 100644
--- a/WebKit/android/nav/FindCanvas.cpp
+++ b/WebKit/android/nav/FindCanvas.cpp
@@ -49,18 +49,18 @@ MatchInfo::MatchInfo() {
 }
 
 MatchInfo::~MatchInfo() {
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
 }
 
 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) {
-    m_picture->safeUnref();
+    SkSafeUnref(m_picture);
     m_layerId = layerId;
     m_location = region;
     m_picture = pic;
@@ -161,7 +161,7 @@ FindCanvas::~FindCanvas() {
     setBounder(NULL);
     /* Just in case getAndClear was not called. */
     delete mMatches;
-    mWorkingPicture->safeUnref();
+    SkSafeUnref(mWorkingPicture);
 }
 
 // Each version of addMatch returns a rectangle for a match.
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);
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index edd362c..177a9ce 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -210,7 +210,7 @@ WebView(JNIEnv* env, jobject javaWebView, int viewImpl) :
 #endif
     delete m_frameCacheUI;
     delete m_navPictureUI;
-    m_baseLayer->safeUnref();
+    SkSafeUnref(m_baseLayer);
     delete m_glDrawFunctor;
 }
 
@@ -686,7 +686,7 @@ CachedRoot* getFrameCache(FrameCachePermission allowNewer)
     }
     m_viewImpl->gFrameCacheMutex.lock();
     delete m_frameCacheUI;
-    m_navPictureUI->safeUnref();
+    SkSafeUnref(m_navPictureUI);
     m_viewImpl->m_updatedFrameCache = false;
     m_frameCacheUI = m_viewImpl->m_frameCacheKit;
     m_navPictureUI = m_viewImpl->m_navPictureKit;
@@ -1396,7 +1396,7 @@ void setBaseLayer(BaseLayerAndroid* layer, WebCore::IntRect& rect, bool showVisu
         copyScrollPositionRecursive(compositeRoot(), newCompositeRoot);
     }
 #endif
-    m_baseLayer->safeUnref();
+    SkSafeUnref(m_baseLayer);
     m_baseLayer = layer;
     CachedRoot* root = getFrameCache(DontAllowNewer);
     if (!root)