Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / page / PageAnimator.cpp

diff --git a/src/third_party/WebKit/Source/core/page/PageAnimator.cpp b/src/third_party/WebKit/Source/core/page/PageAnimator.cpp
index 8ad8967..0d429ba 100644 (file)
--- a/src/third_party/WebKit/Source/core/page/PageAnimator.cpp
+++ b/src/third_party/WebKit/Source/core/page/PageAnimator.cpp
@@ -40,7 +40,7 @@ void PageAnimator::serviceScriptedAnimations(double monotonicAnimationStartTime)
     m_animationFramePending = false;
     TemporaryChange<bool> servicing(m_servicingAnimations, true);
 
-    WillBeHeapVector<RefPtrWillBeMember<Document> > documents;
+    WillBeHeapVector<RefPtrWillBeMember<Document>> documents;
     for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->isLocalFrame())
             documents.append(toLocalFrame(frame)->document());
@@ -51,8 +51,8 @@ void PageAnimator::serviceScriptedAnimations(double monotonicAnimationStartTime)
             documents[i]->view()->serviceScrollAnimations(monotonicAnimationStartTime);
 
             if (const FrameView::ScrollableAreaSet* scrollableAreas = documents[i]->view()->scrollableAreas()) {
-                for (FrameView::ScrollableAreaSet::iterator it = scrollableAreas->begin(); it != scrollableAreas->end(); ++it)
-                    (*it)->serviceScrollAnimations(monotonicAnimationStartTime);
+                for (ScrollableArea* scrollableArea : *scrollableAreas)
+                    scrollableArea->serviceScrollAnimations(monotonicAnimationStartTime);
             }
         }
     }
@@ -76,7 +76,7 @@ void PageAnimator::scheduleVisualUpdate()
 
 void PageAnimator::updateLayoutAndStyleForPainting(LocalFrame* rootFrame)
 {
-    RefPtr<FrameView> view = rootFrame->view();
+    RefPtrWillBeRawPtr<FrameView> view = rootFrame->view();
 
     TemporaryChange<bool> servicing(m_updatingLayoutAndStyleForPainting, true);