Changeset 217184 in webkit
- Timestamp:
- May 19, 2017 11:55:38 PM (7 years ago)
- Location:
- trunk/Tools
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r217167 r217184 1 2017-05-19 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 [Win] error LNK2005: WebCore::JSNode::checkSubClassPatchpoint() already defined in WebKit.lib 4 https://bugs.webkit.org/show_bug.cgi?id=172267 5 6 Reviewed by Per Arne Vollan. 7 8 TestWebCoreLib and TestWebKitLib have linked both WebCore and WebKit. 9 TestWebCoreLib should link only with WebCore. And, TestWebKitLib 10 should link only with WebKit. 11 12 Unfortunately, there is a layer violation at the moment. 13 WebCore::Image::loadPlatformResource needs loadResourceIntoBuffer 14 in WebKit. This change contains a stub of loadResourceIntoBuffer 15 in TestWebCoreLib for the workaround. 16 17 * TestWebKitAPI/PlatformWin.cmake: Do not link WebKit to 18 TestWebCoreLib. Do not link WebCore to TestWebKitLib. 19 * TestWebKitAPI/win/TestWebCoreStubs.cpp: Added. 20 (loadResourceIntoBuffer): Added a stub. 21 1 22 2017-05-19 Simon Fraser <simon.fraser@apple.com> 2 23 -
trunk/Tools/TestWebKitAPI/PlatformWin.cmake
r215606 r217184 37 37 WebCore${DEBUG_SUFFIX} 38 38 WebCoreDerivedSources${DEBUG_SUFFIX} 39 WebKit${DEBUG_SUFFIX}40 39 WindowsCodecs 41 40 gtest … … 44 43 set(TestWebCoreLib_SOURCES 45 44 ${test_main_SOURCES} 45 win/TestWebCoreStubs.cpp 46 46 ${TESTWEBKITAPI_DIR}/TestsController.cpp 47 47 ${TESTWEBKITAPI_DIR}/Tests/WebCore/AffineTransform.cpp … … 141 141 endif () 142 142 143 set(test_webkit_LIBRARIES 144 WebCoreTestSupport 145 WebKit${DEBUG_SUFFIX} 146 gtest 147 ) 143 148 add_library(TestWebKitLib SHARED 144 149 ${test_main_SOURCES} … … 149 154 ) 150 155 151 target_link_libraries(TestWebKitLib ${test_web core_LIBRARIES})156 target_link_libraries(TestWebKitLib ${test_webkit_LIBRARIES}) 152 157 153 158 add_executable(TestWebKit
Note: See TracChangeset
for help on using the changeset viewer.