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

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

Issue 355843002: Rename style(bool) to styleOrFirstLineStyle(bool) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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 | « Source/core/rendering/RenderInline.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | 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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 static FloatRect absoluteBoundingBoxRectForRange(const Range*); 759 static FloatRect absoluteBoundingBoxRectForRange(const Range*);
760 760
761 // the rect that will be painted if this object is passed as the paintingRoo t 761 // the rect that will be painted if this object is passed as the paintingRoo t
762 LayoutRect paintingRootRect(LayoutRect& topLevelRect); 762 LayoutRect paintingRootRect(LayoutRect& topLevelRect);
763 763
764 virtual LayoutUnit minPreferredLogicalWidth() const { return 0; } 764 virtual LayoutUnit minPreferredLogicalWidth() const { return 0; }
765 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; } 765 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; }
766 766
767 RenderStyle* style() const { return m_style.get(); } 767 RenderStyle* style() const { return m_style.get(); }
768 RenderStyle* firstLineStyle() const { return document().styleEngine()->usesF irstLineRules() ? cachedFirstLineStyle() : style(); } 768 RenderStyle* firstLineStyle() const { return document().styleEngine()->usesF irstLineRules() ? cachedFirstLineStyle() : style(); }
769 RenderStyle* style(bool firstLine) const { return firstLine ? firstLineStyle () : style(); } 769 RenderStyle* styleOrFirstLineStyle(bool firstLine) const { return firstLine ? firstLineStyle() : style(); }
770 770
771 inline Color resolveColor(const RenderStyle* styleToUse, int colorProperty) const 771 inline Color resolveColor(const RenderStyle* styleToUse, int colorProperty) const
772 { 772 {
773 return styleToUse->visitedDependentColor(colorProperty); 773 return styleToUse->visitedDependentColor(colorProperty);
774 } 774 }
775 775
776 inline Color resolveColor(int colorProperty) const 776 inline Color resolveColor(int colorProperty) const
777 { 777 {
778 return style()->visitedDependentColor(colorProperty); 778 return style()->visitedDependentColor(colorProperty);
779 } 779 }
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 void showTree(const WebCore::RenderObject*); 1472 void showTree(const WebCore::RenderObject*);
1473 void showLineTree(const WebCore::RenderObject*); 1473 void showLineTree(const WebCore::RenderObject*);
1474 void showRenderTree(const WebCore::RenderObject* object1); 1474 void showRenderTree(const WebCore::RenderObject* object1);
1475 // We don't make object2 an optional parameter so that showRenderTree 1475 // We don't make object2 an optional parameter so that showRenderTree
1476 // can be called from gdb easily. 1476 // can be called from gdb easily.
1477 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1477 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1478 1478
1479 #endif 1479 #endif
1480 1480
1481 #endif // RenderObject_h 1481 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderInline.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698