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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 // CommitNavigation IPC, and then back to the browser again in the | 501 // CommitNavigation IPC, and then back to the browser again in the |
502 // DidCommitProvisionalLoad and the DocumentLoadComplete IPCs. | 502 // DidCommitProvisionalLoad and the DocumentLoadComplete IPCs. |
503 base::TimeTicks ui_timestamp = | 503 base::TimeTicks ui_timestamp = |
504 base::TimeTicks() + base::TimeDelta::FromSecondsD(request->uiStartTime()); | 504 base::TimeTicks() + base::TimeDelta::FromSecondsD(request->uiStartTime()); |
505 FrameMsg_UILoadMetricsReportType::Value report_type = | 505 FrameMsg_UILoadMetricsReportType::Value report_type = |
506 static_cast<FrameMsg_UILoadMetricsReportType::Value>( | 506 static_cast<FrameMsg_UILoadMetricsReportType::Value>( |
507 request->inputPerfMetricReportPolicy()); | 507 request->inputPerfMetricReportPolicy()); |
508 return CommonNavigationParams( | 508 return CommonNavigationParams( |
509 request->url(), referrer, extra_data->transition_type(), | 509 request->url(), referrer, extra_data->transition_type(), |
510 FrameMsg_Navigate_Type::NORMAL, true, should_replace_current_entry, | 510 FrameMsg_Navigate_Type::NORMAL, true, should_replace_current_entry, |
511 ui_timestamp, report_type, GURL(), GURL(), LOFI_UNSPECIFIED); | 511 ui_timestamp, report_type, GURL(), GURL(), LOFI_UNSPECIFIED, |
| 512 base::TimeTicks::Now()); |
512 } | 513 } |
513 | 514 |
514 #if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 515 #if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
515 media::Context3D GetSharedMainThreadContext3D() { | 516 media::Context3D GetSharedMainThreadContext3D() { |
516 cc::ContextProvider* provider = | 517 cc::ContextProvider* provider = |
517 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); | 518 RenderThreadImpl::current()->SharedMainThreadContextProvider().get(); |
518 if (!provider) | 519 if (!provider) |
519 return media::Context3D(); | 520 return media::Context3D(); |
520 return media::Context3D(provider->ContextGL(), provider->GrContext()); | 521 return media::Context3D(provider->ContextGL(), provider->GrContext()); |
521 } | 522 } |
(...skipping 4299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4821 common_params.url.SchemeIs(url::kDataScheme))) { | 4822 common_params.url.SchemeIs(url::kDataScheme))) { |
4822 LoadDataURL(common_params, frame_); | 4823 LoadDataURL(common_params, frame_); |
4823 } else { | 4824 } else { |
4824 // Load the request. | 4825 // Load the request. |
4825 frame_->toWebLocalFrame()->load(request, load_type, | 4826 frame_->toWebLocalFrame()->load(request, load_type, |
4826 item_for_history_navigation); | 4827 item_for_history_navigation); |
4827 } | 4828 } |
4828 | 4829 |
4829 if (load_type == blink::WebFrameLoadType::Standard) { | 4830 if (load_type == blink::WebFrameLoadType::Standard) { |
4830 UpdateFrameNavigationTiming(frame_, | 4831 UpdateFrameNavigationTiming(frame_, |
4831 request_params.browser_navigation_start, | 4832 common_params.navigation_start, |
4832 renderer_navigation_start); | 4833 renderer_navigation_start); |
4833 } | 4834 } |
4834 } | 4835 } |
4835 | 4836 |
4836 // In case LoadRequest failed before didCreateDataSource was called. | 4837 // In case LoadRequest failed before didCreateDataSource was called. |
4837 pending_navigation_params_.reset(); | 4838 pending_navigation_params_.reset(); |
4838 } | 4839 } |
4839 | 4840 |
4840 void RenderFrameImpl::UpdateEncoding(WebFrame* frame, | 4841 void RenderFrameImpl::UpdateEncoding(WebFrame* frame, |
4841 const std::string& encoding_name) { | 4842 const std::string& encoding_name) { |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5321 mojo::ServiceProviderPtr service_provider; | 5322 mojo::ServiceProviderPtr service_provider; |
5322 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5323 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5323 request->url = mojo::String::From(url); | 5324 request->url = mojo::String::From(url); |
5324 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5325 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5325 nullptr, nullptr, | 5326 nullptr, nullptr, |
5326 base::Bind(&OnGotContentHandlerID)); | 5327 base::Bind(&OnGotContentHandlerID)); |
5327 return service_provider.Pass(); | 5328 return service_provider.Pass(); |
5328 } | 5329 } |
5329 | 5330 |
5330 } // namespace content | 5331 } // namespace content |
OLD | NEW |