diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp index 7d590a1a7..a4a103984 100644 --- a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp +++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp @@ -26,16 +26,12 @@ #include "config.h" #include "LayerTreeHost.h" -#if USE(CA) #if PLATFORM(MAC) -#include "LayerTreeHostCAMac.h" -#elif PLATFORM(WIN) -#include "LayerTreeHostCAWin.h" -#endif +#include "LayerTreeHostMac.h" #endif #if USE(COORDINATED_GRAPHICS) -#include "LayerTreeCoordinator.h" +#include "CoordinatedLayerTreeHost.h" #endif #if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL) @@ -49,11 +45,9 @@ namespace WebKit { PassRefPtr<LayerTreeHost> LayerTreeHost::create(WebPage* webPage) { #if PLATFORM(MAC) - return LayerTreeHostCAMac::create(webPage); -#elif PLATFORM(WIN) && HAVE(WKQCA) - return LayerTreeHostCAWin::create(webPage); + return LayerTreeHostMac::create(webPage); #elif USE(COORDINATED_GRAPHICS) - return LayerTreeCoordinator::create(webPage); + return CoordinatedLayerTreeHost::create(webPage); #elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL) return LayerTreeHostGtk::create(webPage); #else |