summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authoralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 07:26:24 +0000
committeralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 07:26:24 +0000
commit3950477db68ae090f35daadc612734f7356cd580 (patch)
treebcc1a2829304785b5e9c970377184df2bad58029 /gpu
parent17e28caac4f0088c14f98424efdf0868d3d6c94c (diff)
downloadchromium_src-3950477db68ae090f35daadc612734f7356cd580.zip
chromium_src-3950477db68ae090f35daadc612734f7356cd580.tar.gz
chromium_src-3950477db68ae090f35daadc612734f7356cd580.tar.bz2
Initialize overlay validator in GpuBrowserCompositorOutputSurface.
Plus refactor overlay transform into separate file to use the same type in cc, ozone and context_support. BUG= Review URL: https://codereview.chromium.org/220723006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/client/context_support.h3
-rw-r--r--gpu/command_buffer/client/gles2_implementation.cc11
-rw-r--r--gpu/command_buffer/client/gles2_implementation.h2
3 files changed, 9 insertions, 7 deletions
diff --git a/gpu/command_buffer/client/context_support.h b/gpu/command_buffer/client/context_support.h
index 7344d1e..9becfc8 100644
--- a/gpu/command_buffer/client/context_support.h
+++ b/gpu/command_buffer/client/context_support.h
@@ -6,6 +6,7 @@
#define GPU_COMMAND_BUFFER_CLIENT_CONTEXT_SUPPORT_H_
#include "base/callback.h"
+#include "ui/gfx/overlay_transform.h"
#include "ui/gfx/rect.h"
namespace gpu {
@@ -37,7 +38,7 @@ class ContextSupport {
// primary surface during the next buffer swap.
// This method is not stateful and needs to be re-scheduled every frame.
virtual void ScheduleOverlayPlane(int plane_z_order,
- unsigned plane_transform,
+ gfx::OverlayTransform plane_transform,
unsigned overlay_texture_id,
const gfx::Rect& display_bounds,
const gfx::RectF& uv_rect) = 0;
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 194ccfe..70c5bc7 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -2826,11 +2826,12 @@ void GLES2Implementation::SetSwapBuffersCompleteCallback(
swap_buffers_complete_callback_ = swap_buffers_complete_callback;
}
-void GLES2Implementation::ScheduleOverlayPlane(int plane_z_order,
- unsigned plane_transform,
- unsigned overlay_texture_id,
- const gfx::Rect& display_bounds,
- const gfx::RectF& uv_rect) {
+void GLES2Implementation::ScheduleOverlayPlane(
+ int plane_z_order,
+ gfx::OverlayTransform plane_transform,
+ unsigned overlay_texture_id,
+ const gfx::Rect& display_bounds,
+ const gfx::RectF& uv_rect) {
NOTREACHED() << "Overlay supported isn't finished.";
}
diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
index c843802..a7517e8 100644
--- a/gpu/command_buffer/client/gles2_implementation.h
+++ b/gpu/command_buffer/client/gles2_implementation.h
@@ -221,7 +221,7 @@ class GLES2_IMPL_EXPORT GLES2Implementation
const base::Closure& swap_buffers_complete_callback)
OVERRIDE;
virtual void ScheduleOverlayPlane(int plane_z_order,
- unsigned plane_transform,
+ gfx::OverlayTransform plane_transform,
unsigned overlay_texture_id,
const gfx::Rect& display_bounds,
const gfx::RectF& uv_rect) OVERRIDE;