| OLD | NEW |
| 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 "core/page/PageAnimator.h" | 5 #include "core/page/PageAnimator.h" |
| 6 | 6 |
| 7 #include "core/animation/DocumentAnimations.h" | 7 #include "core/animation/DocumentAnimations.h" |
| 8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" |
| 9 #include "core/frame/LocalFrame.h" | 9 #include "core/frame/LocalFrame.h" |
| 10 #include "core/page/ChromeClient.h" | 10 #include "core/page/ChromeClient.h" |
| 11 #include "core/page/Page.h" | 11 #include "core/page/Page.h" |
| 12 #include "core/svg/SVGDocumentExtensions.h" | 12 #include "core/svg/SVGDocumentExtensions.h" |
| 13 #include "platform/Logging.h" | 13 #include "platform/Logging.h" |
| 14 #include "wtf/AutoReset.h" |
| 14 | 15 |
| 15 namespace blink { | 16 namespace blink { |
| 16 | 17 |
| 17 PageAnimator::PageAnimator(Page& page) | 18 PageAnimator::PageAnimator(Page& page) |
| 18 : m_page(page) | 19 : m_page(page) |
| 19 , m_servicingAnimations(false) | 20 , m_servicingAnimations(false) |
| 20 , m_updatingLayoutAndStyleForPainting(false) | 21 , m_updatingLayoutAndStyleForPainting(false) |
| 21 { | 22 { |
| 22 } | 23 } |
| 23 | 24 |
| 24 PageAnimator* PageAnimator::create(Page& page) | 25 PageAnimator* PageAnimator::create(Page& page) |
| 25 { | 26 { |
| 26 return new PageAnimator(page); | 27 return new PageAnimator(page); |
| 27 } | 28 } |
| 28 | 29 |
| 29 DEFINE_TRACE(PageAnimator) | 30 DEFINE_TRACE(PageAnimator) |
| 30 { | 31 { |
| 31 visitor->trace(m_page); | 32 visitor->trace(m_page); |
| 32 } | 33 } |
| 33 | 34 |
| 34 void PageAnimator::serviceScriptedAnimations(double monotonicAnimationStartTime) | 35 void PageAnimator::serviceScriptedAnimations(double monotonicAnimationStartTime) |
| 35 { | 36 { |
| 36 TemporaryChange<bool> servicing(m_servicingAnimations, true); | 37 AutoReset<bool> servicing(&m_servicingAnimations, true); |
| 37 clock().updateTime(monotonicAnimationStartTime); | 38 clock().updateTime(monotonicAnimationStartTime); |
| 38 | 39 |
| 39 HeapVector<Member<Document>, 32> documents; | 40 HeapVector<Member<Document>, 32> documents; |
| 40 for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traver
seNext()) { | 41 for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traver
seNext()) { |
| 41 if (frame->isLocalFrame()) | 42 if (frame->isLocalFrame()) |
| 42 documents.append(toLocalFrame(frame)->document()); | 43 documents.append(toLocalFrame(frame)->document()); |
| 43 } | 44 } |
| 44 | 45 |
| 45 for (auto& document : documents) { | 46 for (auto& document : documents) { |
| 46 ScopedFrameBlamer frameBlamer(document->frame()); | 47 ScopedFrameBlamer frameBlamer(document->frame()); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 74 void PageAnimator::scheduleVisualUpdate(LocalFrame* frame) | 75 void PageAnimator::scheduleVisualUpdate(LocalFrame* frame) |
| 75 { | 76 { |
| 76 if (m_servicingAnimations || m_updatingLayoutAndStyleForPainting) | 77 if (m_servicingAnimations || m_updatingLayoutAndStyleForPainting) |
| 77 return; | 78 return; |
| 78 m_page->chromeClient().scheduleAnimation(frame->view()); | 79 m_page->chromeClient().scheduleAnimation(frame->view()); |
| 79 } | 80 } |
| 80 | 81 |
| 81 void PageAnimator::updateAllLifecyclePhases(LocalFrame& rootFrame) | 82 void PageAnimator::updateAllLifecyclePhases(LocalFrame& rootFrame) |
| 82 { | 83 { |
| 83 FrameView* view = rootFrame.view(); | 84 FrameView* view = rootFrame.view(); |
| 84 TemporaryChange<bool> servicing(m_updatingLayoutAndStyleForPainting, true); | 85 AutoReset<bool> servicing(&m_updatingLayoutAndStyleForPainting, true); |
| 85 view->updateAllLifecyclePhases(); | 86 view->updateAllLifecyclePhases(); |
| 86 } | 87 } |
| 87 | 88 |
| 88 } // namespace blink | 89 } // namespace blink |
| OLD | NEW |