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

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

Issue 85463002: Web Animations: Remove WebAnimations runtime feature in favor of WebAnimationsCSS (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 7 years 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/Document.cpp ('k') | Source/core/platform/animation/TimingFunction.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 * 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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 ActiveAnimations* Element::ensureActiveAnimations() 383 ActiveAnimations* Element::ensureActiveAnimations()
384 { 384 {
385 ElementRareData& rareData = ensureElementRareData(); 385 ElementRareData& rareData = ensureElementRareData();
386 if (!rareData.activeAnimations()) 386 if (!rareData.activeAnimations())
387 rareData.setActiveAnimations(adoptPtr(new ActiveAnimations())); 387 rareData.setActiveAnimations(adoptPtr(new ActiveAnimations()));
388 return rareData.activeAnimations(); 388 return rareData.activeAnimations();
389 } 389 }
390 390
391 bool Element::hasActiveAnimations() const 391 bool Element::hasActiveAnimations() const
392 { 392 {
393 if (!RuntimeEnabledFeatures::webAnimationsEnabled()) 393 if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled())
394 return false; 394 return false;
395 395
396 if (!hasRareData()) 396 if (!hasRareData())
397 return false; 397 return false;
398 398
399 ActiveAnimations* activeAnimations = elementRareData()->activeAnimations(); 399 ActiveAnimations* activeAnimations = elementRareData()->activeAnimations();
400 return activeAnimations && !activeAnimations->isEmpty(); 400 return activeAnimations && !activeAnimations->isEmpty();
401 } 401 }
402 402
403 Node::NodeType Element::nodeType() const 403 Node::NodeType Element::nodeType() const
(...skipping 3129 matching lines...) Expand 10 before | Expand all | Expand 10 after
3533 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems 3533 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems
3534 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 3534 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405
3535 if (hasTagName(optionTag) || hasTagName(optgroupTag)) 3535 if (hasTagName(optionTag) || hasTagName(optgroupTag))
3536 return false; 3536 return false;
3537 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3537 if (FullscreenElementStack::isActiveFullScreenElement(this))
3538 return false; 3538 return false;
3539 return true; 3539 return true;
3540 } 3540 }
3541 3541
3542 } // namespace WebCore 3542 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/platform/animation/TimingFunction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698