| 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 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 4158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4169 if (extra_data) { | 4169 if (extra_data) { |
| 4170 document_state->set_was_fetched_via_spdy( | 4170 document_state->set_was_fetched_via_spdy( |
| 4171 extra_data->was_fetched_via_spdy()); | 4171 extra_data->was_fetched_via_spdy()); |
| 4172 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); | 4172 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated()); |
| 4173 document_state->set_alpn_negotiated_protocol( | 4173 document_state->set_alpn_negotiated_protocol( |
| 4174 extra_data->alpn_negotiated_protocol()); | 4174 extra_data->alpn_negotiated_protocol()); |
| 4175 document_state->set_was_alternate_protocol_available( | 4175 document_state->set_was_alternate_protocol_available( |
| 4176 extra_data->was_alternate_protocol_available()); | 4176 extra_data->was_alternate_protocol_available()); |
| 4177 document_state->set_connection_info( | 4177 document_state->set_connection_info( |
| 4178 extra_data->connection_info()); | 4178 extra_data->connection_info()); |
| 4179 document_state->set_was_fetched_via_proxy( | |
| 4180 extra_data->was_fetched_via_proxy()); | |
| 4181 document_state->set_proxy_server( | |
| 4182 extra_data->proxy_server()); | |
| 4183 } | 4179 } |
| 4184 InternalDocumentStateData* internal_data = | 4180 InternalDocumentStateData* internal_data = |
| 4185 InternalDocumentStateData::FromDocumentState(document_state); | 4181 InternalDocumentStateData::FromDocumentState(document_state); |
| 4186 internal_data->set_http_status_code(http_status_code); | 4182 internal_data->set_http_status_code(http_status_code); |
| 4187 } | 4183 } |
| 4188 | 4184 |
| 4189 void RenderFrameImpl::didLoadResourceFromMemoryCache( | 4185 void RenderFrameImpl::didLoadResourceFromMemoryCache( |
| 4190 const blink::WebURLRequest& request, | 4186 const blink::WebURLRequest& request, |
| 4191 const blink::WebURLResponse& response) { | 4187 const blink::WebURLResponse& response) { |
| 4192 // The recipients of this message have no use for data: URLs: they don't | 4188 // The recipients of this message have no use for data: URLs: they don't |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4598 // We need to track the RenderViewHost routing_id because of downstream | 4594 // We need to track the RenderViewHost routing_id because of downstream |
| 4599 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, | 4595 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, |
| 4600 // ResourceDispatcherHostImpl, MediaStreamUIProxy, | 4596 // ResourceDispatcherHostImpl, MediaStreamUIProxy, |
| 4601 // SpeechRecognitionDispatcherHost and possibly others). They look up the view | 4597 // SpeechRecognitionDispatcherHost and possibly others). They look up the view |
| 4602 // based on the ID stored in the resource requests. Once those dependencies | 4598 // based on the ID stored in the resource requests. Once those dependencies |
| 4603 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the | 4599 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the |
| 4604 // client to be based on the routing_id of the RenderFrameHost. | 4600 // client to be based on the routing_id of the RenderFrameHost. |
| 4605 params.render_view_routing_id = render_view_->routing_id(); | 4601 params.render_view_routing_id = render_view_->routing_id(); |
| 4606 params.socket_address.set_host(response.remoteIPAddress().utf8()); | 4602 params.socket_address.set_host(response.remoteIPAddress().utf8()); |
| 4607 params.socket_address.set_port(response.remotePort()); | 4603 params.socket_address.set_port(response.remotePort()); |
| 4608 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); | |
| 4609 if (extra_data) | |
| 4610 params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy(); | |
| 4611 params.was_within_same_page = navigation_state->WasWithinSamePage(); | 4604 params.was_within_same_page = navigation_state->WasWithinSamePage(); |
| 4612 | 4605 |
| 4613 // Set the origin of the frame. This will be replicated to the corresponding | 4606 // Set the origin of the frame. This will be replicated to the corresponding |
| 4614 // RenderFrameProxies in other processes. | 4607 // RenderFrameProxies in other processes. |
| 4615 params.origin = frame->document().getSecurityOrigin(); | 4608 params.origin = frame->document().getSecurityOrigin(); |
| 4616 | 4609 |
| 4617 params.insecure_request_policy = frame->getInsecureRequestPolicy(); | 4610 params.insecure_request_policy = frame->getInsecureRequestPolicy(); |
| 4618 | 4611 |
| 4619 params.has_potentially_trustworthy_unique_origin = | 4612 params.has_potentially_trustworthy_unique_origin = |
| 4620 frame->document().getSecurityOrigin().isUnique() && | 4613 frame->document().getSecurityOrigin().isUnique() && |
| (...skipping 1771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6392 // event target. Potentially a Pepper plugin will receive the event. | 6385 // event target. Potentially a Pepper plugin will receive the event. |
| 6393 // In order to tell whether a plugin gets the last mouse event and which it | 6386 // In order to tell whether a plugin gets the last mouse event and which it |
| 6394 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6387 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6395 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6388 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6396 // |pepper_last_mouse_event_target_|. | 6389 // |pepper_last_mouse_event_target_|. |
| 6397 pepper_last_mouse_event_target_ = nullptr; | 6390 pepper_last_mouse_event_target_ = nullptr; |
| 6398 #endif | 6391 #endif |
| 6399 } | 6392 } |
| 6400 | 6393 |
| 6401 } // namespace content | 6394 } // namespace content |
| OLD | NEW |