| 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 * (C) 2008 David Smith (catfish.man@gmail.com) | 5 * (C) 2008 David Smith (catfish.man@gmail.com) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #define NodeLayoutStyle_h | 26 #define NodeLayoutStyle_h |
| 27 | 27 |
| 28 #include "core/dom/Node.h" | 28 #include "core/dom/Node.h" |
| 29 #include "core/dom/NodeRenderingTraversal.h" | 29 #include "core/dom/NodeRenderingTraversal.h" |
| 30 #include "core/html/HTMLOptGroupElement.h" | 30 #include "core/html/HTMLOptGroupElement.h" |
| 31 #include "core/layout/LayoutObject.h" | 31 #include "core/layout/LayoutObject.h" |
| 32 #include "core/layout/style/LayoutStyle.h" | 32 #include "core/layout/style/LayoutStyle.h" |
| 33 | 33 |
| 34 namespace blink { | 34 namespace blink { |
| 35 | 35 |
| 36 inline LayoutStyle* Node::mutableLayoutStyle() const | 36 inline LayoutStyle* Node::layoutStyle() const |
| 37 { | 37 { |
| 38 if (LayoutObject* renderer = this->renderer()) | 38 if (LayoutObject* renderer = this->renderer()) |
| 39 return renderer->mutableStyle(); | 39 return renderer->style(); |
| 40 // <option> and <optgroup> can be styled even if they don't get renderers, | 40 // <option> and <optgroup> can be styled even if they don't get renderers, |
| 41 // so they store their style internally and return it through nonRendererSty
le(). | 41 // so they store their style internally and return it through nonRendererSty
le(). |
| 42 // We check here explicitly to avoid the virtual call in the common case. | 42 // We check here explicitly to avoid the virtual call in the common case. |
| 43 if (isHTMLOptGroupElement(*this) || isHTMLOptionElement(this)) | 43 if (isHTMLOptGroupElement(*this) || isHTMLOptionElement(this)) |
| 44 return nonRendererStyle(); | 44 return nonRendererStyle(); |
| 45 return 0; | 45 return 0; |
| 46 } | 46 } |
| 47 | 47 |
| 48 inline const LayoutStyle* Node::layoutStyle() const | 48 inline LayoutStyle* Node::parentLayoutStyle() const |
| 49 { | |
| 50 return mutableLayoutStyle(); | |
| 51 } | |
| 52 | |
| 53 inline const LayoutStyle* Node::parentLayoutStyle() const | |
| 54 { | 49 { |
| 55 ContainerNode* parent = NodeRenderingTraversal::parent(*this); | 50 ContainerNode* parent = NodeRenderingTraversal::parent(*this); |
| 56 return parent ? parent->layoutStyle() : 0; | 51 return parent ? parent->layoutStyle() : 0; |
| 57 } | 52 } |
| 58 | 53 |
| 59 inline const LayoutStyle& Node::layoutStyleRef() const | 54 inline const LayoutStyle& Node::layoutStyleRef() const |
| 60 { | 55 { |
| 61 const LayoutStyle* style = layoutStyle(); | 56 const LayoutStyle* style = layoutStyle(); |
| 62 ASSERT(style); | 57 ASSERT(style); |
| 63 return *style; | 58 return *style; |
| 64 } | 59 } |
| 65 | 60 |
| 66 } | 61 } |
| 67 #endif // NodeLayoutStyle_h | 62 #endif // NodeLayoutStyle_h |
| OLD | NEW |