Chromium Code Reviews| Index: Source/web/WebViewImpl.cpp |
| diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp |
| index bcb4ac1e0ca3a636a7c01a796c221ed69ccdfba0..e03a2c1a3209fd852dfbc0fedf109f7d9471f78f 100644 |
| --- a/Source/web/WebViewImpl.cpp |
| +++ b/Source/web/WebViewImpl.cpp |
| @@ -119,6 +119,7 @@ |
| #include "public/web/WebAXObject.h" |
| #include "public/web/WebActiveWheelFlingParameters.h" |
| #include "public/web/WebAutofillClient.h" |
| +#include "public/web/WebBeginFrameArgs.h" |
| #include "public/web/WebFrameClient.h" |
| #include "public/web/WebHitTestResult.h" |
| #include "public/web/WebInputElement.h" |
| @@ -1700,16 +1701,13 @@ void WebViewImpl::didExitFullScreen() |
| m_fullscreenController->didExitFullScreen(); |
| } |
| -void WebViewImpl::animate(double monotonicFrameBeginTime) |
| +void WebViewImpl::beginFrame(WebBeginFrameArgs frameTime) |
| { |
| TRACE_EVENT0("blink", "WebViewImpl::animate"); |
|
Sami
2014/07/16 10:41:15
Please update this trace event too.
mithro-old
2014/07/16 14:26:49
Done.
|
| - if (!monotonicFrameBeginTime) |
| - monotonicFrameBeginTime = monotonicallyIncreasingTime(); |
| - |
| // Create synthetic wheel events as necessary for fling. |
| if (m_gestureAnimation) { |
| - if (m_gestureAnimation->animate(monotonicFrameBeginTime)) |
| + if (m_gestureAnimation->animate(frameTime.lastFrameTime)) |
| scheduleAnimation(); |
| else { |
| endActiveFlingAnimation(); |
| @@ -1726,7 +1724,7 @@ void WebViewImpl::animate(double monotonicFrameBeginTime) |
| if (!m_page) |
| return; |
| - PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime); |
| + PageWidgetDelegate::animate(m_page.get(), frameTime.lastFrameTime); |
| if (m_continuousPaintingEnabled) { |
| ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageOverlays.get()); |