Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(609)

Unified Diff: sky/engine/core/rendering/RenderBox.cpp

Issue 689853003: Remove CSS Grid Layout and grid media queries. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderGrid.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBox.cpp
diff --git a/sky/engine/core/rendering/RenderBox.cpp b/sky/engine/core/rendering/RenderBox.cpp
index 151a3ab8189277eecda0423bfd008224b5c98fc4..94644d8421c3eed5eb7f1971775040bc85b7bae4 100644
--- a/sky/engine/core/rendering/RenderBox.cpp
+++ b/sky/engine/core/rendering/RenderBox.cpp
@@ -40,7 +40,6 @@
#include "core/rendering/PaintInfo.h"
#include "core/rendering/RenderFlexibleBox.h"
#include "core/rendering/RenderGeometryMap.h"
-#include "core/rendering/RenderGrid.h"
#include "core/rendering/RenderInline.h"
#include "core/rendering/RenderLayer.h"
#include "core/rendering/RenderView.h"
@@ -57,8 +56,7 @@ namespace blink {
// Used by flexible boxes when flexing this element and by table cells.
typedef WTF::HashMap<const RenderBox*, LayoutUnit> OverrideSizeMap;
-// Used by grid elements to properly size their grid items.
-// FIXME: Move these into RenderBoxRareData.
+//FIXME(sky): Remove
static OverrideSizeMap* gOverrideContainingBlockLogicalHeightMap = 0;
static OverrideSizeMap* gOverrideContainingBlockLogicalWidthMap = 0;
@@ -175,7 +173,6 @@ void RenderBox::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle
}
updateShapeOutsideInfoAfterStyleChange(*style(), oldStyle);
- updateGridPositionAfterStyleChange(oldStyle);
}
void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle)
@@ -202,24 +199,6 @@ void RenderBox::updateShapeOutsideInfoAfterStyleChange(const RenderStyle& style,
markShapeOutsideDependentsForLayout();
}
-void RenderBox::updateGridPositionAfterStyleChange(const RenderStyle* oldStyle)
-{
- if (!oldStyle || !parent() || !parent()->isRenderGrid())
- return;
-
- if (oldStyle->gridColumnStart() == style()->gridColumnStart()
- && oldStyle->gridColumnEnd() == style()->gridColumnEnd()
- && oldStyle->gridRowStart() == style()->gridRowStart()
- && oldStyle->gridRowEnd() == style()->gridRowEnd()
- && oldStyle->order() == style()->order()
- && oldStyle->hasOutOfFlowPosition() == style()->hasOutOfFlowPosition())
- return;
-
- // It should be possible to not dirty the grid in some cases (like moving an explicitly placed grid item).
- // For now, it's more simple to just always recompute the grid.
- toRenderGrid(parent())->dirtyGrid();
-}
-
void RenderBox::updateFromStyle()
{
RenderBoxModelObject::updateFromStyle();
@@ -1820,7 +1799,7 @@ void RenderBox::computeLogicalWidth(LogicalExtentComputedValues& computedValues)
computedValues.m_margins.m_end, style()->marginStart(), style()->marginEnd());
if (!hasPerpendicularContainingBlock && containerLogicalWidth && containerLogicalWidth != (computedValues.m_extent + computedValues.m_margins.m_start + computedValues.m_margins.m_end)
- && !isFloating() && !isInline() && !cb->isFlexibleBox() && !cb->isRenderGrid()) {
+ && !isFloating() && !isInline() && !cb->isFlexibleBox()) {
LayoutUnit newMargin = containerLogicalWidth - computedValues.m_extent - cb->marginStartForChild(this);
bool hasInvertedDirection = cb->style()->isLeftToRightDirection() != style()->isLeftToRightDirection();
if (hasInvertedDirection)
« no previous file with comments | « sky/engine/core/rendering/RenderBox.h ('k') | sky/engine/core/rendering/RenderGrid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698