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

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

Issue 1590193002: Partial implementation of inline StylePropertyMap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@maps
Patch Set: Update tests Created 4 years, 10 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
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 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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/ElementRareData.h" 31 #include "core/dom/ElementRareData.h"
32
33 #include "core/css/cssom/InlineStylePropertyMap.h"
32 #include "core/dom/CompositorProxiedPropertySet.h" 34 #include "core/dom/CompositorProxiedPropertySet.h"
33 #include "core/style/ComputedStyle.h" 35 #include "core/style/ComputedStyle.h"
34 36
35 namespace blink { 37 namespace blink {
36 38
37 struct SameSizeAsElementRareData : NodeRareData { 39 struct SameSizeAsElementRareData : NodeRareData {
38 short indices[1]; 40 short indices[1];
39 LayoutSize sizeForResizing; 41 LayoutSize sizeForResizing;
40 IntSize scrollOffset; 42 IntSize scrollOffset;
41 void* pointers[13]; 43 void* pointers[13];
42 PersistentWillBeMember<void*> persistentMember[2]; 44 PersistentWillBeMember<void*> persistentMember[3];
43 }; 45 };
44 46
45 CSSStyleDeclaration& ElementRareData::ensureInlineCSSStyleDeclaration(Element* o wnerElement) 47 CSSStyleDeclaration& ElementRareData::ensureInlineCSSStyleDeclaration(Element* o wnerElement)
46 { 48 {
47 if (!m_cssomWrapper) 49 if (!m_cssomWrapper)
48 m_cssomWrapper = adoptPtrWillBeNoop(new InlineCSSStyleDeclaration(ownerE lement)); 50 m_cssomWrapper = adoptPtrWillBeNoop(new InlineCSSStyleDeclaration(ownerE lement));
49 return *m_cssomWrapper; 51 return *m_cssomWrapper;
50 } 52 }
51 53
54 InlineStylePropertyMap& ElementRareData::ensureInlineStylePropertyMap(Element* o wnerElement)
55 {
56 if (!m_cssomMapWrapper) {
57 m_cssomMapWrapper = new InlineStylePropertyMap(ownerElement);
58 }
59 return *m_cssomMapWrapper;
60 }
61
52 AttrNodeList& ElementRareData::ensureAttrNodeList() 62 AttrNodeList& ElementRareData::ensureAttrNodeList()
53 { 63 {
54 if (!m_attrNodeList) 64 if (!m_attrNodeList)
55 m_attrNodeList = adoptPtrWillBeNoop(new AttrNodeList); 65 m_attrNodeList = adoptPtrWillBeNoop(new AttrNodeList);
56 return *m_attrNodeList; 66 return *m_attrNodeList;
57 } 67 }
58 68
59 DEFINE_TRACE_AFTER_DISPATCH(ElementRareData) 69 DEFINE_TRACE_AFTER_DISPATCH(ElementRareData)
60 { 70 {
61 visitor->trace(m_dataset); 71 visitor->trace(m_dataset);
62 visitor->trace(m_classList); 72 visitor->trace(m_classList);
63 visitor->trace(m_shadow); 73 visitor->trace(m_shadow);
64 visitor->trace(m_attributeMap); 74 visitor->trace(m_attributeMap);
65 #if ENABLE(OILPAN) 75 #if ENABLE(OILPAN)
66 visitor->trace(m_attrNodeList); 76 visitor->trace(m_attrNodeList);
67 #endif 77 #endif
68 visitor->trace(m_elementAnimations); 78 visitor->trace(m_elementAnimations);
69 visitor->trace(m_cssomWrapper); 79 visitor->trace(m_cssomWrapper);
80 visitor->trace(m_cssomMapWrapper);
70 visitor->trace(m_customElementDefinition); 81 visitor->trace(m_customElementDefinition);
71 visitor->trace(m_generatedBefore); 82 visitor->trace(m_generatedBefore);
72 visitor->trace(m_generatedAfter); 83 visitor->trace(m_generatedAfter);
73 visitor->trace(m_generatedFirstLetter); 84 visitor->trace(m_generatedFirstLetter);
74 visitor->trace(m_backdrop); 85 visitor->trace(m_backdrop);
75 visitor->trace(m_intersectionObserverData); 86 visitor->trace(m_intersectionObserverData);
76 NodeRareData::traceAfterDispatch(visitor); 87 NodeRareData::traceAfterDispatch(visitor);
77 } 88 }
78 89
79 static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "Ele mentRareData should stay small"); 90 static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "Ele mentRareData should stay small");
80 91
81 } // namespace blink 92 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698