cc: Chromify FakeWebScrollbarThemeGeometry

R=danakj@chromium.org
BUG=none


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

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

3 files changed, 80 insertions, 59 deletions

diff --git a/cc/test/fake_scrollbar_layer.cc b/cc/test/fake_scrollbar_layer.cc
index 43fcf84..96fbeec 100644
--- a/cc/test/fake_scrollbar_layer.cc
+++ b/cc/test/fake_scrollbar_layer.cc
@@ -17,7 +17,7 @@ FakeScrollbarLayer::FakeScrollbarLayer(bool paint_during_update,
     : ScrollbarLayer(FakeWebScrollbar::Create().PassAs<WebKit::WebScrollbar>(),
                      FakeScrollbarThemePainter::Create(paint_during_update).
                          PassAs<ScrollbarThemePainter>(),
-                     FakeWebScrollbarThemeGeometry::create(has_thumb).
+                     FakeWebScrollbarThemeGeometry::Create(has_thumb).
                          PassAs<WebKit::WebScrollbarThemeGeometry>(),
                      scrolling_layer_id),
       update_count_(0),
diff --git a/cc/test/fake_web_scrollbar_theme_geometry.cc b/cc/test/fake_web_scrollbar_theme_geometry.cc
index 8a0f378..15163fa 100644
--- a/cc/test/fake_web_scrollbar_theme_geometry.cc
+++ b/cc/test/fake_web_scrollbar_theme_geometry.cc
@@ -9,96 +9,104 @@ using WebKit::WebRect;
 namespace cc {
 
 WebKit::WebScrollbarThemeGeometry*
-    FakeWebScrollbarThemeGeometry::clone() const {
-  return new FakeWebScrollbarThemeGeometry(m_hasThumb);
+FakeWebScrollbarThemeGeometry::clone() const {
+  return new FakeWebScrollbarThemeGeometry(has_thumb_);
 }
 
-int FakeWebScrollbarThemeGeometry::thumbPosition(WebKit::WebScrollbar*) {
-  if (!m_hasThumb)
+int FakeWebScrollbarThemeGeometry::thumbPosition(
+    WebKit::WebScrollbar* scrollbar) {
+  if (!has_thumb_)
     return 0;
   return 5;
 }
 
-int FakeWebScrollbarThemeGeometry::thumbLength(WebKit::WebScrollbar*) {
-  if (!m_hasThumb)
+int FakeWebScrollbarThemeGeometry::thumbLength(
+    WebKit::WebScrollbar* scrollbar) {
+  if (!has_thumb_)
     return 0;
   return 2;
 }
 
-int FakeWebScrollbarThemeGeometry::trackPosition(WebKit::WebScrollbar*) {
+int FakeWebScrollbarThemeGeometry::trackPosition(
+    WebKit::WebScrollbar* scrollbar) {
   return 0;
 }
 
-int FakeWebScrollbarThemeGeometry::trackLength(WebKit::WebScrollbar*) {
+int FakeWebScrollbarThemeGeometry::trackLength(
+    WebKit::WebScrollbar* scrollbar) {
   return 10;
 }
 
-bool FakeWebScrollbarThemeGeometry::hasButtons(WebKit::WebScrollbar*) {
+bool FakeWebScrollbarThemeGeometry::hasButtons(
+    WebKit::WebScrollbar* scrollbar) {
   return false;
 }
 
-bool FakeWebScrollbarThemeGeometry::hasThumb(WebKit::WebScrollbar*) {
-  return m_hasThumb;
+bool FakeWebScrollbarThemeGeometry::hasThumb(WebKit::WebScrollbar* scrollbar) {
+  return has_thumb_;
 }
 
-WebRect FakeWebScrollbarThemeGeometry::trackRect(WebKit::WebScrollbar*) {
+WebRect FakeWebScrollbarThemeGeometry::trackRect(
+    WebKit::WebScrollbar* scrollbar) {
   return WebRect(0, 0, 10, 10);
 }
 
-WebRect FakeWebScrollbarThemeGeometry::thumbRect(WebKit::WebScrollbar*) {
-  if (!m_hasThumb)
+WebRect FakeWebScrollbarThemeGeometry::thumbRect(
+    WebKit::WebScrollbar* scrollbar) {
+  if (!has_thumb_)
     return WebRect(0, 0, 0, 0);
   return WebRect(0, 5, 5, 2);
 }
 
-int FakeWebScrollbarThemeGeometry::minimumThumbLength(WebKit::WebScrollbar*) {
+int FakeWebScrollbarThemeGeometry::minimumThumbLength(
+    WebKit::WebScrollbar* scrollbar) {
   return 0;
 }
 
-int FakeWebScrollbarThemeGeometry::scrollbarThickness(WebKit::WebScrollbar*) {
+int FakeWebScrollbarThemeGeometry::scrollbarThickness(
+    WebKit::WebScrollbar* scrollbar) {
   return 0;
 }
 
 WebRect FakeWebScrollbarThemeGeometry::backButtonStartRect(
-    WebKit::WebScrollbar*) {
+    WebKit::WebScrollbar* scrollbar) {
   return WebRect();
 }
 
 WebRect FakeWebScrollbarThemeGeometry::backButtonEndRect(
-    WebKit::WebScrollbar*) {
+    WebKit::WebScrollbar* scrollbar) {
   return WebRect();
 }
 
 WebRect FakeWebScrollbarThemeGeometry::forwardButtonStartRect(
-    WebKit::WebScrollbar*) {
+    WebKit::WebScrollbar* scrollbar) {
   return WebRect();
 }
 
 WebRect FakeWebScrollbarThemeGeometry::forwardButtonEndRect(
-    WebKit::WebScrollbar*) {
+    WebKit::WebScrollbar* scrollbar) {
   return WebRect();
 }
 
 WebRect FakeWebScrollbarThemeGeometry::constrainTrackRectToTrackPieces(
-   WebKit::WebScrollbar*,
-   const WebRect&) {
+    WebKit::WebScrollbar* scrollbar,
+    const WebRect& rect) {
   return WebRect();
 }
 
-void FakeWebScrollbarThemeGeometry::splitTrack(
-    WebKit::WebScrollbar*,
-    const WebRect& track,
-    WebRect& startTrack,
-    WebRect& thumb,
-    WebRect& endTrack) {
-  if (!m_hasThumb) {
+void FakeWebScrollbarThemeGeometry::splitTrack(WebKit::WebScrollbar* scrollbar,
+                                               const WebRect& track,
+                                               WebRect& start_track,
+                                               WebRect& thumb,
+                                               WebRect& end_track) {
+  if (!has_thumb_) {
     thumb = WebRect(0, 0, 0, 0);
-    startTrack = WebRect(0, 0, 10, 10);
-    endTrack = WebRect(0, 10, 10, 0);
+    start_track = WebRect(0, 0, 10, 10);
+    end_track = WebRect(0, 10, 10, 0);
   } else {
     thumb = WebRect(0, 5, 5, 2);
-    startTrack = WebRect(0, 5, 0, 5);
-    endTrack = WebRect(0, 0, 0, 5);
+    start_track = WebRect(0, 5, 0, 5);
+    end_track = WebRect(0, 0, 0, 5);
   }
 }
 
diff --git a/cc/test/fake_web_scrollbar_theme_geometry.h b/cc/test/fake_web_scrollbar_theme_geometry.h
index 6c3d38c..0c38333 100644
--- a/cc/test/fake_web_scrollbar_theme_geometry.h
+++ b/cc/test/fake_web_scrollbar_theme_geometry.h
@@ -11,31 +11,44 @@
 namespace cc {
 
 class FakeWebScrollbarThemeGeometry : public WebKit::WebScrollbarThemeGeometry {
-public:
-    static scoped_ptr<WebKit::WebScrollbarThemeGeometry> create(bool hasThumb) { return scoped_ptr<WebKit::WebScrollbarThemeGeometry>(new FakeWebScrollbarThemeGeometry(hasThumb)); }
-
-    virtual WebKit::WebScrollbarThemeGeometry* clone() const OVERRIDE;
-
-    virtual int thumbPosition(WebKit::WebScrollbar*) OVERRIDE;
-    virtual int thumbLength(WebKit::WebScrollbar*) OVERRIDE;
-    virtual int trackPosition(WebKit::WebScrollbar*) OVERRIDE;
-    virtual int trackLength(WebKit::WebScrollbar*) OVERRIDE;
-    virtual bool hasButtons(WebKit::WebScrollbar*) OVERRIDE;
-    virtual bool hasThumb(WebKit::WebScrollbar*) OVERRIDE;
-    virtual WebKit::WebRect trackRect(WebKit::WebScrollbar*) OVERRIDE;
-    virtual WebKit::WebRect thumbRect(WebKit::WebScrollbar*) OVERRIDE;
-    virtual int minimumThumbLength(WebKit::WebScrollbar*) OVERRIDE;
-    virtual int scrollbarThickness(WebKit::WebScrollbar*) OVERRIDE;
-    virtual WebKit::WebRect backButtonStartRect(WebKit::WebScrollbar*) OVERRIDE;
-    virtual WebKit::WebRect backButtonEndRect(WebKit::WebScrollbar*) OVERRIDE;
-    virtual WebKit::WebRect forwardButtonStartRect(WebKit::WebScrollbar*) OVERRIDE;
-    virtual WebKit::WebRect forwardButtonEndRect(WebKit::WebScrollbar*) OVERRIDE;
-    virtual WebKit::WebRect constrainTrackRectToTrackPieces(WebKit::WebScrollbar*, const WebKit::WebRect&) OVERRIDE;
-    virtual void splitTrack(WebKit::WebScrollbar*, const WebKit::WebRect& track, WebKit::WebRect& startTrack, WebKit::WebRect& thumb, WebKit::WebRect& endTrack) OVERRIDE;
-
-protected:
-    FakeWebScrollbarThemeGeometry(bool hasThumb) : m_hasThumb(hasThumb) { }
-    bool m_hasThumb;
+ public:
+  static scoped_ptr<WebKit::WebScrollbarThemeGeometry> Create(bool has_thumb) {
+    return scoped_ptr<WebKit::WebScrollbarThemeGeometry>(
+        new FakeWebScrollbarThemeGeometry(has_thumb));
+  }
+
+  // WebScrollbarThemeGeometry implementation.
+  virtual WebKit::WebScrollbarThemeGeometry* clone() const OVERRIDE;
+  virtual int thumbPosition(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual int thumbLength(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual int trackPosition(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual int trackLength(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual bool hasButtons(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual bool hasThumb(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual WebKit::WebRect trackRect(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual WebKit::WebRect thumbRect(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual int minimumThumbLength(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual int scrollbarThickness(WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual WebKit::WebRect backButtonStartRect(WebKit::WebScrollbar* scrollbar)
+      OVERRIDE;
+  virtual WebKit::WebRect backButtonEndRect(WebKit::WebScrollbar* scrollbar)
+      OVERRIDE;
+  virtual WebKit::WebRect forwardButtonStartRect(
+      WebKit::WebScrollbar* scrollbar) OVERRIDE;
+  virtual WebKit::WebRect forwardButtonEndRect(WebKit::WebScrollbar* scrollbar)
+      OVERRIDE;
+  virtual WebKit::WebRect constrainTrackRectToTrackPieces(
+      WebKit::WebScrollbar* scrollbar,
+      const WebKit::WebRect& rect) OVERRIDE;
+  virtual void splitTrack(WebKit::WebScrollbar* scrollbar,
+                          const WebKit::WebRect& track,
+                          WebKit::WebRect& start_track,
+                          WebKit::WebRect& thumb,
+                          WebKit::WebRect& end_track) OVERRIDE;
+
+ protected:
+  FakeWebScrollbarThemeGeometry(bool has_thumb) : has_thumb_(has_thumb) {}
+  bool has_thumb_;
 };
 
 }  // namespace cc