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

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

Issue 26588002: Remove support for -webkit-line-clamp Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Base files missing... Created 7 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/EllipsisBox.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 24f3f026f6c14b1e10536b4590f4c9f3dfa0b941..f9bb965ef3ef956ac69dd1fa0978788b3f485859 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -5493,16 +5493,6 @@ int RenderBlock::baselinePosition(FontBaseline baselineType, bool firstLine, Lin
int baselinePos = ignoreBaseline ? -1 : inlineBlockBaseline(direction);
- if (isDeprecatedFlexibleBox()) {
- // Historically, we did this check for all baselines. But we can't
- // remove this code from deprecated flexbox, because it effectively
- // breaks -webkit-line-clamp, which is used in the wild -- we would
- // calculate the baseline as if -webkit-line-clamp wasn't used.
- // For simplicity, we use this for all uses of deprecated flexbox.
- LayoutUnit bottomOfContent = direction == HorizontalLine ? borderTop() + paddingTop() + contentHeight() : borderRight() + paddingRight() + contentWidth();
- if (baselinePos > bottomOfContent)
- baselinePos = -1;
- }
if (baselinePos != -1)
return direction == HorizontalLine ? marginTop() + baselinePos : marginRight() + baselinePos;
« no previous file with comments | « Source/core/rendering/EllipsisBox.cpp ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698