From 9663d58a1b0be02c52a33e2f9aa05a54d9ac80d4 Mon Sep 17 00:00:00 2001 From: "simon.fraser@apple.com" Date: Mon, 26 Sep 2011 23:00:37 +0000 Subject: [PATCH] Fix WebKitTestRunner builds for Cairo, Windows and Qt. * WebKitTestRunner/cairo/TestInvocationCairo.cpp: (WTR::TestInvocation::dumpPixelsAndCompareWithExpected): * WebKitTestRunner/win/TestInvocationWin.cpp: (WTR::TestInvocation::dumpPixelsAndCompareWithExpected): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96021 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 9 +++++++++ Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp | 2 +- Tools/WebKitTestRunner/win/TestInvocationWin.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 08d0478..2be001e 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,5 +1,14 @@ 2011-09-26 Simon Fraser + Fix WebKitTestRunner builds for Cairo, Windows and Qt. + + * WebKitTestRunner/cairo/TestInvocationCairo.cpp: + (WTR::TestInvocation::dumpPixelsAndCompareWithExpected): + * WebKitTestRunner/win/TestInvocationWin.cpp: + (WTR::TestInvocation::dumpPixelsAndCompareWithExpected): + +2011-09-26 Simon Fraser + Repaint tests don't work in WebKit2 https://bugs.webkit.org/show_bug.cgi?id=68453 diff --git a/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp b/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp index 6bb6949..d3fbfd2 100644 --- a/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp +++ b/Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp @@ -77,7 +77,7 @@ static void dumpBitmap(cairo_surface_t* surface, const char* checksum) printPNG(data, dataLength, checksum); } -void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef wkImage) +void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef wkImage, WKArrayRef /*repaintRects*/) { cairo_surface_t* surface = WKImageCreateCairoSurface(wkImage); diff --git a/Tools/WebKitTestRunner/win/TestInvocationWin.cpp b/Tools/WebKitTestRunner/win/TestInvocationWin.cpp index 2aec9ae..8945aa6 100644 --- a/Tools/WebKitTestRunner/win/TestInvocationWin.cpp +++ b/Tools/WebKitTestRunner/win/TestInvocationWin.cpp @@ -29,7 +29,7 @@ namespace WTR { #if !USE(CG) && !USE(CAIRO) -void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef) +void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef, WKArrayRef) { } #endif -- 2.7.4