[webkit-changes] [155070] branches/safari-537-branch/Source

Wed, 04 Sep 2013 15:14:19 -0700

Title: [155070] branches/safari-537-branch/Source

Diff

Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (155069 => 155070)


--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-09-04 22:14:50 UTC (rev 155070)
@@ -1,3 +1,11 @@
+2013-09-04  Dean Jackson  <[email protected]>
+
+        <rdar://problem/14910916> Disable CSS_SHAPES on safari-537-branch
+
+        Reviewed by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-08-27  Lucas Forschler  <[email protected]>
 
         Merge r154633

Modified: branches/safari-537-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (155069 => 155070)


--- branches/safari-537-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2013-09-04 22:14:50 UTC (rev 155070)
@@ -52,7 +52,7 @@
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ;
-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
+ENABLE_CSS_SHAPES = ;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ;
 ENABLE_CSS_VARIABLES = ;

Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (155069 => 155070)


--- branches/safari-537-branch/Source/WebCore/ChangeLog	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog	2013-09-04 22:14:50 UTC (rev 155070)
@@ -1,3 +1,11 @@
+2013-09-04  Dean Jackson  <[email protected]>
+
+        <rdar://problem/14910916> Disable CSS_SHAPES on safari-537-branch
+
+        Reviewed by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-09-04  Lucas Forschler  <[email protected]>
 
         Merge r155014

Modified: branches/safari-537-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (155069 => 155070)


--- branches/safari-537-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig	2013-09-04 22:14:50 UTC (rev 155070)
@@ -52,7 +52,7 @@
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ;
-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
+ENABLE_CSS_SHAPES = ;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ;
 ENABLE_CSS_VARIABLES = ;

Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderBlock.cpp (155069 => 155070)


--- branches/safari-537-branch/Source/WebCore/rendering/RenderBlock.cpp	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderBlock.cpp	2013-09-04 22:14:50 UTC (rev 155070)
@@ -1470,6 +1470,7 @@
 static inline bool shapeInfoRequiresRelayout(const RenderBlock* block)
 {
 #if !ENABLE(CSS_SHAPES)
+    UNUSED_PARAM(block);
     return false;
 #else
     ShapeInsideInfo* info = block->shapeInsideInfo();

Modified: branches/safari-537-branch/Source/WebKit/mac/ChangeLog (155069 => 155070)


--- branches/safari-537-branch/Source/WebKit/mac/ChangeLog	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/WebKit/mac/ChangeLog	2013-09-04 22:14:50 UTC (rev 155070)
@@ -1,3 +1,11 @@
+2013-09-04  Dean Jackson  <[email protected]>
+
+        <rdar://problem/14910916> Disable CSS_SHAPES on safari-537-branch
+
+        Reviewed by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-08-26  Lucas Forschler  <[email protected]>
 
         Merge r154528

Modified: branches/safari-537-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (155069 => 155070)


--- branches/safari-537-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2013-09-04 22:14:50 UTC (rev 155070)
@@ -52,7 +52,7 @@
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ;
-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
+ENABLE_CSS_SHAPES = ;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ;
 ENABLE_CSS_VARIABLES = ;

Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (155069 => 155070)


--- branches/safari-537-branch/Source/WebKit2/ChangeLog	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog	2013-09-04 22:14:50 UTC (rev 155070)
@@ -1,3 +1,11 @@
+2013-09-04  Dean Jackson  <[email protected]>
+
+        <rdar://problem/14910916> Disable CSS_SHAPES on safari-537-branch
+
+        Reviewed by Beth Dakin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-08-26  Lucas Forschler  <[email protected]>
 
         Merge r154528

Modified: branches/safari-537-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (155069 => 155070)


--- branches/safari-537-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2013-09-04 22:08:26 UTC (rev 155069)
+++ branches/safari-537-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2013-09-04 22:14:50 UTC (rev 155070)
@@ -52,7 +52,7 @@
 ENABLE_CSS_IMAGE_RESOLUTION = ;
 ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
 ENABLE_CSS_SHADERS = ;
-ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
+ENABLE_CSS_SHAPES = ;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ;
 ENABLE_CSS_VARIABLES = ;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to