| OLD | NEW |
| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 renderer_init_status_(Renderer::UNINITIALIZED), | 117 renderer_init_status_(Renderer::UNINITIALIZED), |
| 118 pending_ticks_(0), | 118 pending_ticks_(0), |
| 119 #ifdef OS_WIN | 119 #ifdef OS_WIN |
| 120 hWnd_(NULL), | 120 hWnd_(NULL), |
| 121 plugin_hWnd_(NULL), | 121 plugin_hWnd_(NULL), |
| 122 content_hWnd_(NULL), | 122 content_hWnd_(NULL), |
| 123 got_dblclick_(false), | 123 got_dblclick_(false), |
| 124 painted_once_(false), | 124 painted_once_(false), |
| 125 #endif | 125 #endif |
| 126 #ifdef OS_MACOSX | 126 #ifdef OS_MACOSX |
| 127 mac_fullscreen_state_(NULL), | |
| 128 renderer_is_software_(false), | 127 renderer_is_software_(false), |
| 129 scroll_is_in_progress_(false), | 128 scroll_is_in_progress_(false), |
| 130 drawing_model_(NPDrawingModelQuickDraw), | 129 drawing_model_(NPDrawingModelQuickDraw), |
| 131 event_model_(NPEventModelCarbon), | 130 event_model_(NPEventModelCarbon), |
| 132 mac_window_(0), | 131 mac_window_(0), |
| 133 mac_fullscreen_window_(0), | |
| 134 #ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG | |
| 135 mac_fullscreen_overlay_window_(0), | |
| 136 #endif | |
| 137 mac_window_selected_tab_(0), | 132 mac_window_selected_tab_(0), |
| 138 mac_cocoa_window_(0), | 133 mac_cocoa_window_(0), |
| 139 mac_surface_hidden_(0), | 134 mac_surface_hidden_(0), |
| 140 mac_2d_context_(0), | 135 mac_2d_context_(0), |
| 141 mac_agl_context_(0), | 136 mac_agl_context_(0), |
| 142 mac_cgl_context_(0), | 137 mac_cgl_context_(0), |
| 143 mac_cgl_pbuffer_(0), | 138 mac_cgl_pbuffer_(0), |
| 144 last_mac_event_time_(0), | 139 last_mac_event_time_(0), |
| 145 gl_layer_(NULL), | 140 gl_layer_(NULL), |
| 146 #ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG | |
| 147 time_to_hide_overlay_(0.0), | |
| 148 #endif | |
| 149 #endif // OS_MACOSX | 141 #endif // OS_MACOSX |
| 150 #ifdef OS_LINUX | 142 #ifdef OS_LINUX |
| 151 display_(NULL), | 143 display_(NULL), |
| 152 window_(0), | 144 window_(0), |
| 153 fullscreen_window_(0), | 145 fullscreen_window_(0), |
| 154 xt_widget_(NULL), | 146 xt_widget_(NULL), |
| 155 xt_app_context_(NULL), | 147 xt_app_context_(NULL), |
| 156 xt_interval_(0), | 148 xt_interval_(0), |
| 157 last_click_time_(0), | 149 last_click_time_(0), |
| 158 drawable_(0), | 150 drawable_(0), |
| (...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1195 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata); | 1187 PluginObject *plugin_object = static_cast<PluginObject *>(npp->pdata); |
| 1196 if (plugin_object) { // May not be initialized yet. | 1188 if (plugin_object) { // May not be initialized yet. |
| 1197 return plugin_object->client()->ProfileToString(); | 1189 return plugin_object->client()->ProfileToString(); |
| 1198 } else { | 1190 } else { |
| 1199 return ""; | 1191 return ""; |
| 1200 } | 1192 } |
| 1201 } | 1193 } |
| 1202 | 1194 |
| 1203 } // namespace globals | 1195 } // namespace globals |
| 1204 } // namespace glue | 1196 } // namespace glue |
| OLD | NEW |