Title: [187058] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187058
- Author
- matthew_han...@apple.com
- Date
- 2015-07-20 21:36:40 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r186867. rdar://problem/21643094
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187057 => 187058)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:36:37 UTC (rev 187057)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:36:40 UTC (rev 187058)
@@ -1,5 +1,18 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186867. rdar://problem/21643094
+
+ 2015-07-15 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Unreviewed build fix after r186858.
+
+ Add missing DOMPath and PathUtilities files to project.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186863. rdar://problem/21715050
2015-07-15 Brady Eidson <beid...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (187057 => 187058)
--- branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-07-21 04:36:37 UTC (rev 187057)
+++ branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-07-21 04:36:40 UTC (rev 187058)
@@ -6664,6 +6664,7 @@
<ClCompile Include="..\html\canvas\ANGLEInstancedArrays.cpp" />
<ClCompile Include="..\html\canvas\CanvasContextAttributes.cpp" />
<ClCompile Include="..\html\canvas\CanvasPathMethods.cpp" />
+ <ClCompile Include="..\html\canvas\DOMPath.cpp" />
<ClCompile Include="..\html\canvas\EXTShaderTextureLOD.cpp" />
<ClCompile Include="..\html\canvas\EXTsRGB.cpp" />
<ClCompile Include="..\html\canvas\EXTBlendMinMax.cpp" />
@@ -7654,6 +7655,7 @@
<ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLCommon.cpp" />
<ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp" />
<ClCompile Include="..\platform\graphics\opengl\TemporaryOpenGLSetting.cpp" />
+ <ClCompile Include="..\platform\graphics\PathUtilities.cpp" />
<ClCompile Include="..\platform\graphics\PlatformDisplay.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -19569,6 +19571,7 @@
<ClInclude Include="..\html\canvas\ANGLEInstancedArrays.h" />
<ClInclude Include="..\html\canvas\CanvasContextAttributes.h" />
<ClInclude Include="..\html\canvas\CanvasPathMethods.h" />
+ <ClInclude Include="..\html\canvas\DOMPath.h" />
<ClInclude Include="..\html\canvas\EXTShaderTextureLOD.h" />
<ClInclude Include="..\html\canvas\EXTsRGB.h" />
<ClInclude Include="..\html\canvas\EXTFragDepth.h" />
@@ -20050,6 +20053,7 @@
<ClInclude Include="..\platform\graphics\opengl\GLDefs.h" />
<ClInclude Include="..\platform\graphics\opengl\GLPlatformContext.h" />
<ClInclude Include="..\platform\graphics\opengl\GLPlatformSurface.h" />
+ <ClInclude Include="..\platform\graphics\PathUtilities.h" />
<ClInclude Include="..\platform\graphics\PlatformDisplay.h" />
<ClInclude Include="..\platform\graphics\texmap\BitmapTexture.h" />
<ClInclude Include="..\platform\graphics\texmap\BitmapTextureGL.h" />
Modified: branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (187057 => 187058)
--- branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-07-21 04:36:37 UTC (rev 187057)
+++ branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-07-21 04:36:40 UTC (rev 187058)
@@ -7258,6 +7258,17 @@
<ClCompile Include="..\platform\win\MemoryPressureHandlerWin.cpp">
<Filter>platform\win</Filter>
</ClCompile>
+ <ClCompile Include="..\dom\NodeOrString.cpp" />
+ <ClCompile Include="..\bindings\js\JSCharacterDataCustom.cpp" />
+ <ClCompile Include="..\bindings\js\JSDocumentFragmentCustom.cpp" />
+ <ClCompile Include="..\bindings\js\JSDocumentTypeCustom.cpp" />
+ <ClCompile Include="..\bindings\js\JSNodeOrString.cpp" />
+ <ClCompile Include="..\html\canvas\DOMPath.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\PathUtilities.cpp">
+ <Filter>platform\graphics</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\geolocation\Coordinates.h">
@@ -15239,6 +15250,14 @@
<ClInclude Include="..\platform\VNodeTracker.h">
<Filter>platform</Filter>
</ClInclude>
+ <ClInclude Include="..\dom\NodeOrString.h" />
+ <ClInclude Include="..\bindings\js\JSNodeOrString.h" />
+ <ClInclude Include="..\html\canvas\DOMPath.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\PathUtilities.h">
+ <Filter>platform\graphics</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\css\CSSGrammar.y.in">
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
