summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 14:02:00 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 14:02:00 +0000
commitb082d58a1be56142aba3b0fcee84e9de9cac2758 (patch)
tree38014c5633299f81b643142cb6b36a6355772fea /webkit
parent5aece6995874d0bb501fb0fa657bb6536ea5609a (diff)
downloadchromium_src-b082d58a1be56142aba3b0fcee84e9de9cac2758.zip
chromium_src-b082d58a1be56142aba3b0fcee84e9de9cac2758.tar.gz
chromium_src-b082d58a1be56142aba3b0fcee84e9de9cac2758.tar.bz2
Pepper: Autogenerate thunk for PPB_URL_Loader.
This requires another annotation: "always_set_output_parameters" This annotation ensures that the thunk implementation will zero-out the value of all output parameters on failure. Tested: Built chrome and browser_tests. BUG= Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=194613 Review URL: https://codereview.chromium.org/14007010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppb_url_loader_impl.cc2
-rw-r--r--webkit/plugins/ppapi/ppb_url_loader_impl.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.cc b/webkit/plugins/ppapi/ppb_url_loader_impl.cc
index ebe08ef..58397b8 100644
--- a/webkit/plugins/ppapi/ppb_url_loader_impl.cc
+++ b/webkit/plugins/ppapi/ppb_url_loader_impl.cc
@@ -311,7 +311,7 @@ void PPB_URLLoader_Impl::GrantUniversalAccess() {
has_universal_access_ = true;
}
-void PPB_URLLoader_Impl::SetStatusCallback(
+void PPB_URLLoader_Impl::RegisterStatusCallback(
PP_URLLoaderTrusted_StatusCallback cb) {
status_callback_ = cb;
}
diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.h b/webkit/plugins/ppapi/ppb_url_loader_impl.h
index 51b9534..bb4ea3a 100644
--- a/webkit/plugins/ppapi/ppb_url_loader_impl.h
+++ b/webkit/plugins/ppapi/ppb_url_loader_impl.h
@@ -61,7 +61,7 @@ class PPB_URLLoader_Impl : public ::ppapi::Resource,
scoped_refptr< ::ppapi::TrackedCallback> callback) OVERRIDE;
virtual void Close() OVERRIDE;
virtual void GrantUniversalAccess() OVERRIDE;
- virtual void SetStatusCallback(
+ virtual void RegisterStatusCallback(
PP_URLLoaderTrusted_StatusCallback cb) OVERRIDE;
virtual bool GetResponseInfoData(
::ppapi::URLResponseInfoData* data) OVERRIDE;