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

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

Issue 15746004: Rename/tweak some StylePropertySet/CSSStyleDeclaration copying functions. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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/PropertySetCSSStyleDeclaration.h ('k') | Source/core/css/StylePropertySet.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 * (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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 clonedValue = internalValue->cloneForCSSOM(); 295 clonedValue = internalValue->cloneForCSSOM();
296 return clonedValue.get(); 296 return clonedValue.get();
297 } 297 }
298 298
299 StyleSheetContents* PropertySetCSSStyleDeclaration::contextStyleSheet() const 299 StyleSheetContents* PropertySetCSSStyleDeclaration::contextStyleSheet() const
300 { 300 {
301 CSSStyleSheet* cssStyleSheet = parentStyleSheet(); 301 CSSStyleSheet* cssStyleSheet = parentStyleSheet();
302 return cssStyleSheet ? cssStyleSheet->contents() : 0; 302 return cssStyleSheet ? cssStyleSheet->contents() : 0;
303 } 303 }
304 304
305 PassRefPtr<StylePropertySet> PropertySetCSSStyleDeclaration::copy() const 305 PassRefPtr<MutableStylePropertySet> PropertySetCSSStyleDeclaration::copyProperti es() const
306 { 306 {
307 return m_propertySet->copy(); 307 return m_propertySet->mutableCopy();
308 } 308 }
309 309
310 bool PropertySetCSSStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID , const CSSValue* propertyValue) const 310 bool PropertySetCSSStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID , const CSSValue* propertyValue) const
311 { 311 {
312 return m_propertySet->propertyMatches(propertyID, propertyValue); 312 return m_propertySet->propertyMatches(propertyID, propertyValue);
313 } 313 }
314 314
315 StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(StylePropertySet* pro pertySet, CSSRule* parentRule) 315 StyleRuleCSSStyleDeclaration::StyleRuleCSSStyleDeclaration(StylePropertySet* pro pertySet, CSSRule* parentRule)
316 : PropertySetCSSStyleDeclaration(propertySet) 316 : PropertySetCSSStyleDeclaration(propertySet)
317 , m_refCount(1) 317 , m_refCount(1)
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 m_parentElement->invalidateStyleAttribute(); 394 m_parentElement->invalidateStyleAttribute();
395 StyleAttributeMutationScope(this).didInvalidateStyleAttr(); 395 StyleAttributeMutationScope(this).didInvalidateStyleAttr();
396 } 396 }
397 397
398 CSSStyleSheet* InlineCSSStyleDeclaration::parentStyleSheet() const 398 CSSStyleSheet* InlineCSSStyleDeclaration::parentStyleSheet() const
399 { 399 {
400 return m_parentElement ? m_parentElement->document()->elementSheet() : 0; 400 return m_parentElement ? m_parentElement->document()->elementSheet() : 0;
401 } 401 }
402 402
403 } // namespace WebCore 403 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/PropertySetCSSStyleDeclaration.h ('k') | Source/core/css/StylePropertySet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698