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

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

Issue 1060973003: compositor-worker: Force elements to grow a layer when a CompositorProxy is created. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 5 years, 8 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
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 1623 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 if (ElementAnimations* elementAnimations = this->elementAnimations()) { 1634 if (ElementAnimations* elementAnimations = this->elementAnimations()) {
1635 elementAnimations->cssAnimations().maybeApplyPendingUpdate(this); 1635 elementAnimations->cssAnimations().maybeApplyPendingUpdate(this);
1636 elementAnimations->updateAnimationFlags(*style); 1636 elementAnimations->updateAnimationFlags(*style);
1637 } 1637 }
1638 1638
1639 if (style->hasTransform()) { 1639 if (style->hasTransform()) {
1640 if (const StylePropertySet* inlineStyle = this->inlineStyle()) 1640 if (const StylePropertySet* inlineStyle = this->inlineStyle())
1641 style->setHasInlineTransform(inlineStyle->hasProperty(CSSPropertyTra nsform) || inlineStyle->hasProperty(CSSPropertyWebkitTransform)); 1641 style->setHasInlineTransform(inlineStyle->hasProperty(CSSPropertyTra nsform) || inlineStyle->hasProperty(CSSPropertyWebkitTransform));
1642 } 1642 }
1643 1643
1644 if (hasCompositorProxy())
1645 style->setHasCompositorProxy(true);
1646
1644 document().didRecalculateStyleForElement(); 1647 document().didRecalculateStyleForElement();
1645 return style.release(); 1648 return style.release();
1646 } 1649 }
1647 1650
1648 PassRefPtr<ComputedStyle> Element::originalStyleForLayoutObject() 1651 PassRefPtr<ComputedStyle> Element::originalStyleForLayoutObject()
1649 { 1652 {
1650 ASSERT(document().inStyleRecalc()); 1653 ASSERT(document().inStyleRecalc());
1651 return document().ensureStyleResolver().styleForElement(this); 1654 return document().ensureStyleResolver().styleForElement(this);
1652 } 1655 }
1653 1656
(...skipping 1841 matching lines...) Expand 10 before | Expand all | Expand 10 after
3495 { 3498 {
3496 #if ENABLE(OILPAN) 3499 #if ENABLE(OILPAN)
3497 if (hasRareData()) 3500 if (hasRareData())
3498 visitor->trace(elementRareData()); 3501 visitor->trace(elementRareData());
3499 visitor->trace(m_elementData); 3502 visitor->trace(m_elementData);
3500 #endif 3503 #endif
3501 ContainerNode::trace(visitor); 3504 ContainerNode::trace(visitor);
3502 } 3505 }
3503 3506
3504 } // namespace blink 3507 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698