../JavaScriptCore: [Win] Update project and solution files for 64-bit builds.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Jan 2014 18:14:00 +0000 (18:14 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Jan 2014 18:14:00 +0000 (18:14 +0000)
https://bugs.webkit.org/show_bug.cgi?id=127457

Reviewed by Eric Carlson.

* JavaScriptCore.vcxproj/JavaScriptCore.submit.sln: Add 64-bit target.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: Update for VS2013
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Add missing
file from project view.
* JavaScriptCore.vcxproj/jsc/jsc.vcxproj: Update for VS2013
* JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj: Ditto
* JavaScriptCore.vcxproj/testapi/testapi.vcxproj: Ditto

../WebCore: [Win] Update project and solution files for 64-bit builds
https://bugs.webkit.org/show_bug.cgi?id=127457

Reviewed by Eric Carlson.

* WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj: Update for VS2013
* WebCore.vcxproj/WebCore.submit.sln: Add x64 targets
* WebCore.vcxproj/WebCore.vcxproj: Update for VS2013. Also exclude 32-bit specific
assembly when building 64-bit target.
* WebCore.vcxproj/WebCore.vcxproj.filters: Update for VS2013
* config.h: Handle 64-bit type definitions.
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimation::setFromValue): Use CGFloat to support 64-bit builds
(PlatformCAAnimation::setToValue): Ditto
(PlatformCAAnimation::setValues): Ditto
* platform/graphics/win/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::fontPlatformData): Add cast to
support 32- and 64-bit targets.
* platform/graphics/win/GraphicsContextCGWin.cpp:
(WebCore::GraphicsContext::drawLineForDocumentMarker): Use CGFloat to
support 64-bit builds.
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::writeURLToDataObject): Specialize std::min to
work on 32- and 64-bit code.
(WebCore::createGlobalImageFileDescriptor): Ditto
* platform/win/StructuredExceptionHandlerSuppressor.cpp:
(WebCore::StructuredExceptionHandlerSuppressor::StructuredExceptionHandlerSuppressor):
Comment out 32-bit inline assembly.
(WebCore::StructuredExceptionHandlerSuppressor::~StructuredExceptionHandlerSuppressor):
Ditto

../WebKit: [Win] Update project and solution files for 64-bit builds
https://bugs.webkit.org/show_bug.cgi?id=127457

Reviewed by Eric Carlson.

* WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Update for VS2013.
* WebKit.vcxproj/WebKit.submit.sln: Add 64-bit target.
* WebKit.vcxproj/WebKit/WebKit.vcxproj: Update for VS2013
* WebKit.vcxproj/WebKit/WebKitApple.props: Remove unused QTMovieWin
library dependency.
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
Update for VS2013.
* WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj: Ditto

../WTF: [Win] Update project and solution files for 64-bit builds.
https://bugs.webkit.org/show_bug.cgi?id=127457

Reviewed by Eric Carlson.

* WTF.vcxproj/WTF.submit.sln: Add x64 targets.
* WTF.vcxproj/WTF.vcxproj: Update for VS2013

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

24 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.submit.sln
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.submit.sln
Source/WTF/WTF.vcxproj/WTF.vcxproj
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCore.submit.sln
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/config.h
Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp
Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp
Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.cpp
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj
Source/WebKit/WebKit.vcxproj/WebKit.submit.sln
Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj

index 2d370a5705ed748a627d6881fbe1a4c59fee06f0..d7d4e7605633d5c302797336ef374d94a4c0260b 100644 (file)
@@ -1,3 +1,18 @@
+2014-01-22  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update project and solution files for 64-bit builds.
+        https://bugs.webkit.org/show_bug.cgi?id=127457
+
+        Reviewed by Eric Carlson.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.submit.sln: Add 64-bit target.
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: Update for VS2013
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Add missing
+        file from project view.
+        * JavaScriptCore.vcxproj/jsc/jsc.vcxproj: Update for VS2013
+        * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj: Ditto
+        * JavaScriptCore.vcxproj/testapi/testapi.vcxproj: Ditto
+
 2014-01-22  Mark Lam  <mark.lam@apple.com>
 
         Poor man's fast breakpoints for a 2.3x debugger speedup.
