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

Unified Diff: ppapi/native_client/src/trusted/plugin/pnacl_resources.cc

Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update #include guards Created 5 years, 11 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: ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc b/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
deleted file mode 100644
index 4c48c7fd9998c8ea5be67048bbb0640c086deb9e..0000000000000000000000000000000000000000
--- a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) 2012 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 "ppapi/native_client/src/trusted/plugin/pnacl_resources.h"
-
-#include "native_client/src/include/portability_io.h"
-#include "native_client/src/shared/platform/nacl_check.h"
-#include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/native_client/src/trusted/plugin/plugin.h"
-#include "ppapi/native_client/src/trusted/plugin/utility.h"
-
-namespace plugin {
-
-namespace {
-
-static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/";
-
-std::string GetFullUrl(const std::string& partial_url) {
- return std::string(kPnaclBaseUrl) + GetNaClInterface()->GetSandboxArch() +
- "/" + partial_url;
-}
-
-} // namespace
-
-PnaclResources::PnaclResources(Plugin* plugin)
- : plugin_(plugin) {
- llc_file_info_ = kInvalidNaClFileInfo;
- ld_file_info_ = kInvalidNaClFileInfo;
-}
-
-PnaclResources::~PnaclResources() {
- if (llc_file_info_.handle != PP_kInvalidFileHandle)
- CloseFileHandle(llc_file_info_.handle);
- if (ld_file_info_.handle != PP_kInvalidFileHandle)
- CloseFileHandle(ld_file_info_.handle);
-}
-
-bool PnaclResources::ReadResourceInfo() {
- PP_Var pp_llc_tool_name_var;
- PP_Var pp_ld_tool_name_var;
- if (!plugin_->nacl_interface()->GetPnaclResourceInfo(
- plugin_->pp_instance(),
- &pp_llc_tool_name_var,
- &pp_ld_tool_name_var)) {
- return false;
- }
- pp::Var llc_tool_name(pp::PASS_REF, pp_llc_tool_name_var);
- pp::Var ld_tool_name(pp::PASS_REF, pp_ld_tool_name_var);
- llc_tool_name_ = GetFullUrl(llc_tool_name.AsString());
- ld_tool_name_ = GetFullUrl(ld_tool_name.AsString());
- return true;
-}
-
-PP_NaClFileInfo PnaclResources::TakeLlcFileInfo() {
- PP_NaClFileInfo to_return = llc_file_info_;
- llc_file_info_ = kInvalidNaClFileInfo;
- return to_return;
-}
-
-PP_NaClFileInfo PnaclResources::TakeLdFileInfo() {
- PP_NaClFileInfo to_return = ld_file_info_;
- ld_file_info_ = kInvalidNaClFileInfo;
- return to_return;
-}
-
-bool PnaclResources::StartLoad() {
- PLUGIN_PRINTF(("PnaclResources::StartLoad\n"));
-
- // Do a blocking load of each of the resources.
- plugin_->nacl_interface()->GetReadExecPnaclFd(llc_tool_name_.c_str(),
- &llc_file_info_);
- plugin_->nacl_interface()->GetReadExecPnaclFd(ld_tool_name_.c_str(),
- &ld_file_info_);
- return (llc_file_info_.handle != PP_kInvalidFileHandle &&
- ld_file_info_.handle != PP_kInvalidFileHandle);
-}
-
-} // namespace plugin

Powered by Google App Engine
This is Rietveld 408576698