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

Unified Diff: Source/core/page/Page.cpp

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed TextAutosizing Created 6 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: Source/core/page/Page.cpp
diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp
index 3df282a738958a24836310ad978da761d1da342a..21e304f3ca91c79c1f7eca063d8a8b3fd426eb72 100644
--- a/Source/core/page/Page.cpp
+++ b/Source/core/page/Page.cpp
@@ -262,6 +262,14 @@ void Page::setNeedsRecalcStyleInAllFrames()
frame->document()->styleResolverChanged(RecalcStyleDeferred);
}
+void Page::setNeedsLayoutInAllFrames()
+{
+ for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (FrameView* view = frame->view())
+ view->setNeedsLayout();
+ }
+}
+
void Page::refreshPlugins(bool reload)
{
if (allPages().isEmpty())
@@ -497,11 +505,18 @@ void Page::settingsChanged(SettingsDelegate::ChangeType changeType)
if (textAutosizer)
textAutosizer->recalculateMultipliers();
}
- setNeedsRecalcStyleInAllFrames();
+ // TextAutosizing updates RenderStyle during layout phase (via TextAutosizer::processSubtree).
+ // We should invoke setNeedsLayout here.
+ setNeedsLayoutInAllFrames();
break;
case SettingsDelegate::ScriptEnableChange:
m_inspectorController->scriptsEnabled(settings().scriptEnabled());
break;
+ case SettingsDelegate::FontFamilyChange:
+ for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
+ frame->document()->styleEngine()->updateGenericFontFamilySettings();
+ setNeedsRecalcStyleInAllFrames();
+ break;
}
}

Powered by Google App Engine
This is Rietveld 408576698