index 9fd8880ae9bc6e4cdc53818c8e1211896b83d0f7..caf723af545a66e3083eab5a998dff3a060fbd0a 100644 (file)
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore.vcxproj", "{22413D41-3A18-42B7-92A8-CEDC6CE86920}"
        ProjectSection(ProjectDependencies) = postProject
                {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
index 8025718b9cf545205daf7547a663a7940fbc8a58..224ed56457ce2616eb0e569a5055319bcdef61f2 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index 8c51a07a8ea01554335616b2efefcf54a24388a5..9744353e71701ac957c0d2f3be3d9e7b68f47ca9 100644 (file)
     <ClInclude Include="..\runtime\ConstantMode.h">
       <Filter>runtime</Filter>
     </ClInclude>
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataViewPrototype.lut.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="JavaScriptCorePreLink.cmd" />
index f642e9b71c090ad49159b36642fd835155fdee94..a829c05b25d52ea1f649841071ba1a4918a6320e 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index ed96eabdf206d3ff8dcc50b3a5e0293bd95d17cd..dc7805bc9fb36d6b1af176ea3039bedf51916d70 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index 544ff2fdd84c193a97762bf3139b3120b14fd024..758878fc40b9de944c1c0ce0872a91143693d69d 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index e5cde8cc372acac8382dfd1bef0b0be06a0eb4b0..ce001d17d657b9f73c90d7a5a2b8c9a81183b1ac 100644 (file)
@@ -1,3 +1,13 @@
+2014-01-22  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update project and solution files for 64-bit builds.
+        https://bugs.webkit.org/show_bug.cgi?id=127457
+
+        Reviewed by Eric Carlson.
+
+        * WTF.vcxproj/WTF.submit.sln: Add x64 targets.
+        * WTF.vcxproj/WTF.vcxproj: Update for VS2013
+
 2014-01-22  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Remove CSS3_TEXT_DECORATION define
index aaa3d671af7ed1e94b9a6cbeb168bc1530635742..39bea3ad458ffa23eca997496b131a9820792919 100644 (file)
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTFGenerated", "WTFGenerated.vcxproj", "{F7366596-0520-4433-B8FF-D843E31E5199}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF.vcxproj", "{8EF73779-BED3-45BB-816D-9FF58399AFA5}"
index b5ce14f422fb284e29403a261a78ee3bfb2c7949..90241ebbde7b6b91ffcd366a3802ceeb764dc5fc 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index 267b792188fa60783ff3865cd538193d19310fdf..af8e8fb50213ea3235b23a94de24ff52d072c149 100644 (file)
@@ -1,3 +1,36 @@
+2014-01-22  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update project and solution files for 64-bit builds
+        https://bugs.webkit.org/show_bug.cgi?id=127457
+
+        Reviewed by Eric Carlson.
+
+        * WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj: Update for VS2013
+        * WebCore.vcxproj/WebCore.submit.sln: Add x64 targets
+        * WebCore.vcxproj/WebCore.vcxproj: Update for VS2013. Also exclude 32-bit specific
+        assembly when building 64-bit target.
+        * WebCore.vcxproj/WebCore.vcxproj.filters: Update for VS2013
+        * config.h: Handle 64-bit type definitions.
+        * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+        (PlatformCAAnimation::setFromValue): Use CGFloat to support 64-bit builds
+        (PlatformCAAnimation::setToValue): Ditto
+        (PlatformCAAnimation::setValues): Ditto
+        * platform/graphics/win/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Add cast to
+        support 32- and 64-bit targets.
+        * platform/graphics/win/GraphicsContextCGWin.cpp:
+        (WebCore::GraphicsContext::drawLineForDocumentMarker): Use CGFloat to
+        support 64-bit builds.
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::writeURLToDataObject): Specialize std::min to
+        work on 32- and 64-bit code.
+        (WebCore::createGlobalImageFileDescriptor): Ditto
+        * platform/win/StructuredExceptionHandlerSuppressor.cpp:
+        (WebCore::StructuredExceptionHandlerSuppressor::StructuredExceptionHandlerSuppressor):
+        Comment out 32-bit inline assembly.
+        (WebCore::StructuredExceptionHandlerSuppressor::~StructuredExceptionHandlerSuppressor):
+        Ditto
+
 2014-01-23  Brady Eidson  <beidson@apple.com>
 
         Make IDBGetResult work with IDBKeyData instead of IDBKey.
index 7929b01356304698b1b08cd039dfaae971691cd3..f9b67d890d97e6ee4606b94283413b8166ae44f7 100644 (file)
@@ -1,14 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreGenerated", "WebCoreGenerated.vcxproj", "{A4159B6F-3106-4F75-9EDD-582307BDB96A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "WebCore.vcxproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
-       ProjectSection(ProjectDependencies) = postProject
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325} = {E498CA9D-3BD2-4D52-8E37-C8DC76526325}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "QTMovieWin\QTMovieWin.vcxproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}"
        ProjectSection(ProjectDependencies) = postProject
                {A4159B6F-3106-4F75-9EDD-582307BDB96A} = {A4159B6F-3106-4F75-9EDD-582307BDB96A}
        EndProjectSection
