Fix paint code so that overlays and views paint their own layers.

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 1980 matching lines @@
 
     PageWidgetDelegate::animate(*m_page, lastFrameTimeMonotonic);
 }
 
 void WebViewImpl::updateAllLifecyclePhases()
 {
     TRACE_EVENT0("blink", "WebViewImpl::updateAllLifecyclePhases");
     if (!mainFrameImpl())
         return;
 
-    if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled())
-        PageWidgetDelegate::updateLifecycleToCompositingCleanPlusScrolling(*m_page, *mainFrameImpl()->frame());
-    else
-        PageWidgetDelegate::updateAllLifecyclePhases(*m_page, *mainFrameImpl()->frame());
-
     updateLayerTreeBackgroundColor();
 
-    // TODO(wangxianzhu): Refactor overlay and link highlights updating and painting to make clearer
-    // dependency between web/ and core/ in synchronized painting mode.
-    if (InspectorOverlay* overlay = inspectorOverlay())
-        overlay->layout();
     for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->updateGeometry();
 
+    PageWidgetDelegate::updateAllLifecyclePhases(*m_page, *mainFrameImpl()->frame());
+
+    if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()) {

[wkorman, 2015/12/16 23:29:54]

Do things still work the old way with this flag off and the other changes in
this CL?

Maybe we can just remove the flag soon since it's on in stable?

[Xianzhu, 2015/12/16 23:45:39]

There are still several regressions. Keeping the old way can help debugging the
regressions. We can remove the flag after all regressions are fixed and no new
discovered regressions after some time.

[chrishtr, 2015/12/16 23:51:32]

I think so yes. I'll do some quick manual testing.

+        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);
+

[wkorman, 2015/12/16 23:29:54]

-1 blank

[chrishtr, 2015/12/16 23:51:33]

Fixed.

+    }
+
     if (FrameView* view = mainFrameImpl()->frameView()) {
         LocalFrame* frame = mainFrameImpl()->frame();
 
         if (m_shouldDispatchFirstVisuallyNonEmptyLayout && view->isVisuallyNonEmpty()) {
             m_shouldDispatchFirstVisuallyNonEmptyLayout = false;
             // TODO(esprehn): Move users of this callback to something
             // better, the heuristic for "visually non-empty" is bad.
             client()->didMeaningfulLayout(WebMeaningfulLayout::VisuallyNonEmpty);
         }
 
         if (m_shouldDispatchFirstLayoutAfterFinishedParsing && frame->document()->hasFinishedParsing())  {
             m_shouldDispatchFirstLayoutAfterFinishedParsing = false;
             client()->didMeaningfulLayout(WebMeaningfulLayout::FinishedParsing);
         }
 
         if (m_shouldDispatchFirstLayoutAfterFinishedLoading && frame->document()->isLoadCompleted()) {
             m_shouldDispatchFirstLayoutAfterFinishedLoading = false;
             client()->didMeaningfulLayout(WebMeaningfulLayout::FinishedLoading);
         }
     }
-
-    // TODO(wangxianzhu): Avoid traversing frame tree for phases (style, layout, etc.) that we are sure no need to update.
-    if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled())
-        PageWidgetDelegate::updateAllLifecyclePhases(*m_page, *mainFrameImpl()->frame());
 }
 
 void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect)
 {
     // This should only be used when compositing is not being used for this
     // WebView, and it is painting into the recording of its parent.
     ASSERT(!isAcceleratedCompositingActive());
 
     double paintStart = currentTime();
     PageWidgetDelegate::paint(*m_page, canvas, rect, *m_page->deprecatedLocalMainFrame());
@@ skipping 2563 matching lines @@
 void WebViewImpl::detachPaintArtifactCompositor()
 {
     if (!m_layerTreeView)
         return;
 
     m_layerTreeView->setDeferCommits(true);
     m_layerTreeView->clearRootLayer();
 }
 
 } // namespace blink