Switch the page-capturing machinery to use the new hooks.

third_party/WebKit/public/web/WebWidgetClient.h

Index: third_party/WebKit/public/web/WebWidgetClient.h
diff --git a/third_party/WebKit/public/web/WebWidgetClient.h b/third_party/WebKit/public/web/WebWidgetClient.h
index c1ce416eb6c0355249171c581bc26725f8459619..8a937cfa5638a2d493d67d4c892a607bc291ef30 100644
--- a/third_party/WebKit/public/web/WebWidgetClient.h
+++ b/third_party/WebKit/public/web/WebWidgetClient.h
@@ -37,6 +37,7 @@
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebScreenInfo.h"
+#include "public/web/WebMeaningfulLayout.h"
 #include "public/web/WebTouchAction.h"
 
 namespace blink {
@@ -78,17 +79,10 @@ public:
     // Called when a call to WebWidget::animate is required
     virtual void scheduleAnimation() { }
 
-    // Called when one of the following things were involved during the layout:
-    // * > 200 text characters
-    // * > 1024 image pixels
-    // * a plugin
-    // * a canvas
-    // An approximation for first layout that resulted in pixels on screen.
-    // Not the best heuristic, and we should replace it with something better.
-    virtual void didFirstVisuallyNonEmptyLayout() { }
-
-    // The frame's document first layout immediately after the parsing finished.
-    // Another way to put it: first frame produced after DOMContentLoaded was dispatched.
+    // Called immediately following the first compositor-driven (frame-generating) layout that
+    // happened after an interesting document lifecyle change (see WebMeaningfulLayout for details.)
+    virtual void didMeaningfulLayout(WebMeaningfulLayout) {}
+
     virtual void didFirstLayoutAfterFinishedParsing() { }
 
     // Called when the widget acquires or loses focus, respectively.