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

Side by Side Diff: Source/core/style/ComputedStyle.h

Issue 1328673003: Remove -webkit-line-box-contain implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix up a few more tests. Created 5 years, 3 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 | « Source/core/layout/line/RootInlineBox.cpp ('k') | Source/core/style/ComputedStyle.cpp » ('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) 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 11 matching lines...) Expand all
22 * 22 *
23 */ 23 */
24 24
25 #ifndef ComputedStyle_h 25 #ifndef ComputedStyle_h
26 #define ComputedStyle_h 26 #define ComputedStyle_h
27 27
28 #include "core/CSSPropertyNames.h" 28 #include "core/CSSPropertyNames.h"
29 #include "core/CoreExport.h" 29 #include "core/CoreExport.h"
30 #include "core/animation/css/CSSAnimationData.h" 30 #include "core/animation/css/CSSAnimationData.h"
31 #include "core/animation/css/CSSTransitionData.h" 31 #include "core/animation/css/CSSTransitionData.h"
32 #include "core/css/CSSLineBoxContainValue.h"
33 #include "core/css/CSSPrimitiveValue.h" 32 #include "core/css/CSSPrimitiveValue.h"
34 #include "core/style/BorderValue.h" 33 #include "core/style/BorderValue.h"
35 #include "core/style/CounterDirectives.h" 34 #include "core/style/CounterDirectives.h"
36 #include "core/style/DataRef.h" 35 #include "core/style/DataRef.h"
37 #include "core/style/ComputedStyleConstants.h" 36 #include "core/style/ComputedStyleConstants.h"
38 #include "core/style/LineClampValue.h" 37 #include "core/style/LineClampValue.h"
39 #include "core/style/NinePieceImage.h" 38 #include "core/style/NinePieceImage.h"
40 #include "core/style/OutlineValue.h" 39 #include "core/style/OutlineValue.h"
41 #include "core/style/SVGComputedStyle.h" 40 #include "core/style/SVGComputedStyle.h"
42 #include "core/style/ShapeValue.h" 41 #include "core/style/ShapeValue.h"
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 bool hasCurrentFilterAnimation() const { return rareNonInheritedData->m_hasC urrentFilterAnimation; } 927 bool hasCurrentFilterAnimation() const { return rareNonInheritedData->m_hasC urrentFilterAnimation; }
929 bool hasCurrentBackdropFilterAnimation() const { return rareNonInheritedData ->m_hasCurrentBackdropFilterAnimation; } 928 bool hasCurrentBackdropFilterAnimation() const { return rareNonInheritedData ->m_hasCurrentBackdropFilterAnimation; }
930 bool shouldCompositeForCurrentAnimations() const { return hasCurrentOpacityA nimation() || hasCurrentTransformAnimation() || hasCurrentFilterAnimation() || h asCurrentBackdropFilterAnimation(); } 929 bool shouldCompositeForCurrentAnimations() const { return hasCurrentOpacityA nimation() || hasCurrentTransformAnimation() || hasCurrentFilterAnimation() || h asCurrentBackdropFilterAnimation(); }
931 930
932 bool isRunningOpacityAnimationOnCompositor() const { return rareNonInherited Data->m_runningOpacityAnimationOnCompositor; } 931 bool isRunningOpacityAnimationOnCompositor() const { return rareNonInherited Data->m_runningOpacityAnimationOnCompositor; }
933 bool isRunningTransformAnimationOnCompositor() const { return rareNonInherit edData->m_runningTransformAnimationOnCompositor; } 932 bool isRunningTransformAnimationOnCompositor() const { return rareNonInherit edData->m_runningTransformAnimationOnCompositor; }
934 bool isRunningFilterAnimationOnCompositor() const { return rareNonInheritedD ata->m_runningFilterAnimationOnCompositor; } 933 bool isRunningFilterAnimationOnCompositor() const { return rareNonInheritedD ata->m_runningFilterAnimationOnCompositor; }
935 bool isRunningBackdropFilterAnimationOnCompositor() const { return rareNonIn heritedData->m_runningBackdropFilterAnimationOnCompositor; } 934 bool isRunningBackdropFilterAnimationOnCompositor() const { return rareNonIn heritedData->m_runningBackdropFilterAnimationOnCompositor; }
936 bool isRunningAnimationOnCompositor() const { return isRunningOpacityAnimati onOnCompositor() || isRunningTransformAnimationOnCompositor() || isRunningFilter AnimationOnCompositor() || isRunningBackdropFilterAnimationOnCompositor(); } 935 bool isRunningAnimationOnCompositor() const { return isRunningOpacityAnimati onOnCompositor() || isRunningTransformAnimationOnCompositor() || isRunningFilter AnimationOnCompositor() || isRunningBackdropFilterAnimationOnCompositor(); }
937 936
938 LineBoxContain lineBoxContain() const { return rareInheritedData->m_lineBoxC ontain; }
939 const LineClampValue& lineClamp() const { return rareNonInheritedData->lineC lamp; } 937 const LineClampValue& lineClamp() const { return rareNonInheritedData->lineC lamp; }
940 Color tapHighlightColor() const { return rareInheritedData->tapHighlightColo r; } 938 Color tapHighlightColor() const { return rareInheritedData->tapHighlightColo r; }
941 ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareI nheritedData->textSecurity); } 939 ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareI nheritedData->textSecurity); }
942 940
943 WritingMode writingMode() const { return static_cast<WritingMode>(inherited_ flags.m_writingMode); } 941 WritingMode writingMode() const { return static_cast<WritingMode>(inherited_ flags.m_writingMode); }
944 bool isHorizontalWritingMode() const { return blink::isHorizontalWritingMode (writingMode()); } 942 bool isHorizontalWritingMode() const { return blink::isHorizontalWritingMode (writingMode()); }
945 bool isFlippedLinesWritingMode() const { return blink::isFlippedLinesWriting Mode(writingMode()); } 943 bool isFlippedLinesWritingMode() const { return blink::isFlippedLinesWriting Mode(writingMode()); }
946 bool isFlippedBlocksWritingMode() const { return blink::isFlippedBlocksWriti ngMode(writingMode()); } 944 bool isFlippedBlocksWritingMode() const { return blink::isFlippedBlocksWriti ngMode(writingMode()); }
947 945
948 EImageRendering imageRendering() const { return static_cast<EImageRendering> (rareInheritedData->m_imageRendering); } 946 EImageRendering imageRendering() const { return static_cast<EImageRendering> (rareInheritedData->m_imageRendering); }
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 void setHasCurrentOpacityAnimation(bool b = true) { SET_VAR(rareNonInherited Data, m_hasCurrentOpacityAnimation, b); } 1414 void setHasCurrentOpacityAnimation(bool b = true) { SET_VAR(rareNonInherited Data, m_hasCurrentOpacityAnimation, b); }
1417 void setHasCurrentTransformAnimation(bool b = true) { SET_VAR(rareNonInherit edData, m_hasCurrentTransformAnimation, b); } 1415 void setHasCurrentTransformAnimation(bool b = true) { SET_VAR(rareNonInherit edData, m_hasCurrentTransformAnimation, b); }
1418 void setHasCurrentFilterAnimation(bool b = true) { SET_VAR(rareNonInheritedD ata, m_hasCurrentFilterAnimation, b); } 1416 void setHasCurrentFilterAnimation(bool b = true) { SET_VAR(rareNonInheritedD ata, m_hasCurrentFilterAnimation, b); }
1419 void setHasCurrentBackdropFilterAnimation(bool b = true) { SET_VAR(rareNonIn heritedData, m_hasCurrentBackdropFilterAnimation, b); } 1417 void setHasCurrentBackdropFilterAnimation(bool b = true) { SET_VAR(rareNonIn heritedData, m_hasCurrentBackdropFilterAnimation, b); }
1420 1418
1421 void setIsRunningOpacityAnimationOnCompositor(bool b = true) { SET_VAR(rareN onInheritedData, m_runningOpacityAnimationOnCompositor, b); } 1419 void setIsRunningOpacityAnimationOnCompositor(bool b = true) { SET_VAR(rareN onInheritedData, m_runningOpacityAnimationOnCompositor, b); }
1422 void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rar eNonInheritedData, m_runningTransformAnimationOnCompositor, b); } 1420 void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rar eNonInheritedData, m_runningTransformAnimationOnCompositor, b); }
1423 void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNo nInheritedData, m_runningFilterAnimationOnCompositor, b); } 1421 void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNo nInheritedData, m_runningFilterAnimationOnCompositor, b); }
1424 void setIsRunningBackdropFilterAnimationOnCompositor(bool b = true) { SET_VA R(rareNonInheritedData, m_runningBackdropFilterAnimationOnCompositor, b); } 1422 void setIsRunningBackdropFilterAnimationOnCompositor(bool b = true) { SET_VA R(rareNonInheritedData, m_runningBackdropFilterAnimationOnCompositor, b); }
1425 1423
1426 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line BoxContain, c); }
1427 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam p, c); } 1424 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam p, c); }
1428 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); } 1425 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); }
1429 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); } 1426 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); }
1430 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc tion, t); } 1427 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc tion, t); }
1431 1428
1432 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s crollBehavior, b); } 1429 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s crollBehavior, b); }
1433 1430
1434 void setScrollSnapType(ScrollSnapType b) { SET_VAR(rareNonInheritedData, m_s crollSnapType, b); } 1431 void setScrollSnapType(ScrollSnapType b) { SET_VAR(rareNonInheritedData, m_s crollSnapType, b); }
1435 void setScrollSnapPointsX(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri tedData.access()->m_scrollSnap, m_xPoints, b); } 1432 void setScrollSnapPointsX(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri tedData.access()->m_scrollSnap, m_xPoints, b); }
1436 void setScrollSnapPointsY(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri tedData.access()->m_scrollSnap, m_yPoints, b); } 1433 void setScrollSnapPointsY(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri tedData.access()->m_scrollSnap, m_yPoints, b); }
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 static float initialPerspective() { return 0; } 1698 static float initialPerspective() { return 0; }
1702 static Length initialPerspectiveOriginX() { return Length(50.0, Percent); } 1699 static Length initialPerspectiveOriginX() { return Length(50.0, Percent); }
1703 static Length initialPerspectiveOriginY() { return Length(50.0, Percent); } 1700 static Length initialPerspectiveOriginY() { return Length(50.0, Percent); }
1704 static LengthPoint initialPerspectiveOrigin() { return LengthPoint(Length(50 .0, Percent), Length(50.0, Percent)); } 1701 static LengthPoint initialPerspectiveOrigin() { return LengthPoint(Length(50 .0, Percent), Length(50.0, Percent)); }
1705 static Color initialBackgroundColor() { return Color::transparent; } 1702 static Color initialBackgroundColor() { return Color::transparent; }
1706 static TextEmphasisFill initialTextEmphasisFill() { return TextEmphasisFillF illed; } 1703 static TextEmphasisFill initialTextEmphasisFill() { return TextEmphasisFillF illed; }
1707 static TextEmphasisMark initialTextEmphasisMark() { return TextEmphasisMarkN one; } 1704 static TextEmphasisMark initialTextEmphasisMark() { return TextEmphasisMarkN one; }
1708 static const AtomicString& initialTextEmphasisCustomMark() { return nullAtom ; } 1705 static const AtomicString& initialTextEmphasisCustomMark() { return nullAtom ; }
1709 static TextEmphasisPosition initialTextEmphasisPosition() { return TextEmpha sisPositionOver; } 1706 static TextEmphasisPosition initialTextEmphasisPosition() { return TextEmpha sisPositionOver; }
1710 static RubyPosition initialRubyPosition() { return RubyPositionBefore; } 1707 static RubyPosition initialRubyPosition() { return RubyPositionBefore; }
1711 static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; }
1712 static ImageOrientationEnum initialImageOrientation() { return OriginTopLeft ; } 1708 static ImageOrientationEnum initialImageOrientation() { return OriginTopLeft ; }
1713 static RespectImageOrientationEnum initialRespectImageOrientation() { return DoNotRespectImageOrientation; } 1709 static RespectImageOrientationEnum initialRespectImageOrientation() { return DoNotRespectImageOrientation; }
1714 static EImageRendering initialImageRendering() { return ImageRenderingAuto; } 1710 static EImageRendering initialImageRendering() { return ImageRenderingAuto; }
1715 static ImageResolutionSource initialImageResolutionSource() { return ImageRe solutionSpecified; } 1711 static ImageResolutionSource initialImageResolutionSource() { return ImageRe solutionSpecified; }
1716 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu tionNoSnap; } 1712 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu tionNoSnap; }
1717 static float initialImageResolution() { return 1; } 1713 static float initialImageResolution() { return 1; }
1718 static StyleImage* initialBorderImageSource() { return 0; } 1714 static StyleImage* initialBorderImageSource() { return 0; }
1719 static StyleImage* initialMaskBoxImageSource() { return 0; } 1715 static StyleImage* initialMaskBoxImageSource() { return 0; }
1720 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE conomy; } 1716 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE conomy; }
1721 static TouchAction initialTouchAction() { return TouchActionAuto; } 1717 static TouchAction initialTouchAction() { return TouchActionAuto; }
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 } 1958 }
1963 1959
1964 inline bool ComputedStyle::hasPseudoElementStyle() const 1960 inline bool ComputedStyle::hasPseudoElementStyle() const
1965 { 1961 {
1966 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1962 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1967 } 1963 }
1968 1964
1969 } // namespace blink 1965 } // namespace blink
1970 1966
1971 #endif // ComputedStyle_h 1967 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « Source/core/layout/line/RootInlineBox.cpp ('k') | Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698