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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/pnacl_resources.h

Issue 315583005: Pepper: Simplify error reporting in PnaclResources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 6 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
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 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_ 5 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
6 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_ 6 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "native_client/src/include/nacl_macros.h" 11 #include "native_client/src/include/nacl_macros.h"
12 #include "native_client/src/include/nacl_string.h" 12 #include "native_client/src/include/nacl_string.h"
13 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" 13 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
14 14
15 #include "ppapi/c/private/pp_file_handle.h" 15 #include "ppapi/c/private/pp_file_handle.h"
16 #include "ppapi/cpp/completion_callback.h" 16 #include "ppapi/cpp/completion_callback.h"
17 17
18 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" 18 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
19 19
20 namespace plugin { 20 namespace plugin {
21 21
22 class Plugin; 22 class Plugin;
23 class PnaclCoordinator;
24 23
25 // Loads a list of resources, providing a way to get file descriptors for 24 // Loads a list of resources, providing a way to get file descriptors for
26 // these resources. URLs for resources are resolved by the manifest 25 // these resources. URLs for resources are resolved by the manifest
27 // and point to pnacl component filesystem resources. 26 // and point to pnacl component filesystem resources.
28 class PnaclResources { 27 class PnaclResources {
29 public: 28 public:
30 PnaclResources(Plugin* plugin, 29 explicit PnaclResources(Plugin* plugin)
31 PnaclCoordinator* coordinator)
32 : plugin_(plugin), 30 : plugin_(plugin),
33 coordinator_(coordinator),
34 llc_file_handle_(PP_kInvalidFileHandle), 31 llc_file_handle_(PP_kInvalidFileHandle),
35 ld_file_handle_(PP_kInvalidFileHandle) { 32 ld_file_handle_(PP_kInvalidFileHandle) {
36 } 33 }
37 virtual ~PnaclResources(); 34 virtual ~PnaclResources();
38 35
39 // Read the resource info JSON file. This is the first step after 36 // Read the resource info JSON file. This is the first step after
40 // construction; it has to be completed before StartLoad is called. 37 // construction; it has to be completed before StartLoad is called.
41 virtual void ReadResourceInfo( 38 virtual void ReadResourceInfo(
42 const pp::CompletionCallback& resource_info_read_cb); 39 const pp::CompletionCallback& resource_info_read_cb);
43 40
44 // Start loading the resources. 41 // Start loading the resources.
45 virtual void StartLoad( 42 virtual void StartLoad(
46 const pp::CompletionCallback& all_loaded_callback); 43 const pp::CompletionCallback& all_loaded_callback);
47 44
48 const nacl::string& GetLlcUrl() { return llc_tool_name_; } 45 const nacl::string& GetLlcUrl() { return llc_tool_name_; }
49 const nacl::string& GetLdUrl() { return ld_tool_name_; } 46 const nacl::string& GetLdUrl() { return ld_tool_name_; }
50 47
51 PP_FileHandle TakeLlcFileHandle(); 48 PP_FileHandle TakeLlcFileHandle();
52 PP_FileHandle TakeLdFileHandle(); 49 PP_FileHandle TakeLdFileHandle();
53 50
54 private: 51 private:
55 NACL_DISALLOW_COPY_AND_ASSIGN(PnaclResources); 52 NACL_DISALLOW_COPY_AND_ASSIGN(PnaclResources);
56 53
57 // The plugin requesting the resource loading. 54 // The plugin requesting the resource loading.
58 Plugin* plugin_; 55 Plugin* plugin_;
59 // The coordinator responsible for reporting errors, etc.
60 PnaclCoordinator* coordinator_;
61 56
62 // Tool names for llc and ld; read from the resource info file. 57 // Tool names for llc and ld; read from the resource info file.
63 nacl::string llc_tool_name_; 58 nacl::string llc_tool_name_;
64 nacl::string ld_tool_name_; 59 nacl::string ld_tool_name_;
65 60
66 // File handles for llc and ld executables, after they've been opened. 61 // File handles for llc and ld executables, after they've been opened.
67 // Only valid after the callback for StartLoad() has been called, and until 62 // Only valid after the callback for StartLoad() has been called, and until
68 // TakeLlcFileHandle()/TakeLdFileHandle() is called. 63 // TakeLlcFileHandle()/TakeLdFileHandle() is called.
69 PP_FileHandle llc_file_handle_; 64 PP_FileHandle llc_file_handle_;
70 PP_FileHandle ld_file_handle_; 65 PP_FileHandle ld_file_handle_;
71 }; 66 };
72 67
73 } // namespace plugin; 68 } // namespace plugin;
74 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_ 69 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
OLDNEW
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc ('k') | ppapi/native_client/src/trusted/plugin/pnacl_resources.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698