Move didMeaningfulLayout calls from WebViewClient to WebWidgetClient.

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 2008 matching lines @@
     if (m_pageColorOverlay)
         m_pageColorOverlay->graphicsLayer()->paint(nullptr);
 
     // TODO(chrishtr): link highlights don't currently paint themselves, it's still driven by cc.
     // Fix this.
     for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->updateGeometry();
 
     if (FrameView* view = mainFrameImpl()->frameView()) {
         LocalFrame* frame = mainFrameImpl()->frame();
+        WebWidgetClient* client = WebLocalFrameImpl::fromFrame(frame)->frameWidget()->client();

[dcheng, 2016/07/07 01:54:56]

Hmm, does this entire function need to move to WebFrameWidget eventually?

[lfg, 2016/07/07 14:27:46]

Yes, but we'll also need to do some stuff in FrameLoaderClientImpl to track the
loads per local root, since for now only the webview is notified.

 
         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);
+            client->didMeaningfulLayout(WebMeaningfulLayout::VisuallyNonEmpty);
         }
 
         if (m_shouldDispatchFirstLayoutAfterFinishedParsing && frame->document()->hasFinishedParsing())  {
             m_shouldDispatchFirstLayoutAfterFinishedParsing = false;
-            client()->didMeaningfulLayout(WebMeaningfulLayout::FinishedParsing);
+            client->didMeaningfulLayout(WebMeaningfulLayout::FinishedParsing);
         }
 
         if (m_shouldDispatchFirstLayoutAfterFinishedLoading && frame->document()->isLoadCompleted()) {
             m_shouldDispatchFirstLayoutAfterFinishedLoading = false;
-            client()->didMeaningfulLayout(WebMeaningfulLayout::FinishedLoading);
+            client->didMeaningfulLayout(WebMeaningfulLayout::FinishedLoading);
         }
     }
 }
 
 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.
     DCHECK(!isAcceleratedCompositingActive());
 
@@ skipping 2478 matching lines @@
 {
     // 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()->deviceScaleFactor();
 }
 
 } // namespace blink