diff options
Diffstat (limited to 'Source/WebKit2/win')
-rwxr-xr-x | Source/WebKit2/win/WebKit2.vcproj | 134 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2Apple.vsprops | 2 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2Generated.make | 4 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2Production.vsprops | 2 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2Release.vsprops | 1 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2ReleaseCairoCFLite.vsprops | 1 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2WebProcessProduction.vsprops | 2 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2WebProcessRelease.vsprops | 1 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKit2WebProcessReleaseCairoCFLite.vsprops | 1 | ||||
-rw-r--r-- | Source/WebKit2/win/WebKitPreBuild.cmd | 5 |
10 files changed, 137 insertions, 16 deletions
diff --git a/Source/WebKit2/win/WebKit2.vcproj b/Source/WebKit2/win/WebKit2.vcproj index 5e4ffa8..cf8ee60 100755 --- a/Source/WebKit2/win/WebKit2.vcproj +++ b/Source/WebKit2/win/WebKit2.vcproj @@ -431,6 +431,10 @@ > </File> <File + RelativePath="..\Shared\EditorState.h" + > + </File> + <File RelativePath="..\Shared\FontInfo.cpp" > </File> @@ -483,6 +487,10 @@ > </File> <File + RelativePath="..\Shared\NativeWebMouseEvent.h" + > + </File> + <File RelativePath="..\Shared\OriginAndDatabases.cpp" > </File> @@ -523,10 +531,6 @@ > </File> <File - RelativePath="..\Shared\SelectionState.h" - > - </File> - <File RelativePath="..\Shared\SessionState.cpp" > </File> @@ -1145,10 +1149,6 @@ RelativePath="..\Shared\CoreIPCSupport\WebPageProxyMessageKinds.h" > </File> - <File - RelativePath="..\Shared\CoreIPCSupport\WebProcessProxyMessageKinds.h" - > - </File> </Filter> <Filter Name="cf" @@ -1194,6 +1194,64 @@ > </File> <File + RelativePath="..\Shared\win\NativeWebMouseEventWin.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_Cairo_CFLite|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release_Cairo_CFLite|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_All|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Production|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File RelativePath="..\Shared\win\PlatformCertificateInfo.cpp" > </File> @@ -1905,6 +1963,10 @@ > </File> <File + RelativePath="..\WebProcess\WebPage\win\LayerTreeHostWin.cpp" + > + </File> + <File RelativePath="..\WebProcess\WebPage\win\WebInspectorWin.cpp" > </File> @@ -1963,6 +2025,10 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\WebProcess\WebPage\ca\win\LayerTreeHostCAWin.h" + > + </File> </Filter> </Filter> </Filter> @@ -2767,6 +2833,14 @@ > </File> <File + RelativePath="..\UIProcess\WebIconDatabaseClient.cpp" + > + </File> + <File + RelativePath="..\UIProcess\WebIconDatabaseClient.h" + > + </File> + <File RelativePath="..\UIProcess\WebInspectorProxy.cpp" > </File> @@ -3236,6 +3310,22 @@ > </File> <File + RelativePath="..\UIProcess\API\C\win\WKGrammarDetail.cpp" + > + </File> + <File + RelativePath="..\UIProcess\API\C\win\WKGrammarDetail.h" + > + </File> + <File + RelativePath="..\UIProcess\API\C\win\WKTextChecker.cpp" + > + </File> + <File + RelativePath="..\UIProcess\API\C\win\WKTextChecker.h" + > + </File> + <File RelativePath="..\UIProcess\API\C\win\WKView.cpp" > </File> @@ -3390,6 +3480,14 @@ > </File> <File + RelativePath="..\UIProcess\win\WebGrammarDetail.cpp" + > + </File> + <File + RelativePath="..\UIProcess\win\WebGrammarDetail.h" + > + </File> + <File RelativePath="..\UIProcess\win\WebInspectorProxyWin.cpp" > </File> @@ -3406,6 +3504,26 @@ > </File> <File + RelativePath="..\UIProcess\win\WebProcessProxyWin.cpp" + > + </File> + <File + RelativePath="..\UIProcess\win\WebTextChecker.cpp" + > + </File> + <File + RelativePath="..\UIProcess\win\WebTextChecker.h" + > + </File> + <File + RelativePath="..\UIProcess\win\WebTextCheckerClient.cpp" + > + </File> + <File + RelativePath="..\UIProcess\win\WebTextCheckerClient.h" + > + </File> + <File RelativePath="..\UIProcess\win\WebUndoClient.cpp" > </File> diff --git a/Source/WebKit2/win/WebKit2Apple.vsprops b/Source/WebKit2/win/WebKit2Apple.vsprops index 68d01ac..2a45d65 100644 --- a/Source/WebKit2/win/WebKit2Apple.vsprops +++ b/Source/WebKit2/win/WebKit2Apple.vsprops @@ -6,7 +6,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(ProjectDir)..\WebProcess\WebPage\ca"" + AdditionalIncludeDirectories=""$(ProjectDir)..\WebProcess\WebPage\ca";"$(ProjectDir)..\WebProcess\WebPage\ca\win"" /> <Tool Name="VCLinkerTool" diff --git a/Source/WebKit2/win/WebKit2Generated.make b/Source/WebKit2/win/WebKit2Generated.make index 79c5f14..694c0d5 100644 --- a/Source/WebKit2/win/WebKit2Generated.make +++ b/Source/WebKit2/win/WebKit2Generated.make @@ -37,6 +37,7 @@ all: xcopy /y /d "..\Shared\API\c\WKURLRequest.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\Shared\API\c\WKURLResponse.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\Shared\API\c\WKUserContentURLPattern.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\cg\WKIconDatabaseCG.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WebKit2.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKApplicationCacheManager.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKAuthenticationChallenge.h" "%ConfigurationBuildDir%\include\WebKit2" @@ -57,6 +58,7 @@ all: xcopy /y /d "..\UIProcess\API\C\WKGeolocationPermissionRequest.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKGeolocationPosition.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKInspector.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\WKIconDatabase.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKKeyValueStorageManager.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKMediaCacheManager.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKNativeEvent.h" "%ConfigurationBuildDir%\include\WebKit2" @@ -73,6 +75,8 @@ all: xcopy /y /d "..\UIProcess\API\C\WKProtectionSpaceTypes.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\WKResourceCacheManager.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\win\WKContextPrivateWin.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\win\WKGrammarDetail.h" "%ConfigurationBuildDir%\include\WebKit2" + xcopy /y /d "..\UIProcess\API\C\win\WKTextChecker.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\win\WKView.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\C\win\WKViewPrivate.h" "%ConfigurationBuildDir%\include\WebKit2" xcopy /y /d "..\UIProcess\API\cpp\WKRetainPtr.h" "%ConfigurationBuildDir%\include\WebKit2" diff --git a/Source/WebKit2/win/WebKit2Production.vsprops b/Source/WebKit2/win/WebKit2Production.vsprops index 5bdec6f..4387622 100644 --- a/Source/WebKit2/win/WebKit2Production.vsprops +++ b/Source/WebKit2/win/WebKit2Production.vsprops @@ -6,7 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; .\WebKit2Common.vsprops; .\WebKit2DirectX.vsprops; diff --git a/Source/WebKit2/win/WebKit2Release.vsprops b/Source/WebKit2/win/WebKit2Release.vsprops index 7ae6676..698b8ff 100644 --- a/Source/WebKit2/win/WebKit2Release.vsprops +++ b/Source/WebKit2/win/WebKit2Release.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; .\WebKit2Common.vsprops; .\WebKit2DirectX.vsprops; diff --git a/Source/WebKit2/win/WebKit2ReleaseCairoCFLite.vsprops b/Source/WebKit2/win/WebKit2ReleaseCairoCFLite.vsprops index 685f929..7d5eeee 100644 --- a/Source/WebKit2/win/WebKit2ReleaseCairoCFLite.vsprops +++ b/Source/WebKit2/win/WebKit2ReleaseCairoCFLite.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops; diff --git a/Source/WebKit2/win/WebKit2WebProcessProduction.vsprops b/Source/WebKit2/win/WebKit2WebProcessProduction.vsprops index 08c8ae2..20f75fc 100644 --- a/Source/WebKit2/win/WebKit2WebProcessProduction.vsprops +++ b/Source/WebKit2/win/WebKit2WebProcessProduction.vsprops @@ -6,7 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; - $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops; .\WebKit2WebProcessCommon.vsprops" > diff --git a/Source/WebKit2/win/WebKit2WebProcessRelease.vsprops b/Source/WebKit2/win/WebKit2WebProcessRelease.vsprops index a32a112..2dbbb93 100644 --- a/Source/WebKit2/win/WebKit2WebProcessRelease.vsprops +++ b/Source/WebKit2/win/WebKit2WebProcessRelease.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; .\WebKit2WebProcessCommon.vsprops" > diff --git a/Source/WebKit2/win/WebKit2WebProcessReleaseCairoCFLite.vsprops b/Source/WebKit2/win/WebKit2WebProcessReleaseCairoCFLite.vsprops index d278242..75811b0 100644 --- a/Source/WebKit2/win/WebKit2WebProcessReleaseCairoCFLite.vsprops +++ b/Source/WebKit2/win/WebKit2WebProcessReleaseCairoCFLite.vsprops @@ -6,6 +6,7 @@ InheritedPropertySheets=" $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops; + $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\releaseproduction.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops; $(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops; .\WebKit2WebProcessCommon.vsprops" diff --git a/Source/WebKit2/win/WebKitPreBuild.cmd b/Source/WebKit2/win/WebKitPreBuild.cmd index b6f0bd4..82f02e9 100644 --- a/Source/WebKit2/win/WebKitPreBuild.cmd +++ b/Source/WebKit2/win/WebKitPreBuild.cmd @@ -5,11 +5,6 @@ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGUR if errorlevel 1 exit 1 echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed" -touch "%CONFIGURATIONBUILDDIR%\tmp.cpp" -cl /analyze /nologo /c "%CONFIGURATIONBUILDDIR%\tmp.cpp" /Fo"%INTDIR%\tmp.obj" 2>&1 | findstr D9040 -if ERRORLEVEL 1 (set EnablePREfast="true") else (set EnablePREfast="false") -if ERRORLEVEL 1 (set AnalyzeWithLargeStack="/analyze:65536") else (set AnalyzeWithLargeStack="") - mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore" xcopy /y /d "%WEBKITLIBRARIESDIR%\include\JavaScriptCore\*" "%CONFIGURATIONBUILDDIR%\include\JavaScriptCore" |