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

Unified Diff: Source/core/rendering/RenderRubyRun.cpp

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 | « Source/core/rendering/RenderObjectInlines.h ('k') | Source/core/rendering/RenderSlider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderRubyRun.cpp
diff --git a/Source/core/rendering/RenderRubyRun.cpp b/Source/core/rendering/RenderRubyRun.cpp
index 4ba77cabb1e042f14adba7bbaa0d5f4e9797c831..e2a89ebb8e14446ebd795628ed613848aa16a523 100644
--- a/Source/core/rendering/RenderRubyRun.cpp
+++ b/Source/core/rendering/RenderRubyRun.cpp
@@ -264,7 +264,7 @@ void RenderRubyRun::layout()
computeOverflow(clientLogicalBottom());
}
-void RenderRubyRun::getOverhang(bool firstLine, RenderObject* startRenderer, RenderObject* endRenderer, int& startOverhang, int& endOverhang) const
+void RenderRubyRun::getOverhang(bool isFirstLine, RenderObject* startRenderer, RenderObject* endRenderer, int& startOverhang, int& endOverhang) const
{
ASSERT(!needsLayout());
@@ -280,6 +280,7 @@ void RenderRubyRun::getOverhang(bool firstLine, RenderObject* startRenderer, Ren
if (!rubyBase->firstRootBox())
return;
+ const OwnOrFirstLineStyle firstLine = isFirstLine ? FirstLineStyle : OwnStyle;
int logicalWidth = this->logicalWidth();
int logicalLeftOverhang = std::numeric_limits<int>::max();
int logicalRightOverhang = std::numeric_limits<int>::max();
« no previous file with comments | « Source/core/rendering/RenderObjectInlines.h ('k') | Source/core/rendering/RenderSlider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698