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 13 matching lines...) Expand all Loading... |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "core/dom/RenderTreeBuilder.h" | 27 #include "core/dom/RenderTreeBuilder.h" |
28 | 28 |
29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
30 #include "core/SVGNames.h" | 30 #include "core/SVGNames.h" |
31 #include "core/css/resolver/StyleResolver.h" | 31 #include "core/css/resolver/StyleResolver.h" |
32 #include "core/dom/Fullscreen.h" | 32 #include "core/dom/Fullscreen.h" |
33 #include "core/dom/Node.h" | 33 #include "core/dom/Node.h" |
| 34 #include "core/dom/PseudoElement.h" |
34 #include "core/dom/Text.h" | 35 #include "core/dom/Text.h" |
35 #include "core/rendering/RenderFullScreen.h" | 36 #include "core/rendering/RenderFullScreen.h" |
36 #include "core/rendering/RenderObject.h" | 37 #include "core/rendering/RenderObject.h" |
37 #include "core/rendering/RenderText.h" | 38 #include "core/rendering/RenderText.h" |
38 #include "core/rendering/RenderView.h" | 39 #include "core/rendering/RenderView.h" |
39 #include "core/svg/SVGElement.h" | 40 #include "core/svg/SVGElement.h" |
40 #include "platform/RuntimeEnabledFeatures.h" | 41 #include "platform/RuntimeEnabledFeatures.h" |
41 | 42 |
42 namespace blink { | 43 namespace blink { |
43 | 44 |
44 RenderObject* RenderTreeBuilder::nextRenderer() const | 45 RenderObject* RenderTreeBuilder::nextRenderer() const |
45 { | 46 { |
46 ASSERT(m_renderingParent); | 47 ASSERT(m_renderingParent); |
47 | 48 |
48 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; | 49 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; |
49 | 50 |
50 if (element && element->isInTopLayer()) | 51 if (element && element->isInTopLayer()) |
51 return NodeRenderingTraversal::nextInTopLayer(element); | 52 return NodeRenderingTraversal::nextInTopLayer(element); |
52 | 53 |
53 // Avoid an O(N^2) walk over the children when reattaching all children of a
node. | 54 // Avoid an O(N^2) walk over the children when reattaching all children of a
node. |
54 if (m_renderingParent->needsAttach()) | 55 if (m_renderingParent->needsAttach()) |
55 return 0; | 56 return 0; |
56 | 57 |
| 58 if (element && element->isFirstLetterPseudoElement()) |
| 59 return element->firstLetterTextRenderer(); |
| 60 |
57 return NodeRenderingTraversal::nextSiblingRenderer(m_node); | 61 return NodeRenderingTraversal::nextSiblingRenderer(m_node); |
58 } | 62 } |
59 | 63 |
60 RenderObject* RenderTreeBuilder::parentRenderer() const | 64 RenderObject* RenderTreeBuilder::parentRenderer() const |
61 { | 65 { |
62 ASSERT(m_renderingParent); | 66 ASSERT(m_renderingParent); |
63 | 67 |
64 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; | 68 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; |
65 | 69 |
| 70 if (element && element->isFirstLetterPseudoElement()) { |
| 71 RenderObject* nextRenderer = element->firstLetterTextRenderer(); |
| 72 return nextRenderer ? nextRenderer->parent() : nullptr; |
| 73 } |
| 74 |
66 if (element && m_renderingParent->renderer()) { | 75 if (element && m_renderingParent->renderer()) { |
67 // FIXME: Guarding this by m_renderingParent->renderer() isn't quite rig
ht as the spec for | 76 // FIXME: Guarding this by m_renderingParent->renderer() isn't quite rig
ht as the spec for |
68 // top layer only talks about display: none ancestors so putting a <dial
og> inside an | 77 // top layer only talks about display: none ancestors so putting a <dial
og> inside an |
69 // <optgroup> seems like it should still work even though this check wil
l prevent it. | 78 // <optgroup> seems like it should still work even though this check wil
l prevent it. |
70 if (element->isInTopLayer()) | 79 if (element->isInTopLayer()) |
71 return m_node->document().renderView(); | 80 return m_node->document().renderView(); |
72 } | 81 } |
73 | 82 |
74 return m_renderingParent->renderer(); | 83 return m_renderingParent->renderer(); |
75 } | 84 } |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 177 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
169 | 178 |
170 RenderObject* nextRenderer = this->nextRenderer(); | 179 RenderObject* nextRenderer = this->nextRenderer(); |
171 textNode->setRenderer(newRenderer); | 180 textNode->setRenderer(newRenderer); |
172 // Parent takes care of the animations, no need to call setAnimatableStyle. | 181 // Parent takes care of the animations, no need to call setAnimatableStyle. |
173 newRenderer->setStyle(m_style.release()); | 182 newRenderer->setStyle(m_style.release()); |
174 parentRenderer->addChild(newRenderer, nextRenderer); | 183 parentRenderer->addChild(newRenderer, nextRenderer); |
175 } | 184 } |
176 | 185 |
177 } | 186 } |
OLD | NEW |