diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp')
| -rw-r--r-- | Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp b/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp index 828e65b1b..376f31986 100644 --- a/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp +++ b/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp @@ -32,7 +32,7 @@ #include "PixelDumpSupport.h" #include "PlatformWebView.h" #include "TestController.h" -#include <WebKit2/WKImageCairo.h> +#include <WebKit/WKImageCairo.h> #include <cairo/cairo.h> #include <cstdio> #include <wtf/Assertions.h> @@ -106,14 +106,9 @@ static void paintRepaintRectOverlay(cairo_surface_t* surface, WKArrayRef repaint cairo_destroy(context); } -void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef wkImage, WKArrayRef repaintRects) +void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef image, WKArrayRef repaintRects, SnapshotResultType) { -#if USE(ACCELERATED_COMPOSITING) && PLATFORM(EFL) - UNUSED_PARAM(wkImage); - cairo_surface_t* surface = WKImageCreateCairoSurface(TestController::shared().mainWebView()->windowSnapshotImage().get()); -#else - cairo_surface_t* surface = WKImageCreateCairoSurface(wkImage); -#endif + cairo_surface_t* surface = WKImageCreateCairoSurface(image); if (repaintRects) paintRepaintRectOverlay(surface, repaintRects); |