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

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

Issue 1297803002: Remove FOUC avoidance from BlockPainter and DeprecatedPaintLayerPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove extra assert. Created 5 years, 4 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/dom/Document.h ('k') | Source/core/paint/BlockPainter.cpp » ('j') | 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 3363 matching lines...) Expand 10 before | Expand all | Expand 10 after
3374 if (!hasViewportUnits()) 3374 if (!hasViewportUnits())
3375 return; 3375 return;
3376 ensureStyleResolver().notifyResizeForViewportUnits(); 3376 ensureStyleResolver().notifyResizeForViewportUnits();
3377 setNeedsStyleRecalcForViewportUnits(); 3377 setNeedsStyleRecalcForViewportUnits();
3378 } 3378 }
3379 3379
3380 void Document::styleResolverChanged(StyleResolverUpdateMode updateMode) 3380 void Document::styleResolverChanged(StyleResolverUpdateMode updateMode)
3381 { 3381 {
3382 styleEngine().resolverChanged(updateMode); 3382 styleEngine().resolverChanged(updateMode);
3383 3383
3384 if (didLayoutWithPendingStylesheets() && !styleEngine().hasPendingSheets()) { 3384 if (m_pendingSheetLayout == DidLayoutWithPendingSheets && !styleEngine().has PendingSheets())
3385 // We need to manually repaint because we avoid doing all repaints in la yout or style
3386 // recalc while sheets are still loading to avoid FOUC.
3387 m_pendingSheetLayout = IgnoreLayoutWithPendingSheets; 3385 m_pendingSheetLayout = IgnoreLayoutWithPendingSheets;
3388
3389 ASSERT(layoutView() || importsController());
3390 if (layoutView())
3391 layoutView()->invalidatePaintForViewAndCompositedLayers();
3392 }
3393 } 3386 }
3394 3387
3395 void Document::styleResolverMayHaveChanged() 3388 void Document::styleResolverMayHaveChanged()
3396 { 3389 {
3397 styleResolverChanged(hasNodesWithPlaceholderStyle() ? FullStyleUpdate : Anal yzedStyleUpdate); 3390 styleResolverChanged(hasNodesWithPlaceholderStyle() ? FullStyleUpdate : Anal yzedStyleUpdate);
3398 } 3391 }
3399 3392
3400 void Document::setHoverNode(PassRefPtrWillBeRawPtr<Node> newHoverNode) 3393 void Document::setHoverNode(PassRefPtrWillBeRawPtr<Node> newHoverNode)
3401 { 3394 {
3402 m_hoverNode = newHoverNode; 3395 m_hoverNode = newHoverNode;
(...skipping 2369 matching lines...) Expand 10 before | Expand all | Expand 10 after
5772 #ifndef NDEBUG 5765 #ifndef NDEBUG
5773 using namespace blink; 5766 using namespace blink;
5774 void showLiveDocumentInstances() 5767 void showLiveDocumentInstances()
5775 { 5768 {
5776 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5769 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5777 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5770 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5778 for (Document* document : set) 5771 for (Document* document : set)
5779 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5772 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5780 } 5773 }
5781 #endif 5774 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/paint/BlockPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698