Commit 84a7f05e authored by Ian Clelland's avatar Ian Clelland Committed by Commit Bot

Remove deprecated feature policy methods on Frame.

Bug: 888668
Change-Id: Iec4e28d6f62d8b146b3e5311197e58e4df4b5dc2
Reviewed-on: https://chromium-review.googlesource.com/c/1331630Reviewed-by: default avatarSteve Kobes <skobes@chromium.org>
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607744}
parent c6c9e18b
...@@ -199,17 +199,6 @@ bool Frame::ConsumeTransientUserActivationInLocalTree() { ...@@ -199,17 +199,6 @@ bool Frame::ConsumeTransientUserActivationInLocalTree() {
return was_active; return was_active;
} }
bool Frame::DeprecatedIsFeatureEnabled(
mojom::FeaturePolicyFeature feature) const {
return GetSecurityContext()->IsFeatureEnabled(feature,
ReportOptions::kDoNotReport);
}
bool Frame::DeprecatedIsFeatureEnabled(mojom::FeaturePolicyFeature feature,
ReportOptions report_on_failure) const {
return GetSecurityContext()->IsFeatureEnabled(feature, report_on_failure);
}
void Frame::SetOwner(FrameOwner* owner) { void Frame::SetOwner(FrameOwner* owner) {
owner_ = owner; owner_ = owner;
UpdateInertIfPossible(); UpdateInertIfPossible();
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "base/debug/stack_trace.h" #include "base/debug/stack_trace.h"
#include "base/optional.h" #include "base/optional.h"
#include "base/unguessable_token.h" #include "base/unguessable_token.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/user_activation_state.h" #include "third_party/blink/public/common/frame/user_activation_state.h"
#include "third_party/blink/public/common/frame/user_activation_update_source.h" #include "third_party/blink/public/common/frame/user_activation_update_source.h"
#include "third_party/blink/public/web/web_frame_load_type.h" #include "third_party/blink/public/web/web_frame_load_type.h"
...@@ -65,7 +64,6 @@ class SecurityContext; ...@@ -65,7 +64,6 @@ class SecurityContext;
class Settings; class Settings;
class WindowProxy; class WindowProxy;
class WindowProxyManager; class WindowProxyManager;
enum class ReportOptions;
struct FrameLoadRequest; struct FrameLoadRequest;
enum class FrameDetachType { kRemove, kSwap }; enum class FrameDetachType { kRemove, kSwap };
...@@ -73,7 +71,6 @@ enum class FrameDetachType { kRemove, kSwap }; ...@@ -73,7 +71,6 @@ enum class FrameDetachType { kRemove, kSwap };
// Status of user gesture. // Status of user gesture.
enum class UserGestureStatus { kActive, kNone }; enum class UserGestureStatus { kActive, kNone };
// Frame is the base class of LocalFrame and RemoteFrame and should only contain // Frame is the base class of LocalFrame and RemoteFrame and should only contain
// functionality shared between both. In particular, any method related to // functionality shared between both. In particular, any method related to
// input, layout, or painting probably belongs on LocalFrame. // input, layout, or painting probably belongs on LocalFrame.
...@@ -190,17 +187,6 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> { ...@@ -190,17 +187,6 @@ class CORE_EXPORT Frame : public GarbageCollectedFinalized<Frame> {
return lifecycle_.GetState() == FrameLifecycle::kAttached; return lifecycle_.GetState() == FrameLifecycle::kAttached;
} }
// Tests whether the policy-controlled feature is enabled in this frame.
// Optionally sends a report to any registered reporting observers or
// Report-To endpoints, via ReportFeaturePolicyViolation(), if the feature is
// disabled.
// TODO(iclelland): Replace these with methods on SecurityContext/Document
bool DeprecatedIsFeatureEnabled(mojom::FeaturePolicyFeature) const;
bool DeprecatedIsFeatureEnabled(mojom::FeaturePolicyFeature,
ReportOptions report_on_failure) const;
virtual void DeprecatedReportFeaturePolicyViolation(
mojom::FeaturePolicyFeature) const {}
// Called to make a frame inert or non-inert. A frame is inert when there // Called to make a frame inert or non-inert. A frame is inert when there
// is a modal dialog displayed within an ancestor frame, and this frame // is a modal dialog displayed within an ancestor frame, and this frame
// itself is not within the dialog. // itself is not within the dialog.
......
...@@ -1523,11 +1523,6 @@ const mojom::blink::ReportingServiceProxyPtr& LocalFrame::GetReportingService() ...@@ -1523,11 +1523,6 @@ const mojom::blink::ReportingServiceProxyPtr& LocalFrame::GetReportingService()
return reporting_service_; return reporting_service_;
} }
void LocalFrame::DeprecatedReportFeaturePolicyViolation(
mojom::FeaturePolicyFeature feature) const {
GetSecurityContext()->ReportFeaturePolicyViolation(feature);
}
// static // static
std::unique_ptr<UserGestureIndicator> LocalFrame::NotifyUserActivation( std::unique_ptr<UserGestureIndicator> LocalFrame::NotifyUserActivation(
LocalFrame* frame, LocalFrame* frame,
......
...@@ -406,10 +406,6 @@ class CORE_EXPORT LocalFrame final : public Frame, ...@@ -406,10 +406,6 @@ class CORE_EXPORT LocalFrame final : public Frame,
SmoothScrollSequencer& GetSmoothScrollSequencer(); SmoothScrollSequencer& GetSmoothScrollSequencer();
// TODO(iclelland): Replace this with a method on Document
void DeprecatedReportFeaturePolicyViolation(
mojom::FeaturePolicyFeature) const override;
const mojom::blink::ReportingServiceProxyPtr& GetReportingService() const; const mojom::blink::ReportingServiceProxyPtr& GetReportingService() const;
private: private:
......
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