viz: Remove getRPtextureSize Function in Direct Renderers

getRPTextureSize is a function that is used for getting render pass
texture size, which is not used since the size is stored implicitly
inside the actual texture size.

R=enne@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I5c68546802eeeb607acd9f07a0d6f0fc11b26453
Reviewed-on: https://chromium-review.googlesource.com/899771Reviewed-by: enne <enne@chromium.org>
Commit-Queue: weiliangc <weiliangc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534784}

components/viz/service/display/direct_renderer.cc

@@ -635,8 +635,7 @@ void DirectRenderer::UseRenderPass(const RenderPass* render_pass) {
 
   BindFramebufferToTexture(render_pass->id);
   InitializeViewport(current_frame(), render_pass->output_rect,
-                     gfx::Rect(render_pass->output_rect.size()),
-                     GetRenderPassTextureSize(render_pass->id));
+                     gfx::Rect(render_pass->output_rect.size()), enlarged_size);
 }
 
 gfx::Rect DirectRenderer::ComputeScissorRectForRenderPass(

components/viz/service/display/direct_renderer.h

@@ -166,8 +166,6 @@ class VIZ_SERVICE_EXPORT DirectRenderer {
       const RenderPassRequirements& requirements) = 0;
   virtual bool IsRenderPassResourceAllocated(
       const RenderPassId& render_pass_id) const = 0;
-  virtual gfx::Size GetRenderPassTextureSize(
-      const RenderPassId& render_pass_id) = 0;
   virtual void BindFramebufferToOutputSurface() = 0;
   virtual void BindFramebufferToTexture(const RenderPassId render_pass_id) = 0;
   virtual void SetScissorTestRect(const gfx::Rect& scissor_rect) = 0;

components/viz/service/display/gl_renderer.cc

@@ -3814,11 +3814,4 @@ bool GLRenderer::IsRenderPassResourceAllocated(
   return texture_it != render_pass_textures_.end();
 }
 
-gfx::Size GLRenderer::GetRenderPassTextureSize(
-    const RenderPassId& render_pass_id) {
-  auto texture_it = render_pass_textures_.find(render_pass_id);
-  DCHECK(texture_it != render_pass_textures_.end());
-  return texture_it->second.size();
-}
-
 }  // namespace viz

components/viz/service/display/gl_renderer.h

@@ -104,8 +104,6 @@ class VIZ_SERVICE_EXPORT GLRenderer : public DirectRenderer {
       const RenderPassRequirements& requirements) override;
   bool IsRenderPassResourceAllocated(
       const RenderPassId& render_pass_id) const override;
-  gfx::Size GetRenderPassTextureSize(
-      const RenderPassId& render_pass_id) override;
   void BindFramebufferToOutputSurface() override;
   void BindFramebufferToTexture(const RenderPassId render_pass_id) override;
   void SetScissorTestRect(const gfx::Rect& scissor_rect) override;

components/viz/service/display/skia_renderer.cc

@@ -742,8 +742,9 @@ void SkiaRenderer::UpdateRenderPassTextures(
 
     const RenderPassRequirements& requirements = render_pass_it->second;
     const RenderPassBacking& backing = pair.second;
-    bool size_appropriate = backing.size.width() >= requirements.size.width() &&
-                            backing.size.height() >= requirements.size.height();
+    bool size_appropriate =
+        backing.render_pass_surface->width() >= requirements.size.width() &&
+        backing.render_pass_surface->height() >= requirements.size.height();
     bool mipmap_appropriate = !requirements.mipmap || backing.mipmap;
     if (!size_appropriate || !mipmap_appropriate)
       passes_to_delete.push_back(pair.first);
@@ -784,7 +785,7 @@ SkiaRenderer::RenderPassBacking::RenderPassBacking(
     bool mipmap,
     bool capability_bgra8888,
     const gfx::ColorSpace& color_space)
-    : size(size), mipmap(mipmap), color_space(color_space) {
+    : mipmap(mipmap), color_space(color_space) {
   ResourceFormat format;
   if (color_space.IsHDR()) {
     // If a platform does not support half-float renderbuffers then it should
@@ -812,14 +813,13 @@ SkiaRenderer::RenderPassBacking::~RenderPassBacking() {}
 
 SkiaRenderer::RenderPassBacking::RenderPassBacking(
     SkiaRenderer::RenderPassBacking&& other)
-    : size(other.size), mipmap(other.mipmap), color_space(other.color_space) {
+    : mipmap(other.mipmap), color_space(other.color_space) {
   render_pass_surface = other.render_pass_surface;
   other.render_pass_surface = nullptr;
 }
 
 SkiaRenderer::RenderPassBacking& SkiaRenderer::RenderPassBacking::operator=(
     SkiaRenderer::RenderPassBacking&& other) {
-  size = other.size;
   mipmap = other.mipmap;
   color_space = other.color_space;
   render_pass_surface = other.render_pass_surface;
@@ -833,11 +833,4 @@ bool SkiaRenderer::IsRenderPassResourceAllocated(
   return it != render_pass_backings_.end();
 }
 
-gfx::Size SkiaRenderer::GetRenderPassTextureSize(
-    const RenderPassId& render_pass_id) {
-  auto it = render_pass_backings_.find(render_pass_id);
-  DCHECK(it != render_pass_backings_.end());
-  return it->second.size;
-}
-
 }  // namespace viz

components/viz/service/display/skia_renderer.h

@@ -51,8 +51,6 @@ class VIZ_SERVICE_EXPORT SkiaRenderer : public DirectRenderer {
       const RenderPassRequirements& requirements) override;
   bool IsRenderPassResourceAllocated(
       const RenderPassId& render_pass_id) const override;
-  gfx::Size GetRenderPassTextureSize(
-      const RenderPassId& render_pass_id) override;
   void BindFramebufferToOutputSurface() override;
   void BindFramebufferToTexture(const RenderPassId render_pass_id) override;
   void SetScissorTestRect(const gfx::Rect& scissor_rect) override;
@@ -102,7 +100,6 @@ class VIZ_SERVICE_EXPORT SkiaRenderer : public DirectRenderer {
   // A map from RenderPass id to the texture used to draw the RenderPass from.
   struct RenderPassBacking {
     sk_sp<SkSurface> render_pass_surface;
-    gfx::Size size;
     bool mipmap;
     gfx::ColorSpace color_space;
     RenderPassBacking(GrContext* gr_context,

components/viz/service/display/software_renderer.cc

@@ -818,12 +818,4 @@ bool SoftwareRenderer::IsRenderPassResourceAllocated(
   return it != render_pass_bitmaps_.end();
 }
 
-gfx::Size SoftwareRenderer::GetRenderPassTextureSize(
-    const RenderPassId& render_pass_id) {
-  auto it = render_pass_bitmaps_.find(render_pass_id);
-  DCHECK(it != render_pass_bitmaps_.end());
-  SkBitmap& bitmap = it->second;
-  return gfx::Size(bitmap.width(), bitmap.height());
-}
-
 }  // namespace viz

components/viz/service/display/software_renderer.h

@@ -49,8 +49,6 @@ class VIZ_SERVICE_EXPORT SoftwareRenderer : public DirectRenderer {
       const RenderPassRequirements& requirements) override;
   bool IsRenderPassResourceAllocated(
       const RenderPassId& render_pass_id) const override;
-  gfx::Size GetRenderPassTextureSize(
-      const RenderPassId& render_pass_id) override;
   void BindFramebufferToOutputSurface() override;
   void BindFramebufferToTexture(const RenderPassId render_pass_id) override;
   void SetScissorTestRect(const gfx::Rect& scissor_rect) override;