Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/renderer/gpu/render_widget_compositor.h" | 5 #include "content/renderer/gpu/render_widget_compositor.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 947 } | 947 } |
| 948 | 948 |
| 949 void RenderWidgetCompositor::DidPostSwapBuffers() { | 949 void RenderWidgetCompositor::DidPostSwapBuffers() { |
| 950 widget_->OnSwapBuffersPosted(); | 950 widget_->OnSwapBuffersPosted(); |
| 951 } | 951 } |
| 952 | 952 |
| 953 void RenderWidgetCompositor::DidAbortSwapBuffers() { | 953 void RenderWidgetCompositor::DidAbortSwapBuffers() { |
| 954 widget_->OnSwapBuffersAborted(); | 954 widget_->OnSwapBuffersAborted(); |
| 955 } | 955 } |
| 956 | 956 |
| 957 namespace { | |
| 958 | |
| 959 blink::WebFrameTimingEvent CompositeTimingEventToDouble( | |
| 960 const cc::FrameTimingTracker::CompositeTimingEvent& event) { | |
| 961 return blink::WebFrameTimingEvent(event.frame_id, | |
| 962 (event.timestamp - base::TimeTicks()).InSecondsF()); | |
| 963 } | |
| 964 | |
| 965 blink::WebFrameTimingEvent MainFrameTimingEventToDouble( | |
| 966 const cc::FrameTimingTracker::MainFrameTimingEvent& event) { | |
| 967 return blink::WebFrameTimingEvent(event.frame_id, | |
| 968 (event.timestamp - base::TimeTicks()).InSecondsF(), | |
| 969 (event.end_time - base::TimeTicks()).InSecondsF()); | |
| 970 } | |
| 971 | |
| 972 } // namespace | |
| 973 | |
| 974 void RenderWidgetCompositor::RecordFrameTimingEvents( | |
| 975 scoped_ptr<cc::FrameTimingTracker::CompositeTimingSet> composite_events, | |
| 976 scoped_ptr<cc::FrameTimingTracker::MainFrameTimingSet> main_frame_events) { | |
| 977 for (const auto& composite_event : *composite_events ) { | |
| 978 int64_t frameId = composite_event.first; | |
| 979 const std::vector<cc::FrameTimingTracker::CompositeTimingEvent>& events = | |
| 980 composite_event.second; | |
| 981 std::vector<blink::WebFrameTimingEvent> webEvents(events.size()); | |
| 982 std::transform(events.begin(), events.end(), webEvents.begin(), | |
| 983 CompositeTimingEventToDouble); | |
|
vmpstr
2015/06/02 17:40:08
I kind of weakly prefer an explicit loop here, but
MikeB
2015/06/02 21:59:36
Done.
| |
| 984 widget_->webwidget()->recordFrameTimingEvent( | |
| 985 blink::WebWidget::CompositeEvent, frameId, webEvents); | |
| 986 } | |
| 987 for (const auto& main_frame_event : *main_frame_events ) { | |
| 988 int64_t frameId = main_frame_event.first; | |
| 989 const std::vector<cc::FrameTimingTracker::MainFrameTimingEvent>& events = | |
| 990 main_frame_event.second; | |
| 991 std::vector<blink::WebFrameTimingEvent> webEvents(events.size()); | |
| 992 std::transform(events.begin(), events.end(), webEvents.begin(), | |
| 993 MainFrameTimingEventToDouble); | |
| 994 widget_->webwidget()->recordFrameTimingEvent( | |
| 995 blink::WebWidget::RenderEvent, frameId, webEvents); | |
| 996 } | |
| 997 } | |
| 998 | |
| 957 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { | 999 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() { |
| 958 cc::ContextProvider* provider = | 1000 cc::ContextProvider* provider = |
| 959 compositor_deps_->GetSharedMainThreadContextProvider(); | 1001 compositor_deps_->GetSharedMainThreadContextProvider(); |
| 960 // provider can be NULL after the GPU process crashed enough times and we | 1002 // provider can be NULL after the GPU process crashed enough times and we |
| 961 // don't want to restart it any more (falling back to software). | 1003 // don't want to restart it any more (falling back to software). |
| 962 if (!provider) | 1004 if (!provider) |
| 963 return; | 1005 return; |
| 964 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); | 1006 provider->ContextGL()->RateLimitOffscreenContextCHROMIUM(); |
| 965 } | 1007 } |
| 966 | 1008 |
| 967 void RenderWidgetCompositor::SetSurfaceIdNamespace( | 1009 void RenderWidgetCompositor::SetSurfaceIdNamespace( |
| 968 uint32_t surface_id_namespace) { | 1010 uint32_t surface_id_namespace) { |
| 969 layer_tree_host_->set_surface_id_namespace(surface_id_namespace); | 1011 layer_tree_host_->set_surface_id_namespace(surface_id_namespace); |
| 970 } | 1012 } |
| 971 | 1013 |
| 972 } // namespace content | 1014 } // namespace content |
| OLD | NEW |