@@ -16,35 +13,47 @@ EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
+               Debug|x64 = Debug|x64
                DebugSuffix|Win32 = DebugSuffix|Win32
+               DebugSuffix|x64 = DebugSuffix|x64
                Production|Win32 = Production|Win32
+               Production|x64 = Production|x64
                Release|Win32 = Release|Win32
+               Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|Win32.ActiveCfg = Debug|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|Win32.Build.0 = Debug|Win32
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|x64.ActiveCfg = Debug|x64
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|x64.Build.0 = Debug|x64
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|Win32.ActiveCfg = Production|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|Win32.Build.0 = Production|Win32
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|x64.ActiveCfg = Production|x64
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|x64.Build.0 = Production|x64
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|Win32.ActiveCfg = Release|Win32
                {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|Win32.Build.0 = Release|Win32
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|x64.ActiveCfg = Release|x64
+               {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|x64.Build.0 = Release|x64
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.Build.0 = Debug|Win32
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|x64.ActiveCfg = Debug|x64
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|x64.Build.0 = Debug|x64
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.ActiveCfg = Production|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.Build.0 = Production|Win32
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|x64.ActiveCfg = Production|x64
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|x64.Build.0 = Production|x64
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32
                {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.ActiveCfg = Production|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.Build.0 = Production|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32
-               {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|x64.ActiveCfg = Release|x64
+               {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 1d07fe5b547d9058585b6144bf898e2b1ea1588d..2c49ba7631d38df3cd8c37b2c0856a9ecf9b99e1 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index b6d5d7f80ed9b8e4da82f1108ccf32038e5f7bb8..660e5c91e661ebee06a1873b5a7c8c5bbfc596ca 100644 (file)
 
 #if USE(CG)
 #ifndef CGFLOAT_DEFINED
-#ifdef __LP64__
+#if (defined(__LP64__) && __LP64__) || (defined(__x86_64__) && __x86_64__) || defined(_M_X64) || defined(__amd64__)
 typedef double CGFloat;
 #else
 typedef float CGFloat;
index e536fce9d384f365327cadb20ed5a41e1c087d99..c584b96f7693df79d320a151cd68391764c07278 100644 (file)
@@ -360,7 +360,7 @@ void PlatformCAAnimation::setFromValue(const FloatPoint3D& value)
     if (animationType() != Basic)
         return;
 
-    float a[3] = { value.x(), value.y(), value.z() };
+    CGFloat a[3] = { value.x(), value.y(), value.z() };
     RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(3, a));
     CACFAnimationSetFromValue(m_animation.get(), v.get());
 }
@@ -370,7 +370,7 @@ void PlatformCAAnimation::setFromValue(const WebCore::Color& value)
     if (animationType() != Basic)
         return;
 
-    float a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
+    CGFloat a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
     RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(4, a));
     CACFAnimationSetFromValue(m_animation.get(), v.get());
 }
@@ -413,7 +413,7 @@ void PlatformCAAnimation::setToValue(const FloatPoint3D& value)
     if (animationType() != Basic)
         return;
 
-    float a[3] = { value.x(), value.y(), value.z() };
+    CGFloat a[3] = { value.x(), value.y(), value.z() };
     RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(3, a));
     CACFAnimationSetToValue(m_animation.get(), v.get());
 }
@@ -423,7 +423,7 @@ void PlatformCAAnimation::setToValue(const WebCore::Color& value)
     if (animationType() != Basic)
         return;
 
-    float a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
+    CGFloat a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
     RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(4, a));
     CACFAnimationSetToValue(m_animation.get(), v.get());
 }
@@ -480,7 +480,7 @@ void PlatformCAAnimation::setValues(const Vector<FloatPoint3D>& value)
         
     RetainPtr<CFMutableArrayRef> array = adoptCF(CFArrayCreateMutable(0, value.size(), &kCFTypeArrayCallBacks));
     for (size_t i = 0; i < value.size(); ++i) {
-        float a[3] = { value[i].x(), value[i].y(), value[i].z() };
+        CGFloat a[3] = { value[i].x(), value[i].y(), value[i].z() };
         RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(3, a));
         CFArrayAppendValue(array.get(), v.get());
     }
