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

Unified Diff: mojo/services/surfaces/surfaces_output_surface.cc

Issue 1049993002: Get mojo_shell building inside chromium checkout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix presubmit Created 5 years, 9 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
« no previous file with comments | « mojo/services/surfaces/surfaces_output_surface.h ('k') | mojo/services/surfaces/surfaces_scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/surfaces/surfaces_output_surface.cc
diff --git a/mojo/cc/direct_output_surface.cc b/mojo/services/surfaces/surfaces_output_surface.cc
similarity index 83%
copy from mojo/cc/direct_output_surface.cc
copy to mojo/services/surfaces/surfaces_output_surface.cc
index 0899c4e17eb6a0f1f48df86b3ec4d0aac1eabced..891ef13700b18b2b60f20d2411fab01090d2663b 100644
--- a/mojo/cc/direct_output_surface.cc
+++ b/mojo/services/surfaces/surfaces_output_surface.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/cc/direct_output_surface.h"
+#include "mojo/services/surfaces/surfaces_output_surface.h"
#include "base/bind.h"
#include "cc/output/compositor_frame.h"
@@ -18,7 +18,8 @@ DirectOutputSurface::DirectOutputSurface(
: cc::OutputSurface(context_provider), weak_ptr_factory_(this) {
}
-DirectOutputSurface::~DirectOutputSurface() {}
+DirectOutputSurface::~DirectOutputSurface() {
+}
void DirectOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
DCHECK(context_provider_.get());
@@ -33,9 +34,8 @@ void DirectOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
uint32_t sync_point =
context_provider_->ContextGL()->InsertSyncPointCHROMIUM();
context_provider_->ContextSupport()->SignalSyncPoint(
- sync_point,
- base::Bind(&OutputSurface::OnSwapBuffersComplete,
- weak_ptr_factory_.GetWeakPtr()));
+ sync_point, base::Bind(&OutputSurface::OnSwapBuffersComplete,
+ weak_ptr_factory_.GetWeakPtr()));
client_->DidSwapBuffers();
}
« no previous file with comments | « mojo/services/surfaces/surfaces_output_surface.h ('k') | mojo/services/surfaces/surfaces_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698