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

Side by Side Diff: Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

Issue 10270006: Merge 113138 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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 | « Source/WebKit/chromium/src/WebWorkerClientImpl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 m_proxy->updateInspectorStateCookie(cookie); 142 m_proxy->updateInspectorStateCookie(cookie);
143 } 143 }
144 #endif // ENABLE(INSPECTOR) 144 #endif // ENABLE(INSPECTOR)
145 145
146 146
147 void WebWorkerClientImpl::postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Ta sk> task) 147 void WebWorkerClientImpl::postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Ta sk> task)
148 { 148 {
149 m_proxy->postTaskToLoader(task); 149 m_proxy->postTaskToLoader(task);
150 } 150 }
151 151
152 void WebWorkerClientImpl::postTaskForModeToWorkerContext(PassOwnPtr<ScriptExecut ionContext::Task> task, const String& mode) 152 bool WebWorkerClientImpl::postTaskForModeToWorkerContext(PassOwnPtr<ScriptExecut ionContext::Task> task, const String& mode)
153 { 153 {
154 m_proxy->postTaskForModeToWorkerContext(task, mode); 154 m_proxy->postTaskForModeToWorkerContext(task, mode);
155 return true;
155 } 156 }
156 157
157 void WebWorkerClientImpl::postMessageToWorkerObject(PassRefPtr<SerializedScriptV alue> value, PassOwnPtr<MessagePortChannelArray> ports) 158 void WebWorkerClientImpl::postMessageToWorkerObject(PassRefPtr<SerializedScriptV alue> value, PassOwnPtr<MessagePortChannelArray> ports)
158 { 159 {
159 m_proxy->postMessageToWorkerObject(value, ports); 160 m_proxy->postMessageToWorkerObject(value, ports);
160 } 161 }
161 162
162 void WebWorkerClientImpl::confirmMessageFromWorkerObject(bool hasPendingActivity ) 163 void WebWorkerClientImpl::confirmMessageFromWorkerObject(bool hasPendingActivity )
163 { 164 {
164 m_proxy->confirmMessageFromWorkerObject(hasPendingActivity); 165 m_proxy->confirmMessageFromWorkerObject(hasPendingActivity);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 { 240 {
240 } 241 }
241 242
242 WebWorkerClientImpl::~WebWorkerClientImpl() 243 WebWorkerClientImpl::~WebWorkerClientImpl()
243 { 244 {
244 } 245 }
245 246
246 } // namespace WebKit 247 } // namespace WebKit
247 248
248 #endif 249 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebWorkerClientImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698