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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 182293002: Make Element::ensureActiveAnimations() return a reference (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/dom/Element.h ('k') | no next file » | 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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 return rareData.attributeMap(); 362 return rareData.attributeMap();
363 } 363 }
364 364
365 ActiveAnimations* Element::activeAnimations() const 365 ActiveAnimations* Element::activeAnimations() const
366 { 366 {
367 if (hasRareData()) 367 if (hasRareData())
368 return elementRareData()->activeAnimations(); 368 return elementRareData()->activeAnimations();
369 return 0; 369 return 0;
370 } 370 }
371 371
372 ActiveAnimations* Element::ensureActiveAnimations() 372 ActiveAnimations& Element::ensureActiveAnimations()
373 { 373 {
374 ElementRareData& rareData = ensureElementRareData(); 374 ElementRareData& rareData = ensureElementRareData();
375 if (!rareData.activeAnimations()) 375 if (!rareData.activeAnimations())
376 rareData.setActiveAnimations(adoptPtr(new ActiveAnimations())); 376 rareData.setActiveAnimations(adoptPtr(new ActiveAnimations()));
377 return rareData.activeAnimations(); 377 return *rareData.activeAnimations();
378 } 378 }
379 379
380 bool Element::hasActiveAnimations() const 380 bool Element::hasActiveAnimations() const
381 { 381 {
382 if (!hasRareData()) 382 if (!hasRareData())
383 return false; 383 return false;
384 384
385 ActiveAnimations* activeAnimations = elementRareData()->activeAnimations(); 385 ActiveAnimations* activeAnimations = elementRareData()->activeAnimations();
386 return activeAnimations && !activeAnimations->isEmpty(); 386 return activeAnimations && !activeAnimations->isEmpty();
387 } 387 }
(...skipping 3153 matching lines...) Expand 10 before | Expand all | Expand 10 after
3541 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems 3541 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems
3542 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 3542 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405
3543 if (hasTagName(optionTag) || hasTagName(optgroupTag)) 3543 if (hasTagName(optionTag) || hasTagName(optgroupTag))
3544 return false; 3544 return false;
3545 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3545 if (FullscreenElementStack::isActiveFullScreenElement(this))
3546 return false; 3546 return false;
3547 return true; 3547 return true;
3548 } 3548 }
3549 3549
3550 } // namespace WebCore 3550 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Element.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698