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

Side by Side Diff: sky/engine/core/page/PageAnimator.cpp

Issue 1020053002: Remove pauseAnimationsForTesting (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sky/engine/config.h" 5 #include "sky/engine/config.h"
6 #include "sky/engine/core/page/PageAnimator.h" 6 #include "sky/engine/core/page/PageAnimator.h"
7 7
8 #include "sky/engine/core/animation/DocumentAnimations.h" 8 #include "sky/engine/core/animation/DocumentAnimations.h"
9 #include "sky/engine/core/dom/Document.h" 9 #include "sky/engine/core/dom/Document.h"
10 #include "sky/engine/core/frame/FrameView.h" 10 #include "sky/engine/core/frame/FrameView.h"
11 #include "sky/engine/core/frame/LocalFrame.h" 11 #include "sky/engine/core/frame/LocalFrame.h"
12 #include "sky/engine/core/page/ChromeClient.h" 12 #include "sky/engine/core/page/ChromeClient.h"
13 #include "sky/engine/core/page/Page.h" 13 #include "sky/engine/core/page/Page.h"
14 #include "sky/engine/platform/Logging.h" 14 #include "sky/engine/platform/Logging.h"
15 15
16 namespace blink { 16 namespace blink {
17 17
18 PageAnimator::PageAnimator(Page* page) 18 PageAnimator::PageAnimator(Page* page)
19 : m_page(page) 19 : m_page(page)
20 , m_servicingAnimations(false) 20 , m_servicingAnimations(false)
21 , m_updatingLayoutAndStyleForPainting(false) 21 , m_updatingLayoutAndStyleForPainting(false)
22 { 22 {
23 } 23 }
24 24
25 void PageAnimator::serviceScriptedAnimations(double monotonicAnimationStartTime) 25 void PageAnimator::serviceScriptedAnimations(double monotonicAnimationStartTime)
26 { 26 {
27 TemporaryChange<bool> servicing(m_servicingAnimations, true); 27 TemporaryChange<bool> servicing(m_servicingAnimations, true);
28 28
29 Vector<RefPtr<Document> > documents; 29 RefPtr<Document> document = m_page->mainFrame()->document();
30 documents.append(m_page->mainFrame()->document());
31 30
32 WTF_LOG(ScriptedAnimationController, "PageAnimator::serviceScriptedAnimation s: #documents = %d", 31 DocumentAnimations::updateAnimationTimingForAnimationFrame(*document, monoto nicAnimationStartTime);
33 static_cast<int>(documents.size())); 32 document->serviceScriptedAnimations(monotonicAnimationStartTime);
34
35 for (size_t i = 0; i < documents.size(); ++i)
36 DocumentAnimations::updateAnimationTimingForAnimationFrame(*documents[i] , monotonicAnimationStartTime);
37
38 for (size_t i = 0; i < documents.size(); ++i)
39 documents[i]->serviceScriptedAnimations(monotonicAnimationStartTime);
40 } 33 }
41 34
42 void PageAnimator::scheduleVisualUpdate() 35 void PageAnimator::scheduleVisualUpdate()
43 { 36 {
44 if (m_servicingAnimations || m_updatingLayoutAndStyleForPainting) 37 if (m_servicingAnimations || m_updatingLayoutAndStyleForPainting)
45 return; 38 return;
46 m_page->scheduleVisualUpdate(); 39 m_page->scheduleVisualUpdate();
47 } 40 }
48 41
49 void PageAnimator::updateLayoutAndStyleForPainting(LocalFrame* rootFrame) 42 void PageAnimator::updateLayoutAndStyleForPainting(LocalFrame* rootFrame)
50 { 43 {
51 RefPtr<FrameView> view = rootFrame->view(); 44 RefPtr<FrameView> view = rootFrame->view();
52 45
53 TemporaryChange<bool> servicing(m_updatingLayoutAndStyleForPainting, true); 46 TemporaryChange<bool> servicing(m_updatingLayoutAndStyleForPainting, true);
54 47
55 // In order for our child HWNDs (NativeWindowWidgets) to update properly, 48 // In order for our child HWNDs (NativeWindowWidgets) to update properly,
56 // they need to be told that we are updating the screen. The problem is that 49 // they need to be told that we are updating the screen. The problem is that
57 // the native widgets need to recalculate their clip region and not overlap 50 // the native widgets need to recalculate their clip region and not overlap
58 // any of our non-native widgets. To force the resizing, call 51 // any of our non-native widgets. To force the resizing, call
59 // setFrameRect(). This will be a quick operation for most frames, but the 52 // setFrameRect(). This will be a quick operation for most frames, but the
60 // NativeWindowWidgets will update a proper clipping region. 53 // NativeWindowWidgets will update a proper clipping region.
61 view->setFrameRect(view->frameRect()); 54 view->setFrameRect(view->frameRect());
62 55
63 // setFrameRect may have the side-effect of causing existing page layout to 56 // setFrameRect may have the side-effect of causing existing page layout to
64 // be invalidated, so layout needs to be called last. 57 // be invalidated, so layout needs to be called last.
65 view->updateLayoutAndStyleForPainting(); 58 view->updateLayoutAndStyleForPainting();
66 } 59 }
67 60
68 } 61 }
OLDNEW
« no previous file with comments | « sky/engine/core/animation/AnimationTimelineTest.cpp ('k') | sky/engine/public/web/WebDocument.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698