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

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

Issue 138643003: Simpler return value of HashTable::add/HashMap:add and others (Closed)
Patch Set: Daily master update (now with base url?) 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
« no previous file with comments | « Source/core/css/FontFaceCache.cpp ('k') | Source/core/css/RuleFeature.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 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 CSSValue* AbstractPropertySetCSSStyleDeclaration::cloneAndCacheForCSSOM(CSSValue * internalValue) 285 CSSValue* AbstractPropertySetCSSStyleDeclaration::cloneAndCacheForCSSOM(CSSValue * internalValue)
286 { 286 {
287 if (!internalValue) 287 if (!internalValue)
288 return 0; 288 return 0;
289 289
290 // The map is here to maintain the object identity of the CSSValues over mul tiple invocations. 290 // The map is here to maintain the object identity of the CSSValues over mul tiple invocations.
291 // FIXME: It is likely that the identity is not important for web compatibil ity and this code should be removed. 291 // FIXME: It is likely that the identity is not important for web compatibil ity and this code should be removed.
292 if (!m_cssomCSSValueClones) 292 if (!m_cssomCSSValueClones)
293 m_cssomCSSValueClones = adoptPtr(new HashMap<CSSValue*, RefPtr<CSSValue> >); 293 m_cssomCSSValueClones = adoptPtr(new HashMap<CSSValue*, RefPtr<CSSValue> >);
294 294
295 RefPtr<CSSValue>& clonedValue = m_cssomCSSValueClones->add(internalValue, Re fPtr<CSSValue>()).iterator->value; 295 RefPtr<CSSValue>& clonedValue = m_cssomCSSValueClones->add(internalValue, Re fPtr<CSSValue>()).storedValue->value;
296 if (!clonedValue) 296 if (!clonedValue)
297 clonedValue = internalValue->cloneForCSSOM(); 297 clonedValue = internalValue->cloneForCSSOM();
298 return clonedValue.get(); 298 return clonedValue.get();
299 } 299 }
300 300
301 StyleSheetContents* AbstractPropertySetCSSStyleDeclaration::contextStyleSheet() const 301 StyleSheetContents* AbstractPropertySetCSSStyleDeclaration::contextStyleSheet() const
302 { 302 {
303 CSSStyleSheet* cssStyleSheet = parentStyleSheet(); 303 CSSStyleSheet* cssStyleSheet = parentStyleSheet();
304 return cssStyleSheet ? cssStyleSheet->contents() : 0; 304 return cssStyleSheet ? cssStyleSheet->contents() : 0;
305 } 305 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 { 398 {
399 m_parentElement->ref(); 399 m_parentElement->ref();
400 } 400 }
401 401
402 void InlineCSSStyleDeclaration::deref() 402 void InlineCSSStyleDeclaration::deref()
403 { 403 {
404 m_parentElement->deref(); 404 m_parentElement->deref();
405 } 405 }
406 406
407 } // namespace WebCore 407 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/FontFaceCache.cpp ('k') | Source/core/css/RuleFeature.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698