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

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
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 Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 17 matching lines...) Expand all
28 #include "CSSPropertyNames.h" 28 #include "CSSPropertyNames.h"
29 #include "core/css/CSSLineBoxContainValue.h" 29 #include "core/css/CSSLineBoxContainValue.h"
30 #include "core/css/CSSPrimitiveValue.h" 30 #include "core/css/CSSPrimitiveValue.h"
31 #include "core/css/LengthFunctions.h" 31 #include "core/css/LengthFunctions.h"
32 #include "core/platform/Length.h" 32 #include "core/platform/Length.h"
33 #include "core/platform/LengthBox.h" 33 #include "core/platform/LengthBox.h"
34 #include "core/platform/LengthSize.h" 34 #include "core/platform/LengthSize.h"
35 #include "core/platform/ThemeTypes.h" 35 #include "core/platform/ThemeTypes.h"
36 #include "core/platform/animation/CSSAnimationDataList.h" 36 #include "core/platform/animation/CSSAnimationDataList.h"
37 #include "core/platform/graphics/Color.h" 37 #include "core/platform/graphics/Color.h"
38 #include "core/platform/graphics/ColorSpace.h"
39 #include "core/platform/graphics/FontBaseline.h" 38 #include "core/platform/graphics/FontBaseline.h"
40 #include "core/platform/graphics/FontDescription.h" 39 #include "core/platform/graphics/FontDescription.h"
41 #include "core/platform/graphics/GraphicsTypes.h" 40 #include "core/platform/graphics/GraphicsTypes.h"
42 #include "core/platform/graphics/LayoutBoxExtent.h" 41 #include "core/platform/graphics/LayoutBoxExtent.h"
43 #include "core/platform/graphics/RoundedRect.h" 42 #include "core/platform/graphics/RoundedRect.h"
44 #include "core/platform/graphics/transforms/TransformOperations.h" 43 #include "core/platform/graphics/transforms/TransformOperations.h"
45 #include "core/platform/text/TextDirection.h" 44 #include "core/platform/text/TextDirection.h"
46 #include "core/platform/text/UnicodeBidi.h" 45 #include "core/platform/text/UnicodeBidi.h"
47 #include "core/rendering/style/BorderValue.h" 46 #include "core/rendering/style/BorderValue.h"
48 #include "core/rendering/style/CounterDirectives.h" 47 #include "core/rendering/style/CounterDirectives.h"
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 } 703 }
705 704
706 const ShadowData* textShadow() const { return rareInheritedData->textShadow. get(); } 705 const ShadowData* textShadow() const { return rareInheritedData->textShadow. get(); }
707 void getTextShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bot tom, LayoutUnit& left) const { getShadowExtent(textShadow(), top, right, bottom, left); } 706 void getTextShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bot tom, LayoutUnit& left) const { getShadowExtent(textShadow(), top, right, bottom, left); }
708 void getTextShadowHorizontalExtent(LayoutUnit& left, LayoutUnit& right) cons t { getShadowHorizontalExtent(textShadow(), left, right); } 707 void getTextShadowHorizontalExtent(LayoutUnit& left, LayoutUnit& right) cons t { getShadowHorizontalExtent(textShadow(), left, right); }
709 void getTextShadowVerticalExtent(LayoutUnit& top, LayoutUnit& bottom) const { getShadowVerticalExtent(textShadow(), top, bottom); } 708 void getTextShadowVerticalExtent(LayoutUnit& top, LayoutUnit& bottom) const { getShadowVerticalExtent(textShadow(), top, bottom); }
710 void getTextShadowInlineDirectionExtent(LayoutUnit& logicalLeft, LayoutUnit& logicalRight) { getShadowInlineDirectionExtent(textShadow(), logicalLeft, logic alRight); } 709 void getTextShadowInlineDirectionExtent(LayoutUnit& logicalLeft, LayoutUnit& logicalRight) { getShadowInlineDirectionExtent(textShadow(), logicalLeft, logic alRight); }
711 void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& l ogicalBottom) { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalB ottom); } 710 void getTextShadowBlockDirectionExtent(LayoutUnit& logicalTop, LayoutUnit& l ogicalBottom) { getShadowBlockDirectionExtent(textShadow(), logicalTop, logicalB ottom); }
712 711
713 float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; } 712 float textStrokeWidth() const { return rareInheritedData->textStrokeWidth; }
714 ColorSpace colorSpace() const { return static_cast<ColorSpace>(rareInherited Data->colorSpace); }
715 float opacity() const { return rareNonInheritedData->opacity; } 713 float opacity() const { return rareNonInheritedData->opacity; }
716 ControlPart appearance() const { return static_cast<ControlPart>(rareNonInhe ritedData->m_appearance); } 714 ControlPart appearance() const { return static_cast<ControlPart>(rareNonInhe ritedData->m_appearance); }
717 // aspect ratio convenience method 715 // aspect ratio convenience method
718 bool hasAspectRatio() const { return rareNonInheritedData->m_hasAspectRatio; } 716 bool hasAspectRatio() const { return rareNonInheritedData->m_hasAspectRatio; }
719 float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenom inator(); } 717 float aspectRatio() const { return aspectRatioNumerator() / aspectRatioDenom inator(); }
720 float aspectRatioDenominator() const { return rareNonInheritedData->m_aspect RatioDenominator; } 718 float aspectRatioDenominator() const { return rareNonInheritedData->m_aspect RatioDenominator; }
721 float aspectRatioNumerator() const { return rareNonInheritedData->m_aspectRa tioNumerator; } 719 float aspectRatioNumerator() const { return rareNonInheritedData->m_aspectRa tioNumerator; }
722 EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonIn heritedData->m_deprecatedFlexibleBox->align); } 720 EBoxAlignment boxAlign() const { return static_cast<EBoxAlignment>(rareNonIn heritedData->m_deprecatedFlexibleBox->align); }
723 EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inher ited_flags._box_direction); } 721 EBoxDirection boxDirection() const { return static_cast<EBoxDirection>(inher ited_flags._box_direction); }
724 float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox ->flex; } 722 float boxFlex() const { return rareNonInheritedData->m_deprecatedFlexibleBox ->flex; }
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags._page_break_inside = b; } 1159 void setPageBreakInside(EPageBreak b) { ASSERT(b == PBAUTO || b == PBAVOID); noninherited_flags._page_break_inside = b; }
1162 void setPageBreakBefore(EPageBreak b) { noninherited_flags._page_break_befor e = b; } 1160 void setPageBreakBefore(EPageBreak b) { noninherited_flags._page_break_befor e = b; }
1163 void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; } 1161 void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; }
1164 1162
1165 // CSS3 Setters 1163 // CSS3 Setters
1166 void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); } 1164 void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v); }
1167 void setTextShadow(PassOwnPtr<ShadowData>, bool add = false); 1165 void setTextShadow(PassOwnPtr<ShadowData>, bool add = false);
1168 void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStr okeColor, c); } 1166 void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStr okeColor, c); }
1169 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); } 1167 void setTextStrokeWidth(float w) { SET_VAR(rareInheritedData, textStrokeWidt h, w); }
1170 void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillC olor, c); } 1168 void setTextFillColor(const Color& c) { SET_VAR(rareInheritedData, textFillC olor, c); }
1171 void setColorSpace(ColorSpace space) { SET_VAR(rareInheritedData, colorSpace , space); }
1172 void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNo nInheritedData, opacity, v); } 1169 void setOpacity(float f) { float v = clampTo<float>(f, 0, 1); SET_VAR(rareNo nInheritedData, opacity, v); }
1173 void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearan ce, a); } 1170 void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearan ce, a); }
1174 // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexb ox-20090723/#alignment 1171 // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexb ox-20090723/#alignment
1175 void setBoxAlign(EBoxAlignment a) { SET_VAR(rareNonInheritedData.access()->m _deprecatedFlexibleBox, align, a); } 1172 void setBoxAlign(EBoxAlignment a) { SET_VAR(rareNonInheritedData.access()->m _deprecatedFlexibleBox, align, a); }
1176 void setBoxDecorationBreak(EBoxDecorationBreak b) { SET_VAR(m_box, m_boxDeco rationBreak, b); } 1173 void setBoxDecorationBreak(EBoxDecorationBreak b) { SET_VAR(m_box, m_boxDeco rationBreak, b); }
1177 void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; } 1174 void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; }
1178 void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_deprecat edFlexibleBox, flex, f); } 1175 void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_deprecat edFlexibleBox, flex, f); }
1179 void setBoxFlexGroup(unsigned int fg) { SET_VAR(rareNonInheritedData.access( )->m_deprecatedFlexibleBox, flex_group, fg); } 1176 void setBoxFlexGroup(unsigned int fg) { SET_VAR(rareNonInheritedData.access( )->m_deprecatedFlexibleBox, flex_group, fg); }
1180 void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->m_dep recatedFlexibleBox, lines, l); } 1177 void setBoxLines(EBoxLines l) { SET_VAR(rareNonInheritedData.access()->m_dep recatedFlexibleBox, lines, l); }
1181 void setBoxOrdinalGroup(unsigned int og) { SET_VAR(rareNonInheritedData.acce ss()->m_deprecatedFlexibleBox, ordinal_group, og); } 1178 void setBoxOrdinalGroup(unsigned int og) { SET_VAR(rareNonInheritedData.acce ss()->m_deprecatedFlexibleBox, ordinal_group, og); }
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 void reportMemoryUsage(MemoryObjectInfo*) const; 1459 void reportMemoryUsage(MemoryObjectInfo*) const;
1463 1460
1464 // Initial values for all the properties 1461 // Initial values for all the properties
1465 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } 1462 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
1466 static EBorderStyle initialBorderStyle() { return BNONE; } 1463 static EBorderStyle initialBorderStyle() { return BNONE; }
1467 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; } 1464 static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; }
1468 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); } 1465 static NinePieceImage initialNinePieceImage() { return NinePieceImage(); }
1469 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); } 1466 static LengthSize initialBorderRadius() { return LengthSize(Length(0, Fixed) , Length(0, Fixed)); }
1470 static ECaptionSide initialCaptionSide() { return CAPTOP; } 1467 static ECaptionSide initialCaptionSide() { return CAPTOP; }
1471 static EClear initialClear() { return CNONE; } 1468 static EClear initialClear() { return CNONE; }
1472 static ColorSpace initialColorSpace() { return ColorSpaceDeviceRGB; }
1473 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; } 1469 static ColumnAxis initialColumnAxis() { return AutoColumnAxis; }
1474 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; } 1470 static ColumnProgression initialColumnProgression() { return NormalColumnPro gression; }
1475 static TextDirection initialDirection() { return LTR; } 1471 static TextDirection initialDirection() { return LTR; }
1476 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 1472 static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
1477 static TextCombine initialTextCombine() { return TextCombineNone; } 1473 static TextCombine initialTextCombine() { return TextCombineNone; }
1478 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; } 1474 static TextOrientation initialTextOrientation() { return TextOrientationVert icalRight; }
1479 static EDisplay initialDisplay() { return INLINE; } 1475 static EDisplay initialDisplay() { return INLINE; }
1480 static EEmptyCell initialEmptyCells() { return SHOW; } 1476 static EEmptyCell initialEmptyCells() { return SHOW; }
1481 static EFloat initialFloating() { return NoFloat; } 1477 static EFloat initialFloating() { return NoFloat; }
1482 static EListStylePosition initialListStylePosition() { return OUTSIDE; } 1478 static EListStylePosition initialListStylePosition() { return OUTSIDE; }
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1767 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1763 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1768 return false; 1764 return false;
1769 1765
1770 rareInheritedData.access()->m_textOrientation = textOrientation; 1766 rareInheritedData.access()->m_textOrientation = textOrientation;
1771 return true; 1767 return true;
1772 } 1768 }
1773 1769
1774 } // namespace WebCore 1770 } // namespace WebCore
1775 1771
1776 #endif // RenderStyle_h 1772 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RootInlineBox.cpp ('k') | Source/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698