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

Side by Side Diff: ui/gl/gl_image_memory.h

Issue 1431333002: Revert of Re-land: ui: Add custom stride support to GLImageMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/gpu_memory_buffer.h ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GL_GL_IMAGE_MEMORY_H_ 5 #ifndef UI_GL_GL_IMAGE_MEMORY_H_
6 #define UI_GL_GL_IMAGE_MEMORY_H_ 6 #define UI_GL_GL_IMAGE_MEMORY_H_
7 7
8 #include "ui/gl/gl_image.h" 8 #include "ui/gl/gl_image.h"
9 9
10 #include "base/numerics/safe_math.h" 10 #include "base/numerics/safe_math.h"
11 #include "ui/gfx/buffer_types.h" 11 #include "ui/gfx/buffer_types.h"
12 12
13 namespace gl { 13 namespace gl {
14 14
15 class GL_EXPORT GLImageMemory : public GLImage { 15 class GL_EXPORT GLImageMemory : public GLImage {
16 public: 16 public:
17 GLImageMemory(const gfx::Size& size, unsigned internalformat); 17 GLImageMemory(const gfx::Size& size, unsigned internalformat);
18 18
19 bool Initialize(const unsigned char* memory, 19 bool Initialize(const unsigned char* memory, gfx::BufferFormat format);
20 gfx::BufferFormat format,
21 size_t stride);
22 20
23 // Overridden from GLImage: 21 // Overridden from GLImage:
24 void Destroy(bool have_context) override; 22 void Destroy(bool have_context) override;
25 gfx::Size GetSize() override; 23 gfx::Size GetSize() override;
26 unsigned GetInternalFormat() override; 24 unsigned GetInternalFormat() override;
27 bool BindTexImage(unsigned target) override; 25 bool BindTexImage(unsigned target) override;
28 void ReleaseTexImage(unsigned target) override {} 26 void ReleaseTexImage(unsigned target) override {}
29 bool CopyTexImage(unsigned target) override; 27 bool CopyTexImage(unsigned target) override;
30 bool CopyTexSubImage(unsigned target, 28 bool CopyTexSubImage(unsigned target,
31 const gfx::Point& offset, 29 const gfx::Point& offset,
32 const gfx::Rect& rect) override; 30 const gfx::Rect& rect) override;
33 bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, 31 bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
34 int z_order, 32 int z_order,
35 gfx::OverlayTransform transform, 33 gfx::OverlayTransform transform,
36 const gfx::Rect& bounds_rect, 34 const gfx::Rect& bounds_rect,
37 const gfx::RectF& crop_rect) override; 35 const gfx::RectF& crop_rect) override;
38 36
39 static unsigned GetInternalFormatForTesting(gfx::BufferFormat format); 37 static unsigned GetInternalFormatForTesting(gfx::BufferFormat format);
40 38
41 protected: 39 protected:
42 ~GLImageMemory() override; 40 ~GLImageMemory() override;
43 41
44 gfx::BufferFormat format() const { return format_; } 42 gfx::BufferFormat format() const { return format_; }
45 size_t stride() const { return stride_; }
46 43
47 private: 44 private:
48 const gfx::Size size_; 45 const gfx::Size size_;
49 const unsigned internalformat_; 46 const unsigned internalformat_;
50 const unsigned char* memory_; 47 const unsigned char* memory_;
51 gfx::BufferFormat format_; 48 gfx::BufferFormat format_;
52 size_t stride_;
53 49
54 DISALLOW_COPY_AND_ASSIGN(GLImageMemory); 50 DISALLOW_COPY_AND_ASSIGN(GLImageMemory);
55 }; 51 };
56 52
57 } // namespace gl 53 } // namespace gl
58 54
59 #endif // UI_GL_GL_IMAGE_MEMORY_H_ 55 #endif // UI_GL_GL_IMAGE_MEMORY_H_
OLDNEW
« no previous file with comments | « ui/gfx/gpu_memory_buffer.h ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698