Index: cc/layers/picture_image_layer.cc |
diff --git a/cc/layers/picture_image_layer.cc b/cc/layers/picture_image_layer.cc |
index c041936573bcbc1fd9df106a63675fe4a1411b8c..2907cd22e0c666cfb9765e0a983aa882a09192e1 100644 |
--- a/cc/layers/picture_image_layer.cc |
+++ b/cc/layers/picture_image_layer.cc |
@@ -40,10 +40,12 @@ void PictureImageLayer::SetBitmap(const SkBitmap& bitmap) { |
SetNeedsDisplay(); |
} |
-void PictureImageLayer::PaintContents(SkCanvas* canvas, |
- const gfx::Rect& clip, |
- gfx::RectF* opaque) { |
- if (!canvas || !bitmap_.width() || !bitmap_.height()) |
+void PictureImageLayer::PaintContents( |
+ SkCanvas* canvas, |
+ const gfx::Rect& clip, |
+ gfx::RectF* opaque, |
+ ContentLayerClient::GraphicsContextStatus) { |
+ if (!bitmap_.width() || !bitmap_.height()) |
danakj
2014/05/01 17:07:11
Do you want to early out here based on the Graphic
Stephen Chennney
2014/05/01 19:12:26
Sami added the !canvas check during the previous a
danakj
2014/05/01 19:15:14
No, I don't want to early out on canvas if it's ne
|
return; |
SkScalar content_to_layer_scale_x = |