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

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

Issue 1645433002: Basic implementation of @apply (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix expted.txt for failing test Created 4 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
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 Apple Inc. All r ights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 return propertySet().propertyCount(); 148 return propertySet().propertyCount();
149 } 149 }
150 150
151 String AbstractPropertySetCSSStyleDeclaration::item(unsigned i) const 151 String AbstractPropertySetCSSStyleDeclaration::item(unsigned i) const
152 { 152 {
153 if (i >= propertySet().propertyCount()) 153 if (i >= propertySet().propertyCount())
154 return ""; 154 return "";
155 StylePropertySet::PropertyReference property = propertySet().propertyAt(i); 155 StylePropertySet::PropertyReference property = propertySet().propertyAt(i);
156 if (RuntimeEnabledFeatures::cssVariablesEnabled() && property.id() == CSSPro pertyVariable) 156 if (RuntimeEnabledFeatures::cssVariablesEnabled() && property.id() == CSSPro pertyVariable)
157 return toCSSCustomPropertyDeclaration(property.value())->name(); 157 return toCSSCustomPropertyDeclaration(property.value())->name();
158 if (property.id() == CSSPropertyApplyAtRule)
159 return "@apply";
158 return getPropertyName(property.id()); 160 return getPropertyName(property.id());
159 } 161 }
160 162
161 String AbstractPropertySetCSSStyleDeclaration::cssText() const 163 String AbstractPropertySetCSSStyleDeclaration::cssText() const
162 { 164 {
163 return propertySet().asText(); 165 return propertySet().asText();
164 } 166 }
165 167
166 void AbstractPropertySetCSSStyleDeclaration::setCSSText(const String& text, Exce ptionState&) 168 void AbstractPropertySetCSSStyleDeclaration::setCSSText(const String& text, Exce ptionState&)
167 { 169 {
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 } 421 }
420 #endif 422 #endif
421 423
422 DEFINE_TRACE(InlineCSSStyleDeclaration) 424 DEFINE_TRACE(InlineCSSStyleDeclaration)
423 { 425 {
424 visitor->trace(m_parentElement); 426 visitor->trace(m_parentElement);
425 AbstractPropertySetCSSStyleDeclaration::trace(visitor); 427 AbstractPropertySetCSSStyleDeclaration::trace(visitor);
426 } 428 }
427 429
428 } // namespace blink 430 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698