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

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: Rework patch after https://codereview.chromium.org/14324009 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.cpp » ('j') | Source/core/css/CSSParser.cpp » ('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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 CSSPropertyWebkitTransformOrigin, 341 CSSPropertyWebkitTransformOrigin,
342 CSSPropertyWebkitTransformStyle, 342 CSSPropertyWebkitTransformStyle,
343 CSSPropertyWebkitTransitionDelay, 343 CSSPropertyWebkitTransitionDelay,
344 CSSPropertyWebkitTransitionDuration, 344 CSSPropertyWebkitTransitionDuration,
345 CSSPropertyWebkitTransitionProperty, 345 CSSPropertyWebkitTransitionProperty,
346 CSSPropertyWebkitTransitionTimingFunction, 346 CSSPropertyWebkitTransitionTimingFunction,
347 CSSPropertyWebkitUserDrag, 347 CSSPropertyWebkitUserDrag,
348 CSSPropertyWebkitUserModify, 348 CSSPropertyWebkitUserModify,
349 CSSPropertyWebkitUserSelect, 349 CSSPropertyWebkitUserSelect,
350 CSSPropertyWebkitWritingMode, 350 CSSPropertyWebkitWritingMode,
351 #if ENABLE(CSS_REGIONS)
352 CSSPropertyWebkitFlowInto, 351 CSSPropertyWebkitFlowInto,
353 CSSPropertyWebkitFlowFrom, 352 CSSPropertyWebkitFlowFrom,
354 CSSPropertyWebkitRegionOverflow, 353 CSSPropertyWebkitRegionOverflow,
355 CSSPropertyWebkitRegionBreakAfter, 354 CSSPropertyWebkitRegionBreakAfter,
356 CSSPropertyWebkitRegionBreakBefore, 355 CSSPropertyWebkitRegionBreakBefore,
357 CSSPropertyWebkitRegionBreakInside, 356 CSSPropertyWebkitRegionBreakInside,
358 #endif
359 CSSPropertyWebkitAppRegion, 357 CSSPropertyWebkitAppRegion,
360 #if ENABLE(CSS_EXCLUSIONS) 358 #if ENABLE(CSS_EXCLUSIONS)
361 CSSPropertyWebkitWrapFlow, 359 CSSPropertyWebkitWrapFlow,
362 CSSPropertyWebkitShapeMargin, 360 CSSPropertyWebkitShapeMargin,
363 CSSPropertyWebkitShapePadding, 361 CSSPropertyWebkitShapePadding,
364 CSSPropertyWebkitWrapThrough, 362 CSSPropertyWebkitWrapThrough,
365 #endif 363 #endif
366 #if ENABLE(SVG) 364 #if ENABLE(SVG)
367 CSSPropertyBufferedRendering, 365 CSSPropertyBufferedRendering,
368 CSSPropertyClipPath, 366 CSSPropertyClipPath,
(...skipping 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1800 case CSSPropertyWebkitColumnBreakBefore: 1798 case CSSPropertyWebkitColumnBreakBefore:
1801 return cssValuePool().createValue(style->columnBreakBefore()); 1799 return cssValuePool().createValue(style->columnBreakBefore());
1802 case CSSPropertyWebkitColumnBreakInside: 1800 case CSSPropertyWebkitColumnBreakInside:
1803 return cssValuePool().createValue(style->columnBreakInside()); 1801 return cssValuePool().createValue(style->columnBreakInside());
1804 case CSSPropertyWebkitColumnWidth: 1802 case CSSPropertyWebkitColumnWidth:
1805 if (style->hasAutoColumnWidth()) 1803 if (style->hasAutoColumnWidth())
1806 return cssValuePool().createIdentifierValue(CSSValueAuto); 1804 return cssValuePool().createIdentifierValue(CSSValueAuto);
1807 return zoomAdjustedPixelValue(style->columnWidth(), style.get()); 1805 return zoomAdjustedPixelValue(style->columnWidth(), style.get());
1808 case CSSPropertyTabSize: 1806 case CSSPropertyTabSize:
1809 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER); 1807 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER);
1810 #if ENABLE(CSS_REGIONS)
1811 case CSSPropertyWebkitRegionBreakAfter: 1808 case CSSPropertyWebkitRegionBreakAfter:
1812 return cssValuePool().createValue(style->regionBreakAfter()); 1809 return cssValuePool().createValue(style->regionBreakAfter());
1813 case CSSPropertyWebkitRegionBreakBefore: 1810 case CSSPropertyWebkitRegionBreakBefore:
1814 return cssValuePool().createValue(style->regionBreakBefore()); 1811 return cssValuePool().createValue(style->regionBreakBefore());
1815 case CSSPropertyWebkitRegionBreakInside: 1812 case CSSPropertyWebkitRegionBreakInside:
1816 return cssValuePool().createValue(style->regionBreakInside()); 1813 return cssValuePool().createValue(style->regionBreakInside());
1817 #endif
1818 case CSSPropertyCursor: { 1814 case CSSPropertyCursor: {
1819 RefPtr<CSSValueList> list; 1815 RefPtr<CSSValueList> list;
1820 CursorList* cursors = style->cursors(); 1816 CursorList* cursors = style->cursors();
1821 if (cursors && cursors->size() > 0) { 1817 if (cursors && cursors->size() > 0) {
1822 list = CSSValueList::createCommaSeparated(); 1818 list = CSSValueList::createCommaSeparated();
1823 for (unsigned i = 0; i < cursors->size(); ++i) 1819 for (unsigned i = 0; i < cursors->size(); ++i)
1824 if (StyleImage* image = cursors->at(i).image()) 1820 if (StyleImage* image = cursors->at(i).image())
1825 list->append(image->cssValue()); 1821 list->append(image->cssValue());
1826 } 1822 }
1827 RefPtr<CSSValue> value = cssValuePool().createValue(style->cursor()) ; 1823 RefPtr<CSSValue> value = cssValuePool().createValue(style->cursor()) ;
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
2561 if (operation->getOperationType() == ClipPathOperation::SHAPE) 2557 if (operation->getOperationType() == ClipPathOperation::SHAPE)
2562 return valueForBasicShape(static_cast<ShapeClipPathOperation *>(operation)->basicShape()); 2558 return valueForBasicShape(static_cast<ShapeClipPathOperation *>(operation)->basicShape());
2563 #if ENABLE(SVG) 2559 #if ENABLE(SVG)
2564 else if (operation->getOperationType() == ClipPathOperation::REF ERENCE) { 2560 else if (operation->getOperationType() == ClipPathOperation::REF ERENCE) {
2565 ReferenceClipPathOperation* referenceOperation = static_cast <ReferenceClipPathOperation*>(operation); 2561 ReferenceClipPathOperation* referenceOperation = static_cast <ReferenceClipPathOperation*>(operation);
2566 return CSSPrimitiveValue::create(referenceOperation->url(), CSSPrimitiveValue::CSS_URI); 2562 return CSSPrimitiveValue::create(referenceOperation->url(), CSSPrimitiveValue::CSS_URI);
2567 } 2563 }
2568 #endif 2564 #endif
2569 } 2565 }
2570 return cssValuePool().createIdentifierValue(CSSValueNone); 2566 return cssValuePool().createIdentifierValue(CSSValueNone);
2571 #if ENABLE(CSS_REGIONS)
2572 case CSSPropertyWebkitFlowInto: 2567 case CSSPropertyWebkitFlowInto:
2573 if (style->flowThread().isNull()) 2568 if (style->flowThread().isNull())
2574 return cssValuePool().createIdentifierValue(CSSValueNone); 2569 return cssValuePool().createIdentifierValue(CSSValueNone);
2575 return cssValuePool().createValue(style->flowThread(), CSSPrimitiveV alue::CSS_STRING); 2570 return cssValuePool().createValue(style->flowThread(), CSSPrimitiveV alue::CSS_STRING);
2576 case CSSPropertyWebkitFlowFrom: 2571 case CSSPropertyWebkitFlowFrom:
2577 if (style->regionThread().isNull()) 2572 if (style->regionThread().isNull())
2578 return cssValuePool().createIdentifierValue(CSSValueNone); 2573 return cssValuePool().createIdentifierValue(CSSValueNone);
2579 return cssValuePool().createValue(style->regionThread(), CSSPrimitiv eValue::CSS_STRING); 2574 return cssValuePool().createValue(style->regionThread(), CSSPrimitiv eValue::CSS_STRING);
2580 case CSSPropertyWebkitRegionOverflow: 2575 case CSSPropertyWebkitRegionOverflow:
2581 return cssValuePool().createValue(style->regionOverflow()); 2576 return cssValuePool().createValue(style->regionOverflow());
2582 #endif
2583 #if ENABLE(CSS_EXCLUSIONS) 2577 #if ENABLE(CSS_EXCLUSIONS)
2584 case CSSPropertyWebkitWrapFlow: 2578 case CSSPropertyWebkitWrapFlow:
2585 return cssValuePool().createValue(style->wrapFlow()); 2579 return cssValuePool().createValue(style->wrapFlow());
2586 case CSSPropertyWebkitShapeMargin: 2580 case CSSPropertyWebkitShapeMargin:
2587 return cssValuePool().createValue(style->shapeMargin()); 2581 return cssValuePool().createValue(style->shapeMargin());
2588 case CSSPropertyWebkitShapePadding: 2582 case CSSPropertyWebkitShapePadding:
2589 return cssValuePool().createValue(style->shapePadding()); 2583 return cssValuePool().createValue(style->shapePadding());
2590 case CSSPropertyWebkitShapeInside: 2584 case CSSPropertyWebkitShapeInside:
2591 if (!style->shapeInside()) 2585 if (!style->shapeInside())
2592 return cssValuePool().createIdentifierValue(CSSValueAuto); 2586 return cssValuePool().createIdentifierValue(CSSValueAuto);
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
3000 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2994 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3001 CSSPropertyB ackgroundClip }; 2995 CSSPropertyB ackgroundClip };
3002 2996
3003 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2997 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3004 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2998 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
3005 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2999 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
3006 return list.release(); 3000 return list.release();
3007 } 3001 }
3008 3002
3009 } // namespace WebCore 3003 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSParser.cpp » ('j') | Source/core/css/CSSParser.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698