cc: Chromify the LayerPainter class.

Style-only change. Make the LayerPainter follow chromium style.

R=enne
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/12612007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186850 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 14 insertions, 12 deletions

diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index da7113a..48e590b 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -25,10 +25,10 @@ scoped_ptr<ContentLayerPainter> ContentLayerPainter::create(ContentLayerClient*
     return make_scoped_ptr(new ContentLayerPainter(client));
 }
 
-void ContentLayerPainter::paint(SkCanvas* canvas, gfx::Rect contentRect, gfx::RectF& opaque)
+void ContentLayerPainter::Paint(SkCanvas* canvas, gfx::Rect contentRect, gfx::RectF* opaque)
 {
     base::TimeTicks paintStart = base::TimeTicks::HighResNow();
-    m_client->paintContents(canvas, contentRect, opaque);
+    m_client->paintContents(canvas, contentRect, *opaque);
     base::TimeTicks paintEnd = base::TimeTicks::HighResNow();
     double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart).InSecondsF();
     UMA_HISTOGRAM_CUSTOM_COUNTS("Renderer4.AccelContentPaintDurationMS",
diff --git a/cc/content_layer.h b/cc/content_layer.h
index be7139b..7aa37e8 100644
--- a/cc/content_layer.h
+++ b/cc/content_layer.h
@@ -21,7 +21,7 @@ class CC_EXPORT ContentLayerPainter : public LayerPainter {
 public:
     static scoped_ptr<ContentLayerPainter> create(ContentLayerClient*);
 
-    virtual void paint(SkCanvas*, gfx::Rect contentRect, gfx::RectF& opaque) OVERRIDE;
+    virtual void Paint(SkCanvas*, gfx::Rect contentRect, gfx::RectF* opaque) OVERRIDE;
 
 private:
     explicit ContentLayerPainter(ContentLayerClient*);
diff --git a/cc/content_layer_updater.cc b/cc/content_layer_updater.cc
index c9b7d3a..e55b23e 100644
--- a/cc/content_layer_updater.cc
+++ b/cc/content_layer_updater.cc
@@ -52,7 +52,7 @@ void ContentLayerUpdater::paintContents(SkCanvas* canvas, const gfx::Rect& conte
     base::TimeTicks paintBeginTime;
     if (stats)
         paintBeginTime = base::TimeTicks::Now();
-    m_painter->paint(canvas, layerRect, opaqueLayerRect);
+    m_painter->Paint(canvas, layerRect, &opaqueLayerRect);
     if (stats) {
         stats->totalPaintTime += base::TimeTicks::Now() - paintBeginTime;
         stats->totalPixelsPainted += contentRect.width() * contentRect.height();
diff --git a/cc/layer_painter.h b/cc/layer_painter.h
index dcf69da..2d1fc7b 100644
--- a/cc/layer_painter.h
+++ b/cc/layer_painter.h
@@ -17,9 +17,11 @@ class RectF;
 namespace cc {
 
 class CC_EXPORT LayerPainter {
-public:
-    virtual ~LayerPainter() { }
-    virtual void paint(SkCanvas*, gfx::Rect contentRect, gfx::RectF& opaque) = 0;
+ public:
+  virtual ~LayerPainter() {}
+  virtual void Paint(SkCanvas* canvas,
+                     gfx::Rect content_rect,
+                     gfx::RectF* opaque) = 0;
 };
 
 }  // namespace cc
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index 6fdf2bc..c3c2013 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -58,7 +58,7 @@ private:
 
 class MockLayerPainter : public LayerPainter {
 public:
-    virtual void paint(SkCanvas*, gfx::Rect, gfx::RectF&) OVERRIDE { }
+    virtual void Paint(SkCanvas* canvas, gfx::Rect content_rect, gfx::RectF* opaque) OVERRIDE { }
 };
 
 
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
index ded7bf1..04f49bf 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/scrollbar_layer.cc
@@ -140,7 +140,7 @@ public:
         return make_scoped_ptr(new ScrollbarBackgroundPainter(scrollbar, painter, geometry, trackPart));
     }
 
-    virtual void paint(SkCanvas* canvas, gfx::Rect contentRect, gfx::RectF&) OVERRIDE
+    virtual void Paint(SkCanvas* canvas, gfx::Rect contentRect, gfx::RectF* opaque) OVERRIDE
     {
         // The following is a simplification of ScrollbarThemeComposite::paint.
         m_painter->PaintScrollbarBackground(canvas, contentRect);
@@ -196,7 +196,7 @@ public:
         return make_scoped_ptr(new ScrollbarThumbPainter(scrollbar, painter, geometry));
     }
 
-    virtual void paint(SkCanvas* canvas, gfx::Rect contentRect, gfx::RectF& opaque) OVERRIDE
+    virtual void Paint(SkCanvas* canvas, gfx::Rect contentRect, gfx::RectF* opaque) OVERRIDE
     {
         // Consider the thumb to be at the origin when painting.
         gfx::Rect thumbRect = m_geometry->thumbRect(m_scrollbar);
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index b8a07c2..264f892 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -1574,9 +1574,9 @@ class TrackingLayerPainter : public LayerPainter {
 public:
     static scoped_ptr<TrackingLayerPainter> create() { return make_scoped_ptr(new TrackingLayerPainter()); }
 
-    virtual void paint(SkCanvas*, gfx::Rect contentRect, gfx::RectF&) OVERRIDE
+    virtual void Paint(SkCanvas* canvas, gfx::Rect content_rect, gfx::RectF* opaque) OVERRIDE
     {
-        m_paintedRect = contentRect;
+        m_paintedRect = content_rect;
     }
 
     const gfx::Rect& paintedRect() const { return m_paintedRect; }