Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (187907 => 187908)
--- trunk/Source/_javascript_Core/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1,3 +1,13 @@
+2015-08-04 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters: Drive-by-fix.
+ Show JSC files in proper project locations in IDE.
+
2015-08-04 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (187907 => 187908)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1170,9 +1170,6 @@
<ClCompile Include="..\dfg\DFGDesiredWeakReferences.cpp">
<Filter>dfg</Filter>
</ClCompile>
- <ClCompile Include="..\dfg\DFGDesiredWriteBarriers.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
<ClCompile Include="..\dfg\DFGDisassembler.cpp">
<Filter>dfg</Filter>
</ClCompile>
@@ -1314,9 +1311,6 @@
<ClCompile Include="..\dfg\DFGStackLayoutPhase.cpp">
<Filter>dfg</Filter>
</ClCompile>
- <ClCompile Include="..\dfg\DFGStoreBarrierElisionPhase.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
<ClCompile Include="..\dfg\DFGThunks.cpp">
<Filter>dfg</Filter>
</ClCompile>
@@ -1830,6 +1824,13 @@
<ClCompile Include="..\wasm\WASMReader.cpp">
<Filter>wasm</Filter>
</ClCompile>
+ <ClCompile Include="..\bytecode\TrackedReferences.cpp" />
+ <ClCompile Include="..\dfg\DFGCombinedLiveness.cpp" />
+ <ClCompile Include="..\dfg\DFGConstantHoistingPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGIntegerRangeOptimizationPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGMinifiedGraph.cpp" />
+ <ClCompile Include="..\dfg\DFGOSRExitFuzz.cpp" />
+ <ClCompile Include="..\dfg\DFGStoreBarrierInsertionPhase.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\API\APICallbackFunction.h">
@@ -3555,9 +3556,6 @@
<ClInclude Include="..\dfg\DFGDesiredWeakReferences.h">
<Filter>dfg</Filter>
</ClInclude>
- <ClInclude Include="..\dfg\DFGDesiredWriteBarriers.h">
- <Filter>dfg</Filter>
- </ClInclude>
<ClInclude Include="..\dfg\DFGDisassembler.h">
<Filter>dfg</Filter>
</ClInclude>
@@ -3750,9 +3748,6 @@
<ClInclude Include="..\dfg\DFGStackLayoutPhase.h">
<Filter>dfg</Filter>
</ClInclude>
- <ClInclude Include="..\dfg\DFGStoreBarrierElisionPhase.h">
- <Filter>dfg</Filter>
- </ClInclude>
<ClInclude Include="..\dfg\DFGStructureAbstractValue.h">
<Filter>dfg</Filter>
</ClInclude>
@@ -4370,6 +4365,12 @@
<ClInclude Include="..\wasm\WASMReader.h">
<Filter>wasm</Filter>
</ClInclude>
+ <ClInclude Include="..\bytecode\TrackedReferences.h" />
+ <ClInclude Include="..\dfg\DFGCombinedLiveness.h" />
+ <ClInclude Include="..\dfg\DFGConstantHoistingPhase.h" />
+ <ClInclude Include="..\dfg\DFGIntegerRangeOptimizationPhase.h" />
+ <ClInclude Include="..\dfg\DFGOSRExitFuzz.h" />
+ <ClInclude Include="..\dfg\DFGStoreBarrierInsertionPhase.h" />
</ItemGroup>
<ItemGroup>
<None Include="_javascript_CorePreLink.cmd" />
@@ -4558,4 +4559,4 @@
<Filter>jit</Filter>
</MASM>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/WTF/ChangeLog (187907 => 187908)
--- trunk/Source/WTF/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WTF/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1,3 +1,15 @@
+2015-08-04 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * WTF.vcxproj/WTF.vcxproj.filters: Drive-by-fix to place files in
+ proper project locations in the IDE.
+ * wtf/Platform.h: Don't define the _HAS_EXCEPTIONS macro when building with
+ Visual Studio 2015.
+
2015-08-04 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r187815 and r187817.
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (187907 => 187908)
--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-08-04 23:10:36 UTC (rev 187908)
@@ -713,9 +713,10 @@
<ClInclude Include="..\wtf\win\WorkItemWin.h">
<Filter>wtf\win</Filter>
</ClInclude>
+ <ClInclude Include="..\wtf\TinyPtrSet.h" />
</ItemGroup>
<ItemGroup>
<None Include="WTFPostBuild.cmd" />
<None Include="WTFPreBuild.cmd" />
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/WTF/wtf/Platform.h (187907 => 187908)
--- trunk/Source/WTF/wtf/Platform.h 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WTF/wtf/Platform.h 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1106,7 +1106,7 @@
#define ENABLE_PLATFORM_FONT_LOOKUP 1
#endif
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) && _MSC_VER < 1900
#undef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#undef _HAS_EXCEPTIONS
Modified: trunk/Source/WebKit/win/ChangeLog (187907 => 187908)
--- trunk/Source/WebKit/win/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1,3 +1,13 @@
+2015-08-04 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * WebView.cpp:
+ (WebView::setCacheModel): Add explicit 'get' to satisfy compiler.
+
2015-08-04 Alex Christensen <achristen...@webkit.org>
Fix Windows build after r187886.
Modified: trunk/Source/WebKit/win/WebView.cpp (187907 => 187908)
--- trunk/Source/WebKit/win/WebView.cpp 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-08-04 23:10:36 UTC (rev 187908)
@@ -539,7 +539,7 @@
else
cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString();
}
- cacheDirectory = String(cfurlCacheDirectory);
+ cacheDirectory = String(cfurlCacheDirectory.get());
CFIndex cacheMemoryCapacity = 0;
CFIndex cacheDiskCapacity = 0;
#elif USE(CURL)
Modified: trunk/Tools/ChangeLog (187907 => 187908)
--- trunk/Tools/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1,3 +1,22 @@
+2015-08-04 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/PluginTest.h: If building with
+ something older than VS2015, define snprintf as _snprintf.
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props:
+ Remove unneeded macro definition for snprintf.
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo._determine_win_version): Recognize Windows 10.
+ * Scripts/webkitpy/port/win.py:
+ (WinPort): Ditto.
+ * Scripts/webkitpy/port/win_unittest.py:
+ (WinPortTest.test_baseline_search_path): Include Windows 10 in tests.
+ (WinPortTest._assert_version): Ditto.
+
2015-08-04 Brian Burg <bb...@apple.com>
Unreviewed, update email addresses in contributors.json and watchlist.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props (187907 => 187908)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props 2015-08-04 23:10:36 UTC (rev 187908)
@@ -6,7 +6,6 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\TestNetscapePlugIn;$(ProjectDir)..\..\TestNetscapePlugIn\win;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\_javascript_Core;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h (187907 => 187908)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h 2015-08-04 23:10:36 UTC (rev 187908)
@@ -31,6 +31,10 @@
#include <map>
#include <string>
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
+#endif
+
// Helper classes for implementing has_member
typedef char (&no_tag)[1];
typedef char (&yes_tag)[2];
Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (187907 => 187908)
--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1,4 +1,5 @@
# Copyright (c) 2011 Google Inc. All rights reserved.
+# Copyright (c) 2015 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@@ -165,6 +166,8 @@
return 'lucid'
def _determine_win_version(self, win_version_tuple):
+ if win_version_tuple[:3] == (0, 0, 10240):
+ return 'win10'
if win_version_tuple[:3] == (6, 1, 7600):
return '7sp0'
if win_version_tuple[:2] == (6, 0):
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (187907 => 187908)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2015-08-04 23:10:36 UTC (rev 187908)
@@ -47,7 +47,7 @@
class WinPort(ApplePort):
port_name = "win"
- VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
+ VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win-win10", "win"]
ARCHITECTURES = ['x86', 'x86_64']
Modified: trunk/Tools/Scripts/webkitpy/port/win_unittest.py (187907 => 187908)
--- trunk/Tools/Scripts/webkitpy/port/win_unittest.py 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/Scripts/webkitpy/port/win_unittest.py 2015-08-04 23:10:36 UTC (rev 187908)
@@ -63,13 +63,13 @@
self.assertEqual(port.baseline_search_path(), absolute_search_paths)
def test_baseline_search_path(self):
- self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac'], 'xp')
- self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac'], 'vista')
- self._assert_search_path(['win-7sp0', 'win', 'mac'], '7sp0')
+ self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'xp')
+ self._assert_search_path(['win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'vista')
+ self._assert_search_path(['win-7sp0', 'win-win10', 'win', 'mac'], '7sp0')
- self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
- self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
- self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
def _assert_version(self, port_name, expected_version):
host = MockSystemHost(os_name='win', os_version=expected_version)
Modified: trunk/WebKitLibraries/ChangeLog (187907 => 187908)
--- trunk/WebKitLibraries/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/WebKitLibraries/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
@@ -1,3 +1,13 @@
+2015-08-04 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * win/tools/vsprops/common.props: Fix build flags to use Windows 7
+ (WINVER=0x601) as minimum build target for 64-bit builds.
+
2015-08-03 Filip Pizlo <fpi...@apple.com>
Check in LLVM 3.6.2 binary drops for El Capitan
Modified: trunk/WebKitLibraries/win/tools/vsprops/common.props (187907 => 187908)
--- trunk/WebKitLibraries/win/tools/vsprops/common.props 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/WebKitLibraries/win/tools/vsprops/common.props 2015-08-04 23:10:36 UTC (rev 187908)
@@ -40,9 +40,9 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>
- <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;WINVER=0x601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WINDOWS;WINVER=0x601;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>false</ExceptionHandling>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
