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

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 years, 5 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/RenderMenuList.h ('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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 class RenderBlock; 61 class RenderBlock;
62 class RenderFlowThread; 62 class RenderFlowThread;
63 class RenderGeometryMap; 63 class RenderGeometryMap;
64 class RenderLayer; 64 class RenderLayer;
65 class RenderLayerModelObject; 65 class RenderLayerModelObject;
66 class RenderView; 66 class RenderView;
67 class TransformState; 67 class TransformState;
68 68
69 struct PaintInfo; 69 struct PaintInfo;
70 70
71 enum OwnOrFirstLineStyle {
72 OwnStyle,
73 FirstLineStyle,
74 };
75
71 enum CursorDirective { 76 enum CursorDirective {
72 SetCursorBasedOnStyle, 77 SetCursorBasedOnStyle,
73 SetCursor, 78 SetCursor,
74 DoNotSetCursor 79 DoNotSetCursor
75 }; 80 };
76 81
77 enum HitTestFilter { 82 enum HitTestFilter {
78 HitTestAll, 83 HitTestAll,
79 HitTestSelf, 84 HitTestSelf,
80 HitTestDescendants 85 HitTestDescendants
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 // the rect that will be painted if this object is passed as the paintingRoo t 778 // the rect that will be painted if this object is passed as the paintingRoo t
774 LayoutRect paintingRootRect(LayoutRect& topLevelRect); 779 LayoutRect paintingRootRect(LayoutRect& topLevelRect);
775 780
776 virtual LayoutUnit minPreferredLogicalWidth() const { return 0; } 781 virtual LayoutUnit minPreferredLogicalWidth() const { return 0; }
777 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; } 782 virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; }
778 783
779 RenderStyle* style() const { return m_style.get(); } 784 RenderStyle* style() const { return m_style.get(); }
780 785
781 /* The two following methods are inlined in RenderObjectInlines.h */ 786 /* The two following methods are inlined in RenderObjectInlines.h */
782 RenderStyle* firstLineStyle() const; 787 RenderStyle* firstLineStyle() const;
783 RenderStyle* style(bool firstLine) const; 788 RenderStyle* style(OwnOrFirstLineStyle) const;
784 789
785 inline Color resolveColor(const RenderStyle* styleToUse, int colorProperty) const 790 inline Color resolveColor(const RenderStyle* styleToUse, int colorProperty) const
786 { 791 {
787 return styleToUse->visitedDependentColor(colorProperty); 792 return styleToUse->visitedDependentColor(colorProperty);
788 } 793 }
789 794
790 inline Color resolveColor(int colorProperty) const 795 inline Color resolveColor(int colorProperty) const
791 { 796 {
792 return style()->visitedDependentColor(colorProperty); 797 return style()->visitedDependentColor(colorProperty);
793 } 798 }
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 void showTree(const WebCore::RenderObject*); 1499 void showTree(const WebCore::RenderObject*);
1495 void showLineTree(const WebCore::RenderObject*); 1500 void showLineTree(const WebCore::RenderObject*);
1496 void showRenderTree(const WebCore::RenderObject* object1); 1501 void showRenderTree(const WebCore::RenderObject* object1);
1497 // We don't make object2 an optional parameter so that showRenderTree 1502 // We don't make object2 an optional parameter so that showRenderTree
1498 // can be called from gdb easily. 1503 // can be called from gdb easily.
1499 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1504 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1500 1505
1501 #endif 1506 #endif
1502 1507
1503 #endif // RenderObject_h 1508 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMenuList.h ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698