Disable painting in a few more places

Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 373 matching lines @@
     // collapsed. Therefore, subpixel text is disabled when we are drawing
     // onto a layer.
     if (paintingDisabled() || isDrawingToLayer() || !isCertainlyOpaque())
         return false;
 
     return shouldSmoothFonts();
 }
 
 void GraphicsContext::setCompositeOperation(CompositeOperator compositeOperation, WebBlendMode blendMode)
 {
+    if (paintingDisabled())
+        return;
     mutableState()->setCompositeOperation(compositeOperation, blendMode);
 }
 
 SkColorFilter* GraphicsContext::colorFilter()
 {
     return immutableState()->colorFilter();
 }
 
 void GraphicsContext::setColorFilter(ColorFilter colorFilter)
 {
@@ skipping 78 matching lines @@
 }
 
 void GraphicsContext::beginRecording(const FloatRect& bounds)
 {
     RefPtr<DisplayList> displayList = adoptRef(new DisplayList(bounds));
 
     SkCanvas* savedCanvas = m_canvas;
     SkMatrix savedMatrix = getTotalMatrix();
 
     IntRect recordingRect = enclosingIntRect(bounds);
-    m_canvas = displayList->picture()->beginRecording(recordingRect.width(), recordingRect.height(),
-        SkPicture::kUsePathBoundsForClip_RecordingFlag);
+    if (!paintingDisabled()) {

[Stephen Chennney, 2014/03/28 12:47:18]

This can go up a line - I don't see us using recordingRect if we don't record.

+        m_canvas = displayList->picture()->beginRecording(recordingRect.width(), recordingRect.height(),
+            SkPicture::kUsePathBoundsForClip_RecordingFlag);
 
-    // We want the bounds offset mapped to (0, 0), such that the display list content
-    // is fully contained within the SkPictureRecord's bounds.
-    if (!toFloatSize(bounds.location()).isZero()) {
-        m_canvas->translate(-bounds.x(), -bounds.y());
-        // To avoid applying the offset repeatedly in getTotalMatrix(), we pre-apply it here.
-        savedMatrix.preTranslate(bounds.x(), bounds.y());
+        // We want the bounds offset mapped to (0, 0), such that the display list content
+        // is fully contained within the SkPictureRecord's bounds.
+        if (!toFloatSize(bounds.location()).isZero()) {
+            m_canvas->translate(-bounds.x(), -bounds.y());
+            // To avoid applying the offset repeatedly in getTotalMatrix(), we pre-apply it here.
+            savedMatrix.preTranslate(bounds.x(), bounds.y());
+        }
     }
 
     m_recordingStateStack.append(RecordingState(savedCanvas, savedMatrix, displayList));
 }
 
 PassRefPtr<DisplayList> GraphicsContext::endRecording()
 {
     ASSERT(!m_recordingStateStack.isEmpty());
 
     RecordingState recording = m_recordingStateStack.last();
-    ASSERT(recording.m_displayList->picture()->getRecordingCanvas());
-    recording.m_displayList->picture()->endRecording();
+    if (!paintingDisabled()) {
+        ASSERT(recording.m_displayList->picture()->getRecordingCanvas());
+        recording.m_displayList->picture()->endRecording();
+    }
 
     m_recordingStateStack.removeLast();
     m_canvas = recording.m_savedCanvas;
 
     return recording.m_displayList.release();
 }
 
 bool GraphicsContext::isRecording() const
 {
     return !m_recordingStateStack.isEmpty();
@@ skipping 119 matching lines @@
     if (shadowSpread < 0)
         bounds.inflate(-shadowSpread);
 
     IntRect offsetBounds = bounds;
     offsetBounds.move(-shadowOffset);
     return unionRect(bounds, offsetBounds);
 }
 
 void GraphicsContext::drawInnerShadow(const RoundedRect& rect, const Color& shadowColor, const IntSize shadowOffset, int shadowBlur, int shadowSpread, Edges clippedEdges)
 {
+    if (paintingDisabled())
+        return;
+
     IntRect holeRect(rect.rect());
     holeRect.inflate(-shadowSpread);
 
     if (holeRect.isEmpty()) {
         if (rect.isRounded())
             fillRoundedRect(rect, shadowColor);
         else
             fillRect(rect.rect(), shadowColor);
         return;
     }
@@ skipping 455 matching lines @@
             paint.setAlpha(0x80); // signal to m_opaqueRegion that we are not fully opaque
 
         m_opaqueRegion.didDrawRect(this, rect, paint, 0);
         // more efficient would be to call markRectAsOpaque or MarkRectAsNonOpaque directly,
         // rather than cons-ing up a paint with an xfermode and alpha
     }
 }
 
 void GraphicsContext::writePixels(const SkBitmap& bitmap, int x, int y)
 {
+    if (paintingDisabled())
+        return;
+
     if (!bitmap.getTexture()) {
         SkAutoLockPixels alp(bitmap);
         if (bitmap.getPixels())
             writePixels(bitmap.info(), bitmap.getPixels(), bitmap.rowBytes(), x, y);
     }
 }
 
 void GraphicsContext::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, const SkPaint* paint)
 {
     if (paintingDisabled())
@@ skipping 50 matching lines @@
         return;
 
     m_canvas->drawRect(rect, paint);
 
     if (m_trackOpaqueRegion)
         m_opaqueRegion.didDrawRect(this, rect, paint, 0);
 }
 
 void GraphicsContext::didDrawRect(const SkRect& rect, const SkPaint& paint, const SkBitmap* bitmap)
 {
+    if (paintingDisabled())
+        return;
+
     if (m_trackOpaqueRegion)
         m_opaqueRegion.didDrawRect(this, rect, paint, bitmap);
 }
 
 void GraphicsContext::drawPosText(const void* text, size_t byteLength,
     const SkPoint pos[],  const SkRect& textRect, const SkPaint& paint)
 {
     if (paintingDisabled())
         return;
 
@@ skipping 405 matching lines @@
         return;
 
     CompositeOperator previousOperator = compositeOperation();
     setCompositeOperation(op);
     fillRect(rect, color);
     setCompositeOperation(previousOperator);
 }
 
 void GraphicsContext::fillRoundedRect(const RoundedRect& rect, const Color& color)
 {
+    if (paintingDisabled())
+        return;
+
     if (rect.isRounded())
         fillRoundedRect(rect.rect(), rect.radii().topLeft(), rect.radii().topRight(), rect.radii().bottomLeft(), rect.radii().bottomRight(), color);
     else
         fillRect(rect.rect(), color);
 }
 
 void GraphicsContext::fillRectWithRoundedHole(const IntRect& rect, const RoundedRect& roundedHoleRect, const Color& color)
 {
     if (paintingDisabled())
         return;
@@ skipping 257 matching lines @@
 
 void GraphicsContext::didDrawTextInRect(const SkRect& textRect)
 {
     if (m_trackTextRegion) {
         TRACE_EVENT0("skia", "PlatformContextSkia::trackTextRegion");
         m_textRegion.join(textRect);
     }
 }
 
 }