Mac: Clean up ifdefs in output surface

content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h

 // 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.
 
 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include <memory>
 
 #include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
@@ skipping 18 matching lines @@
       gpu::SurfaceHandle surface_handle,
       scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
       base::SingleThreadTaskRunner* task_runner,
       std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
           overlay_candidate_validator,
       unsigned int target,
       unsigned int internalformat,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
   ~GpuSurfacelessBrowserCompositorOutputSurface() override;
 
- private:
+ protected:

[danakj, 2016/06/01 18:11:04]

can you leave the member variables protected?

i'm not sure why we're trying to hide the overrides here at all, the class is an
output surface and is meant to be used as one. Can you just make the methods
public? Is that sufficient?

[danakj, 2016/06/01 18:11:22]

i mean, private.

[ccameron, 2016/06/01 19:44:22]

Yeah, didn't make sense to me. Moved the private down instead.

   // cc::OutputSurface implementation.
   void SwapBuffers(cc::CompositorFrame* frame) override;
   void OnSwapBuffersComplete() override;
   void BindFramebuffer() override;
   void Reshape(const gfx::Size& size, float scale_factor, bool alpha) override;
   bool IsDisplayedAsOverlayPlane() const override;
   unsigned GetOverlayTextureId() const override;
 
   // BrowserCompositorOutputSurface implementation.
   void OnGpuSwapBuffersCompleted(
       const std::vector<ui::LatencyInfo>& latency_info,
       gfx::SwapResult result,
       const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override;
 
   unsigned int internalformat_;
   std::unique_ptr<display_compositor::GLHelper> gl_helper_;
   std::unique_ptr<display_compositor::BufferQueue> output_surface_;
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_GPU_SURFACELESS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_