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

Side by Side Diff: sky/engine/core/frame/FrameView.cpp

Issue 1229273004: Remove Animations and Transitions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « sky/engine/core/events/TransitionEvent.idl ('k') | sky/engine/core/frame/LocalFrame.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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
11 * This library is free software; you can redistribute it and/or 11 * This library is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU Library General Public 12 * modify it under the terms of the GNU Library General Public
13 * License as published by the Free Software Foundation; either 13 * License as published by the Free Software Foundation; either
14 * version 2 of the License, or (at your option) any later version. 14 * version 2 of the License, or (at your option) any later version.
15 * 15 *
16 * This library is distributed in the hope that it will be useful, 16 * This library is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19 * Library General Public License for more details. 19 * Library General Public License for more details.
20 * 20 *
21 * You should have received a copy of the GNU Library General Public License 21 * You should have received a copy of the GNU Library General Public License
22 * along with this library; see the file COPYING.LIB. If not, write to 22 * along with this library; see the file COPYING.LIB. If not, write to
23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 * Boston, MA 02110-1301, USA. 24 * Boston, MA 02110-1301, USA.
25 */ 25 */
26 26
27 #include "sky/engine/core/frame/FrameView.h" 27 #include "sky/engine/core/frame/FrameView.h"
28 28
29 #include "gen/sky/platform/RuntimeEnabledFeatures.h" 29 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
30 #include "sky/engine/core/animation/DocumentAnimations.h"
31 #include "sky/engine/core/css/resolver/StyleResolver.h" 30 #include "sky/engine/core/css/resolver/StyleResolver.h"
32 #include "sky/engine/core/dom/DocumentMarkerController.h" 31 #include "sky/engine/core/dom/DocumentMarkerController.h"
33 #include "sky/engine/core/editing/FrameSelection.h" 32 #include "sky/engine/core/editing/FrameSelection.h"
34 #include "sky/engine/core/frame/FrameHost.h" 33 #include "sky/engine/core/frame/FrameHost.h"
35 #include "sky/engine/core/frame/LocalFrame.h" 34 #include "sky/engine/core/frame/LocalFrame.h"
36 #include "sky/engine/core/frame/Settings.h" 35 #include "sky/engine/core/frame/Settings.h"
37 #include "sky/engine/core/loader/FrameLoaderClient.h" 36 #include "sky/engine/core/loader/FrameLoaderClient.h"
38 #include "sky/engine/core/page/ChromeClient.h" 37 #include "sky/engine/core/page/ChromeClient.h"
39 #include "sky/engine/core/page/EventHandler.h" 38 #include "sky/engine/core/page/EventHandler.h"
40 #include "sky/engine/core/page/FocusController.h" 39 #include "sky/engine/core/page/FocusController.h"
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 660
662 void FrameView::updateLayoutAndStyleForPainting() 661 void FrameView::updateLayoutAndStyleForPainting()
663 { 662 {
664 // Updating layout can run script, which can tear down the FrameView. 663 // Updating layout can run script, which can tear down the FrameView.
665 RefPtr<FrameView> protector(this); 664 RefPtr<FrameView> protector(this);
666 665
667 updateLayoutAndStyleIfNeededRecursive(); 666 updateLayoutAndStyleIfNeededRecursive();
668 667
669 // TODO(ojan): Get rid of this and just have the LayoutClean state. 668 // TODO(ojan): Get rid of this and just have the LayoutClean state.
670 lifecycle().advanceTo(DocumentLifecycle::StyleAndLayoutClean); 669 lifecycle().advanceTo(DocumentLifecycle::StyleAndLayoutClean);
671
672 DocumentAnimations::startPendingAnimations(*m_frame->document());
673 } 670 }
674 671
675 void FrameView::updateLayoutAndStyleIfNeededRecursive() 672 void FrameView::updateLayoutAndStyleIfNeededRecursive()
676 { 673 {
677 // We have to crawl our entire tree looking for any FrameViews that need 674 // We have to crawl our entire tree looking for any FrameViews that need
678 // layout and make sure they are up to date. 675 // layout and make sure they are up to date.
679 // Mac actually tests for intersection with the dirty region and tries not t o 676 // Mac actually tests for intersection with the dirty region and tries not t o
680 // update layout for frames that are outside the dirty region. Not only doe s this seem 677 // update layout for frames that are outside the dirty region. Not only doe s this seem
681 // pointless (since those frames will have set a zero timer to layout anyway ), but 678 // pointless (since those frames will have set a zero timer to layout anyway ), but
682 // it is also incorrect, since if two frames overlap, the first could be exc luded from the dirty 679 // it is also incorrect, since if two frames overlap, the first could be exc luded from the dirty
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 totalObjects = 0; 757 totalObjects = 0;
761 758
762 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) { 759 for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
763 ++totalObjects; 760 ++totalObjects;
764 if (o->needsLayout()) 761 if (o->needsLayout())
765 ++needsLayoutObjects; 762 ++needsLayoutObjects;
766 } 763 }
767 } 764 }
768 765
769 } // namespace blink 766 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/events/TransitionEvent.idl ('k') | sky/engine/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698