| Index: cc/test/fake_content_layer_client.h
|
| diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h
|
| index 1060d0845889aa154bd51b1481c893746ed6f300..d53d34e2ea3d95ef6e716339de53df332396aa92 100644
|
| --- a/cc/test/fake_content_layer_client.h
|
| +++ b/cc/test/fake_content_layer_client.h
|
| @@ -27,13 +27,12 @@ class FakeContentLayerClient : public ContentLayerClient {
|
| FakeContentLayerClient();
|
| ~FakeContentLayerClient() override;
|
|
|
| - void PaintContents(
|
| - SkCanvas* canvas,
|
| - const gfx::Rect& rect,
|
| - ContentLayerClient::GraphicsContextStatus gc_status) override;
|
| + void PaintContents(SkCanvas* canvas,
|
| + const gfx::Rect& rect,
|
| + PaintingControlSetting painting_control) override;
|
| scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
|
| const gfx::Rect& clip,
|
| - GraphicsContextStatus gc_status) override;
|
| + PaintingControlSetting painting_control) override;
|
| bool FillsBoundsCompletely() const override;
|
|
|
| void set_fill_with_nonsolid_color(bool nonsolid) {
|
| @@ -56,8 +55,8 @@ class FakeContentLayerClient : public ContentLayerClient {
|
|
|
| SkCanvas* last_canvas() const { return last_canvas_; }
|
|
|
| - ContentLayerClient::GraphicsContextStatus last_context_status() const {
|
| - return last_context_status_;
|
| + PaintingControlSetting last_painting_control() const {
|
| + return last_painting_control_;
|
| }
|
|
|
| private:
|
| @@ -68,7 +67,7 @@ class FakeContentLayerClient : public ContentLayerClient {
|
| RectPaintVector draw_rects_;
|
| BitmapVector draw_bitmaps_;
|
| SkCanvas* last_canvas_;
|
| - ContentLayerClient::GraphicsContextStatus last_context_status_;
|
| + PaintingControlSetting last_painting_control_;
|
| };
|
|
|
| } // namespace cc
|
|
|