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

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

Issue 667823002: PlatformEventDispatcher::DispatchEvent() should return a PostDispatchAction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui_enums
Patch Set: Fix platform_event_source_unittest.cc Created 6 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/events/platform/platform_event_source_unittest.cc ('k') | ui/gl/gl_surface_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_SURFACE_GLX_H_ 5 #ifndef UI_GL_GL_SURFACE_GLX_H_
6 #define UI_GL_GL_SURFACE_GLX_H_ 6 #define UI_GL_GL_SURFACE_GLX_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 protected: 70 protected:
71 virtual ~NativeViewGLSurfaceGLX(); 71 virtual ~NativeViewGLSurfaceGLX();
72 72
73 private: 73 private:
74 // The handle for the drawable to make current or swap. 74 // The handle for the drawable to make current or swap.
75 gfx::AcceleratedWidget GetDrawableHandle() const; 75 gfx::AcceleratedWidget GetDrawableHandle() const;
76 76
77 // PlatformEventDispatcher implementation 77 // PlatformEventDispatcher implementation
78 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; 78 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override;
79 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; 79 virtual ui::PostDispatchAction DispatchEvent(
80 const ui::PlatformEvent& event) override;
80 81
81 // Window passed in at creation. Always valid. 82 // Window passed in at creation. Always valid.
82 gfx::AcceleratedWidget parent_window_; 83 gfx::AcceleratedWidget parent_window_;
83 84
84 // Child window, used to control resizes so that they're in-order with GL. 85 // Child window, used to control resizes so that they're in-order with GL.
85 gfx::AcceleratedWidget window_; 86 gfx::AcceleratedWidget window_;
86 87
87 void* config_; 88 void* config_;
88 gfx::Size size_; 89 gfx::Size size_;
89 90
(...skipping 23 matching lines...) Expand all
113 gfx::Size size_; 114 gfx::Size size_;
114 void* config_; 115 void* config_;
115 XID pbuffer_; 116 XID pbuffer_;
116 117
117 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); 118 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX);
118 }; 119 };
119 120
120 } // namespace gfx 121 } // namespace gfx
121 122
122 #endif // UI_GL_GL_SURFACE_GLX_H_ 123 #endif // UI_GL_GL_SURFACE_GLX_H_
OLDNEW
« no previous file with comments | « ui/events/platform/platform_event_source_unittest.cc ('k') | ui/gl/gl_surface_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698