Adjust use counters and UKM counters for fenced frames.
Change to use the outermost main frame when recording this relevant
to the main frame. This will leave metrics consistent with the previous
approach. (1 main frame per page visit).
BUG=1314858
Change-Id: I1a8a8276b9547912e4d029e6386bc366b4383eda
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3621773
Reviewed-by: Kevin McNee <mcnee@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/main@{#998617}
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 1026394..ea476993 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -670,10 +670,18 @@
void LocalDOMWindow::CountUseOnlyInCrossOriginIframe(
mojom::blink::WebFeature feature) {
- if (GetFrame() && GetFrame()->IsCrossOriginToMainFrame())
+ if (GetFrame() && GetFrame()->IsCrossOriginToOutermostMainFrame())
CountUse(feature);
}
+void LocalDOMWindow::CountUseOnlyInSameOriginIframe(
+ mojom::blink::WebFeature feature) {
+ if (GetFrame() && !GetFrame()->IsOutermostMainFrame() &&
+ !GetFrame()->IsCrossOriginToOutermostMainFrame()) {
+ CountUse(feature);
+ }
+}
+
void LocalDOMWindow::CountUseOnlyInCrossSiteIframe(
mojom::blink::WebFeature feature) {
if (IsCrossSiteSubframeIncludingScheme())
@@ -788,7 +796,7 @@
// event to skip dispatch when the renderer exits. If this is not the case or
// there are other cases, we need to fix this code to only record the metric
// once the event is dispatched.
- if (GetFrame() && GetFrame()->IsMainFrame()) {
+ if (GetFrame() && GetFrame()->IsOutermostMainFrame()) {
RecordUMAEventPageShowPersisted(EventPageShowPersisted::kNoInRenderer);
}
}
@@ -801,7 +809,7 @@
DispatchEvent(*PageTransitionEvent::CreatePersistedPageshow(navigation_start),
document_.Get());
- if (GetFrame() && GetFrame()->IsMainFrame()) {
+ if (GetFrame() && GetFrame()->IsOutermostMainFrame()) {
RecordUMAEventPageShowPersisted(EventPageShowPersisted::kYesInRenderer);
}
}
@@ -1218,9 +1226,7 @@
return;
}
- if (!GetFrame()->IsMainFrame() && !GetFrame()->IsCrossOriginToMainFrame()) {
- CountUse(WebFeature::kSameOriginIframeWindowPrint);
- }
+ CountUseOnlyInSameOriginIframe(WebFeature::kSameOriginIframeWindowPrint);
CountUseOnlyInCrossOriginIframe(WebFeature::kCrossOriginWindowPrint);
should_print_when_finished_loading_ = false;
@@ -1260,9 +1266,7 @@
if (!page)
return;
- if (!GetFrame()->IsMainFrame() && !GetFrame()->IsCrossOriginToMainFrame()) {
- CountUse(WebFeature::kSameOriginIframeWindowAlert);
- }
+ CountUseOnlyInSameOriginIframe(WebFeature::kSameOriginIframeWindowAlert);
Deprecation::CountDeprecationCrossOriginIframe(
this, WebFeature::kCrossOriginWindowAlert);
@@ -1296,9 +1300,7 @@
if (!page)
return false;
- if (!GetFrame()->IsMainFrame() && !GetFrame()->IsCrossOriginToMainFrame()) {
- CountUse(WebFeature::kSameOriginIframeWindowConfirm);
- }
+ CountUseOnlyInSameOriginIframe(WebFeature::kSameOriginIframeWindowConfirm);
Deprecation::CountDeprecationCrossOriginIframe(
this, WebFeature::kCrossOriginWindowConfirm);
@@ -1339,9 +1341,7 @@
default_value, return_value))
return return_value;
- if (!GetFrame()->IsMainFrame() && !GetFrame()->IsCrossOriginToMainFrame()) {
- CountUse(WebFeature::kSameOriginIframeWindowPrompt);
- }
+ CountUseOnlyInSameOriginIframe(WebFeature::kSameOriginIframeWindowPrompt);
Deprecation::CountDeprecationCrossOriginIframe(
this, WebFeature::kCrossOriginWindowAlert);
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.h b/third_party/blink/renderer/core/frame/local_dom_window.h
index c6dbb484..a17d45e 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.h
+++ b/third_party/blink/renderer/core/frame/local_dom_window.h
@@ -198,6 +198,10 @@
// iframe.
void CountUseOnlyInCrossOriginIframe(mojom::blink::WebFeature feature);
+ // Count |feature| only when this window is associated with a same-origin
+ // iframe with the outermost main frame.
+ void CountUseOnlyInSameOriginIframe(mojom::blink::WebFeature feature);
+
// Count |feature| only when this window is associated with a cross-site
// iframe. A "site" is a scheme and registrable domain.
void CountUseOnlyInCrossSiteIframe(mojom::blink::WebFeature feature) override;
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
index 50641ed..d09e52e 100644
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -2338,7 +2338,7 @@
//
// Use response_.AddressSpace() instead of frame_->DomWindow()->AddressSpace()
// since the latter isn't populated in unit tests.
- if (frame_->IsMainFrame()) {
+ if (frame_->IsOutermostMainFrame()) {
auto address_space = response_.AddressSpace();
if ((address_space == network::mojom::blink::IPAddressSpace::kPrivate ||
address_space == network::mojom::blink::IPAddressSpace::kLocal) &&
diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_party/blink/renderer/core/loader/frame_loader.cc
index bb0593ba..b3b4a4ce 100644
--- a/third_party/blink/renderer/core/loader/frame_loader.cc
+++ b/third_party/blink/renderer/core/loader/frame_loader.cc
@@ -1727,9 +1727,9 @@
document_loader_->GetUseCounter().Count(
is_subresource
? WebFeature::kLegacyTLSVersionInSubresource
- : (frame_->Tree().Parent()
- ? WebFeature::kLegacyTLSVersionInSubframeMainResource
- : WebFeature::kLegacyTLSVersionInMainFrameResource),
+ : (frame_->IsOutermostMainFrame()
+ ? WebFeature::kLegacyTLSVersionInMainFrameResource
+ : WebFeature::kLegacyTLSVersionInSubframeMainResource),
frame_.Get());
// For non-main-frame loads, we have to use the main frame's document for
@@ -1781,8 +1781,8 @@
// resources, and only use the warning level for main-frame resources.
frame_->Console().AddMessage(MakeGarbageCollected<ConsoleMessage>(
mojom::ConsoleMessageSource::kOther,
- frame_->IsMainFrame() ? mojom::ConsoleMessageLevel::kWarning
- : mojom::ConsoleMessageLevel::kVerbose,
+ frame_->IsOutermostMainFrame() ? mojom::ConsoleMessageLevel::kWarning
+ : mojom::ConsoleMessageLevel::kVerbose,
console_message));
}
