diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
| commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
| tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Tools/TestWebKitAPI/JavaScriptTest.h | |
| parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
| download | qtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz | |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/TestWebKitAPI/JavaScriptTest.h')
| -rw-r--r-- | Tools/TestWebKitAPI/JavaScriptTest.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Tools/TestWebKitAPI/JavaScriptTest.h b/Tools/TestWebKitAPI/JavaScriptTest.h index c6e79c3b6..c0494b2ca 100644 --- a/Tools/TestWebKitAPI/JavaScriptTest.h +++ b/Tools/TestWebKitAPI/JavaScriptTest.h @@ -23,14 +23,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#if PLATFORM(MAC) -#ifdef __OBJC__ -@class WKView; -@class WebView; -#else -class WKView; -class WebView; -#endif +#if PLATFORM(COCOA) +OBJC_CLASS WKView; +OBJC_CLASS WebView; #endif namespace TestWebKitAPI { @@ -44,7 +39,7 @@ namespace TestWebKitAPI { ::testing::AssertionResult runJSTest(const char* pageExpr, const char* scriptExpr, const char* expectedResultExpr, WKPageRef, const char* script, const char* expectedResult); ::testing::AssertionResult compareJSResult(const char* script, const char* actualResult, const char* expectedResult); -#if PLATFORM(MAC) +#if PLATFORM(COCOA) ::testing::AssertionResult runJSTest(const char* webViewExpr, const char* scriptExpr, const char* expectedResultExpr, WebView *, const char* script, const char* expectedResult); ::testing::AssertionResult runJSTest(const char* viewExpr, const char* scriptExpr, const char* expectedResultExpr, WKView *, const char* script, const char* expectedResult); #endif |