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

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

Issue 1303413005: Remove work-around for Win-Clang in-class initializer bug (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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/MatchResult.h ('k') | no next file » | 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 30 matching lines...) Expand all
41 41
42 MatchedProperties::~MatchedProperties() 42 MatchedProperties::~MatchedProperties()
43 { 43 {
44 } 44 }
45 45
46 DEFINE_TRACE(MatchedProperties) 46 DEFINE_TRACE(MatchedProperties)
47 { 47 {
48 visitor->trace(properties); 48 visitor->trace(properties);
49 } 49 }
50 50
51 // TODO(thakis): Remove this once http://crbug.com/488634 is fixed.
52 MatchResult::MatchResult() = default;
53
54 void MatchResult::addMatchedProperties(const StylePropertySet* properties, unsig ned linkMatchType, PropertyWhitelistType propertyWhitelistType) 51 void MatchResult::addMatchedProperties(const StylePropertySet* properties, unsig ned linkMatchType, PropertyWhitelistType propertyWhitelistType)
55 { 52 {
56 m_matchedProperties.grow(m_matchedProperties.size() + 1); 53 m_matchedProperties.grow(m_matchedProperties.size() + 1);
57 MatchedProperties& newProperties = m_matchedProperties.last(); 54 MatchedProperties& newProperties = m_matchedProperties.last();
58 newProperties.properties = const_cast<StylePropertySet*>(properties); 55 newProperties.properties = const_cast<StylePropertySet*>(properties);
59 newProperties.m_types.linkMatchType = linkMatchType; 56 newProperties.m_types.linkMatchType = linkMatchType;
60 newProperties.m_types.whitelistType = propertyWhitelistType; 57 newProperties.m_types.whitelistType = propertyWhitelistType;
61 } 58 }
62 59
63 void MatchResult::finishAddingUARules() 60 void MatchResult::finishAddingUARules()
64 { 61 {
65 m_uaRangeEnd = m_matchedProperties.size(); 62 m_uaRangeEnd = m_matchedProperties.size();
66 } 63 }
67 64
68 void MatchResult::finishAddingAuthorRulesForTreeScope() 65 void MatchResult::finishAddingAuthorRulesForTreeScope()
69 { 66 {
70 // Don't add empty ranges. 67 // Don't add empty ranges.
71 if (m_authorRangeEnds.isEmpty() && m_uaRangeEnd == m_matchedProperties.size( )) 68 if (m_authorRangeEnds.isEmpty() && m_uaRangeEnd == m_matchedProperties.size( ))
72 return; 69 return;
73 if (!m_authorRangeEnds.isEmpty() && m_authorRangeEnds.last() == m_matchedPro perties.size()) 70 if (!m_authorRangeEnds.isEmpty() && m_authorRangeEnds.last() == m_matchedPro perties.size())
74 return; 71 return;
75 m_authorRangeEnds.append(m_matchedProperties.size()); 72 m_authorRangeEnds.append(m_matchedProperties.size());
76 } 73 }
77 74
78 } // namespace blink 75 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/MatchResult.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698