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

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

Issue 1131793008: Forced style invalidation when clearing resolver no longer needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed no longer valid styleResolver() assert. Created 5 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
« no previous file with comments | « no previous file | Source/core/dom/StyleEngine.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 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 1580
1581 void Document::updateStyleInvalidationIfNeeded() 1581 void Document::updateStyleInvalidationIfNeeded()
1582 { 1582 {
1583 ScriptForbiddenScope forbidScript; 1583 ScriptForbiddenScope forbidScript;
1584 1584
1585 if (!isActive()) 1585 if (!isActive())
1586 return; 1586 return;
1587 if (!childNeedsStyleInvalidation()) 1587 if (!childNeedsStyleInvalidation())
1588 return; 1588 return;
1589 TRACE_EVENT0("blink", "Document::updateStyleInvalidationIfNeeded"); 1589 TRACE_EVENT0("blink", "Document::updateStyleInvalidationIfNeeded");
1590 ASSERT(styleResolver());
1591
1592 styleEngine().styleInvalidator().invalidate(*this); 1590 styleEngine().styleInvalidator().invalidate(*this);
1593 } 1591 }
1594 1592
1595 void Document::setupFontBuilder(ComputedStyle& documentStyle) 1593 void Document::setupFontBuilder(ComputedStyle& documentStyle)
1596 { 1594 {
1597 FontBuilder fontBuilder(*this); 1595 FontBuilder fontBuilder(*this);
1598 RefPtrWillBeRawPtr<CSSFontSelector> selector = styleEngine().fontSelector(); 1596 RefPtrWillBeRawPtr<CSSFontSelector> selector = styleEngine().fontSelector();
1599 fontBuilder.createFontForDocument(selector, documentStyle); 1597 fontBuilder.createFontForDocument(selector, documentStyle);
1600 } 1598 }
1601 1599
(...skipping 4172 matching lines...) Expand 10 before | Expand all | Expand 10 after
5774 #ifndef NDEBUG 5772 #ifndef NDEBUG
5775 using namespace blink; 5773 using namespace blink;
5776 void showLiveDocumentInstances() 5774 void showLiveDocumentInstances()
5777 { 5775 {
5778 WeakDocumentSet& set = liveDocumentSet(); 5776 WeakDocumentSet& set = liveDocumentSet();
5779 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5777 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5780 for (Document* document : set) 5778 for (Document* document : set)
5781 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5779 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5782 } 5780 }
5783 #endif 5781 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/StyleEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698