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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 933953003: Move the remaining rendering/svg/RenderSVG* files to layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/FrameView.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) 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 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1394 1394
1395 // Now we have all of the matched rules in the appropriate order. Walk the r ules and apply 1395 // Now we have all of the matched rules in the appropriate order. Walk the r ules and apply
1396 // high-priority properties first, i.e., those properties that other propert ies depend on. 1396 // high-priority properties first, i.e., those properties that other propert ies depend on.
1397 // The order is (1) high-priority not important, (2) high-priority important , (3) normal not important 1397 // The order is (1) high-priority not important, (2) high-priority important , (3) normal not important
1398 // and (4) normal important. 1398 // and (4) normal important.
1399 applyMatchedProperties<HighPropertyPriority>(state, matchResult, false, 0, m atchResult.matchedProperties.size() - 1, applyInheritedOnly); 1399 applyMatchedProperties<HighPropertyPriority>(state, matchResult, false, 0, m atchResult.matchedProperties.size() - 1, applyInheritedOnly);
1400 applyMatchedProperties<HighPropertyPriority>(state, matchResult, true, match Result.ranges.firstAuthorRule, matchResult.ranges.lastAuthorRule, applyInherited Only); 1400 applyMatchedProperties<HighPropertyPriority>(state, matchResult, true, match Result.ranges.firstAuthorRule, matchResult.ranges.lastAuthorRule, applyInherited Only);
1401 applyMatchedProperties<HighPropertyPriority>(state, matchResult, true, match Result.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly); 1401 applyMatchedProperties<HighPropertyPriority>(state, matchResult, true, match Result.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly);
1402 1402
1403 if (UNLIKELY(isSVGForeignObjectElement(element))) { 1403 if (UNLIKELY(isSVGForeignObjectElement(element))) {
1404 // RenderSVGRoot handles zooming for the whole SVG subtree, so foreignOb ject content should not be scaled again. 1404 // LayoutSVGRoot handles zooming for the whole SVG subtree, so foreignOb ject content should not be scaled again.
1405 // 1405 //
1406 // FIXME: The following hijacks the zoom property for foreignObject so t hat children of foreignObject get the 1406 // FIXME: The following hijacks the zoom property for foreignObject so t hat children of foreignObject get the
1407 // correct font-size in case of zooming. 'zoom' has HighPropertyPriority , along with other font-related 1407 // correct font-size in case of zooming. 'zoom' has HighPropertyPriority , along with other font-related
1408 // properties used as input to the FontBuilder, so resetting it here may cause the FontBuilder to recompute the 1408 // properties used as input to the FontBuilder, so resetting it here may cause the FontBuilder to recompute the
1409 // font used as inheritable font for foreignObject content. If we want t o support zoom on foreignObject we'll 1409 // font used as inheritable font for foreignObject content. If we want t o support zoom on foreignObject we'll
1410 // need to find another way of handling the SVG zoom model. 1410 // need to find another way of handling the SVG zoom model.
1411 state.setEffectiveZoom(LayoutStyle::initialZoom()); 1411 state.setEffectiveZoom(LayoutStyle::initialZoom());
1412 } 1412 }
1413 1413
1414 if (cachedMatchedProperties && cachedMatchedProperties->layoutStyle->effecti veZoom() != state.style()->effectiveZoom()) { 1414 if (cachedMatchedProperties && cachedMatchedProperties->layoutStyle->effecti veZoom() != state.style()->effectiveZoom()) {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1547 visitor->trace(m_uncommonAttributeRuleSet); 1547 visitor->trace(m_uncommonAttributeRuleSet);
1548 visitor->trace(m_watchedSelectorsRules); 1548 visitor->trace(m_watchedSelectorsRules);
1549 visitor->trace(m_treeBoundaryCrossingRules); 1549 visitor->trace(m_treeBoundaryCrossingRules);
1550 visitor->trace(m_styleSharingLists); 1550 visitor->trace(m_styleSharingLists);
1551 visitor->trace(m_pendingStyleSheets); 1551 visitor->trace(m_pendingStyleSheets);
1552 visitor->trace(m_document); 1552 visitor->trace(m_document);
1553 #endif 1553 #endif
1554 } 1554 }
1555 1555
1556 } // namespace blink 1556 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698