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

Side by Side Diff: webkit/glue/webworker_impl.cc

Issue 224018: WebKit update 48700:48721.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Updated test expectations for realz. Created 11 years, 2 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
« no previous file with comments | « webkit/api/src/ApplicationCacheHost.cpp ('k') | webkit/glue/webworkerclient_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 8
9 #include "DedicatedWorkerContext.h" 9 #include "DedicatedWorkerContext.h"
10 #include "DedicatedWorkerThread.h" 10 #include "DedicatedWorkerThread.h"
11 #include "GenericWorkerTask.h" 11 #include "GenericWorkerTask.h"
12 #include "KURL.h" 12 #include "KURL.h"
13 #include "MessageEvent.h"
13 #include "MessagePort.h" 14 #include "MessagePort.h"
14 #include "MessagePortChannel.h" 15 #include "MessagePortChannel.h"
15 #include "ScriptExecutionContext.h" 16 #include "ScriptExecutionContext.h"
16 #include "SecurityOrigin.h" 17 #include "SecurityOrigin.h"
17 #include "SubstituteData.h" 18 #include "SubstituteData.h"
18 #include <wtf/MainThread.h> 19 #include <wtf/MainThread.h>
19 #include <wtf/Threading.h> 20 #include <wtf/Threading.h>
20 21
21 #undef LOG 22 #undef LOG
22 23
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 WebCore::ScriptExecutionContext* context, 116 WebCore::ScriptExecutionContext* context,
116 WebWorkerImpl* this_ptr, 117 WebWorkerImpl* this_ptr,
117 const WebCore::String& message, 118 const WebCore::String& message,
118 WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) { 119 WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) {
119 DCHECK(context->isWorkerContext()); 120 DCHECK(context->isWorkerContext());
120 WebCore::DedicatedWorkerContext* worker_context = 121 WebCore::DedicatedWorkerContext* worker_context =
121 static_cast<WebCore::DedicatedWorkerContext*>(context); 122 static_cast<WebCore::DedicatedWorkerContext*>(context);
122 123
123 WTF::OwnPtr<WebCore::MessagePortArray> ports = 124 WTF::OwnPtr<WebCore::MessagePortArray> ports =
124 WebCore::MessagePort::entanglePorts(*context, channels.release()); 125 WebCore::MessagePort::entanglePorts(*context, channels.release());
125 worker_context->dispatchMessage(message, ports.release()); 126 worker_context->dispatchEvent(
127 WebCore::MessageEvent::create(ports.release(), message));
126 128
127 this_ptr->confirmMessageFromWorkerObject( 129 this_ptr->confirmMessageFromWorkerObject(
128 worker_context->hasPendingActivity()); 130 worker_context->hasPendingActivity());
129 } 131 }
130 132
131 // WebWorker ------------------------------------------------------------------- 133 // WebWorker -------------------------------------------------------------------
132 134
133 void WebWorkerImpl::startWorkerContext(const WebURL& script_url, 135 void WebWorkerImpl::startWorkerContext(const WebURL& script_url,
134 const WebString& user_agent, 136 const WebString& user_agent,
135 const WebString& source_code) { 137 const WebString& source_code) {
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 380
379 namespace WebKit { 381 namespace WebKit {
380 382
381 WebWorker* WebWorker::create(WebWorkerClient* client) { 383 WebWorker* WebWorker::create(WebWorkerClient* client) {
382 return NULL; 384 return NULL;
383 } 385 }
384 386
385 } 387 }
386 388
387 #endif 389 #endif
OLDNEW
« no previous file with comments | « webkit/api/src/ApplicationCacheHost.cpp ('k') | webkit/glue/webworkerclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698