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 1500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1511 if (!using_browser_compositor_) | 1511 if (!using_browser_compositor_) |
1512 SetBeginFrameSource(nullptr); | 1512 SetBeginFrameSource(nullptr); |
1513 // If the DFH has already been destroyed, it will have cleaned itself up. | 1513 // If the DFH has already been destroyed, it will have cleaned itself up. |
1514 // This happens in some WebView cases. | 1514 // This happens in some WebView cases. |
1515 if (delegated_frame_host_) | 1515 if (delegated_frame_host_) |
1516 delegated_frame_host_->UnregisterFrameSinkHierarchy(); | 1516 delegated_frame_host_->UnregisterFrameSinkHierarchy(); |
1517 DCHECK(!begin_frame_source_); | 1517 DCHECK(!begin_frame_source_); |
1518 } | 1518 } |
1519 | 1519 |
1520 void RenderWidgetHostViewAndroid::SendBeginFrame(cc::BeginFrameArgs args) { | 1520 void RenderWidgetHostViewAndroid::SendBeginFrame(cc::BeginFrameArgs args) { |
1521 TRACE_EVENT1("cc", "RenderWidgetHostViewAndroid::SendBeginFrame", | 1521 TRACE_EVENT2("cc", "RenderWidgetHostViewAndroid::SendBeginFrame", |
1522 "frame_time_us", args.frame_time.ToInternalValue()); | 1522 "frame_number", args.sequence_number, "frame_time_us", |
| 1523 args.frame_time.ToInternalValue()); |
1523 | 1524 |
1524 // Synchronous compositor does not use deadline-based scheduling. | 1525 // Synchronous compositor does not use deadline-based scheduling. |
1525 // TODO(brianderson): Replace this hardcoded deadline after Android | 1526 // TODO(brianderson): Replace this hardcoded deadline after Android |
1526 // switches to Surfaces and the Browser's commit isn't in the critical path. | 1527 // switches to Surfaces and the Browser's commit isn't in the critical path. |
1527 args.deadline = sync_compositor_ ? base::TimeTicks() | 1528 args.deadline = sync_compositor_ ? base::TimeTicks() |
1528 : args.frame_time + (args.interval * 0.6); | 1529 : args.frame_time + (args.interval * 0.6); |
1529 host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args)); | 1530 host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args)); |
1530 if (sync_compositor_) | 1531 if (sync_compositor_) |
1531 sync_compositor_->DidSendBeginFrame(view_.GetWindowAndroid()); | 1532 sync_compositor_->DidSendBeginFrame(view_.GetWindowAndroid()); |
1532 } | 1533 } |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2070 if (!compositor) | 2071 if (!compositor) |
2071 return; | 2072 return; |
2072 | 2073 |
2073 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2074 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
2074 overscroll_refresh_handler, compositor, | 2075 overscroll_refresh_handler, compositor, |
2075 ui::GetScaleFactorForNativeView(GetNativeView())); | 2076 ui::GetScaleFactorForNativeView(GetNativeView())); |
2076 is_showing_overscroll_glow_ = true; | 2077 is_showing_overscroll_glow_ = true; |
2077 } | 2078 } |
2078 | 2079 |
2079 } // namespace content | 2080 } // namespace content |
OLD | NEW |