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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 request.setHTTPHeaderField("User-Agent", custom_user_agent); | 541 request.setHTTPHeaderField("User-Agent", custom_user_agent); |
542 } | 542 } |
543 } | 543 } |
544 | 544 |
545 request.setExtraData( | 545 request.setExtraData( |
546 new RequestExtraData(referrer_policy, | 546 new RequestExtraData(referrer_policy, |
547 custom_user_agent, | 547 custom_user_agent, |
548 was_after_preconnect_request, | 548 was_after_preconnect_request, |
549 (frame == top_frame), | 549 (frame == top_frame), |
550 frame->identifier(), | 550 frame->identifier(), |
| 551 GURL(frame->document().securityOrigin().toString()), |
551 frame->parent() == top_frame, | 552 frame->parent() == top_frame, |
552 frame->parent() ? frame->parent()->identifier() : -1, | 553 frame->parent() ? frame->parent()->identifier() : -1, |
553 navigation_state->allow_download(), | 554 navigation_state->allow_download(), |
554 transition_type, | 555 transition_type, |
555 navigation_state->transferred_request_child_id(), | 556 navigation_state->transferred_request_child_id(), |
556 navigation_state->transferred_request_request_id())); | 557 navigation_state->transferred_request_request_id())); |
557 | 558 |
558 DocumentState* top_document_state = | 559 DocumentState* top_document_state = |
559 DocumentState::FromDataSource(top_data_source); | 560 DocumentState::FromDataSource(top_data_source); |
560 if (top_document_state) { | 561 if (top_document_state) { |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
879 | 880 |
880 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, | 881 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, |
881 int arb_robustness_status_code) { | 882 int arb_robustness_status_code) { |
882 Send(new ViewHostMsg_DidLose3DContext( | 883 Send(new ViewHostMsg_DidLose3DContext( |
883 GURL(frame->top()->document().securityOrigin().toString()), | 884 GURL(frame->top()->document().securityOrigin().toString()), |
884 THREE_D_API_TYPE_WEBGL, | 885 THREE_D_API_TYPE_WEBGL, |
885 arb_robustness_status_code)); | 886 arb_robustness_status_code)); |
886 } | 887 } |
887 | 888 |
888 } // namespace content | 889 } // namespace content |
OLD | NEW |