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

Side by Side Diff: third_party/WebKit/Source/core/dom/NodeRareData.cpp

Issue 2739033003: Move FrameHost::m_subframeCount to Page (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameHost.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "core/dom/NodeRareData.h" 31 #include "core/dom/NodeRareData.h"
32 32
33 #include "bindings/core/v8/ScriptWrappableVisitor.h" 33 #include "bindings/core/v8/ScriptWrappableVisitor.h"
34 #include "core/dom/Element.h" 34 #include "core/dom/Element.h"
35 #include "core/dom/ElementRareData.h" 35 #include "core/dom/ElementRareData.h"
36 #include "core/frame/FrameHost.h" 36 #include "core/page/Page.h"
37 #include "platform/heap/Handle.h" 37 #include "platform/heap/Handle.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 struct SameSizeAsNodeRareData { 41 struct SameSizeAsNodeRareData {
42 void* m_pointer; 42 void* m_pointer;
43 Member<void*> m_willbeMember[2]; 43 Member<void*> m_willbeMember[2];
44 unsigned m_bitfields; 44 unsigned m_bitfields;
45 }; 45 };
46 46
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 void NodeRareData::finalizeGarbageCollectedObject() { 79 void NodeRareData::finalizeGarbageCollectedObject() {
80 CHECK(!layoutObject()); 80 CHECK(!layoutObject());
81 if (m_isElementRareData) 81 if (m_isElementRareData)
82 static_cast<ElementRareData*>(this)->~ElementRareData(); 82 static_cast<ElementRareData*>(this)->~ElementRareData();
83 else 83 else
84 this->~NodeRareData(); 84 this->~NodeRareData();
85 } 85 }
86 86
87 void NodeRareData::incrementConnectedSubframeCount() { 87 void NodeRareData::incrementConnectedSubframeCount() {
88 SECURITY_CHECK((m_connectedFrameCount + 1) <= FrameHost::maxNumberOfFrames); 88 SECURITY_CHECK((m_connectedFrameCount + 1) <= Page::maxNumberOfFrames);
89 ++m_connectedFrameCount; 89 ++m_connectedFrameCount;
90 } 90 }
91 91
92 // Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow 92 // Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
93 static_assert(FrameHost::maxNumberOfFrames < 93 static_assert(Page::maxNumberOfFrames <
94 (1 << NodeRareData::ConnectedFrameCountBits), 94 (1 << NodeRareData::ConnectedFrameCountBits),
95 "Frame limit should fit in rare data count"); 95 "Frame limit should fit in rare data count");
96 96
97 } // namespace blink 97 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/FrameHost.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698