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

Unified Diff: ui/gl/gl_surface_glx.h

Issue 1723303002: Implement GLX for Ozone X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move refactor to new CL. Created 4 years, 8 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
Index: ui/gl/gl_surface_glx.h
diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
index 6cb5f38732c96703d7da484d5e39bdff88d0a59b..3d9ae616be88c54c2439f7bc0c52fd359f978663 100644
--- a/ui/gl/gl_surface_glx.h
+++ b/ui/gl/gl_surface_glx.h
@@ -11,7 +11,6 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "ui/events/platform/platform_event_dispatcher.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/vsync_provider.h"
@@ -52,8 +51,7 @@ class GL_EXPORT GLSurfaceGLX : public GLSurface {
};
// A surface used to render to a view.
-class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX,
- public ui::PlatformEventDispatcher {
+class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
public:
explicit NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window);
@@ -75,14 +73,22 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX,
protected:
~NativeViewGLSurfaceGLX() override;
+ // Handle registering and unregistering for Expose events.
rjkroege 2016/04/27 19:08:12 This seems unfortunate. Can you handle this at a l
kylechar 2016/04/27 19:36:32 Not totally sure I understand this part. This abst
+ virtual void RegisterEvents() = 0;
+ virtual void UnregisterEvents() = 0;
+
+ // Forwards Expose event to child window.
+ void ForwardExposeEvent(XEvent* xevent);
+
+ // Checks if event is Expose for child window.
+ bool CanHandleEvent(XEvent* xevent);
+
+ gfx::AcceleratedWidget window() const { return window_; }
+
private:
// The handle for the drawable to make current or swap.
GLXDrawable GetDrawableHandle() const;
- // PlatformEventDispatcher implementation
- bool CanDispatchEvent(const ui::PlatformEvent& event) override;
- uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
-
// Window passed in at creation. Always valid.
gfx::AcceleratedWidget parent_window_;

Powered by Google App Engine
This is Rietveld 408576698