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

Side by Side Diff: plugin/cross/o3d_glue.cc

Issue 577038: O3D Mac: Add CoreAnimation support (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « plugin/cross/o3d_glue.h ('k') | plugin/mac/graphics_utils_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2009, Google Inc. 2 * Copyright 2009, Google Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 mac_fullscreen_overlay_window_(0), 135 mac_fullscreen_overlay_window_(0),
136 #endif 136 #endif
137 mac_window_selected_tab_(0), 137 mac_window_selected_tab_(0),
138 mac_cocoa_window_(0), 138 mac_cocoa_window_(0),
139 mac_surface_hidden_(0), 139 mac_surface_hidden_(0),
140 mac_2d_context_(0), 140 mac_2d_context_(0),
141 mac_agl_context_(0), 141 mac_agl_context_(0),
142 mac_cgl_context_(0), 142 mac_cgl_context_(0),
143 mac_cgl_pbuffer_(0), 143 mac_cgl_pbuffer_(0),
144 last_mac_event_time_(0), 144 last_mac_event_time_(0),
145 gl_layer_(NULL),
145 #ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG 146 #ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG
146 time_to_hide_overlay_(0.0), 147 time_to_hide_overlay_(0.0),
147 #endif 148 #endif
148 #endif // OS_MACOSX 149 #endif // OS_MACOSX
149 #ifdef OS_LINUX 150 #ifdef OS_LINUX
150 display_(NULL), 151 display_(NULL),
151 window_(0), 152 window_(0),
152 fullscreen_window_(0), 153 fullscreen_window_(0),
153 xt_widget_(NULL), 154 xt_widget_(NULL),
154 xt_app_context_(NULL), 155 xt_app_context_(NULL),
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata); 1195 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata);
1195 if (plugin_object) { // May not be initialized yet. 1196 if (plugin_object) { // May not be initialized yet.
1196 return plugin_object->client()->ProfileToString(); 1197 return plugin_object->client()->ProfileToString();
1197 } else { 1198 } else {
1198 return ""; 1199 return "";
1199 } 1200 }
1200 } 1201 }
1201 1202
1202 } // namespace globals 1203 } // namespace globals
1203 } // namespace glue 1204 } // namespace glue
OLDNEW
« no previous file with comments | « plugin/cross/o3d_glue.h ('k') | plugin/mac/graphics_utils_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698