[PageLoadMetrics] Keep track of Ad Sizes on Pages

chrome/browser/page_load_metrics/page_load_metrics_observer.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_METRICS_OBSERVER_H_
 #define CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_METRICS_OBSERVER_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "chrome/common/page_load_metrics/page_load_timing.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/resource_type.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "url/gurl.h"
 
 namespace page_load_metrics {
 
 // This enum represents how a page load ends. If the action occurs before the
 // page load finishes (or reaches some point like first paint), then we consider
 // the load to be aborted.
 enum PageEndReason {
   // Page lifetime has not yet ended (page is still active).
@@ skipping 165 matching lines @@
   // Extra information supplied to the page load metrics system from the
   // renderer for the main frame.
   const PageLoadMetadata main_frame_metadata;
 
   // PageLoadMetadata for child frames of the current page load.
   const PageLoadMetadata child_frame_metadata;
 };
 
 // Container for various information about a request within a page load.
 struct ExtraRequestInfo {
-  ExtraRequestInfo(bool was_cached,
+  ExtraRequestInfo(const GURL& url,
+                   int frame_tree_node_id,
+                   bool was_cached,
                    int64_t raw_body_bytes,
                    bool data_reduction_proxy_used,
                    int64_t original_network_content_length);
 
   ExtraRequestInfo(const ExtraRequestInfo& other);
 
   ~ExtraRequestInfo();
 
+  // The URL for the request.
+  GURL url;
+
+  // The frame tree node id that initiated the request.
+  int frame_tree_node_id;
+
   // True if the resource was loaded from cache.
   const bool was_cached;
 
   // The number of body (not header) prefilter bytes.
   const int64_t raw_body_bytes;
 
   // Whether this request used Data Reduction Proxy.
   const bool data_reduction_proxy_used;
 
   // The number of body (not header) bytes that the data reduction proxy saw
@@ skipping 35 matching lines @@
       content::NavigationHandle* navigation_handle);
 
   // OnCommit is triggered when a page load commits, i.e. when we receive the
   // first data for the request. The navigation handle holds relevant data for
   // the navigation, but will be destroyed soon after this call. Don't hold a
   // reference to it.
   // Observers that return STOP_OBSERVING will not receive any additional
   // callbacks, and will be deleted after invocation of this method returns.
   virtual ObservePolicy OnCommit(content::NavigationHandle* navigation_handle);
 
+  // OnCommitSubFrame is triggered when the a sub-frame of the committed page
+  // is committed. The navigation handle holds relevant data for the
+  // navigation, but will be destroyed soon after this call. Don't hold a
+  // reference to it.
+  // Unlike the main frame, OnCommitSubFrame does not filter by
+  // PageTrackDecider::ShouldTrack. This means that data URIs, network error
+  // pages, and non-html documents will result in OnCommitSubFrame being
+  // called.
+  virtual ObservePolicy OnCommitSubFrame(

[Bryan McQuade, 2017/04/13 19:21:27]

i dont see a strong reason that observers might want to stop observing for a
certain subframe commit, so i'm inclined to have this return void for now. how
does that sound?

[Bryan McQuade, 2017/04/14 19:19:23]

looks like this comment might've gotten lost (or i might've just missed your
reply - sorry if that's the case). just wanted to re-ping to make sure you see
it.

[jkarlin, 2017/04/24 17:27:58]

Sorry, I did miss it. Thanks for pointing it out again.

I originally wrote it to return void but INVOKE_AND_PRUNE_OBSERVERS requires an
ObservePolicy, so I figured it didn't hurt to leave it.

+      content::NavigationHandle* navigation_handle);
+
   // OnHidden is triggered when a page leaves the foreground. It does not fire
   // when a foreground page is permanently closed; for that, listen to
   // OnComplete instead.
   virtual ObservePolicy OnHidden(const PageLoadTiming& timing,
                                  const PageLoadExtraInfo& extra_info);
 
   // OnShown is triggered when a page is brought to the foreground. It does not
   // fire when the page first loads; for that, listen for OnStart instead.
   virtual ObservePolicy OnShown();
 
@@ skipping 95 matching lines @@
       const FailedProvisionalLoadInfo& failed_provisional_load_info,
       const PageLoadExtraInfo& extra_info) {}
 
   // Called whenever a request is loaded for this page load.
   virtual void OnLoadedResource(const ExtraRequestInfo& extra_request_info) {}
 };
 
 }  // namespace page_load_metrics
 
 #endif  // CHROME_BROWSER_PAGE_LOAD_METRICS_PAGE_LOAD_METRICS_OBSERVER_H_