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 "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "content/child/appcache/appcache_dispatcher.h" | 9 #include "content/child/appcache/appcache_dispatcher.h" |
10 #include "content/child/fileapi/file_system_dispatcher.h" | 10 #include "content/child/fileapi/file_system_dispatcher.h" |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 request.setHTTPHeaderField("User-Agent", custom_user_agent); | 530 request.setHTTPHeaderField("User-Agent", custom_user_agent); |
531 } | 531 } |
532 } | 532 } |
533 | 533 |
534 request.setExtraData( | 534 request.setExtraData( |
535 new RequestExtraData(referrer_policy, | 535 new RequestExtraData(referrer_policy, |
536 custom_user_agent, | 536 custom_user_agent, |
537 was_after_preconnect_request, | 537 was_after_preconnect_request, |
538 (frame == top_frame), | 538 (frame == top_frame), |
539 frame->identifier(), | 539 frame->identifier(), |
| 540 GURL(frame->document().securityOrigin().toString()), |
540 frame->parent() == top_frame, | 541 frame->parent() == top_frame, |
541 frame->parent() ? frame->parent()->identifier() : -1, | 542 frame->parent() ? frame->parent()->identifier() : -1, |
542 navigation_state->allow_download(), | 543 navigation_state->allow_download(), |
543 transition_type, | 544 transition_type, |
544 navigation_state->transferred_request_child_id(), | 545 navigation_state->transferred_request_child_id(), |
545 navigation_state->transferred_request_request_id())); | 546 navigation_state->transferred_request_request_id())); |
546 | 547 |
547 DocumentState* top_document_state = | 548 DocumentState* top_document_state = |
548 DocumentState::FromDataSource(top_data_source); | 549 DocumentState::FromDataSource(top_data_source); |
549 if (top_document_state) { | 550 if (top_document_state) { |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
868 | 869 |
869 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, | 870 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, |
870 int arb_robustness_status_code) { | 871 int arb_robustness_status_code) { |
871 Send(new ViewHostMsg_DidLose3DContext( | 872 Send(new ViewHostMsg_DidLose3DContext( |
872 GURL(frame->top()->document().securityOrigin().toString()), | 873 GURL(frame->top()->document().securityOrigin().toString()), |
873 THREE_D_API_TYPE_WEBGL, | 874 THREE_D_API_TYPE_WEBGL, |
874 arb_robustness_status_code)); | 875 arb_robustness_status_code)); |
875 } | 876 } |
876 | 877 |
877 } // namespace content | 878 } // namespace content |
OLD | NEW |