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 3376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3387 bool is_new_navigation) { | 3387 bool is_new_navigation) { |
3388 DocumentState* document_state = | 3388 DocumentState* document_state = |
3389 DocumentState::FromDataSource(frame->dataSource()); | 3389 DocumentState::FromDataSource(frame->dataSource()); |
3390 NavigationState* navigation_state = document_state->navigation_state(); | 3390 NavigationState* navigation_state = document_state->navigation_state(); |
3391 | 3391 |
3392 if (document_state->commit_load_time().is_null()) | 3392 if (document_state->commit_load_time().is_null()) |
3393 document_state->set_commit_load_time(Time::Now()); | 3393 document_state->set_commit_load_time(Time::Now()); |
3394 | 3394 |
3395 if (document_state->must_reset_scroll_and_scale_state()) { | 3395 if (document_state->must_reset_scroll_and_scale_state()) { |
3396 #if defined(OS_ANDROID) // crbug.com/153907 | 3396 #if defined(OS_ANDROID) // crbug.com/153907 |
3397 // http://crbug.com/165436 | 3397 webview()->resetScrollAndScaleState(); |
3398 // webview()->resetScrollAndScaleState(); | |
3399 #endif | 3398 #endif |
3400 document_state->set_must_reset_scroll_and_scale_state(false); | 3399 document_state->set_must_reset_scroll_and_scale_state(false); |
3401 } | 3400 } |
3402 | 3401 |
3403 if (is_new_navigation) { | 3402 if (is_new_navigation) { |
3404 // When we perform a new navigation, we need to update the last committed | 3403 // When we perform a new navigation, we need to update the last committed |
3405 // session history entry with state for the page we are leaving. | 3404 // session history entry with state for the page we are leaving. |
3406 UpdateSessionHistory(frame); | 3405 UpdateSessionHistory(frame); |
3407 | 3406 |
3408 // We bump our Page ID to correspond with the new session history entry. | 3407 // We bump our Page ID to correspond with the new session history entry. |
(...skipping 3076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6485 } | 6484 } |
6486 #endif | 6485 #endif |
6487 | 6486 |
6488 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6487 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6489 TransportDIB::Handle dib_handle) { | 6488 TransportDIB::Handle dib_handle) { |
6490 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6489 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6491 RenderProcess::current()->ReleaseTransportDIB(dib); | 6490 RenderProcess::current()->ReleaseTransportDIB(dib); |
6492 } | 6491 } |
6493 | 6492 |
6494 } // namespace content | 6493 } // namespace content |
OLD | NEW |