Commit 63668d1d authored by arthursonzogni's avatar arthursonzogni Committed by Commit Bot

Remove unused code [2/2]

Previous patch removed functions non referenced by a caller:
https://chromium-review.googlesource.com/c/chromium/src/+/2523114

Pulling the string further, this caused more functions not to have a
any callers, which are removed here.

Bug: 1146469
Change-Id: Ic82c95c07523d10e6d88d45ea2fa392562f05501
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521190
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825804}
parent c30d4ef2
......@@ -92,9 +92,6 @@ interface Frame {
// It is safe to call this without calling BlockRequests.
ResumeBlockedRequests();
// Cancels blocked requests. BlockRequests must have been called before.
CancelBlockedRequests();
// Samsung Galaxy Note-specific "smart clip" stylus text getter.
// Extracts the data at the given rect.
[EnableIf=is_android]
......
......@@ -3017,10 +3017,6 @@ void RenderFrameImpl::ResumeBlockedRequests() {
frame_request_blocker_->Resume();
}
void RenderFrameImpl::CancelBlockedRequests() {
frame_request_blocker_->Cancel();
}
void RenderFrameImpl::AllowBindings(int32_t enabled_bindings_flags) {
enabled_bindings_ |= enabled_bindings_flags;
}
......
......@@ -450,7 +450,6 @@ class CONTENT_EXPORT RenderFrameImpl
GetCanonicalUrlForSharingCallback callback) override;
void BlockRequests() override;
void ResumeBlockedRequests() override;
void CancelBlockedRequests() override;
void UpdateBrowserControlsState(BrowserControlsState constraints,
BrowserControlsState current,
bool animate) override;
......
......@@ -32,9 +32,6 @@ class BLINK_PLATFORM_EXPORT WebFrameRequestBlocker
// Resumes any blocked subresource requests.
virtual void Resume() = 0;
// Cancels any blocked subresource requests.
virtual void Cancel() = 0;
virtual std::unique_ptr<URLLoaderThrottle> GetThrottleIfRequestsBlocked() = 0;
};
......
......@@ -41,12 +41,6 @@ class RequestBlockerThrottle : public URLLoaderThrottle,
delegate_->Resume();
}
void Cancel() override {
frame_request_blocker_->RemoveObserver(this);
frame_request_blocker_ = nullptr;
delegate_->CancelWithError(net::ERR_FAILED);
}
private:
scoped_refptr<FrameRequestBlocker> frame_request_blocker_;
};
......@@ -68,12 +62,6 @@ void FrameRequestBlocker::Resume() {
clients_->Notify(FROM_HERE, &Client::Resume);
}
void FrameRequestBlocker::Cancel() {
DCHECK(blocked_.IsOne());
blocked_.Decrement();
clients_->Notify(FROM_HERE, &Client::Cancel);
}
std::unique_ptr<URLLoaderThrottle>
FrameRequestBlocker::GetThrottleIfRequestsBlocked() {
if (blocked_.IsZero())
......
......@@ -25,16 +25,12 @@ class FrameRequestBlocker final : public WebFrameRequestBlocker {
// Resumes any blocked subresource requests.
void Resume() override;
// Cancels any blocked subresource requests.
void Cancel() override;
std::unique_ptr<URLLoaderThrottle> GetThrottleIfRequestsBlocked() override;
private:
class Client {
public:
virtual void Resume() = 0;
virtual void Cancel() = 0;
};
friend class base::RefCountedThreadSafe<FrameRequestBlocker>;
......
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