Commit 4a2e9a72 authored by Jihwan Marc Kim's avatar Jihwan Marc Kim Committed by Commit Bot

Remove AdFrameSizeIntervention metrics and code

No longer pursuing an intervention with the 1050 KB threshold.
Remove the associated metrics and code.

Bug: 962616
Change-Id: Id4e199dfc398b10121d4bbcea3102e94d0af4a3c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1686971Reviewed-by: default avatarIlya Sherman <isherman@chromium.org>
Reviewed-by: default avatarJohn Delaney <johnidel@chromium.org>
Commit-Queue: John Delaney <johnidel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680003}
parent 95be20ea
...@@ -54,14 +54,6 @@ content::RenderFrameHost* FindFrameMaybeUnsafe( ...@@ -54,14 +54,6 @@ content::RenderFrameHost* FindFrameMaybeUnsafe(
handle->GetFrameTreeNodeId()); handle->GetFrameTreeNodeId());
} }
void RecordSingleFeatureUsage(content::RenderFrameHost* rfh,
blink::mojom::WebFeature web_feature) {
page_load_metrics::mojom::PageLoadFeatures page_load_features(
{web_feature}, {} /* css_properties */, {} /* animated_css_properties */);
page_load_metrics::MetricsWebContentsObserver::RecordFeatureUsage(
rfh, page_load_features);
}
using ResourceMimeType = AdsPageLoadMetricsObserver::ResourceMimeType; using ResourceMimeType = AdsPageLoadMetricsObserver::ResourceMimeType;
} // namespace } // namespace
...@@ -517,13 +509,6 @@ void AdsPageLoadMetricsObserver::ProcessResourceForFrame( ...@@ -517,13 +509,6 @@ void AdsPageLoadMetricsObserver::ProcessResourceForFrame(
resource, process_id, GetDelegate()->GetResourceTracker()); resource, process_id, GetDelegate()->GetResourceTracker());
if (unaccounted_ad_bytes) if (unaccounted_ad_bytes)
ancestor_data->AdjustAdBytes(unaccounted_ad_bytes, mime_type); ancestor_data->AdjustAdBytes(unaccounted_ad_bytes, mime_type);
if (ancestor_data->size_intervention_status() ==
FrameData::FrameSizeInterventionStatus::kTriggered) {
RecordSingleFeatureUsage(
GetDelegate()->GetWebContents()->GetMainFrame(),
blink::mojom::WebFeature::kAdFrameSizeIntervention);
}
} }
void AdsPageLoadMetricsObserver::RecordAdFrameUkm(ukm::SourceId source_id) { void AdsPageLoadMetricsObserver::RecordAdFrameUkm(ukm::SourceId source_id) {
...@@ -805,16 +790,6 @@ void AdsPageLoadMetricsObserver::RecordPerFrameHistogramsForAdTagging( ...@@ -805,16 +790,6 @@ void AdsPageLoadMetricsObserver::RecordPerFrameHistogramsForAdTagging(
UMA_HISTOGRAM_COUNTS_10000, visibility, UMA_HISTOGRAM_COUNTS_10000, visibility,
std::min(ad_frame_data.frame_size().width(), std::min(ad_frame_data.frame_size().width(),
ad_frame_data.frame_size().height())); ad_frame_data.frame_size().height()));
ADS_HISTOGRAM("FrameCounts.AdFrames.PerFrame.SizeIntervention",
UMA_HISTOGRAM_ENUMERATION, visibility,
ad_frame_data.size_intervention_status());
if (ad_frame_data.size_intervention_status() ==
FrameData::FrameSizeInterventionStatus::kTriggered) {
ADS_HISTOGRAM(
"FrameCounts.AdFrames.PerFrame.SizeIntervention.MediaStatus",
UMA_HISTOGRAM_ENUMERATION, visibility, ad_frame_data.media_status());
}
ADS_HISTOGRAM("Bytes.AdFrames.PerFrame.Total", PAGE_BYTES_HISTOGRAM, ADS_HISTOGRAM("Bytes.AdFrames.PerFrame.Total", PAGE_BYTES_HISTOGRAM,
visibility, ad_frame_data.bytes()); visibility, ad_frame_data.bytes());
......
...@@ -63,8 +63,7 @@ FrameData::FrameData(FrameTreeNodeId frame_tree_node_id) ...@@ -63,8 +63,7 @@ FrameData::FrameData(FrameTreeNodeId frame_tree_node_id)
user_activation_status_(UserActivationStatus::kNoActivation), user_activation_status_(UserActivationStatus::kNoActivation),
is_display_none_(false), is_display_none_(false),
visibility_(FrameVisibility::kVisible), visibility_(FrameVisibility::kVisible),
frame_size_(gfx::Size()), frame_size_(gfx::Size()) {}
size_intervention_status_(FrameSizeInterventionStatus::kNone) {}
FrameData::~FrameData() = default; FrameData::~FrameData() = default;
...@@ -118,11 +117,6 @@ void FrameData::ProcessResourceLoadInFrame( ...@@ -118,11 +117,6 @@ void FrameData::ProcessResourceLoadInFrame(
same_origin_bytes_ += resource->encoded_body_length; same_origin_bytes_ += resource->encoded_body_length;
} }
if (bytes_ > kFrameSizeInterventionByteThreshold &&
user_activation_status_ == UserActivationStatus::kNoActivation) {
size_intervention_status_ = FrameSizeInterventionStatus::kTriggered;
}
if (resource->reported_as_ad_resource) { if (resource->reported_as_ad_resource) {
ad_network_bytes_ += resource->delta_bytes; ad_network_bytes_ += resource->delta_bytes;
ad_bytes_ += resource->delta_bytes; ad_bytes_ += resource->delta_bytes;
......
...@@ -34,15 +34,6 @@ class FrameData { ...@@ -34,15 +34,6 @@ class FrameData {
kMaxValue = kAnyVisibility, kMaxValue = kAnyVisibility,
}; };
// Whether or not the frame size intervention would have triggered on
// this frame. These values are persisted to logs. Entries should not be
// renumbered and numeric values should never be reused.
enum class FrameSizeInterventionStatus {
kNone = 0,
kTriggered = 1,
kMaxValue = kTriggered,
};
// These values are persisted to logs. Entries should not be renumbered and // These values are persisted to logs. Entries should not be renumbered and
// numeric values should never be reused. For any additions, also update the // numeric values should never be reused. For any additions, also update the
// corresponding PageEndReason enum in enums.xml. // corresponding PageEndReason enum in enums.xml.
...@@ -80,9 +71,6 @@ class FrameData { ...@@ -80,9 +71,6 @@ class FrameData {
kMaxValue = kPlayed, kMaxValue = kPlayed,
}; };
// Maximum number of bytes allowed to be loaded by a frame.
static const int kFrameSizeInterventionByteThreshold = 1050 * 1024;
// Window over which to consider cpu time spent in an ad_frame. // Window over which to consider cpu time spent in an ad_frame.
static constexpr base::TimeDelta kCpuWindowSize = static constexpr base::TimeDelta kCpuWindowSize =
base::TimeDelta::FromSeconds(30); base::TimeDelta::FromSeconds(30);
...@@ -179,10 +167,6 @@ class FrameData { ...@@ -179,10 +167,6 @@ class FrameData {
gfx::Size frame_size() const { return frame_size_; } gfx::Size frame_size() const { return frame_size_; }
FrameSizeInterventionStatus size_intervention_status() const {
return size_intervention_status_;
}
MediaStatus media_status() const { return media_status_; } MediaStatus media_status() const { return media_status_; }
void set_media_status(MediaStatus media_status) { void set_media_status(MediaStatus media_status) {
...@@ -265,10 +249,6 @@ class FrameData { ...@@ -265,10 +249,6 @@ class FrameData {
url::Origin origin_; url::Origin origin_;
MediaStatus media_status_ = MediaStatus::kNotPlayed; MediaStatus media_status_ = MediaStatus::kNotPlayed;
// Indicates whether or not this frame would have triggered a size
// intervention.
FrameSizeInterventionStatus size_intervention_status_;
DISALLOW_COPY_AND_ASSIGN(FrameData); DISALLOW_COPY_AND_ASSIGN(FrameData);
}; };
......
...@@ -2183,7 +2183,6 @@ enum WebFeature { ...@@ -2183,7 +2183,6 @@ enum WebFeature {
kV8RemotePlayback_Prompt_Method = 2781, kV8RemotePlayback_Prompt_Method = 2781,
kLayoutShiftExplicitlyRequested = 2782, kLayoutShiftExplicitlyRequested = 2782,
kMediaSessionSkipAd = 2783, kMediaSessionSkipAd = 2783,
kAdFrameSizeIntervention = 2784,
kV8UserActivation_HasBeenActive_AttributeGetter = 2785, kV8UserActivation_HasBeenActive_AttributeGetter = 2785,
kV8UserActivation_IsActive_AttributeGetter = 2786, kV8UserActivation_IsActive_AttributeGetter = 2786,
kTextEncoderEncodeInto = 2787, kTextEncoderEncodeInto = 2787,
......
...@@ -92259,6 +92259,9 @@ uploading your change for review. ...@@ -92259,6 +92259,9 @@ uploading your change for review.
<histogram base="true" <histogram base="true"
name="PageLoad.FrameCounts.AdFrames.PerFrame.SizeIntervention" name="PageLoad.FrameCounts.AdFrames.PerFrame.SizeIntervention"
enum="AdFrameSizeInterventionStatus" expires_after="2020-01-29"> enum="AdFrameSizeInterventionStatus" expires_after="2020-01-29">
<obsolete>
Deprecated July 2019 in Issue 962616.
</obsolete>
<owner>johnidel@chromium.org</owner> <owner>johnidel@chromium.org</owner>
<owner>jkarlin@chromium.org</owner> <owner>jkarlin@chromium.org</owner>
<summary> <summary>
...@@ -92273,6 +92276,9 @@ uploading your change for review. ...@@ -92273,6 +92276,9 @@ uploading your change for review.
<histogram base="true" <histogram base="true"
name="PageLoad.FrameCounts.AdFrames.PerFrame.SizeIntervention.MediaStatus" name="PageLoad.FrameCounts.AdFrames.PerFrame.SizeIntervention.MediaStatus"
enum="AdFrameMediaStatus" expires_after="2020-02-22"> enum="AdFrameMediaStatus" expires_after="2020-02-22">
<obsolete>
Deprecated July 2019 in Issue 962616.
</obsolete>
<owner>johnidel@chromium.org</owner> <owner>johnidel@chromium.org</owner>
<owner>jkarlin@chromium.org</owner> <owner>jkarlin@chromium.org</owner>
<summary> <summary>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment