Mus: DirectOutputSurface* => DisplayOutputSurface*

services/ui/surfaces/display_output_surface.cc

Index: services/ui/surfaces/display_output_surface.cc
diff --git a/services/ui/surfaces/direct_output_surface.cc b/services/ui/surfaces/display_output_surface.cc
similarity index 63%
rename from services/ui/surfaces/direct_output_surface.cc
rename to services/ui/surfaces/display_output_surface.cc
index 75865a04f2d181af9dfba40de1ea51f4a88aca69..1ffb143c05e9b4802c4bf9a3731179fa9950add9 100644
--- a/services/ui/surfaces/direct_output_surface.cc
+++ b/services/ui/surfaces/display_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 "services/ui/surfaces/direct_output_surface.h"
+#include "services/ui/surfaces/display_output_surface.h"
 
 #include <stdint.h>
 
@@ -18,7 +18,7 @@
 
 namespace ui {
 
-DirectOutputSurface::DirectOutputSurface(
+DisplayOutputSurface::DisplayOutputSurface(
     scoped_refptr<cc::InProcessContextProvider> context_provider,
     cc::SyntheticBeginFrameSource* synthetic_begin_frame_source)
     : cc::OutputSurface(context_provider),
@@ -27,40 +27,40 @@ DirectOutputSurface::DirectOutputSurface(
   capabilities_.flipped_output_surface =
       context_provider->ContextCapabilities().flips_vertically;
   context_provider->SetSwapBuffersCompletionCallback(
-      base::Bind(&DirectOutputSurface::OnGpuSwapBuffersCompleted,
+      base::Bind(&DisplayOutputSurface::OnGpuSwapBuffersCompleted,
                  weak_ptr_factory_.GetWeakPtr()));
   context_provider->SetUpdateVSyncParametersCallback(
-      base::Bind(&DirectOutputSurface::OnVSyncParametersUpdated,
+      base::Bind(&DisplayOutputSurface::OnVSyncParametersUpdated,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-DirectOutputSurface::~DirectOutputSurface() {}
+DisplayOutputSurface::~DisplayOutputSurface() {}
 
-void DirectOutputSurface::BindToClient(cc::OutputSurfaceClient* client) {
+void DisplayOutputSurface::BindToClient(cc::OutputSurfaceClient* client) {
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
 }
 
-void DirectOutputSurface::EnsureBackbuffer() {}
+void DisplayOutputSurface::EnsureBackbuffer() {}
 
-void DirectOutputSurface::DiscardBackbuffer() {
+void DisplayOutputSurface::DiscardBackbuffer() {
   context_provider()->ContextGL()->DiscardBackbufferCHROMIUM();
 }
 
-void DirectOutputSurface::BindFramebuffer() {
+void DisplayOutputSurface::BindFramebuffer() {
   context_provider()->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
-void DirectOutputSurface::Reshape(const gfx::Size& size,
-                                  float device_scale_factor,
-                                  const gfx::ColorSpace& color_space,
-                                  bool has_alpha) {
+void DisplayOutputSurface::Reshape(const gfx::Size& size,
+                                   float device_scale_factor,
+                                   const gfx::ColorSpace& color_space,
+                                   bool has_alpha) {
   context_provider()->ContextGL()->ResizeCHROMIUM(
       size.width(), size.height(), device_scale_factor, has_alpha);
 }
 
-void DirectOutputSurface::SwapBuffers(cc::OutputSurfaceFrame frame) {
+void DisplayOutputSurface::SwapBuffers(cc::OutputSurfaceFrame frame) {
   DCHECK(context_provider_);
   if (frame.sub_buffer_rect == gfx::Rect(frame.size)) {
     context_provider_->ContextSupport()->Swap();
@@ -70,7 +70,7 @@ void DirectOutputSurface::SwapBuffers(cc::OutputSurfaceFrame frame) {
   }
 }
 
-uint32_t DirectOutputSurface::GetFramebufferCopyTextureFormat() {
+uint32_t DisplayOutputSurface::GetFramebufferCopyTextureFormat() {
   // TODO(danakj): What attributes are used for the default framebuffer here?
   // Can it have alpha? cc::InProcessContextProvider doesn't take any
   // attributes.
@@ -78,42 +78,41 @@ uint32_t DirectOutputSurface::GetFramebufferCopyTextureFormat() {
 }
 
 cc::OverlayCandidateValidator*
-DirectOutputSurface::GetOverlayCandidateValidator() const {
+DisplayOutputSurface::GetOverlayCandidateValidator() const {
   return nullptr;
 }
 
-bool DirectOutputSurface::IsDisplayedAsOverlayPlane() const {
+bool DisplayOutputSurface::IsDisplayedAsOverlayPlane() const {
   return false;
 }
 
-unsigned DirectOutputSurface::GetOverlayTextureId() const {
+unsigned DisplayOutputSurface::GetOverlayTextureId() const {
   return 0;
 }
 
-bool DirectOutputSurface::SurfaceIsSuspendForRecycle() const {
+bool DisplayOutputSurface::SurfaceIsSuspendForRecycle() const {
   return false;
 }
 
-bool DirectOutputSurface::HasExternalStencilTest() const {
+bool DisplayOutputSurface::HasExternalStencilTest() const {
   return false;
 }
 
-void DirectOutputSurface::ApplyExternalStencil() {}
+void DisplayOutputSurface::ApplyExternalStencil() {}
 
-void DirectOutputSurface::OnGpuSwapBuffersCompleted(
+void DisplayOutputSurface::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::SwapResult result,
     const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) {
   client_->DidReceiveSwapBuffersAck();
 }
 
-void DirectOutputSurface::OnVSyncParametersUpdated(base::TimeTicks timebase,
-                                                   base::TimeDelta interval) {
+void DisplayOutputSurface::OnVSyncParametersUpdated(base::TimeTicks timebase,
+                                                    base::TimeDelta interval) {
   // TODO(brianderson): We should not be receiving 0 intervals.
   synthetic_begin_frame_source_->OnUpdateVSyncParameters(
       timebase,
       interval.is_zero() ? cc::BeginFrameArgs::DefaultInterval() : interval);
 }
 
-
 }  // namespace ui