Index: cc/test/fake_web_scrollbar_theme_geometry.cc |
diff --git a/cc/test/fake_web_scrollbar_theme_geometry.cc b/cc/test/fake_web_scrollbar_theme_geometry.cc |
index 8a0f378875bf5998931a6500967d3c078f24436d..15163face8ba025f7c9cf45c984dc7ac77de57c1 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); |
} |
} |