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

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

Issue 2524423002: VR: Disable Overscroll Glow in VrShell (Closed)
Patch Set: VR: Disable Overscroll Glow in VrShell Created 4 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
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 <utility> 9 #include <utility>
10 10
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
1497 host_->Send(new ViewMsg_BeginFrame( 1497 host_->Send(new ViewMsg_BeginFrame(
1498 host_->GetRoutingID(), 1498 host_->GetRoutingID(),
1499 cc::BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline, 1499 cc::BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, deadline,
1500 vsync_period, cc::BeginFrameArgs::NORMAL))); 1500 vsync_period, cc::BeginFrameArgs::NORMAL)));
1501 if (sync_compositor_) 1501 if (sync_compositor_)
1502 sync_compositor_->DidSendBeginFrame(view_.GetWindowAndroid()); 1502 sync_compositor_->DidSendBeginFrame(view_.GetWindowAndroid());
1503 } 1503 }
1504 1504
1505 bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) { 1505 bool RenderWidgetHostViewAndroid::Animate(base::TimeTicks frame_time) {
1506 bool needs_animate = false; 1506 bool needs_animate = false;
1507 if (overscroll_controller_) { 1507 if (overscroll_controller_ && is_showing_overscroll_glow_) {
1508 needs_animate |= overscroll_controller_->Animate( 1508 needs_animate |= overscroll_controller_->Animate(
1509 frame_time, content_view_core_->GetViewAndroid()->GetLayer()); 1509 frame_time, content_view_core_->GetViewAndroid()->GetLayer());
1510 } 1510 }
1511 if (selection_controller_) 1511 if (selection_controller_)
1512 needs_animate |= selection_controller_->Animate(frame_time); 1512 needs_animate |= selection_controller_->Animate(frame_time);
1513 return needs_animate; 1513 return needs_animate;
1514 } 1514 }
1515 1515
1516 void RenderWidgetHostViewAndroid::RequestDisallowInterceptTouchEvent() { 1516 void RenderWidgetHostViewAndroid::RequestDisallowInterceptTouchEvent() {
1517 if (content_view_core_) 1517 if (content_view_core_)
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
1712 1712
1713 void RenderWidgetHostViewAndroid::SetTextHandlesTemporarilyHidden(bool hidden) { 1713 void RenderWidgetHostViewAndroid::SetTextHandlesTemporarilyHidden(bool hidden) {
1714 if (selection_controller_) 1714 if (selection_controller_)
1715 selection_controller_->SetTemporarilyHidden(hidden); 1715 selection_controller_->SetTemporarilyHidden(hidden);
1716 } 1716 }
1717 1717
1718 SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const { 1718 SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
1719 return cached_background_color_; 1719 return cached_background_color_;
1720 } 1720 }
1721 1721
1722 void RenderWidgetHostViewAndroid::SetShowingOverscrollGlow(bool showing_glow) {
1723 is_showing_overscroll_glow_ = showing_glow;
1724 }
1725
1722 void RenderWidgetHostViewAndroid::DidOverscroll( 1726 void RenderWidgetHostViewAndroid::DidOverscroll(
1723 const ui::DidOverscrollParams& params) { 1727 const ui::DidOverscrollParams& params) {
1724 if (sync_compositor_) 1728 if (sync_compositor_)
1725 sync_compositor_->DidOverscroll(params); 1729 sync_compositor_->DidOverscroll(params);
1726 1730
1727 if (!content_view_core_ || !is_showing_) 1731 if (!content_view_core_ || !is_showing_)
1728 return; 1732 return;
1729 1733
1730 if (overscroll_controller_) 1734 if (overscroll_controller_)
1731 overscroll_controller_->OnOverscrolled(params); 1735 overscroll_controller_->OnOverscrolled(params);
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
1796 if (resize) 1800 if (resize)
1797 WasResized(); 1801 WasResized();
1798 1802
1799 if (!selection_controller_) 1803 if (!selection_controller_)
1800 selection_controller_ = CreateSelectionController(this, content_view_core_); 1804 selection_controller_ = CreateSelectionController(this, content_view_core_);
1801 1805
1802 if (!overscroll_controller_ && 1806 if (!overscroll_controller_ &&
1803 view_.GetWindowAndroid()->GetCompositor()) { 1807 view_.GetWindowAndroid()->GetCompositor()) {
1804 overscroll_controller_ = CreateOverscrollController( 1808 overscroll_controller_ = CreateOverscrollController(
1805 content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView())); 1809 content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
1810 is_showing_overscroll_glow_ = true;
1806 } 1811 }
1807 } 1812 }
1808 1813
1809 void RenderWidgetHostViewAndroid::RunAckCallbacks() { 1814 void RenderWidgetHostViewAndroid::RunAckCallbacks() {
1810 while (!ack_callbacks_.empty()) { 1815 while (!ack_callbacks_.empty()) {
1811 ack_callbacks_.front().Run(); 1816 ack_callbacks_.front().Run();
1812 ack_callbacks_.pop(); 1817 ack_callbacks_.pop();
1813 } 1818 }
1814 } 1819 }
1815 1820
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1863 void RenderWidgetHostViewAndroid::OnDetachedFromWindow() { 1868 void RenderWidgetHostViewAndroid::OnDetachedFromWindow() {
1864 StopObservingRootWindow(); 1869 StopObservingRootWindow();
1865 OnDetachCompositor(); 1870 OnDetachCompositor();
1866 } 1871 }
1867 1872
1868 void RenderWidgetHostViewAndroid::OnAttachCompositor() { 1873 void RenderWidgetHostViewAndroid::OnAttachCompositor() {
1869 DCHECK(content_view_core_); 1874 DCHECK(content_view_core_);
1870 if (!overscroll_controller_) 1875 if (!overscroll_controller_)
1871 overscroll_controller_ = CreateOverscrollController( 1876 overscroll_controller_ = CreateOverscrollController(
1872 content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView())); 1877 content_view_core_, ui::GetScaleFactorForNativeView(GetNativeView()));
1878 is_showing_overscroll_glow_ = true;
1873 ui::WindowAndroidCompositor* compositor = 1879 ui::WindowAndroidCompositor* compositor =
1874 view_.GetWindowAndroid()->GetCompositor(); 1880 view_.GetWindowAndroid()->GetCompositor();
1875 delegated_frame_host_->RegisterFrameSinkHierarchy( 1881 delegated_frame_host_->RegisterFrameSinkHierarchy(
1876 compositor->GetFrameSinkId()); 1882 compositor->GetFrameSinkId());
1877 } 1883 }
1878 1884
1879 void RenderWidgetHostViewAndroid::OnDetachCompositor() { 1885 void RenderWidgetHostViewAndroid::OnDetachCompositor() {
1880 DCHECK(content_view_core_); 1886 DCHECK(content_view_core_);
1881 DCHECK(using_browser_compositor_); 1887 DCHECK(using_browser_compositor_);
1882 RunAckCallbacks(); 1888 RunAckCallbacks();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1977 case ui::MotionEvent::ACTION_UP: 1983 case ui::MotionEvent::ACTION_UP:
1978 case ui::MotionEvent::ACTION_POINTER_UP: 1984 case ui::MotionEvent::ACTION_POINTER_UP:
1979 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED", 1985 UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
1980 delta.InMicroseconds(), 1, 1000000, 50); 1986 delta.InMicroseconds(), 1, 1000000, 50);
1981 default: 1987 default:
1982 return; 1988 return;
1983 } 1989 }
1984 } 1990 }
1985 1991
1986 } // namespace content 1992 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698