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 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 const WebSecurityOrigin& sourceOrigin, 139 const WebSecurityOrigin& sourceOrigin,
140 const WebMessagePortChannelArray& webChannels, 140 const WebMessagePortChannelArray& webChannels,
141 std::unique_ptr<WebServiceWorker::Handle> handle) { 141 std::unique_ptr<WebServiceWorker::Handle> handle) {
142 WebSerializedScriptValue value = 142 WebSerializedScriptValue value =
143 WebSerializedScriptValue::fromString(message); 143 WebSerializedScriptValue::fromString(message);
144 MessagePortArray* ports = 144 MessagePortArray* ports =
145 MessagePort::toMessagePortArray(m_workerGlobalScope, webChannels); 145 MessagePort::toMessagePortArray(m_workerGlobalScope, webChannels);
146 String origin; 146 String origin;
147 if (!sourceOrigin.isUnique()) 147 if (!sourceOrigin.isUnique())
148 origin = sourceOrigin.toString(); 148 origin = sourceOrigin.toString();
149 ServiceWorker* source = ServiceWorker::from( 149 ServiceWorker* source =
150 m_workerGlobalScope->getExecutionContext(), wrapUnique(handle.release())); 150 ServiceWorker::from(m_workerGlobalScope->getExecutionContext(),
151 WTF::wrapUnique(handle.release()));
151 WaitUntilObserver* observer = WaitUntilObserver::create( 152 WaitUntilObserver* observer = WaitUntilObserver::create(
152 workerGlobalScope(), WaitUntilObserver::Message, eventID); 153 workerGlobalScope(), WaitUntilObserver::Message, eventID);
153 154
154 Event* event = 155 Event* event =
155 ExtendableMessageEvent::create(value, origin, ports, source, observer); 156 ExtendableMessageEvent::create(value, origin, ports, source, observer);
156 workerGlobalScope()->dispatchExtendableEvent(event, observer); 157 workerGlobalScope()->dispatchExtendableEvent(event, observer);
157 } 158 }
158 159
159 void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent( 160 void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(
160 int fetchEventID, 161 int fetchEventID,
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 return *m_document; 486 return *m_document;
486 } 487 }
487 488
488 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope() 489 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope()
489 const { 490 const {
490 DCHECK(m_workerGlobalScope); 491 DCHECK(m_workerGlobalScope);
491 return m_workerGlobalScope; 492 return m_workerGlobalScope;
492 } 493 }
493 494
494 } // namespace blink 495 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698