Early return from layer painting when fully clipped

Fixes logspam due to merged layers unnecessarily painting when fully clipped.

Change-Id: I0f2f1b851c9386dcebda58bf844fd68073338e1c

1 files changed, 8 insertions, 7 deletions

diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
index 67d1259..84ce910 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp
@@ -803,13 +803,14 @@ bool LayerAndroid::drawCanvas(SkCanvas* canvas, bool drawChildren, PaintStyle st
         r.set(m_clippingRect.x(), m_clippingRect.y(),
               m_clippingRect.x() + m_clippingRect.width(),
               m_clippingRect.y() + m_clippingRect.height());
-        canvas->clipRect(r);
-        SkMatrix matrix;
-        GLUtils::toSkMatrix(matrix, m_drawTransform);
-        SkMatrix canvasMatrix = canvas->getTotalMatrix();
-        matrix.postConcat(canvasMatrix);
-        canvas->setMatrix(matrix);
-        onDraw(canvas, m_drawOpacity, 0, style);
+        if (canvas->clipRect(r)) {
+            SkMatrix matrix;
+            GLUtils::toSkMatrix(matrix, m_drawTransform);
+            SkMatrix canvasMatrix = canvas->getTotalMatrix();
+            matrix.postConcat(canvasMatrix);
+            canvas->setMatrix(matrix);
+            onDraw(canvas, m_drawOpacity, 0, style);
+        }
     }
 
     if (!drawChildren)