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/bind.h" | 10 #include "base/bind.h" |
(...skipping 3337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3348 void RenderViewImpl::didCommitProvisionalLoad(WebFrame* frame, | 3348 void RenderViewImpl::didCommitProvisionalLoad(WebFrame* frame, |
3349 bool is_new_navigation) { | 3349 bool is_new_navigation) { |
3350 DocumentState* document_state = | 3350 DocumentState* document_state = |
3351 DocumentState::FromDataSource(frame->dataSource()); | 3351 DocumentState::FromDataSource(frame->dataSource()); |
3352 NavigationState* navigation_state = document_state->navigation_state(); | 3352 NavigationState* navigation_state = document_state->navigation_state(); |
3353 | 3353 |
3354 if (document_state->commit_load_time().is_null()) | 3354 if (document_state->commit_load_time().is_null()) |
3355 document_state->set_commit_load_time(Time::Now()); | 3355 document_state->set_commit_load_time(Time::Now()); |
3356 | 3356 |
3357 if (document_state->must_reset_scroll_and_scale_state()) { | 3357 if (document_state->must_reset_scroll_and_scale_state()) { |
| 3358 #if defined(OS_ANDROID) // crbug.com/153907 |
3358 webview()->resetScrollAndScaleState(); | 3359 webview()->resetScrollAndScaleState(); |
| 3360 #endif |
3359 document_state->set_must_reset_scroll_and_scale_state(false); | 3361 document_state->set_must_reset_scroll_and_scale_state(false); |
3360 } | 3362 } |
3361 | 3363 |
3362 if (is_new_navigation) { | 3364 if (is_new_navigation) { |
3363 // When we perform a new navigation, we need to update the last committed | 3365 // When we perform a new navigation, we need to update the last committed |
3364 // session history entry with state for the page we are leaving. | 3366 // session history entry with state for the page we are leaving. |
3365 UpdateSessionHistory(frame); | 3367 UpdateSessionHistory(frame); |
3366 | 3368 |
3367 // We bump our Page ID to correspond with the new session history entry. | 3369 // We bump our Page ID to correspond with the new session history entry. |
3368 page_id_ = next_page_id_++; | 3370 page_id_ = next_page_id_++; |
(...skipping 3058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6427 } | 6429 } |
6428 #endif | 6430 #endif |
6429 | 6431 |
6430 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6432 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6431 TransportDIB::Handle dib_handle) { | 6433 TransportDIB::Handle dib_handle) { |
6432 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6434 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6433 RenderProcess::current()->ReleaseTransportDIB(dib); | 6435 RenderProcess::current()->ReleaseTransportDIB(dib); |
6434 } | 6436 } |
6435 | 6437 |
6436 } // namespace content | 6438 } // namespace content |
OLD | NEW |