diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
| commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
| tree | f6256640b6c46d7da221435803cae65326817ba2 /Tools/TestWebKitAPI | |
| parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
| download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz | |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Tools/TestWebKitAPI')
| -rw-r--r-- | Tools/TestWebKitAPI/PlatformEfl.cmake | 2 | ||||
| -rw-r--r-- | Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp | 10 | ||||
| -rw-r--r-- | Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/Tools/TestWebKitAPI/PlatformEfl.cmake b/Tools/TestWebKitAPI/PlatformEfl.cmake index 4c4c90284..62f865ce5 100644 --- a/Tools/TestWebKitAPI/PlatformEfl.cmake +++ b/Tools/TestWebKitAPI/PlatformEfl.cmake @@ -8,7 +8,7 @@ ADD_CUSTOM_TARGET(forwarding-headersSoupForTestWebKitAPI ) SET(ForwardingNetworkHeadersForTestWebKitAPI_NAME forwarding-headersSoupForTestWebKitAPI) -INCLUDE_DIRECTORIES(${LIBSOUP24_INCLUDE_DIRS} +INCLUDE_DIRECTORIES(${LIBSOUP_INCLUDE_DIRS} ${WEBKIT2_DIR}/UIProcess/API/C/soup ${WEBKIT2_DIR}/UIProcess/API/C/efl ${ECORE_INCLUDE_DIRS} diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp b/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp index e84386f18..819a79d0d 100644 --- a/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp +++ b/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp @@ -107,6 +107,13 @@ 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ], + 'conditions': [ + ['inside_chromium_build==1', { + 'ant_build_to_chromium_src': '<(ant_build_out)/../../', + }, { + 'ant_build_to_chromium_src': '<(chromium_src_dir)', + }], + ], }, # Part of the following was copied from <(chromium_src_dir)/build/apk_test.gpyi. # Not including it because gyp include doesn't support variable in path or under @@ -131,6 +138,7 @@ '"<@(input_jars_paths)"', '--output', '<(PRODUCT_DIR)/TestWebKitAPI_apk', + '--strip-binary=<(android_strip)', '--ant-args', '-DANDROID_SDK=<(android_sdk)', '--ant-args', @@ -143,6 +151,8 @@ '-DANDROID_TOOLCHAIN=<(android_toolchain)', '--ant-args', '-DPRODUCT_DIR=<(ant_build_out)', + '--ant-args', + '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)', '--sdk-build=<(sdk_build)', '--app_abi', '<(android_app_abi)', diff --git a/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp b/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp index 3f02a0f67..d6d48fc61 100644 --- a/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp +++ b/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp @@ -149,7 +149,7 @@ TEST(WTF, MediaTime) EXPECT_EQ(MediaTime(3, 2).toDouble(), 1.5); EXPECT_EQ(MediaTime(1, 1 << 16).toFloat(), 1 / pow(2.0f, 16.0f)); EXPECT_EQ(MediaTime(1, 1 << 30).toDouble(), 1 / pow(2.0, 30.0)); - EXPECT_EQ(MediaTime::createWithDouble(M_PI, 1 << 30), MediaTime(3373259426, 1 << 30)); + EXPECT_EQ(MediaTime::createWithDouble(M_PI, 1 << 30), MediaTime(3373259426U, 1 << 30)); EXPECT_EQ(MediaTime::createWithFloat(INFINITY), MediaTime::positiveInfiniteTime()); EXPECT_EQ(MediaTime::createWithFloat(-INFINITY), MediaTime::negativeInfiniteTime()); EXPECT_EQ(MediaTime::createWithFloat(NAN), MediaTime::invalidTime()); |