Diff
Modified: trunk/Tools/ChangeLog (260340 => 260341)
--- trunk/Tools/ChangeLog 2020-04-19 18:01:18 UTC (rev 260340)
+++ trunk/Tools/ChangeLog 2020-04-19 18:12:40 UTC (rev 260341)
@@ -1,3 +1,25 @@
+2020-04-19 Don Olmstead <[email protected]>
+
+ [CMake] Consolidate TestNetscapePlugin build
+ https://bugs.webkit.org/show_bug.cgi?id=210691
+
+ Reviewed by Fujii Hironori.
+
+ The DumpRenderTree CMakeLists.txt contained a definition of TestNetscapePlugIn
+ which was used for WebKitLegacy ports. The TestNetscapePlugIn directory also had
+ a CMakeLists.txt used by GTK for its port. The definitions in DumpRenderTree's
+ CMake are moved into the TestNetscapePlugIn CMake to provide a common definition
+ for all ports that ENABLE_NETSCAPE_PLUGIN_API.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+ * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
+ * DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake: Added.
+ * DumpRenderTree/TestNetscapePlugIn/PlatformWin.cmake: Added.
+ * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.def: Renamed from Tools/DumpRenderTree/win/TestNetscapePlugin.def.
+ * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.rc: Renamed from Tools/DumpRenderTree/win/TestNetscapePlugin.rc.
+ * DumpRenderTree/TestNetscapePlugIn/win/resource.h: Renamed from Tools/DumpRenderTree/win/resource.h.
+
2020-04-19 Emilio Cobos Álvarez <[email protected]>
Allow to override sccache server port.
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (260340 => 260341)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-04-19 18:01:18 UTC (rev 260340)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-04-19 18:12:40 UTC (rev 260341)
@@ -47,53 +47,6 @@
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
)
-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_PRIVATE_INCLUDE_DIRECTORIES
- ${CMAKE_BINARY_DIR}
- ${DumpRenderTree_DIR}/TestNetscapePlugIn
- ${DumpRenderTree_DIR}/TestNetscapePlugIn/ForwardingHeaders
- ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests
-)
-
-list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
- ${PAL_FRAMEWORK_HEADERS_DIR}
- ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
- ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
-)
-
-set(TestNetscapePlugIn_LIBRARIES
- WebCoreTestSupport
- WebKit::_javascript_Core
-)
-
set(DumpRenderTree_IDL_FILES
"${WebKitTestRunner_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
)
@@ -114,7 +67,5 @@
WEBKIT_EXECUTABLE(DumpRenderTree)
if (ENABLE_NETSCAPE_PLUGIN_API)
- add_library(TestNetscapePlugIn SHARED ${TestNetscapePlugIn_SOURCES})
- target_include_directories(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES})
- target_link_libraries(TestNetscapePlugIn PRIVATE ${TestNetscapePlugIn_LIBRARIES})
+ add_subdirectory(TestNetscapePlugIn)
endif ()
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (260340 => 260341)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-04-19 18:01:18 UTC (rev 260340)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-04-19 18:12:40 UTC (rev 260341)
@@ -23,40 +23,12 @@
win/WorkQueueItemWin.cpp
)
-list(APPEND TestNetscapePlugIn_SOURCES
- win/TestNetscapePlugin.def
- win/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
-)
-
set(wrapper_DEFINITIONS USE_CONSOLE_ENTRY_POINT)
-list(APPEND TestNetscapePlugIn_LIBRARIES
- Msimg32
- Shlwapi
- WebKitLegacy
-)
-
list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
${DumpRenderTree_DIR}/win
)
-list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
- ${DumpRenderTree_DIR}/TestNetscapePlugIn/win
- ${DumpRenderTree_DIR}/TestNetscapePlugIn/Tests/win
-)
-
list(APPEND DumpRenderTree_LIBRARIES
Comsuppw
Oleacc
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (260340 => 260341)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2020-04-19 18:01:18 UTC (rev 260340)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2020-04-19 18:12:40 UTC (rev 260341)
@@ -1,71 +1,54 @@
-set(WEBKIT_TESTNETSCAPEPLUGIN_DIR "${TOOLS_DIR}/DumpRenderTree/TestNetscapePlugIn")
+set(TestNetscapePlugIn_DIR "${TOOLS_DIR}/DumpRenderTree/TestNetscapePlugIn")
+set(TestNetscapePlugIn_LIBRARY_TYPE SHARED)
-set(WebKitTestNetscapePlugIn_SOURCES
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/PluginObject.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/PluginTest.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/TestObject.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/main.cpp
+set(TestNetscapePlugIn_SOURCES
+ PluginObject.cpp
+ PluginTest.cpp
+ TestObject.cpp
+ main.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/DocumentOpenInDestroyStream.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/EvaluateJSAfterRemovingPluginElement.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/FormValue.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/GetURLWithJavaScriptURL.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/LogNPPSetWindow.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/NPPNewFails.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/NPPSetWindowCalledDuringDestruction.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/NPRuntimeCallsWithNullNPP.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/NPRuntimeRemoveProperty.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/NullNPPGetValuePointer.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/PassDifferentNPPStruct.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/PluginScriptableNPObjectInvokeDefault.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/PluginScriptableObjectOverridesAllProperties.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/PrivateBrowsing.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/ToStringAndValueOfObject.cpp
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/URLRedirect.cpp
+ Tests/DocumentOpenInDestroyStream.cpp
+ Tests/EvaluateJSAfterRemovingPluginElement.cpp
+ Tests/FormValue.cpp
+ Tests/GetURLNotifyWithURLThatFailsToLoad.cpp
+ Tests/GetURLWithJavaScriptURL.cpp
+ Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp
+ Tests/GetUserAgentWithNullNPPFromNPPNew.cpp
+ Tests/LogNPPSetWindow.cpp
+ Tests/NPDeallocateCalledBeforeNPShutdown.cpp
+ Tests/NPPNewFails.cpp
+ Tests/NPPSetWindowCalledDuringDestruction.cpp
+ Tests/NPRuntimeCallsWithNullNPP.cpp
+ Tests/NPRuntimeObjectFromDestroyedPlugin.cpp
+ Tests/NPRuntimeRemoveProperty.cpp
+ Tests/NullNPPGetValuePointer.cpp
+ Tests/PassDifferentNPPStruct.cpp
+ Tests/PluginScriptableNPObjectInvokeDefault.cpp
+ Tests/PluginScriptableObjectOverridesAllProperties.cpp
+ Tests/PrivateBrowsing.cpp
+ Tests/ToStringAndValueOfObject.cpp
+ Tests/URLRedirect.cpp
)
-set(WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/ForwardingHeaders
- ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
- ${WTF_DIR}
+set(TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
+ ${TestNetscapePlugIn_DIR}
+ ${TestNetscapePlugIn_DIR}/ForwardingHeaders
+ ${TestNetscapePlugIn_DIR}/Tests
)
-set(WebKitTestNetscapePlugIn_LIBRARIES
+set(TestNetscapePlugIn_LIBRARIES
WebKit::WTF
)
-if (MOZ_X11)
- set(WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES
- ${X11_INCLUDE_DIR}
- )
+# The ForwardingHeaders directory contains np*.h which are copied from WebCore
+# so depend on the WebKit::WebCore target when building
+set(TestNetscapePlugIn_DEPENDENCIES WebKit::WebCore)
+list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR})
- list(APPEND WebKitTestNetscapePlugIn_LIBRARIES
- ${X11_LIBRARIES}
- )
+WEBKIT_FRAMEWORK_DECLARE(TestNetscapePlugIn)
+WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
+WEBKIT_FRAMEWORK(TestNetscapePlugIn)
- add_definitions(-DMOZ_X11)
+if (COMPILER_IS_GCC_OR_CLANG)
+ WEBKIT_ADD_TARGET_CXX_FLAGS(TestNetscapePlugIn -Wno-unused-parameter)
endif ()
-
-if (XP_UNIX)
- list(APPEND WebKitTestNetscapePlugIn_SOURCES
- ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/unix/CallInvalidateRectWithNullNPPArgument.cpp
- )
-
- add_definitions(-DXP_UNIX)
-endif ()
-
-include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES})
-
-add_library(TestNetscapePlugIn SHARED ${WebKitTestNetscapePlugIn_SOURCES})
-target_link_libraries(TestNetscapePlugIn ${WebKitTestNetscapePlugIn_LIBRARIES})
-add_dependencies(TestNetscapePlugIn WebKit::WebCore)
-set_target_properties(TestNetscapePlugIn PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
-
-WEBKIT_ADD_TARGET_CXX_FLAGS(TestNetscapePlugIn -Wno-unused-parameter)
Added: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake (0 => 260341)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformGTK.cmake 2020-04-19 18:12:40 UTC (rev 260341)
@@ -0,0 +1,18 @@
+if (MOZ_X11)
+ list(APPEND TestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES
+ ${X11_INCLUDE_DIR}
+ )
+ list(APPEND TestNetscapePlugIn_LIBRARIES
+ ${X11_LIBRARIES}
+ )
+ list(APPEND TestNetscapePlugIn_DEFINITIONS MOZ_X11)
+endif ()
+
+if (XP_UNIX)
+ list(APPEND TestNetscapePlugIn_SOURCES
+ Tests/unix/CallInvalidateRectWithNullNPPArgument.cpp
+ )
+ list(APPEND TestNetscapePlugIn_DEFINITIONS XP_UNIX)
+endif ()
+
+set_target_properties(TestNetscapePlugIn PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
Added: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformWin.cmake (0 => 260341)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformWin.cmake (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PlatformWin.cmake 2020-04-19 18:12:40 UTC (rev 260341)
@@ -0,0 +1,25 @@
+list(APPEND TestNetscapePlugIn_SOURCES
+ Tests/win/CallJSThatDestroysPlugin.cpp
+ Tests/win/DrawsGradient.cpp
+ Tests/win/DumpWindowRect.cpp
+ Tests/win/GetValueNetscapeWindow.cpp
+ Tests/win/NPNInvalidateRectInvalidatesWindow.cpp
+ Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
+ Tests/win/WindowRegionIsSetToClipRect.cpp
+ Tests/win/WindowlessPaintRectCoordinates.cpp
+
+ win/TestNetscapePlugIn.def
+ win/TestNetscapePlugIn.rc
+ win/WindowGeometryTest.cpp
+ win/WindowedPluginTest.cpp
+)
+
+list(APPEND TestNetscapePlugIn_PRIVATE_INCLUDE_DIRECTORIES
+ ${TestNetscapePlugIn_DIR}/Tests/win
+ ${TestNetscapePlugIn_DIR}/win
+)
+
+list(APPEND TestNetscapePlugIn_LIBRARIES
+ Msimg32
+ Shlwapi
+)
Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.def (from rev 260340, trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def) (0 => 260341)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.def (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.def 2020-04-19 18:12:40 UTC (rev 260341)
@@ -0,0 +1,4 @@
+EXPORTS
+ NP_GetEntryPoints @1
+ NP_Initialize @2
+ NP_Shutdown @3
Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.rc (from rev 260340, trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc) (0 => 260341)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.rc (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugIn.rc 2020-04-19 18:12:40 UTC (rev 260341)
@@ -0,0 +1,102 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "windows.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""windows.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904e4"
+ BEGIN
+ VALUE "CompanyName", "Apple Inc."
+ VALUE "FileDescription", "Simple Netscape plug-in that handles test content for WebKit"
+ VALUE "FileExtents", "testnetscape|png"
+ VALUE "FileOpenName", "test netscape content|PNG image"
+ VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2009"
+ VALUE "MIMEType", "application/x-webkit-test-netscape|image/png"
+ VALUE "OriginalFilename", "npTestNetscapePlugin.dll"
+ VALUE "ProductName", "WebKit Test PlugIn"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Copied: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/resource.h (from rev 260340, trunk/Tools/DumpRenderTree/win/resource.h) (0 => 260341)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/resource.h (rev 0)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/win/resource.h 2020-04-19 18:12:40 UTC (rev 260341)
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by TestNetscapePlugin.rc
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Deleted: trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def (260340 => 260341)
--- trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def 2020-04-19 18:01:18 UTC (rev 260340)
+++ trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def 2020-04-19 18:12:40 UTC (rev 260341)
@@ -1,4 +0,0 @@
-EXPORTS
- NP_GetEntryPoints @1
- NP_Initialize @2
- NP_Shutdown @3
Deleted: trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc (260340 => 260341)
--- trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc 2020-04-19 18:01:18 UTC (rev 260340)
+++ trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc 2020-04-19 18:12:40 UTC (rev 260341)
@@ -1,102 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "windows.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""windows.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904e4"
- BEGIN
- VALUE "CompanyName", "Apple Inc."
- VALUE "FileDescription", "Simple Netscape plug-in that handles test content for WebKit"
- VALUE "FileExtents", "testnetscape|png"
- VALUE "FileOpenName", "test netscape content|PNG image"
- VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2009"
- VALUE "MIMEType", "application/x-webkit-test-netscape|image/png"
- VALUE "OriginalFilename", "npTestNetscapePlugin.dll"
- VALUE "ProductName", "WebKit Test PlugIn"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1252
- END
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
Deleted: trunk/Tools/DumpRenderTree/win/resource.h (260340 => 260341)
--- trunk/Tools/DumpRenderTree/win/resource.h 2020-04-19 18:01:18 UTC (rev 260340)
+++ trunk/Tools/DumpRenderTree/win/resource.h 2020-04-19 18:12:40 UTC (rev 260341)
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by TestNetscapePlugin.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
