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

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

Issue 425203002: Revert of Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | « Source/core/dom/Node.cpp ('k') | Source/core/editing/TextIterator.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 "config.h" 31 #include "config.h"
32 #include "core/dom/NodeRareData.h" 32 #include "core/dom/NodeRareData.h"
33 #include "core/dom/Element.h" 33 #include "core/dom/Element.h"
34 #include "core/dom/ElementRareData.h" 34 #include "core/dom/ElementRareData.h"
35 #include "core/page/Page.h" 35 #include "core/page/Page.h"
36 #include "core/rendering/RenderObject.h"
37 #include "platform/heap/Handle.h" 36 #include "platform/heap/Handle.h"
38 37
39 namespace blink { 38 namespace blink {
40 39
41 struct SameSizeAsNodeRareData { 40 struct SameSizeAsNodeRareData {
42 void* m_pointer[2]; 41 void* m_pointer[2];
43 OwnPtrWillBeMember<NodeMutationObserverData> m_mutationObserverData; 42 OwnPtrWillBeMember<NodeMutationObserverData> m_mutationObserverData;
44 unsigned m_bitfields; 43 unsigned m_bitfields;
45 }; 44 };
46 45
47 COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareD ataShouldStaySmall); 46 COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareD ataShouldStaySmall);
48 47
49 void NodeRareData::traceAfterDispatch(Visitor* visitor) 48 void NodeRareData::traceAfterDispatch(Visitor* visitor)
50 { 49 {
51 #if ENABLE(OILPAN)
52 visitor->trace(m_renderer);
53 #endif
54 visitor->trace(m_mutationObserverData); 50 visitor->trace(m_mutationObserverData);
55 // Do not keep empty NodeListsNodeData objects around. 51 // Do not keep empty NodeListsNodeData objects around.
56 if (m_nodeLists && m_nodeLists->isEmpty()) 52 if (m_nodeLists && m_nodeLists->isEmpty())
57 m_nodeLists.clear(); 53 m_nodeLists.clear();
58 else 54 else
59 visitor->trace(m_nodeLists); 55 visitor->trace(m_nodeLists);
60 } 56 }
61 57
62 void NodeRareData::trace(Visitor* visitor) 58 void NodeRareData::trace(Visitor* visitor)
63 { 59 {
64 if (m_isElementRareData) 60 if (m_isElementRareData)
65 static_cast<ElementRareData*>(this)->traceAfterDispatch(visitor); 61 static_cast<ElementRareData*>(this)->traceAfterDispatch(visitor);
66 else 62 else
67 traceAfterDispatch(visitor); 63 traceAfterDispatch(visitor);
68 } 64 }
69 65
70 void NodeRareData::finalizeGarbageCollectedObject() 66 void NodeRareData::finalizeGarbageCollectedObject()
71 { 67 {
72 RELEASE_ASSERT(!renderer()); 68 RELEASE_ASSERT(!renderer());
73 if (m_isElementRareData) 69 if (m_isElementRareData)
74 static_cast<ElementRareData*>(this)->~ElementRareData(); 70 static_cast<ElementRareData*>(this)->~ElementRareData();
75 else 71 else
76 this->~NodeRareData(); 72 this->~NodeRareData();
77 } 73 }
78 74
79 // Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow 75 // Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
80 COMPILE_ASSERT(Page::maxNumberOfFrames < (1 << NodeRareData::ConnectedFrameCount Bits), Frame_limit_should_fit_in_rare_data_count); 76 COMPILE_ASSERT(Page::maxNumberOfFrames < (1 << NodeRareData::ConnectedFrameCount Bits), Frame_limit_should_fit_in_rare_data_count);
81 77
82 } // namespace blink 78 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Node.cpp ('k') | Source/core/editing/TextIterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698