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

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 476113004: Replace overdraw_bottom_height with top_controls_layout_height. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index cb317f46203293225de1ed0346cf78c2a96bf9e9..4caefa49ec1928cc3cdacc0aab2c03198dc9b246 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -379,8 +379,7 @@ void ContentViewCoreImpl::UpdateFrameInfo(
const gfx::SizeF& content_size,
const gfx::SizeF& viewport_size,
const gfx::Vector2dF& controls_offset,
- const gfx::Vector2dF& content_offset,
- float overdraw_bottom_height) {
+ const gfx::Vector2dF& content_offset) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
if (obj.is_null())
@@ -401,8 +400,7 @@ void ContentViewCoreImpl::UpdateFrameInfo(
viewport_size.width(),
viewport_size.height(),
controls_offset.y(),
- content_offset.y(),
- overdraw_bottom_height);
+ content_offset.y());
}
void ContentViewCoreImpl::SetTitle(const base::string16& title) {
@@ -768,15 +766,6 @@ gfx::Size ContentViewCoreImpl::GetViewportSizeOffsetDip() const {
gfx::ScaleSize(GetViewportSizeOffsetPix(), 1.0f / dpi_scale()));
}
-float ContentViewCoreImpl::GetOverdrawBottomHeightDip() const {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
- if (j_obj.is_null())
- return 0.f;
- return Java_ContentViewCore_getOverdrawBottomHeightPix(env, j_obj.obj())
- / dpi_scale();
-}
-
void ContentViewCoreImpl::AttachLayer(scoped_refptr<cc::Layer> layer) {
root_layer_->InsertChild(layer, 0);
root_layer_->SetIsDrawable(false);

Powered by Google App Engine
This is Rietveld 408576698