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

Unified Diff: Source/core/dom/StyleEngine.cpp

Issue 304033005: Should check whether document.settings() is available or not when updating GenericFontFamilySetting… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added FIXME comment Created 6 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/StyleEngine.cpp
diff --git a/Source/core/dom/StyleEngine.cpp b/Source/core/dom/StyleEngine.cpp
index cf956cc58d465fd514eff2b9c7fb91a6e8f07a45..f67e605c19bbb5de5b2ddf4f8cb7b6c371382020 100644
--- a/Source/core/dom/StyleEngine.cpp
+++ b/Source/core/dom/StyleEngine.cpp
@@ -525,6 +525,15 @@ void StyleEngine::clearFontCache()
void StyleEngine::updateGenericFontFamilySettings()
{
+ // FIXME: in-active documents should not be in any frame tree.
abarth-chromium 2014/06/06 17:02:02 That's not accurate. Documents become inactive an
tasak 2014/06/09 04:41:26 Thank you. I updated the comment.
+ // After confirming that this condition is always true,
+ // remove the fllowing ASSERT.
abarth-chromium 2014/06/06 17:02:02 fllowing -> following
tasak 2014/06/09 04:41:26 Done.
+ ASSERT(document().isActive());
+
+ // Since document::settings() can return null, need to check whether
+ // document has settings or not. crbug.com/376525
abarth-chromium 2014/06/06 17:02:02 Please remove this comment. If settings() couldn't
tasak 2014/06/09 04:41:26 I agree that we should have automated test. Howev
+ if (!document().settings())
+ return;
abarth-chromium 2014/06/06 17:05:29 Why are you checking the Settings object here? I d
tasak 2014/06/09 04:41:25 I see. I moved the check to CSSFontSelector::updat
if (!m_fontSelector)
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698