| 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 |
| 11 * version 2 of the License, or (at your option) any later version. | 11 * version 2 of the License, or (at your option) any later version. |
| 12 * | 12 * |
| 13 * This library is distributed in the hope that it will be useful, | 13 * This library is distributed in the hope that it will be useful, |
| 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * Library General Public License for more details. | 16 * Library General Public License for more details. |
| 17 * | 17 * |
| 18 * You should have received a copy of the GNU Library General Public License | 18 * You should have received a copy of the GNU Library General Public License |
| 19 * along with this library; see the file COPYING.LIB. If not, write to | 19 * along with this library; see the file COPYING.LIB. If not, write to |
| 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
| 22 * | 22 * |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #ifndef NodeLayoutStyle_h | 25 #ifndef NodeComputedStyle_h |
| 26 #define NodeLayoutStyle_h | 26 #define NodeComputedStyle_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/ComputedStyle.h" |
| 33 | 33 |
| 34 namespace blink { | 34 namespace blink { |
| 35 | 35 |
| 36 inline const LayoutStyle* Node::layoutStyle() const | 36 inline const ComputedStyle* Node::computedStyle() const |
| 37 { | 37 { |
| 38 return mutableLayoutStyle(); | 38 return mutableComputedStyle(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 inline LayoutStyle* Node::mutableLayoutStyle() const | 41 inline ComputedStyle* Node::mutableComputedStyle() const |
| 42 { | 42 { |
| 43 if (LayoutObject* renderer = this->layoutObject()) | 43 if (LayoutObject* layoutObject = this->layoutObject()) |
| 44 return const_cast<LayoutStyle*>(renderer->style()); | 44 return const_cast<ComputedStyle*>(layoutObject->style()); |
| 45 // <option> and <optgroup> can be styled even if they don't get renderers, | 45 // <option> and <optgroup> can be styled even if they don't get layout objec
ts, |
| 46 // so they store their style internally and return it through nonRendererSty
le(). | 46 // so they store their style internally and return it through nonLayoutObjec
tComputedStyle(). |
| 47 // We check here explicitly to avoid the virtual call in the common case. | 47 // We check here explicitly to avoid the virtual call in the common case. |
| 48 if (isHTMLOptGroupElement(*this) || isHTMLOptionElement(this)) | 48 if (isHTMLOptGroupElement(*this) || isHTMLOptionElement(this)) |
| 49 return nonRendererStyle(); | 49 return nonLayoutObjectComputedStyle(); |
| 50 return 0; | 50 return 0; |
| 51 } | 51 } |
| 52 | 52 |
| 53 inline const LayoutStyle* Node::parentLayoutStyle() const | 53 inline const ComputedStyle* Node::parentComputedStyle() const |
| 54 { | 54 { |
| 55 ContainerNode* parent = NodeRenderingTraversal::parent(*this); | 55 ContainerNode* parent = NodeRenderingTraversal::parent(*this); |
| 56 return parent ? parent->layoutStyle() : 0; | 56 return parent ? parent->computedStyle() : 0; |
| 57 } | 57 } |
| 58 | 58 |
| 59 inline const LayoutStyle& Node::layoutStyleRef() const | 59 inline const ComputedStyle& Node::computedStyleRef() const |
| 60 { | 60 { |
| 61 const LayoutStyle* style = layoutStyle(); | 61 const ComputedStyle* style = computedStyle(); |
| 62 ASSERT(style); | 62 ASSERT(style); |
| 63 return *style; | 63 return *style; |
| 64 } | 64 } |
| 65 | 65 |
| 66 } | 66 } |
| 67 #endif // NodeLayoutStyle_h | 67 #endif // NodeComputedStyle_h |
| OLD | NEW |