diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/chromium/FramelessScrollView.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/chromium/FramelessScrollView.cpp')
| -rw-r--r-- | Source/WebCore/platform/chromium/FramelessScrollView.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/WebCore/platform/chromium/FramelessScrollView.cpp b/Source/WebCore/platform/chromium/FramelessScrollView.cpp index 3fbf2d6..b6a8f53 100644 --- a/Source/WebCore/platform/chromium/FramelessScrollView.cpp +++ b/Source/WebCore/platform/chromium/FramelessScrollView.cpp @@ -32,6 +32,7 @@ #include "FramelessScrollView.h" #include "FramelessScrollViewClient.h" +#include "ScrollbarTheme.h" namespace WebCore { @@ -72,10 +73,16 @@ IntRect FramelessScrollView::windowClipRect(bool clipToContents) const return contentsToWindow(visibleContentRect(!clipToContents)); } -void FramelessScrollView::paintContents(GraphicsContext*, const IntRect& damageRect) +void FramelessScrollView::paintContents(GraphicsContext*, const IntRect&) { } +void FramelessScrollView::paintScrollCorner(GraphicsContext* context, const IntRect& cornerRect) +{ + // ScrollbarThemeComposite::paintScrollCorner incorrectly assumes that the ScrollView is a FrameView. + ScrollbarTheme::defaultPaintScrollCorner(context, cornerRect); +} + void FramelessScrollView::contentsResized() { } |