| Index: Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| diff --git a/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| index 45e2d0aef78196b72fc78abc671f9b2949ba0714..7aae6ed864983456bb8d0d5f187d80eb46077448 100644
|
| --- a/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| +++ b/Source/web/ServiceWorkerGlobalScopeProxy.cpp
|
| @@ -51,9 +51,7 @@
|
| #include "modules/push_messaging/PushMessageData.h"
|
| #include "modules/serviceworkers/ExtendableEvent.h"
|
| #include "modules/serviceworkers/FetchEvent.h"
|
| -#include "modules/serviceworkers/ServiceWorkerClient.h"
|
| #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
|
| -#include "modules/serviceworkers/ServiceWorkerWindowClient.h"
|
| #include "modules/serviceworkers/StashedMessagePort.h"
|
| #include "modules/serviceworkers/StashedPortCollection.h"
|
| #include "modules/serviceworkers/WaitUntilObserver.h"
|
| @@ -107,12 +105,7 @@ void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(int eventID, const WebSer
|
| request->headers()->setGuard(Headers::ImmutableGuard);
|
| FetchEventInit eventInit;
|
| eventInit.setRequest(request);
|
| - if (webRequest.client().clientType == WebServiceWorkerClientTypeWindow) {
|
| - eventInit.setClient(ServiceWorkerWindowClient::create(webRequest.client()));
|
| - eventInit.setIsReload(webRequest.isReload());
|
| - } else {
|
| - eventInit.setClient(ServiceWorkerClient::create(webRequest.client()));
|
| - }
|
| + eventInit.setIsReload(webRequest.isReload());
|
| RefPtrWillBeRawPtr<FetchEvent> fetchEvent(FetchEvent::create(EventTypeNames::fetch, eventInit, observer));
|
| defaultPrevented = !m_workerGlobalScope->dispatchEvent(fetchEvent.release());
|
| observer->didDispatchEvent(defaultPrevented);
|
|
|