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

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

Issue 1367743002: Fix assert when resolving font on canvas with dirty shadow distribution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
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 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
1441 CSSPropertyID properties[] = { 1441 CSSPropertyID properties[] = {
1442 CSSPropertyFontSize, 1442 CSSPropertyFontSize,
1443 CSSPropertyFontFamily, 1443 CSSPropertyFontFamily,
1444 CSSPropertyFontStretch, 1444 CSSPropertyFontStretch,
1445 CSSPropertyFontStyle, 1445 CSSPropertyFontStyle,
1446 CSSPropertyFontVariant, 1446 CSSPropertyFontVariant,
1447 CSSPropertyFontWeight, 1447 CSSPropertyFontWeight,
1448 CSSPropertyLineHeight, 1448 CSSPropertyLineHeight,
1449 }; 1449 };
1450 1450
1451 // TODO(timloh): This is weird, the style is being used as its own parent 1451 // TODO(timloh): This is weird, the style is being used as its own parent
rune 2015/09/23 22:55:42 This seems to be because style object already has
1452 StyleResolverState state(document(), document().documentElement(), style); 1452 StyleResolverState state(document(), nullptr, style);
1453 state.setStyle(style); 1453 state.setStyle(style);
1454 1454
1455 for (CSSPropertyID property : properties) { 1455 for (CSSPropertyID property : properties) {
1456 if (property == CSSPropertyLineHeight) 1456 if (property == CSSPropertyLineHeight)
1457 updateFont(state); 1457 updateFont(state);
1458 StyleBuilder::applyProperty(property, state, propertySet.getPropertyCSSV alue(property).get()); 1458 StyleBuilder::applyProperty(property, state, propertySet.getPropertyCSSV alue(property).get());
1459 } 1459 }
1460 } 1460 }
1461 1461
1462 void StyleResolver::addMediaQueryResults(const MediaQueryResultList& list) 1462 void StyleResolver::addMediaQueryResults(const MediaQueryResultList& list)
(...skipping 24 matching lines...) Expand all
1487 visitor->trace(m_watchedSelectorsRules); 1487 visitor->trace(m_watchedSelectorsRules);
1488 visitor->trace(m_treeBoundaryCrossingRules); 1488 visitor->trace(m_treeBoundaryCrossingRules);
1489 visitor->trace(m_styleResourceLoader); 1489 visitor->trace(m_styleResourceLoader);
1490 visitor->trace(m_styleSharingLists); 1490 visitor->trace(m_styleSharingLists);
1491 visitor->trace(m_pendingStyleSheets); 1491 visitor->trace(m_pendingStyleSheets);
1492 visitor->trace(m_document); 1492 visitor->trace(m_document);
1493 #endif 1493 #endif
1494 } 1494 }
1495 1495
1496 } // namespace blink 1496 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698