Skip to content

Commit

Permalink
Remove current implementation of frame timing events.
Browse files Browse the repository at this point in the history
The new draft [1] is significantly simpler and may not need frame IDs at
all. Per feedback from igrigorik@, it's probably easier to just revert
the current implementation until someone is ready to pick this up and
work on it again.

BUG=537864
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=haibinlu@chromium.org
R=esprehn@chromium.org,vmpstr@chromium.org

Review URL: https://codereview.chromium.org/1897123002

Cr-Commit-Position: refs/heads/master@{#388313}
  • Loading branch information
zetafunction authored and Commit bot committed Apr 19, 2016
1 parent 161be3d commit 27d40dd
Show file tree
Hide file tree
Showing 70 changed files with 1 addition and 1,542 deletions.
6 changes: 0 additions & 6 deletions blimp/client/feature/compositor/blimp_compositor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,6 @@ void BlimpCompositor::DidCompleteSwapBuffers() {}

void BlimpCompositor::DidCompletePageScaleAnimation() {}

void BlimpCompositor::RecordFrameTimingEvents(
std::unique_ptr<cc::FrameTimingTracker::CompositeTimingSet>
composite_events,
std::unique_ptr<cc::FrameTimingTracker::MainFrameTimingSet>
main_frame_events) {}

void BlimpCompositor::SetProtoReceiver(ProtoReceiver* receiver) {
remote_proto_channel_receiver_ = receiver;
}
Expand Down
5 changes: 0 additions & 5 deletions blimp/client/feature/compositor/blimp_compositor.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,6 @@ class BLIMP_CLIENT_EXPORT BlimpCompositor
void DidCommitAndDrawFrame() override;
void DidCompleteSwapBuffers() override;
void DidCompletePageScaleAnimation() override;
void RecordFrameTimingEvents(
std::unique_ptr<cc::FrameTimingTracker::CompositeTimingSet>
composite_events,
std::unique_ptr<cc::FrameTimingTracker::MainFrameTimingSet>
main_frame_events) override;

// RemoteProtoChannel implementation.
void SetProtoReceiver(ProtoReceiver* receiver) override;
Expand Down
5 changes: 0 additions & 5 deletions cc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ component("cc") {
"debug/devtools_instrumentation.h",
"debug/frame_rate_counter.cc",
"debug/frame_rate_counter.h",
"debug/frame_timing_request.cc",
"debug/frame_timing_request.h",
"debug/frame_timing_tracker.cc",
"debug/frame_timing_tracker.h",
"debug/frame_viewer_instrumentation.cc",
"debug/frame_viewer_instrumentation.h",
"debug/invalidation_benchmark.cc",
Expand Down Expand Up @@ -785,7 +781,6 @@ test("cc_unittests") {
"base/simple_enclosed_region_unittest.cc",
"base/tiling_data_unittest.cc",
"base/unique_notifier_unittest.cc",
"debug/frame_timing_tracker_unittest.cc",
"debug/layer_tree_debug_state_unittest.cc",
"debug/micro_benchmark_controller_unittest.cc",
"debug/rendering_stats_unittest.cc",
Expand Down
25 changes: 0 additions & 25 deletions cc/blink/web_layer_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -301,31 +301,6 @@ WebVector<WebRect> WebLayerImpl::nonFastScrollableRegion() const {
return result;
}

void WebLayerImpl::setFrameTimingRequests(
const WebVector<std::pair<int64_t, WebRect>>& requests) {
std::vector<cc::FrameTimingRequest> frame_timing_requests(requests.size());
for (size_t i = 0; i < requests.size(); ++i) {
frame_timing_requests[i] = cc::FrameTimingRequest(
requests[i].first, gfx::Rect(requests[i].second));
}
layer_->SetFrameTimingRequests(frame_timing_requests);
}

WebVector<std::pair<int64_t, WebRect>> WebLayerImpl::frameTimingRequests()
const {
const std::vector<cc::FrameTimingRequest>& frame_timing_requests =
layer_->FrameTimingRequests();

size_t num_requests = frame_timing_requests.size();

WebVector<std::pair<int64_t, WebRect>> result(num_requests);
for (size_t i = 0; i < num_requests; ++i) {
result[i] = std::make_pair(frame_timing_requests[i].id(),
frame_timing_requests[i].rect());
}
return result;
}

void WebLayerImpl::setTouchEventHandlerRegion(const WebVector<WebRect>& rects) {
cc::Region region;
for (size_t i = 0; i < rects.size(); ++i)
Expand Down
5 changes: 0 additions & 5 deletions cc/blink/web_layer_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,6 @@ class WebLayerImpl : public blink::WebLayer {
void setTouchEventHandlerRegion(
const blink::WebVector<blink::WebRect>& region) override;
blink::WebVector<blink::WebRect> touchEventHandlerRegion() const override;
void setFrameTimingRequests(
const blink::WebVector<std::pair<int64_t, blink::WebRect>>& requests)
override;
blink::WebVector<std::pair<int64_t, blink::WebRect>> frameTimingRequests()
const override;
void setIsContainerForFixedPositionLayers(bool is_container) override;
bool isContainerForFixedPositionLayers() const override;
void setPositionConstraint(
Expand Down
4 changes: 0 additions & 4 deletions cc/cc.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@
'debug/devtools_instrumentation.h',
'debug/frame_rate_counter.cc',
'debug/frame_rate_counter.h',
'debug/frame_timing_request.cc',
'debug/frame_timing_request.h',
'debug/frame_timing_tracker.cc',
'debug/frame_timing_tracker.h',
'debug/frame_viewer_instrumentation.cc',
'debug/frame_viewer_instrumentation.h',
'debug/invalidation_benchmark.cc',
Expand Down
1 change: 0 additions & 1 deletion cc/cc_tests.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
'base/simple_enclosed_region_unittest.cc',
'base/tiling_data_unittest.cc',
'base/unique_notifier_unittest.cc',
'debug/frame_timing_tracker_unittest.cc',
'debug/layer_tree_debug_state_unittest.cc',
'debug/micro_benchmark_controller_unittest.cc',
'debug/rendering_stats_unittest.cc',
Expand Down
19 changes: 0 additions & 19 deletions cc/debug/frame_timing_request.cc

This file was deleted.

41 changes: 0 additions & 41 deletions cc/debug/frame_timing_request.h

This file was deleted.

119 changes: 0 additions & 119 deletions cc/debug/frame_timing_tracker.cc

This file was deleted.

98 changes: 0 additions & 98 deletions cc/debug/frame_timing_tracker.h

This file was deleted.

Loading

0 comments on commit 27d40dd

Please sign in to comment.