@@ -495,7 +495,7 @@ void PlatformCAAnimation::setValues(const Vector<WebCore::Color>& value)
         
     RetainPtr<CFMutableArrayRef> array = adoptCF(CFArrayCreateMutable(0, value.size(), &kCFTypeArrayCallBacks));
     for (size_t i = 0; i < value.size(); ++i) {
-        float a[4] = { value[i].red(), value[i].green(), value[i].blue(), value[i].alpha() };
+        CGFloat a[4] = { value[i].red(), value[i].green(), value[i].blue(), value[i].alpha() };
         RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(4, a));
         CFArrayAppendValue(array.get(), v.get());
     }
index 39d1122fa148ef2a5a6a11e9e535b8a6d903be3b..2cf3784a61a670dbb148646c3af7a52f15ce4b6c 100644 (file)
@@ -45,7 +45,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, b
     ASSERT(m_fontReference);
 
     LOGFONT& logFont = *static_cast<LOGFONT*>(malloc(sizeof(LOGFONT)));
-    memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination().data(), sizeof(logFont.lfFaceName[0]) * min(static_cast<size_t>(LF_FACESIZE), 1 + m_name.length()));
+    memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination().data(), sizeof(logFont.lfFaceName[0]) * std::min<size_t>(static_cast<size_t>(LF_FACESIZE), 1 + m_name.length()));
 
     logFont.lfHeight = -size;
     if (renderingMode == NormalRenderingMode)
