Organize Layout/Paint-related hooks (blink-side).

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 1889 matching lines @@
     for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->updateGeometry();
 
     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.
-            // TODO(dglazkov): This should likely be a WebViewClient API.
+            // TODO(dglazkov): Remove this line after https://codereview.chromium.org/1319073003 lands.
             frame->loader().client()->dispatchDidFirstVisuallyNonEmptyLayout();
+            client()->didFirstVisuallyNonEmptyLayout();
         }
 
         if (m_shouldDispatchFirstLayoutAfterFinishedParsing && frame->document()->hasFinishedParsing())  {
             m_shouldDispatchFirstLayoutAfterFinishedParsing = false;
             client()->didFirstLayoutAfterFinishedParsing();
         }
     }
 }
 
 void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect)
@@ skipping 2504 matching lines @@
     if (m_pageColorOverlay)
         m_pageColorOverlay->update();
     if (InspectorOverlayImpl* overlay = inspectorOverlay()) {
         PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
         if (inspectorPageOverlay)
             inspectorPageOverlay->update();
     }
 }
 
 } // namespace blink