Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1114)

Unified Diff: ui/gl/gl_image_io_surface.h

Issue 1418603002: Revert of Re-land: ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_image_glx.cc ('k') | ui/gl/gl_image_io_surface.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_io_surface.h
diff --git a/ui/gl/gl_image_io_surface.h b/ui/gl/gl_image_io_surface.h
index 45bd3ac83a9270b4f00406433396715ec13b455b..56b4478ec3be793f8f99db75024c753b3eaa0412 100644
--- a/ui/gl/gl_image_io_surface.h
+++ b/ui/gl/gl_image_io_surface.h
@@ -9,8 +9,7 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/threading/thread_checker.h"
-#include "ui/gfx/buffer_types.h"
-#include "ui/gfx/generic_shared_memory_id.h"
+#include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gl/gl_image.h"
#if defined(__OBJC__)
@@ -23,23 +22,26 @@
class GL_EXPORT GLImageIOSurface : public GLImage {
public:
- GLImageIOSurface(const Size& size, unsigned internalformat);
+ GLImageIOSurface(const gfx::Size& size, unsigned internalformat);
bool Initialize(IOSurfaceRef io_surface,
- GenericSharedMemoryId io_surface_id,
+ gfx::GenericSharedMemoryId io_surface_id,
BufferFormat format);
// Overridden from GLImage:
void Destroy(bool have_context) override;
- Size GetSize() override;
+ gfx::Size GetSize() override;
unsigned GetInternalFormat() override;
bool BindTexImage(unsigned target) override;
void ReleaseTexImage(unsigned target) override {}
- bool CopyTexImage(unsigned target) override;
bool CopyTexSubImage(unsigned target,
const Point& offset,
const Rect& rect) override;
- bool ScheduleOverlayPlane(AcceleratedWidget widget,
+ void WillUseTexImage() override {}
+ void DidUseTexImage() override {}
+ void WillModifyTexImage() override {}
+ void DidModifyTexImage() override {}
+ bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
int z_order,
OverlayTransform transform,
const Rect& bounds_rect,
@@ -50,17 +52,18 @@
base::ScopedCFTypeRef<IOSurfaceRef> io_surface();
- static void SetLayerForWidget(AcceleratedWidget widget, CALayer* layer);
+ static void SetLayerForWidget(gfx::AcceleratedWidget widget,
+ CALayer* layer);
protected:
~GLImageIOSurface() override;
private:
- const Size size_;
+ const gfx::Size size_;
const unsigned internalformat_;
BufferFormat format_;
base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
- GenericSharedMemoryId io_surface_id_;
+ gfx::GenericSharedMemoryId io_surface_id_;
base::ThreadChecker thread_checker_;
DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface);
« no previous file with comments | « ui/gl/gl_image_glx.cc ('k') | ui/gl/gl_image_io_surface.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698