| Index: third_party/WebKit/Source/core/dom/Node.h
|
| diff --git a/third_party/WebKit/Source/core/dom/Node.h b/third_party/WebKit/Source/core/dom/Node.h
|
| index c5ed07c4c42f0af19d9b4cfb6e70e99456f1361e..f91e8b7061ce2c748249989d0d813e8b1faae13a 100644
|
| --- a/third_party/WebKit/Source/core/dom/Node.h
|
| +++ b/third_party/WebKit/Source/core/dom/Node.h
|
| @@ -77,8 +77,8 @@ class StyleChangeReasonForTracing;
|
| class Text;
|
| class TouchEvent;
|
|
|
| -const int nodeStyleChangeShift = 19;
|
| -const int nodeCustomElementShift = 21;
|
| +const int nodeStyleChangeShift = 18;
|
| +const int nodeCustomElementShift = 20;
|
|
|
| enum StyleChangeType {
|
| NoStyleChange = 0,
|
| @@ -472,16 +472,6 @@ class CORE_EXPORT Node : public EventTarget {
|
|
|
| void updateDistribution();
|
|
|
| - bool svgFilterNeedsLayerUpdate() const {
|
| - return getFlag(SVGFilterNeedsLayerUpdateFlag);
|
| - }
|
| - void setSVGFilterNeedsLayerUpdate() {
|
| - setFlag(SVGFilterNeedsLayerUpdateFlag);
|
| - }
|
| - void clearSVGFilterNeedsLayerUpdate() {
|
| - clearFlag(SVGFilterNeedsLayerUpdateFlag);
|
| - }
|
| -
|
| void setIsLink(bool f);
|
|
|
| bool hasEventTargetData() const { return getFlag(HasEventTargetDataFlag); }
|
| @@ -823,30 +813,29 @@ class CORE_EXPORT Node : public EventTarget {
|
| IsFinishedParsingChildrenFlag = 1 << 12,
|
|
|
| // Flags related to recalcStyle.
|
| - SVGFilterNeedsLayerUpdateFlag = 1 << 13,
|
| - HasCustomStyleCallbacksFlag = 1 << 14,
|
| - ChildNeedsStyleInvalidationFlag = 1 << 15,
|
| - NeedsStyleInvalidationFlag = 1 << 16,
|
| - ChildNeedsDistributionRecalcFlag = 1 << 17,
|
| - ChildNeedsStyleRecalcFlag = 1 << 18,
|
| + HasCustomStyleCallbacksFlag = 1 << 13,
|
| + ChildNeedsStyleInvalidationFlag = 1 << 14,
|
| + NeedsStyleInvalidationFlag = 1 << 15,
|
| + ChildNeedsDistributionRecalcFlag = 1 << 16,
|
| + ChildNeedsStyleRecalcFlag = 1 << 17,
|
| StyleChangeMask =
|
| 1 << nodeStyleChangeShift | 1 << (nodeStyleChangeShift + 1),
|
|
|
| CustomElementStateMask = 0x3 << nodeCustomElementShift,
|
|
|
| - HasNameOrIsEditingTextFlag = 1 << 23,
|
| - HasEventTargetDataFlag = 1 << 24,
|
| + HasNameOrIsEditingTextFlag = 1 << 22,
|
| + HasEventTargetDataFlag = 1 << 23,
|
|
|
| - V0CustomElementFlag = 1 << 25,
|
| - V0CustomElementUpgradedFlag = 1 << 26,
|
| + V0CustomElementFlag = 1 << 24,
|
| + V0CustomElementUpgradedFlag = 1 << 25,
|
|
|
| - NeedsReattachLayoutTree = 1 << 27,
|
| - ChildNeedsReattachLayoutTree = 1 << 28,
|
| + NeedsReattachLayoutTree = 1 << 26,
|
| + ChildNeedsReattachLayoutTree = 1 << 27,
|
|
|
| DefaultNodeFlags = IsFinishedParsingChildrenFlag | NeedsReattachStyleChange
|
| };
|
|
|
| - // 3 bits remaining.
|
| + // 4 bits remaining.
|
|
|
| bool getFlag(NodeFlags mask) const { return m_nodeFlags & mask; }
|
| void setFlag(bool f, NodeFlags mask) {
|
|
|