| OLD | NEW |
| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 #include "platform/fonts/FontDescription.h" | 71 #include "platform/fonts/FontDescription.h" |
| 72 #include "platform/geometry/FloatRoundedRect.h" | 72 #include "platform/geometry/FloatRoundedRect.h" |
| 73 #include "platform/geometry/LayoutRectOutsets.h" | 73 #include "platform/geometry/LayoutRectOutsets.h" |
| 74 #include "platform/graphics/Color.h" | 74 #include "platform/graphics/Color.h" |
| 75 #include "platform/graphics/GraphicsTypes.h" | 75 #include "platform/graphics/GraphicsTypes.h" |
| 76 #include "platform/scroll/ScrollableArea.h" | 76 #include "platform/scroll/ScrollableArea.h" |
| 77 #include "platform/text/TextDirection.h" | 77 #include "platform/text/TextDirection.h" |
| 78 #include "platform/text/TextRun.h" | 78 #include "platform/text/TextRun.h" |
| 79 #include "platform/text/UnicodeBidi.h" | 79 #include "platform/text/UnicodeBidi.h" |
| 80 #include "platform/transforms/TransformOperations.h" | 80 #include "platform/transforms/TransformOperations.h" |
| 81 #include "public/platform/WebScrollBlocksOn.h" | |
| 82 #include "wtf/Forward.h" | 81 #include "wtf/Forward.h" |
| 83 #include "wtf/OwnPtr.h" | 82 #include "wtf/OwnPtr.h" |
| 84 #include "wtf/RefCounted.h" | 83 #include "wtf/RefCounted.h" |
| 85 #include "wtf/StdLibExtras.h" | 84 #include "wtf/StdLibExtras.h" |
| 86 #include "wtf/Vector.h" | 85 #include "wtf/Vector.h" |
| 87 | 86 |
| 88 template<typename T, typename U> inline bool compareEqual(const T& t, const U& u
) { return t == static_cast<T>(u); } | 87 template<typename T, typename U> inline bool compareEqual(const T& t, const U& u
) { return t == static_cast<T>(u); } |
| 89 | 88 |
| 90 #define SET_VAR(group, variable, value) \ | 89 #define SET_VAR(group, variable, value) \ |
| 91 if (!compareEqual(group->variable, value)) \ | 90 if (!compareEqual(group->variable, value)) \ |
| (...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 954 | 953 |
| 955 EIsolation isolation() const { return static_cast<EIsolation>(rareNonInherit
edData->m_isolation); } | 954 EIsolation isolation() const { return static_cast<EIsolation>(rareNonInherit
edData->m_isolation); } |
| 956 void setIsolation(EIsolation v) { rareNonInheritedData.access()->m_isolation
= v; } | 955 void setIsolation(EIsolation v) { rareNonInheritedData.access()->m_isolation
= v; } |
| 957 bool hasIsolation() const { return isolation() != IsolationAuto; } | 956 bool hasIsolation() const { return isolation() != IsolationAuto; } |
| 958 | 957 |
| 959 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef
tToRightDirection() && isHorizontalWritingMode(); } | 958 bool shouldPlaceBlockDirectionScrollbarOnLogicalLeft() const { return !isLef
tToRightDirection() && isHorizontalWritingMode(); } |
| 960 | 959 |
| 961 TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInh
eritedData->m_touchAction); } | 960 TouchAction touchAction() const { return static_cast<TouchAction>(rareNonInh
eritedData->m_touchAction); } |
| 962 | 961 |
| 963 ScrollBehavior scrollBehavior() const { return static_cast<ScrollBehavior>(r
areNonInheritedData->m_scrollBehavior); } | 962 ScrollBehavior scrollBehavior() const { return static_cast<ScrollBehavior>(r
areNonInheritedData->m_scrollBehavior); } |
| 964 WebScrollBlocksOn scrollBlocksOn() const { return static_cast<WebScrollBlock
sOn>(rareNonInheritedData->m_scrollBlocksOn); } | |
| 965 bool hasScrollBlocksOn() const { return scrollBlocksOn() != WebScrollBlocksO
nNone; } | |
| 966 | 963 |
| 967 ScrollSnapType scrollSnapType() const { return static_cast<ScrollSnapType>(r
areNonInheritedData->m_scrollSnapType); } | 964 ScrollSnapType scrollSnapType() const { return static_cast<ScrollSnapType>(r
areNonInheritedData->m_scrollSnapType); } |
| 968 ScrollSnapPoints scrollSnapPointsX() const { return rareNonInheritedData->m_
scrollSnap->m_xPoints; } | 965 ScrollSnapPoints scrollSnapPointsX() const { return rareNonInheritedData->m_
scrollSnap->m_xPoints; } |
| 969 ScrollSnapPoints scrollSnapPointsY() const { return rareNonInheritedData->m_
scrollSnap->m_yPoints; } | 966 ScrollSnapPoints scrollSnapPointsY() const { return rareNonInheritedData->m_
scrollSnap->m_yPoints; } |
| 970 Vector<LengthPoint> scrollSnapCoordinate() const { return rareNonInheritedDa
ta->m_scrollSnap->m_coordinates; } | 967 Vector<LengthPoint> scrollSnapCoordinate() const { return rareNonInheritedDa
ta->m_scrollSnap->m_coordinates; } |
| 971 LengthPoint scrollSnapDestination() const { return rareNonInheritedData->m_s
crollSnap->m_destination; } | 968 LengthPoint scrollSnapDestination() const { return rareNonInheritedData->m_s
crollSnap->m_destination; } |
| 972 | 969 |
| 973 const Vector<CSSPropertyID>& willChangeProperties() const { return rareNonIn
heritedData->m_willChange->m_properties; } | 970 const Vector<CSSPropertyID>& willChangeProperties() const { return rareNonIn
heritedData->m_willChange->m_properties; } |
| 974 bool willChangeContents() const { return rareNonInheritedData->m_willChange-
>m_contents; } | 971 bool willChangeContents() const { return rareNonInheritedData->m_willChange-
>m_contents; } |
| 975 bool willChangeScrollPosition() const { return rareNonInheritedData->m_willC
hange->m_scrollPosition; } | 972 bool willChangeScrollPosition() const { return rareNonInheritedData->m_willC
hange->m_scrollPosition; } |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1412 void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rar
eNonInheritedData, m_runningTransformAnimationOnCompositor, b); } | 1409 void setIsRunningTransformAnimationOnCompositor(bool b = true) { SET_VAR(rar
eNonInheritedData, m_runningTransformAnimationOnCompositor, b); } |
| 1413 void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNo
nInheritedData, m_runningFilterAnimationOnCompositor, b); } | 1410 void setIsRunningFilterAnimationOnCompositor(bool b = true) { SET_VAR(rareNo
nInheritedData, m_runningFilterAnimationOnCompositor, b); } |
| 1414 | 1411 |
| 1415 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line
BoxContain, c); } | 1412 void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_line
BoxContain, c); } |
| 1416 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam
p, c); } | 1413 void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClam
p, c); } |
| 1417 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi
ghlightColor, c); } | 1414 void setTapHighlightColor(const Color& c) { SET_VAR(rareInheritedData, tapHi
ghlightColor, c); } |
| 1418 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat
a, textSecurity, aTextSecurity); } | 1415 void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedDat
a, textSecurity, aTextSecurity); } |
| 1419 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc
tion, t); } | 1416 void setTouchAction(TouchAction t) { SET_VAR(rareNonInheritedData, m_touchAc
tion, t); } |
| 1420 | 1417 |
| 1421 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s
crollBehavior, b); } | 1418 void setScrollBehavior(ScrollBehavior b) { SET_VAR(rareNonInheritedData, m_s
crollBehavior, b); } |
| 1422 void setScrollBlocksOn(WebScrollBlocksOn b) { SET_VAR(rareNonInheritedData,
m_scrollBlocksOn, b); } | |
| 1423 | 1419 |
| 1424 void setScrollSnapType(ScrollSnapType b) { SET_VAR(rareNonInheritedData, m_s
crollSnapType, b); } | 1420 void setScrollSnapType(ScrollSnapType b) { SET_VAR(rareNonInheritedData, m_s
crollSnapType, b); } |
| 1425 void setScrollSnapPointsX(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri
tedData.access()->m_scrollSnap, m_xPoints, b); } | 1421 void setScrollSnapPointsX(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri
tedData.access()->m_scrollSnap, m_xPoints, b); } |
| 1426 void setScrollSnapPointsY(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri
tedData.access()->m_scrollSnap, m_yPoints, b); } | 1422 void setScrollSnapPointsY(const ScrollSnapPoints& b) { SET_VAR(rareNonInheri
tedData.access()->m_scrollSnap, m_yPoints, b); } |
| 1427 void setScrollSnapDestination(const LengthPoint& b) { SET_VAR(rareNonInherit
edData.access()->m_scrollSnap, m_destination, b); } | 1423 void setScrollSnapDestination(const LengthPoint& b) { SET_VAR(rareNonInherit
edData.access()->m_scrollSnap, m_destination, b); } |
| 1428 void setScrollSnapCoordinate(const Vector<LengthPoint>& b) { SET_VAR(rareNon
InheritedData.access()->m_scrollSnap, m_coordinates, b); } | 1424 void setScrollSnapCoordinate(const Vector<LengthPoint>& b) { SET_VAR(rareNon
InheritedData.access()->m_scrollSnap, m_coordinates, b); } |
| 1429 | 1425 |
| 1430 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_
VAR(rareNonInheritedData.access()->m_willChange, m_properties, properties); } | 1426 void setWillChangeProperties(const Vector<CSSPropertyID>& properties) { SET_
VAR(rareNonInheritedData.access()->m_willChange, m_properties, properties); } |
| 1431 void setWillChangeContents(bool b) { SET_VAR(rareNonInheritedData.access()->
m_willChange, m_contents, b); } | 1427 void setWillChangeContents(bool b) { SET_VAR(rareNonInheritedData.access()->
m_willChange, m_contents, b); } |
| 1432 void setWillChangeScrollPosition(bool b) { SET_VAR(rareNonInheritedData.acce
ss()->m_willChange, m_scrollPosition, b); } | 1428 void setWillChangeScrollPosition(bool b) { SET_VAR(rareNonInheritedData.acce
ss()->m_willChange, m_scrollPosition, b); } |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1700 static ImageResolutionSource initialImageResolutionSource() { return ImageRe
solutionSpecified; } | 1696 static ImageResolutionSource initialImageResolutionSource() { return ImageRe
solutionSpecified; } |
| 1701 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu
tionNoSnap; } | 1697 static ImageResolutionSnap initialImageResolutionSnap() { return ImageResolu
tionNoSnap; } |
| 1702 static float initialImageResolution() { return 1; } | 1698 static float initialImageResolution() { return 1; } |
| 1703 static StyleImage* initialBorderImageSource() { return 0; } | 1699 static StyleImage* initialBorderImageSource() { return 0; } |
| 1704 static StyleImage* initialMaskBoxImageSource() { return 0; } | 1700 static StyleImage* initialMaskBoxImageSource() { return 0; } |
| 1705 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE
conomy; } | 1701 static PrintColorAdjust initialPrintColorAdjust() { return PrintColorAdjustE
conomy; } |
| 1706 static TouchAction initialTouchAction() { return TouchActionAuto; } | 1702 static TouchAction initialTouchAction() { return TouchActionAuto; } |
| 1707 static ShadowList* initialBoxShadow() { return 0; } | 1703 static ShadowList* initialBoxShadow() { return 0; } |
| 1708 static ShadowList* initialTextShadow() { return 0; } | 1704 static ShadowList* initialTextShadow() { return 0; } |
| 1709 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorAuto; } | 1705 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorAuto; } |
| 1710 static WebScrollBlocksOn initialScrollBlocksOn() { return WebScrollBlocksOnN
one; } | |
| 1711 static ScrollSnapType initialScrollSnapType() { return ScrollSnapTypeNone; } | 1706 static ScrollSnapType initialScrollSnapType() { return ScrollSnapTypeNone; } |
| 1712 static ScrollSnapPoints initialScrollSnapPointsX() { return ScrollSnapPoints
(); } | 1707 static ScrollSnapPoints initialScrollSnapPointsX() { return ScrollSnapPoints
(); } |
| 1713 static ScrollSnapPoints initialScrollSnapPointsY() { return ScrollSnapPoints
(); } | 1708 static ScrollSnapPoints initialScrollSnapPointsY() { return ScrollSnapPoints
(); } |
| 1714 static LengthPoint initialScrollSnapDestination() { return LengthPoint(Lengt
h(0, Fixed), Length(0, Fixed)); } | 1709 static LengthPoint initialScrollSnapDestination() { return LengthPoint(Lengt
h(0, Fixed), Length(0, Fixed)); } |
| 1715 static Vector<LengthPoint> initialScrollSnapCoordinate() { return Vector<Len
gthPoint>(); } | 1710 static Vector<LengthPoint> initialScrollSnapCoordinate() { return Vector<Len
gthPoint>(); } |
| 1716 | 1711 |
| 1717 // The initial value is 'none' for grid tracks. | 1712 // The initial value is 'none' for grid tracks. |
| 1718 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr
idTrackSize>(); } | 1713 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr
idTrackSize>(); } |
| 1719 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT
rackSize>(); } | 1714 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT
rackSize>(); } |
| 1720 | 1715 |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1946 } | 1941 } |
| 1947 | 1942 |
| 1948 inline bool ComputedStyle::hasPseudoElementStyle() const | 1943 inline bool ComputedStyle::hasPseudoElementStyle() const |
| 1949 { | 1944 { |
| 1950 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; | 1945 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; |
| 1951 } | 1946 } |
| 1952 | 1947 |
| 1953 } // namespace blink | 1948 } // namespace blink |
| 1954 | 1949 |
| 1955 #endif // ComputedStyle_h | 1950 #endif // ComputedStyle_h |
| OLD | NEW |