Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 * * Neither the name of Google Inc. nor the names of its | 10 * * Neither the name of Google Inc. nor the names of its |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/dom/shadow/ElementShadow.h" | 28 #include "core/dom/shadow/ElementShadow.h" |
| 29 | 29 |
| 30 #include "core/css/StyleSheetList.h" | 30 #include "core/css/StyleSheetList.h" |
| 31 #include "core/dom/ElementTraversal.h" | 31 #include "core/dom/ElementTraversal.h" |
| 32 #include "core/dom/NodeTraversal.h" | 32 #include "core/dom/NodeTraversal.h" |
| 33 #include "core/dom/shadow/DistributedNodes.h" | 33 #include "core/dom/shadow/DistributedNodes.h" |
| 34 #include "core/frame/UseCounter.h" | |
| 34 #include "core/html/HTMLContentElement.h" | 35 #include "core/html/HTMLContentElement.h" |
| 35 #include "core/html/HTMLShadowElement.h" | 36 #include "core/html/HTMLShadowElement.h" |
| 36 #include "core/inspector/InspectorInstrumentation.h" | 37 #include "core/inspector/InspectorInstrumentation.h" |
| 37 #include "platform/EventDispatchForbiddenScope.h" | 38 #include "platform/EventDispatchForbiddenScope.h" |
| 38 #include "platform/ScriptForbiddenScope.h" | 39 #include "platform/ScriptForbiddenScope.h" |
| 39 | 40 |
| 40 namespace blink { | 41 namespace blink { |
| 41 | 42 |
| 42 class DistributionPool final { | 43 class DistributionPool final { |
| 43 STACK_ALLOCATED(); | 44 STACK_ALLOCATED(); |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 #endif | 143 #endif |
| 143 } | 144 } |
| 144 | 145 |
| 145 ShadowRoot& ElementShadow::addShadowRoot(Element& shadowHost, ShadowRoot::Shadow RootType type) | 146 ShadowRoot& ElementShadow::addShadowRoot(Element& shadowHost, ShadowRoot::Shadow RootType type) |
| 146 { | 147 { |
| 147 EventDispatchForbiddenScope assertNoEventDispatch; | 148 EventDispatchForbiddenScope assertNoEventDispatch; |
| 148 ScriptForbiddenScope forbidScript; | 149 ScriptForbiddenScope forbidScript; |
| 149 | 150 |
| 150 if (type == ShadowRoot::OpenShadowRoot && (!youngestShadowRoot() || youngest ShadowRoot()->type() == ShadowRoot::UserAgentShadowRoot)) | 151 if (type == ShadowRoot::OpenShadowRoot && (!youngestShadowRoot() || youngest ShadowRoot()->type() == ShadowRoot::UserAgentShadowRoot)) |
| 151 shadowHost.willAddFirstOpenShadowRoot(); | 152 shadowHost.willAddFirstOpenShadowRoot(); |
| 153 else | |
|
hayato
2015/05/20 02:10:04
Will this count UserAgent ShadowRoot also?
kochi
2015/05/20 02:26:25
Good catch. fixed.
| |
| 154 UseCounter::count(shadowHost.document(), UseCounter::DeprecatedMultipleE lementCreateShadowRoot); | |
| 152 | 155 |
| 153 for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadow Root()) | 156 for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadow Root()) |
| 154 root->lazyReattachIfAttached(); | 157 root->lazyReattachIfAttached(); |
| 155 | 158 |
| 156 RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = ShadowRoot::create(shadowHost.do cument(), type); | 159 RefPtrWillBeRawPtr<ShadowRoot> shadowRoot = ShadowRoot::create(shadowHost.do cument(), type); |
| 157 shadowRoot->setParentOrShadowHostNode(&shadowHost); | 160 shadowRoot->setParentOrShadowHostNode(&shadowHost); |
| 158 shadowRoot->setParentTreeScope(shadowHost.treeScope()); | 161 shadowRoot->setParentTreeScope(shadowHost.treeScope()); |
| 159 m_shadowRoots.push(shadowRoot.get()); | 162 m_shadowRoots.push(shadowRoot.get()); |
| 160 setNeedsDistributionRecalc(); | 163 setNeedsDistributionRecalc(); |
| 161 | 164 |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 371 visitor->trace(m_nodeToInsertionPoints); | 374 visitor->trace(m_nodeToInsertionPoints); |
| 372 visitor->trace(m_selectFeatures); | 375 visitor->trace(m_selectFeatures); |
| 373 // Shadow roots are linked with previous and next pointers which are traced. | 376 // Shadow roots are linked with previous and next pointers which are traced. |
| 374 // It is therefore enough to trace one of the shadow roots here and the | 377 // It is therefore enough to trace one of the shadow roots here and the |
| 375 // rest will be traced from there. | 378 // rest will be traced from there. |
| 376 visitor->trace(m_shadowRoots.head()); | 379 visitor->trace(m_shadowRoots.head()); |
| 377 #endif | 380 #endif |
| 378 } | 381 } |
| 379 | 382 |
| 380 } // namespace | 383 } // namespace |
| OLD | NEW |