summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_file_ref_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 21:16:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 21:16:06 +0000
commit2040e30fc671f33cd42716dc32957bbbef54321b (patch)
tree04e71f4627d9afae37e8508b09d33709520d0224 /ppapi/proxy/ppb_file_ref_proxy.cc
parent159ffc1ba1d4846e7b7c459f5c098c581436ef82 (diff)
downloadchromium_src-2040e30fc671f33cd42716dc32957bbbef54321b.zip
chromium_src-2040e30fc671f33cd42716dc32957bbbef54321b.tar.gz
chromium_src-2040e30fc671f33cd42716dc32957bbbef54321b.tar.bz2
Revert 113656 - Implement a proxy for Pepper FileIO.
This splits apart the old in-process implementation into a new object in shared_impl that does most of the general tracking. This alllows that code to be shared by the proxy. BUG=http://crbug.com/101154 Review URL: http://codereview.chromium.org/8764003 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8890037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_file_ref_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_file_ref_proxy.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/ppapi/proxy/ppb_file_ref_proxy.cc b/ppapi/proxy/ppb_file_ref_proxy.cc
index e481f86..20b522c 100644
--- a/ppapi/proxy/ppb_file_ref_proxy.cc
+++ b/ppapi/proxy/ppb_file_ref_proxy.cc
@@ -33,9 +33,6 @@ class FileRef : public PPB_FileRef_Shared {
explicit FileRef(const PPB_FileRef_CreateInfo& info);
virtual ~FileRef();
- // Resource overrides.
- virtual void LastPluginRefWasDeleted() OVERRIDE;
-
// PPB_FileRef_API implementation (not provided by PPB_FileRef_Shared).
virtual PP_Resource GetParent() OVERRIDE;
virtual int32_t MakeDirectory(PP_Bool make_ancestors,
@@ -80,11 +77,6 @@ FileRef::FileRef(const PPB_FileRef_CreateInfo& info)
}
FileRef::~FileRef() {
- // The callbacks map should have been cleared by LastPluginRefWasDeleted.
- DCHECK(pending_callbacks_.empty());
-}
-
-void FileRef::LastPluginRefWasDeleted() {
// Abort all pending callbacks. Do this by posting a task to avoid reentering
// the plugin's Release() call that probably deleted this object.
for (PendingCallbackMap::iterator i = pending_callbacks_.begin();
@@ -93,7 +85,6 @@ void FileRef::LastPluginRefWasDeleted() {
i->second.func, i->second.user_data,
static_cast<int32_t>(PP_ERROR_ABORTED)));
}
- pending_callbacks_.clear();
}
PP_Resource FileRef::GetParent() {