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

Side by Side Diff: trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 21334002: Revert 214160 "Implement Worker-MainThread bridge for FileSystem..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 if (!web_idb_factory_) 400 if (!web_idb_factory_)
401 web_idb_factory_.reset( 401 web_idb_factory_.reset(
402 new RendererWebIDBFactoryImpl(thread_safe_sender_.get())); 402 new RendererWebIDBFactoryImpl(thread_safe_sender_.get()));
403 return web_idb_factory_.get(); 403 return web_idb_factory_.get();
404 } 404 }
405 405
406 //------------------------------------------------------------------------------ 406 //------------------------------------------------------------------------------
407 407
408 WebFileSystem* RendererWebKitPlatformSupportImpl::fileSystem() { 408 WebFileSystem* RendererWebKitPlatformSupportImpl::fileSystem() {
409 if (!web_file_system_) 409 if (!web_file_system_)
410 web_file_system_.reset(new WebFileSystemImpl(child_thread_loop_.get())); 410 web_file_system_.reset(new WebFileSystemImpl());
411 return web_file_system_.get(); 411 return web_file_system_.get();
412 } 412 }
413 413
414 //------------------------------------------------------------------------------ 414 //------------------------------------------------------------------------------
415 415
416 WebMimeRegistry::SupportsType 416 WebMimeRegistry::SupportsType
417 RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaMIMEType( 417 RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaMIMEType(
418 const WebString& mime_type, 418 const WebString& mime_type,
419 const WebString& codecs) { 419 const WebString& codecs) {
420 return supportsMediaMIMEType(mime_type, codecs, WebString()); 420 return supportsMediaMIMEType(mime_type, codecs, WebString());
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 return; 1154 return;
1155 QuotaDispatcher::ThreadSpecificInstance( 1155 QuotaDispatcher::ThreadSpecificInstance(
1156 thread_safe_sender_.get(), 1156 thread_safe_sender_.get(),
1157 quota_message_filter_.get())->QueryStorageUsageAndQuota( 1157 quota_message_filter_.get())->QueryStorageUsageAndQuota(
1158 storage_partition, 1158 storage_partition,
1159 static_cast<quota::StorageType>(type), 1159 static_cast<quota::StorageType>(type),
1160 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); 1160 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
1161 } 1161 }
1162 1162
1163 } // namespace content 1163 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/child/fileapi/webfilesystem_impl.cc ('k') | trunk/src/content/worker/worker_webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698