Commit a94bda97 authored by Jay Harris's avatar Jay Harris Committed by Commit Bot

WebApps: Removes request property from LaunchParams.

This brings the LaunchParams dictionary into line with what's discussed
in the explainer:
https://github.com/WICG/file-handling/blob/master/explainer.md

Bug: 829689
Change-Id: I3322099aeb8cdcf558acb8a59076fbbc285467e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2012377Reviewed-by: default avatarAlan Cutter <alancutter@chromium.org>
Commit-Queue: Jay Harris <harrisjay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733887}
parent 9ff29d67
......@@ -4,9 +4,6 @@
#include "third_party/blink/renderer/modules/launch/launch_params.h"
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include "third_party/blink/renderer/core/fetch/fetch_request_data.h"
#include "third_party/blink/renderer/core/fetch/request.h"
#include "third_party/blink/renderer/modules/native_file_system/native_file_system_handle.h"
#include "third_party/blink/renderer/platform/heap/visitor.h"
......@@ -17,22 +14,8 @@ LaunchParams::LaunchParams(HeapVector<Member<NativeFileSystemHandle>> files)
LaunchParams::~LaunchParams() = default;
Request* LaunchParams::request(ScriptState* script_state) {
if (!fetch_request_)
return nullptr;
if (!request_) {
request_ =
Request::Create(script_state, *fetch_request_.get(),
FetchRequestData::ForServiceWorkerFetchEvent::kFalse);
}
return request_;
}
void LaunchParams::Trace(blink::Visitor* visitor) {
visitor->Trace(files_);
visitor->Trace(request_);
ScriptWrappable::Trace(visitor);
}
......
......@@ -5,17 +5,13 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_LAUNCH_LAUNCH_PARAMS_H_
#define THIRD_PARTY_BLINK_RENDERER_MODULES_LAUNCH_LAUNCH_PARAMS_H_
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
#include "third_party/blink/renderer/modules/native_file_system/native_file_system_handle.h"
#include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
#include "third_party/blink/renderer/platform/heap/heap_allocator.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
namespace blink {
class Request;
class ScriptState;
class Visitor;
class LaunchParams final : public ScriptWrappable {
......@@ -27,14 +23,11 @@ class LaunchParams final : public ScriptWrappable {
// LaunchParams IDL interface.
const HeapVector<Member<NativeFileSystemHandle>>& files() { return files_; }
Request* request(ScriptState* script_state);
void Trace(blink::Visitor*) override;
private:
HeapVector<Member<NativeFileSystemHandle>> files_;
Member<Request> request_;
mojom::blink::FetchAPIRequestPtr fetch_request_;
};
} // namespace blink
......
......@@ -7,7 +7,4 @@
[RuntimeEnabled=FileHandling] interface LaunchParams {
readonly attribute FrozenArray<FileSystemHandle> files;
[CallWith=ScriptState]
readonly attribute Request request;
};
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