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

Unified Diff: sky/engine/core/css/resolver/StyleBuilderCustom.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/css/resolver/StyleBuilderConverter.cpp ('k') | sky/engine/core/frame/PRESUBMIT.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleBuilderCustom.cpp
diff --git a/sky/engine/core/css/resolver/StyleBuilderCustom.cpp b/sky/engine/core/css/resolver/StyleBuilderCustom.cpp
index b80cb333e57a364e87b8bd05e9b2343eb60a148d..be916f3a0e4869100b9549748985009543790dac 100644
--- a/sky/engine/core/css/resolver/StyleBuilderCustom.cpp
+++ b/sky/engine/core/css/resolver/StyleBuilderCustom.cpp
@@ -47,7 +47,6 @@
#include "core/css/CSSCursorImageValue.h"
#include "core/css/CSSFontValue.h"
#include "core/css/CSSGradientValue.h"
-#include "core/css/CSSGridTemplateAreasValue.h"
#include "core/css/CSSHelper.h"
#include "core/css/CSSImageSetValue.h"
#include "core/css/CSSLineBoxContainValue.h"
@@ -119,37 +118,6 @@ void StyleBuilderFunctions::applyValueCSSPropertyColor(StyleResolverState& state
state.style()->setColor(StyleBuilderConverter::convertColor(state, value));
}
-void StyleBuilderFunctions::applyInitialCSSPropertyJustifyItems(StyleResolverState& state)
-{
- state.style()->setJustifyItems(RenderStyle::initialJustifyItems());
- state.style()->setJustifyItemsOverflowAlignment(RenderStyle::initialJustifyItemsOverflowAlignment());
- state.style()->setJustifyItemsPositionType(RenderStyle::initialJustifyItemsPositionType());
-}
-
-void StyleBuilderFunctions::applyInheritCSSPropertyJustifyItems(StyleResolverState& state)
-{
- state.style()->setJustifyItems(state.parentStyle()->justifyItems());
- state.style()->setJustifyItemsOverflowAlignment(state.parentStyle()->justifyItemsOverflowAlignment());
- state.style()->setJustifyItemsPositionType(state.parentStyle()->justifyItemsPositionType());
-}
-
-void StyleBuilderFunctions::applyValueCSSPropertyJustifyItems(StyleResolverState& state, CSSValue* value)
-{
-
- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
- if (Pair* pairValue = primitiveValue->getPairValue()) {
- if (pairValue->first()->getValueID() == CSSValueLegacy) {
- state.style()->setJustifyItemsPositionType(LegacyPosition);
- state.style()->setJustifyItems(*pairValue->second());
- } else {
- state.style()->setJustifyItems(*pairValue->first());
- state.style()->setJustifyItemsOverflowAlignment(*pairValue->second());
- }
- } else {
- state.style()->setJustifyItems(*primitiveValue);
- }
-}
-
void StyleBuilderFunctions::applyInitialCSSPropertyCursor(StyleResolverState& state)
{
state.style()->clearCursorList();
@@ -221,43 +189,6 @@ void StyleBuilderFunctions::applyValueCSSPropertyFontSize(StyleResolverState& st
state.fontBuilder().setFontSizeValue(value, state.parentStyle(), state.rootElementStyle());
}
-void StyleBuilderFunctions::applyInitialCSSPropertyGridTemplateAreas(StyleResolverState& state)
-{
- state.style()->setNamedGridArea(RenderStyle::initialNamedGridArea());
- state.style()->setNamedGridAreaRowCount(RenderStyle::initialNamedGridAreaCount());
- state.style()->setNamedGridAreaColumnCount(RenderStyle::initialNamedGridAreaCount());
-}
-
-void StyleBuilderFunctions::applyInheritCSSPropertyGridTemplateAreas(StyleResolverState& state)
-{
- state.style()->setNamedGridArea(state.parentStyle()->namedGridArea());
- state.style()->setNamedGridAreaRowCount(state.parentStyle()->namedGridAreaRowCount());
- state.style()->setNamedGridAreaColumnCount(state.parentStyle()->namedGridAreaColumnCount());
-}
-
-void StyleBuilderFunctions::applyValueCSSPropertyGridTemplateAreas(StyleResolverState& state, CSSValue* value)
-{
- if (value->isPrimitiveValue()) {
- // FIXME: Shouldn't we clear the grid-area values
- ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
- return;
- }
-
- CSSGridTemplateAreasValue* gridTemplateAreasValue = toCSSGridTemplateAreasValue(value);
- const NamedGridAreaMap& newNamedGridAreas = gridTemplateAreasValue->gridAreaMap();
-
- NamedGridLinesMap namedGridColumnLines = state.style()->namedGridColumnLines();
- NamedGridLinesMap namedGridRowLines = state.style()->namedGridRowLines();
- StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridColumnLines, ForColumns);
- StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridRowLines, ForRows);
- state.style()->setNamedGridColumnLines(namedGridColumnLines);
- state.style()->setNamedGridRowLines(namedGridRowLines);
-
- state.style()->setNamedGridArea(newNamedGridAreas);
- state.style()->setNamedGridAreaRowCount(gridTemplateAreasValue->rowCount());
- state.style()->setNamedGridAreaColumnCount(gridTemplateAreasValue->columnCount());
-}
-
void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState& state, CSSValue* value)
{
CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
@@ -1041,60 +972,4 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextOrientation(StyleReso
state.setTextOrientation(*toCSSPrimitiveValue(value));
}
-void StyleBuilderFunctions::applyValueCSSPropertyGridAutoFlow(StyleResolverState& state, CSSValue* value)
-{
- ASSERT(value->isValueList());
- CSSValueList* list = toCSSValueList(value);
-
- CSSPrimitiveValue* first = list->length() >= 1 ? toCSSPrimitiveValue(list->item(0)) : nullptr;
-
- if (!first) {
- applyInitialCSSPropertyGridAutoFlow(state);
- return;
- }
-
- CSSPrimitiveValue* second = list->length() == 2 ? toCSSPrimitiveValue(list->item(1)) : nullptr;
-
- GridAutoFlow autoFlow = RenderStyle::initialGridAutoFlow();
- switch (first->getValueID()) {
- case CSSValueRow:
- if (second) {
- if (second->getValueID() == CSSValueDense)
- autoFlow = AutoFlowRowDense;
- else
- autoFlow = AutoFlowStackRow;
- } else {
- autoFlow = AutoFlowRow;
- }
- break;
- case CSSValueColumn:
- if (second) {
- if (second->getValueID() == CSSValueDense)
- autoFlow = AutoFlowColumnDense;
- else
- autoFlow = AutoFlowStackColumn;
- } else {
- autoFlow = AutoFlowColumn;
- }
- break;
- case CSSValueDense:
- if (second && second->getValueID() == CSSValueColumn)
- autoFlow = AutoFlowColumnDense;
- else
- autoFlow = AutoFlowRowDense;
- break;
- case CSSValueStack:
- if (second && second->getValueID() == CSSValueColumn)
- autoFlow = AutoFlowStackColumn;
- else
- autoFlow = AutoFlowStackRow;
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
-
- state.style()->setGridAutoFlow(autoFlow);
-}
-
} // namespace blink
« no previous file with comments | « sky/engine/core/css/resolver/StyleBuilderConverter.cpp ('k') | sky/engine/core/frame/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698