Diff
Modified: trunk/LayoutTests/ChangeLog (144761 => 144762)
--- trunk/LayoutTests/ChangeLog 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/LayoutTests/ChangeLog 2013-03-05 16:27:54 UTC (rev 144762)
@@ -1,3 +1,14 @@
+2013-03-05 Julien Chaffraix <jchaffr...@webkit.org>
+
+ [CSS Grid Layout] Add parsing for grid-{end|after}
+ https://bugs.webkit.org/show_bug.cgi?id=111372
+
+ Reviewed by Tony Chang.
+
+ * fast/css-grid-layout/grid-item-end-after-get-set-expected.txt: Added.
+ * fast/css-grid-layout/grid-item-end-after-get-set.html: Added.
+ Note that some of the test fails as we don't treat grid-{row|column} as a shorthand.
+
2013-03-05 Mark Lam <mark....@apple.com>
Improve robustness of WebSQL quota management.
Added: trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt (0 => 144762)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt 2013-03-05 16:27:54 UTC (rev 144762)
@@ -0,0 +1,56 @@
+Test that setting and getting grid-end and grid-after works as expected
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test getting -webkit-grid-end and -webkit-grid-after set through CSS
+PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-end') is 'auto'
+PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column') is 'auto'
+PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
+PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row') is 'auto'
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-end') is '10'
+FAIL getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column') should be 10. Was auto.
+PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-after') is '15'
+FAIL getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row') should be 15. Was auto.
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-end') is '-10'
+FAIL getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column') should be -10. Was auto.
+PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-after') is '-15'
+FAIL getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row') should be -15. Was auto.
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-end') is 'auto'
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column') is 'auto'
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
+PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row') is 'auto'
+
+Test the initial value
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto'
+
+Test getting and setting grid-end and grid-after through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '18'
+FAIL getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') should be 18. Was auto.
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '66'
+FAIL getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') should be 66. Was auto.
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '-55'
+FAIL getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') should be -55. Was auto.
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '-40'
+FAIL getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') should be -40. Was auto.
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto'
+
+Test setting grid-end and grid-after back to 'auto' through JS
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '18'
+FAIL getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') should be 18. Was auto.
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '66'
+FAIL getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') should be 66. Was auto.
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html (0 => 144762)
--- trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html 2013-03-05 16:27:54 UTC (rev 144762)
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
+</script>
+<style>
+.gridItemWithPositiveInteger {
+ -webkit-grid-end: 10;
+ -webkit-grid-after: 15;
+}
+.gridItemWithNegativeInteger {
+ -webkit-grid-end: -10;
+ -webkit-grid-after: -15;
+}
+.gridItemWithAuto {
+ -webkit-grid-end: auto;
+ -webkit-grid-after: auto;
+}
+</style>
+<script src=""
+</head>
+<body>
+<!-- The first has no properties set on it. -->
+<div id="gridElement"></div>
+<div class="gridItemWithPositiveInteger" id="gridItemWithPositiveInteger"></div>
+<div class="gridItemWithNegativeInteger" id="gridItemWithNegativeInteger"></div>
+<div class="gridItemWithAuto" id="gridItemWithAutoElement"></div>
+<script>
+ description('Test that setting and getting grid-end and grid-after works as expected');
+
+ debug("Test getting -webkit-grid-end and -webkit-grid-after set through CSS");
+ var gridElement = document.getElementById("gridElement");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-end')", "'auto'");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column')", "'auto'");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
+ shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row')", "'auto'");
+
+ var gridItemWithPositiveInteger = document.getElementById("gridItemWithPositiveInteger");
+ shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-end')", "'10'");
+ shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column')", "'10'");
+ shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-after')", "'15'");
+ shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row')", "'15'");
+
+ var gridItemWithNegativeInteger = document.getElementById("gridItemWithNegativeInteger");
+ shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-end')", "'-10'");
+ shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column')", "'-10'");
+ shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-after')", "'-15'");
+ shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row')", "'-15'");
+
+ var gridItemWithAutoElement = document.getElementById("gridItemWithAutoElement");
+ shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-end')", "'auto'");
+ shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column')", "'auto'");
+ shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
+ shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row')", "'auto'");
+
+ debug("");
+ debug("Test the initial value");
+ var element = document.createElement("div");
+ document.body.appendChild(element);
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto'");
+
+ debug("");
+ debug("Test getting and setting grid-end and grid-after through JS");
+ element.style.webkitGridEnd = "18";
+ element.style.webkitGridAfter = "66";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'66'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66'");
+
+ element = document.createElement("div");
+ document.body.appendChild(element);
+ element.style.webkitGridEnd = "-55";
+ element.style.webkitGridAfter = "-40";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'-55'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'-55'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'-40'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'-40'");
+
+ element = document.createElement("div");
+ document.body.appendChild(element);
+ element.style.webkitGridEnd = "auto";
+ element.style.webkitGridAfter = "auto";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto'");
+
+ debug("");
+ debug("Test setting grid-end and grid-after back to 'auto' through JS");
+ element.style.webkitGridEnd = "18";
+ element.style.webkitGridAfter = "66";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'66'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66'");
+ element.style.webkitGridEnd = "auto";
+ element.style.webkitGridAfter = "auto";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto'");
+</script>
+<script src=""
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (144761 => 144762)
--- trunk/Source/WebCore/ChangeLog 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/ChangeLog 2013-03-05 16:27:54 UTC (rev 144762)
@@ -1,3 +1,44 @@
+2013-03-05 Julien Chaffraix <jchaffr...@webkit.org>
+
+ [CSS Grid Layout] Add parsing for grid-{end|after}
+ https://bugs.webkit.org/show_bug.cgi?id=111372
+
+ Reviewed by Tony Chang.
+
+ Test: fast/css-grid-layout/grid-item-end-after-get-set.html
+
+ This change adds the proper support for grid-{end|after}. It doesn't update
+ grid-{row|column} to be a shorthand for both grid-{before|start} and grid-{after|end}
+ though.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ Added the new properties to our known properties. Also added
+ support for getComputedStyle.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ Added parsing for the new properties.
+
+ * css/CSSProperty.cpp:
+ (WebCore::CSSProperty::isInheritedProperty):
+ The new properties are not inherited.
+
+ * css/CSSPropertyNames.in:
+ Added the new properties.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ Added code to handle applying them to our style.
+
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleGridItemData.cpp:
+ (WebCore::StyleGridItemData::StyleGridItemData):
+ * rendering/style/StyleGridItemData.h:
+ (WebCore::StyleGridItemData::operator==):
+ (StyleGridItemData):
+ Updated our representation to store the new properties.
+
2013-03-05 Andrey Kosyakov <ca...@chromium.org>
Unreviewed follow-up to r144756, fix broken inspector-less build.
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (144761 => 144762)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-03-05 16:27:54 UTC (rev 144762)
@@ -285,7 +285,9 @@
CSSPropertyWebkitGridColumns,
CSSPropertyWebkitGridRows,
CSSPropertyWebkitGridStart,
+ CSSPropertyWebkitGridEnd,
CSSPropertyWebkitGridBefore,
+ CSSPropertyWebkitGridAfter,
CSSPropertyWebkitGridColumn,
CSSPropertyWebkitGridRow,
CSSPropertyWebkitHighlight,
@@ -1933,9 +1935,13 @@
case CSSPropertyWebkitGridStart:
case CSSPropertyWebkitGridColumn:
return valueForGridPosition(style->gridItemStart());
+ case CSSPropertyWebkitGridEnd:
+ return valueForGridPosition(style->gridItemEnd());
case CSSPropertyWebkitGridBefore:
case CSSPropertyWebkitGridRow:
return valueForGridPosition(style->gridItemBefore());
+ case CSSPropertyWebkitGridAfter:
+ return valueForGridPosition(style->gridItemAfter());
case CSSPropertyHeight:
if (renderer) {
Modified: trunk/Source/WebCore/css/CSSParser.cpp (144761 => 144762)
--- trunk/Source/WebCore/css/CSSParser.cpp 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-03-05 16:27:54 UTC (rev 144762)
@@ -2600,7 +2600,9 @@
return parseGridTrackList(propId, important);
case CSSPropertyWebkitGridStart:
+ case CSSPropertyWebkitGridEnd:
case CSSPropertyWebkitGridBefore:
+ case CSSPropertyWebkitGridAfter:
case CSSPropertyWebkitGridColumn:
case CSSPropertyWebkitGridRow:
if (!cssGridLayoutEnabled())
Modified: trunk/Source/WebCore/css/CSSProperty.cpp (144761 => 144762)
--- trunk/Source/WebCore/css/CSSProperty.cpp 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2013-03-05 16:27:54 UTC (rev 144762)
@@ -584,7 +584,9 @@
case CSSPropertyWebkitGridColumns:
case CSSPropertyWebkitGridRows:
case CSSPropertyWebkitGridStart:
+ case CSSPropertyWebkitGridEnd:
case CSSPropertyWebkitGridBefore:
+ case CSSPropertyWebkitGridAfter:
case CSSPropertyWebkitGridColumn:
case CSSPropertyWebkitGridRow:
case CSSPropertyWebkitLineClamp:
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (144761 => 144762)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2013-03-05 16:27:54 UTC (rev 144762)
@@ -293,7 +293,9 @@
-webkit-grid-columns
-webkit-grid-rows
-webkit-grid-start
+-webkit-grid-end
-webkit-grid-before
+-webkit-grid-after
-webkit-grid-column
-webkit-grid-row
-webkit-grid-auto-flow
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (144761 => 144762)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-03-05 16:27:54 UTC (rev 144762)
@@ -3567,6 +3567,7 @@
}
case CSSPropertyWebkitGridStart:
+ // FIXME: This is wrong as the property should be a shorthand.
case CSSPropertyWebkitGridColumn: {
GridPosition startPosition;
if (!createGridPosition(value, startPosition))
@@ -3574,7 +3575,16 @@
state.style()->setGridItemStart(startPosition);
return;
}
+ case CSSPropertyWebkitGridEnd: {
+ GridPosition endPosition;
+ if (!createGridPosition(value, endPosition))
+ return;
+ state.style()->setGridItemEnd(endPosition);
+ return;
+ }
+
case CSSPropertyWebkitGridBefore:
+ // FIXME: This is wrong as the property should be a shorthand.
case CSSPropertyWebkitGridRow: {
GridPosition beforePosition;
if (!createGridPosition(value, beforePosition))
@@ -3582,6 +3592,14 @@
state.style()->setGridItemBefore(beforePosition);
return;
}
+ case CSSPropertyWebkitGridAfter: {
+ GridPosition afterPosition;
+ if (!createGridPosition(value, afterPosition))
+ return;
+ state.style()->setGridItemAfter(afterPosition);
+ return;
+ }
+
// These properties are aliased and StyleBuilder already applied the property on the prefixed version.
case CSSPropertyTransitionDelay:
case CSSPropertyTransitionDuration:
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (144761 => 144762)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-03-05 16:27:54 UTC (rev 144762)
@@ -766,7 +766,9 @@
GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_gridAutoFlow; }
const GridPosition& gridItemStart() const { return rareNonInheritedData->m_gridItem->m_gridStart; }
+ const GridPosition& gridItemEnd() const { return rareNonInheritedData->m_gridItem->m_gridEnd; }
const GridPosition& gridItemBefore() const { return rareNonInheritedData->m_gridItem->m_gridBefore; }
+ const GridPosition& gridItemAfter() const { return rareNonInheritedData->m_gridItem->m_gridAfter; }
const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShadow.get(); }
void getBoxShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bottom, LayoutUnit& left) const { getShadowExtent(boxShadow(), top, right, bottom, left); }
@@ -1254,7 +1256,9 @@
void setGridRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridRows, lengths); }
void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoFlow, flow); }
void setGridItemStart(const GridPosition& startPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridStart, startPosition); }
+ void setGridItemEnd(const GridPosition& endPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridEnd, endPosition); }
void setGridItemBefore(const GridPosition& beforePosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridBefore, beforePosition); }
+ void setGridItemAfter(const GridPosition& afterPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridAfter, afterPosition); }
void setMarqueeIncrement(const Length& f) { SET_VAR(rareNonInheritedData.access()->m_marquee, increment, f); }
void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marquee, speed, f); }
Modified: trunk/Source/WebCore/rendering/style/StyleGridItemData.cpp (144761 => 144762)
--- trunk/Source/WebCore/rendering/style/StyleGridItemData.cpp 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/rendering/style/StyleGridItemData.cpp 2013-03-05 16:27:54 UTC (rev 144762)
@@ -36,14 +36,18 @@
StyleGridItemData::StyleGridItemData()
: m_gridStart(RenderStyle::initialGridPosition())
+ , m_gridEnd(RenderStyle::initialGridPosition())
, m_gridBefore(RenderStyle::initialGridPosition())
+ , m_gridAfter(RenderStyle::initialGridPosition())
{
}
StyleGridItemData::StyleGridItemData(const StyleGridItemData& o)
: RefCounted<StyleGridItemData>()
, m_gridStart(o.m_gridStart)
+ , m_gridEnd(o.m_gridEnd)
, m_gridBefore(o.m_gridBefore)
+ , m_gridAfter(o.m_gridAfter)
{
}
Modified: trunk/Source/WebCore/rendering/style/StyleGridItemData.h (144761 => 144762)
--- trunk/Source/WebCore/rendering/style/StyleGridItemData.h 2013-03-05 16:06:19 UTC (rev 144761)
+++ trunk/Source/WebCore/rendering/style/StyleGridItemData.h 2013-03-05 16:27:54 UTC (rev 144762)
@@ -46,7 +46,8 @@
bool operator==(const StyleGridItemData& o) const
{
- return m_gridStart == o.m_gridStart && m_gridBefore == o.m_gridBefore;
+ return m_gridStart == o.m_gridStart && m_gridEnd == o.m_gridEnd
+ && m_gridBefore == o.m_gridBefore && m_gridAfter == o.m_gridAfter;
}
bool operator!=(const StyleGridItemData& o) const
@@ -55,7 +56,9 @@
}
GridPosition m_gridStart;
+ GridPosition m_gridEnd;
GridPosition m_gridBefore;
+ GridPosition m_gridAfter;
private:
StyleGridItemData();
