diff options
Diffstat (limited to 'chromium/ppapi/native_client/src/trusted/plugin/file_downloader.h')
| -rw-r--r-- | chromium/ppapi/native_client/src/trusted/plugin/file_downloader.h | 131 |
1 files changed, 25 insertions, 106 deletions
diff --git a/chromium/ppapi/native_client/src/trusted/plugin/file_downloader.h b/chromium/ppapi/native_client/src/trusted/plugin/file_downloader.h index 4fd7997cc92..4a1a71accf8 100644 --- a/chromium/ppapi/native_client/src/trusted/plugin/file_downloader.h +++ b/chromium/ppapi/native_client/src/trusted/plugin/file_downloader.h @@ -9,10 +9,8 @@ #include "native_client/src/include/nacl_macros.h" #include "native_client/src/include/nacl_string.h" -#include "native_client/src/trusted/validator/nacl_file_info.h" -#include "ppapi/c/private/pp_file_handle.h" -#include "ppapi/c/private/ppb_file_io_private.h" -#include "ppapi/c/trusted/ppb_url_loader_trusted.h" +#include "native_client/src/public/nacl_file_info.h" +#include "ppapi/c/private/ppb_nacl_private.h" #include "ppapi/cpp/file_io.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/url_loader.h" @@ -25,18 +23,10 @@ namespace plugin { class Plugin; typedef enum { - DOWNLOAD_TO_FILE = 0, - DOWNLOAD_TO_BUFFER, - DOWNLOAD_STREAM, + DOWNLOAD_TO_BUFFER_AND_STREAM = 0, DOWNLOAD_NONE } DownloadMode; -typedef enum { - SCHEME_CHROME_EXTENSION, - SCHEME_DATA, - SCHEME_OTHER -} UrlSchemeType; - typedef std::vector<char>* FileStreamData; typedef CallbackSource<FileStreamData> StreamCallbackSource; typedef pp::CompletionCallbackWithOutput<FileStreamData> StreamCallback; @@ -45,85 +35,39 @@ typedef pp::CompletionCallbackWithOutput<FileStreamData> StreamCallback; // the url into a file and providing an open file descriptor. class FileDownloader { public: - // Ctor initializes |instance_| to NULL, be sure to call Initialize() before - // calling Open(), or Open() will fail. - FileDownloader() - : instance_(NULL), - file_open_notify_callback_(pp::BlockUntilComplete()), - stream_finish_callback_(pp::BlockUntilComplete()), - file_handle_(PP_kInvalidFileHandle), - file_io_private_interface_(NULL), - url_loader_trusted_interface_(NULL), - open_time_(-1), - mode_(DOWNLOAD_NONE), - open_and_stream_(true), - url_scheme_(SCHEME_OTHER), - data_stream_callback_source_(NULL) {} + explicit FileDownloader(Plugin* instance); ~FileDownloader() {} - // Initialize() can only be called once during the lifetime of this instance. - void Initialize(Plugin* instance); - // Issues a GET on |url| to start downloading the response into a file, // and finish streaming it. |callback| will be run after streaming is // done or if an error prevents streaming from completing. // Returns true when callback is scheduled to be called on success or failure. - // Returns false if callback is NULL, Initialize() has not been called or if - // the PPB_FileIO_Trusted interface is not available. + // Returns false if callback is NULL, or if the PPB_FileIO_Trusted interface + // is not available. // If |record_progress| is true, then download progress will be recorded, // and can be polled through GetDownloadProgress(). // If |progress_callback| is not NULL and |record_progress| is true, // then the callback will be invoked for every progress update received // by the loader. - bool Open(const nacl::string& url, - DownloadMode mode, - const pp::CompletionCallback& callback, - bool record_progress, - PP_URLLoaderTrusted_StatusCallback progress_callback); // Similar to Open(), but used for streaming the |url| data directly to the // caller without writing to a temporary file. The callbacks provided by // |stream_callback_source| are expected to copy the data before returning. // |callback| is called once the response headers are received, - // and streaming must be completed separately via FinishStreaming(). + // and streaming must be completed separately via BeginStreaming(). bool OpenStream(const nacl::string& url, const pp::CompletionCallback& callback, StreamCallbackSource* stream_callback_source); // Finish streaming the response body for a URL request started by either - // Open() or OpenStream(). If DownloadMode is DOWNLOAD_TO_FILE, - // then the response body is streamed to a file, the file is opened and - // a file descriptor is made available. Runs the given |callback| when - // streaming is done. - void FinishStreaming(const pp::CompletionCallback& callback); - - // Bypasses downloading and takes a handle to the open file. To get the fd, - // call GetFileInfo(). - void OpenFast(const nacl::string& url, PP_FileHandle file_handle, - uint64_t file_token_lo, uint64_t file_token_hi); - - // Return a structure describing the file opened, including a file desc. - // If downloading and opening succeeded, this returns a valid read-only - // POSIX file descriptor. On failure, the return value is an invalid - // descriptor. The file descriptor is owned by this instance, so the - // delegate does not have to close it. - struct NaClFileInfo GetFileInfo(); - - // Returns the time delta between the call to Open() and this function. - int64_t TimeSinceOpenMilliseconds() const; - - // The value of |url_| changes over the life of this instance. When the file - // is first opened, |url_| is a copy of the URL used to open the file, which - // can be a relative URL. Once the GET request has finished, and the contents - // of the file represented by |url_| are available, |url_| is the full URL - // including the scheme, host and full path. - const nacl::string& url() const { return url_; } - - // Returns the url passed to Open(). - const nacl::string& url_to_open() const { return url_to_open_; } - - // Returns the PP_Resource of the active URL loader, or kInvalidResource. - PP_Resource url_loader() const { return url_loader_.pp_resource(); } + // OpenStream(). Runs the given |callback| when streaming is done. + void BeginStreaming(const pp::CompletionCallback& callback); + + // Once the GET request has finished, and the contents of the file + // represented by |url_| are available, |full_url_| is the full URL including + // the scheme, host and full path. + // Returns an empty string before the GET request has finished. + const nacl::string& full_url() const { return full_url_; } // GetDownloadProgress() returns the current download progress, which is // meaningful after Open() has been called. Progress only refers to the @@ -138,14 +82,6 @@ class FileDownloader { bool GetDownloadProgress(int64_t* bytes_received, int64_t* total_bytes_to_be_received) const; - // Returns the buffer used for DOWNLOAD_TO_BUFFER mode. - const std::deque<char>& buffer() const { return buffer_; } - - bool streaming_to_file() const; - bool streaming_to_buffer() const; - bool streaming_to_user() const; - bool not_streaming() const; - int status_code() const { return status_code_; } nacl::string GetResponseHeaders() const; @@ -153,54 +89,37 @@ class FileDownloader { extra_request_headers_ = extra_request_headers; } - private: NACL_DISALLOW_COPY_AND_ASSIGN(FileDownloader); - // This class loads and opens the file in three steps for DOWNLOAD_TO_FILE: - // 1) Ask the browser to start streaming |url_| as a file. - // 2) Ask the browser to finish streaming if headers indicate success. - // 3) Ask the browser to open the file, so we can get the file descriptor. - // For DOWNLOAD_TO_BUFFER, the process is very similar: + + // For DOWNLOAD_TO_BUFFER_AND_STREAM, the process is very similar: // 1) Ask the browser to start streaming |url_| to an internal buffer. // 2) Ask the browser to finish streaming to |temp_buffer_| on success. - // 3) Wait for streaming to finish, filling |buffer_| incrementally. + // 3) Wait for streaming to finish, passing the data directly to the user. // Each step is done asynchronously using callbacks. We create callbacks // through a factory to take advantage of ref-counting. - // DOWNLOAD_STREAM is similar to DOWNLOAD_TO_BUFFER except the downloaded - // data is passed directly to the user instead of saved in a buffer. - // The public Open*() functions start step 1), and the public FinishStreaming + // The public Open*() functions start step 1), and the public BeginStreaming // function proceeds to step 2) and 3). bool InitialResponseIsValid(); void URLLoadStartNotify(int32_t pp_error); - void URLLoadFinishNotify(int32_t pp_error); void URLReadBodyNotify(int32_t pp_error); - void StreamFinishNotify(int32_t pp_error); - void GotFileHandleNotify(int32_t pp_error, PP_FileHandle handle); Plugin* instance_; - nacl::string url_to_open_; - nacl::string url_; + nacl::string full_url_; + nacl::string extra_request_headers_; pp::URLResponseInfo url_response_; pp::CompletionCallback file_open_notify_callback_; pp::CompletionCallback stream_finish_callback_; - pp::FileIO file_reader_; - PP_FileHandle file_handle_; - struct NaClFileToken file_token_; - const PPB_FileIO_Private* file_io_private_interface_; - const PPB_URLLoaderTrusted* url_loader_trusted_interface_; pp::URLLoader url_loader_; pp::CompletionCallbackFactory<FileDownloader> callback_factory_; - int64_t open_time_; int32_t status_code_; DownloadMode mode_; - bool open_and_stream_; - static const uint32_t kTempBufferSize = 2048; + static const uint32_t kTempBufferSize = 16384; std::vector<char> temp_buffer_; - std::deque<char> buffer_; - UrlSchemeType url_scheme_; StreamCallbackSource* data_stream_callback_source_; - NaClFileInfo cached_file_info_; }; -} // namespace plugin; + +} // namespace plugin + #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_FILE_DOWNLOADER_H_ |