diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-07 11:21:11 +0200 |
| commit | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch) | |
| tree | 988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp | |
| parent | dd91e772430dc294e3bf478c119ef8d43c0a3358 (diff) | |
| download | qtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz | |
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp index 841e35ab8..11e893faf 100644 --- a/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp +++ b/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp @@ -29,7 +29,7 @@ // Subclasses #include "DrawingAreaImpl.h" -#if PLATFORM(MAC) +#if PLATFORM(MAC) && ENABLE(THREADED_SCROLLING) #include "TiledCoreAnimationDrawingArea.h" #endif @@ -42,7 +42,7 @@ PassOwnPtr<DrawingArea> DrawingArea::create(WebPage* webPage, const WebPageCreat switch (parameters.drawingAreaType) { case DrawingAreaTypeImpl: return DrawingAreaImpl::create(webPage, parameters); -#if PLATFORM(MAC) +#if PLATFORM(MAC) && ENABLE(THREADED_SCROLLING) case DrawingAreaTypeTiledCoreAnimation: return TiledCoreAnimationDrawingArea::create(webPage, parameters); #endif @@ -61,4 +61,10 @@ DrawingArea::~DrawingArea() { } +void DrawingArea::dispatchAfterEnsuringUpdatedScrollPosition(const Function<void ()>& function) +{ + // Scroll position updates are synchronous by default so we can just call the function right away here. + function(); +} + } // namespace WebKit |