OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
7 * Copyright (C) 2011 Google Inc. All rights reserved. | 7 * Copyright (C) 2011 Google Inc. All rights reserved. |
8 * | 8 * |
9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 m_parentNodeForRenderingAndStyle = parent->shadowHost(); | 54 m_parentNodeForRenderingAndStyle = parent->shadowHost(); |
55 return; | 55 return; |
56 } | 56 } |
57 | 57 |
58 m_location = LocationLightChild; | 58 m_location = LocationLightChild; |
59 | 59 |
60 if (parent->isElementNode()) { | 60 if (parent->isElementNode()) { |
61 m_visualParentShadowRoot = toElement(parent)->shadowRoot(); | 61 m_visualParentShadowRoot = toElement(parent)->shadowRoot(); |
62 | 62 |
63 if (m_visualParentShadowRoot) { | 63 if (m_visualParentShadowRoot) { |
64 if ((m_includer = m_visualParentShadowRoot->includerFor(m_node))) { | 64 if ((m_includer = m_visualParentShadowRoot->includerFor(m_node)) |
| 65 && m_visualParentShadowRoot->isInclusionSelectorActive()) { |
65 m_phase = AttachContentForwarded; | 66 m_phase = AttachContentForwarded; |
66 m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_includ
er).parentNodeForRenderingAndStyle(); | 67 m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_includ
er).parentNodeForRenderingAndStyle(); |
67 return; | 68 return; |
68 } | 69 } |
69 | 70 |
70 m_phase = AttachContentLight; | 71 m_phase = AttachContentLight; |
71 m_parentNodeForRenderingAndStyle = parent; | 72 m_parentNodeForRenderingAndStyle = parent; |
72 return; | 73 return; |
73 } | 74 } |
74 } | 75 } |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 m_context.hostChildrenChanged(); | 326 m_context.hostChildrenChanged(); |
326 | 327 |
327 if (!newRenderer) | 328 if (!newRenderer) |
328 return; | 329 return; |
329 | 330 |
330 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. | 331 // Note: Adding newRenderer instead of renderer(). renderer() may be a child
of newRenderer. |
331 parentRenderer->addChild(newRenderer, nextRenderer); | 332 parentRenderer->addChild(newRenderer, nextRenderer); |
332 } | 333 } |
333 | 334 |
334 } | 335 } |
OLD | NEW |