| 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 3394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3405 const content::PasswordForm* old_password_form = | 3405 const content::PasswordForm* old_password_form = |
| 3406 old_document_state->password_form_data(); | 3406 old_document_state->password_form_data(); |
| 3407 if (old_password_form) { | 3407 if (old_password_form) { |
| 3408 document_state->set_password_form_data( | 3408 document_state->set_password_form_data( |
| 3409 make_scoped_ptr(new content::PasswordForm(*old_password_form))); | 3409 make_scoped_ptr(new content::PasswordForm(*old_password_form))); |
| 3410 } | 3410 } |
| 3411 } | 3411 } |
| 3412 | 3412 |
| 3413 // Make sure redirect tracking state is clear for the new load. | 3413 // Make sure redirect tracking state is clear for the new load. |
| 3414 completed_client_redirect_src_ = Referrer(); | 3414 completed_client_redirect_src_ = Referrer(); |
| 3415 } else if (frame->parent()->isLoading()) { | 3415 } else if (frame->parent()->isLoading() || |
| 3416 document_state->navigation_state()->pending_page_id() == -1) { |
| 3416 // Take note of AUTO_SUBFRAME loads here, so that we can know how to | 3417 // Take note of AUTO_SUBFRAME loads here, so that we can know how to |
| 3417 // load an error page. See didFailProvisionalLoad. | 3418 // load an error page. See didFailProvisionalLoad. |
| 3418 document_state->navigation_state()->set_transition_type( | 3419 document_state->navigation_state()->set_transition_type( |
| 3419 PAGE_TRANSITION_AUTO_SUBFRAME); | 3420 PAGE_TRANSITION_AUTO_SUBFRAME); |
| 3420 } | 3421 } |
| 3421 | 3422 |
| 3422 FOR_EACH_OBSERVER( | 3423 FOR_EACH_OBSERVER( |
| 3423 RenderViewObserver, observers_, DidStartProvisionalLoad(frame)); | 3424 RenderViewObserver, observers_, DidStartProvisionalLoad(frame)); |
| 3424 | 3425 |
| 3425 Send(new ViewHostMsg_DidStartProvisionalLoadForFrame( | 3426 Send(new ViewHostMsg_DidStartProvisionalLoadForFrame( |
| (...skipping 3114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6540 WebURL url = icon_urls[i].iconURL(); | 6541 WebURL url = icon_urls[i].iconURL(); |
| 6541 if (!url.isEmpty()) | 6542 if (!url.isEmpty()) |
| 6542 urls.push_back(FaviconURL(url, | 6543 urls.push_back(FaviconURL(url, |
| 6543 ToFaviconType(icon_urls[i].iconType()))); | 6544 ToFaviconType(icon_urls[i].iconType()))); |
| 6544 } | 6545 } |
| 6545 SendUpdateFaviconURL(urls); | 6546 SendUpdateFaviconURL(urls); |
| 6546 } | 6547 } |
| 6547 | 6548 |
| 6548 | 6549 |
| 6549 } // namespace content | 6550 } // namespace content |
| OLD | NEW |