Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: trunk/src/content/browser/compositor/gpu_browser_compositor_output_surface.cc

Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/content/browser/compositor/gpu_browser_compositor_output_surface.cc
===================================================================
--- trunk/src/content/browser/compositor/gpu_browser_compositor_output_surface.cc (revision 245194)
+++ trunk/src/content/browser/compositor/gpu_browser_compositor_output_surface.cc (working copy)
@@ -1,51 +0,0 @@
-// Copyright 2014 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/browser/compositor/gpu_browser_compositor_output_surface.h"
-
-#include "cc/output/compositor_frame.h"
-#include "content/browser/compositor/reflector_impl.h"
-#include "content/common/gpu/client/context_provider_command_buffer.h"
-#include "gpu/command_buffer/client/gles2_interface.h"
-
-namespace content {
-
-GpuBrowserCompositorOutputSurface::GpuBrowserCompositorOutputSurface(
- const scoped_refptr<ContextProviderCommandBuffer>& context,
- int surface_id,
- IDMap<BrowserCompositorOutputSurface>* output_surface_map,
- base::MessageLoopProxy* compositor_message_loop,
- base::WeakPtr<ui::Compositor> compositor)
- : BrowserCompositorOutputSurface(context,
- surface_id,
- output_surface_map,
- compositor_message_loop,
- compositor) {}
-
-GpuBrowserCompositorOutputSurface::~GpuBrowserCompositorOutputSurface() {}
-
-void GpuBrowserCompositorOutputSurface::SwapBuffers(
- cc::CompositorFrame* frame) {
- DCHECK(frame->gl_frame_data);
-
- ContextProviderCommandBuffer* provider_command_buffer =
- static_cast<ContextProviderCommandBuffer*>(context_provider_.get());
- CommandBufferProxyImpl* command_buffer_proxy =
- provider_command_buffer->GetCommandBufferProxy();
- DCHECK(command_buffer_proxy);
- context_provider_->ContextGL()->ShallowFlushCHROMIUM();
- command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
-
- if (reflector_.get()) {
- if (frame->gl_frame_data->sub_buffer_rect ==
- gfx::Rect(frame->gl_frame_data->size))
- reflector_->OnSwapBuffers();
- else
- reflector_->OnPostSubBuffer(frame->gl_frame_data->sub_buffer_rect);
- }
-
- OutputSurface::SwapBuffers(frame);
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698