| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 // ordered in DOM tree order. We don't have a good way to do that yet, | 65 // ordered in DOM tree order. We don't have a good way to do that yet, |
| 66 // since NodeRenderingTraversal isn't aware of reparenting. It's safe to | 66 // since NodeRenderingTraversal isn't aware of reparenting. It's safe to |
| 67 // just append for now; it doesn't disrupt the top layer rendering as | 67 // just append for now; it doesn't disrupt the top layer rendering as |
| 68 // the layer collection in RenderLayer only requires that top layer | 68 // the layer collection in RenderLayer only requires that top layer |
| 69 // renderers are orderered correctly relative to each other. | 69 // renderers are orderered correctly relative to each other. |
| 70 if (!element->isInTopLayer()) | 70 if (!element->isInTopLayer()) |
| 71 return 0; | 71 return 0; |
| 72 | 72 |
| 73 const Vector<RefPtr<Element> >& topLayerElements = element->document().t
opLayerElements(); | 73 const Vector<RefPtr<Element> >& topLayerElements = element->document().t
opLayerElements(); |
| 74 size_t position = topLayerElements.find(element); | 74 size_t position = topLayerElements.find(element); |
| 75 ASSERT(position != notFound); | 75 ASSERT(position != kNotFound); |
| 76 for (size_t i = position + 1; i < topLayerElements.size(); ++i) { | 76 for (size_t i = position + 1; i < topLayerElements.size(); ++i) { |
| 77 if (RenderObject* renderer = topLayerElements[i]->renderer()) | 77 if (RenderObject* renderer = topLayerElements[i]->renderer()) |
| 78 return renderer; | 78 return renderer; |
| 79 } | 79 } |
| 80 return 0; | 80 return 0; |
| 81 } | 81 } |
| 82 | 82 |
| 83 if (m_parentFlowRenderer) | 83 if (m_parentFlowRenderer) |
| 84 return m_parentFlowRenderer->nextRendererForNode(m_node); | 84 return m_parentFlowRenderer->nextRendererForNode(m_node); |
| 85 | 85 |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); | 277 newRenderer->setFlowThreadState(parentRenderer->flowThreadState()); |
| 278 | 278 |
| 279 RenderObject* nextRenderer = this->nextRenderer(); | 279 RenderObject* nextRenderer = this->nextRenderer(); |
| 280 textNode->setRenderer(newRenderer); | 280 textNode->setRenderer(newRenderer); |
| 281 // Parent takes care of the animations, no need to call setAnimatableStyle. | 281 // Parent takes care of the animations, no need to call setAnimatableStyle. |
| 282 newRenderer->setStyle(m_style.release()); | 282 newRenderer->setStyle(m_style.release()); |
| 283 parentRenderer->addChild(newRenderer, nextRenderer); | 283 parentRenderer->addChild(newRenderer, nextRenderer); |
| 284 } | 284 } |
| 285 | 285 |
| 286 } | 286 } |
| OLD | NEW |