diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 17:01:18 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 17:01:18 +0000 |
| commit | 52bf465e9d660330d267d5b29c36fe3e9ce1d905 (patch) | |
| tree | 9f909ff5ab06c0065f7b6cbe97281c28bc7adaaf /webkit/glue/webworker_impl.cc | |
| parent | ff043d8475259c7fb700d529b82a964ad51c8d9a (diff) | |
| download | chromium_src-52bf465e9d660330d267d5b29c36fe3e9ce1d905.zip chromium_src-52bf465e9d660330d267d5b29c36fe3e9ce1d905.tar.gz chromium_src-52bf465e9d660330d267d5b29c36fe3e9ce1d905.tar.bz2 | |
Cleanup in webkit/glue to remove some dependencies.
Switch scoped_ptr to OwnPtr.
Switch base::RefCounted to WTF::RefCounted.
Switch string16/wstring to WebCore::String
Switch DCHECK to ASSERT.
Switch from Chromium #ifdefs to WebKit #ifdefs for ports.
R=dglazkov
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/292042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webworker_impl.cc')
| -rw-r--r-- | webkit/glue/webworker_impl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc index 5eda75a..ec943cd 100644 --- a/webkit/glue/webworker_impl.cc +++ b/webkit/glue/webworker_impl.cc @@ -22,7 +22,6 @@ #undef LOG -#include "base/logging.h" #include "webkit/api/public/WebFrameClient.h" #include "webkit/api/public/WebMessagePortChannel.h" #include "webkit/api/public/WebScreenInfo.h" @@ -118,7 +117,7 @@ void WebWorkerImpl::PostMessageToWorkerContextTask( WebWorkerImpl* this_ptr, const WebCore::String& message, WTF::PassOwnPtr<WebCore::MessagePortChannelArray> channels) { - DCHECK(context->isWorkerContext()); + ASSERT(context->isWorkerContext()); WebCore::DedicatedWorkerContext* worker_context = static_cast<WebCore::DedicatedWorkerContext*>(context); @@ -142,7 +141,7 @@ void WebWorkerImpl::startWorkerContext(const WebURL& script_url, // Create 'shadow page'. This page is never displayed, it is used to proxy the // loading requests from the worker context to the rest of WebKit and Chromium // infrastructure. - DCHECK(!web_view_); + ASSERT(!web_view_); web_view_ = WebView::create(NULL); WebPreferences().Apply(web_view_); web_view_->initializeMainFrame(WorkerWebFrameClient::GetSharedInstance()); |