| Index: Source/web/WebViewImpl.cpp
|
| diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
|
| index 709f1df97c0f0539ce100aadda25b7c42510709d..2dfa7e1aff181be0045126f367c1ebb98da07b07 100644
|
| --- a/Source/web/WebViewImpl.cpp
|
| +++ b/Source/web/WebViewImpl.cpp
|
| @@ -1819,7 +1819,9 @@ void WebViewImpl::beginFrame(const WebBeginFrameArgs& frameTime)
|
| if (!m_page)
|
| return;
|
|
|
| - PageWidgetDelegate::animate(m_page.get(), validFrameTime.lastFrameTimeMonotonic);
|
| + // FIXME: This should probably be using the local root?
|
| + if (m_page->mainFrame()->isLocalFrame())
|
| + PageWidgetDelegate::animate(m_page.get(), validFrameTime.lastFrameTimeMonotonic, m_page->deprecatedLocalMainFrame());
|
|
|
| if (m_continuousPaintingEnabled) {
|
| ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageOverlays.get());
|
| @@ -1855,7 +1857,7 @@ void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect)
|
| ASSERT(!isAcceleratedCompositingActive());
|
|
|
| double paintStart = currentTime();
|
| - PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque);
|
| + PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque, m_page->deprecatedLocalMainFrame());
|
| double paintEnd = currentTime();
|
| double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart);
|
| Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
|
| @@ -1874,7 +1876,7 @@ void WebViewImpl::paintCompositedDeprecated(WebCanvas* canvas, const WebRect& re
|
| PaintBehavior oldPaintBehavior = view->paintBehavior();
|
| view->setPaintBehavior(oldPaintBehavior | PaintBehaviorFlattenCompositingLayers);
|
|
|
| - PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque);
|
| + PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque, m_page->deprecatedLocalMainFrame());
|
|
|
| view->setPaintBehavior(oldPaintBehavior);
|
| }
|
| @@ -2065,7 +2067,7 @@ bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
|
| return true;
|
| }
|
|
|
| - return PageWidgetDelegate::handleInputEvent(m_page.get(), *this, inputEvent);
|
| + return PageWidgetDelegate::handleInputEvent(m_page.get(), *this, inputEvent, m_page->deprecatedLocalMainFrame());
|
| }
|
|
|
| void WebViewImpl::setCursorVisibilityState(bool isVisible)
|
|
|