Fixing build errors when enable_vulkan=true

Recent modification of class locations / names were causing build errors in
vulkan related files.
Corrected them in this patch.

you need to set enable_vulkan=true to verify this.

BUG=682523

Test: Build code with enable_vulkan=true
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I812d83c6eae7a483c905928cdabf6c5fb43f347a
Reviewed-on: https://chromium-review.googlesource.com/645589
Commit-Queue: Chandan Padhi <c.padhi@samsung.com>
Reviewed-by: enne <enne@chromium.org>
Reviewed-by: Chandan Padhi <c.padhi@samsung.com>
Reviewed-by: ccameron chromium <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501890}

AUTHORS

@@ -728,6 +728,7 @@ Sunitha Srivatsa <srivats@amazon.com>
 Suyash Sengar <suyash.s@samsung.com>
 Sunil Ratnu <sunil.ratnu@samsung.com>
 Suvanjan Mukherjee <suvanjanmukherjee@gmail.com>
+Swarali Raut <swarali.sr@samsung.com>
 Swati Jaiswal <swa.jaiswal@samsung.com>
 Sylvain Zimmer <sylvinus@gmail.com>
 Sylvestre Ledru <sylvestre.ledru@gmail.com>

cc/output/vulkan_renderer.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "cc/output/vulkan_renderer.h"
+#include "cc/output/output_surface.h"
 #include "cc/output/output_surface_frame.h"
 
 namespace cc {
@@ -15,9 +16,9 @@ void VulkanRenderer::SwapBuffers(std::vector<ui::LatencyInfo> latency_info) {
   output_surface_->SwapBuffers(std::move(output_frame));
 }
 
-VulkanRenderer::VulkanRenderer(const RendererSettings* settings,
+VulkanRenderer::VulkanRenderer(const viz::RendererSettings* settings,
                                OutputSurface* output_surface,
-                               ResourceProvider* resource_provider,
+                               DisplayResourceProvider* resource_provider,
                                TextureMailboxDeleter* texture_mailbox_deleter,
                                int highp_threshold_min)
     : DirectRenderer(settings, output_surface, resource_provider) {}
@@ -26,12 +27,15 @@ void VulkanRenderer::DidChangeVisibility() {
   NOTIMPLEMENTED();
 }
 
-void VulkanRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) {
+void VulkanRenderer::BindFramebufferToOutputSurface() {
   NOTIMPLEMENTED();
 }
 
-bool VulkanRenderer::BindFramebufferToTexture(DrawingFrame* frame,
-                                              const ScopedResource* resource) {
+viz::ResourceFormat VulkanRenderer::BackbufferFormat() const {
+  return resource_provider_->best_texture_format();
+}
+
+bool VulkanRenderer::BindFramebufferToTexture(const ScopedResource* resource) {
   NOTIMPLEMENTED();
   return false;
 }
@@ -41,23 +45,25 @@ void VulkanRenderer::SetScissorTestRect(const gfx::Rect& scissor_rect) {
 }
 
 void VulkanRenderer::PrepareSurfaceForPass(
-    DrawingFrame* frame,
     SurfaceInitializationMode initialization_mode,
     const gfx::Rect& render_pass_scissor) {
   NOTIMPLEMENTED();
 }
 
-void VulkanRenderer::DoDrawQuad(DrawingFrame* frame,
-                                const viz::DrawQuad* quad,
+void VulkanRenderer::SetEnableDCLayers(bool enable) {
+  NOTIMPLEMENTED();
+}
+
+void VulkanRenderer::DoDrawQuad(const DrawQuad* quad,
                                 const gfx::QuadF* clip_region) {
   NOTIMPLEMENTED();
 }
 
-void VulkanRenderer::BeginDrawingFrame(DrawingFrame* frame) {
+void VulkanRenderer::BeginDrawingFrame() {
   NOTIMPLEMENTED();
 }
 
-void VulkanRenderer::FinishDrawingFrame(DrawingFrame* frame) {
+void VulkanRenderer::FinishDrawingFrame() {
   NOTIMPLEMENTED();
 }
 
@@ -65,7 +71,7 @@ void VulkanRenderer::FinishDrawingQuadList() {
   NOTIMPLEMENTED();
 }
 
-bool VulkanRenderer::FlippedFramebuffer(const DrawingFrame* frame) const {
+bool VulkanRenderer::FlippedFramebuffer() const {
   NOTIMPLEMENTED();
   return false;
 }
@@ -79,7 +85,6 @@ void VulkanRenderer::EnsureScissorTestDisabled() {
 }
 
 void VulkanRenderer::CopyDrawnRenderPass(
-    DrawingFrame* frame,
     std::unique_ptr<viz::CopyOutputRequest> request) {
   NOTIMPLEMENTED();
 }

cc/output/vulkan_renderer.h

@@ -5,19 +5,20 @@
 #ifndef CC_OUTPUT_VULKAN_RENDERER_H_
 #define CC_OUTPUT_VULKAN_RENDERER_H_
 
-#include "cc/base/cc_export.h"
+#include "cc/cc_export.h"
 #include "cc/output/direct_renderer.h"
 #include "ui/latency/latency_info.h"
 
 namespace cc {
 
 class TextureMailboxDeleter;
+class OutputSurface;
 
 class CC_EXPORT VulkanRenderer : public DirectRenderer {
  public:
-  VulkanRenderer(const RendererSettings* settings,
+  VulkanRenderer(const viz::RendererSettings* settings,
                  OutputSurface* output_surface,
-                 ResourceProvider* resource_provider,
+                 DisplayResourceProvider* resource_provider,
                  TextureMailboxDeleter* texture_mailbox_deleter,
                  int highp_threshold_min);
   ~VulkanRenderer() override;
@@ -28,28 +29,25 @@ class CC_EXPORT VulkanRenderer : public DirectRenderer {
  protected:
   // Implementations of protected Renderer functions.
   void DidChangeVisibility() override;
+  viz::ResourceFormat BackbufferFormat() const override;
 
   // Implementations of protected DirectRenderer functions.
-  void BindFramebufferToOutputSurface(DrawingFrame* frame) override;
-  bool BindFramebufferToTexture(DrawingFrame* frame,
-                                const ScopedResource* resource) override;
+  void BindFramebufferToOutputSurface() override;
+  bool BindFramebufferToTexture(const ScopedResource* resource) override;
   void SetScissorTestRect(const gfx::Rect& scissor_rect) override;
-  void PrepareSurfaceForPass(DrawingFrame* frame,
-                             SurfaceInitializationMode initialization_mode,
+  void PrepareSurfaceForPass(SurfaceInitializationMode initialization_mode,
                              const gfx::Rect& render_pass_scissor) override;
-  void DoDrawQuad(DrawingFrame* frame,
-                  const viz::DrawQuad* quad,
-                  const gfx::QuadF* clip_region) override;
-  void BeginDrawingFrame(DrawingFrame* frame) override;
-  void FinishDrawingFrame(DrawingFrame* frame) override;
+  void DoDrawQuad(const DrawQuad* quad, const gfx::QuadF* clip_region) override;
+  void BeginDrawingFrame() override;
+  void FinishDrawingFrame() override;
   void FinishDrawingQuadList() override;
-  bool FlippedFramebuffer(const DrawingFrame* frame) const override;
+  bool FlippedFramebuffer() const override;
   void EnsureScissorTestEnabled() override;
   void EnsureScissorTestDisabled() override;
   void CopyDrawnRenderPass(
-      DrawingFrame* frame,
       std::unique_ptr<viz::CopyOutputRequest> request) override;
   bool CanPartialSwap() override;
+  void SetEnableDCLayers(bool enable) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VulkanRenderer);

content/browser/compositor/vulkan_browser_compositor_output_surface.cc

@@ -12,7 +12,7 @@
 namespace content {
 
 VulkanBrowserCompositorOutputSurface::VulkanBrowserCompositorOutputSurface(
-    scoped_refptr<cc::VulkanContextProvider> context,
+    scoped_refptr<viz::VulkanContextProvider> context,
     const UpdateVSyncParametersCallback& update_vsync_parameters_callback)
     : BrowserCompositorOutputSurface(std::move(context),
                                      update_vsync_parameters_callback),
@@ -87,10 +87,16 @@ void VulkanBrowserCompositorOutputSurface::Reshape(
     const gfx::Size& size,
     float device_scale_factor,
     const gfx::ColorSpace& color_space,
-    bool has_alpha) {
+    bool has_alpha,
+    bool use_stencil) {
   NOTIMPLEMENTED();
 }
 
+void VulkanBrowserCompositorOutputSurface::SetDrawRectangle(
+    const gfx::Rect& rect) {
+  NOTREACHED();
+}
+
 uint32_t
 VulkanBrowserCompositorOutputSurface::GetFramebufferCopyTextureFormat() {
   NOTIMPLEMENTED();

content/browser/compositor/vulkan_browser_compositor_output_surface.h

@@ -23,7 +23,7 @@ class VulkanBrowserCompositorOutputSurface
     : public BrowserCompositorOutputSurface {
  public:
   VulkanBrowserCompositorOutputSurface(
-      scoped_refptr<cc::VulkanContextProvider> context,
+      scoped_refptr<viz::VulkanContextProvider> context,
       const UpdateVSyncParametersCallback& update_vsync_parameters_callback);
 
   ~VulkanBrowserCompositorOutputSurface() override;
@@ -43,9 +43,11 @@ class VulkanBrowserCompositorOutputSurface
   void Reshape(const gfx::Size& size,
                float device_scale_factor,
                const gfx::ColorSpace& color_space,
-               bool has_alpha) override;
+               bool has_alpha,
+               bool use_stencil) override;
   uint32_t GetFramebufferCopyTextureFormat() override;
   void SwapBuffers(cc::OutputSurfaceFrame frame) override;
+  void SetDrawRectangle(const gfx::Rect& rect) override;
 
  private:
   void SwapBuffersAck();