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

Side by Side Diff: android_webview/browser/browser_view_renderer.cc

Issue 210213002: [android_webview] Update max scroll offset from page scale change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "android_webview/browser/browser_view_renderer.h" 5 #include "android_webview/browser/browser_view_renderer.h"
6 6
7 #include "android_webview/browser/browser_view_renderer_client.h" 7 #include "android_webview/browser/browser_view_renderer_client.h"
8 #include "android_webview/browser/shared_renderer_state.h" 8 #include "android_webview/browser/shared_renderer_state.h"
9 #include "android_webview/public/browser/draw_gl.h" 9 #include "android_webview/public/browser/draw_gl.h"
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 ui_thread_weak_ptr_, 437 ui_thread_weak_ptr_,
438 page_scale_factor, 438 page_scale_factor,
439 min_page_scale_factor, 439 min_page_scale_factor,
440 max_page_scale_factor)); 440 max_page_scale_factor));
441 return; 441 return;
442 } 442 }
443 page_scale_factor_ = page_scale_factor; 443 page_scale_factor_ = page_scale_factor;
444 DCHECK_GT(page_scale_factor_, 0); 444 DCHECK_GT(page_scale_factor_, 0);
445 client_->SetPageScaleFactorAndLimits( 445 client_->SetPageScaleFactorAndLimits(
446 page_scale_factor, min_page_scale_factor, max_page_scale_factor); 446 page_scale_factor, min_page_scale_factor, max_page_scale_factor);
447 client_->SetMaxContainerViewScrollOffset(max_scroll_offset());
447 } 448 }
448 449
449 void BrowserViewRenderer::SetRootLayerScrollableSize( 450 void BrowserViewRenderer::SetRootLayerScrollableSize(
450 gfx::SizeF scrollable_size) { 451 gfx::SizeF scrollable_size) {
451 if (!ui_task_runner_->BelongsToCurrentThread()) { 452 if (!ui_task_runner_->BelongsToCurrentThread()) {
452 ui_task_runner_->PostTask( 453 ui_task_runner_->PostTask(
453 FROM_HERE, 454 FROM_HERE,
454 base::Bind(&BrowserViewRenderer::SetRootLayerScrollableSize, 455 base::Bind(&BrowserViewRenderer::SetRootLayerScrollableSize,
455 ui_thread_weak_ptr_, 456 ui_thread_weak_ptr_,
456 scrollable_size)); 457 scrollable_size));
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 base::StringAppendF(&str, 594 base::StringAppendF(&str,
594 "surface width height: [%d %d] ", 595 "surface width height: [%d %d] ",
595 draw_info->width, 596 draw_info->width,
596 draw_info->height); 597 draw_info->height);
597 base::StringAppendF(&str, "is_layer: %d ", draw_info->is_layer); 598 base::StringAppendF(&str, "is_layer: %d ", draw_info->is_layer);
598 } 599 }
599 return str; 600 return str;
600 } 601 }
601 602
602 } // namespace android_webview 603 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698