Removing GraphicsContext from ImageBuffer

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
@@ skipping 97 matching lines @@
     // out a transparency layer below that is filled with the mask color. In the end this should
     // not be marked opaque.
 
     context->beginLayer();
     context->fillRect(FloatRect(10, 10, 10, 10), opaque, SkXfermode::kSrcOver_Mode);
 
     context->beginLayer(1, SkXfermode::kDstIn_Mode);
 
     OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
     EXPECT_FALSE(!alphaImage);
-    alphaImage->context()->fillRect(IntRect(0, 0, 100, 100), alpha);
+    alphaImage->canvas()->drawColor(alpha.rgb());
 
     context->drawImageBuffer(alphaImage.get(), FloatRect(10, 10, 10, 10));
 
     context->endLayer();
     context->endLayer();
 
     EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, IntRect());
 }
 
 TEST(GraphicsContextTest, trackImageMaskWithOpaqueRect)
@@ skipping 12 matching lines @@
     // out a transparency layer below that is filled with the mask color. In the end this should
     // not be marked opaque.
 
     context->beginLayer();
     context->fillRect(FloatRect(10, 10, 10, 10), opaque, SkXfermode::kSrcOver_Mode);
 
     context->beginLayer(1, SkXfermode::kDstIn_Mode);
 
     OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
     EXPECT_FALSE(!alphaImage);
-    alphaImage->context()->fillRect(IntRect(0, 0, 100, 100), alpha);
+    alphaImage->canvas()->drawColor(alpha.rgb());
 
     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));
@@ skipping 103 matching lines @@
     EXPECT_TRUE(canvas1->unique());
 
     // endRecording finally makes the picture accessible
     RefPtr<const SkPicture> picture = context->endRecording();
     EXPECT_TRUE(picture);
 
     context->endRecording();
 }
 
 } // namespace