diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/common/fileapi | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/common/fileapi')
| -rw-r--r-- | chromium/content/common/fileapi/OWNERS | 1 | ||||
| -rw-r--r-- | chromium/content/common/fileapi/file_system_messages.h | 26 | ||||
| -rw-r--r-- | chromium/content/common/fileapi/webblob_messages.h | 12 |
3 files changed, 3 insertions, 36 deletions
diff --git a/chromium/content/common/fileapi/OWNERS b/chromium/content/common/fileapi/OWNERS index 4db30b6cede..76dd015b4ff 100644 --- a/chromium/content/common/fileapi/OWNERS +++ b/chromium/content/common/fileapi/OWNERS @@ -9,6 +9,5 @@ per-file *_messages*.h=cdn@chromium.org per-file *_messages*.h=cevans@chromium.org per-file *_messages*.h=inferno@chromium.org per-file *_messages*.h=jschuh@chromium.org -per-file *_messages*.h=palmer@chromium.org per-file *_messages*.h=tsepez@chromium.org per-file *_messages*.h=kenrb@chromium.org diff --git a/chromium/content/common/fileapi/file_system_messages.h b/chromium/content/common/fileapi/file_system_messages.h index 191bf9d96f4..727c6de54e4 100644 --- a/chromium/content/common/fileapi/file_system_messages.h +++ b/chromium/content/common/fileapi/file_system_messages.h @@ -74,12 +74,10 @@ IPC_MESSAGE_CONTROL2(FileSystemMsg_DidFail, // File system messages sent from the child process to the browser. // WebFrameClient::openFileSystem() message. -IPC_MESSAGE_CONTROL5(FileSystemHostMsg_Open, +IPC_MESSAGE_CONTROL3(FileSystemHostMsg_OpenFileSystem, int /* request_id */, GURL /* origin_url */, - fileapi::FileSystemType /* type */, - int64 /* requested_size */, - bool /* create */) + fileapi::FileSystemType /* type */) // WevFrameClient::resolveURL() message. IPC_MESSAGE_CONTROL2(FileSystemHostMsg_ResolveURL, @@ -105,7 +103,7 @@ IPC_MESSAGE_CONTROL3(FileSystemHostMsg_Copy, GURL /* dest path */) // WebFileSystem::remove() message. -IPC_MESSAGE_CONTROL3(FileSystemMsg_Remove, +IPC_MESSAGE_CONTROL3(FileSystemHostMsg_Remove, int /* request_id */, GURL /* path */, bool /* recursive */) @@ -166,16 +164,6 @@ IPC_MESSAGE_CONTROL2(FileSystemHostMsg_CancelWrite, int /* request id */, int /* id of request to cancel */) -// Pepper's OpenFile message. -IPC_MESSAGE_CONTROL3(FileSystemHostMsg_OpenPepperFile, - int /* request id */, - GURL /* file path */, - int /* pp_open_flags */) - -// Pepper's NotifyCloseFile message. -IPC_MESSAGE_CONTROL1(FileSystemHostMsg_NotifyCloseFile, - int /* file_open_id */) - // WebFileSystem::createSnapshotFileAndReadMetadata() message. IPC_MESSAGE_CONTROL2(FileSystemHostMsg_CreateSnapshotFile, int /* request_id */, @@ -191,11 +179,3 @@ IPC_MESSAGE_CONTROL1(FileSystemHostMsg_DidReceiveSnapshotFile, IPC_SYNC_MESSAGE_CONTROL1_1(FileSystemHostMsg_SyncGetPlatformPath, GURL /* file path */, base::FilePath /* platform_path */) - -// Pre- and post-update notifications for ppapi implementation. -IPC_MESSAGE_CONTROL1(FileSystemHostMsg_WillUpdate, - GURL /* file_path */) - -IPC_MESSAGE_CONTROL2(FileSystemHostMsg_DidUpdate, - GURL /* file_path */, - int64 /* delta */) diff --git a/chromium/content/common/fileapi/webblob_messages.h b/chromium/content/common/fileapi/webblob_messages.h index 92a98164ca5..b4399e7f472 100644 --- a/chromium/content/common/fileapi/webblob_messages.h +++ b/chromium/content/common/fileapi/webblob_messages.h @@ -39,18 +39,6 @@ IPC_MESSAGE_CONTROL2(BlobHostMsg_RegisterPublicURL, IPC_MESSAGE_CONTROL1(BlobHostMsg_RevokePublicURL, GURL) -// Temporary support for mapping old style blobUrls to new style uuids. -IPC_MESSAGE_CONTROL2(BlobHostMsg_DeprecatedRegisterBlobURL, - GURL, - std::string /* uuid */) -IPC_MESSAGE_CONTROL2(BlobHostMsg_DeprecatedCloneBlobURL, - GURL, - GURL) -IPC_MESSAGE_CONTROL1(BlobHostMsg_DeprecatedRevokeBlobURL, - GURL) - - - // Stream messages sent from the renderer to the browser. // Registers a stream as being built. |