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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutText.cpp

Issue 2683553002: Fix not autosizing ruby elements issue. (Closed)
Patch Set: Use MarkContainerChain for setPreferredLogicalWidthsDirty, when we skipped inline-block before Created 3 years, 10 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
Index: third_party/WebKit/Source/core/layout/LayoutText.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutText.cpp b/third_party/WebKit/Source/core/layout/LayoutText.cpp
index c79928f7f8e13723c215949a74acc73cea2907f8..951709fc72b5ba18a612a22a96590ca5d10254b5 100644
--- a/third_party/WebKit/Source/core/layout/LayoutText.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutText.cpp
@@ -1388,8 +1388,10 @@ void LayoutText::computePreferredLogicalWidths(
fontData->getFontMetrics().floatDescent(), m_maxWidth);
}
// We shouldn't change our mind once we "know".
- ASSERT(!m_knownToHaveNoOverflowAndNoFallbackFonts ||
- (fallbackFonts.isEmpty() && glyphOverflow.isApproximatelyZero()));
+ if (!preferredLogicalWidthsDirty()) {
pdr. 2017/02/10 04:10:46 I think this dcheck should still work. Do you know
cathiechentx 2017/02/10 05:17:47 Hesitated to make this change too. The reason to f
pdr. 2017/02/10 19:27:09 Can you add a test for this? Just naively removing
cathiechentx 2017/02/13 14:53:56 fallbackFonts is not empty...
cathiechentx 2017/02/15 14:19:20 Update:) Actuall fallbackFonts is empty. "If thi
+ DCHECK(!m_knownToHaveNoOverflowAndNoFallbackFonts ||
+ (fallbackFonts.isEmpty() && glyphOverflow.isApproximatelyZero()));
+ }
m_knownToHaveNoOverflowAndNoFallbackFonts =
fallbackFonts.isEmpty() && glyphOverflow.isApproximatelyZero();

Powered by Google App Engine
This is Rietveld 408576698