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

Side by Side Diff: sky/engine/core/dom/Element.cpp

Issue 768493002: Get rid of CompositingState. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix incorrect case. Created 6 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
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 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 if (hasRareData()) { 834 if (hasRareData()) {
835 ElementRareData* data = elementRareData(); 835 ElementRareData* data = elementRareData();
836 836
837 // attach() will perform the below steps for us when inside recalcStyle. 837 // attach() will perform the below steps for us when inside recalcStyle.
838 if (!document().inStyleRecalc()) { 838 if (!document().inStyleRecalc()) {
839 data->clearComputedStyle(); 839 data->clearComputedStyle();
840 } 840 }
841 841
842 if (ActiveAnimations* activeAnimations = data->activeAnimations()) { 842 if (ActiveAnimations* activeAnimations = data->activeAnimations()) {
843 if (context.performingReattach) { 843 if (context.performingReattach) {
844 // FIXME: We call detach from within style recalc, so compositin gState is not up to date.
845 // https://code.google.com/p/chromium/issues/detail?id=339847
846 DisableCompositingQueryAsserts disabler;
847
848 // FIXME: restart compositor animations rather than pull back to the main thread 844 // FIXME: restart compositor animations rather than pull back to the main thread
849 activeAnimations->cancelAnimationOnCompositor(); 845 activeAnimations->cancelAnimationOnCompositor();
850 } else { 846 } else {
851 activeAnimations->cssAnimations().cancel(); 847 activeAnimations->cssAnimations().cancel();
852 activeAnimations->setAnimationStyleChange(false); 848 activeAnimations->setAnimationStyleChange(false);
853 } 849 }
854 } 850 }
855 851
856 if (ElementShadow* shadow = data->shadow()) 852 if (ElementShadow* shadow = data->shadow())
857 shadow->detach(context); 853 shadow->detach(context);
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 return false; 1793 return false;
1798 // Turn off style sharing for elements that can gain layers for reasons outs ide of the style system. 1794 // Turn off style sharing for elements that can gain layers for reasons outs ide of the style system.
1799 // See comments in RenderObject::setStyle(). 1795 // See comments in RenderObject::setStyle().
1800 // FIXME: Why does gaining a layer from outside the style system require dis abling sharing? 1796 // FIXME: Why does gaining a layer from outside the style system require dis abling sharing?
1801 if (isHTMLCanvasElement(*this)) 1797 if (isHTMLCanvasElement(*this))
1802 return false; 1798 return false;
1803 return true; 1799 return true;
1804 } 1800 }
1805 1801
1806 } // namespace blink 1802 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698