| Index: cc/resources/content_layer_updater.h
|
| diff --git a/cc/resources/content_layer_updater.h b/cc/resources/content_layer_updater.h
|
| index 6959526ef1c77a916b03b53057f83f4604ba61d9..6af2195e3a730794c34ebfe4ffbf7c88b8dc4051 100644
|
| --- a/cc/resources/content_layer_updater.h
|
| +++ b/cc/resources/content_layer_updater.h
|
| @@ -22,7 +22,7 @@ class RenderingStatsInstrumentation;
|
| class CC_EXPORT ContentLayerUpdater : public LayerUpdater {
|
| public:
|
| void set_rendering_stats_instrumentation(RenderingStatsInstrumentation* rsi);
|
| - virtual void SetOpaque(bool) OVERRIDE;
|
| + virtual void SetOpaque(bool opaque) OVERRIDE;
|
|
|
| protected:
|
| ContentLayerUpdater(scoped_ptr<LayerPainter> painter,
|
| @@ -31,7 +31,7 @@ class CC_EXPORT ContentLayerUpdater : public LayerUpdater {
|
| virtual ~ContentLayerUpdater();
|
|
|
| void PaintContents(SkCanvas* canvas,
|
| - gfx::Point origin,
|
| + const gfx::Point& origin,
|
| float contents_width_scale,
|
| float contents_height_scale,
|
| gfx::Rect* resulting_opaque_rect);
|
| @@ -42,14 +42,13 @@ class CC_EXPORT ContentLayerUpdater : public LayerUpdater {
|
| RenderingStatsInstrumentation* rendering_stats_instrumentation_;
|
| int layer_id_;
|
|
|
| + // True when it is known that all output pixels will be opaque.
|
| + bool layer_is_opaque_;
|
| +
|
| private:
|
| gfx::Rect content_rect_;
|
| scoped_ptr<LayerPainter> painter_;
|
|
|
| - protected:
|
| - // True when it is known that all output pixels will be opaque.
|
| - bool layer_is_opaque_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ContentLayerUpdater);
|
| };
|
|
|
|
|