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

Side by Side Diff: Source/core/rendering/RenderObject.h

Issue 856523002: Make RenderObject::resolveColor(const RenderStyle*, int) static. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 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 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 795
796 virtual LayoutUnit minPreferredLogicalWidth() const { return 0; } 796 virtual LayoutUnit minPreferredLogicalWidth() const { return 0; }
797 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; } 797 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; }
798 798
799 RenderStyle* style() const { return m_style.get(); } 799 RenderStyle* style() const { return m_style.get(); }
800 800
801 /* The two following methods are inlined in RenderObjectInlines.h */ 801 /* The two following methods are inlined in RenderObjectInlines.h */
802 RenderStyle* firstLineStyle() const; 802 RenderStyle* firstLineStyle() const;
803 RenderStyle* style(bool firstLine) const; 803 RenderStyle* style(bool firstLine) const;
804 804
805 inline Color resolveColor(const RenderStyle* styleToUse, int colorProperty) const 805 static inline Color resolveColor(const RenderStyle* styleToUse, int colorPro perty)
806 { 806 {
807 return styleToUse->visitedDependentColor(colorProperty); 807 return styleToUse->visitedDependentColor(colorProperty);
808 } 808 }
809 809
810 inline Color resolveColor(int colorProperty) const 810 inline Color resolveColor(int colorProperty) const
811 { 811 {
812 return style()->visitedDependentColor(colorProperty); 812 return style()->visitedDependentColor(colorProperty);
813 } 813 }
814 814
815 // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a 815 // Used only by Element::pseudoStyleCacheIsInvalid to get a first line style based off of a
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 void showTree(const blink::RenderObject*); 1617 void showTree(const blink::RenderObject*);
1618 void showLineTree(const blink::RenderObject*); 1618 void showLineTree(const blink::RenderObject*);
1619 void showRenderTree(const blink::RenderObject* object1); 1619 void showRenderTree(const blink::RenderObject* object1);
1620 // We don't make object2 an optional parameter so that showRenderTree 1620 // We don't make object2 an optional parameter so that showRenderTree
1621 // can be called from gdb easily. 1621 // can be called from gdb easily.
1622 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2); 1622 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObjec t* object2);
1623 1623
1624 #endif 1624 #endif
1625 1625
1626 #endif // RenderObject_h 1626 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698