Move overdraw tracking code from GraphicsContext to CanvasRenderingContext2D

Source/platform/graphics/GraphicsContextTest.cpp

 /*
  * Copyright (C) 2012 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
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "platform/graphics/GraphicsContext.h"
 
 #include "platform/graphics/BitmapImage.h"
-#include "platform/graphics/GraphicsContextClient.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/skia/NativeImageSkia.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkBlurDrawLooper.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 
@@ skipping 120 matching lines @@
     context.drawImageBuffer(alphaImage.get(), FloatRect(10, 10, 10, 10));
 
     // We can't have an opaque mask actually, but we can pretend here like it would look if we did.
     context.fillRect(FloatRect(12, 12, 3, 3), opaque, SkXfermode::kSrcOver_Mode);
 
     context.endLayer();
     context.endLayer();
 
     EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, IntRect(12, 12, 3, 3));
 }
-
+/*
 #define TEST_CLEAR_SETUP \
         SkBitmap bitmap; \
         bitmap.allocN32Pixels(10, 10); \
         bitmap.eraseColor(0); \
         SkCanvas canvas(bitmap); \
         TestGraphicsContextClient gcClient; \
         GraphicsContext context(&canvas, nullptr); \
         context.setClient(&gcClient);
 
 #define TEST_CLEAR_1(SHOULD_CLEAR, CALL1) \
@@ skipping 205 matching lines @@
         SkPaint paint;
         SkAutoTUnref<SkDrawLooper> looper(SkBlurDrawLooper::Create(SK_ColorWHITE, 1, 1, 1));
         paint.setLooper(looper.get());
         TEST_CLEAR_1(false, drawRect(fullRect, paint));
     }
     {
         SkPaint paint;
         TEST_CLEAR_3(false, beginLayer(1.0f, SkXfermode::kSrcOver_Mode), drawRect(fullRect, paint), endLayer());
     }
 }
-
+*/

[dshwang, 2015/02/06 19:10:37]

why don't you delete code?

[Justin Novosad, 2015/02/06 19:37:31]

I will. I am currently working on moving these test to make them CRC2D unit
tests.  That will be taken care of in my next upload.

 TEST(GraphicsContextTest, UnboundedDrawsAreClipped)
 {
     SkBitmap bitmap;
     bitmap.allocN32Pixels(400, 400);
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     GraphicsContext context(&canvas, nullptr);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
@@ skipping 91 matching lines @@
 
     // endRecording finally makes the picture accessible
     RefPtr<const SkPicture> picture = context.endRecording();
     EXPECT_TRUE(picture);
     EXPECT_TRUE(picture->unique());
 
     context.endRecording();
 }
 
 } // namespace