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/quota_dispatcher.h" | 10 #include "content/child/quota_dispatcher.h" |
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
537 request.setHTTPHeaderField("User-Agent", custom_user_agent); | 537 request.setHTTPHeaderField("User-Agent", custom_user_agent); |
538 } | 538 } |
539 } | 539 } |
540 | 540 |
541 request.setExtraData( | 541 request.setExtraData( |
542 new RequestExtraData(referrer_policy, | 542 new RequestExtraData(referrer_policy, |
543 custom_user_agent, | 543 custom_user_agent, |
544 was_after_preconnect_request, | 544 was_after_preconnect_request, |
545 (frame == top_frame), | 545 (frame == top_frame), |
546 frame->identifier(), | 546 frame->identifier(), |
| 547 GURL(frame->document().securityOrigin().toString()), |
547 frame->parent() == top_frame, | 548 frame->parent() == top_frame, |
548 frame->parent() ? frame->parent()->identifier() : -1, | 549 frame->parent() ? frame->parent()->identifier() : -1, |
549 navigation_state->allow_download(), | 550 navigation_state->allow_download(), |
550 transition_type, | 551 transition_type, |
551 navigation_state->transferred_request_child_id(), | 552 navigation_state->transferred_request_child_id(), |
552 navigation_state->transferred_request_request_id())); | 553 navigation_state->transferred_request_request_id())); |
553 | 554 |
554 DocumentState* top_document_state = | 555 DocumentState* top_document_state = |
555 DocumentState::FromDataSource(top_data_source); | 556 DocumentState::FromDataSource(top_data_source); |
556 if (top_document_state) { | 557 if (top_document_state) { |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
834 | 835 |
835 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, | 836 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, |
836 int arb_robustness_status_code) { | 837 int arb_robustness_status_code) { |
837 Send(new ViewHostMsg_DidLose3DContext( | 838 Send(new ViewHostMsg_DidLose3DContext( |
838 GURL(frame->top()->document().securityOrigin().toString()), | 839 GURL(frame->top()->document().securityOrigin().toString()), |
839 THREE_D_API_TYPE_WEBGL, | 840 THREE_D_API_TYPE_WEBGL, |
840 arb_robustness_status_code)); | 841 arb_robustness_status_code)); |
841 } | 842 } |
842 | 843 |
843 } // namespace content | 844 } // namespace content |
OLD | NEW |