| OLD | NEW |
| 1 // Copyright (c) 2011 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 #ifdef _MSC_VER | 5 #ifdef _MSC_VER |
| 6 // Do not warn about use of std::copy with raw pointers. | 6 // Do not warn about use of std::copy with raw pointers. |
| 7 #pragma warning(disable : 4996) | 7 #pragma warning(disable : 4996) |
| 8 #endif | 8 #endif |
| 9 | 9 |
| 10 #include "native_client/src/trusted/plugin/plugin.h" | 10 #include "native_client/src/trusted/plugin/plugin.h" |
| 11 | 11 |
| (...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1345 // initialized and the untrusted plugin being initialized. This is (roughly) | 1345 // initialized and the untrusted plugin being initialized. This is (roughly) |
| 1346 // the cost of using NaCl, in terms of startup time. | 1346 // the cost of using NaCl, in terms of startup time. |
| 1347 HistogramStartupTimeMedium( | 1347 HistogramStartupTimeMedium( |
| 1348 "NaCl.Perf.StartupTime.NaClOverhead", | 1348 "NaCl.Perf.StartupTime.NaClOverhead", |
| 1349 static_cast<float>(NaClGetTimeOfDayMicroseconds() - init_time_) | 1349 static_cast<float>(NaClGetTimeOfDayMicroseconds() - init_time_) |
| 1350 / NACL_MICROS_PER_MILLI); | 1350 / NACL_MICROS_PER_MILLI); |
| 1351 | 1351 |
| 1352 // Check that the .nexe exports the PPAPI intialization method. | 1352 // Check that the .nexe exports the PPAPI intialization method. |
| 1353 NaClSrpcService* client_service = srpc_channel->client; | 1353 NaClSrpcService* client_service = srpc_channel->client; |
| 1354 if (NaClSrpcServiceMethodIndex(client_service, | 1354 if (NaClSrpcServiceMethodIndex(client_service, |
| 1355 "PPP_InitializeModule:iihs:ii") == | 1355 "PPP_InitializeModule:ihs:i") == |
| 1356 kNaClSrpcInvalidMethodIndex) { | 1356 kNaClSrpcInvalidMethodIndex) { |
| 1357 error_info->SetReport( | 1357 error_info->SetReport( |
| 1358 ERROR_START_PROXY_CHECK_PPP, | 1358 ERROR_START_PROXY_CHECK_PPP, |
| 1359 "could not find PPP_InitializeModule() - toolchain version mismatch?"); | 1359 "could not find PPP_InitializeModule() - toolchain version mismatch?"); |
| 1360 PLUGIN_PRINTF(("Plugin::StartProxiedExecution (%s)\n", | 1360 PLUGIN_PRINTF(("Plugin::StartProxiedExecution (%s)\n", |
| 1361 error_info->message().c_str())); | 1361 error_info->message().c_str())); |
| 1362 return false; | 1362 return false; |
| 1363 } | 1363 } |
| 1364 nacl::scoped_ptr<BrowserPpp> ppapi_proxy( | 1364 nacl::scoped_ptr<BrowserPpp> ppapi_proxy( |
| 1365 new(std::nothrow) BrowserPpp(srpc_channel, this)); | 1365 new(std::nothrow) BrowserPpp(srpc_channel, this)); |
| (...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2049 std::string scheme = canonicalized.AsString().substr(comps.scheme.begin, | 2049 std::string scheme = canonicalized.AsString().substr(comps.scheme.begin, |
| 2050 comps.scheme.len); | 2050 comps.scheme.len); |
| 2051 if (scheme == kChromeExtensionUriScheme) | 2051 if (scheme == kChromeExtensionUriScheme) |
| 2052 return SCHEME_CHROME_EXTENSION; | 2052 return SCHEME_CHROME_EXTENSION; |
| 2053 if (scheme == kDataUriScheme) | 2053 if (scheme == kDataUriScheme) |
| 2054 return SCHEME_DATA; | 2054 return SCHEME_DATA; |
| 2055 return SCHEME_OTHER; | 2055 return SCHEME_OTHER; |
| 2056 } | 2056 } |
| 2057 | 2057 |
| 2058 } // namespace plugin | 2058 } // namespace plugin |
| OLD | NEW |