Commit f385e383 authored by Daniele Castagna's avatar Daniele Castagna Committed by Commit Bot

viz: Don't consider TileQuad as overlay candidates

The only platform where we promote TileQuad to overlays
is on Mac where we don't use OverlayCandidate related code.

Bug: 1022544

Change-Id: I917a06110be0a4d106f692dbc9939253aa76a86c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067551
Commit-Queue: Khushal <khushalsagar@chromium.org>
Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743812}
parent 6dcde5bb
...@@ -130,9 +130,6 @@ bool OverlayCandidate::FromDrawQuad(DisplayResourceProvider* resource_provider, ...@@ -130,9 +130,6 @@ bool OverlayCandidate::FromDrawQuad(DisplayResourceProvider* resource_provider,
case DrawQuad::Material::kTextureContent: case DrawQuad::Material::kTextureContent:
return FromTextureQuad(resource_provider, return FromTextureQuad(resource_provider,
TextureDrawQuad::MaterialCast(quad), candidate); TextureDrawQuad::MaterialCast(quad), candidate);
case DrawQuad::Material::kTiledContent:
return FromTileQuad(resource_provider, TileDrawQuad::MaterialCast(quad),
candidate);
case DrawQuad::Material::kVideoHole: case DrawQuad::Material::kVideoHole:
return FromVideoHoleQuad( return FromVideoHoleQuad(
resource_provider, VideoHoleDrawQuad::MaterialCast(quad), candidate); resource_provider, VideoHoleDrawQuad::MaterialCast(quad), candidate);
...@@ -305,19 +302,6 @@ bool OverlayCandidate::FromTextureQuad( ...@@ -305,19 +302,6 @@ bool OverlayCandidate::FromTextureQuad(
return true; return true;
} }
// static
bool OverlayCandidate::FromTileQuad(DisplayResourceProvider* resource_provider,
const TileDrawQuad* quad,
OverlayCandidate* candidate) {
if (!FromDrawQuadResource(resource_provider, quad, quad->resource_id(), false,
candidate)) {
return false;
}
candidate->resource_size_in_pixels = quad->texture_size;
candidate->uv_rect = quad->tex_coord_rect;
return true;
}
// static // static
bool OverlayCandidate::FromStreamVideoQuad( bool OverlayCandidate::FromStreamVideoQuad(
DisplayResourceProvider* resource_provider, DisplayResourceProvider* resource_provider,
......
...@@ -29,7 +29,6 @@ namespace viz { ...@@ -29,7 +29,6 @@ namespace viz {
class DisplayResourceProvider; class DisplayResourceProvider;
class StreamVideoDrawQuad; class StreamVideoDrawQuad;
class TextureDrawQuad; class TextureDrawQuad;
class TileDrawQuad;
class VideoHoleDrawQuad; class VideoHoleDrawQuad;
class VIZ_SERVICE_EXPORT OverlayCandidate { class VIZ_SERVICE_EXPORT OverlayCandidate {
...@@ -129,9 +128,6 @@ class VIZ_SERVICE_EXPORT OverlayCandidate { ...@@ -129,9 +128,6 @@ class VIZ_SERVICE_EXPORT OverlayCandidate {
static bool FromTextureQuad(DisplayResourceProvider* resource_provider, static bool FromTextureQuad(DisplayResourceProvider* resource_provider,
const TextureDrawQuad* quad, const TextureDrawQuad* quad,
OverlayCandidate* candidate); OverlayCandidate* candidate);
static bool FromTileQuad(DisplayResourceProvider* resource_provider,
const TileDrawQuad* quad,
OverlayCandidate* candidate);
static bool FromStreamVideoQuad(DisplayResourceProvider* resource_provider, static bool FromStreamVideoQuad(DisplayResourceProvider* resource_provider,
const StreamVideoDrawQuad* quad, const StreamVideoDrawQuad* quad,
OverlayCandidate* candidate); OverlayCandidate* candidate);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment