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

Unified Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 754743004: Don't return false for RenderStyle::operator== while fonts load. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years 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 | « LayoutTests/http/tests/webfont/animation-assert-expected.html ('k') | Source/platform/fonts/Font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/RenderStyle.cpp
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
index 44183b6f552cd27d76e54375145e2bd8bc029880..65b10e09d54225059906ef22a701547385cfc4b7 100644
--- a/Source/core/rendering/style/RenderStyle.cpp
+++ b/Source/core/rendering/style/RenderStyle.cpp
@@ -508,6 +508,9 @@ bool RenderStyle::diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& oth
if (inherited->textAutosizingMultiplier != other.inherited->textAutosizingMultiplier)
return true;
+ if (inherited->font.loadingCustomFonts() && !other.inherited->font.loadingCustomFonts())
+ return true;
rune 2014/12/04 12:54:17 This catches the case going from loading to not lo
rune 2014/12/05 00:21:39 Done.
+
if (inherited.get() != other.inherited.get()) {
if (inherited->line_height != other.inherited->line_height
|| inherited->font != other.inherited->font
« no previous file with comments | « LayoutTests/http/tests/webfont/animation-assert-expected.html ('k') | Source/platform/fonts/Font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698