diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
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> 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) |