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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 270623007: Revert "HTML Imports: Fix yet another FOUC" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed bad merge. Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 2972 matching lines...) Expand 10 before | Expand all | Expand 10 after
2983 currentFrame = ancestorFrame; 2983 currentFrame = ancestorFrame;
2984 ancestorFrame = ancestorFrame->tree().parent(); 2984 ancestorFrame = ancestorFrame->tree().parent();
2985 } 2985 }
2986 return 0; 2986 return 0;
2987 } 2987 }
2988 2988
2989 void Document::didLoadAllImports() 2989 void Document::didLoadAllImports()
2990 { 2990 {
2991 if (!haveStylesheetsLoaded()) 2991 if (!haveStylesheetsLoaded())
2992 return; 2992 return;
2993 setNeedsStyleRecalc(SubtreeStyleChange); 2993
2994 didLoadAllScriptBlockingResources(); 2994 didLoadAllScriptBlockingResources();
2995 } 2995 }
2996 2996
2997 void Document::didRemoveAllPendingStylesheet() 2997 void Document::didRemoveAllPendingStylesheet()
2998 { 2998 {
2999 m_needsNotifyRemoveAllPendingStylesheet = false; 2999 m_needsNotifyRemoveAllPendingStylesheet = false;
3000 3000
3001 styleResolverChanged(RecalcStyleDeferred, hasNodesWithPlaceholderStyle() ? F ullStyleUpdate : AnalyzedStyleUpdate); 3001 styleResolverChanged(RecalcStyleDeferred, hasNodesWithPlaceholderStyle() ? F ullStyleUpdate : AnalyzedStyleUpdate);
3002 3002
3003 if (HTMLImportLoader* import = importLoader()) 3003 if (HTMLImportLoader* import = importLoader())
3004 import->didRemoveAllPendingStylesheet(); 3004 import->didRemoveAllPendingStylesheet();
3005 3005
3006 if (!haveImportsLoaded()) 3006 if (!haveImportsLoaded())
3007 return; 3007 return;
3008
3008 didLoadAllScriptBlockingResources(); 3009 didLoadAllScriptBlockingResources();
3009 } 3010 }
3010 3011
3011 void Document::didLoadAllScriptBlockingResources() 3012 void Document::didLoadAllScriptBlockingResources()
3012 { 3013 {
3013 executeScriptsWaitingForResourcesIfNeeded(); 3014 executeScriptsWaitingForResourcesIfNeeded();
3014 3015
3015 if (m_gotoAnchorNeededAfterStylesheetsLoad && view()) 3016 if (m_gotoAnchorNeededAfterStylesheetsLoad && view())
3016 view()->scrollToFragment(m_url); 3017 view()->scrollToFragment(m_url);
3017 } 3018 }
(...skipping 2681 matching lines...) Expand 10 before | Expand all | Expand 10 after
5699 visitor->trace(m_visibilityObservers); 5700 visitor->trace(m_visibilityObservers);
5700 visitor->trace(m_userActionElements); 5701 visitor->trace(m_userActionElements);
5701 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this); 5702 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this);
5702 DocumentSupplementable::trace(visitor); 5703 DocumentSupplementable::trace(visitor);
5703 TreeScope::trace(visitor); 5704 TreeScope::trace(visitor);
5704 ContainerNode::trace(visitor); 5705 ContainerNode::trace(visitor);
5705 ExecutionContext::trace(visitor); 5706 ExecutionContext::trace(visitor);
5706 } 5707 }
5707 5708
5708 } // namespace WebCore 5709 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolver.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698