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

Side by Side Diff: Source/core/dom/NodeRareData.h

Issue 1233453006: Merge 197139 "Fix the logic that limits the number of frames in ..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2403/
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/dom/NodeRareData.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) 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 David Smith <catfish.man@gmail.com> 3 * Copyright (C) 2008 David Smith <catfish.man@gmail.com>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 NodeMutationObserverData* mutationObserverData() { return m_mutationObserver Data.get(); } 76 NodeMutationObserverData* mutationObserverData() { return m_mutationObserver Data.get(); }
77 NodeMutationObserverData& ensureMutationObserverData() 77 NodeMutationObserverData& ensureMutationObserverData()
78 { 78 {
79 if (!m_mutationObserverData) 79 if (!m_mutationObserverData)
80 m_mutationObserverData = NodeMutationObserverData::create(); 80 m_mutationObserverData = NodeMutationObserverData::create();
81 return *m_mutationObserverData; 81 return *m_mutationObserverData;
82 } 82 }
83 83
84 unsigned connectedSubframeCount() const { return m_connectedFrameCount; } 84 unsigned connectedSubframeCount() const { return m_connectedFrameCount; }
85 void incrementConnectedSubframeCount(unsigned amount) 85 void incrementConnectedSubframeCount(unsigned amount);
86 {
87 m_connectedFrameCount += amount;
88 }
89 void decrementConnectedSubframeCount(unsigned amount) 86 void decrementConnectedSubframeCount(unsigned amount)
90 { 87 {
91 ASSERT(m_connectedFrameCount); 88 ASSERT(m_connectedFrameCount);
92 ASSERT(amount <= m_connectedFrameCount); 89 ASSERT(amount <= m_connectedFrameCount);
93 m_connectedFrameCount -= amount; 90 m_connectedFrameCount -= amount;
94 } 91 }
95 92
96 bool hasElementFlag(ElementFlags mask) const { return m_elementFlags & mask; } 93 bool hasElementFlag(ElementFlags mask) const { return m_elementFlags & mask; }
97 void setElementFlag(ElementFlags mask, bool value) { m_elementFlags = (m_ele mentFlags & ~mask) | (-(int32_t)value & mask); } 94 void setElementFlag(ElementFlags mask, bool value) { m_elementFlags = (m_ele mentFlags & ~mask) | (-(int32_t)value & mask); }
98 void clearElementFlag(ElementFlags mask) { m_elementFlags &= ~mask; } 95 void clearElementFlag(ElementFlags mask) { m_elementFlags &= ~mask; }
(...skipping 28 matching lines...) Expand all
127 unsigned m_connectedFrameCount : ConnectedFrameCountBits; 124 unsigned m_connectedFrameCount : ConnectedFrameCountBits;
128 unsigned m_elementFlags : NumberOfElementFlags; 125 unsigned m_elementFlags : NumberOfElementFlags;
129 unsigned m_restyleFlags : NumberOfDynamicRestyleFlags; 126 unsigned m_restyleFlags : NumberOfDynamicRestyleFlags;
130 protected: 127 protected:
131 unsigned m_isElementRareData : 1; 128 unsigned m_isElementRareData : 1;
132 }; 129 };
133 130
134 } // namespace blink 131 } // namespace blink
135 132
136 #endif // NodeRareData_h 133 #endif // NodeRareData_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/NodeRareData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698