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

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

Issue 620753006: Rendering API cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 6 years, 2 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/InlineFlowBox.h ('k') | Source/core/rendering/LayoutState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/InlineFlowBox.cpp
diff --git a/Source/core/rendering/InlineFlowBox.cpp b/Source/core/rendering/InlineFlowBox.cpp
index 4d0c4a6ce1f810ae78136f689e3107322ea99dd8..f4f36b70c970b2aba636d880191c06a67edce16c 100644
--- a/Source/core/rendering/InlineFlowBox.cpp
+++ b/Source/core/rendering/InlineFlowBox.cpp
@@ -1111,26 +1111,6 @@ bool InlineFlowBox::boxShadowCanBeAppliedToBackground(const FillLayer& lastBackg
return (!hasFillImage && !renderer().style()->hasBorderRadius()) || (!prevLineBox() && !nextLineBox()) || !parent();
}
-void InlineFlowBox::constrainToLineTopAndBottomIfNeeded(LayoutRect& rect) const
-{
- bool noQuirksMode = renderer().document().inNoQuirksMode();
- if (!noQuirksMode && !hasTextChildren() && !(descendantsHaveSameLineHeightAndBaseline() && hasTextDescendants())) {
- const RootInlineBox& rootBox = root();
- LayoutUnit logicalTop = isHorizontal() ? rect.y() : rect.x();
- LayoutUnit logicalHeight = isHorizontal() ? rect.height() : rect.width();
- LayoutUnit bottom = std::min(rootBox.lineBottom(), logicalTop + logicalHeight);
- logicalTop = std::max(rootBox.lineTop(), logicalTop);
- logicalHeight = bottom - logicalTop;
- if (isHorizontal()) {
- rect.setY(logicalTop);
- rect.setHeight(logicalHeight);
- } else {
- rect.setX(logicalTop);
- rect.setWidth(logicalHeight);
- }
- }
-}
-
InlineBox* InlineFlowBox::firstLeafChild() const
{
InlineBox* leaf = 0;
« no previous file with comments | « Source/core/rendering/InlineFlowBox.h ('k') | Source/core/rendering/LayoutState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698