Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: webkit/plugins/ppapi/ppb_file_io_impl.cc

Issue 7433006: Pepper quota support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/ppapi/ppb_file_io_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_file_io_impl.cc b/webkit/plugins/ppapi/ppb_file_io_impl.cc
index 309067cd1b5cbf51783770aa46f8c63a8acff00a..6cc4e1f1533db69ff2a577e0643fbe71579e20a3 100644
--- a/webkit/plugins/ppapi/ppb_file_io_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_io_impl.cc
@@ -4,7 +4,6 @@
#include "webkit/plugins/ppapi/ppb_file_io_impl.h"
-#include "base/callback.h"
#include "base/file_util.h"
#include "base/file_util_proxy.h"
#include "base/message_loop_proxy.h"
@@ -18,12 +17,14 @@
#include "ppapi/shared_impl/time_conversion.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_file_ref_api.h"
+#include "webkit/fileapi/file_system_util.h"
#include "webkit/plugins/ppapi/common.h"
#include "webkit/plugins/ppapi/file_type_conversions.h"
#include "webkit/plugins/ppapi/plugin_module.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
#include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
#include "webkit/plugins/ppapi/resource_tracker.h"
+#include "webkit/quota/quota_client.h"
using ppapi::PPTimeToTime;
using ppapi::TimeToPPTime;
@@ -34,6 +35,25 @@ using ppapi::thunk::PPB_FileRef_API;
namespace webkit {
namespace ppapi {
+namespace {
+quota::StorageType PPFileSystemTypeToQuotaStorageType(PP_FileSystemType type) {
+ switch (type) {
+ case PP_FILESYSTEMTYPE_LOCALPERSISTENT:
+ return quota::kStorageTypePersistent;
+ case PP_FILESYSTEMTYPE_LOCALTEMPORARY:
+ return quota::kStorageTypeTemporary;
+ default:
+ return quota::kStorageTypeUnknown;
+ }
+ NOTREACHED();
+}
+
+bool DoesRequireQuotaCheck(PP_FileSystemType type) {
+ return (type == PP_FILESYSTEMTYPE_LOCALTEMPORARY ||
+ type == PP_FILESYSTEMTYPE_LOCALPERSISTENT);
+}
+} // anonymous namespace
+
PPB_FileIO_Impl::CallbackEntry::CallbackEntry()
: read_buffer(NULL) {
}
@@ -51,7 +71,8 @@ PPB_FileIO_Impl::PPB_FileIO_Impl(PluginInstance* instance)
ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)),
file_(base::kInvalidPlatformFileValue),
pending_op_(OPERATION_NONE),
- info_(NULL) {
+ info_(NULL),
+ pending_setlength_length_(-1) {
}
PPB_FileIO_Impl::~PPB_FileIO_Impl() {
@@ -88,13 +109,16 @@ int32_t PPB_FileIO_Impl::Open(PP_Resource pp_file_ref,
return PP_ERROR_FAILED;
break;
case PP_FILESYSTEMTYPE_LOCALPERSISTENT:
- case PP_FILESYSTEMTYPE_LOCALTEMPORARY:
+ case PP_FILESYSTEMTYPE_LOCALTEMPORARY: {
+ GURL root_url = file_ref->GetFileSystemURL();
if (!instance()->delegate()->AsyncOpenFileSystemURL(
- file_ref->GetFileSystemURL(), flags,
+ root_url, flags,
callback_factory_.NewCallback(
&PPB_FileIO_Impl::AsyncOpenFileCallback)))
return PP_ERROR_FAILED;
+ origin_url_ = GURL(root_url.path()).GetOrigin();
break;
+ }
default:
return PP_ERROR_FAILED;
}
@@ -168,11 +192,31 @@ int32_t PPB_FileIO_Impl::Write(int64_t offset,
if (rv != PP_OK)
return rv;
- if (!base::FileUtilProxy::Write(
- instance()->delegate()->GetFileThreadMessageLoopProxy(),
- file_, offset, buffer, bytes_to_write,
- callback_factory_.NewCallback(&PPB_FileIO_Impl::WriteCallback)))
- return PP_ERROR_FAILED;
+ PendingWrite write;
+ write.offset = offset;
+ write.buffer = buffer;
+ write.bytes_to_write = bytes_to_write;
+
+ int64 expected_growth = offset + bytes_to_write - file_size_;
yzshen1 2011/07/19 17:41:55 It is possible that this method gets called for mu
michaeln 2011/07/19 22:01:45 I have these concerns too, keeping track of filesi
kinuko 2011/07/20 13:39:35 Putting aside the fact that the current design is
+ if (!DoesRequireQuotaCheck(file_system_type_) ||
+ expected_growth <= 0) {
+ // we're ok to go.
+ pending_write_callbacks_.push(write);
+ if (!base::FileUtilProxy::Write(
+ instance()->delegate()->GetFileThreadMessageLoopProxy(),
+ file_, offset, buffer, bytes_to_write,
+ callback_factory_.NewCallback(&PPB_FileIO_Impl::WriteCallback))) {
+ pending_write_callbacks_.pop();
+ return PP_ERROR_FAILED;
+ }
+ } else {
+ pending_writes_.push(write);
+ instance()->delegate()->CanWrite(
+ origin_url_,
+ PPFileSystemTypeToQuotaStorageType(file_system_type_),
+ expected_growth,
+ callback_factory_.NewCallback(&PPB_FileIO_Impl::DidCheckQuotaForWrite));
+ }
RegisterCallback(OPERATION_WRITE, callback, NULL);
return PP_OK_COMPLETIONPENDING;
@@ -184,11 +228,28 @@ int32_t PPB_FileIO_Impl::SetLength(int64_t length,
if (rv != PP_OK)
return rv;
- if (!base::FileUtilProxy::Truncate(
- instance()->delegate()->GetFileThreadMessageLoopProxy(),
- file_, length,
- callback_factory_.NewCallback(&PPB_FileIO_Impl::StatusCallback)))
- return PP_ERROR_FAILED;
+ DCHECK_EQ(-1, pending_setlength_length_);
michaeln 2011/07/19 22:01:45 What guarantees are there that there's only one Se
kinuko 2011/07/20 13:39:35 Seems like EXCLUSIVE operations cannot run in para
yzshen1 2011/07/20 20:50:36 Yes, that is correct. On 2011/07/20 13:39:35, kin
+ pending_setlength_length_ = length;
+
+ int64 expected_growth = length - file_size_;
+ if (!DoesRequireQuotaCheck(file_system_type_) ||
+ expected_growth <= 0) {
+ if (!base::FileUtilProxy::Truncate(
+ instance()->delegate()->GetFileThreadMessageLoopProxy(),
+ file_, length,
+ callback_factory_.NewCallback(
+ &PPB_FileIO_Impl::SetLengthCallback))) {
+ pending_setlength_length_ = -1;
+ return PP_ERROR_FAILED;
+ }
+ } else {
+ instance()->delegate()->CanWrite(
+ origin_url_,
+ PPFileSystemTypeToQuotaStorageType(file_system_type_),
+ expected_growth,
+ callback_factory_.NewCallback(
+ &PPB_FileIO_Impl::DidCheckQuotaForSetLength));
+ }
RegisterCallback(OPERATION_EXCLUSIVE, callback, NULL);
return PP_OK_COMPLETIONPENDING;
@@ -304,7 +365,8 @@ void PPB_FileIO_Impl::StatusCallback(base::PlatformFileError error_code) {
void PPB_FileIO_Impl::AsyncOpenFileCallback(
base::PlatformFileError error_code,
- base::PassPlatformFile file) {
+ base::PassPlatformFile file,
+ int64_t file_size) {
if (pending_op_ != OPERATION_EXCLUSIVE || callbacks_.empty()) {
NOTREACHED();
return;
@@ -312,6 +374,7 @@ void PPB_FileIO_Impl::AsyncOpenFileCallback(
DCHECK(file_ == base::kInvalidPlatformFileValue);
file_ = file.ReleaseValue();
+ file_size_ = file_size;
RunAndRemoveFirstPendingCallback(PlatformFileErrorToPepperError(error_code));
}
@@ -369,13 +432,77 @@ void PPB_FileIO_Impl::WriteCallback(base::PlatformFileError error_code,
return;
}
+ DCHECK(!pending_write_callbacks_.empty());
+ PendingWrite write = pending_write_callbacks_.front();
+ pending_write_callbacks_.pop();
+
if (error_code != base::PLATFORM_FILE_OK) {
RunAndRemoveFirstPendingCallback(
PlatformFileErrorToPepperError(error_code));
} else {
+ int64 growth = write.offset + bytes_written - file_size_;
+ if (growth >= 0) {
+ if (DoesRequireQuotaCheck(file_system_type_)) {
+ instance()->delegate()->NotifyStorageModified(
+ quota::QuotaClient::kFileSystem,
+ origin_url_,
+ PPFileSystemTypeToQuotaStorageType(file_system_type_),
+ growth);
+ }
+ file_size_ += growth;
+ }
RunAndRemoveFirstPendingCallback(bytes_written);
}
}
+void PPB_FileIO_Impl::SetLengthCallback(
+ base::PlatformFileError error_code) {
+ if (callbacks_.empty()) {
+ NOTREACHED();
+ return;
+ }
+
+ DCHECK_NE(-1, pending_setlength_length_);
+
+ if (base::PLATFORM_FILE_OK == error_code &&
+ DoesRequireQuotaCheck(file_system_type_)) {
+ int64 delta = pending_setlength_length_ - file_size_;
+ instance()->delegate()->NotifyStorageModified(
+ quota::QuotaClient::kFileSystem,
+ origin_url_,
+ PPFileSystemTypeToQuotaStorageType(file_system_type_),
+ delta);
+ }
+
+ RunAndRemoveFirstPendingCallback(PlatformFileErrorToPepperError(error_code));
michaeln 2011/07/19 22:01:45 Now that some of these operations call out the the
yzshen1 2011/07/19 23:14:14 What is more, the order of multiple write operatio
kinuko 2011/07/20 13:39:35 I splitted the callbacks queue into two, one for r
+ file_size_ = pending_setlength_length_;
yzshen1 2011/07/19 17:41:55 Even if it failed, we still set file_size_ to pend
kinuko 2011/07/20 13:39:35 Good catch... fixed.
+ pending_setlength_length_ = -1;
+}
+
+void PPB_FileIO_Impl::DidCheckQuotaForWrite(bool success) {
yzshen1 2011/07/19 17:41:55 This method and DidCheckQuotaForSetLength ignore |
+ DCHECK(!pending_writes_.empty());
+ PendingWrite write = pending_writes_.front();
+ pending_writes_.pop();
+ pending_write_callbacks_.push(write);
+
+ if (!base::FileUtilProxy::Write(
+ instance()->delegate()->GetFileThreadMessageLoopProxy(),
+ file_, write.offset, write.buffer, write.bytes_to_write,
+ callback_factory_.NewCallback(&PPB_FileIO_Impl::WriteCallback))) {
+ RunAndRemoveFirstPendingCallback(PP_ERROR_FAILED);
+ }
+}
+
+void PPB_FileIO_Impl::DidCheckQuotaForSetLength(bool success) {
+ DCHECK(!pending_setlength_length_ != -1);
+ if (!base::FileUtilProxy::Truncate(
+ instance()->delegate()->GetFileThreadMessageLoopProxy(),
+ file_, pending_setlength_length_,
+ callback_factory_.NewCallback(
+ &PPB_FileIO_Impl::SetLengthCallback))) {
+ RunAndRemoveFirstPendingCallback(PP_ERROR_FAILED);
+ }
+}
+
} // namespace ppapi
} // namespace webkit
« webkit/plugins/ppapi/ppb_file_io_impl.h ('K') | « webkit/plugins/ppapi/ppb_file_io_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698