Attachment 310639 Details for Bug 172267 – Patch

[patch] Patch

bug-172267-20170519184708.patch (text/plain), 4.30 KB, created by Fujii Hironori on 2017-05-19 02:47:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2017-05-19 02:47:10 PDT

Size: 4.30 KB

patch

obsolete

>Subversion Revision: 217036
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a15c7d405de30752cbc0ccce3a84c6fac3484ef8..ba9ce80e9198d892df41a7a037ad4f25f6b71f07 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,24 @@
>+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 NOBODY (OOPS!).
>+
>+        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-17  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r217014.
>diff --git a/Tools/TestWebKitAPI/PlatformWin.cmake b/Tools/TestWebKitAPI/PlatformWin.cmake
>index f69ef752d8f53e3429c04a054f61206f0c3d9a3c..a79aa6d45dc0b19a307cee9c8d87f415adb81745 100644
>--- a/Tools/TestWebKitAPI/PlatformWin.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWin.cmake
>@@ -36,13 +36,13 @@ set(test_webcore_LIBRARIES
>     Usp10
>     WebCore${DEBUG_SUFFIX}
>     WebCoreDerivedSources${DEBUG_SUFFIX}
>-    WebKit${DEBUG_SUFFIX}
>     WindowsCodecs
>     gtest
> )
> 
> set(TestWebCoreLib_SOURCES
>     ${test_main_SOURCES}
>+    win/TestWebCoreStubs.cpp
>     ${TESTWEBKITAPI_DIR}/TestsController.cpp
>     ${TESTWEBKITAPI_DIR}/Tests/WebCore/AffineTransform.cpp
>     ${TESTWEBKITAPI_DIR}/Tests/WebCore/CalculationValue.cpp
>@@ -140,6 +140,11 @@ if (${WTF_PLATFORM_WIN_CAIRO})
>     )
> endif ()
> 
>+set(test_webkit_LIBRARIES
>+    WebCoreTestSupport
>+    WebKit${DEBUG_SUFFIX}
>+    gtest
>+)
> add_library(TestWebKitLib SHARED
>     ${test_main_SOURCES}
>     ${TESTWEBKITAPI_DIR}/TestsController.cpp
>@@ -148,7 +153,7 @@ add_library(TestWebKitLib SHARED
>     ${TESTWEBKITAPI_DIR}/win/HostWindow.cpp
> )
> 
>-target_link_libraries(TestWebKitLib ${test_webcore_LIBRARIES})
>+target_link_libraries(TestWebKitLib ${test_webkit_LIBRARIES})
> 
> add_executable(TestWebKit
>     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
>diff --git a/Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp b/Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..1f930f2e4c1b1f181f47773fb473d0463a4ecfb9
>--- /dev/null
>+++ b/Tools/TestWebKitAPI/win/TestWebCoreStubs.cpp
>@@ -0,0 +1,32 @@
>+/*
>+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1.  Redistributions of source code must retain the above copyright
>+ *     notice, this list of conditions and the following disclaimer.
>+ * 2.  Redistributions in binary form must reproduce the above copyright
>+ *     notice, this list of conditions and the following disclaimer in the
>+ *     documentation and/or other materials provided with the distribution.
>+ * 
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
>+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
>+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
>+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
>+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
>+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
>+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+#include "config.h"
>+
>+#include "SharedBuffer.h"
>+
>+RefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char*)
>+{
>+    return nullptr;
>+}
>+

Actions: View | Formatted Diff | Diff

Attachments on bug 172267: 310635 | 310639