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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 23494021: [Android] Provide a valid initial size for the overscroll effect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Explicit size on creation Created 7 years, 3 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
« no previous file with comments | « content/browser/android/overscroll_glow.cc ('k') | 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/browser/renderer_host/render_widget_host_view_android.h" 5 #include "content/browser/renderer_host/render_widget_host_view_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) { 822 bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) {
823 if (!overscroll_effect_) 823 if (!overscroll_effect_)
824 return false; 824 return false;
825 return overscroll_effect_->Animate(frame_time); 825 return overscroll_effect_->Animate(frame_time);
826 } 826 }
827 827
828 void RenderWidgetHostViewAndroid::CreateOverscrollEffectIfNecessary() { 828 void RenderWidgetHostViewAndroid::CreateOverscrollEffectIfNecessary() {
829 if (!overscroll_effect_enabled_ || overscroll_effect_) 829 if (!overscroll_effect_enabled_ || overscroll_effect_)
830 return; 830 return;
831 831
832 overscroll_effect_ = OverscrollGlow::Create(true); 832 overscroll_effect_ = OverscrollGlow::Create(true, content_size_in_layer_);
833 833
834 // Prevent future creation attempts on failure. 834 // Prevent future creation attempts on failure.
835 if (!overscroll_effect_) 835 if (!overscroll_effect_)
836 overscroll_effect_enabled_ = false; 836 overscroll_effect_enabled_ = false;
837 837
838 if (overscroll_effect_ && content_view_core_ && are_layers_attached_) 838 if (overscroll_effect_ && content_view_core_ && are_layers_attached_)
839 content_view_core_->AttachLayer(overscroll_effect_->root_layer()); 839 content_view_core_->AttachLayer(overscroll_effect_->root_layer());
840 } 840 }
841 841
842 void RenderWidgetHostViewAndroid::UpdateAnimationSize( 842 void RenderWidgetHostViewAndroid::UpdateAnimationSize(
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 // RenderWidgetHostView, public: 1288 // RenderWidgetHostView, public:
1289 1289
1290 // static 1290 // static
1291 RenderWidgetHostView* 1291 RenderWidgetHostView*
1292 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { 1292 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
1293 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); 1293 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
1294 return new RenderWidgetHostViewAndroid(rwhi, NULL); 1294 return new RenderWidgetHostViewAndroid(rwhi, NULL);
1295 } 1295 }
1296 1296
1297 } // namespace content 1297 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/overscroll_glow.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698