summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authoralexis.menard@intel.com <alexis.menard@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 13:16:56 +0000
committeralexis.menard@intel.com <alexis.menard@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 13:16:56 +0000
commit49291946b0033be9217477a03f2d5588248ff4a7 (patch)
tree45675f1222b90806449e33819b8a92d6aa1b2cac /ppapi
parent08bb5ffc8f6e8fe2c7a83e6ef2e44d292024bc27 (diff)
downloadchromium_src-49291946b0033be9217477a03f2d5588248ff4a7.zip
chromium_src-49291946b0033be9217477a03f2d5588248ff4a7.tar.gz
chromium_src-49291946b0033be9217477a03f2d5588248ff4a7.tar.bz2
Move some files from chrome/renderer/pepper to components/nacl/renderer/
Move pnacl_translation_resource_host files as they have no dependencies of the chrome layer. Move the creation of the nacl private interface (ppb_nacl_private_impl) to the components directory : it requires to remove the IsOffTheRecord member of the interface (to not depend on chrome/) but it's not used anyway. This is part of an effort to componentize NaCl code. BUG=244791 Review URL: https://codereview.chromium.org/88193002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/api/private/ppb_nacl_private.idl4
-rw-r--r--ppapi/c/private/ppb_nacl_private.h5
-rw-r--r--ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc9
-rw-r--r--ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h3
-rw-r--r--ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c6
5 files changed, 3 insertions, 24 deletions
diff --git a/ppapi/api/private/ppb_nacl_private.idl b/ppapi/api/private/ppb_nacl_private.idl
index 2d85044..4e215d7 100644
--- a/ppapi/api/private/ppb_nacl_private.idl
+++ b/ppapi/api/private/ppb_nacl_private.idl
@@ -146,10 +146,6 @@ interface PPB_NaCl_Private {
void ReportTranslationFinished([in] PP_Instance instance,
[in] PP_Bool success);
- /* Return true if we are off the record.
- */
- PP_Bool IsOffTheRecord();
-
/* Display a UI message to the user. */
PP_ExternalPluginResult ReportNaClError([in] PP_Instance instance,
[in] PP_NaClError message_id);
diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h
index 7ba7583..44bbb9f 100644
--- a/ppapi/c/private/ppb_nacl_private.h
+++ b/ppapi/c/private/ppb_nacl_private.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From private/ppb_nacl_private.idl modified Thu Nov 14 08:29:25 2013. */
+/* From private/ppb_nacl_private.idl modified Fri Nov 29 09:11:40 2013. */
#ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
#define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
@@ -160,9 +160,6 @@ struct PPB_NaCl_Private_1_0 {
* the plugin.)
*/
void (*ReportTranslationFinished)(PP_Instance instance, PP_Bool success);
- /* Return true if we are off the record.
- */
- PP_Bool (*IsOffTheRecord)(void);
/* Display a UI message to the user. */
PP_ExternalPluginResult (*ReportNaClError)(PP_Instance instance,
PP_NaClError message_id);
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
index d67b991..f892059 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc
@@ -226,12 +226,8 @@ PnaclCoordinator* PnaclCoordinator::BitcodeToNative(
pnacl_options,
translate_notify_callback);
coordinator->pnacl_init_time_ = NaClGetTimeOfDayMicroseconds();
- coordinator->off_the_record_ =
- plugin->nacl_interface()->IsOffTheRecord();
- PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (manifest=%p, "
- "off_the_record=%d)\n",
- reinterpret_cast<const void*>(coordinator->manifest_.get()),
- coordinator->off_the_record_));
+ PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (manifest=%p, ",
+ reinterpret_cast<const void*>(coordinator->manifest_.get())));
// First start a network request for the pexe, to tickle the component
// updater's On-Demand resource throttler, and to get Last-Modified/ETag
@@ -255,7 +251,6 @@ PnaclCoordinator::PnaclCoordinator(
pnacl_options_(pnacl_options),
is_cache_hit_(PP_FALSE),
error_already_reported_(false),
- off_the_record_(false),
pnacl_init_time_(0),
pexe_size_(0),
pexe_bytes_compiled_(0),
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
index 00d6beb..e38cbc0 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h
@@ -219,9 +219,6 @@ class PnaclCoordinator: public CallbackSource<FileStreamData> {
// was already run/consumed.
bool error_already_reported_;
- // True if compilation is off_the_record.
- bool off_the_record_;
-
// State for timing and size information for UMA stats.
int64_t pnacl_init_time_;
int64_t pexe_size_; // Count as we stream -- will converge to pexe size.
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index 1c00a38..d22ec78 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -2998,11 +2998,6 @@ static void Pnacl_M25_PPB_NaCl_Private_ReportTranslationFinished(PP_Instance ins
iface->ReportTranslationFinished(instance, success);
}
-static PP_Bool Pnacl_M25_PPB_NaCl_Private_IsOffTheRecord(void) {
- const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_1_0.real_iface;
- return iface->IsOffTheRecord();
-}
-
static PP_ExternalPluginResult Pnacl_M25_PPB_NaCl_Private_ReportNaClError(PP_Instance instance, PP_NaClError message_id) {
const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_1_0.real_iface;
return iface->ReportNaClError(instance, message_id);
@@ -4896,7 +4891,6 @@ struct PPB_NaCl_Private_1_0 Pnacl_Wrappers_PPB_NaCl_Private_1_0 = {
.CreateTemporaryFile = (PP_FileHandle (*)(PP_Instance instance))&Pnacl_M25_PPB_NaCl_Private_CreateTemporaryFile,
.GetNexeFd = (int32_t (*)(PP_Instance instance, const char* pexe_url, uint32_t abi_version, uint32_t opt_level, const char* last_modified, const char* etag, PP_Bool has_no_store_header, PP_Bool* is_hit, PP_FileHandle* nexe_handle, struct PP_CompletionCallback callback))&Pnacl_M25_PPB_NaCl_Private_GetNexeFd,
.ReportTranslationFinished = (void (*)(PP_Instance instance, PP_Bool success))&Pnacl_M25_PPB_NaCl_Private_ReportTranslationFinished,
- .IsOffTheRecord = (PP_Bool (*)(void))&Pnacl_M25_PPB_NaCl_Private_IsOffTheRecord,
.ReportNaClError = (PP_ExternalPluginResult (*)(PP_Instance instance, PP_NaClError message_id))&Pnacl_M25_PPB_NaCl_Private_ReportNaClError,
.OpenNaClExecutable = (PP_FileHandle (*)(PP_Instance instance, const char* file_url, uint64_t* file_token_lo, uint64_t* file_token_hi))&Pnacl_M25_PPB_NaCl_Private_OpenNaClExecutable,
.DispatchEvent = (void (*)(PP_Instance instance, PP_NaClEventType event_type, struct PP_Var resource_url, PP_Bool length_is_computable, uint64_t loaded_bytes, uint64_t total_bytes))&Pnacl_M25_PPB_NaCl_Private_DispatchEvent,