cc: Chromify ScrollbarGeometryStub

R=jamesr@chromium.org
BUG=none


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

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

2 files changed, 100 insertions, 95 deletions

diff --git a/cc/layers/scrollbar_geometry_stub.cc b/cc/layers/scrollbar_geometry_stub.cc
index fa7b1da..cd2bc07 100644
--- a/cc/layers/scrollbar_geometry_stub.cc
+++ b/cc/layers/scrollbar_geometry_stub.cc
@@ -6,104 +6,97 @@
 
 #include <cmath>
 
-using WebKit::WebRect;
-using WebKit::WebScrollbar;
-using WebKit::WebScrollbarThemeGeometry;
-
 namespace cc {
 
-ScrollbarGeometryStub::ScrollbarGeometryStub(scoped_ptr<WebScrollbarThemeGeometry> geometry)
-    : m_geometry(geometry.Pass())
-{
-}
+ScrollbarGeometryStub::ScrollbarGeometryStub(
+    scoped_ptr<WebKit::WebScrollbarThemeGeometry> geometry)
+    : geometry_(geometry.Pass()) {}
 
-ScrollbarGeometryStub::~ScrollbarGeometryStub()
-{
-}
+ScrollbarGeometryStub::~ScrollbarGeometryStub() {}
 
-WebScrollbarThemeGeometry* ScrollbarGeometryStub::clone() const
-{
-    return m_geometry->clone();
+WebKit::WebScrollbarThemeGeometry* ScrollbarGeometryStub::clone() const {
+  return geometry_->clone();
 }
 
-int ScrollbarGeometryStub::thumbPosition(WebScrollbar* scrollbar)
-{
-    return m_geometry->thumbPosition(scrollbar);
+int ScrollbarGeometryStub::thumbPosition(WebKit::WebScrollbar* scrollbar) {
+  return geometry_->thumbPosition(scrollbar);
 }
 
-int ScrollbarGeometryStub::thumbLength(WebScrollbar* scrollbar)
-{
-    return std::max(0, m_geometry->thumbLength(scrollbar));
+int ScrollbarGeometryStub::thumbLength(WebKit::WebScrollbar* scrollbar) {
+  return std::max(0, geometry_->thumbLength(scrollbar));
 }
 
-int ScrollbarGeometryStub::trackPosition(WebScrollbar* scrollbar)
-{
-    return m_geometry->trackPosition(scrollbar);
+int ScrollbarGeometryStub::trackPosition(WebKit::WebScrollbar* scrollbar) {
+  return geometry_->trackPosition(scrollbar);
 }
 
-int ScrollbarGeometryStub::trackLength(WebScrollbar* scrollbar)
-{
-    return m_geometry->trackLength(scrollbar);
+int ScrollbarGeometryStub::trackLength(WebKit::WebScrollbar* scrollbar) {
+  return geometry_->trackLength(scrollbar);
 }
 
-bool ScrollbarGeometryStub::hasButtons(WebScrollbar* scrollbar)
-{
-    return m_geometry->hasButtons(scrollbar);
+bool ScrollbarGeometryStub::hasButtons(WebKit::WebScrollbar* scrollbar) {
+  return geometry_->hasButtons(scrollbar);
 }
 
-bool ScrollbarGeometryStub::hasThumb(WebScrollbar* scrollbar)
-{
-    return m_geometry->hasThumb(scrollbar);
+bool ScrollbarGeometryStub::hasThumb(WebKit::WebScrollbar* scrollbar) {
+  return geometry_->hasThumb(scrollbar);
 }
 
-WebRect ScrollbarGeometryStub::trackRect(WebScrollbar* scrollbar)
-{
-    return m_geometry->trackRect(scrollbar);
+WebKit::WebRect ScrollbarGeometryStub::trackRect(
+    WebKit::WebScrollbar* scrollbar) {
+  return geometry_->trackRect(scrollbar);
 }
 
-WebRect ScrollbarGeometryStub::thumbRect(WebScrollbar* scrollbar)
-{
-    return m_geometry->thumbRect(scrollbar);
+WebKit::WebRect ScrollbarGeometryStub::thumbRect(
+    WebKit::WebScrollbar* scrollbar) {
+  return geometry_->thumbRect(scrollbar);
 }
 
-int ScrollbarGeometryStub::minimumThumbLength(WebScrollbar* scrollbar)
-{
-    return m_geometry->minimumThumbLength(scrollbar);
+int ScrollbarGeometryStub::minimumThumbLength(WebKit::WebScrollbar* scrollbar) {
+  return geometry_->minimumThumbLength(scrollbar);
 }
 
-int ScrollbarGeometryStub::scrollbarThickness(WebScrollbar* scrollbar)
-{
-    return m_geometry->scrollbarThickness(scrollbar);
+int ScrollbarGeometryStub::scrollbarThickness(WebKit::WebScrollbar* scrollbar) {
+  return geometry_->scrollbarThickness(scrollbar);
 }
 
-WebRect ScrollbarGeometryStub::backButtonStartRect(WebScrollbar* scrollbar)
-{
-    return m_geometry->backButtonStartRect(scrollbar);
+WebKit::WebRect ScrollbarGeometryStub::backButtonStartRect(
+    WebKit::WebScrollbar* scrollbar) {
+  return geometry_->backButtonStartRect(scrollbar);
 }
 
-WebRect ScrollbarGeometryStub::backButtonEndRect(WebScrollbar* scrollbar)
-{
-    return m_geometry->backButtonEndRect(scrollbar);
+WebKit::WebRect ScrollbarGeometryStub::backButtonEndRect(
+    WebKit::WebScrollbar* scrollbar) {
+  return geometry_->backButtonEndRect(scrollbar);
 }
 
-WebRect ScrollbarGeometryStub::forwardButtonStartRect(WebScrollbar* scrollbar)
-{
-    return m_geometry->forwardButtonStartRect(scrollbar);
+WebKit::WebRect ScrollbarGeometryStub::forwardButtonStartRect(
+    WebKit::WebScrollbar* scrollbar) {
+  return geometry_->forwardButtonStartRect(scrollbar);
 }
 
-WebRect ScrollbarGeometryStub::forwardButtonEndRect(WebScrollbar* scrollbar)
-{
-    return m_geometry->forwardButtonEndRect(scrollbar);
+WebKit::WebRect ScrollbarGeometryStub::forwardButtonEndRect(
+    WebKit::WebScrollbar* scrollbar) {
+  return geometry_->forwardButtonEndRect(scrollbar);
 }
 
-WebRect ScrollbarGeometryStub::constrainTrackRectToTrackPieces(WebScrollbar* scrollbar, const WebRect& rect)
-{
-    return m_geometry->constrainTrackRectToTrackPieces(scrollbar, rect);
+WebKit::WebRect ScrollbarGeometryStub::constrainTrackRectToTrackPieces(
+    WebKit::WebScrollbar* scrollbar,
+    const WebKit::WebRect& rect) {
+  return geometry_->constrainTrackRectToTrackPieces(scrollbar, rect);
 }
 
-void ScrollbarGeometryStub::splitTrack(WebScrollbar* scrollbar, const WebRect& unconstrainedTrackRect, WebRect& beforeThumbRect, WebRect& thumbRect, WebRect& afterThumbRect)
-{
-    m_geometry->splitTrack(scrollbar, unconstrainedTrackRect, beforeThumbRect, thumbRect, afterThumbRect);
+void ScrollbarGeometryStub::splitTrack(
+    WebKit::WebScrollbar* scrollbar,
+    const WebKit::WebRect& unconstrained_track_rect,
+    WebKit::WebRect& before_thumb_rect,
+    WebKit::WebRect& thumb_rect,
+    WebKit::WebRect& after_thumb_rect) {
+  geometry_->splitTrack(scrollbar,
+                        unconstrained_track_rect,
+                        before_thumb_rect,
+                        thumb_rect,
+                        after_thumb_rect);
 }
 
 }  // namespace cc
diff --git a/cc/layers/scrollbar_geometry_stub.h b/cc/layers/scrollbar_geometry_stub.h
index d671475..7858f9c 100644
--- a/cc/layers/scrollbar_geometry_stub.h
+++ b/cc/layers/scrollbar_geometry_stub.h
@@ -14,39 +14,51 @@ namespace cc {
 // This subclass wraps an existing scrollbar geometry class so that
 // another class can derive from it and override specific functions, while
 // passing through the remaining ones.
-class CC_EXPORT ScrollbarGeometryStub : public NON_EXPORTED_BASE(WebKit::WebScrollbarThemeGeometry) {
-public:
-    virtual ~ScrollbarGeometryStub();
-
-    // Allow derived classes to update themselves from a scrollbar.
-    void update(WebKit::WebScrollbar*) { }
-
-    // WebScrollbarThemeGeometry interface
-    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:
-    explicit ScrollbarGeometryStub(scoped_ptr<WebKit::WebScrollbarThemeGeometry>);
-
-private:
-    scoped_ptr<WebKit::WebScrollbarThemeGeometry> m_geometry;
-
-    DISALLOW_COPY_AND_ASSIGN(ScrollbarGeometryStub);
+class CC_EXPORT ScrollbarGeometryStub :
+    public NON_EXPORTED_BASE(WebKit::WebScrollbarThemeGeometry) {
+ public:
+  virtual ~ScrollbarGeometryStub();
+
+  // Allow derived classes to update themselves from a scrollbar.
+  void Update(WebKit::WebScrollbar* scrollbar) {}
+
+  // WebScrollbarThemeGeometry interface
+  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:
+  explicit ScrollbarGeometryStub(
+      scoped_ptr<WebKit::WebScrollbarThemeGeometry> scrollbar);
+
+ private:
+  scoped_ptr<WebKit::WebScrollbarThemeGeometry> geometry_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScrollbarGeometryStub);
 };
 
 }