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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
60 using WebKit::WebString; | 60 using WebKit::WebString; |
61 using WebKit::WebURL; | 61 using WebKit::WebURL; |
62 using WebKit::WebURLError; | 62 using WebKit::WebURLError; |
63 using WebKit::WebURLRequest; | 63 using WebKit::WebURLRequest; |
64 using WebKit::WebURLResponse; | 64 using WebKit::WebURLResponse; |
65 using WebKit::WebUserGestureIndicator; | 65 using WebKit::WebUserGestureIndicator; |
66 using WebKit::WebVector; | 66 using WebKit::WebVector; |
67 using WebKit::WebView; | 67 using WebKit::WebView; |
68 using base::Time; | 68 using base::Time; |
69 using base::TimeDelta; | 69 using base::TimeDelta; |
70 | |
Charlie Reis
2013/08/19 16:20:06
nit: No extra line here.
dsjang
2013/08/19 21:37:18
Done.
| |
70 using webkit_glue::WebURLResponseExtraDataImpl; | 71 using webkit_glue::WebURLResponseExtraDataImpl; |
71 | 72 |
72 namespace content { | 73 namespace content { |
73 | 74 |
74 static RenderFrameImpl* (*g_create_render_frame_impl)(RenderViewImpl*, int32) = | 75 static RenderFrameImpl* (*g_create_render_frame_impl)(RenderViewImpl*, int32) = |
75 NULL; | 76 NULL; |
76 | 77 |
77 // static | 78 // static |
78 RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view, | 79 RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view, |
79 int32 routing_id) { | 80 int32 routing_id) { |
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
553 request.setHTTPHeaderField("User-Agent", custom_user_agent); | 554 request.setHTTPHeaderField("User-Agent", custom_user_agent); |
554 } | 555 } |
555 } | 556 } |
556 | 557 |
557 request.setExtraData( | 558 request.setExtraData( |
558 new RequestExtraData(referrer_policy, | 559 new RequestExtraData(referrer_policy, |
559 custom_user_agent, | 560 custom_user_agent, |
560 was_after_preconnect_request, | 561 was_after_preconnect_request, |
561 (frame == top_frame), | 562 (frame == top_frame), |
562 frame->identifier(), | 563 frame->identifier(), |
564 frame->document().securityOrigin().toString(), | |
563 frame->parent() == top_frame, | 565 frame->parent() == top_frame, |
564 frame->parent() ? frame->parent()->identifier() : -1, | 566 frame->parent() ? frame->parent()->identifier() : -1, |
565 navigation_state->allow_download(), | 567 navigation_state->allow_download(), |
566 transition_type, | 568 transition_type, |
567 navigation_state->transferred_request_child_id(), | 569 navigation_state->transferred_request_child_id(), |
568 navigation_state->transferred_request_request_id())); | 570 navigation_state->transferred_request_request_id())); |
569 | 571 |
570 DocumentState* top_document_state = | 572 DocumentState* top_document_state = |
571 DocumentState::FromDataSource(top_data_source); | 573 DocumentState::FromDataSource(top_data_source); |
572 if (top_document_state) { | 574 if (top_document_state) { |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
891 | 893 |
892 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, | 894 void RenderFrameImpl::didLoseWebGLContext(WebKit::WebFrame* frame, |
893 int arb_robustness_status_code) { | 895 int arb_robustness_status_code) { |
894 Send(new ViewHostMsg_DidLose3DContext( | 896 Send(new ViewHostMsg_DidLose3DContext( |
895 GURL(frame->top()->document().securityOrigin().toString()), | 897 GURL(frame->top()->document().securityOrigin().toString()), |
896 THREE_D_API_TYPE_WEBGL, | 898 THREE_D_API_TYPE_WEBGL, |
897 arb_robustness_status_code)); | 899 arb_robustness_status_code)); |
898 } | 900 } |
899 | 901 |
900 } // namespace content | 902 } // namespace content |
OLD | NEW |