From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- .../WebKit2/WebProcess/WebPage/LayerTreeHost.cpp | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 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 a4a103984..e50b00855 100644 --- a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp +++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp @@ -24,17 +24,16 @@ */ #include "config.h" -#include "LayerTreeHost.h" -#if PLATFORM(MAC) -#include "LayerTreeHostMac.h" -#endif +#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER) -#if USE(COORDINATED_GRAPHICS) -#include "CoordinatedLayerTreeHost.h" -#endif +#include "LayerTreeHost.h" -#if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL) +#if USE(COORDINATED_GRAPHICS_MULTIPROCESS) +#include "CoordinatedLayerTreeHost.h" +#elif USE(COORDINATED_GRAPHICS_THREADED) +#include "ThreadedCoordinatedLayerTreeHost.h" +#elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL) #include "LayerTreeHostGtk.h" #endif @@ -44,9 +43,9 @@ namespace WebKit { PassRefPtr LayerTreeHost::create(WebPage* webPage) { -#if PLATFORM(MAC) - return LayerTreeHostMac::create(webPage); -#elif USE(COORDINATED_GRAPHICS) +#if USE(COORDINATED_GRAPHICS_THREADED) + return ThreadedCoordinatedLayerTreeHost::create(webPage); +#elif USE(COORDINATED_GRAPHICS_MULTIPROCESS) return CoordinatedLayerTreeHost::create(webPage); #elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL) return LayerTreeHostGtk::create(webPage); @@ -66,3 +65,5 @@ LayerTreeHost::~LayerTreeHost() } } // namespace WebKit + +#endif // USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER) -- cgit v1.2.1