Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (188175 => 188176)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1,3 +1,13 @@
+2015-08-07 Alex Christensen <achristen...@webkit.org>
+
+ Build more testing binaries with CMake on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147799
+
+ Reviewed by Brent Fulgham.
+
+ * shell/PlatformWin.cmake: Added.
+ Build jsc.dll and jsc.exe to find Apple Application Support or WinCairo dlls before using them.
+
2015-08-07 Filip Pizlo <fpi...@apple.com>
Lightweight locks should be adaptive
Added: trunk/Source/_javascript_Core/shell/PlatformWin.cmake (0 => 188176)
--- trunk/Source/_javascript_Core/shell/PlatformWin.cmake (rev 0)
+++ trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2015-08-07 23:42:07 UTC (rev 188176)
@@ -0,0 +1,9 @@
+include_directories(./ ${_javascript_Core_INCLUDE_DIRECTORIES})
+add_library(jscdll SHARED ${JSC_SOURCES})
+target_link_libraries(jscdll ${JSC_LIBRARIES})
+set_target_properties(jscdll PROPERTIES FOLDER "_javascript_Core")
+set_target_properties(jscdll PROPERTIES OUTPUT_NAME "jsc")
+
+set(JSC_SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
+set(JSC_LIBRARIES shlwapi)
+add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
Modified: trunk/Source/WebCore/CMakeLists.txt (188175 => 188176)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-07 23:42:07 UTC (rev 188176)
@@ -2869,7 +2869,8 @@
Modules/encryptedmedia/MediaKeys.cpp
html/MediaKeyEvent.cpp
-
+ )
+ list(APPEND WebCoreTestSupport_SOURCES
testing/MockCDM.cpp
)
list(APPEND WebCore_IDL_FILES
@@ -3274,7 +3275,7 @@
testing/TypeConversions.idl
)
-set(WebCoreTestSupport_SOURCES
+list(APPEND WebCoreTestSupport_SOURCES
platform/mock/PlatformSpeechSynthesizerMock.cpp
platform/mock/mediasource/MockBox.cpp
Modified: trunk/Source/WebCore/ChangeLog (188175 => 188176)
--- trunk/Source/WebCore/ChangeLog 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1,3 +1,15 @@
+2015-08-07 Alex Christensen <achristen...@webkit.org>
+
+ Build more testing binaries with CMake on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147799
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ MockCDM.cpp needs to be part of WebCoreTestSupport, not WebCore.
+ * PlatformWin.cmake:
+ Added files needed for AppleWin port.
+
2015-08-07 Anders Carlsson <ander...@apple.com>
Being moving away from using SQLTransactionStateMachine in SQLTransactionBackend
Modified: trunk/Source/WebCore/PlatformWin.cmake (188175 => 188176)
--- trunk/Source/WebCore/PlatformWin.cmake 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-08-07 23:42:07 UTC (rev 188176)
@@ -62,6 +62,7 @@
platform/graphics/win/FontCacheWin.cpp
platform/graphics/win/FontPlatformDataWin.cpp
platform/graphics/win/FontWin.cpp
+ platform/graphics/win/FullScreenController.cpp
platform/graphics/win/GraphicsContextWin.cpp
platform/graphics/win/IconWin.cpp
platform/graphics/win/ImageWin.cpp
@@ -91,6 +92,7 @@
platform/win/DragImageWin.cpp
platform/win/EventLoopWin.cpp
platform/win/FileSystemWin.cpp
+ platform/win/GDIObjectCounter.cpp
platform/win/GDIUtilities.cpp
platform/win/KeyEventWin.cpp
platform/win/LanguageWin.cpp
Modified: trunk/Source/WebKit/win/ChangeLog (188175 => 188176)
--- trunk/Source/WebKit/win/ChangeLog 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1,3 +1,14 @@
+2015-08-07 Alex Christensen <achristen...@webkit.org>
+
+ Build more testing binaries with CMake on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147799
+
+ Reviewed by Brent Fulgham.
+
+ * WebKitDLL.cpp:
+ (loadResourceIntoBuffer):
+ AppleWin doesn't like exporting a function without a separate declaration.
+
2015-08-05 Tim Horton <timothy_hor...@apple.com>
Try to fix the build
Modified: trunk/Source/WebKit/win/WebKitDLL.cpp (188175 => 188176)
--- trunk/Source/WebKit/win/WebKitDLL.cpp 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Source/WebKit/win/WebKitDLL.cpp 2015-08-07 23:42:07 UTC (rev 188176)
@@ -157,7 +157,8 @@
}
//FIXME: We should consider moving this to a new file for cross-project functionality
-WEBKIT_API PassRefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name)
+WEBKIT_API PassRefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name);
+PassRefPtr<WebCore::SharedBuffer> loadResourceIntoBuffer(const char* name)
{
int idr;
// temporary hack to get resource id
Modified: trunk/Tools/ChangeLog (188175 => 188176)
--- trunk/Tools/ChangeLog 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Tools/ChangeLog 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1,3 +1,23 @@
+2015-08-07 Alex Christensen <achristen...@webkit.org>
+
+ Build more testing binaries with CMake on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147799
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/CMakeLists.txt:
+ Build TestNetscapePlugin.
+ * DumpRenderTree/PlatformWin.cmake:
+ Build ImageDiff and add files necessary for TestNetscapePlugin on Windows.
+ * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders: Added.
+ * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit: Added.
+ * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h: Copied from DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h.
+ * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h: Copied from DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h.
+ * DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h: Copied from DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h.
+ * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h: Removed.
+ * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h: Removed.
+ * DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h: Removed.
+
2015-08-07 Jason Marcell <jmarc...@apple.com>
Refactor BuildbotQueue.compareIterations and BuildbotQueue.compareIterationsByRevisions to be more generic
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (188175 => 188176)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-07 23:42:07 UTC (rev 188176)
@@ -70,6 +70,46 @@
${WEBCORE_DIR}/testing/js
)
+set(TestNetscapePlugin_SOURCES
+ TestNetscapePlugin/PluginObject.cpp
+ TestNetscapePlugin/PluginTest.cpp
+ TestNetscapePlugin/TestObject.cpp
+ TestNetscapePlugin/main.cpp
+
+ TestNetscapePlugin/Tests/DocumentOpenInDestroyStream.cpp
+ TestNetscapePlugin/Tests/EvaluateJSAfterRemovingPluginElement.cpp
+ TestNetscapePlugin/Tests/FormValue.cpp
+ TestNetscapePlugin/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp
+ TestNetscapePlugin/Tests/GetURLWithJavaScriptURL.cpp
+ TestNetscapePlugin/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp
+ TestNetscapePlugin/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp
+ TestNetscapePlugin/Tests/LogNPPSetWindow.cpp
+ TestNetscapePlugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
+ TestNetscapePlugin/Tests/NPPNewFails.cpp
+ TestNetscapePlugin/Tests/NPPSetWindowCalledDuringDestruction.cpp
+ TestNetscapePlugin/Tests/NPRuntimeCallsWithNullNPP.cpp
+ TestNetscapePlugin/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp
+ TestNetscapePlugin/Tests/NPRuntimeRemoveProperty.cpp
+ TestNetscapePlugin/Tests/NullNPPGetValuePointer.cpp
+ TestNetscapePlugin/Tests/PassDifferentNPPStruct.cpp
+ TestNetscapePlugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp
+ TestNetscapePlugin/Tests/PluginScriptableObjectOverridesAllProperties.cpp
+ TestNetscapePlugin/Tests/PrivateBrowsing.cpp
+ TestNetscapePlugin/Tests/ToStringAndValueOfObject.cpp
+ TestNetscapePlugin/Tests/URLRedirect.cpp
+)
+
+set(TestNetscapePlugin_LIBRARIES
+ _javascript_Core
+ WTF
+ WebCoreTestSupport
+ WebKit
+)
+
+list(APPEND TestNetscapePlugin_LIBRARIES
+ WebKit
+)
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
@@ -77,3 +117,7 @@
add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
+
+add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
+target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
+set_target_properties(TestNetscapePlugin PROPERTIES FOLDER "Tools")
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (188175 => 188176)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1,5 +1,6 @@
set(DumpRenderTreeLib_SOURCES
${DumpRenderTree_SOURCES}
+
win/AccessibilityControllerWin.cpp
win/AccessibilityUIElementWin.cpp
win/DRTDataObject.cpp
@@ -26,8 +27,46 @@
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
)
+list(APPEND TestNetscapePlugin_SOURCES
+ DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.def
+ DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.rc
+
+ TestNetscapePlugin/Tests/win/CallJSThatDestroysPlugin.cpp
+ TestNetscapePlugin/Tests/win/DrawsGradient.cpp
+ TestNetscapePlugin/Tests/win/DumpWindowRect.cpp
+ TestNetscapePlugin/Tests/win/GetValueNetscapeWindow.cpp
+ TestNetscapePlugin/Tests/win/NPNInvalidateRectInvalidatesWindow.cpp
+ TestNetscapePlugin/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
+ TestNetscapePlugin/Tests/win/WindowRegionIsSetToClipRect.cpp
+ TestNetscapePlugin/Tests/win/WindowlessPaintRectCoordinates.cpp
+
+ TestNetscapePlugin/win/WindowGeometryTest.cpp
+ TestNetscapePlugin/win/WindowedPluginTest.cpp
+)
+
+list(APPEND TestNetscapePlugin_LIBRARIES
+ Msimg32
+ Shlwapi
+)
+
+set(ImageDiff_SOURCES
+ win/ImageDiffWin.cpp
+)
+
+set(ImageDiff_LIBRARIES
+ _javascript_Core
+ WTF
+ WebKit
+)
+
list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
win
+ DumpRenderTree.vcxproj/TestNetscapePlugin
+ TestNetscapePlugin
+ TestNetscapePlugin/ForwardingHeaders
+ TestNetscapePlugin/Tests
+ TestNetscapePlugin/win
+ TestNetscapePlugin/Tests/win
)
list(APPEND DumpRenderTree_LIBRARIES
@@ -49,16 +88,49 @@
list(APPEND DumpRenderTreeLib_SOURCES
cairo/PixelDumpSupportCairo.cpp
)
+ list(APPEND ImageDiff_SOURCES
+ win/ImageDiffCairo.cpp
+ )
+ list(APPEND ImageDiff_LIBRARIES
+ cairo
+ )
+else ()
+ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+ cg
+ )
+ list(APPEND DumpRenderTreeLib_SOURCES
+ cg/PixelDumpSupportCG.cpp
+ )
+ list(APPEND DumpRenderTreeLib_LIBRARIES
+ CFNetwork
+ CoreGraphics
+ )
+ list(APPEND ImageDiff_SOURCES
+ cg/ImageDiffCG.cpp
+ )
+ list(APPEND ImageDiff_LIBRARIES
+ CoreFoundation
+ CoreGraphics
+ )
endif ()
ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
+add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools")
set_target_properties(DumpRenderTreeLib PROPERTIES OUTPUT_NAME "DumpRenderTree")
target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
+add_executable(ImageDiff ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
+target_link_libraries(ImageDiff shlwapi)
+set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
+set_target_properties(ImageDiff PROPERTIES OUTPUT_NAME "ImageDiff")
+add_library(ImageDiffLib SHARED ${ImageDiff_SOURCES})
+set_target_properties(ImageDiffLib PROPERTIES FOLDER "Tools")
+set_target_properties(ImageDiffLib PROPERTIES OUTPUT_NAME "ImageDiff")
+target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
+
add_definitions(-D_UNICODE)
-
Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h (from rev 188169, trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h) (0 => 188176)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h 2015-08-07 23:42:07 UTC (rev 188176)
@@ -0,0 +1 @@
+#include <plugins/npapi.h>
Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h (from rev 188169, trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h) (0 => 188176)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h 2015-08-07 23:42:07 UTC (rev 188176)
@@ -0,0 +1 @@
+#include <plugins/npfunctions.h>
Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h (from rev 188169, trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h) (0 => 188176)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h 2015-08-07 23:42:07 UTC (rev 188176)
@@ -0,0 +1 @@
+#include <plugins/npruntime.h>
Deleted: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h (188175 => 188176)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1 +0,0 @@
-#include <plugins/npapi.h>
Deleted: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h (188175 => 188176)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1 +0,0 @@
-#include <plugins/npfunctions.h>
Deleted: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h (188175 => 188176)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h 2015-08-07 23:39:53 UTC (rev 188175)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h 2015-08-07 23:42:07 UTC (rev 188176)
@@ -1 +0,0 @@
-#include <plugins/npruntime.h>
