Chromium Code Reviews| 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 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 3399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3410 const content::PasswordForm* old_password_form = | 3410 const content::PasswordForm* old_password_form = |
| 3411 old_document_state->password_form_data(); | 3411 old_document_state->password_form_data(); |
| 3412 if (old_password_form) { | 3412 if (old_password_form) { |
| 3413 document_state->set_password_form_data( | 3413 document_state->set_password_form_data( |
| 3414 make_scoped_ptr(new content::PasswordForm(*old_password_form))); | 3414 make_scoped_ptr(new content::PasswordForm(*old_password_form))); |
| 3415 } | 3415 } |
| 3416 } | 3416 } |
| 3417 | 3417 |
| 3418 // Make sure redirect tracking state is clear for the new load. | 3418 // Make sure redirect tracking state is clear for the new load. |
| 3419 completed_client_redirect_src_ = Referrer(); | 3419 completed_client_redirect_src_ = Referrer(); |
| 3420 } else if (frame->parent()->isLoading()) { | 3420 } else if (frame->parent()->isLoading() || |
| 3421 document_state->navigation_state()->pending_page_id() == -1) { | |
|
Charlie Reis
2013/05/23 21:53:33
It's hard to tell whether this fix is correct, sin
nasko
2013/09/20 21:25:39
This is now completely rewritten.
| |
| 3421 // Take note of AUTO_SUBFRAME loads here, so that we can know how to | 3422 // Take note of AUTO_SUBFRAME loads here, so that we can know how to |
| 3422 // load an error page. See didFailProvisionalLoad. | 3423 // load an error page. See didFailProvisionalLoad. |
| 3423 document_state->navigation_state()->set_transition_type( | 3424 document_state->navigation_state()->set_transition_type( |
| 3424 PAGE_TRANSITION_AUTO_SUBFRAME); | 3425 PAGE_TRANSITION_AUTO_SUBFRAME); |
| 3425 } | 3426 } |
| 3426 | 3427 |
| 3427 FOR_EACH_OBSERVER( | 3428 FOR_EACH_OBSERVER( |
| 3428 RenderViewObserver, observers_, DidStartProvisionalLoad(frame)); | 3429 RenderViewObserver, observers_, DidStartProvisionalLoad(frame)); |
| 3429 | 3430 |
| 3430 Send(new ViewHostMsg_DidStartProvisionalLoadForFrame( | 3431 Send(new ViewHostMsg_DidStartProvisionalLoadForFrame( |
| (...skipping 3131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6562 WebURL url = icon_urls[i].iconURL(); | 6563 WebURL url = icon_urls[i].iconURL(); |
| 6563 if (!url.isEmpty()) | 6564 if (!url.isEmpty()) |
| 6564 urls.push_back(FaviconURL(url, | 6565 urls.push_back(FaviconURL(url, |
| 6565 ToFaviconType(icon_urls[i].iconType()))); | 6566 ToFaviconType(icon_urls[i].iconType()))); |
| 6566 } | 6567 } |
| 6567 SendUpdateFaviconURL(urls); | 6568 SendUpdateFaviconURL(urls); |
| 6568 } | 6569 } |
| 6569 | 6570 |
| 6570 | 6571 |
| 6571 } // namespace content | 6572 } // namespace content |
| OLD | NEW |