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

Side by Side Diff: webkit/tools/test_shell/test_worker/test_webworker.cc

Issue 149575: Roll WebKit DEPS from 45738 to 45840. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | Annotate | Revision Log
« no previous file with comments | « webkit/tools/test_shell/test_worker/test_webworker.h ('k') | webkit/webkit.gyp » ('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 #if ENABLE(WORKERS) 7 #if ENABLE(WORKERS)
8 8
9 #include "webkit/tools/test_shell/test_worker/test_webworker.h" 9 #include "webkit/tools/test_shell/test_worker/test_webworker.h"
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const WebString& source_url) { 80 const WebString& source_url) {
81 if (webworkerclient_delegate_) 81 if (webworkerclient_delegate_)
82 webworkerclient_delegate_->postExceptionToWorkerObject(error_message, 82 webworkerclient_delegate_->postExceptionToWorkerObject(error_message,
83 line_number, 83 line_number,
84 source_url); 84 source_url);
85 } 85 }
86 86
87 void TestWebWorker::postConsoleMessageToWorkerObject( 87 void TestWebWorker::postConsoleMessageToWorkerObject(
88 int destination_id, 88 int destination_id,
89 int source_id, 89 int source_id,
90 int message_type,
90 int message_level, 91 int message_level,
91 const WebString& message, 92 const WebString& message,
92 int line_number, 93 int line_number,
93 const WebString& source_url) { 94 const WebString& source_url) {
94 if (webworkerclient_delegate_) 95 if (webworkerclient_delegate_)
95 webworkerclient_delegate_->postConsoleMessageToWorkerObject( 96 webworkerclient_delegate_->postConsoleMessageToWorkerObject(
96 destination_id, source_id, message_level, message, line_number, 97 destination_id, source_id, message_type, message_level,
97 source_url); 98 message, line_number, source_url);
98 } 99 }
99 100
100 void TestWebWorker::confirmMessageFromWorkerObject(bool has_pending_activity) { 101 void TestWebWorker::confirmMessageFromWorkerObject(bool has_pending_activity) {
101 if (webworkerclient_delegate_) 102 if (webworkerclient_delegate_)
102 webworkerclient_delegate_->confirmMessageFromWorkerObject( 103 webworkerclient_delegate_->confirmMessageFromWorkerObject(
103 has_pending_activity); 104 has_pending_activity);
104 } 105 }
105 106
106 void TestWebWorker::reportPendingActivity(bool has_pending_activity) { 107 void TestWebWorker::reportPendingActivity(bool has_pending_activity) {
107 if (webworkerclient_delegate_) 108 if (webworkerclient_delegate_)
108 webworkerclient_delegate_->reportPendingActivity(has_pending_activity); 109 webworkerclient_delegate_->reportPendingActivity(has_pending_activity);
109 } 110 }
110 111
111 void TestWebWorker::workerContextDestroyed() { 112 void TestWebWorker::workerContextDestroyed() {
112 webworker_impl_ = NULL; 113 webworker_impl_ = NULL;
113 if (webworkerclient_delegate_) 114 if (webworkerclient_delegate_)
114 webworkerclient_delegate_->workerContextDestroyed(); 115 webworkerclient_delegate_->workerContextDestroyed();
115 Release(); // Releases the reference held for worker context object. 116 Release(); // Releases the reference held for worker context object.
116 } 117 }
117 118
118 #endif 119 #endif
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_worker/test_webworker.h ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698