content/browser/fileapi/fileapi_message_filter.h - Issue 15817013: Add Stream support to WebBlobRegistry and FileAPIMessageFilter.

Unified Diff: content/browser/fileapi/fileapi_message_filter.h

Issue 15817013: Add Stream support to WebBlobRegistry and FileAPIMessageFilter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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: content/browser/fileapi/fileapi_message_filter.h

diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h

index e57d05d0f0dfd52a8ca77150af43bf4d35e9a037..ae542bc4bfd6df596bc98e1bd866067621c157d3 100644

--- a/content/browser/fileapi/fileapi_message_filter.h

+++ b/content/browser/fileapi/fileapi_message_filter.h

@@ -13,8 +13,11 @@

#include "base/containers/hash_tables.h"

#include "base/files/file_util_proxy.h"

#include "base/id_map.h"

+#include "base/memory/ref_counted.h"

#include "base/platform_file.h"

#include "base/shared_memory.h"

+#include "content/browser/streams/stream.h"

+#include "content/browser/streams/stream_context.h"

#include "content/public/browser/browser_message_filter.h"

#include "webkit/browser/fileapi/file_system_operation_runner.h"

#include "webkit/common/blob/blob_data.h"

@@ -53,13 +56,15 @@ class FileAPIMessageFilter : public BrowserMessageFilter {

int process_id,

net::URLRequestContextGetter* request_context_getter,

fileapi::FileSystemContext* file_system_context,

- ChromeBlobStorageContext* blob_storage_context);

+ ChromeBlobStorageContext* blob_storage_context,

+ StreamContext* stream_context);

// Used by the worker process host on the IO thread.

FileAPIMessageFilter(

int process_id,

net::URLRequestContext* request_context,

fileapi::FileSystemContext* file_system_context,

- ChromeBlobStorageContext* blob_storage_context);

+ ChromeBlobStorageContext* blob_storage_context,

+ StreamContext* stream_context);

// BrowserMessageFilter implementation.

virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;

@@ -121,6 +126,7 @@ class FileAPIMessageFilter : public BrowserMessageFilter {

void OnDidReceiveSnapshotFile(int request_id);

void OnStartBuildingBlob(const GURL& url);

+ void OnStartBuildingStream(const GURL& url, const std::string& content_type);

void OnAppendBlobDataItem(const GURL& url,

const webkit_blob::BlobData::Item& item);

void OnAppendSharedMemory(const GURL& url, base::SharedMemoryHandle handle,

@@ -168,6 +174,8 @@ class FileAPIMessageFilter : public BrowserMessageFilter {

int permissions,

base::PlatformFileError* error);

+ scoped_refptr<Stream> GetStreamForURL(const GURL& url);

fileapi::FileSystemOperationRunner* operation_runner();

int process_id_;

@@ -185,6 +193,7 @@ class FileAPIMessageFilter : public BrowserMessageFilter {

net::URLRequestContext* request_context_;

scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;

+ scoped_refptr<StreamContext> stream_context_;

michaeln 2013/06/24 20:48:17 This separate 'context' class in the content layer

tyoshino (SeeGerritForStatus) 2013/06/25 08:38:00 I think we can merge them into one. I'll try.

// Keep track of blob URLs registered in this process. Need to unregister

// all of them when the renderer process dies.

« no previous file with comments | « no previous file | content/browser/fileapi/fileapi_message_filter.cc » ('j') | content/child/webblobregistry_impl.cc » ('J')