Changeset 217184 in webkit

Timestamp:

May 19, 2017 11:55:38 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[Win] error LNK2005: WebCore::JSNode::checkSubClassPatchpoint() already defined in WebKit.lib
​https://bugs.webkit.org/show_bug.cgi?id=172267

Patch by Fujii Hironori <Fujii Hironori> on 2017-05-19
Reviewed by Per Arne Vollan.

TestWebCoreLib and TestWebKitLib have linked both WebCore and WebKit.
TestWebCoreLib should link only with WebCore. And, TestWebKitLib
should link only with WebKit.

Unfortunately, there is a layer violation at the moment.
WebCore::Image::loadPlatformResource needs loadResourceIntoBuffer
in WebKit. This change contains a stub of loadResourceIntoBuffer
in TestWebCoreLib for the workaround.

• TestWebKitAPI/PlatformWin.cmake: Do not link WebKit to

TestWebCoreLib. Do not link WebCore to TestWebKitLib.

• TestWebKitAPI/win/TestWebCoreStubs.cpp: Added.

(loadResourceIntoBuffer): Added a stub.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/PlatformWin.cmake (modified) (4 diffs)
• TestWebKitAPI/win/TestWebCoreStubs.cpp (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-05-19  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] error LNK2005: WebCore::JSNode::checkSubClassPatchpoint() already defined in WebKit.lib
+        https://bugs.webkit.org/show_bug.cgi?id=172267
+
+        Reviewed by Per Arne Vollan.
+
+        TestWebCoreLib and TestWebKitLib have linked both WebCore and WebKit.
+        TestWebCoreLib should link only with WebCore. And, TestWebKitLib
+        should link only with WebKit.
+
+        Unfortunately, there is a layer violation at the moment.
+        WebCore::Image::loadPlatformResource needs loadResourceIntoBuffer
+        in WebKit. This change contains a stub of loadResourceIntoBuffer
+        in TestWebCoreLib for the workaround.
+
+        * TestWebKitAPI/PlatformWin.cmake: Do not link WebKit to
+        TestWebCoreLib. Do not link WebCore to TestWebKitLib.
+        * TestWebKitAPI/win/TestWebCoreStubs.cpp: Added.
+        (loadResourceIntoBuffer): Added a stub.
+
 2017-05-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/TestWebKitAPI/PlatformWin.cmake

@@ -37 +37 @@
     WebCore${DEBUG_SUFFIX}
     WebCoreDerivedSources${DEBUG_SUFFIX}
-    WebKit${DEBUG_SUFFIX}
     WindowsCodecs
     gtest
@@ -44 +43 @@
 set(TestWebCoreLib_SOURCES
     ${test_main_SOURCES}
+    win/TestWebCoreStubs.cpp
     ${TESTWEBKITAPI_DIR}/TestsController.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WebCore/AffineTransform.cpp
@@ -141 +141 @@
 endif ()
 
+set(test_webkit_LIBRARIES
+    WebCoreTestSupport
+    WebKit${DEBUG_SUFFIX}
+    gtest
+)
 add_library(TestWebKitLib SHARED
     ${test_main_SOURCES}
@@ -149 +154 @@
 )
 
-target_link_libraries(TestWebKitLib ${test_webcore_LIBRARIES})
+target_link_libraries(TestWebKitLib ${test_webkit_LIBRARIES})
 
 add_executable(TestWebKit