| 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 NodeRenderStyle_h | 25 #ifndef NodeRenderStyle_h |
| 26 #define NodeRenderStyle_h | 26 #define NodeRenderStyle_h |
| 27 | 27 |
| 28 #include "HTMLNames.h" | |
| 29 #include "core/dom/Node.h" | 28 #include "core/dom/Node.h" |
| 30 #include "core/dom/NodeRenderingTraversal.h" | 29 #include "core/dom/NodeRenderingTraversal.h" |
| 30 #include "core/html/HTMLOptGroupElement.h" |
| 31 #include "core/rendering/RenderObject.h" | 31 #include "core/rendering/RenderObject.h" |
| 32 #include "core/rendering/style/RenderStyle.h" | 32 #include "core/rendering/style/RenderStyle.h" |
| 33 | 33 |
| 34 namespace WebCore { | 34 namespace WebCore { |
| 35 | 35 |
| 36 inline RenderStyle* Node::renderStyle() const | 36 inline RenderStyle* Node::renderStyle() const |
| 37 { | 37 { |
| 38 if (RenderObject* renderer = this->renderer()) | 38 if (RenderObject* renderer = this->renderer()) |
| 39 return renderer->style(); | 39 return renderer->style(); |
| 40 // <option> and <optgroup> can be styled even though they never get renderer
s, | 40 // <option> and <optgroup> can be styled even though they never get renderer
s, |
| 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 (hasTagName(HTMLNames::optgroupTag) || hasTagName(HTMLNames::optionTag)) | 43 if (isHTMLOptGroupElement(*this) || isHTMLOptionElement(this)) |
| 44 return nonRendererStyle(); | 44 return nonRendererStyle(); |
| 45 return 0; | 45 return 0; |
| 46 } | 46 } |
| 47 | 47 |
| 48 inline RenderStyle* Node::parentRenderStyle() const | 48 inline RenderStyle* Node::parentRenderStyle() const |
| 49 { | 49 { |
| 50 ContainerNode* parent = NodeRenderingTraversal::parent(this); | 50 ContainerNode* parent = NodeRenderingTraversal::parent(this); |
| 51 return parent ? parent->renderStyle() : 0; | 51 return parent ? parent->renderStyle() : 0; |
| 52 } | 52 } |
| 53 | 53 |
| 54 } | 54 } |
| 55 #endif | 55 #endif |
| OLD | NEW |