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

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

Issue 723373006: Add CSS parsing support for the scroll-blocks-on property (in place of touch-action-delay) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Apply CR feedback Created 6 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/rendering/style/RenderStyleConstants.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) 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 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 void setBlendMode(WebBlendMode v); 947 void setBlendMode(WebBlendMode v);
948 bool hasBlendMode() const; 948 bool hasBlendMode() const;
949 949
950 EIsolation isolation() const; 950 EIsolation isolation() const;
951 void setIsolation(EIsolation v); 951 void setIsolation(EIsolation v);
952 bool hasIsolation() const; 952 bool hasIsolation() const;
953 953
954 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef tToRightDirection() && isHorizontalWritingMode(); } 954 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef tToRightDirection() && isHorizontalWritingMode(); }
955 955
956 TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInh eritedData->m_touchAction); } 956 TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInh eritedData->m_touchAction); }
957 TouchActionDelay touchActionDelay() const { return static_cast<TouchActionDe lay>(rareInheritedData->m_touchActionDelay); }
958 957
959 ScrollBehavior scrollBehavior() const { return static_cast<ScrollBehavior>(r areNonInheritedData->m_scrollBehavior); } 958 ScrollBehavior scrollBehavior() const { return static_cast<ScrollBehavior>(r areNonInheritedData->m_scrollBehavior); }
959 ScrollBlocksOn scrollBlocksOn() const { return static_cast<ScrollBlocksOn>(r areNonInheritedData->m_scrollBlocksOn); }
960 960
961 const Vector<CSSPropertyID>& willChangeProperties() const { return rareNonIn heritedData->m_willChange->m_properties; } 961 const Vector<CSSPropertyID>& willChangeProperties() const { return rareNonIn heritedData->m_willChange->m_properties; }
962 bool willChangeContents() const { return rareNonInheritedData->m_willChange- >m_contents; } 962 bool willChangeContents() const { return rareNonInheritedData->m_willChange- >m_contents; }
963 bool willChangeScrollPosition() const { return rareNonInheritedData->m_willC hange->m_scrollPosition; } 963 bool willChangeScrollPosition() const { return rareNonInheritedData->m_willC hange->m_scrollPosition; }
964 bool hasWillChangeCompositingHint() const; 964 bool hasWillChangeCompositingHint() const;
965 bool subtreeWillChangeContents() const { return rareInheritedData->m_subtree WillChangeContents; } 965 bool subtreeWillChangeContents() const { return rareInheritedData->m_subtree WillChangeContents; }
966 966
967 // attribute setter methods 967 // attribute setter methods
968 968
969 void setDisplay(EDisplay v) { noninherited_flags.effectiveDisplay = v; } 969 void setDisplay(EDisplay v) { noninherited_flags.effectiveDisplay = v; }
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1387 1387
1388 void setIsRunningOpacityAnimationOnCompositor(bool b = true) { SET_VAR(rareN onInheritedData, m_runningOpacityAnimationOnCompositor, b); } 1388 void setIsRunningOpacityAnimationOnCompositor(bool b = true) { SET_VAR(rareN onInheritedData, m_runningOpacityAnimationOnCompositor, b); }
1389 void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rar eNonInheritedData, m_runningTransformAnimationOnCompositor, b); } 1389 void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rar eNonInheritedData, m_runningTransformAnimationOnCompositor, b); }
1390 void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNo nInheritedData, m_runningFilterAnimationOnCompositor, b); } 1390 void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNo nInheritedData, m_runningFilterAnimationOnCompositor, b); }
1391 1391
1392 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line BoxContain, c); } 1392 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line BoxContain, c); }
1393 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam p, c); } 1393 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam p, c); }
1394 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); } 1394 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi ghlightColor, c); }
1395 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); } 1395 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat a, textSecurity, aTextSecurity); }
1396 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc tion, t); } 1396 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc tion, t); }
1397 void setTouchActionDelay(TouchActionDelay t) { SET_VAR(rareInheritedData, m_ touchActionDelay, t); }
1398 1397
1399 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s crollBehavior, b); } 1398 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s crollBehavior, b); }
1399 void setScrollBlocksOn(ScrollBlocksOn b) { SET_VAR(rareNonInheritedData, m_s crollBlocksOn, b); }
1400 1400
1401 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_ VAR(rareNonInheritedData.access()->m_willChange, m_properties, properties); } 1401 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_ VAR(rareNonInheritedData.access()->m_willChange, m_properties, properties); }
1402 void setWillChangeContents(bool b) { SET_VAR(rareNonInheritedData.access()-> m_willChange, m_contents, b); } 1402 void setWillChangeContents(bool b) { SET_VAR(rareNonInheritedData.access()-> m_willChange, m_contents, b); }
1403 void setWillChangeScrollPosition(bool b) { SET_VAR(rareNonInheritedData.acce ss()->m_willChange, m_scrollPosition, b); } 1403 void setWillChangeScrollPosition(bool b) { SET_VAR(rareNonInheritedData.acce ss()->m_willChange, m_scrollPosition, b); }
1404 void setSubtreeWillChangeContents(bool b) { SET_VAR(rareInheritedData, m_sub treeWillChangeContents, b); } 1404 void setSubtreeWillChangeContents(bool b) { SET_VAR(rareInheritedData, m_sub treeWillChangeContents, b); }
1405 1405
1406 bool requiresAcceleratedCompositingForExternalReasons(bool b) { return rareN onInheritedData->m_requiresAcceleratedCompositingForExternalReasons; } 1406 bool requiresAcceleratedCompositingForExternalReasons(bool b) { return rareN onInheritedData->m_requiresAcceleratedCompositingForExternalReasons; }
1407 void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(r areNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); } 1407 void setRequiresAcceleratedCompositingForExternalReasons(bool b) { SET_VAR(r areNonInheritedData, m_requiresAcceleratedCompositingForExternalReasons, b); }
1408 1408
1409 const SVGRenderStyle& svgStyle() const { return *m_svgStyle.get(); } 1409 const SVGRenderStyle& svgStyle() const { return *m_svgStyle.get(); }
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; } 1664 static LineBoxContain initialLineBoxContain() { return LineBoxContainBlock | LineBoxContainInline | LineBoxContainReplaced; }
1665 static ImageOrientationEnum initialImageOrientation() { return OriginTopLeft ; } 1665 static ImageOrientationEnum initialImageOrientation() { return OriginTopLeft ; }
1666 static EImageRendering initialImageRendering() { return ImageRenderingAuto; } 1666 static EImageRendering initialImageRendering() { return ImageRenderingAuto; }
1667 static ImageResolutionSource initialImageResolutionSource() { return ImageRe solutionSpecified; } 1667 static ImageResolutionSource initialImageResolutionSource() { return ImageRe solutionSpecified; }
1668 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu tionNoSnap; } 1668 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu tionNoSnap; }
1669 static float initialImageResolution() { return 1; } 1669 static float initialImageResolution() { return 1; }
1670 static StyleImage* initialBorderImageSource() { return 0; } 1670 static StyleImage* initialBorderImageSource() { return 0; }
1671 static StyleImage* initialMaskBoxImageSource() { return 0; } 1671 static StyleImage* initialMaskBoxImageSource() { return 0; }
1672 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE conomy; } 1672 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE conomy; }
1673 static TouchAction initialTouchAction() { return TouchActionAuto; } 1673 static TouchAction initialTouchAction() { return TouchActionAuto; }
1674 static TouchActionDelay initialTouchActionDelay() { return TouchActionDelayS cript; }
1675 static ShadowList* initialBoxShadow() { return 0; } 1674 static ShadowList* initialBoxShadow() { return 0; }
1676 static ShadowList* initialTextShadow() { return 0; } 1675 static ShadowList* initialTextShadow() { return 0; }
1677 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; } 1676 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; }
1677 static ScrollBlocksOn initialScrollBlocksOn() { return ScrollBlocksOnNone; }
1678 1678
1679 // The initial value is 'none' for grid tracks. 1679 // The initial value is 'none' for grid tracks.
1680 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr idTrackSize>(); } 1680 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr idTrackSize>(); }
1681 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT rackSize>(); } 1681 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT rackSize>(); }
1682 1682
1683 static GridAutoFlow initialGridAutoFlow() { return AutoFlowRow; } 1683 static GridAutoFlow initialGridAutoFlow() { return AutoFlowRow; }
1684 1684
1685 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length( Auto)); } 1685 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length( Auto)); }
1686 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut o)); } 1686 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut o)); }
1687 1687
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 inline bool RenderStyle::hasPseudoElementStyle() const 1915 inline bool RenderStyle::hasPseudoElementStyle() const
1916 { 1916 {
1917 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1917 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1918 } 1918 }
1919 1919
1920 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1920 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1921 1921
1922 } // namespace blink 1922 } // namespace blink
1923 1923
1924 #endif // RenderStyle_h 1924 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698