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

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

Issue 205033007: Revert of Oilpan: Move CSSStyleDeclaration and subclasses to the heap using transistion types. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/CSSComputedStyleDeclaration.h ('k') | Source/core/css/CSSFilterRule.h » ('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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 { 1113 {
1114 unsigned nameWithoutColonsStart = pseudoElementName[0] == ':' ? (pseudoEleme ntName[1] == ':' ? 2 : 1) : 0; 1114 unsigned nameWithoutColonsStart = pseudoElementName[0] == ':' ? (pseudoEleme ntName[1] == ':' ? 2 : 1) : 0;
1115 m_pseudoElementSpecifier = CSSSelector::pseudoId(CSSSelector::parsePseudoTyp e( 1115 m_pseudoElementSpecifier = CSSSelector::pseudoId(CSSSelector::parsePseudoTyp e(
1116 AtomicString(pseudoElementName.substring(nameWithoutColonsStart)))); 1116 AtomicString(pseudoElementName.substring(nameWithoutColonsStart))));
1117 } 1117 }
1118 1118
1119 CSSComputedStyleDeclaration::~CSSComputedStyleDeclaration() 1119 CSSComputedStyleDeclaration::~CSSComputedStyleDeclaration()
1120 { 1120 {
1121 } 1121 }
1122 1122
1123 #if !ENABLE(OILPAN)
1124 void CSSComputedStyleDeclaration::ref() 1123 void CSSComputedStyleDeclaration::ref()
1125 { 1124 {
1126 ++m_refCount; 1125 ++m_refCount;
1127 } 1126 }
1128 1127
1129 void CSSComputedStyleDeclaration::deref() 1128 void CSSComputedStyleDeclaration::deref()
1130 { 1129 {
1131 ASSERT(m_refCount); 1130 ASSERT(m_refCount);
1132 if (!--m_refCount) 1131 if (!--m_refCount)
1133 delete this; 1132 delete this;
1134 } 1133 }
1135 #endif
1136 1134
1137 String CSSComputedStyleDeclaration::cssText() const 1135 String CSSComputedStyleDeclaration::cssText() const
1138 { 1136 {
1139 StringBuilder result; 1137 StringBuilder result;
1140 const Vector<CSSPropertyID>& properties = computableProperties(); 1138 const Vector<CSSPropertyID>& properties = computableProperties();
1141 1139
1142 for (unsigned i = 0; i < properties.size(); i++) { 1140 for (unsigned i = 0; i < properties.size(); i++) {
1143 if (i) 1141 if (i)
1144 result.append(' '); 1142 result.append(' ');
1145 result.append(getPropertyName(properties[i])); 1143 result.append(getPropertyName(properties[i]));
(...skipping 1898 matching lines...) Expand 10 before | Expand all | Expand 10 after
3044 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3045 CSSPropertyB ackgroundClip }; 3043 CSSPropertyB ackgroundClip };
3046 3044
3047 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3048 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3049 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3050 return list.release(); 3048 return list.release();
3051 } 3049 }
3052 3050
3053 } // namespace WebCore 3051 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.h ('k') | Source/core/css/CSSFilterRule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698