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 bb7635903f3aa1634f5df8b47f7c269609bfaad2..db27ad010268a53d7d1041d882c356aa427cad04 100644 |
--- a/third_party/WebKit/Source/core/dom/Node.h |
+++ b/third_party/WebKit/Source/core/dom/Node.h |
@@ -93,8 +93,8 @@ class TagCollection; |
class Text; |
class TouchEvent; |
-const int nodeStyleChangeShift = 19; |
-const int nodeCustomElementShift = 21; |
+const int nodeStyleChangeShift = 18; |
+const int nodeCustomElementShift = 20; |
enum StyleChangeType { |
NoStyleChange = 0, |
@@ -483,16 +483,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); } |
@@ -830,31 +820,30 @@ 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, |
- HasWeakReferencesFlag = 1 << 24, |
- HasEventTargetDataFlag = 1 << 25, |
+ HasNameOrIsEditingTextFlag = 1 << 22, |
+ HasWeakReferencesFlag = 1 << 23, |
+ HasEventTargetDataFlag = 1 << 24, |
- V0CustomElementFlag = 1 << 26, |
- V0CustomElementUpgradedFlag = 1 << 27, |
+ V0CustomElementFlag = 1 << 25, |
+ V0CustomElementUpgradedFlag = 1 << 26, |
- NeedsReattachLayoutTree = 1 << 28, |
- ChildNeedsReattachLayoutTree = 1 << 29, |
+ NeedsReattachLayoutTree = 1 << 27, |
+ ChildNeedsReattachLayoutTree = 1 << 28, |
DefaultNodeFlags = IsFinishedParsingChildrenFlag | NeedsReattachStyleChange |
}; |
- // 1 bit remaining. |
+ // 3 bits remaining. |
bool getFlag(NodeFlags mask) const { return m_nodeFlags & mask; } |
void setFlag(bool f, NodeFlags mask) { |