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

Side by Side Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 709203002: Remove more oilpan. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 // be propagated from shadow host to distributed node. 452 // be propagated from shadow host to distributed node.
453 if (state.distributedToInsertionPoint()) { 453 if (state.distributedToInsertionPoint()) {
454 if (Element* parent = element->parentElement()) { 454 if (Element* parent = element->parentElement()) {
455 if (RenderStyle* styleOfShadowHost = parent->renderStyle()) 455 if (RenderStyle* styleOfShadowHost = parent->renderStyle())
456 state.style()->setUserModify(styleOfShadowHost->userModify()); 456 state.style()->setUserModify(styleOfShadowHost->userModify());
457 } 457 }
458 } 458 }
459 459
460 state.fontBuilder().initForStyleResolve(state.document(), state.style()); 460 state.fontBuilder().initForStyleResolve(state.document(), state.style());
461 461
462 bool needsCollection = false;
463 CSSDefaultStyleSheets::instance().ensureDefaultStyleSheetsForElement(element , needsCollection);
464 if (needsCollection)
465 collectFeatures();
466
467 { 462 {
468 ElementRuleCollector collector(state.elementContext(), state.style()); 463 ElementRuleCollector collector(state.elementContext(), state.style());
469 464
470 matchAllRules(state, collector, matchingBehavior != MatchAllRulesExcludi ngSMIL); 465 matchAllRules(state, collector, matchingBehavior != MatchAllRulesExcludi ngSMIL);
471 466
472 applyMatchedProperties(state, collector.matchedResult()); 467 applyMatchedProperties(state, collector.matchedResult());
473 468
474 addContentAttrValuesToFeatures(state.contentAttrValues(), m_features); 469 addContentAttrValuesToFeatures(state.contentAttrValues(), m_features);
475 } 470 }
476 471
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 visitor->trace(m_viewportDependentMediaQueryResults); 1002 visitor->trace(m_viewportDependentMediaQueryResults);
1008 visitor->trace(m_features); 1003 visitor->trace(m_features);
1009 visitor->trace(m_attributeRuleSet); 1004 visitor->trace(m_attributeRuleSet);
1010 visitor->trace(m_styleSharingLists); 1005 visitor->trace(m_styleSharingLists);
1011 visitor->trace(m_pendingStyleSheets); 1006 visitor->trace(m_pendingStyleSheets);
1012 visitor->trace(m_document); 1007 visitor->trace(m_document);
1013 #endif 1008 #endif
1014 } 1009 }
1015 1010
1016 } // namespace blink 1011 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.h ('k') | sky/engine/core/dom/DOMSettableTokenList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698