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

Side by Side Diff: Source/core/css/StylePropertySet.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 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/css/StylePropertySerializer.cpp ('k') | Source/core/css/StyleRule.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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * Copyright (C) 2013 Intel Corporation. All rights reserved. 5 * Copyright (C) 2013 Intel Corporation. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 if (value) 128 if (value)
129 return value->cssText(); 129 return value->cssText();
130 130
131 return StylePropertySerializer(*this).getPropertyValue(propertyID); 131 return StylePropertySerializer(*this).getPropertyValue(propertyID);
132 } 132 }
133 133
134 PassRefPtrWillBeRawPtr<CSSValue> StylePropertySet::getPropertyCSSValue(CSSProper tyID propertyID) const 134 PassRefPtrWillBeRawPtr<CSSValue> StylePropertySet::getPropertyCSSValue(CSSProper tyID propertyID) const
135 { 135 {
136 int foundPropertyIndex = findPropertyIndex(propertyID); 136 int foundPropertyIndex = findPropertyIndex(propertyID);
137 if (foundPropertyIndex == -1) 137 if (foundPropertyIndex == -1)
138 return 0; 138 return nullptr;
139 return propertyAt(foundPropertyIndex).value(); 139 return propertyAt(foundPropertyIndex).value();
140 } 140 }
141 141
142 bool MutableStylePropertySet::removeShorthandProperty(CSSPropertyID propertyID) 142 bool MutableStylePropertySet::removeShorthandProperty(CSSPropertyID propertyID)
143 { 143 {
144 StylePropertyShorthand shorthand = shorthandForProperty(propertyID); 144 StylePropertyShorthand shorthand = shorthandForProperty(propertyID);
145 if (!shorthand.length()) 145 if (!shorthand.length())
146 return false; 146 return false;
147 147
148 bool ret = removePropertiesInSet(shorthand.properties(), shorthand.length()) ; 148 bool ret = removePropertiesInSet(shorthand.properties(), shorthand.length()) ;
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 result.appendLiteral(": "); 569 result.appendLiteral(": ");
570 result.append(propertyValue()->cssText()); 570 result.append(propertyValue()->cssText());
571 if (isImportant()) 571 if (isImportant())
572 result.appendLiteral(" !important"); 572 result.appendLiteral(" !important");
573 result.append(';'); 573 result.append(';');
574 return result.toString(); 574 return result.toString();
575 } 575 }
576 576
577 577
578 } // namespace WebCore 578 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/StylePropertySerializer.cpp ('k') | Source/core/css/StyleRule.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698