Title: [96026] trunk
- Revision
- 96026
- Author
- [email protected]
- Date
- 2011-09-26 16:07:50 -0700 (Mon, 26 Sep 2011)
Log Message
switch the initial value of flex-order to 0
https://bugs.webkit.org/show_bug.cgi?id=68820
Source/WebCore:
The spec changed from having an initial value of 1 to 0.
Reviewed by Ojan Vafai.
* rendering/style/RenderStyle.h:
(WebCore::InheritedFlags::initialFlexOrder):
LayoutTests:
Reviewed by Ojan Vafai.
* css3/flexbox/flex-order.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (96025 => 96026)
--- trunk/LayoutTests/ChangeLog 2011-09-26 23:07:28 UTC (rev 96025)
+++ trunk/LayoutTests/ChangeLog 2011-09-26 23:07:50 UTC (rev 96026)
@@ -1,3 +1,12 @@
+2011-09-26 Tony Chang <[email protected]>
+
+ switch the initial value of flex-order to 0
+ https://bugs.webkit.org/show_bug.cgi?id=68820
+
+ Reviewed by Ojan Vafai.
+
+ * css3/flexbox/flex-order.html:
+
2011-09-26 Chris Marrin <[email protected]>
Enable requestAnimationFrame on Windows
Modified: trunk/LayoutTests/css3/flexbox/flex-order.html (96025 => 96026)
--- trunk/LayoutTests/css3/flexbox/flex-order.html 2011-09-26 23:07:28 UTC (rev 96025)
+++ trunk/LayoutTests/css3/flexbox/flex-order.html 2011-09-26 23:07:50 UTC (rev 96026)
@@ -33,7 +33,7 @@
<body>
<div style="display: -webkit-flexbox" class="horizontal-box">
- <div class="first" style="width: -webkit-flex(1); -webkit-flex-order: 1"></div>
+ <div class="first" style="width: -webkit-flex(1); -webkit-flex-order: 0"></div>
<div class="second" style="width: -webkit-flex(1);"></div>
<div class="third" style="width: -webkit-flex(1); -webkit-flex-order: 3"></div>
<div class="fourth" style="width: -webkit-flex(1); -webkit-flex-order: 20"></div>
@@ -48,10 +48,10 @@
<!-- The example from the spec. -->
<div style="display: -webkit-flexbox" class="horizontal-box">
- <div class="third" style="width: -webkit-flex(1); -webkit-flex-order: 2"></div>
+ <div class="third" style="width: -webkit-flex(1); -webkit-flex-order: 1"></div>
<div class="first" style="width: -webkit-flex(1)"></div>
- <div class="fourth" style="width: -webkit-flex(1); -webkit-flex-order: 2"></div>
- <div class="second" style="width: -webkit-flex(1); -webkit-flex-order: 1"></div>
+ <div class="fourth" style="width: -webkit-flex(1); -webkit-flex-order: 1"></div>
+ <div class="second" style="width: -webkit-flex(1); -webkit-flex-order: 0"></div>
</div>
<div style="display: -webkit-flexbox" class="horizontal-box">
@@ -79,8 +79,8 @@
<div style="display: -webkit-flexbox" class="horizontal-box">
<div class="second" style="width: -webkit-flex(1); -webkit-flex-order: 0"></div>
<div class="first" style="width: -webkit-flex(1); -webkit-flex-order: -1"></div>
- <div class="third" style="width: -webkit-flex(1); -webkit-flex-order: 1"></div>
- <div class="fourth" style="width: -webkit-flex(1)"></div>
+ <div class="fourth" style="width: -webkit-flex(1); -webkit-flex-order: 1"></div>
+ <div class="third" style="width: -webkit-flex(1)"></div>
</div>
<!-- Values greater than what can be stored in an int are clamped from
Modified: trunk/Source/WebCore/ChangeLog (96025 => 96026)
--- trunk/Source/WebCore/ChangeLog 2011-09-26 23:07:28 UTC (rev 96025)
+++ trunk/Source/WebCore/ChangeLog 2011-09-26 23:07:50 UTC (rev 96026)
@@ -1,3 +1,15 @@
+2011-09-26 Tony Chang <[email protected]>
+
+ switch the initial value of flex-order to 0
+ https://bugs.webkit.org/show_bug.cgi?id=68820
+
+ The spec changed from having an initial value of 1 to 0.
+
+ Reviewed by Ojan Vafai.
+
+ * rendering/style/RenderStyle.h:
+ (WebCore::InheritedFlags::initialFlexOrder):
+
2011-09-26 Chris Rogers <[email protected]>
OfflineAudioDestinationNode must wait for thread completion in uninitialize()
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (96025 => 96026)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2011-09-26 23:07:28 UTC (rev 96025)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2011-09-26 23:07:50 UTC (rev 96026)
@@ -1385,7 +1385,7 @@
static float initialFlexboxWidthNegativeFlex() { return 0; }
static float initialFlexboxHeightPositiveFlex() { return 0; }
static float initialFlexboxHeightNegativeFlex() { return 0; }
- static int initialFlexOrder() { return 1; }
+ static int initialFlexOrder() { return 0; }
static EFlexPack initialFlexPack() { return PackStart; }
static EFlexAlign initialFlexAlign() { return AlignStretch; }
static EFlexFlow initialFlexFlow() { return FlowRow; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
