From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp') 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::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 -- cgit v1.2.1