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 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1483 return; | 1483 return; |
1484 | 1484 |
1485 observing_root_window_ = true; | 1485 observing_root_window_ = true; |
1486 if (host_) | 1486 if (host_) |
1487 host_->Send(new ViewMsg_SetBeginFramePaused(host_->GetRoutingID(), false)); | 1487 host_->Send(new ViewMsg_SetBeginFramePaused(host_->GetRoutingID(), false)); |
1488 view_.GetWindowAndroid()->AddObserver(this); | 1488 view_.GetWindowAndroid()->AddObserver(this); |
1489 // When using browser compositor, DelegatedFrameHostAndroid provides the BFS. | 1489 // When using browser compositor, DelegatedFrameHostAndroid provides the BFS. |
1490 if (!using_browser_compositor_) | 1490 if (!using_browser_compositor_) |
1491 SetBeginFrameSource(view_.GetWindowAndroid()->GetBeginFrameSource()); | 1491 SetBeginFrameSource(view_.GetWindowAndroid()->GetBeginFrameSource()); |
1492 | 1492 |
1493 ui::WindowAndroidCompositor* compositor = | 1493 content::CompositorImpl* compositor = |
boliu
2017/01/30 17:20:22
nit: no need for content::
Alex Z.
2017/01/30 20:37:49
Done.
| |
1494 view_.GetWindowAndroid()->GetCompositor(); | 1494 static_cast<CompositorImpl*>(view_.GetWindowAndroid()->GetCompositor()); |
1495 if (compositor) { | 1495 if (compositor) { |
Fady Samuel
2017/01/29 15:43:02
No need for {, } if block is a single statement.
Alex Z.
2017/01/30 20:37:49
Done.
| |
1496 delegated_frame_host_->RegisterFrameSinkHierarchy( | 1496 compositor->AddChildFrameSink(delegated_frame_host_->GetFrameSinkId()); |
1497 compositor->GetFrameSinkId()); | |
1498 } | 1497 } |
1499 } | 1498 } |
1500 | 1499 |
1501 void RenderWidgetHostViewAndroid::StopObservingRootWindow() { | 1500 void RenderWidgetHostViewAndroid::StopObservingRootWindow() { |
1502 if (!(view_.GetWindowAndroid())) { | 1501 if (!(view_.GetWindowAndroid())) { |
1503 DCHECK(!observing_root_window_); | 1502 DCHECK(!observing_root_window_); |
1504 return; | 1503 return; |
1505 } | 1504 } |
1506 | 1505 |
1507 if (!observing_root_window_) | 1506 if (!observing_root_window_) |
(...skipping 559 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 |