Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

Issue 2141383002: [Fetch API] Remove HandleScope to protect local handles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 origin = sourceOrigin.toString(); 126 origin = sourceOrigin.toString();
127 ServiceWorker* source = ServiceWorker::from(m_workerGlobalScope->getExecutio nContext(), wrapUnique(handle.release())); 127 ServiceWorker* source = ServiceWorker::from(m_workerGlobalScope->getExecutio nContext(), wrapUnique(handle.release()));
128 WaitUntilObserver* observer = WaitUntilObserver::create(workerGlobalScope(), WaitUntilObserver::Message, eventID); 128 WaitUntilObserver* observer = WaitUntilObserver::create(workerGlobalScope(), WaitUntilObserver::Message, eventID);
129 129
130 Event* event = ExtendableMessageEvent::create(value, origin, ports, source, observer); 130 Event* event = ExtendableMessageEvent::create(value, origin, ports, source, observer);
131 workerGlobalScope()->dispatchExtendableEvent(event, observer); 131 workerGlobalScope()->dispatchExtendableEvent(event, observer);
132 } 132 }
133 133
134 void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(int responseID, int event FinishID, const WebServiceWorkerRequest& webRequest) 134 void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(int responseID, int event FinishID, const WebServiceWorkerRequest& webRequest)
135 { 135 {
136 ScriptState::Scope scope(workerGlobalScope()->scriptController()->getScriptS tate());
136 WaitUntilObserver* waitUntilObserver = WaitUntilObserver::create(workerGloba lScope(), WaitUntilObserver::Fetch, eventFinishID); 137 WaitUntilObserver* waitUntilObserver = WaitUntilObserver::create(workerGloba lScope(), WaitUntilObserver::Fetch, eventFinishID);
137 RespondWithObserver* respondWithObserver = RespondWithObserver::create(worke rGlobalScope(), responseID, webRequest.url(), webRequest.mode(), webRequest.fram eType(), webRequest.requestContext(), waitUntilObserver); 138 RespondWithObserver* respondWithObserver = RespondWithObserver::create(worke rGlobalScope(), responseID, webRequest.url(), webRequest.mode(), webRequest.fram eType(), webRequest.requestContext(), waitUntilObserver);
138 Request* request = Request::create(workerGlobalScope()->scriptController()-> getScriptState(), webRequest); 139 Request* request = Request::create(workerGlobalScope()->scriptController()-> getScriptState(), webRequest);
139 request->getHeaders()->setGuard(Headers::ImmutableGuard); 140 request->getHeaders()->setGuard(Headers::ImmutableGuard);
140 FetchEventInit eventInit; 141 FetchEventInit eventInit;
141 eventInit.setCancelable(true); 142 eventInit.setCancelable(true);
142 eventInit.setRequest(request); 143 eventInit.setRequest(request);
143 eventInit.setClientId(webRequest.isMainResourceLoad() ? WebString() : webReq uest.clientId()); 144 eventInit.setClientId(webRequest.isMainResourceLoad() ? WebString() : webReq uest.clientId());
144 eventInit.setIsReload(webRequest.isReload()); 145 eventInit.setIsReload(webRequest.isReload());
145 FetchEvent* fetchEvent = FetchEvent::create(workerGlobalScope()->scriptContr oller()->getScriptState(), EventTypeNames::fetch, eventInit, respondWithObserver , waitUntilObserver); 146 FetchEvent* fetchEvent = FetchEvent::create(workerGlobalScope()->scriptContr oller()->getScriptState(), EventTypeNames::fetch, eventInit, respondWithObserver , waitUntilObserver);
146 waitUntilObserver->willDispatchEvent(); 147 waitUntilObserver->willDispatchEvent();
147 DispatchEventResult dispatchResult = workerGlobalScope()->dispatchEvent(fetc hEvent); 148 DispatchEventResult dispatchResult = workerGlobalScope()->dispatchEvent(fetc hEvent);
148 respondWithObserver->didDispatchEvent(dispatchResult); 149 respondWithObserver->didDispatchEvent(dispatchResult);
149 // false is okay because waitUntil for fetch event doesn't care about the 150 // false is okay because waitUntil for fetch event doesn't care about the
150 // promise rejection or an uncaught runtime script error. 151 // promise rejection or an uncaught runtime script error.
151 waitUntilObserver->didDispatchEvent(false /* errorOccurred */); 152 waitUntilObserver->didDispatchEvent(false /* errorOccurred */);
152 } 153 }
153 154
154 void ServiceWorkerGlobalScopeProxy::dispatchForeignFetchEvent(int responseID, in t eventFinishID, const WebServiceWorkerRequest& webRequest) 155 void ServiceWorkerGlobalScopeProxy::dispatchForeignFetchEvent(int responseID, in t eventFinishID, const WebServiceWorkerRequest& webRequest)
155 { 156 {
157 ScriptState::Scope scope(workerGlobalScope()->scriptController()->getScriptS tate());
156 RefPtr<SecurityOrigin> origin = SecurityOrigin::create(webRequest.referrerUr l()); 158 RefPtr<SecurityOrigin> origin = SecurityOrigin::create(webRequest.referrerUr l());
157 WaitUntilObserver* waitUntilObserver = WaitUntilObserver::create(workerGloba lScope(), WaitUntilObserver::Fetch, eventFinishID); 159 WaitUntilObserver* waitUntilObserver = WaitUntilObserver::create(workerGloba lScope(), WaitUntilObserver::Fetch, eventFinishID);
158 ForeignFetchRespondWithObserver* respondWithObserver = ForeignFetchRespondWi thObserver::create(workerGlobalScope(), responseID, webRequest.url(), webRequest .mode(), webRequest.frameType(), webRequest.requestContext(), origin, waitUntilO bserver); 160 ForeignFetchRespondWithObserver* respondWithObserver = ForeignFetchRespondWi thObserver::create(workerGlobalScope(), responseID, webRequest.url(), webRequest .mode(), webRequest.frameType(), webRequest.requestContext(), origin, waitUntilO bserver);
159 Request* request = Request::create(workerGlobalScope()->scriptController()-> getScriptState(), webRequest); 161 Request* request = Request::create(workerGlobalScope()->scriptController()-> getScriptState(), webRequest);
160 request->getHeaders()->setGuard(Headers::ImmutableGuard); 162 request->getHeaders()->setGuard(Headers::ImmutableGuard);
161 ForeignFetchEventInit eventInit; 163 ForeignFetchEventInit eventInit;
162 eventInit.setCancelable(true); 164 eventInit.setCancelable(true);
163 eventInit.setRequest(request); 165 eventInit.setRequest(request);
164 eventInit.setOrigin(origin->toString()); 166 eventInit.setOrigin(origin->toString());
165 ForeignFetchEvent* fetchEvent = ForeignFetchEvent::create(workerGlobalScope( )->scriptController()->getScriptState(), EventTypeNames::foreignfetch, eventInit , respondWithObserver, waitUntilObserver); 167 ForeignFetchEvent* fetchEvent = ForeignFetchEvent::create(workerGlobalScope( )->scriptController()->getScriptState(), EventTypeNames::foreignfetch, eventInit , respondWithObserver, waitUntilObserver);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 return *m_document; 310 return *m_document;
309 } 311 }
310 312
311 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope() con st 313 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope() con st
312 { 314 {
313 DCHECK(m_workerGlobalScope); 315 DCHECK(m_workerGlobalScope);
314 return m_workerGlobalScope; 316 return m_workerGlobalScope;
315 } 317 }
316 318
317 } // namespace blink 319 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698