diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 23:20:46 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 23:20:46 +0000 |
| commit | 2da8d317072968241f986ffed0be477900831889 (patch) | |
| tree | 761eedfabaaba837480c3604c0cfcf10e8d7d07c /webkit/glue/webworkerclient_impl.h | |
| parent | b9a0b1b39c5bcf551178cab7a2aa5f24d5afc929 (diff) | |
| download | chromium_src-2da8d317072968241f986ffed0be477900831889.zip chromium_src-2da8d317072968241f986ffed0be477900831889.tar.gz chromium_src-2da8d317072968241f986ffed0be477900831889.tar.bz2 | |
Reland changes to enable worker layout tests. Compared to last review (http://codereview.chromium.org/50045), the following changes are made:
1) Add chrome/test/worker/DEPS to address checkdeps error.
2) Change test_expectations.txt to skip some worker layout tests.
3) Add test_worker.vcproj to webkit.sln so that test_worker.dll can be built for WebKit build.
Review URL: http://codereview.chromium.org/56074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webworkerclient_impl.h')
| -rw-r--r-- | webkit/glue/webworkerclient_impl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/glue/webworkerclient_impl.h b/webkit/glue/webworkerclient_impl.h index 4c8277c..5a8a4cd 100644 --- a/webkit/glue/webworkerclient_impl.h +++ b/webkit/glue/webworkerclient_impl.h @@ -7,7 +7,6 @@ #if ENABLE(WORKERS) -#include "base/scoped_ptr.h" #include "webkit/glue/webworkerclient.h" #include "WorkerContextProxy.h" @@ -61,7 +60,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy, WTF::RefPtr<WebCore::ScriptExecutionContext> script_execution_context_; WebCore::Worker* worker_; - scoped_ptr<WebWorker> webworker_; + WebWorker* webworker_; bool asked_to_terminate_; uint32 unconfirmed_message_count_; bool worker_context_had_pending_activity_; |