diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 21:28:00 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 21:28:00 +0000 |
| commit | 983b5efbb9b739ecfd0b65e7e0c766739ae32054 (patch) | |
| tree | 4695340d9904ee5b7e7c67f1614062d19c4be203 /webkit | |
| parent | 507b58089a4e15d7c8e039badc37340ce96a4b5c (diff) | |
| download | chromium_src-983b5efbb9b739ecfd0b65e7e0c766739ae32054.zip chromium_src-983b5efbb9b739ecfd0b65e7e0c766739ae32054.tar.gz chromium_src-983b5efbb9b739ecfd0b65e7e0c766739ae32054.tar.bz2 | |
Get rid of temporary scrollbar code now that WebKit is rolled.
Review URL: http://codereview.chromium.org/7637018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_scrollbar_impl.cc | 11 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_scrollbar_impl.h | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc index cf197ec..3407ba7 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.cc +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.cc @@ -125,16 +125,10 @@ PPB_Scrollbar_Impl::~PPB_Scrollbar_Impl() { } void PPB_Scrollbar_Impl::Init(bool vertical) { -#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY) scrollbar_.reset(WebScrollbar::createForPlugin( vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal, instance()->container(), static_cast<WebKit::WebScrollbarClient*>(this))); -#else - scrollbar_.reset(WebScrollbar::create( - static_cast<WebKit::WebScrollbarClient*>(this), - vertical ? WebScrollbar::Vertical : WebScrollbar::Horizontal)); -#endif } PPB_Scrollbar_API* PPB_Scrollbar_Impl::AsPPB_Scrollbar_API() { @@ -156,12 +150,7 @@ uint32_t PPB_Scrollbar_Impl::GetThickness() { } bool PPB_Scrollbar_Impl::IsOverlay() { -// TODO(jam): take this out once WebKit is rolled. -#if defined(WEBSCROLLBAR_SUPPORTS_OVERLAY) return scrollbar_->isOverlay(); -#else - return false; -#endif } uint32_t PPB_Scrollbar_Impl::GetValue() { diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.h b/webkit/plugins/ppapi/ppb_scrollbar_impl.h index 5fca18b..7ffbbcf 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.h +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.h @@ -63,8 +63,7 @@ class PPB_Scrollbar_Impl : public PPB_Widget_Impl, // WebKit::WebScrollbarClient implementation. virtual void valueChanged(WebKit::WebScrollbar* scrollbar) OVERRIDE; - // TODO(jam): add OVERRIDE once WebKit is rolled - virtual void overlayChanged(WebKit::WebScrollbar* scrollbar); + virtual void overlayChanged(WebKit::WebScrollbar* scrollbar) OVERRIDE; virtual void invalidateScrollbarRect(WebKit::WebScrollbar* scrollbar, const WebKit::WebRect& rect) OVERRIDE; virtual void getTickmarks( |