index d1b5aa5af2816a80a4f072252e2387feba3d406c..c5b73ea2e7d7fc3ec45ddc7b4ab12819a95b4be1 100644 (file)
@@ -228,10 +228,10 @@ void GraphicsContext::drawLineForDocumentMarker(const FloatPoint& point, float w
     
     // Dash lengths for the top and bottom of the error underline are the same.
     // These are magic.
-    static const float edge_dash_lengths[] = {2.0f, 2.0f};
-    static const float middle_dash_lengths[] = {2.76f, 1.24f};
-    static const float edge_offset = -(edge_dash_lengths[1] - 1.0f) / 2.0f;
-    static const float middle_offset = -(middle_dash_lengths[1] - 1.0f) / 2.0f;
+    static const CGFloat edge_dash_lengths[] = {2.0f, 2.0f};
+    static const CGFloat middle_dash_lengths[] = { 2.76f, 1.24f };
+    static const CGFloat edge_offset = -(edge_dash_lengths[1] - 1.0f) / 2.0f;
+    static const CGFloat middle_offset = -(middle_dash_lengths[1] - 1.0f) / 2.0f;
 
     // Line opacities.  Once again, these are magic.
     const float upperOpacity = 0.33f;
index 11250efebc300296374bd1f1e2e6b5780ffb0d2a..8b852ff5dac58959ac05970dc899fa4639b2b6f0 100644 (file)
@@ -27,7 +27,9 @@
 
 #include "StructuredExceptionHandlerSuppressor.h"
 
+#if defined(_M_IX86)
 extern "C" int __stdcall exceptionHandlerThunk(); // Defined in makesafeseh.asm
+#endif
 
 static bool exceptionShouldTerminateProgram(int code)
 {
@@ -75,6 +77,7 @@ namespace WebCore {
 
 StructuredExceptionHandlerSuppressor::StructuredExceptionHandlerSuppressor(ExceptionRegistration& exceptionRegistration)
 {
+#if defined(_M_IX86)
     // Note: Windows requires that the EXCEPTION_REGISTRATION block (modeled here as our
     // ExceptionRegistration struct) be stack allocated. Therefore we instantiated it prior
     // to building this object so that Windows can still find it in stack memory when it
@@ -120,13 +123,19 @@ StructuredExceptionHandlerSuppressor::StructuredExceptionHandlerSuppressor(Excep
     __asm mov FS:[0], eax
 
     m_savedExceptionRegistration = registration;
+#else
+    // 64-bit x64 no longer needs dynamic modification of the exception handlers.
+#endif
 }
 
 StructuredExceptionHandlerSuppressor::~StructuredExceptionHandlerSuppressor()
 {
+#if defined(_M_IX86)
     // Restore the exception handler
     __asm mov eax, [m_savedExceptionRegistration]
     __asm mov FS:[0], eax
+#else
+#endif
 }
 
 #pragma warning(pop)
index 1006a06414614469c4c7ecab1bef2efd8174eb48..c905de25ac17b8b75e177a6ef517d609421803fe 100644 (file)
@@ -1,3 +1,19 @@
+2014-01-22  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Update project and solution files for 64-bit builds
+        https://bugs.webkit.org/show_bug.cgi?id=127457
+
+        Reviewed by Eric Carlson.
+
+        * WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Update for VS2013.
+        * WebKit.vcxproj/WebKit.submit.sln: Add 64-bit target.
+        * WebKit.vcxproj/WebKit/WebKit.vcxproj: Update for VS2013
+        * WebKit.vcxproj/WebKit/WebKitApple.props: Remove unused QTMovieWin
+        library dependency.
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
+        Update for VS2013.
+        * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj: Ditto
+
 2014-01-22  Martin Robinson  <mrobinson@igalia.com>
 
         [GTK] Avoid a circular dependency when building webkitenumtypes.h
index b1d87f090728ab8682dfa10d13d0a7f234bed63e..35d6e1bc2e181538c6f4634bb056bfc47349d230 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index 5de95e9c0918871fb72af335d7cd4d76906efd40..0a8b28c9543308e10b898b7a0d6f946e9d32aba7 100644 (file)
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Interfaces", "Interfaces\Interfaces.vcxproj", "{1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "WebKit\WebKit.vcxproj", "{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"
@@ -21,43 +23,79 @@ EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
+               Debug|x64 = Debug|x64
                DebugSuffix|Win32 = DebugSuffix|Win32
+               DebugSuffix|x64 = DebugSuffix|x64
                Production|Win32 = Production|Win32
+               Production|x64 = Production|x64
                Release|Win32 = Release|Win32
+               Release|x64 = Release|x64
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|Win32.ActiveCfg = Debug|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|Win32.Build.0 = Debug|Win32
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|x64.ActiveCfg = Debug|x64
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|x64.Build.0 = Debug|x64
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|Win32.ActiveCfg = Production|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|Win32.Build.0 = Production|Win32
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|x64.ActiveCfg = Production|x64
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|x64.Build.0 = Production|x64
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|Win32.ActiveCfg = Release|Win32
                {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|Win32.Build.0 = Release|Win32
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|x64.ActiveCfg = Release|x64
+               {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|x64.Build.0 = Release|x64
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.ActiveCfg = Debug|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|x64.ActiveCfg = Debug|x64
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|x64.Build.0 = Debug|x64
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.ActiveCfg = Production|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.Build.0 = Production|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|x64.ActiveCfg = Production|x64
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|x64.Build.0 = Production|x64
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32
                {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|x64.ActiveCfg = Release|x64
+               {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|x64.Build.0 = Release|x64
                {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|Win32.ActiveCfg = Debug|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|Win32.Build.0 = Debug|Win32
+               {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|x64.ActiveCfg = Debug|x64
+               {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|x64.Build.0 = Debug|x64
                {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {0F837117-8C0B-4596-A373-A37E14A01223}.Production|Win32.ActiveCfg = Production|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.Production|Win32.Build.0 = Production|Win32
+               {0F837117-8C0B-4596-A373-A37E14A01223}.Production|x64.ActiveCfg = Production|x64
+               {0F837117-8C0B-4596-A373-A37E14A01223}.Production|x64.Build.0 = Production|x64
                {0F837117-8C0B-4596-A373-A37E14A01223}.Release|Win32.ActiveCfg = Release|Win32
                {0F837117-8C0B-4596-A373-A37E14A01223}.Release|Win32.Build.0 = Release|Win32
+               {0F837117-8C0B-4596-A373-A37E14A01223}.Release|x64.ActiveCfg = Release|x64
+               {0F837117-8C0B-4596-A373-A37E14A01223}.Release|x64.Build.0 = Release|x64
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|Win32.ActiveCfg = Debug|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|Win32.Build.0 = Debug|Win32
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|x64.ActiveCfg = Debug|x64
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|x64.Build.0 = Debug|x64
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|Win32.ActiveCfg = Production|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|Win32.Build.0 = Production|Win32
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|x64.ActiveCfg = Production|x64
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|x64.Build.0 = Production|x64
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|Win32.ActiveCfg = Release|Win32
                {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|Win32.Build.0 = Release|Win32
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|x64.ActiveCfg = Release|x64
+               {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index a99c9c120454e97f57cdc6d6b15bad968ebfbb91..89741f3d18a78cc54a1db7498a2e64f2016f0329 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index 879a490114482ccf22b584424e206ed8381e74b1..5ee41783eec53a1a1b1ae4a1a8c019552a3ec552 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>
index 24282638ac2a7be17b7a03c8c0ed53ebb01529b0..95536cc04051afd462f05e6ff968458f8074afba 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugSuffix|Win32">
       <Configuration>DebugSuffix</Configuration>