| 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 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1297 params.security_info = response.securityInfo(); | 1297 params.security_info = response.securityInfo(); |
| 1298 } | 1298 } |
| 1299 | 1299 |
| 1300 // Set the URL to be displayed in the browser UI to the user. | 1300 // Set the URL to be displayed in the browser UI to the user. |
| 1301 params.url = GetLoadingUrl(frame); | 1301 params.url = GetLoadingUrl(frame); |
| 1302 | 1302 |
| 1303 if (frame->document().baseURL() != params.url) | 1303 if (frame->document().baseURL() != params.url) |
| 1304 params.base_url = frame->document().baseURL(); | 1304 params.base_url = frame->document().baseURL(); |
| 1305 | 1305 |
| 1306 GetRedirectChain(ds, ¶ms.redirects); | 1306 GetRedirectChain(ds, ¶ms.redirects); |
| 1307 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); |
| 1308 bool is_multipart_payload = extra_data && extra_data->is_multipart_payload(); |
| 1307 params.should_update_history = !ds->hasUnreachableURL() && | 1309 params.should_update_history = !ds->hasUnreachableURL() && |
| 1308 !response.isMultipartPayload() && (response.httpStatusCode() != 404); | 1310 !is_multipart_payload && (response.httpStatusCode() != 404); |
| 1309 | 1311 |
| 1310 params.searchable_form_url = document_state->searchable_form_url(); | 1312 params.searchable_form_url = document_state->searchable_form_url(); |
| 1311 params.searchable_form_encoding = | 1313 params.searchable_form_encoding = |
| 1312 document_state->searchable_form_encoding(); | 1314 document_state->searchable_form_encoding(); |
| 1313 | 1315 |
| 1314 const PasswordForm* password_form_data = | 1316 const PasswordForm* password_form_data = |
| 1315 document_state->password_form_data(); | 1317 document_state->password_form_data(); |
| 1316 if (password_form_data) | 1318 if (password_form_data) |
| 1317 params.password_form = *password_form_data; | 1319 params.password_form = *password_form_data; |
| 1318 | 1320 |
| (...skipping 4153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5472 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5474 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5473 return !!RenderThreadImpl::current()->compositor_thread(); | 5475 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5474 } | 5476 } |
| 5475 | 5477 |
| 5476 void RenderViewImpl::OnJavaBridgeInit() { | 5478 void RenderViewImpl::OnJavaBridgeInit() { |
| 5477 DCHECK(!java_bridge_dispatcher_); | 5479 DCHECK(!java_bridge_dispatcher_); |
| 5478 #if defined(ENABLE_JAVA_BRIDGE) | 5480 #if defined(ENABLE_JAVA_BRIDGE) |
| 5479 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5481 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5480 #endif | 5482 #endif |
| 5481 } | 5483 } |
| OLD | NEW |