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

Side by Side Diff: ui/gl/gl_image_glx.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 unified diff | Download patch
« no previous file with comments | « ui/gl/gl_image_egl.cc ('k') | ui/gl/gl_image_glx.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_GLX_H_ 5 #ifndef UI_GL_GL_IMAGE_GLX_H_
6 #define UI_GL_GL_IMAGE_GLX_H_ 6 #define UI_GL_GL_IMAGE_GLX_H_
7 7
8 #include "ui/gfx/geometry/size.h" 8 #include "ui/gfx/geometry/size.h"
9 #include "ui/gfx/x/x11_types.h" 9 #include "ui/gfx/x/x11_types.h"
10 #include "ui/gl/gl_export.h" 10 #include "ui/gl/gl_export.h"
11 #include "ui/gl/gl_image.h" 11 #include "ui/gl/gl_image.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 14
15 class GL_EXPORT GLImageGLX : public GLImage { 15 class GL_EXPORT GLImageGLX : public GLImage {
16 public: 16 public:
17 GLImageGLX(const Size& size, unsigned internalformat); 17 GLImageGLX(const gfx::Size& size, unsigned internalformat);
18 18
19 bool Initialize(XID pixmap); 19 bool Initialize(XID pixmap);
20 20
21 // Overridden from GLImage: 21 // Overridden from GLImage:
22 void Destroy(bool have_context) override; 22 void Destroy(bool have_context) override;
23 Size GetSize() override; 23 gfx::Size GetSize() override;
24 unsigned GetInternalFormat() override; 24 unsigned GetInternalFormat() override;
25 bool BindTexImage(unsigned target) override; 25 bool BindTexImage(unsigned target) override;
26 void ReleaseTexImage(unsigned target) override; 26 void ReleaseTexImage(unsigned target) override;
27 bool CopyTexImage(unsigned target) override;
28 bool CopyTexSubImage(unsigned target, 27 bool CopyTexSubImage(unsigned target,
29 const Point& offset, 28 const Point& offset,
30 const Rect& rect) override; 29 const Rect& rect) override;
31 bool ScheduleOverlayPlane(AcceleratedWidget widget, 30 void WillUseTexImage() override {}
31 void DidUseTexImage() override {}
32 void WillModifyTexImage() override {}
33 void DidModifyTexImage() override {}
34 bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
32 int z_order, 35 int z_order,
33 OverlayTransform transform, 36 OverlayTransform transform,
34 const Rect& bounds_rect, 37 const Rect& bounds_rect,
35 const RectF& crop_rect) override; 38 const RectF& crop_rect) override;
36 void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, 39 void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd,
37 uint64_t process_tracing_id, 40 uint64_t process_tracing_id,
38 const std::string& dump_name) override; 41 const std::string& dump_name) override;
39 42
40 protected: 43 protected:
41 ~GLImageGLX() override; 44 ~GLImageGLX() override;
42 45
43 private: 46 private:
44 XID glx_pixmap_; 47 XID glx_pixmap_;
45 const Size size_; 48 const gfx::Size size_;
46 unsigned internalformat_; 49 unsigned internalformat_;
47 50
48 DISALLOW_COPY_AND_ASSIGN(GLImageGLX); 51 DISALLOW_COPY_AND_ASSIGN(GLImageGLX);
49 }; 52 };
50 53
51 } // namespace gfx 54 } // namespace gfx
52 55
53 #endif // UI_GL_GL_IMAGE_GLX_H_ 56 #endif // UI_GL_GL_IMAGE_GLX_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_image_egl.cc ('k') | ui/gl/gl_image_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698