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

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

Issue 339573005: Wrong pending sheets test causing FOUC. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added test 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 unified diff | Download patch | Annotate | Revision Log
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 3428 matching lines...) Expand 10 before | Expand all | Expand 10 after
3439 3439
3440 void Document::styleResolverChanged(StyleResolverUpdateMode updateMode) 3440 void Document::styleResolverChanged(StyleResolverUpdateMode updateMode)
3441 { 3441 {
3442 // styleResolverChanged() can be invoked during Document destruction. 3442 // styleResolverChanged() can be invoked during Document destruction.
3443 // We just skip that case. 3443 // We just skip that case.
3444 if (!m_styleEngine) 3444 if (!m_styleEngine)
3445 return; 3445 return;
3446 3446
3447 m_styleEngine->resolverChanged(updateMode); 3447 m_styleEngine->resolverChanged(updateMode);
3448 3448
3449 if (didLayoutWithPendingStylesheets() && haveStylesheetsLoaded()) { 3449 if (didLayoutWithPendingStylesheets() && !m_styleEngine->hasPendingSheets()) {
3450 // We need to manually repaint because we avoid doing all repaints in la yout or style 3450 // We need to manually repaint because we avoid doing all repaints in la yout or style
3451 // recalc while sheets are still loading to avoid FOUC. 3451 // recalc while sheets are still loading to avoid FOUC.
3452 m_pendingSheetLayout = IgnoreLayoutWithPendingSheets; 3452 m_pendingSheetLayout = IgnoreLayoutWithPendingSheets;
3453 renderView()->repaintViewAndCompositedLayers(); 3453 renderView()->repaintViewAndCompositedLayers();
3454 } 3454 }
3455 3455
3456 m_evaluateMediaQueriesOnStyleRecalc = true; 3456 m_evaluateMediaQueriesOnStyleRecalc = true;
3457 } 3457 }
3458 3458
3459 void Document::styleResolverMayHaveChanged() 3459 void Document::styleResolverMayHaveChanged()
(...skipping 2374 matching lines...) Expand 10 before | Expand all | Expand 10 after
5834 visitor->trace(m_compositorPendingAnimations); 5834 visitor->trace(m_compositorPendingAnimations);
5835 visitor->trace(m_contextDocument); 5835 visitor->trace(m_contextDocument);
5836 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this); 5836 visitor->registerWeakMembers<Document, &Document::clearWeakMembers>(this);
5837 DocumentSupplementable::trace(visitor); 5837 DocumentSupplementable::trace(visitor);
5838 TreeScope::trace(visitor); 5838 TreeScope::trace(visitor);
5839 ContainerNode::trace(visitor); 5839 ContainerNode::trace(visitor);
5840 ExecutionContext::trace(visitor); 5840 ExecutionContext::trace(visitor);
5841 } 5841 }
5842 5842
5843 } // namespace WebCore 5843 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698