| Index: Source/web/WebPagePopupImpl.cpp
|
| diff --git a/Source/web/WebPagePopupImpl.cpp b/Source/web/WebPagePopupImpl.cpp
|
| index 0d3cb7acc7713fbb79f6a1be9e2893df4e996de2..48e8d706d6eb88c84e6e2699ddaf7ea2809c3416 100644
|
| --- a/Source/web/WebPagePopupImpl.cpp
|
| +++ b/Source/web/WebPagePopupImpl.cpp
|
| @@ -43,6 +43,7 @@
|
| #include "core/page/FocusController.h"
|
| #include "core/page/Page.h"
|
| #include "core/page/PagePopupClient.h"
|
| +#include "platform/LayoutTestSupport.h"
|
| #include "platform/TraceEvent.h"
|
| #include "platform/heap/Handle.h"
|
| #include "public/platform/WebCompositeAndReadbackAsyncCallback.h"
|
| @@ -114,12 +115,16 @@ private:
|
|
|
| virtual void scheduleAnimation() OVERRIDE
|
| {
|
| + // Calling scheduleAnimation on m_webView so WebTestProxy will call beginFrame.
|
| + if (LayoutTestSupport::isRunningLayoutTest())
|
| + m_popup->m_webView->scheduleAnimation();
|
| +
|
| if (m_popup->isAcceleratedCompositingActive()) {
|
| ASSERT(m_popup->m_layerTreeView);
|
| m_popup->m_layerTreeView->setNeedsAnimate();
|
| return;
|
| }
|
| - m_popup->widgetClient()->scheduleAnimation();
|
| + m_popup->m_widgetClient->scheduleAnimation();
|
| }
|
|
|
| virtual WebScreenInfo screenInfo() const OVERRIDE
|
| @@ -426,6 +431,11 @@ void WebPagePopupImpl::closePopup()
|
| m_popupClient->didClosePopup();
|
| }
|
|
|
| +LocalDOMWindow* WebPagePopupImpl::window()
|
| +{
|
| + return m_page->mainFrame()->domWindow();
|
| +}
|
| +
|
| void WebPagePopupImpl::compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback* callback)
|
| {
|
| ASSERT(isAcceleratedCompositingActive());
|
|
|