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 895 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
906 ViewMsg_Navigate_Type::RELOAD_IGNORING_CACHE); | 906 ViewMsg_Navigate_Type::RELOAD_IGNORING_CACHE); |
907 main_frame->reload(ignore_cache); | 907 main_frame->reload(ignore_cache); |
908 } else if (!params.state.empty()) { | 908 } else if (!params.state.empty()) { |
909 // We must know the page ID of the page we are navigating back to. | 909 // We must know the page ID of the page we are navigating back to. |
910 DCHECK_NE(params.page_id, -1); | 910 DCHECK_NE(params.page_id, -1); |
911 main_frame->loadHistoryItem( | 911 main_frame->loadHistoryItem( |
912 webkit_glue::HistoryItemFromString(params.state)); | 912 webkit_glue::HistoryItemFromString(params.state)); |
913 } else { | 913 } else { |
914 // Navigate to the given URL. | 914 // Navigate to the given URL. |
915 WebURLRequest request(params.url); | 915 WebURLRequest request(params.url); |
916 request.setVirtualURL(params.virtual_url); | |
darin (slow to review)
2012/03/27 03:20:49
we don't want to have to teach WebKit about virtua
chebert
2012/03/31 21:03:18
Done.
| |
916 | 917 |
917 // A session history navigation should have been accompanied by state. | 918 // A session history navigation should have been accompanied by state. |
918 CHECK_EQ(params.page_id, -1); | 919 CHECK_EQ(params.page_id, -1); |
919 | 920 |
920 if (main_frame->isViewSourceModeEnabled()) | 921 if (main_frame->isViewSourceModeEnabled()) |
921 request.setCachePolicy(WebURLRequest::ReturnCacheDataElseLoad); | 922 request.setCachePolicy(WebURLRequest::ReturnCacheDataElseLoad); |
922 | 923 |
923 if (params.referrer.url.is_valid()) { | 924 if (params.referrer.url.is_valid()) { |
924 WebString referrer = WebSecurityPolicy::generateReferrerHeader( | 925 WebString referrer = WebSecurityPolicy::generateReferrerHeader( |
925 params.referrer.policy, | 926 params.referrer.policy, |
(...skipping 4268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5194 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5195 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5195 return !!RenderThreadImpl::current()->compositor_thread(); | 5196 return !!RenderThreadImpl::current()->compositor_thread(); |
5196 } | 5197 } |
5197 | 5198 |
5198 void RenderViewImpl::OnJavaBridgeInit() { | 5199 void RenderViewImpl::OnJavaBridgeInit() { |
5199 DCHECK(!java_bridge_dispatcher_.get()); | 5200 DCHECK(!java_bridge_dispatcher_.get()); |
5200 #if defined(ENABLE_JAVA_BRIDGE) | 5201 #if defined(ENABLE_JAVA_BRIDGE) |
5201 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 5202 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
5202 #endif | 5203 #endif |
5203 } | 5204 } |
OLD | NEW |