| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 3077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3088 frame->parent() ? frame->parent()->identifier() : -1, | 3088 frame->parent() ? frame->parent()->identifier() : -1, |
| 3089 transition_type, | 3089 transition_type, |
| 3090 navigation_state->transferred_request_child_id(), | 3090 navigation_state->transferred_request_child_id(), |
| 3091 navigation_state->transferred_request_request_id())); | 3091 navigation_state->transferred_request_request_id())); |
| 3092 | 3092 |
| 3093 DocumentState* top_document_state = | 3093 DocumentState* top_document_state = |
| 3094 DocumentState::FromDataSource(top_data_source); | 3094 DocumentState::FromDataSource(top_data_source); |
| 3095 // TODO(gavinp): separate out prefetching and prerender field trials | 3095 // TODO(gavinp): separate out prefetching and prerender field trials |
| 3096 // if the rel=prerender rel type is sticking around. | 3096 // if the rel=prerender rel type is sticking around. |
| 3097 if (top_document_state && | 3097 if (top_document_state && |
| 3098 (request.targetType() == WebURLRequest::TargetIsPrefetch || | 3098 request.targetType() == WebURLRequest::TargetIsPrefetch) |
| 3099 request.targetType() == WebURLRequest::TargetIsPrerender)) | |
| 3100 top_document_state->set_was_prefetcher(true); | 3099 top_document_state->set_was_prefetcher(true); |
| 3101 | 3100 |
| 3102 request.setRequestorID(routing_id_); | 3101 request.setRequestorID(routing_id_); |
| 3103 request.setHasUserGesture(frame->isProcessingUserGesture()); | 3102 request.setHasUserGesture(frame->isProcessingUserGesture()); |
| 3104 | 3103 |
| 3105 if (!renderer_preferences_.enable_referrers) | 3104 if (!renderer_preferences_.enable_referrers) |
| 3106 request.clearHTTPHeaderField("Referer"); | 3105 request.clearHTTPHeaderField("Referer"); |
| 3107 } | 3106 } |
| 3108 | 3107 |
| 3109 void RenderViewImpl::didReceiveResponse( | 3108 void RenderViewImpl::didReceiveResponse( |
| (...skipping 2140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5250 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5249 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5251 return !!RenderThreadImpl::current()->compositor_thread(); | 5250 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5252 } | 5251 } |
| 5253 | 5252 |
| 5254 void RenderViewImpl::OnJavaBridgeInit() { | 5253 void RenderViewImpl::OnJavaBridgeInit() { |
| 5255 DCHECK(!java_bridge_dispatcher_.get()); | 5254 DCHECK(!java_bridge_dispatcher_.get()); |
| 5256 #if defined(ENABLE_JAVA_BRIDGE) | 5255 #if defined(ENABLE_JAVA_BRIDGE) |
| 5257 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5256 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
| 5258 #endif | 5257 #endif |
| 5259 } | 5258 } |
| OLD | NEW |