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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 14178009: Remove CSS_REGIONS compile flag from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use RuntimeEnabledFeatures::cssRegionsEnabled all over the places. Guard WEBKIT_REGION_RULE at runt… Created 7 years, 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/css/CSSParser.h » ('j') | Source/core/css/CSSParserMode.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 CSSPropertyWebkitTransformOrigin, 338 CSSPropertyWebkitTransformOrigin,
339 CSSPropertyWebkitTransformStyle, 339 CSSPropertyWebkitTransformStyle,
340 CSSPropertyWebkitTransitionDelay, 340 CSSPropertyWebkitTransitionDelay,
341 CSSPropertyWebkitTransitionDuration, 341 CSSPropertyWebkitTransitionDuration,
342 CSSPropertyWebkitTransitionProperty, 342 CSSPropertyWebkitTransitionProperty,
343 CSSPropertyWebkitTransitionTimingFunction, 343 CSSPropertyWebkitTransitionTimingFunction,
344 CSSPropertyWebkitUserDrag, 344 CSSPropertyWebkitUserDrag,
345 CSSPropertyWebkitUserModify, 345 CSSPropertyWebkitUserModify,
346 CSSPropertyWebkitUserSelect, 346 CSSPropertyWebkitUserSelect,
347 CSSPropertyWebkitWritingMode, 347 CSSPropertyWebkitWritingMode,
348 #if ENABLE(CSS_REGIONS)
349 CSSPropertyWebkitFlowInto, 348 CSSPropertyWebkitFlowInto,
350 CSSPropertyWebkitFlowFrom, 349 CSSPropertyWebkitFlowFrom,
351 CSSPropertyWebkitRegionOverflow, 350 CSSPropertyWebkitRegionOverflow,
352 CSSPropertyWebkitRegionBreakAfter, 351 CSSPropertyWebkitRegionBreakAfter,
353 CSSPropertyWebkitRegionBreakBefore, 352 CSSPropertyWebkitRegionBreakBefore,
354 CSSPropertyWebkitRegionBreakInside, 353 CSSPropertyWebkitRegionBreakInside,
355 #endif
356 CSSPropertyWebkitAppRegion, 354 CSSPropertyWebkitAppRegion,
357 #if ENABLE(CSS_EXCLUSIONS) 355 #if ENABLE(CSS_EXCLUSIONS)
358 CSSPropertyWebkitWrapFlow, 356 CSSPropertyWebkitWrapFlow,
359 CSSPropertyWebkitShapeMargin, 357 CSSPropertyWebkitShapeMargin,
360 CSSPropertyWebkitShapePadding, 358 CSSPropertyWebkitShapePadding,
361 CSSPropertyWebkitWrapThrough, 359 CSSPropertyWebkitWrapThrough,
362 #endif 360 #endif
363 #if ENABLE(SVG) 361 #if ENABLE(SVG)
364 CSSPropertyBufferedRendering, 362 CSSPropertyBufferedRendering,
365 CSSPropertyClipPath, 363 CSSPropertyClipPath,
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 case CSSPropertyWebkitColumnBreakBefore: 1795 case CSSPropertyWebkitColumnBreakBefore:
1798 return cssValuePool().createValue(style->columnBreakBefore()); 1796 return cssValuePool().createValue(style->columnBreakBefore());
1799 case CSSPropertyWebkitColumnBreakInside: 1797 case CSSPropertyWebkitColumnBreakInside:
1800 return cssValuePool().createValue(style->columnBreakInside()); 1798 return cssValuePool().createValue(style->columnBreakInside());
1801 case CSSPropertyWebkitColumnWidth: 1799 case CSSPropertyWebkitColumnWidth:
1802 if (style->hasAutoColumnWidth()) 1800 if (style->hasAutoColumnWidth())
1803 return cssValuePool().createIdentifierValue(CSSValueAuto); 1801 return cssValuePool().createIdentifierValue(CSSValueAuto);
1804 return zoomAdjustedPixelValue(style->columnWidth(), style.get()); 1802 return zoomAdjustedPixelValue(style->columnWidth(), style.get());
1805 case CSSPropertyTabSize: 1803 case CSSPropertyTabSize:
1806 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER); 1804 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER);
1807 #if ENABLE(CSS_REGIONS)
1808 case CSSPropertyWebkitRegionBreakAfter: 1805 case CSSPropertyWebkitRegionBreakAfter:
1809 return cssValuePool().createValue(style->regionBreakAfter()); 1806 return cssValuePool().createValue(style->regionBreakAfter());
1810 case CSSPropertyWebkitRegionBreakBefore: 1807 case CSSPropertyWebkitRegionBreakBefore:
1811 return cssValuePool().createValue(style->regionBreakBefore()); 1808 return cssValuePool().createValue(style->regionBreakBefore());
1812 case CSSPropertyWebkitRegionBreakInside: 1809 case CSSPropertyWebkitRegionBreakInside:
1813 return cssValuePool().createValue(style->regionBreakInside()); 1810 return cssValuePool().createValue(style->regionBreakInside());
1814 #endif
1815 case CSSPropertyCursor: { 1811 case CSSPropertyCursor: {
1816 RefPtr<CSSValueList> list; 1812 RefPtr<CSSValueList> list;
1817 CursorList* cursors = style->cursors(); 1813 CursorList* cursors = style->cursors();
1818 if (cursors && cursors->size() > 0) { 1814 if (cursors && cursors->size() > 0) {
1819 list = CSSValueList::createCommaSeparated(); 1815 list = CSSValueList::createCommaSeparated();
1820 for (unsigned i = 0; i < cursors->size(); ++i) 1816 for (unsigned i = 0; i < cursors->size(); ++i)
1821 if (StyleImage* image = cursors->at(i).image()) 1817 if (StyleImage* image = cursors->at(i).image())
1822 list->append(image->cssValue()); 1818 list->append(image->cssValue());
1823 } 1819 }
1824 RefPtr<CSSValue> value = cssValuePool().createValue(style->cursor()) ; 1820 RefPtr<CSSValue> value = cssValuePool().createValue(style->cursor()) ;
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2554 if (operation->getOperationType() == ClipPathOperation::SHAPE) 2550 if (operation->getOperationType() == ClipPathOperation::SHAPE)
2555 return valueForBasicShape(static_cast<ShapeClipPathOperation *>(operation)->basicShape()); 2551 return valueForBasicShape(static_cast<ShapeClipPathOperation *>(operation)->basicShape());
2556 #if ENABLE(SVG) 2552 #if ENABLE(SVG)
2557 else if (operation->getOperationType() == ClipPathOperation::REF ERENCE) { 2553 else if (operation->getOperationType() == ClipPathOperation::REF ERENCE) {
2558 ReferenceClipPathOperation* referenceOperation = static_cast <ReferenceClipPathOperation*>(operation); 2554 ReferenceClipPathOperation* referenceOperation = static_cast <ReferenceClipPathOperation*>(operation);
2559 return CSSPrimitiveValue::create(referenceOperation->url(), CSSPrimitiveValue::CSS_URI); 2555 return CSSPrimitiveValue::create(referenceOperation->url(), CSSPrimitiveValue::CSS_URI);
2560 } 2556 }
2561 #endif 2557 #endif
2562 } 2558 }
2563 return cssValuePool().createIdentifierValue(CSSValueNone); 2559 return cssValuePool().createIdentifierValue(CSSValueNone);
2564 #if ENABLE(CSS_REGIONS)
2565 case CSSPropertyWebkitFlowInto: 2560 case CSSPropertyWebkitFlowInto:
2566 if (style->flowThread().isNull()) 2561 if (style->flowThread().isNull())
2567 return cssValuePool().createIdentifierValue(CSSValueNone); 2562 return cssValuePool().createIdentifierValue(CSSValueNone);
2568 return cssValuePool().createValue(style->flowThread(), CSSPrimitiveV alue::CSS_STRING); 2563 return cssValuePool().createValue(style->flowThread(), CSSPrimitiveV alue::CSS_STRING);
2569 case CSSPropertyWebkitFlowFrom: 2564 case CSSPropertyWebkitFlowFrom:
2570 if (style->regionThread().isNull()) 2565 if (style->regionThread().isNull())
2571 return cssValuePool().createIdentifierValue(CSSValueNone); 2566 return cssValuePool().createIdentifierValue(CSSValueNone);
2572 return cssValuePool().createValue(style->regionThread(), CSSPrimitiv eValue::CSS_STRING); 2567 return cssValuePool().createValue(style->regionThread(), CSSPrimitiv eValue::CSS_STRING);
2573 case CSSPropertyWebkitRegionOverflow: 2568 case CSSPropertyWebkitRegionOverflow:
2574 return cssValuePool().createValue(style->regionOverflow()); 2569 return cssValuePool().createValue(style->regionOverflow());
2575 #endif
2576 #if ENABLE(CSS_EXCLUSIONS) 2570 #if ENABLE(CSS_EXCLUSIONS)
2577 case CSSPropertyWebkitWrapFlow: 2571 case CSSPropertyWebkitWrapFlow:
2578 return cssValuePool().createValue(style->wrapFlow()); 2572 return cssValuePool().createValue(style->wrapFlow());
2579 case CSSPropertyWebkitShapeMargin: 2573 case CSSPropertyWebkitShapeMargin:
2580 return cssValuePool().createValue(style->shapeMargin()); 2574 return cssValuePool().createValue(style->shapeMargin());
2581 case CSSPropertyWebkitShapePadding: 2575 case CSSPropertyWebkitShapePadding:
2582 return cssValuePool().createValue(style->shapePadding()); 2576 return cssValuePool().createValue(style->shapePadding());
2583 case CSSPropertyWebkitShapeInside: 2577 case CSSPropertyWebkitShapeInside:
2584 if (!style->shapeInside()) 2578 if (!style->shapeInside())
2585 return cssValuePool().createIdentifierValue(CSSValueAuto); 2579 return cssValuePool().createIdentifierValue(CSSValueAuto);
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
2993 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2987 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2994 CSSPropertyB ackgroundClip }; 2988 CSSPropertyB ackgroundClip };
2995 2989
2996 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2990 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2997 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2991 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
2998 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2992 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
2999 return list.release(); 2993 return list.release();
3000 } 2994 }
3001 2995
3002 } // namespace WebCore 2996 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSParser.h » ('j') | Source/core/css/CSSParserMode.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698