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

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

Issue 715633006: Remove FontDescriptionChangeScope, and let FontBuilder partially apply values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: IsSetFlag -> PropertySetFlag. Created 5 years, 10 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 | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/platform/fonts/FontDescription.h » ('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 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 root = host; 1619 root = host;
1620 while (Node* ancestor = root->parentOrShadowHostNode()) 1620 while (Node* ancestor = root->parentOrShadowHostNode())
1621 root = ancestor; 1621 root = ancestor;
1622 if (root->childNeedsDistributionRecalc()) 1622 if (root->childNeedsDistributionRecalc())
1623 root->recalcDistribution(); 1623 root->recalcDistribution();
1624 } 1624 }
1625 1625
1626 void Document::setupFontBuilder(RenderStyle* documentStyle) 1626 void Document::setupFontBuilder(RenderStyle* documentStyle)
1627 { 1627 {
1628 FontBuilder fontBuilder(*this); 1628 FontBuilder fontBuilder(*this);
1629 fontBuilder.setFontDescription(documentStyle->fontDescription());
1630 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ; 1629 RefPtrWillBeRawPtr<CSSFontSelector> selector = m_styleEngine->fontSelector() ;
1631 fontBuilder.createFontForDocument(selector, documentStyle); 1630 fontBuilder.createFontForDocument(selector, documentStyle);
1632 } 1631 }
1633 1632
1634 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change) 1633 void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
1635 { 1634 {
1636 ASSERT(inStyleRecalc()); 1635 ASSERT(inStyleRecalc());
1637 ASSERT(documentElement()); 1636 ASSERT(documentElement());
1638 1637
1639 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle(); 1638 RefPtr<RenderStyle> documentElementStyle = documentElement()->renderStyle();
(...skipping 4123 matching lines...) Expand 10 before | Expand all | Expand 10 after
5763 #ifndef NDEBUG 5762 #ifndef NDEBUG
5764 using namespace blink; 5763 using namespace blink;
5765 void showLiveDocumentInstances() 5764 void showLiveDocumentInstances()
5766 { 5765 {
5767 WeakDocumentSet& set = liveDocumentSet(); 5766 WeakDocumentSet& set = liveDocumentSet();
5768 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5767 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5769 for (Document* document : set) 5768 for (Document* document : set)
5770 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5769 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5771 } 5770 }
5772 #endif 5771 #endif
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698