| OLD | NEW |
| 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 "native_client/src/trusted/plugin/pnacl_resources.h" | 5 #include "native_client/src/trusted/plugin/pnacl_resources.h" |
| 6 | 6 |
| 7 #include <utility> | |
| 8 #include <vector> | |
| 9 | |
| 10 #include "native_client/src/include/portability_io.h" | 7 #include "native_client/src/include/portability_io.h" |
| 11 #include "native_client/src/shared/platform/nacl_check.h" | 8 #include "native_client/src/shared/platform/nacl_check.h" |
| 12 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" | 9 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" |
| 13 #include "native_client/src/trusted/plugin/browser_interface.h" | |
| 14 #include "native_client/src/trusted/plugin/manifest.h" | 10 #include "native_client/src/trusted/plugin/manifest.h" |
| 15 #include "native_client/src/trusted/plugin/plugin.h" | 11 #include "native_client/src/trusted/plugin/plugin.h" |
| 16 #include "native_client/src/trusted/plugin/plugin_error.h" | |
| 17 #include "native_client/src/trusted/plugin/pnacl_coordinator.h" | 12 #include "native_client/src/trusted/plugin/pnacl_coordinator.h" |
| 18 #include "native_client/src/trusted/plugin/utility.h" | 13 #include "native_client/src/trusted/plugin/utility.h" |
| 19 | 14 |
| 20 #include "ppapi/c/pp_errors.h" | 15 #include "ppapi/c/pp_errors.h" |
| 21 | 16 |
| 22 namespace plugin { | 17 namespace plugin { |
| 23 | 18 |
| 24 class Plugin; | |
| 25 | |
| 26 PnaclResources::~PnaclResources() { | 19 PnaclResources::~PnaclResources() { |
| 27 for (std::map<nacl::string, nacl::DescWrapper*>::iterator | 20 for (std::map<nacl::string, nacl::DescWrapper*>::iterator |
| 28 i = resource_wrappers_.begin(), e = resource_wrappers_.end(); | 21 i = resource_wrappers_.begin(), e = resource_wrappers_.end(); |
| 29 i != e; | 22 i != e; |
| 30 ++i) { | 23 ++i) { |
| 31 delete i->second; | 24 delete i->second; |
| 32 } | 25 } |
| 33 resource_wrappers_.clear(); | 26 resource_wrappers_.clear(); |
| 34 } | 27 } |
| 35 | 28 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 coordinator_->ReportPpapiError(pp_error, | 71 coordinator_->ReportPpapiError(pp_error, |
| 79 "PnaclResources::ResourceReady failed."); | 72 "PnaclResources::ResourceReady failed."); |
| 80 } else { | 73 } else { |
| 81 resource_wrappers_[url] = | 74 resource_wrappers_[url] = |
| 82 plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY); | 75 plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY); |
| 83 delayed_callback_->RunIfTime(); | 76 delayed_callback_->RunIfTime(); |
| 84 } | 77 } |
| 85 } | 78 } |
| 86 | 79 |
| 87 } // namespace plugin | 80 } // namespace plugin |
| OLD | NEW |