Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: chrome/renderer/render_view.cc

Issue 661445: Avoid having every frame of a multipart response create a (Closed)
Patch Set: with unittest Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webkit/glue/multipart_response_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 } 1165 }
1166 1166
1167 // Set the URL to be displayed in the browser UI to the user. 1167 // Set the URL to be displayed in the browser UI to the user.
1168 if (ds->hasUnreachableURL()) { 1168 if (ds->hasUnreachableURL()) {
1169 params.url = ds->unreachableURL(); 1169 params.url = ds->unreachableURL();
1170 } else { 1170 } else {
1171 params.url = request.url(); 1171 params.url = request.url();
1172 } 1172 }
1173 1173
1174 GetRedirectChain(ds, &params.redirects); 1174 GetRedirectChain(ds, &params.redirects);
1175 params.should_update_history = !ds->hasUnreachableURL(); 1175 params.should_update_history = !ds->hasUnreachableURL() &&
1176 !response.isMultipartPayload();
1176 1177
1177 params.searchable_form_url = navigation_state->searchable_form_url(); 1178 params.searchable_form_url = navigation_state->searchable_form_url();
1178 params.searchable_form_encoding = 1179 params.searchable_form_encoding =
1179 navigation_state->searchable_form_encoding(); 1180 navigation_state->searchable_form_encoding();
1180 1181
1181 const PasswordForm* password_form_data = 1182 const PasswordForm* password_form_data =
1182 navigation_state->password_form_data(); 1183 navigation_state->password_form_data();
1183 if (password_form_data) 1184 if (password_form_data)
1184 params.password_form = *password_form_data; 1185 params.password_form = *password_form_data;
1185 1186
(...skipping 3382 matching lines...) Expand 10 before | Expand all | Expand 10 after
4568 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) { 4569 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) {
4569 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window)); 4570 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window));
4570 } 4571 }
4571 #endif 4572 #endif
4572 4573
4573 WebKit::WebGeolocationServiceInterface* RenderView::getGeolocationService() { 4574 WebKit::WebGeolocationServiceInterface* RenderView::getGeolocationService() {
4574 if (!geolocation_dispatcher_.get()) 4575 if (!geolocation_dispatcher_.get())
4575 geolocation_dispatcher_.reset(new GeolocationDispatcher(this)); 4576 geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
4576 return geolocation_dispatcher_.get(); 4577 return geolocation_dispatcher_.get();
4577 } 4578 }
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/multipart_response_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698