Log Message
Clean up Tools *.vcxproj after switching to CMake. * DumpRenderTree/DumpRenderTree.sln: Removed. * DumpRenderTree/DumpRenderTree.vcxproj: Removed. * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin: Removed. * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.def: Removed. * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.rc: Removed. * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/resource.h: Removed. * DumpRenderTree/PlatformWin.cmake: * DumpRenderTree/win/TestNetscapePlugin.def: Copied from DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.def. * DumpRenderTree/win/TestNetscapePlugin.rc: Copied from DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.rc. * DumpRenderTree/win/resource.h: Copied from DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/resource.h. * MiniBrowser/MiniBrowser.vcxproj: Removed. * MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.ico: Removed. * MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.rc: Removed. * MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLib.rc: Removed. * MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLibResource.h: Removed. * MiniBrowser/MiniBrowser.vcxproj/MiniBrowserResource.h: Removed. * MiniBrowser/MiniBrowser.vcxproj/small.ico: Removed. * MiniBrowser/win/CMakeLists.txt: * MiniBrowser/win/MiniBrowser.ico: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.ico. * MiniBrowser/win/MiniBrowser.rc: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.rc. * MiniBrowser/win/MiniBrowserLib.rc: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLib.rc. * MiniBrowser/win/MiniBrowserLibResource.h: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLibResource.h. * MiniBrowser/win/MiniBrowserResource.h: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowserResource.h. * MiniBrowser/win/small.ico: Copied from MiniBrowser/MiniBrowser.vcxproj/small.ico. * WebKitTestRunner/WebKitTestRunner.sln: Removed. * win/DLLLauncher/DLLLauncherWinCairo.props: Removed.
Modified Paths
- trunk/Tools/ChangeLog
- trunk/Tools/DumpRenderTree/PlatformWin.cmake
- trunk/Tools/MiniBrowser/win/CMakeLists.txt
Added Paths
- trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def
- trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc
- trunk/Tools/DumpRenderTree/win/resource.h
- trunk/Tools/MiniBrowser/win/MiniBrowser.ico
- trunk/Tools/MiniBrowser/win/MiniBrowser.rc
- trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc
- trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h
- trunk/Tools/MiniBrowser/win/MiniBrowserResource.h
- trunk/Tools/MiniBrowser/win/small.ico
Removed Paths
- trunk/Tools/DumpRenderTree/DumpRenderTree.sln
- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/
- trunk/Tools/MiniBrowser/MiniBrowser.vcxproj/
- trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln
- trunk/Tools/win/DLLLauncher/DLLLauncherWinCairo.props
Diff
Modified: trunk/Tools/ChangeLog (201913 => 201914)
--- trunk/Tools/ChangeLog 2016-06-10 06:06:08 UTC (rev 201913)
+++ trunk/Tools/ChangeLog 2016-06-10 06:11:26 UTC (rev 201914)
@@ -1,3 +1,34 @@
+2016-06-09 Alex Christensen <[email protected]>
+
+ Clean up Tools *.vcxproj after switching to CMake.
+
+ * DumpRenderTree/DumpRenderTree.sln: Removed.
+ * DumpRenderTree/DumpRenderTree.vcxproj: Removed.
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin: Removed.
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.def: Removed.
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.rc: Removed.
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/resource.h: Removed.
+ * DumpRenderTree/PlatformWin.cmake:
+ * DumpRenderTree/win/TestNetscapePlugin.def: Copied from DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.def.
+ * DumpRenderTree/win/TestNetscapePlugin.rc: Copied from DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.rc.
+ * DumpRenderTree/win/resource.h: Copied from DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/resource.h.
+ * MiniBrowser/MiniBrowser.vcxproj: Removed.
+ * MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.ico: Removed.
+ * MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.rc: Removed.
+ * MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLib.rc: Removed.
+ * MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLibResource.h: Removed.
+ * MiniBrowser/MiniBrowser.vcxproj/MiniBrowserResource.h: Removed.
+ * MiniBrowser/MiniBrowser.vcxproj/small.ico: Removed.
+ * MiniBrowser/win/CMakeLists.txt:
+ * MiniBrowser/win/MiniBrowser.ico: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.ico.
+ * MiniBrowser/win/MiniBrowser.rc: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.rc.
+ * MiniBrowser/win/MiniBrowserLib.rc: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLib.rc.
+ * MiniBrowser/win/MiniBrowserLibResource.h: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLibResource.h.
+ * MiniBrowser/win/MiniBrowserResource.h: Copied from MiniBrowser/MiniBrowser.vcxproj/MiniBrowserResource.h.
+ * MiniBrowser/win/small.ico: Copied from MiniBrowser/MiniBrowser.vcxproj/small.ico.
+ * WebKitTestRunner/WebKitTestRunner.sln: Removed.
+ * win/DLLLauncher/DLLLauncherWinCairo.props: Removed.
+
2016-06-09 Zalan Bujtas <[email protected]>
Add testing support for 3x device scale factor.
Deleted: trunk/Tools/DumpRenderTree/DumpRenderTree.sln (201913 => 201914)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.sln 2016-06-10 06:06:08 UTC (rev 201913)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.sln 2016-06-10 06:11:26 UTC (rev 201914)
@@ -1,100 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTree", "win\DumpRenderTree.vcproj", "{6567DFD4-D6DE-4CD5-825D-17E353D160E1}"
- ProjectSection(ProjectDependencies) = postProject
- {C0737398-3565-439E-A2B8-AB2BE4D5430C} = {C0737398-3565-439E-A2B8-AB2BE4D5430C}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestNetscapePlugin", "TestNetscapePlugin\win\TestNetscapePlugin.vcproj", "{C0737398-3565-439E-A2B8-AB2BE4D5430C}"
- ProjectSection(ProjectDependencies) = postProject
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiff", "win\ImageDiff.vcproj", "{59CC0547-70AC-499C-9B19-EC01C6F61137}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DumpRenderTreeLauncher", "win\DumpRenderTreeLauncher.vcproj", "{2974EA02-840B-4995-8719-8920A61006F1}"
- ProjectSection(ProjectDependencies) = postProject
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1} = {6567DFD4-D6DE-4CD5-825D-17E353D160E1}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiffLauncher", "win\ImageDiffLauncher.vcproj", "{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}"
- ProjectSection(ProjectDependencies) = postProject
- {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug_All|Win32 = Debug_All|Win32
- Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32
- Debug|Win32 = Debug|Win32
- Production|Win32 = Production|Win32
- Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.ActiveCfg = Debug|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.Build.0 = Debug|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.ActiveCfg = Production|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.Build.0 = Production|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.ActiveCfg = Release|Win32
- {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.Build.0 = Release|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.ActiveCfg = Debug|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.ActiveCfg = Production|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.Build.0 = Production|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.ActiveCfg = Debug|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.ActiveCfg = Production|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.Build.0 = Production|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Debug|Win32.ActiveCfg = Debug|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Debug|Win32.Build.0 = Debug|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Production|Win32.ActiveCfg = Production|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Production|Win32.Build.0 = Production|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.ActiveCfg = Release|Win32
- {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.Build.0 = Release|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_Cairo_CFLite|Win32.ActiveCfg = Debug_Cairo_CFLite|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_Cairo_CFLite|Win32.Build.0 = Debug_Cairo_CFLite|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.ActiveCfg = Debug|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.Build.0 = Debug|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.ActiveCfg = Production|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.Build.0 = Production|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.ActiveCfg = Release|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (201913 => 201914)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-06-10 06:06:08 UTC (rev 201913)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-06-10 06:11:26 UTC (rev 201914)
@@ -32,8 +32,8 @@
)
list(APPEND TestNetscapePlugin_SOURCES
- DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.def
- DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.rc
+ win/TestNetscapePlugin.def
+ win/TestNetscapePlugin.rc
TestNetscapePlugin/Tests/win/CallJSThatDestroysPlugin.cpp
TestNetscapePlugin/Tests/win/DrawsGradient.cpp
@@ -70,7 +70,6 @@
list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
win
- DumpRenderTree.vcxproj/TestNetscapePlugin
TestNetscapePlugin
TestNetscapePlugin/ForwardingHeaders
TestNetscapePlugin/Tests
Copied: trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def (from rev 201902, trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.def) (0 => 201914)
--- trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def (rev 0)
+++ trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.def 2016-06-10 06:11:26 UTC (rev 201914)
@@ -0,0 +1,4 @@
+EXPORTS
+ NP_GetEntryPoints @1
+ NP_Initialize @2
+ NP_Shutdown @3
Copied: trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc (from rev 201902, trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.rc) (0 => 201914)
--- trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc (rev 0)
+++ trunk/Tools/DumpRenderTree/win/TestNetscapePlugin.rc 2016-06-10 06:11:26 UTC (rev 201914)
@@ -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/win/resource.h (from rev 201902, trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/resource.h) (0 => 201914)
--- trunk/Tools/DumpRenderTree/win/resource.h (rev 0)
+++ trunk/Tools/DumpRenderTree/win/resource.h 2016-06-10 06:11:26 UTC (rev 201914)
@@ -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
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (201913 => 201914)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-06-10 06:06:08 UTC (rev 201913)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-06-10 06:11:26 UTC (rev 201914)
@@ -1,5 +1,4 @@
set(MiniBrowser_INCLUDE_DIRECTORIES
- ../MiniBrowser.vcxproj
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit"
"${WTF_DIR}"
@@ -15,11 +14,10 @@
ResourceLoadDelegate.cpp
WebDownloadDelegate.cpp
MiniBrowser.cpp
+ MiniBrowserLib.rc
MiniBrowserWebHost.cpp
WinMain.cpp
stdafx.cpp
-
- ../MiniBrowser.vcxproj/MiniBrowserLib.rc
)
set(MiniBrowser_LIBRARIES
@@ -54,7 +52,7 @@
add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
-add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp ../MiniBrowser.vcxproj/MiniBrowser.rc)
+add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc)
target_link_libraries(MiniBrowser shlwapi)
set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
Copied: trunk/Tools/MiniBrowser/win/MiniBrowser.ico (from rev 201902, trunk/Tools/MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.ico)
(Binary files differ)
Copied: trunk/Tools/MiniBrowser/win/MiniBrowser.rc (from rev 201902, trunk/Tools/MiniBrowser/MiniBrowser.vcxproj/MiniBrowser.rc) (0 => 201914)
--- trunk/Tools/MiniBrowser/win/MiniBrowser.rc (rev 0)
+++ trunk/Tools/MiniBrowser/win/MiniBrowser.rc 2016-06-10 06:11:26 UTC (rev 201914)
@@ -0,0 +1,76 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "MiniBrowserResource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#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
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_MINIBROWSER ICON "MiniBrowser.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "MiniBrowserResource.\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "#include ""windows.h""\r\n"
+ "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Copied: trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc (from rev 201902, trunk/Tools/MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLib.rc) (0 => 201914)
--- trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc (rev 0)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc 2016-06-10 06:11:26 UTC (rev 201914)
@@ -0,0 +1,328 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "MiniBrowserLibResource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_MINIBROWSER ICON "MiniBrowser.ico"
+IDI_SMALL ICON "small.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDC_MINIBROWSER MENU
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&Print\tCtrl-P", IDM_PRINT
+ MENUITEM "E&xit", IDM_EXIT
+ END
+ POPUP "&View"
+ BEGIN
+ MENUITEM "Actual Size", IDM_ACTUAL_SIZE
+ MENUITEM "Zoom In\tCtrl++", IDM_ZOOM_IN
+ MENUITEM "Zoom Out\tCtrl+-", IDM_ZOOM_OUT
+ MENUITEM "Invert Colors", IDM_INVERT_COLORS
+ END
+ POPUP "&History"
+ BEGIN
+ MENUITEM "Back", IDM_HISTORY_BACKWARD
+ MENUITEM "Forward", IDM_HISTORY_FORWARD
+ MENUITEM SEPARATOR
+ MENUITEM "Unused History 0", IDM_HISTORY_LINK0
+ MENUITEM "Unused History 1", IDM_HISTORY_LINK1
+ MENUITEM "Unused History 2", IDM_HISTORY_LINK2
+ MENUITEM "Unused History 3", IDM_HISTORY_LINK3
+ MENUITEM "Unused History 4", IDM_HISTORY_LINK4
+ MENUITEM "Unused History 5", IDM_HISTORY_LINK5
+ MENUITEM "Unused History 6", IDM_HISTORY_LINK6
+ MENUITEM "Unused History 7", IDM_HISTORY_LINK7
+ MENUITEM "Unused History 8", IDM_HISTORY_LINK8
+ MENUITEM "Unused History 9", IDM_HISTORY_LINK9
+ END
+ POPUP "D&evelop"
+ BEGIN
+ MENUITEM "Show Web Inspector", IDM_WEB_INSPECTOR
+ POPUP "User Agent"
+ BEGIN
+ MENUITEM "Default (Automatically Chosen)", IDM_UA_DEFAULT
+ MENUITEM SEPARATOR
+ MENUITEM "Safari 8.0", IDM_UA_SAFARI_8_0
+ MENUITEM SEPARATOR
+ MENUITEM "Safari iOS 8 - iPhone", IDM_UA_SAFARI_IOS_8_IPHONE
+ MENUITEM "Safari iOS 8 - iPad", IDM_UA_SAFARI_IOS_8_IPAD
+ MENUITEM SEPARATOR
+ MENUITEM "Internet Explorer 11.0", IDM_UA_IE_11
+ MENUITEM SEPARATOR
+ MENUITEM "Google Chrome - Mac", IDM_UA_CHROME_MAC
+ MENUITEM "Google Chrome - Windows", IDM_UA_CHROME_WIN
+ MENUITEM SEPARATOR
+ MENUITEM "Firefox - Mac", IDM_UA_FIREFOX_MAC
+ MENUITEM "Firefox - Windows", IDM_UA_FIREFOX_WIN
+ MENUITEM SEPARATOR
+ MENUITEM "Other", IDM_UA_OTHER
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Disable Images", IDM_DISABLE_IMAGES
+ MENUITEM "Disable Styles", IDM_DISABLE_STYLES
+ MENUITEM "Disable _javascript_", IDM_DISABLE_JAVASCRIPT
+ MENUITEM "Disable Local File Restrictions", IDM_DISABLE_LOCAL_FILE_RESTRICTIONS
+ END
+ POPUP "&Help"
+ BEGIN
+ MENUITEM "&About ...", IDM_ABOUT
+ END
+ POPUP "&Debug"
+ BEGIN
+ MENUITEM "Use AVFoundation", IDM_AVFOUNDATION, CHECKED
+ MENUITEM "Use Accelerated Compositing", IDM_ACC_COMPOSITING, CHECKED
+ MENUITEM "Enable WebKit Full Screen", IDM_WK_FULLSCREEN, CHECKED
+ MENUITEM SEPARATOR
+ MENUITEM "Show Compositing Borders", IDM_COMPOSITING_BORDERS
+ MENUITEM "Show Tiled Drawing indicator", IDM_DEBUG_INFO_LAYER
+ MENUITEM SEPARATOR
+ MENUITEM "Show Caches Window", IDM_CACHES
+ MENUITEM "Show Layer Tree", IDM_SHOW_LAYER_TREE
+ END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDC_MINIBROWSER ACCELERATORS
+BEGIN
+ "/", IDM_ABOUT, ASCII, ALT, NOINVERT
+ "?", IDM_ABOUT, ASCII, ALT, NOINVERT
+ VK_ADD, IDM_ZOOM_IN, VIRTKEY, CONTROL, NOINVERT
+ VK_SUBTRACT, IDM_ZOOM_OUT, VIRTKEY, CONTROL, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUTBOX DIALOGEX 22, 17, 230, 75
+STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "System", 0, 0, 0x0
+BEGIN
+ ICON IDI_MINIBROWSER,IDC_MYICON,14,9,20,20
+ LTEXT "MiniBrowser Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+ LTEXT "Copyright (C) 2015",IDC_STATIC,49,20,119,8
+ DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP
+END
+
+IDD_CACHES DIALOGEX 0, 0, 401, 456
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,287,435,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,344,435,50,14
+ GROUPBOX "FastMalloc",IDC_STATIC,208,14,186,67
+ GROUPBOX "WebCore Cache",IDC_STATIC,17,83,376,105
+ GROUPBOX "_javascript_ Heap",IDC_STATIC,18,193,376,168
+ GROUPBOX "Site Icon Database",IDC_STATIC,18,366,142,65
+ GROUPBOX "Font and Glyph Caches",IDC_STATIC,168,366,226,66
+ GROUPBOX "CFURLCache",IDC_STATIC,7,14,197,67
+ PUSHBUTTON "Empty URLCache",IDC_EMPTY_URL_CACHE,131,63,69,14,WS_DISABLED
+ PUSHBUTTON "Return Free Memory",IDC_RETURN_FREE_MEMORY,308,63,76,14,WS_DISABLED
+ PUSHBUTTON "Empty WebCore Cache",IDC_EMPTY_WEBCORE_CACHE,21,170,83,14,WS_DISABLED
+ CONTROL "Disable WebCore Cache",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,119,172,93,10
+ PUSHBUTTON "Garbage Collect _javascript_ Objects",IDC_GC_JSC,253,343,135,14,WS_DISABLED
+ RTEXT "Reserved VM",IDC_STATIC,212,26,67,9
+ RTEXT "0",IDC_RESERVED_VM,290,26,94,8
+ RTEXT "Committed VM",IDC_STATIC,211,39,67,8
+ RTEXT "0",IDC_COMMITTED_VM,290,39,94,8
+ RTEXT "Free List Bytes",IDC_STATIC,211,52,67,8
+ RTEXT "0",IDC_FREE_LIST_BYTES,290,52,94,8
+ RTEXT "Images",IDC_STATIC,37,106,24,8
+ RTEXT "CSS",IDC_STATIC,47,116,14,8
+ RTEXT "XSL",IDC_STATIC,49,126,12,8
+ RTEXT "_javascript_",IDC_STATIC,27,135,34,8
+ RTEXT "Total",IDC_STATIC,43,146,17,8
+ LTEXT "Objects",IDC_STATIC,111,96,26,8
+ LTEXT "Bytes",IDC_STATIC,175,96,19,8
+ LTEXT "Live",IDC_STATIC,232,96,14,8
+ LTEXT "Decoded",IDC_STATIC,284,96,29,8
+ LTEXT "Purgeable",IDC_STATIC,351,96,33,8
+ RTEXT "0",IDC_IMAGES_OBJECT_COUNT,100,106,32,8
+ RTEXT "0",IDC_CSS_OBJECT_COUNT,100,116,32,8
+ RTEXT "0",IDC_XSL_OBJECT_COUNT,100,126,32,8
+ RTEXT "0",IDC_JSC_OBJECT_COUNT,100,135,32,8
+ RTEXT "0",IDC_TOTAL_OBJECT_COUNT,100,146,32,8
+ RTEXT "0",IDC_IMAGES_BYTES,162,106,32,8
+ RTEXT "0",IDC_CSS_BYTES,162,116,32,8
+ RTEXT "0",IDC_XSL_BYTES,162,126,32,8
+ RTEXT "0",IDC_JSC_BYTES,162,135,32,8
+ RTEXT "0",IDC_TOTAL_BYTES,162,146,32,8
+ RTEXT "0",IDC_IMAGES_LIVE_COUNT,221,106,32,8
+ RTEXT "0",IDC_CSS_LIVE_COUNT,221,116,32,8
+ RTEXT "0",IDC_XSL_LIVE_COUNT,221,126,32,8
+ RTEXT "0",IDC_JSC_LIVE_COUNT,221,135,32,8
+ RTEXT "0",IDC_TOTAL_LIVE_COUNT,221,146,32,8
+ RTEXT "0",IDC_IMAGES_DECODED_COUNT,284,106,32,8
+ RTEXT "0",IDC_CSS_DECODED_COUNT,284,116,32,8
+ RTEXT "0",IDC_XSL_DECODED_COUNT,284,126,32,8
+ RTEXT "0",IDC_JSC_DECODED_COUNT,284,135,32,8
+ RTEXT "0",IDC_TOTAL_DECODED,284,146,32,8
+ RTEXT "0",IDC_IMAGES_PURGEABLE_COUNT,354,106,32,8
+ RTEXT "0",IDC_CSS_PURGEABLE_COUNT,354,116,32,8
+ RTEXT "0",IDC_XSL_PURGEABLE_COUNT,354,126,32,8
+ RTEXT "0",IDC_JSC_PURGEABLE_COUNT,354,135,32,8
+ RTEXT "0",IDC_TOTAL_PURGEABLE,354,146,32,8
+ RTEXT "Total Objects",IDC_STATIC,63,207,44,8
+ RTEXT "Global Objects",IDC_STATIC,56,217,51,8
+ RTEXT "Protected Objects",IDC_STATIC,48,227,59,8
+ RTEXT "0",IDC_TOTAL_JSC_HEAP_OBJECTS,127,207,56,8
+ RTEXT "0",IDC_GLOBAL_JSC_HEAP_OBJECTS,127,217,56,8
+ RTEXT "0",IDC_PROTECTED_JSC_HEAP_OBJECTS,127,227,56,8
+ RTEXT "Size",IDC_STATIC56,223,207,14,8
+ RTEXT "Free",IDC_STATIC57,222,217,16,8
+ RTEXT "0",IDC_JSC_HEAP_SIZE,270,207,56,8
+ RTEXT "0",IDC_JSC_HEAP_FREE,270,217,56,8
+ PUSHBUTTON "Purge Inactive Font Data",IDC_BUTTON5,293,415,95,14,WS_DISABLED
+ LTEXT "Total Font Data Objects",IDC_STATIC,208,379,78,8
+ LTEXT "Inactive Font Data Objects",IDC_STATIC,198,390,88,8
+ LTEXT "Glyph Pages",IDC_STATIC,246,402,40,8
+ RTEXT "0",IDC_TOTAL_FONT_OBJECTS,329,379,56,8
+ RTEXT "0",IDC_INACTIVE_FONT_OBJECTS,329,390,56,8
+ RTEXT "0",IDC_GLYPH_PAGES,329,402,56,8
+ LTEXT "Page URL Mappings",IDC_STATIC,33,380,64,8
+ LTEXT "Retained Page URLs",IDC_STATIC,31,390,66,8
+ LTEXT "Site Icon Records",IDC_STATIC,40,400,57,8
+ LTEXT "Site Icons with Data",IDC_STATIC,32,410,65,8
+ RTEXT "0",IDC_PAGE_URL_MAPPINGS,101,380,52,8
+ RTEXT "0",IDC_RETAINED_PAGE_URLS,101,390,52,8
+ RTEXT "0",IDC_SITE_ICON_RECORDS,101,400,52,8
+ RTEXT "0",IDC_SITE_ICONS_WITH_DATA,101,410,52,8
+END
+
+IDD_USER_AGENT DIALOGEX 0, 0, 309, 176
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ LTEXT "Type a custom user agent string for this page.",IDC_Message,7,7,295,19
+ EDITTEXT IDC_USER_AGENT_INPUT,7,34,295,117,ES_AUTOHSCROLL
+ DEFPUSHBUTTON "OK",IDOK,198,155,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,252,155,50,14
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "MiniBrowserLibResource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "#include ""windows.h""\r\n"
+ "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_ABOUTBOX, DIALOG
+ BEGIN
+ END
+
+ IDD_CACHES, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 394
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 449
+ END
+
+ IDD_USER_AGENT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 302
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 169
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+ IDS_APP_TITLE "MiniBrowser"
+ IDC_MINIBROWSER "MINIBROWSER"
+END
+
+#endif // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Copied: trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h (from rev 201902, trunk/Tools/MiniBrowser/MiniBrowser.vcxproj/MiniBrowserLibResource.h) (0 => 201914)
--- trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h (rev 0)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h 2016-06-10 06:11:26 UTC (rev 201914)
@@ -0,0 +1,121 @@
+// {{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by MiniBrowserLib.rc
+//
+#define IDC_MYICON 2
+#define IDD_MINIBROWSER_DIALOG 102
+#define IDS_APP_TITLE 103
+#define IDD_ABOUTBOX 103
+#define IDM_ABOUT 104
+#define IDM_EXIT 105
+#define IDM_PRINT 106
+#define IDI_MINIBROWSER 107
+#define IDI_SMALL 108
+#define IDC_MINIBROWSER 109
+#define IDM_AVFOUNDATION 110
+#define IDM_ACC_COMPOSITING 111
+#define IDM_WK_FULLSCREEN 112
+#define IDM_COMPOSITING_BORDERS 113
+#define IDM_CACHES 114
+#define IDM_WEB_INSPECTOR 120
+#define IDM_DISABLE_IMAGES 121
+#define IDM_DISABLE_STYLES 122
+#define IDM_DISABLE_JAVASCRIPT 123
+#define IDM_DISABLE_LOCAL_FILE_RESTRICTIONS 124
+#define IDM_INVERT_COLORS 125
+#define IDR_MAINFRAME 128
+#define IDD_CACHES 129
+#define IDM_HISTORY_BACKWARD 130
+#define IDD_USER_AGENT 130
+#define IDM_HISTORY_FORWARD 131
+#define IDM_HISTORY_LINK0 150
+#define IDM_HISTORY_LINK1 151
+#define IDM_HISTORY_LINK2 152
+#define IDM_HISTORY_LINK3 153
+#define IDM_HISTORY_LINK4 154
+#define IDM_HISTORY_LINK5 155
+#define IDM_HISTORY_LINK6 156
+#define IDM_HISTORY_LINK7 157
+#define IDM_HISTORY_LINK8 158
+#define IDM_HISTORY_LINK9 159
+#define IDT_UPDATE_STATS 160
+#define IDM_UA_DEFAULT 161
+#define IDM_UA_SAFARI_8_0 162
+#define IDM_UA_SAFARI_IOS_8_IPHONE 163
+#define IDM_UA_SAFARI_IOS_8_IPAD 164
+#define IDM_UA_IE_11 165
+#define IDM_UA_CHROME_MAC 166
+#define IDM_UA_CHROME_WIN 167
+#define IDM_UA_FIREFOX_MAC 168
+#define IDM_UA_FIREFOX_WIN 169
+#define IDM_UA_OTHER 170
+#define IDM_ACTUAL_SIZE 171
+#define IDM_ZOOM_IN 172
+#define IDM_ZOOM_OUT 173
+#define IDM_SHOW_LAYER_TREE 174
+#define IDM_DEBUG_INFO_LAYER 175
+#define IDC_EMPTY_URL_CACHE 1000
+#define IDC_RETURN_FREE_MEMORY 1001
+#define IDC_EMPTY_WEBCORE_CACHE 1002
+#define IDC_CHECK1 1003
+#define IDC_HEAP_OBJECTS 1005
+#define IDC_GC_JSC 1006
+#define IDC_RESERVED_VM 1007
+#define IDC_COMMITTED_VM 1008
+#define IDC_FREE_LIST_BYTES 1009
+#define IDC_IMAGES_OBJECT_COUNT 1011
+#define IDC_CSS_OBJECT_COUNT 1012
+#define IDC_XSL_OBJECT_COUNT 1013
+#define IDC_JSC_OBJECT_COUNT 1014
+#define IDC_TOTAL_OBJECT_COUNT 1015
+#define IDC_IMAGES_BYTES 1016
+#define IDC_CSS_BYTES 1017
+#define IDC_XSL_BYTES 1018
+#define IDC_JSC_BYTES 1019
+#define IDC_TOTAL_BYTES 1020
+#define IDC_IMAGES_LIVE_COUNT 1021
+#define IDC_CSS_LIVE_COUNT 1022
+#define IDC_XSL_LIVE_COUNT 1023
+#define IDC_JSC_LIVE_COUNT 1024
+#define IDC_TOTAL_LIVE_COUNT 1025
+#define IDC_IMAGES_DECODED_COUNT 1026
+#define IDC_CSS_DECODED_COUNT 1027
+#define IDC_XSL_DECODED_COUNT 1028
+#define IDC_JSC_DECODED_COUNT 1029
+#define IDC_TOTAL_DECODED 1030
+#define IDC_IMAGES_PURGEABLE_COUNT 1031
+#define IDC_CSS_PURGEABLE_COUNT 1032
+#define IDC_XSL_PURGEABLE_COUNT 1033
+#define IDC_JSC_PURGEABLE_COUNT 1034
+#define IDC_TOTAL_PURGEABLE 1035
+#define IDC_TOTAL_JSC_HEAP_OBJECTS 1036
+#define IDC_GLOBAL_JSC_HEAP_OBJECTS 1037
+#define IDC_PROTECTED_JSC_HEAP_OBJECTS 1038
+#define IDC_STATIC56 1039
+#define IDC_STATIC57 1040
+#define IDC_JSC_HEAP_SIZE 1041
+#define IDC_JSC_HEAP_FREE 1042
+#define IDC_BUTTON5 1043
+#define IDC_TOTAL_FONT_OBJECTS 1044
+#define IDC_Message 1044
+#define IDC_INACTIVE_FONT_OBJECTS 1045
+#define IDC_GLYPH_PAGES 1046
+#define IDC_PAGE_URL_MAPPINGS 1047
+#define IDC_RETAINED_PAGE_URLS 1048
+#define IDC_SITE_ICON_RECORDS 1049
+#define IDC_TOTAL_FONT_OBJECTS5 1050
+#define IDC_SITE_ICONS_WITH_DATA 1051
+#define IDC_USER_AGENT_INPUT 1052
+#define IDC_STATIC -1
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC 1
+#define _APS_NEXT_RESOURCE_VALUE 174
+#define _APS_NEXT_COMMAND_VALUE 32776
+#define _APS_NEXT_CONTROL_VALUE 1053
+#define _APS_NEXT_SYMED_VALUE 110
+#endif
+#endif
Copied: trunk/Tools/MiniBrowser/win/MiniBrowserResource.h (from rev 201902, trunk/Tools/MiniBrowser/MiniBrowser.vcxproj/MiniBrowserResource.h) (0 => 201914)
--- trunk/Tools/MiniBrowser/win/MiniBrowserResource.h (rev 0)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserResource.h 2016-06-10 06:11:26 UTC (rev 201914)
@@ -0,0 +1,20 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by MiniBrowserLauncher.rc
+//
+#define IDD_MINIBROWSER_DIALOG 102
+#define IDI_MINIBROWSER 107
+#define IDR_MAINFRAME 128
+#define IDC_STATIC -1
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC 1
+#define _APS_NEXT_RESOURCE_VALUE 129
+#define _APS_NEXT_COMMAND_VALUE 32771
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 110
+#endif
+#endif
Copied: trunk/Tools/MiniBrowser/win/small.ico (from rev 201902, trunk/Tools/MiniBrowser/MiniBrowser.vcxproj/small.ico)
(Binary files differ)
Deleted: trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln (201913 => 201914)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln 2016-06-10 06:06:08 UTC (rev 201913)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.sln 2016-06-10 06:11:26 UTC (rev 201914)
@@ -1,104 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunner", "win\WebKitTestRunner.vcproj", "{3B99669B-1817-443B-BCBE-835580146668}"
- ProjectSection(ProjectDependencies) = postProject
- {CBC3391C-F060-4BF5-A66E-81404168816B} = {CBC3391C-F060-4BF5-A66E-81404168816B}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundleGenerated", "win\InjectedBundleGenerated.vcproj", "{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}"
- ProjectSection(ProjectDependencies) = postProject
- {C0737398-3565-439E-A2B8-AB2BE4D5430C} = {C0737398-3565-439E-A2B8-AB2BE4D5430C}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiff", "..\DumpRenderTree\win\ImageDiff.vcproj", "{59CC0547-70AC-499C-9B19-EC01C6F61137}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectedBundle", "win\InjectedBundle.vcproj", "{CBC3391C-F060-4BF5-A66E-81404168816B}"
- ProjectSection(ProjectDependencies) = postProject
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD} = {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestNetscapePlugin", "..\DumpRenderTree\TestNetscapePlugIn\win\TestNetscapePlugin.vcproj", "{C0737398-3565-439E-A2B8-AB2BE4D5430C}"
- ProjectSection(ProjectDependencies) = postProject
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017} = {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitTestRunnerLauncher", "win\WebKitTestRunnerLauncher.vcproj", "{C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}"
- ProjectSection(ProjectDependencies) = postProject
- {3B99669B-1817-443B-BCBE-835580146668} = {3B99669B-1817-443B-BCBE-835580146668}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageDiffLauncher", "..\DumpRenderTree\win\ImageDiffLauncher.vcproj", "{DD7949B6-F2B4-47C2-9C42-E21E84CB1017}"
- ProjectSection(ProjectDependencies) = postProject
- {59CC0547-70AC-499C-9B19-EC01C6F61137} = {59CC0547-70AC-499C-9B19-EC01C6F61137}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug_All|Win32 = Debug_All|Win32
- Debug|Win32 = Debug|Win32
- Production|Win32 = Production|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.ActiveCfg = Debug|Win32
- {3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.Build.0 = Debug|Win32
- {3B99669B-1817-443B-BCBE-835580146668}.Production|Win32.ActiveCfg = Production|Win32
- {3B99669B-1817-443B-BCBE-835580146668}.Production|Win32.Build.0 = Production|Win32
- {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.ActiveCfg = Release|Win32
- {3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.Build.0 = Release|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.ActiveCfg = Debug|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.Build.0 = Debug|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Production|Win32.ActiveCfg = Production|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Production|Win32.Build.0 = Production|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = Release|Win32
- {4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = Release|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.ActiveCfg = Debug|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.ActiveCfg = Production|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.Build.0 = Production|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32
- {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.ActiveCfg = Debug|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.Build.0 = Debug|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Production|Win32.ActiveCfg = Production|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Production|Win32.Build.0 = Production|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.ActiveCfg = Release|Win32
- {CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.Build.0 = Release|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.ActiveCfg = Debug|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.ActiveCfg = Production|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.Build.0 = Production|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32
- {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.ActiveCfg = Debug|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Debug|Win32.Build.0 = Debug|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.ActiveCfg = Production|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Production|Win32.Build.0 = Production|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.ActiveCfg = Release|Win32
- {C13FA6EF-B531-4BAD-9A23-18E2BEB8B040}.Release|Win32.Build.0 = Release|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_All|Win32.Build.0 = Debug_All|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.ActiveCfg = Debug|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.Build.0 = Debug|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.ActiveCfg = Production|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.Build.0 = Production|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.ActiveCfg = Release|Win32
- {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
Deleted: trunk/Tools/win/DLLLauncher/DLLLauncherWinCairo.props (201913 => 201914)
--- trunk/Tools/win/DLLLauncher/DLLLauncherWinCairo.props 2016-06-10 06:06:08 UTC (rev 201913)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherWinCairo.props 2016-06-10 06:11:26 UTC (rev 201914)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ImportGroup Label="PropertySheets" />
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup />
- <ItemDefinitionGroup>
- <ClCompile>
- <PreprocessorDefinitions>WIN_CAIRO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemDefinitionGroup>
- <ItemGroup />
-</Project>
\ No newline at end of file
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
