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

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

Issue 1156213003: Cancel animations before calling ContainerNode::attach in Element::attach. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add a test. Created 5 years, 6 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 | « LayoutTests/animations/display-none-cancel-computedstyle-expected.txt ('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 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1443 if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) { 1443 if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) {
1444 ElementRareData* data = elementRareData(); 1444 ElementRareData* data = elementRareData();
1445 data->clearComputedStyle(); 1445 data->clearComputedStyle();
1446 } 1446 }
1447 1447
1448 if (!isActiveInsertionPoint(*this)) 1448 if (!isActiveInsertionPoint(*this))
1449 LayoutTreeBuilderForElement(*this, context.resolvedStyle).createLayoutOb jectIfNeeded(); 1449 LayoutTreeBuilderForElement(*this, context.resolvedStyle).createLayoutOb jectIfNeeded();
1450 1450
1451 addCallbackSelectors(); 1451 addCallbackSelectors();
1452 1452
1453 if (hasRareData() && !layoutObject()) {
1454 if (ElementAnimations* elementAnimations = elementRareData()->elementAni mations()) {
1455 elementAnimations->cssAnimations().cancel();
1456 elementAnimations->setAnimationStyleChange(false);
1457 }
1458 }
1459
1453 StyleResolverParentScope parentScope(*this); 1460 StyleResolverParentScope parentScope(*this);
1454 1461
1455 createPseudoElementIfNeeded(BEFORE); 1462 createPseudoElementIfNeeded(BEFORE);
1456 1463
1457 // When a shadow root exists, it does the work of attaching the children. 1464 // When a shadow root exists, it does the work of attaching the children.
1458 if (ElementShadow* shadow = this->shadow()) 1465 if (ElementShadow* shadow = this->shadow())
1459 shadow->attach(context); 1466 shadow->attach(context);
1460 1467
1461 ContainerNode::attach(context); 1468 ContainerNode::attach(context);
1462 1469
1463 createPseudoElementIfNeeded(AFTER); 1470 createPseudoElementIfNeeded(AFTER);
1464 createPseudoElementIfNeeded(BACKDROP); 1471 createPseudoElementIfNeeded(BACKDROP);
1465 1472
1466 // We create the first-letter element after the :before, :after and 1473 // We create the first-letter element after the :before, :after and
1467 // children are attached because the first letter text could come 1474 // children are attached because the first letter text could come
1468 // from any of them. 1475 // from any of them.
1469 createPseudoElementIfNeeded(FIRST_LETTER); 1476 createPseudoElementIfNeeded(FIRST_LETTER);
1470
1471 if (hasRareData() && !layoutObject()) {
1472 if (ElementAnimations* elementAnimations = elementRareData()->elementAni mations()) {
1473 elementAnimations->cssAnimations().cancel();
1474 elementAnimations->setAnimationStyleChange(false);
1475 }
1476 }
1477 } 1477 }
1478 1478
1479 void Element::detach(const AttachContext& context) 1479 void Element::detach(const AttachContext& context)
1480 { 1480 {
1481 HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpdates; 1481 HTMLFrameOwnerElement::UpdateSuspendScope suspendWidgetHierarchyUpdates;
1482 cancelFocusAppearanceUpdate(); 1482 cancelFocusAppearanceUpdate();
1483 removeCallbackSelectors(); 1483 removeCallbackSelectors();
1484 if (hasRareData()) { 1484 if (hasRareData()) {
1485 ElementRareData* data = elementRareData(); 1485 ElementRareData* data = elementRareData();
1486 data->clearPseudoElements(); 1486 data->clearPseudoElements();
(...skipping 1958 matching lines...) Expand 10 before | Expand all | Expand 10 after
3445 { 3445 {
3446 #if ENABLE(OILPAN) 3446 #if ENABLE(OILPAN)
3447 if (hasRareData()) 3447 if (hasRareData())
3448 visitor->trace(elementRareData()); 3448 visitor->trace(elementRareData());
3449 visitor->trace(m_elementData); 3449 visitor->trace(m_elementData);
3450 #endif 3450 #endif
3451 ContainerNode::trace(visitor); 3451 ContainerNode::trace(visitor);
3452 } 3452 }
3453 3453
3454 } // namespace blink 3454 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/animations/display-none-cancel-computedstyle-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698