Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: Source/core/dom/NodeRenderStyle.h

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix a crashers (everything is building!) Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
26 #define NodeRenderStyle_h 26 #define NodeRenderStyle_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/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 blink { 34 namespace blink {
35 35
36 inline RenderStyle* Node::renderStyle() const 36 inline RenderStyle* Node::mutableRenderStyle() const
37 { 37 {
38 if (RenderObject* renderer = this->renderer()) 38 if (RenderObject* renderer = this->renderer())
39 return renderer->style(); 39 return renderer->deprecatedMutableStyle();
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 RenderStyle* Node::parentRenderStyle() const 48 inline const RenderStyle* Node::renderStyle() const
49 {
50 return mutableRenderStyle();
51 }
52
53 inline const RenderStyle* Node::parentRenderStyle() const
49 { 54 {
50 ContainerNode* parent = NodeRenderingTraversal::parent(*this); 55 ContainerNode* parent = NodeRenderingTraversal::parent(*this);
51 return parent ? parent->renderStyle() : 0; 56 return parent ? parent->renderStyle() : 0;
52 } 57 }
53 58
54 } 59 }
55 #endif 60 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698