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 "config.h" | 5 #include "config.h" |
6 #include "core/page/PageAnimator.h" | 6 #include "core/page/PageAnimator.h" |
7 | 7 |
8 #include "core/animation/DocumentAnimations.h" | 8 #include "core/animation/DocumentAnimations.h" |
9 #include "core/dom/Document.h" | 9 #include "core/dom/Document.h" |
10 #include "core/frame/FrameView.h" | 10 #include "core/frame/FrameView.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 TemporaryChange<bool> servicing(m_servicingAnimations, true); | 30 TemporaryChange<bool> servicing(m_servicingAnimations, true); |
31 | 31 |
32 WillBeHeapVector<RefPtrWillBeMember<Document> > documents; | 32 WillBeHeapVector<RefPtrWillBeMember<Document> > documents; |
33 for (RefPtr<Frame> frame = m_page->mainFrame(); frame; frame = frame->tree()
.traverseNext()) { | 33 for (RefPtr<Frame> frame = m_page->mainFrame(); frame; frame = frame->tree()
.traverseNext()) { |
34 if (frame->isLocalFrame()) | 34 if (frame->isLocalFrame()) |
35 documents.append(toLocalFrame(frame.get())->document()); | 35 documents.append(toLocalFrame(frame.get())->document()); |
36 } | 36 } |
37 | 37 |
38 for (size_t i = 0; i < documents.size(); ++i) { | 38 for (size_t i = 0; i < documents.size(); ++i) { |
39 if (documents[i]->frame()) { | 39 if (documents[i]->frame()) { |
40 documents[i]->view()->serviceScrollAnimations(); | 40 documents[i]->view()->serviceScrollbarAnimations(); |
41 | 41 |
42 if (const FrameView::ScrollableAreaSet* scrollableAreas = documents[
i]->view()->scrollableAreas()) { | 42 if (const FrameView::ScrollableAreaSet* scrollableAreas = documents[
i]->view()->scrollableAreas()) { |
43 for (FrameView::ScrollableAreaSet::iterator it = scrollableAreas
->begin(); it != scrollableAreas->end(); ++it) | 43 for (FrameView::ScrollableAreaSet::iterator it = scrollableAreas
->begin(); it != scrollableAreas->end(); ++it) |
44 (*it)->serviceScrollAnimations(); | 44 (*it)->serviceScrollbarAnimations(); |
45 } | 45 } |
46 } | 46 } |
47 } | 47 } |
48 | 48 |
49 for (size_t i = 0; i < documents.size(); ++i) { | 49 for (size_t i = 0; i < documents.size(); ++i) { |
50 DocumentAnimations::updateAnimationTimingForAnimationFrame(*documents[i]
, monotonicAnimationStartTime); | 50 DocumentAnimations::updateAnimationTimingForAnimationFrame(*documents[i]
, monotonicAnimationStartTime); |
51 SVGDocumentExtensions::serviceOnAnimationFrame(*documents[i], monotonicA
nimationStartTime); | 51 SVGDocumentExtensions::serviceOnAnimationFrame(*documents[i], monotonicA
nimationStartTime); |
52 } | 52 } |
53 | 53 |
54 for (size_t i = 0; i < documents.size(); ++i) | 54 for (size_t i = 0; i < documents.size(); ++i) |
(...skipping 21 matching lines...) Expand all Loading... |
76 // setFrameRect(). This will be a quick operation for most frames, but the | 76 // setFrameRect(). This will be a quick operation for most frames, but the |
77 // NativeWindowWidgets will update a proper clipping region. | 77 // NativeWindowWidgets will update a proper clipping region. |
78 view->setFrameRect(view->frameRect()); | 78 view->setFrameRect(view->frameRect()); |
79 | 79 |
80 // setFrameRect may have the side-effect of causing existing page layout to | 80 // setFrameRect may have the side-effect of causing existing page layout to |
81 // be invalidated, so layout needs to be called last. | 81 // be invalidated, so layout needs to be called last. |
82 view->updateLayoutAndStyleForPainting(); | 82 view->updateLayoutAndStyleForPainting(); |
83 } | 83 } |
84 | 84 |
85 } | 85 } |
OLD | NEW |