Title: [172123] tags/Safari-600.1.2.7/WebKitLibraries
Revision
172123
Author
dburk...@apple.com
Date
2014-08-05 21:21:58 -0700 (Tue, 05 Aug 2014)

Log Message

Merge Patch for <rdar://problem/17923227>.

Modified Paths


Diff

Modified: tags/Safari-600.1.2.7/WebKitLibraries/ChangeLog (172122 => 172123)


--- tags/Safari-600.1.2.7/WebKitLibraries/ChangeLog	2014-08-06 04:18:09 UTC (rev 172122)
+++ tags/Safari-600.1.2.7/WebKitLibraries/ChangeLog	2014-08-06 04:21:58 UTC (rev 172123)
@@ -1,3 +1,11 @@
+2014-08-05  Brent Fulgham  <bfulg...@apple.com>
+
+        [Win] Turn off features we don't want to ship this cycle.
+        <rdar://problem/17922754>
+
+        * win/tools/vsprops/FeatureDefines.props: Match with
+        changes in <http://trac.webkit.org/changeset/171178>
+
 2014-08-04  Matthew Hanson  <matthew_han...@apple.com>
 
         [Win] Temporarily turn off WebGL feature.

Modified: tags/Safari-600.1.2.7/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (172122 => 172123)


--- tags/Safari-600.1.2.7/WebKitLibraries/win/tools/vsprops/FeatureDefines.props	2014-08-06 04:18:09 UTC (rev 172122)
+++ tags/Safari-600.1.2.7/WebKitLibraries/win/tools/vsprops/FeatureDefines.props	2014-08-06 04:21:58 UTC (rev 172123)
@@ -4,7 +4,7 @@
     <ENABLE_3D_RENDERING>ENABLE_3D_RENDERING</ENABLE_3D_RENDERING>
     <ENABLE_ACCELERATED_2D_CANVAS />
     <ENABLE_ACCELERATED_OVERFLOW_SCROLLING />
-    <ENABLE_CANVAS_PATH>ENABLE_CANVAS_PATH</ENABLE_CANVAS_PATH>
+    <ENABLE_CANVAS_PATH />
     <ENABLE_CANVAS_PROXY />
     <ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
     <ENABLE_CSP_NEXT />
@@ -14,13 +14,13 @@
     <ENABLE_CSS_COMPOSITING />
     <ENABLE_CSS_EXCLUSIONS />
     <ENABLE_CSS_FILTERS>ENABLE_CSS_FILTERS</ENABLE_CSS_FILTERS>
-    <ENABLE_CSS_GRID_LAYOUT>ENABLE_CSS_GRID_LAYOUT</ENABLE_CSS_GRID_LAYOUT>
+    <ENABLE_CSS_GRID_LAYOUT />
     <ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
     <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
     <ENABLE_CSS_SHADERS />
     <ENABLE_CSS_SHAPES>ENABLE_CSS_SHAPES</ENABLE_CSS_SHAPES>
     <ENABLE_CSS_SHAPE_INSIDE>ENABLE_CSS_SHAPE_INSIDE</ENABLE_CSS_SHAPE_INSIDE>
-    <ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED</ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>
+    <ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED />
     <ENABLE_CUSTOM_SCHEME_HANDLER />
     <ENABLE_DATAGRID />
     <ENABLE_DATALIST_ELEMENT />
@@ -60,12 +60,12 @@
     <ENABLE_PROXIMITY_EVENTS />
     <ENABLE_QUOTA />
     <ENABLE_NAVIGATOR_CONTENT_UTILS />
-    <ENABLE_PICTURE_SIZES>ENABLE_PICTURE_SIZES</ENABLE_PICTURE_SIZES>
+    <ENABLE_PICTURE_SIZES />
     <ENABLE_PROMISES>ENABLE_PROMISES</ENABLE_PROMISES>
     <ENABLE_REQUEST_ANIMATION_FRAME>ENABLE_REQUEST_ANIMATION_FRAME</ENABLE_REQUEST_ANIMATION_FRAME>
     <ENABLE_SCRIPTED_SPEECH />
     <ENABLE_SHADOW_DOM />
-    <ENABLE_SHARED_WORKERS>ENABLE_SHARED_WORKERS</ENABLE_SHARED_WORKERS>
+    <ENABLE_SHARED_WORKERS />
     <ENABLE_SQL_DATABASE>ENABLE_SQL_DATABASE</ENABLE_SQL_DATABASE>
     <ENABLE_STYLE_SCOPED />
     <ENABLE_SUBPIXEL_LAYOUT>ENABLE_SUBPIXEL_LAYOUT</ENABLE_SUBPIXEL_LAYOUT>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to