Chromium Code Reviews| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 NodeRenderingContext::~NodeRenderingContext() | 72 NodeRenderingContext::~NodeRenderingContext() |
| 73 { | 73 { |
| 74 } | 74 } |
| 75 | 75 |
| 76 static bool isRendererReparented(const RenderObject* renderer) | 76 static bool isRendererReparented(const RenderObject* renderer) |
| 77 { | 77 { |
| 78 if (!renderer->node()->isElementNode()) | 78 if (!renderer->node()->isElementNode()) |
| 79 return false; | 79 return false; |
| 80 if (renderer->style() && !renderer->style()->flowThread().isEmpty()) | 80 if (renderer->style() && !renderer->style()->flowThread().isEmpty()) |
| 81 return true; | 81 return true; |
| 82 if (toElement(renderer->node())->isInTopLayer()) | 82 if (toElement(renderer->node())->isReparentedByRenderView(renderer->style()) ) |
| 83 return true; | 83 return true; |
| 84 return false; | 84 return false; |
| 85 } | 85 } |
| 86 | 86 |
| 87 RenderObject* NodeRenderingContext::nextRenderer() const | 87 RenderObject* NodeRenderingContext::nextRenderer() const |
| 88 { | 88 { |
| 89 if (RenderObject* renderer = m_node->renderer()) | 89 if (RenderObject* renderer = m_node->renderer()) |
| 90 return renderer->nextSibling(); | 90 return renderer->nextSibling(); |
| 91 | 91 |
| 92 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; | 92 Element* element = m_node->isElementNode() ? toElement(m_node) : 0; |
| 93 if (element && element->isInTopLayer()) { | 93 |
| 94 if (element && element->isReparentedByRenderView(m_style.get())) { | |
| 95 if (!element->isInTopLayer()) | |
|
Julien - ping for review
2013/05/01 23:35:48
Why don't you just check isInTopLayer above instea
falken
2013/05/02 13:11:59
If the renderer is reparented, we don't want to ge
Julien - ping for review
2013/05/02 16:27:49
OK, this code is definitely confusing I would say.
falken
2013/05/08 08:13:29
Done.
| |
| 96 return 0; | |
| 97 | |
| 94 const Vector<RefPtr<Element> >& topLayerElements = element->document()-> topLayerElements(); | 98 const Vector<RefPtr<Element> >& topLayerElements = element->document()-> topLayerElements(); |
| 95 size_t position = topLayerElements.find(element); | 99 size_t position = topLayerElements.find(element); |
| 96 ASSERT(position != notFound); | 100 ASSERT(position != notFound); |
| 97 for (size_t i = position + 1; i < topLayerElements.size(); ++i) { | 101 for (size_t i = position + 1; i < topLayerElements.size(); ++i) { |
| 98 if (RenderObject* renderer = topLayerElements[i]->renderer()) | 102 if (RenderObject* renderer = topLayerElements[i]->renderer()) |
| 99 return renderer; | 103 return renderer; |
| 100 } | 104 } |
| 101 return 0; | 105 return 0; |
| 102 } | 106 } |
| 103 | 107 |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 116 } | 120 } |
| 117 | 121 |
| 118 return 0; | 122 return 0; |
| 119 } | 123 } |
| 120 | 124 |
| 121 RenderObject* NodeRenderingContext::previousRenderer() const | 125 RenderObject* NodeRenderingContext::previousRenderer() const |
| 122 { | 126 { |
| 123 if (RenderObject* renderer = m_node->renderer()) | 127 if (RenderObject* renderer = m_node->renderer()) |
| 124 return renderer->previousSibling(); | 128 return renderer->previousSibling(); |
| 125 | 129 |
| 126 // FIXME: This doesn't work correctly for things in the top layer that are | 130 // FIXME: This doesn't work correctly for reparented elements that are |
| 127 // display: none. We'd need to duplicate the logic in nextRenderer, but sinc e | 131 // display: none. We'd need to duplicate the logic in nextRenderer, but sinc e |
| 128 // nothing needs that yet just assert. | 132 // nothing needs that yet just assert. |
| 129 ASSERT(!m_node->isElementNode() || !toElement(m_node)->isInTopLayer()); | 133 ASSERT(!m_node->isElementNode() || !toElement(m_node)->isReparentedByRenderV iew(m_style.get())); |
| 130 | 134 |
| 131 if (m_parentFlowRenderer) | 135 if (m_parentFlowRenderer) |
| 132 return m_parentFlowRenderer->previousRendererForNode(m_node); | 136 return m_parentFlowRenderer->previousRendererForNode(m_node); |
| 133 | 137 |
| 134 // FIXME: We should have the same O(N^2) avoidance as nextRenderer does | 138 // FIXME: We should have the same O(N^2) avoidance as nextRenderer does |
| 135 // however, when I tried adding it, several tests failed. | 139 // however, when I tried adding it, several tests failed. |
| 136 for (Node* sibling = NodeRenderingTraversal::previousSibling(m_node); siblin g; sibling = NodeRenderingTraversal::previousSibling(sibling)) { | 140 for (Node* sibling = NodeRenderingTraversal::previousSibling(m_node); siblin g; sibling = NodeRenderingTraversal::previousSibling(sibling)) { |
| 137 RenderObject* renderer = sibling->renderer(); | 141 RenderObject* renderer = sibling->renderer(); |
| 138 if (renderer && !isRendererReparented(renderer)) | 142 if (renderer && !isRendererReparented(renderer)) |
| 139 return renderer; | 143 return renderer; |
| 140 } | 144 } |
| 141 | 145 |
| 142 return 0; | 146 return 0; |
| 143 } | 147 } |
| 144 | 148 |
| 145 RenderObject* NodeRenderingContext::parentRenderer() const | 149 RenderObject* NodeRenderingContext::parentRenderer() const |
| 146 { | 150 { |
| 147 if (RenderObject* renderer = m_node->renderer()) | 151 if (RenderObject* renderer = m_node->renderer()) |
| 148 return renderer->parent(); | 152 return renderer->parent(); |
| 149 | 153 |
| 150 if (m_node->isElementNode() && toElement(m_node)->isInTopLayer()) { | 154 if (m_node->isElementNode() && toElement(m_node)->isReparentedByRenderView(m _style.get())) { |
| 151 // The parent renderer of top layer elements is the RenderView, but only | 155 // The parent renderer of reparented elements is the RenderView, but onl y |
| 152 // if the normal parent would have had a renderer. | 156 // if the normal parent would have had a renderer. |
| 153 // FIXME: This behavior isn't quite right as the spec for top layer | 157 // FIXME: This behavior isn't quite right as the spec for top layer |
| 154 // only talks about display: none ancestors so putting a <dialog> inside | 158 // only talks about display: none ancestors so putting a <dialog> inside |
| 155 // an <optgroup> seems like it should still work even though this check | 159 // an <optgroup> seems like it should still work even though this check |
| 156 // will prevent it. | 160 // will prevent it. |
| 157 if (!m_renderingParent || !m_renderingParent->renderer()) | 161 if (!m_renderingParent || !m_renderingParent->renderer()) |
| 158 return 0; | 162 return 0; |
| 159 return m_node->document()->renderView(); | 163 return m_node->document()->renderView(); |
| 160 } | 164 } |
| 161 | 165 |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 306 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 310 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 307 | 311 |
| 308 RenderObject* nextRenderer = this->nextRenderer(); | 312 RenderObject* nextRenderer = this->nextRenderer(); |
| 309 textNode->setRenderer(newRenderer); | 313 textNode->setRenderer(newRenderer); |
| 310 // Parent takes care of the animations, no need to call setAnimatableStyle. | 314 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 311 newRenderer->setStyle(m_style.release()); | 315 newRenderer->setStyle(m_style.release()); |
| 312 parentRenderer->addChild(newRenderer, nextRenderer); | 316 parentRenderer->addChild(newRenderer, nextRenderer); |
| 313 } | 317 } |
| 314 | 318 |
| 315 } | 319 } |
| OLD | NEW |