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

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

Issue 23874019: Web Animations CSS: Start running animations on the compositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and rename hasActiveAnimationOnCompositor to hasActiveAnimationsOnCompositor Created 7 years, 1 month 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/frame/FrameView.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 1421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1432 data->setPseudoElement(BACKDROP, 0); 1432 data->setPseudoElement(BACKDROP, 0);
1433 data->setIsInsideRegion(false); 1433 data->setIsInsideRegion(false);
1434 1434
1435 // attach() will perform the below steps for us when inside recalcStyle. 1435 // attach() will perform the below steps for us when inside recalcStyle.
1436 if (!document().inStyleRecalc()) { 1436 if (!document().inStyleRecalc()) {
1437 data->resetStyleState(); 1437 data->resetStyleState();
1438 data->clearComputedStyle(); 1438 data->clearComputedStyle();
1439 data->resetDynamicRestyleObservations(); 1439 data->resetDynamicRestyleObservations();
1440 } 1440 }
1441 1441
1442 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled() && !context.perfor mingReattach) { 1442 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled()) {
1443 if (ActiveAnimations* activeAnimations = data->activeAnimations()) 1443 if (ActiveAnimations* activeAnimations = data->activeAnimations()) {
1444 activeAnimations->cssAnimations().cancel(); 1444 if (context.performingReattach) {
1445 // FIXME: restart compositor animations rather than pull bac k to the main thread
1446 activeAnimations->cancelAnimationOnCompositor();
1447 } else {
1448 activeAnimations->cssAnimations().cancel();
1449 }
1450 }
1445 } 1451 }
1446 } 1452 }
1447 if (ElementShadow* shadow = this->shadow()) 1453 if (ElementShadow* shadow = this->shadow())
1448 shadow->detach(context); 1454 shadow->detach(context);
1449 ContainerNode::detach(context); 1455 ContainerNode::detach(context);
1450 } 1456 }
1451 1457
1452 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS tyle* newStyle) 1458 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS tyle* newStyle)
1453 { 1459 {
1454 ASSERT(currentStyle == renderStyle()); 1460 ASSERT(currentStyle == renderStyle());
(...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after
3514 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems 3520 // Before doing so, we need to resolve issues in HTMLSelectElement::recalcLi stItems
3515 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405 3521 // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cg i?id=88405
3516 if (hasTagName(optionTag) || hasTagName(optgroupTag)) 3522 if (hasTagName(optionTag) || hasTagName(optgroupTag))
3517 return false; 3523 return false;
3518 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3524 if (FullscreenElementStack::isActiveFullScreenElement(this))
3519 return false; 3525 return false;
3520 return true; 3526 return true;
3521 } 3527 }
3522 3528
3523 } // namespace WebCore 3529 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698