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

Unified Diff: Source/core/rendering/InlineBox.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/rendering/InlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/InlineBox.h
diff --git a/Source/core/rendering/InlineBox.h b/Source/core/rendering/InlineBox.h
index 128437839aaa10bef7ca551f5b33fa0b17622752..f1026a15c2850e1beb23ef80cd5a369b575615f2 100644
--- a/Source/core/rendering/InlineBox.h
+++ b/Source/core/rendering/InlineBox.h
@@ -148,7 +148,7 @@ public:
void setExtracted(bool extracted = true) { m_bitfields.setExtracted(extracted); }
void setFirstLineStyleBit(bool firstLine) { m_bitfields.setFirstLine(firstLine); }
- bool isFirstLineStyle() const { return m_bitfields.firstLine(); }
+ OwnOrFirstLineStyle isFirstLineStyle() const { return m_bitfields.firstLine() ? FirstLineStyle : OwnStyle; }
void remove(MarkLineBoxes = MarkLineBoxesDirty);
@@ -276,7 +276,7 @@ public:
bool visibleToHitTestRequest(const HitTestRequest& request) const { return renderer().visibleToHitTestRequest(request); }
- EVerticalAlign verticalAlign() const { return renderer().style(m_bitfields.firstLine())->verticalAlign(); }
+ EVerticalAlign verticalAlign() const { return renderer().style(m_bitfields.firstLine() ? FirstLineStyle : OwnStyle)->verticalAlign(); }
// Use with caution! The type is not checked!
RenderBoxModelObject* boxModelObject() const
« no previous file with comments | « no previous file | Source/core/rendering/InlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698