OLD | NEW |
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 1471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1482 if (host_) | 1482 if (host_) |
1483 host_->Send(new ViewMsg_SetBeginFramePaused(host_->GetRoutingID(), false)); | 1483 host_->Send(new ViewMsg_SetBeginFramePaused(host_->GetRoutingID(), false)); |
1484 view_.GetWindowAndroid()->AddObserver(this); | 1484 view_.GetWindowAndroid()->AddObserver(this); |
1485 // When using browser compositor, DelegatedFrameHostAndroid provides the BFS. | 1485 // When using browser compositor, DelegatedFrameHostAndroid provides the BFS. |
1486 if (!using_browser_compositor_) | 1486 if (!using_browser_compositor_) |
1487 SetBeginFrameSource(view_.GetWindowAndroid()->GetBeginFrameSource()); | 1487 SetBeginFrameSource(view_.GetWindowAndroid()->GetBeginFrameSource()); |
1488 | 1488 |
1489 ui::WindowAndroidCompositor* compositor = | 1489 ui::WindowAndroidCompositor* compositor = |
1490 view_.GetWindowAndroid()->GetCompositor(); | 1490 view_.GetWindowAndroid()->GetCompositor(); |
1491 if (compositor) { | 1491 if (compositor) { |
1492 delegated_frame_host_->RegisterFrameSinkHierarchy( | 1492 compositor->AddChildFrameSink(delegated_frame_host_->GetFrameSinkId()); |
1493 compositor->GetFrameSinkId()); | |
1494 } | 1493 } |
1495 } | 1494 } |
1496 | 1495 |
1497 void RenderWidgetHostViewAndroid::StopObservingRootWindow() { | 1496 void RenderWidgetHostViewAndroid::StopObservingRootWindow() { |
1498 if (!(view_.GetWindowAndroid())) { | 1497 if (!(view_.GetWindowAndroid())) { |
1499 DCHECK(!observing_root_window_); | 1498 DCHECK(!observing_root_window_); |
1500 return; | 1499 return; |
1501 } | 1500 } |
1502 | 1501 |
1503 if (!observing_root_window_) | 1502 if (!observing_root_window_) |
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2067 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); | 2066 ui::WindowAndroidCompositor* compositor = window_android->GetCompositor(); |
2068 if (!compositor) | 2067 if (!compositor) |
2069 return; | 2068 return; |
2070 | 2069 |
2071 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2070 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
2072 overscroll_refresh_handler, compositor, | 2071 overscroll_refresh_handler, compositor, |
2073 ui::GetScaleFactorForNativeView(GetNativeView())); | 2072 ui::GetScaleFactorForNativeView(GetNativeView())); |
2074 } | 2073 } |
2075 | 2074 |
2076 } // namespace content | 2075 } // namespace content |
OLD | NEW |