cc: Remove "SwapBuffers" naming from LayerTreeHostSingleThreadClient

content/renderer/render_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 764 matching lines @@
 void RenderWidget::DidCommitCompositorFrame() {
   for (auto& observer : render_frames_)
     observer.DidCommitCompositorFrame();
   for (auto& observer : render_frame_proxies_)
     observer.DidCommitCompositorFrame();
   input_handler_->FlushPendingInputEventAck();
 }
 
 void RenderWidget::DidCompletePageScaleAnimation() {}
 
-void RenderWidget::DidCompleteSwapBuffers() {
-  TRACE_EVENT0("renderer", "RenderWidget::DidCompleteSwapBuffers");
+void RenderWidget::DidReceiveCompositorFrameAck() {
+  TRACE_EVENT0("renderer", "RenderWidget::DidReceiveCompositorFrameAck");
 
   // Notify subclasses threaded composited rendering was flushed to the screen.
   DidFlushPaint();
 
   if (!next_paint_flags_ && !need_update_rect_for_auto_resize_) {
     return;
   }
 
   ViewHostMsg_UpdateRect_Params params;
   params.view_size = size_;
   params.flags = next_paint_flags_;
 
   Send(new ViewHostMsg_UpdateRect(routing_id_, params));
   next_paint_flags_ = 0;
   need_update_rect_for_auto_resize_ = false;
 }
 
 void RenderWidget::ForwardCompositorProto(const std::vector<uint8_t>& proto) {
   Send(new ViewHostMsg_ForwardCompositorProto(routing_id_, proto));
 }
 
 bool RenderWidget::IsClosing() const {
   return host_closing_;
 }
 
-void RenderWidget::OnSwapBuffersAborted() {
-  TRACE_EVENT0("renderer", "RenderWidget::OnSwapBuffersAborted");
-  // Schedule another frame so the compositor learns about it.
-  ScheduleComposite();

[danakj, 2016/10/21 23:36:52]

This would possibly prevent context recovery because we have to composite to get
a context, but layout tests don't lose context and I NOTREACHED() that this is
the case and bots will inform me otherwise.

Oh, and ScheduleComposite does nothing unless
GetCompositorImplThreadTaskRunner() is true which it isnt in single thread
anyway so I think this is all no-ops.

[piman, 2016/10/21 23:44:22]

I think most uses of ScheduleComposite are wrong (either redundant or not
sufficient if it was needed), so I'm pretty ok with that

-}
-
-void RenderWidget::OnSwapBuffersComplete() {
-  TRACE_EVENT0("renderer", "RenderWidget::OnSwapBuffersComplete");
-
-  // Notify subclasses that composited rendering was flushed to the screen.
-  DidFlushPaint();

[danakj, 2016/10/21 23:36:52]

This looks scary but RWC calls DidCompleteSwapBuffers right before calling
OnSwapBuffersAborted, and it does the same thing, so we were doing this twice.

-}
-
-void RenderWidget::OnSwapBuffersPosted() {
-  TRACE_EVENT0("renderer", "RenderWidget::OnSwapBuffersPosted");
-}
-
 void RenderWidget::RequestScheduleAnimation() {
   scheduleAnimation();
 }
 
 void RenderWidget::UpdateVisualState() {
   GetWebWidget()->updateAllLifecyclePhases();
 }
 
 void RenderWidget::WillBeginCompositorFrame() {
   TRACE_EVENT0("gpu", "RenderWidget::willBeginCompositorFrame");
@@ skipping 1339 matching lines @@
 bool RenderWidget::isPointerLocked() {
   return mouse_lock_dispatcher_->IsMouseLockedTo(
       webwidget_mouse_lock_target_.get());
 }
 
 blink::WebWidget* RenderWidget::GetWebWidget() const {
   return webwidget_internal_;
 }
 
 }  // namespace content