Defer ChromeClient::attachRootGraphicsLayer until after compositing update.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 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 343 matching lines @@
       m_maximumLegibleScale(1),
       m_doubleTapZoomPageScaleFactor(0),
       m_doubleTapZoomPending(false),
       m_enableFakePageScaleAnimationForTesting(false),
       m_fakePageScaleAnimationPageScaleFactor(0),
       m_fakePageScaleAnimationUseAnchor(false),
       m_compositorDeviceScaleFactorOverride(0),
       m_suppressNextKeypressEvent(false),
       m_imeAcceptEvents(true),
       m_devToolsEmulator(nullptr),
+      m_needsUpdatePageOverlays(false),
       m_isTransparent(false),
       m_tabsToLinks(false),
       m_layerTreeView(nullptr),
       m_rootLayer(nullptr),
       m_rootGraphicsLayer(nullptr),
       m_visualViewportContainerLayer(nullptr),
       m_matchesHeuristicsForGpuRasterization(false),
       m_flingModifier(0),
       m_flingSourceDevice(WebGestureDeviceUninitialized),
       m_fullscreenController(FullscreenController::create(this)),
@@ skipping 1616 matching lines @@
   if (!mainFrameImpl())
     return;
 
   DocumentLifecycle::AllowThrottlingScope throttlingScope(
       mainFrameImpl()->frame()->document()->lifecycle());
   updateLayerTreeBackgroundColor();
 
   PageWidgetDelegate::updateAllLifecyclePhases(*m_page,
                                                *mainFrameImpl()->frame());
 
+  // This needs to run after the compositing update.
+  updatePageOverlays();

[bokan, 2017/03/06 16:17:18]

I think there's ways for compositing to be run without going through
WVI::updateAllLifecyclePhases, e.g
FrameView::updateLifecycleToCompositingCleanPlusScrolling is called from
GestureManager::handleGestureTap, is that ok?

[skobes, 2017/03/06 22:44:23]

Done, although doing this from WebViewImpl::layoutUpdated hits a re-entrancy
assertion in FrameView::updateLifecyclePhasesInternal.

It looks like it's sufficient to call it only from setPageOverlayColor, since
this ensures subsequent invocations of PageOverlay::update will see the root
GraphicsLayer.

   if (InspectorOverlay* overlay = inspectorOverlay()) {
     overlay->updateAllLifecyclePhases();
     // TODO(chrishtr): integrate paint into the overlay's lifecycle.
     if (overlay->pageOverlay() && overlay->pageOverlay()->graphicsLayer())
       overlay->pageOverlay()->graphicsLayer()->paint(nullptr);
   }
   if (m_pageColorOverlay)
     m_pageColorOverlay->graphicsLayer()->paint(nullptr);
 
   // TODO(chrishtr): link highlights don't currently paint themselves, it's
@@ skipping 1665 matching lines @@
 
   FrameView* view = webframe->frame()->view();
 
   postLayoutResize(webframe);
 
   // Relayout immediately to avoid violating the rule that needsLayout()
   // isn't set at the end of a layout.
   if (view->needsLayout())
     view->layout();
 
-  updatePageOverlays();
+  m_needsUpdatePageOverlays = true;
 
   m_fullscreenController->didUpdateLayout();
   m_client->didUpdateLayout();
 }
 
 void WebViewImpl::didChangeContentsSize() {
   pageScaleConstraintsSet().didChangeContentsSize(contentsSize(),
                                                   pageScaleFactor());
 }
 
@@ skipping 24 matching lines @@
 
 void WebViewImpl::setPageOverlayColor(WebColor color) {
   if (m_pageColorOverlay)
     m_pageColorOverlay.reset();
 
   if (color == Color::transparent)
     return;
 
   m_pageColorOverlay = PageOverlay::create(
       mainFrameImpl(), WTF::makeUnique<ColorOverlay>(color));
-  m_pageColorOverlay->update();
+  m_needsUpdatePageOverlays = true;
 }
 
 WebPageImportanceSignals* WebViewImpl::pageImportanceSignals() {
   return &m_pageImportanceSignals;
 }
 
 Element* WebViewImpl::focusedElement() const {
   LocalFrame* frame = m_page->focusController().focusedFrame();
   if (!frame)
     return nullptr;
@@ skipping 391 matching lines @@
 
 CompositorWorkerProxyClient* WebViewImpl::createCompositorWorkerProxyClient() {
   return new CompositorWorkerProxyClientImpl(&mutator());
 }
 
 AnimationWorkletProxyClient* WebViewImpl::createAnimationWorkletProxyClient() {
   return new AnimationWorkletProxyClientImpl(&mutator());
 }
 
 void WebViewImpl::updatePageOverlays() {
-  if (m_pageColorOverlay)
-    m_pageColorOverlay->update();
-  if (InspectorOverlay* overlay = inspectorOverlay()) {
-    PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
-    if (inspectorPageOverlay)
-      inspectorPageOverlay->update();
+  if (m_needsUpdatePageOverlays) {
+    if (m_pageColorOverlay)
+      m_pageColorOverlay->update();
+    if (InspectorOverlay* overlay = inspectorOverlay()) {
+      PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
+      if (inspectorPageOverlay)
+        inspectorPageOverlay->update();
+    }
+    m_needsUpdatePageOverlays = false;
   }
 }
 
 float WebViewImpl::deviceScaleFactor() const {
   // TODO(oshima): Investigate if this should return the ScreenInfo's scale
   // factor rather than page's scale factor, which can be 1 in use-zoom-for-dsf
   // mode.
   if (!page())
     return 1;
 
   return page()->deviceScaleFactorDeprecated();
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameInWidget() const {
   if (!mainFrameImpl())
     return nullptr;
 
   LocalFrame* focusedFrame = toLocalFrame(focusedCoreFrame());
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink