Let PagePopupChromeClient schedule frames before attachRootGraphicsLayer.

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 111 matching lines @@
     if (!paintRect.isEmpty())
       m_popup->widgetClient()->didInvalidateRect(paintRect);
   }
 
   void scheduleAnimation(FrameViewBase*) override {
     // Calling scheduleAnimation on m_webView so WebViewTestProxy will call
     // beginFrame.
     if (LayoutTestSupport::isRunningLayoutTest())
       m_popup->m_webView->mainFrameImpl()->frameWidget()->scheduleAnimation();
 
-    if (m_popup->isAcceleratedCompositingActive()) {
-      DCHECK(m_popup->m_layerTreeView);
+    if (m_popup->m_layerTreeView) {
       m_popup->m_layerTreeView->setNeedsBeginFrame();
       return;
     }
     m_popup->m_widgetClient->scheduleAnimation();
   }
 
   void attachCompositorAnimationTimeline(CompositorAnimationTimeline* timeline,
                                          LocalFrame*) override {
     if (m_popup->m_animationHost)
       m_popup->m_animationHost->addTimeline(*timeline);
@@ skipping 174 matching lines @@
   frame->view()->setTransparent(false);
   if (AXObjectCache* cache =
           m_popupClient->ownerElement().document().existingAXObjectCache())
     cache->childrenChanged(&m_popupClient->ownerElement());
 
   DCHECK(frame->domWindow());
   PagePopupSupplement::install(*frame, *this, m_popupClient);
   DCHECK_EQ(m_popupClient->ownerElement().document().existingAXObjectCache(),
             frame->document()->existingAXObjectCache());
 
+  initializeLayerTreeView();
+
   RefPtr<SharedBuffer> data = SharedBuffer::create();
   m_popupClient->writeDocument(data.get());
   frame->setPageZoomFactor(m_popupClient->zoomFactor());
   frame->loader().load(FrameLoadRequest(
       0, blankURL(), SubstituteData(data, "text/html", "UTF-8", KURL(),
                                     ForceSynchronousLoad)));
   return true;
 }
 
 void WebPagePopupImpl::postMessage(const String& message) {
@@ skipping 25 matching lines @@
 }
 
 void WebPagePopupImpl::setWindowRect(const IntRect& rectInScreen) {
   widgetClient()->setWindowRect(rectInScreen);
 }
 
 void WebPagePopupImpl::setRootGraphicsLayer(GraphicsLayer* layer) {
   m_rootGraphicsLayer = layer;
   m_rootLayer = layer ? layer->platformLayer() : 0;
 
-  setIsAcceleratedCompositingActive(layer);
+  m_isAcceleratedCompositingActive = !!layer;
   if (m_layerTreeView) {
     if (m_rootLayer) {
       m_layerTreeView->setRootLayer(*m_rootLayer);
     } else {
       m_layerTreeView->clearRootLayer();
     }
   }
 }
 
-void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter) {
-  if (m_isAcceleratedCompositingActive == enter)
-    return;
-
-  if (!enter) {
-    m_isAcceleratedCompositingActive = false;
-  } else if (m_layerTreeView) {
-    m_isAcceleratedCompositingActive = true;
+void WebPagePopupImpl::initializeLayerTreeView() {
+  TRACE_EVENT0("blink", "WebPagePopupImpl::initializeLayerTreeView");
+  m_layerTreeView = m_widgetClient->initializeLayerTreeView();
+  if (m_layerTreeView) {
+    m_layerTreeView->setVisible(true);
+    m_animationHost = WTF::makeUnique<CompositorAnimationHost>(
+        m_layerTreeView->compositorAnimationHost());
+    m_page->layerTreeViewInitialized(*m_layerTreeView, nullptr);
   } else {
-    TRACE_EVENT0("blink",
-                 "WebPagePopupImpl::setIsAcceleratedCompositingActive(true)");
-
-    m_layerTreeView = m_widgetClient->initializeLayerTreeView();
-    if (m_layerTreeView) {
-      m_layerTreeView->setVisible(true);
-      m_isAcceleratedCompositingActive = true;
-      m_animationHost = WTF::makeUnique<CompositorAnimationHost>(
-          m_layerTreeView->compositorAnimationHost());
-      m_page->layerTreeViewInitialized(*m_layerTreeView, nullptr);
-    } else {
-      m_isAcceleratedCompositingActive = false;
-      m_animationHost = nullptr;
-    }
+    m_animationHost = nullptr;
   }
 }
 
 void WebPagePopupImpl::beginFrame(double lastFrameTimeMonotonic) {
   if (!m_page)
     return;
   // FIXME: This should use lastFrameTimeMonotonic but doing so
   // breaks tests.
   PageWidgetDelegate::animate(*m_page, monotonicallyIncreasingTime());
 }
 
 void WebPagePopupImpl::willCloseLayerTreeView() {
   if (m_page && m_layerTreeView)
     m_page->willCloseLayerTreeView(*m_layerTreeView, nullptr);
 
-  setIsAcceleratedCompositingActive(false);
+  m_isAcceleratedCompositingActive = false;
   m_layerTreeView = nullptr;
   m_animationHost = nullptr;
 }
 
 void WebPagePopupImpl::updateAllLifecyclePhases() {
   if (!m_page)
     return;
   PageWidgetDelegate::updateAllLifecyclePhases(
       *m_page, *m_page->deprecatedLocalMainFrame());
 }
@@ skipping 169 matching lines @@
   // A WebPagePopupImpl instance usually has two references.
   //  - One owned by the instance itself. It represents the visible widget.
   //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
   //    WebPagePopupImpl to close.
   // We need them because the closing operation is asynchronous and the widget
   // can be closed while the WebViewImpl is unaware of it.
   return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 }  // namespace blink