summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc7
-rw-r--r--content/common/pepper_file_util.cc23
-rw-r--r--content/common/pepper_file_util.h18
-rw-r--r--content/content_common.gypi2
-rw-r--r--content/renderer/pepper/pepper_file_system_host.cc3
-rw-r--r--ppapi/shared_impl/DEPS1
-rw-r--r--ppapi/shared_impl/file_system_util.cc14
-rw-r--r--ppapi/shared_impl/file_system_util.h5
-rw-r--r--ppapi/shared_impl/host_resource.h2
9 files changed, 50 insertions, 25 deletions
diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc
index 5eec410..acebdc0 100644
--- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc
@@ -8,6 +8,7 @@
#include "base/callback.h"
#include "content/browser/renderer_host/pepper/pepper_file_io_host.h"
#include "content/browser/renderer_host/pepper/quota_reservation.h"
+#include "content/common/pepper_file_util.h"
#include "content/public/browser/browser_ppapi_host.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/plugin_service.h"
@@ -163,7 +164,7 @@ int32_t PepperFileSystemBrowserHost::OnHostMsgOpen(
called_open_ = true;
fileapi::FileSystemType file_system_type =
- ppapi::PepperFileSystemTypeToFileSystemType(type_);
+ PepperFileSystemTypeToFileSystemType(type_);
if (file_system_type == fileapi::kFileSystemTypeUnknown)
return PP_ERROR_FAILED;
@@ -426,7 +427,7 @@ bool PepperFileSystemBrowserHost::ShouldCreateQuotaReservation() const {
CHECK(quota_manager_proxy);
CHECK(quota_manager_proxy->quota_manager());
fileapi::FileSystemType file_system_type =
- ppapi::PepperFileSystemTypeToFileSystemType(type_);
+ PepperFileSystemTypeToFileSystemType(type_);
return !quota_manager_proxy->quota_manager()->IsStorageUnlimited(
root_url_.GetOrigin(),
fileapi::FileSystemTypeToQuotaStorageType(file_system_type));
@@ -441,7 +442,7 @@ void PepperFileSystemBrowserHost::CreateQuotaReservation(
base::Bind(&QuotaReservation::Create,
file_system_context_,
root_url_.GetOrigin(),
- ppapi::PepperFileSystemTypeToFileSystemType(type_)),
+ PepperFileSystemTypeToFileSystemType(type_)),
base::Bind(&PepperFileSystemBrowserHost::GotQuotaReservation,
weak_factory_.GetWeakPtr(),
callback));
diff --git a/content/common/pepper_file_util.cc b/content/common/pepper_file_util.cc
new file mode 100644
index 0000000..50ad86be
--- /dev/null
+++ b/content/common/pepper_file_util.cc
@@ -0,0 +1,23 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/common/pepper_file_util.h"
+
+namespace content {
+
+fileapi::FileSystemType PepperFileSystemTypeToFileSystemType(
+ PP_FileSystemType type) {
+ switch (type) {
+ case PP_FILESYSTEMTYPE_LOCALTEMPORARY:
+ return fileapi::kFileSystemTypeTemporary;
+ case PP_FILESYSTEMTYPE_LOCALPERSISTENT:
+ return fileapi::kFileSystemTypePersistent;
+ case PP_FILESYSTEMTYPE_EXTERNAL:
+ return fileapi::kFileSystemTypeExternal;
+ default:
+ return fileapi::kFileSystemTypeUnknown;
+ }
+}
+
+} // namespace content
diff --git a/content/common/pepper_file_util.h b/content/common/pepper_file_util.h
new file mode 100644
index 0000000..7766332
--- /dev/null
+++ b/content/common/pepper_file_util.h
@@ -0,0 +1,18 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_COMMON_PEPPER_FILE_UTIL_H_
+#define CONTENT_COMMON_PEPPER_FILE_UTIL_H_
+
+#include "ppapi/c/pp_file_info.h"
+#include "webkit/common/fileapi/file_system_types.h"
+
+namespace content {
+
+fileapi::FileSystemType PepperFileSystemTypeToFileSystemType(
+ PP_FileSystemType type);
+
+} // namespace content
+
+#endif // CONTENT_COMMON_PEPPER_FILE_UTIL_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index e46690c..9d780a2 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -407,6 +407,8 @@
'common/page_state_serialization.cc',
'common/page_state_serialization.h',
'common/page_zoom.cc',
+ 'common/pepper_file_util.cc',
+ 'common/pepper_file_util.h',
'common/pepper_messages.h',
'common/pepper_plugin_list.cc',
'common/pepper_plugin_list.h',
diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc
index 036d319..229428d 100644
--- a/content/renderer/pepper/pepper_file_system_host.cc
+++ b/content/renderer/pepper/pepper_file_system_host.cc
@@ -8,6 +8,7 @@
#include "base/callback.h"
#include "content/child/child_thread.h"
#include "content/child/fileapi/file_system_dispatcher.h"
+#include "content/common/pepper_file_util.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/public/renderer/render_view.h"
#include "content/public/renderer/renderer_ppapi_host.h"
@@ -92,7 +93,7 @@ int32_t PepperFileSystemHost::OnHostMsgOpen(
called_open_ = true;
fileapi::FileSystemType file_system_type =
- ppapi::PepperFileSystemTypeToFileSystemType(type_);
+ PepperFileSystemTypeToFileSystemType(type_);
if (file_system_type == fileapi::kFileSystemTypeUnknown)
return PP_ERROR_FAILED;
diff --git a/ppapi/shared_impl/DEPS b/ppapi/shared_impl/DEPS
index 3b00152..03701c8 100644
--- a/ppapi/shared_impl/DEPS
+++ b/ppapi/shared_impl/DEPS
@@ -5,7 +5,6 @@ include_rules = [
"+media/base",
"+skia",
"+ui/events",
- "+webkit/common/fileapi/file_system_types.h",
"-ppapi/cpp",
"-ppapi/proxy",
diff --git a/ppapi/shared_impl/file_system_util.cc b/ppapi/shared_impl/file_system_util.cc
index 330995c..25650d1 100644
--- a/ppapi/shared_impl/file_system_util.cc
+++ b/ppapi/shared_impl/file_system_util.cc
@@ -8,20 +8,6 @@
namespace ppapi {
-fileapi::FileSystemType PepperFileSystemTypeToFileSystemType(
- PP_FileSystemType type) {
- switch (type) {
- case PP_FILESYSTEMTYPE_LOCALTEMPORARY:
- return fileapi::kFileSystemTypeTemporary;
- case PP_FILESYSTEMTYPE_LOCALPERSISTENT:
- return fileapi::kFileSystemTypePersistent;
- case PP_FILESYSTEMTYPE_EXTERNAL:
- return fileapi::kFileSystemTypeExternal;
- default:
- return fileapi::kFileSystemTypeUnknown;
- }
-}
-
bool FileSystemTypeIsValid(PP_FileSystemType type) {
return (type == PP_FILESYSTEMTYPE_LOCALPERSISTENT ||
type == PP_FILESYSTEMTYPE_LOCALTEMPORARY ||
diff --git a/ppapi/shared_impl/file_system_util.h b/ppapi/shared_impl/file_system_util.h
index 5b39f69..bb7e8c7 100644
--- a/ppapi/shared_impl/file_system_util.h
+++ b/ppapi/shared_impl/file_system_util.h
@@ -10,14 +10,9 @@
#include "ppapi/c/pp_file_info.h"
#include "ppapi/c/private/ppb_isolated_file_system_private.h"
#include "ppapi/shared_impl/ppapi_shared_export.h"
-#include "webkit/common/fileapi/file_system_types.h"
namespace ppapi {
-PPAPI_SHARED_EXPORT
-fileapi::FileSystemType PepperFileSystemTypeToFileSystemType(
- PP_FileSystemType type);
-
PPAPI_SHARED_EXPORT bool FileSystemTypeIsValid(PP_FileSystemType type);
PPAPI_SHARED_EXPORT bool FileSystemTypeHasQuota(PP_FileSystemType type);
diff --git a/ppapi/shared_impl/host_resource.h b/ppapi/shared_impl/host_resource.h
index 6770a52..3c49090 100644
--- a/ppapi/shared_impl/host_resource.h
+++ b/ppapi/shared_impl/host_resource.h
@@ -18,7 +18,7 @@ namespace ppapi {
//
// Old style resources match these file specs:
// Proxy: ppapi/proxy/ppb_*_proxy.*
-// Host: webkit/plugins/ppapi/*
+// Host: content/ppapi_plugin/*
// New style resources match these file specs:
// Proxy: ppapi/proxy/*_resource.*
// Browser: (content|chrome)/browser/renderer_host/pepper/pepper_*_host.*
generated by cgit v1.1 at 2024-09-22 01:29:42 +0000