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

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: New version 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') | no next file with comments »
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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 CSSPropertyWebkitTransformOrigin, 330 CSSPropertyWebkitTransformOrigin,
331 CSSPropertyWebkitTransformStyle, 331 CSSPropertyWebkitTransformStyle,
332 CSSPropertyWebkitTransitionDelay, 332 CSSPropertyWebkitTransitionDelay,
333 CSSPropertyWebkitTransitionDuration, 333 CSSPropertyWebkitTransitionDuration,
334 CSSPropertyWebkitTransitionProperty, 334 CSSPropertyWebkitTransitionProperty,
335 CSSPropertyWebkitTransitionTimingFunction, 335 CSSPropertyWebkitTransitionTimingFunction,
336 CSSPropertyWebkitUserDrag, 336 CSSPropertyWebkitUserDrag,
337 CSSPropertyWebkitUserModify, 337 CSSPropertyWebkitUserModify,
338 CSSPropertyWebkitUserSelect, 338 CSSPropertyWebkitUserSelect,
339 CSSPropertyWebkitWritingMode, 339 CSSPropertyWebkitWritingMode,
340 #if ENABLE(CSS_REGIONS)
341 CSSPropertyWebkitFlowInto, 340 CSSPropertyWebkitFlowInto,
342 CSSPropertyWebkitFlowFrom, 341 CSSPropertyWebkitFlowFrom,
343 CSSPropertyWebkitRegionOverflow, 342 CSSPropertyWebkitRegionOverflow,
344 CSSPropertyWebkitRegionBreakAfter, 343 CSSPropertyWebkitRegionBreakAfter,
345 CSSPropertyWebkitRegionBreakBefore, 344 CSSPropertyWebkitRegionBreakBefore,
346 CSSPropertyWebkitRegionBreakInside, 345 CSSPropertyWebkitRegionBreakInside,
347 #endif
348 CSSPropertyWebkitAppRegion, 346 CSSPropertyWebkitAppRegion,
349 CSSPropertyWebkitWrapFlow, 347 CSSPropertyWebkitWrapFlow,
350 CSSPropertyWebkitShapeMargin, 348 CSSPropertyWebkitShapeMargin,
351 CSSPropertyWebkitShapePadding, 349 CSSPropertyWebkitShapePadding,
352 CSSPropertyWebkitWrapThrough, 350 CSSPropertyWebkitWrapThrough,
353 #if ENABLE(SVG) 351 #if ENABLE(SVG)
354 CSSPropertyBufferedRendering, 352 CSSPropertyBufferedRendering,
355 CSSPropertyClipPath, 353 CSSPropertyClipPath,
356 CSSPropertyClipRule, 354 CSSPropertyClipRule,
357 CSSPropertyMask, 355 CSSPropertyMask,
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1793 case CSSPropertyWebkitColumnBreakBefore: 1791 case CSSPropertyWebkitColumnBreakBefore:
1794 return cssValuePool().createValue(style->columnBreakBefore()); 1792 return cssValuePool().createValue(style->columnBreakBefore());
1795 case CSSPropertyWebkitColumnBreakInside: 1793 case CSSPropertyWebkitColumnBreakInside:
1796 return cssValuePool().createValue(style->columnBreakInside()); 1794 return cssValuePool().createValue(style->columnBreakInside());
1797 case CSSPropertyWebkitColumnWidth: 1795 case CSSPropertyWebkitColumnWidth:
1798 if (style->hasAutoColumnWidth()) 1796 if (style->hasAutoColumnWidth())
1799 return cssValuePool().createIdentifierValue(CSSValueAuto); 1797 return cssValuePool().createIdentifierValue(CSSValueAuto);
1800 return zoomAdjustedPixelValue(style->columnWidth(), style.get()); 1798 return zoomAdjustedPixelValue(style->columnWidth(), style.get());
1801 case CSSPropertyTabSize: 1799 case CSSPropertyTabSize:
1802 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER); 1800 return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValu e::CSS_NUMBER);
1803 #if ENABLE(CSS_REGIONS)
1804 case CSSPropertyWebkitRegionBreakAfter: 1801 case CSSPropertyWebkitRegionBreakAfter:
1805 return cssValuePool().createValue(style->regionBreakAfter()); 1802 return cssValuePool().createValue(style->regionBreakAfter());
1806 case CSSPropertyWebkitRegionBreakBefore: 1803 case CSSPropertyWebkitRegionBreakBefore:
1807 return cssValuePool().createValue(style->regionBreakBefore()); 1804 return cssValuePool().createValue(style->regionBreakBefore());
1808 case CSSPropertyWebkitRegionBreakInside: 1805 case CSSPropertyWebkitRegionBreakInside:
1809 return cssValuePool().createValue(style->regionBreakInside()); 1806 return cssValuePool().createValue(style->regionBreakInside());
1810 #endif
1811 case CSSPropertyCursor: { 1807 case CSSPropertyCursor: {
1812 RefPtr<CSSValueList> list; 1808 RefPtr<CSSValueList> list;
1813 CursorList* cursors = style->cursors(); 1809 CursorList* cursors = style->cursors();
1814 if (cursors && cursors->size() > 0) { 1810 if (cursors && cursors->size() > 0) {
1815 list = CSSValueList::createCommaSeparated(); 1811 list = CSSValueList::createCommaSeparated();
1816 for (unsigned i = 0; i < cursors->size(); ++i) 1812 for (unsigned i = 0; i < cursors->size(); ++i)
1817 if (StyleImage* image = cursors->at(i).image()) 1813 if (StyleImage* image = cursors->at(i).image())
1818 list->append(image->cssValue()); 1814 list->append(image->cssValue());
1819 } 1815 }
1820 RefPtr<CSSValue> value = cssValuePool().createValue(style->cursor()) ; 1816 RefPtr<CSSValue> value = cssValuePool().createValue(style->cursor()) ;
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
2546 if (operation->getOperationType() == ClipPathOperation::SHAPE) 2542 if (operation->getOperationType() == ClipPathOperation::SHAPE)
2547 return valueForBasicShape(static_cast<ShapeClipPathOperation *>(operation)->basicShape()); 2543 return valueForBasicShape(static_cast<ShapeClipPathOperation *>(operation)->basicShape());
2548 #if ENABLE(SVG) 2544 #if ENABLE(SVG)
2549 else if (operation->getOperationType() == ClipPathOperation::REF ERENCE) { 2545 else if (operation->getOperationType() == ClipPathOperation::REF ERENCE) {
2550 ReferenceClipPathOperation* referenceOperation = static_cast <ReferenceClipPathOperation*>(operation); 2546 ReferenceClipPathOperation* referenceOperation = static_cast <ReferenceClipPathOperation*>(operation);
2551 return CSSPrimitiveValue::create(referenceOperation->url(), CSSPrimitiveValue::CSS_URI); 2547 return CSSPrimitiveValue::create(referenceOperation->url(), CSSPrimitiveValue::CSS_URI);
2552 } 2548 }
2553 #endif 2549 #endif
2554 } 2550 }
2555 return cssValuePool().createIdentifierValue(CSSValueNone); 2551 return cssValuePool().createIdentifierValue(CSSValueNone);
2556 #if ENABLE(CSS_REGIONS)
2557 case CSSPropertyWebkitFlowInto: 2552 case CSSPropertyWebkitFlowInto:
2558 if (style->flowThread().isNull()) 2553 if (style->flowThread().isNull())
2559 return cssValuePool().createIdentifierValue(CSSValueNone); 2554 return cssValuePool().createIdentifierValue(CSSValueNone);
2560 return cssValuePool().createValue(style->flowThread(), CSSPrimitiveV alue::CSS_STRING); 2555 return cssValuePool().createValue(style->flowThread(), CSSPrimitiveV alue::CSS_STRING);
2561 case CSSPropertyWebkitFlowFrom: 2556 case CSSPropertyWebkitFlowFrom:
2562 if (style->regionThread().isNull()) 2557 if (style->regionThread().isNull())
2563 return cssValuePool().createIdentifierValue(CSSValueNone); 2558 return cssValuePool().createIdentifierValue(CSSValueNone);
2564 return cssValuePool().createValue(style->regionThread(), CSSPrimitiv eValue::CSS_STRING); 2559 return cssValuePool().createValue(style->regionThread(), CSSPrimitiv eValue::CSS_STRING);
2565 case CSSPropertyWebkitRegionOverflow: 2560 case CSSPropertyWebkitRegionOverflow:
2566 return cssValuePool().createValue(style->regionOverflow()); 2561 return cssValuePool().createValue(style->regionOverflow());
2567 #endif
2568 case CSSPropertyWebkitWrapFlow: 2562 case CSSPropertyWebkitWrapFlow:
2569 return cssValuePool().createValue(style->wrapFlow()); 2563 return cssValuePool().createValue(style->wrapFlow());
2570 case CSSPropertyWebkitShapeMargin: 2564 case CSSPropertyWebkitShapeMargin:
2571 return cssValuePool().createValue(style->shapeMargin()); 2565 return cssValuePool().createValue(style->shapeMargin());
2572 case CSSPropertyWebkitShapePadding: 2566 case CSSPropertyWebkitShapePadding:
2573 return cssValuePool().createValue(style->shapePadding()); 2567 return cssValuePool().createValue(style->shapePadding());
2574 case CSSPropertyWebkitShapeInside: 2568 case CSSPropertyWebkitShapeInside:
2575 if (!style->shapeInside()) 2569 if (!style->shapeInside())
2576 return cssValuePool().createIdentifierValue(CSSValueAuto); 2570 return cssValuePool().createIdentifierValue(CSSValueAuto);
2577 else if (style->shapeInside()->type() == ExclusionShapeValue::OUTSID E) 2571 else if (style->shapeInside()->type() == ExclusionShapeValue::OUTSID E)
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
2981 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2975 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2982 CSSPropertyB ackgroundClip }; 2976 CSSPropertyB ackgroundClip };
2983 2977
2984 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2978 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2985 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2979 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
2986 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2980 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
2987 return list.release(); 2981 return list.release();
2988 } 2982 }
2989 2983
2990 } // namespace WebCore 2984 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698