OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/nacl/renderer/ppb_nacl_private_impl.h" | 5 #include "components/nacl/renderer/ppb_nacl_private_impl.h" |
6 | 6 |
7 #include <numeric> | 7 #include <numeric> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
737 uint64_t total_bytes) { | 737 uint64_t total_bytes) { |
738 ProgressEvent event(event_type, | 738 ProgressEvent event(event_type, |
739 resource_url, | 739 resource_url, |
740 PP_ToBool(length_is_computable), | 740 PP_ToBool(length_is_computable), |
741 loaded_bytes, | 741 loaded_bytes, |
742 total_bytes); | 742 total_bytes); |
743 DispatchProgressEvent(instance, event); | 743 DispatchProgressEvent(instance, event); |
744 } | 744 } |
745 | 745 |
746 void ReportLoadSuccess(PP_Instance instance, | 746 void ReportLoadSuccess(PP_Instance instance, |
747 const char* url, | |
748 uint64_t loaded_bytes, | 747 uint64_t loaded_bytes, |
749 uint64_t total_bytes) { | 748 uint64_t total_bytes) { |
750 NexeLoadManager* load_manager = GetNexeLoadManager(instance); | 749 NexeLoadManager* load_manager = GetNexeLoadManager(instance); |
751 if (load_manager) | 750 if (load_manager) { |
752 load_manager->ReportLoadSuccess(url, loaded_bytes, total_bytes); | 751 load_manager->ReportLoadSuccess(load_manager->program_url(), |
| 752 loaded_bytes, |
| 753 total_bytes); |
| 754 } |
753 } | 755 } |
754 | 756 |
755 void ReportLoadError(PP_Instance instance, | 757 void ReportLoadError(PP_Instance instance, |
756 PP_NaClError error, | 758 PP_NaClError error, |
757 const char* error_message) { | 759 const char* error_message) { |
758 NexeLoadManager* load_manager = GetNexeLoadManager(instance); | 760 NexeLoadManager* load_manager = GetNexeLoadManager(instance); |
759 if (load_manager) | 761 if (load_manager) |
760 load_manager->ReportLoadError(error, error_message); | 762 load_manager->ReportLoadError(error, error_message); |
761 } | 763 } |
762 | 764 |
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1637 &SetPNaClStartTime | 1639 &SetPNaClStartTime |
1638 }; | 1640 }; |
1639 | 1641 |
1640 } // namespace | 1642 } // namespace |
1641 | 1643 |
1642 const PPB_NaCl_Private* GetNaClPrivateInterface() { | 1644 const PPB_NaCl_Private* GetNaClPrivateInterface() { |
1643 return &nacl_interface; | 1645 return &nacl_interface; |
1644 } | 1646 } |
1645 | 1647 |
1646 } // namespace nacl | 1648 } // namespace nacl |
OLD | NEW |