Index: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
diff --git a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
index 5ed7d7f1fe78a32333662b9cbebb869fefdb26ef..29b6548182c7e3beae11dda8a3d631f526ea591a 100644 |
--- a/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
+++ b/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp |
@@ -106,7 +106,6 @@ void ServiceWorkerGlobalScopeProxy::dispatchActivateEvent(int eventID) |
void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(int eventID, const WebServiceWorkerRequest& webRequest) |
{ |
RespondWithObserver* observer = RespondWithObserver::create(workerGlobalScope(), eventID, webRequest.url(), webRequest.mode(), webRequest.frameType(), webRequest.requestContext()); |
- bool defaultPrevented = false; |
Request* request = Request::create(workerGlobalScope(), webRequest); |
request->headers()->setGuard(Headers::ImmutableGuard); |
FetchEventInit eventInit; |
@@ -114,8 +113,8 @@ void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(int eventID, const WebSer |
eventInit.setRequest(request); |
eventInit.setIsReload(webRequest.isReload()); |
RefPtrWillBeRawPtr<FetchEvent> fetchEvent(FetchEvent::create(EventTypeNames::fetch, eventInit, observer)); |
- defaultPrevented = !workerGlobalScope()->dispatchEvent(fetchEvent.release()); |
- observer->didDispatchEvent(defaultPrevented); |
+ WebInputEventResult eventResult = workerGlobalScope()->dispatchEvent(fetchEvent.release()); |
+ observer->didDispatchEvent(eventResult != WebInputEventResult::NotHandled); |
tkent
2015/12/03 00:36:25
Can we change the argument of RespondWithObserver
dtapuska
2015/12/03 02:00:53
Done.
|
} |
void ServiceWorkerGlobalScopeProxy::dispatchGeofencingEvent(int eventID, WebGeofencingEventType eventType, const WebString& regionID, const WebCircularGeofencingRegion& region) |