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

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

Issue 686723002: Improve RAII of StyleResolverState. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: When baseRenderStyle!=0: 1) don't inherit, and 2) use defaultStyleForElement as fallback parent. Created 6 years, 1 month 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
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 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after
1654 while (Node* host = root->shadowHost()) 1654 while (Node* host = root->shadowHost())
1655 root = host; 1655 root = host;
1656 while (Node* ancestor = root->parentOrShadowHostNode()) 1656 while (Node* ancestor = root->parentOrShadowHostNode())
1657 root = ancestor; 1657 root = ancestor;
1658 if (root->childNeedsDistributionRecalc()) 1658 if (root->childNeedsDistributionRecalc())
1659 root->recalcDistribution(); 1659 root->recalcDistribution();
1660 } 1660 }
1661 1661
1662 void Document::setupFontBuilder(RenderStyle* documentStyle) 1662 void Document::setupFontBuilder(RenderStyle* documentStyle)
1663 { 1663 {
1664 FontBuilder fontBuilder(*this); 1664 FontBuilder fontBuilder(*this, documentStyle);
1665 fontBuilder.setStyle(documentStyle);
1666 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ; 1665 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ;
1667 fontBuilder.createFontForDocument(selector, documentStyle); 1666 fontBuilder.createFontForDocument(selector, documentStyle);
1668 } 1667 }
1669 1668
1670 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change) 1669 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
1671 { 1670 {
1672 ASSERT(inStyleRecalc()); 1671 ASSERT(inStyleRecalc());
1673 ASSERT(documentElement()); 1672 ASSERT(documentElement());
1674 1673
1675 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle(); 1674 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle();
(...skipping 4148 matching lines...) Expand 10 before | Expand all | Expand 10 after
5824 #ifndef NDEBUG 5823 #ifndef NDEBUG
5825 using namespace blink; 5824 using namespace blink;
5826 void showLiveDocumentInstances() 5825 void showLiveDocumentInstances()
5827 { 5826 {
5828 WeakDocumentSet& set = liveDocumentSet(); 5827 WeakDocumentSet& set = liveDocumentSet();
5829 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5828 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5830 for (Document* document : set) 5829 for (Document* document : set)
5831 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5830 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5832 } 5831 }
5833 #endif 5832 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698