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

Side by Side Diff: Source/core/dom/Element.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/dom/DocumentOrderedMap.cpp ('k') | Source/core/dom/ElementDataCache.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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 static AttrNodeList& ensureAttrNodeListForElement(Element* element) 163 static AttrNodeList& ensureAttrNodeListForElement(Element* element)
164 { 164 {
165 if (element->hasSyntheticAttrChildNodes()) { 165 if (element->hasSyntheticAttrChildNodes()) {
166 ASSERT(attrNodeListMap().contains(element)); 166 ASSERT(attrNodeListMap().contains(element));
167 return *attrNodeListMap().get(element); 167 return *attrNodeListMap().get(element);
168 } 168 }
169 ASSERT(!attrNodeListMap().contains(element)); 169 ASSERT(!attrNodeListMap().contains(element));
170 element->setHasSyntheticAttrChildNodes(true); 170 element->setHasSyntheticAttrChildNodes(true);
171 AttrNodeListMap::AddResult result = attrNodeListMap().add(element, adoptPtr( new AttrNodeList)); 171 AttrNodeListMap::AddResult result = attrNodeListMap().add(element, adoptPtr( new AttrNodeList));
172 return *result.iterator->value; 172 return *result.storedValue->value;
173 } 173 }
174 174
175 static void removeAttrNodeListForElement(Element* element) 175 static void removeAttrNodeListForElement(Element* element)
176 { 176 {
177 ASSERT(element->hasSyntheticAttrChildNodes()); 177 ASSERT(element->hasSyntheticAttrChildNodes());
178 ASSERT(attrNodeListMap().contains(element)); 178 ASSERT(attrNodeListMap().contains(element));
179 attrNodeListMap().remove(element); 179 attrNodeListMap().remove(element);
180 element->setHasSyntheticAttrChildNodes(false); 180 element->setHasSyntheticAttrChildNodes(false);
181 } 181 }
182 182
(...skipping 3442 matching lines...) Expand 10 before | Expand all | Expand 10 after
3625 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems 3625 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems
3626 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 3626 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405
3627 if (hasTagName(optionTag) || hasTagName(optgroupTag)) 3627 if (hasTagName(optionTag) || hasTagName(optgroupTag))
3628 return false; 3628 return false;
3629 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3629 if (FullscreenElementStack::isActiveFullScreenElement(this))
3630 return false; 3630 return false;
3631 return true; 3631 return true;
3632 } 3632 }
3633 3633
3634 } // namespace WebCore 3634 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentOrderedMap.cpp ('k') | Source/core/dom/ElementDataCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698