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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 11316342: [RDS] Temporary workaround for black tabs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing upload Created 8 years 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 | no next file » | 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) 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 3373 matching lines...) Expand 10 before | Expand all | Expand 10 after
3384 bool is_new_navigation) { 3384 bool is_new_navigation) {
3385 DocumentState* document_state = 3385 DocumentState* document_state =
3386 DocumentState::FromDataSource(frame->dataSource()); 3386 DocumentState::FromDataSource(frame->dataSource());
3387 NavigationState* navigation_state = document_state->navigation_state(); 3387 NavigationState* navigation_state = document_state->navigation_state();
3388 3388
3389 if (document_state->commit_load_time().is_null()) 3389 if (document_state->commit_load_time().is_null())
3390 document_state->set_commit_load_time(Time::Now()); 3390 document_state->set_commit_load_time(Time::Now());
3391 3391
3392 if (document_state->must_reset_scroll_and_scale_state()) { 3392 if (document_state->must_reset_scroll_and_scale_state()) {
3393 #if defined(OS_ANDROID) // crbug.com/153907 3393 #if defined(OS_ANDROID) // crbug.com/153907
3394 webview()->resetScrollAndScaleState(); 3394 // http://crbug.com/165436
3395 // webview()->resetScrollAndScaleState();
3395 #endif 3396 #endif
3396 document_state->set_must_reset_scroll_and_scale_state(false); 3397 document_state->set_must_reset_scroll_and_scale_state(false);
3397 } 3398 }
3398 3399
3399 if (is_new_navigation) { 3400 if (is_new_navigation) {
3400 // When we perform a new navigation, we need to update the last committed 3401 // When we perform a new navigation, we need to update the last committed
3401 // session history entry with state for the page we are leaving. 3402 // session history entry with state for the page we are leaving.
3402 UpdateSessionHistory(frame); 3403 UpdateSessionHistory(frame);
3403 3404
3404 // We bump our Page ID to correspond with the new session history entry. 3405 // 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
6481 } 6482 }
6482 #endif 6483 #endif
6483 6484
6484 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6485 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6485 TransportDIB::Handle dib_handle) { 6486 TransportDIB::Handle dib_handle) {
6486 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6487 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6487 RenderProcess::current()->ReleaseTransportDIB(dib); 6488 RenderProcess::current()->ReleaseTransportDIB(dib);
6488 } 6489 }
6489 6490
6490 } // namespace content 6491 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698