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

Unified Diff: ui/gfx/native_widget_types.h

Issue 11475017: Revert 171569 as it broke some browser_tests on win_aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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/compositor/compositor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_widget_types.h
===================================================================
--- ui/gfx/native_widget_types.h (revision 171661)
+++ ui/gfx/native_widget_types.h (working copy)
@@ -278,19 +278,30 @@
: handle(kNullPluginWindow),
transport(false),
parent_gpu_process_id(0),
- parent_client_id(0) {
+ parent_client_id(0),
+ parent_context_id(0),
+ sync_point(0) {
+ parent_texture_id[0] = 0;
+ parent_texture_id[1] = 0;
}
GLSurfaceHandle(PluginWindowHandle handle_, bool transport_)
: handle(handle_),
transport(transport_),
parent_gpu_process_id(0),
- parent_client_id(0) {
+ parent_client_id(0),
+ parent_context_id(0),
+ sync_point(0) {
+ parent_texture_id[0] = 0;
+ parent_texture_id[1] = 0;
}
bool is_null() const { return handle == kNullPluginWindow && !transport; }
PluginWindowHandle handle;
bool transport;
int parent_gpu_process_id;
uint32 parent_client_id;
+ uint32 parent_context_id;
+ uint32 parent_texture_id[2];
+ uint32 sync_point;
};
// AcceleratedWidget provides a surface to compositors to paint pixels.
« no previous file with comments | « ui/compositor/compositor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698