summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-04 02:39:46 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-04 02:39:46 +0000
commit9b55d80fa4e4bc46edb05db7fc9c432f26aec698 (patch)
tree78659f07489bdffe2cc96415d030759aa3f45da5 /webkit/tools
parentca4c57582b55c83f493baa9c913611b35c9a6e25 (diff)
downloadchromium_src-9b55d80fa4e4bc46edb05db7fc9c432f26aec698.zip
chromium_src-9b55d80fa4e4bc46edb05db7fc9c432f26aec698.tar.gz
chromium_src-9b55d80fa4e4bc46edb05db7fc9c432f26aec698.tar.bz2
Update webkit/ to use WeakPtr<T>::get() instead of implicit "operator T*"
BUG=245942 TBR=darin@chromium.org Review URL: https://codereview.chromium.org/16335016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_dom_storage_system.cc4
-rw-r--r--webkit/tools/test_shell/simple_file_writer.cc6
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc
index 823b1d2..1acdc7b 100644
--- a/webkit/tools/test_shell/simple_dom_storage_system.cc
+++ b/webkit/tools/test_shell/simple_dom_storage_system.cc
@@ -40,7 +40,7 @@ class SimpleDomStorageSystem::NamespaceImpl : public WebStorageNamespace {
private:
DomStorageContext* Context() {
- if (!parent_)
+ if (!parent_.get())
return NULL;
return parent_->context_.get();
}
@@ -65,7 +65,7 @@ class SimpleDomStorageSystem::AreaImpl : public WebStorageArea {
private:
DomStorageHost* Host() {
- if (!parent_)
+ if (!parent_.get())
return NULL;
return parent_->host_.get();
}
diff --git a/webkit/tools/test_shell/simple_file_writer.cc b/webkit/tools/test_shell/simple_file_writer.cc
index a09df46..b6e15c6 100644
--- a/webkit/tools/test_shell/simple_file_writer.cc
+++ b/webkit/tools/test_shell/simple_file_writer.cc
@@ -113,7 +113,7 @@ class SimpleFileWriter::IOThreadProxy
base::Bind(&IOThreadProxy::DidSucceedOnMainThread, this));
return;
}
- if (simple_writer_)
+ if (simple_writer_.get())
simple_writer_->DidSucceed();
}
@@ -124,7 +124,7 @@ class SimpleFileWriter::IOThreadProxy
base::Bind(&IOThreadProxy::DidFailOnMainThread, this, error_code));
return;
}
- if (simple_writer_)
+ if (simple_writer_.get())
simple_writer_->DidFail(error_code);
}
@@ -136,7 +136,7 @@ class SimpleFileWriter::IOThreadProxy
this, bytes, complete));
return;
}
- if (simple_writer_)
+ if (simple_writer_.get())
simple_writer_->DidWrite(bytes, complete);
}