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

Side by Side Diff: ui/gfx/native_widget_types.h

Issue 615503004: Remove TextureImageTransportSurface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NOTREACHED -> NOTIMPLEMENTED 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 | « content/test/test_render_view_host.cc ('k') | no next file » | 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_GFX_NATIVE_WIDGET_TYPES_H_ 5 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_ 6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_ANDROID) 10 #if defined(OS_ANDROID)
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 #else 210 #else
211 // On Mac we don't have windowed plugins. We use a NULL/0 PluginWindowHandle 211 // On Mac we don't have windowed plugins. We use a NULL/0 PluginWindowHandle
212 // in shared code to indicate there is no window present. 212 // in shared code to indicate there is no window present.
213 typedef bool PluginWindowHandle; 213 typedef bool PluginWindowHandle;
214 const PluginWindowHandle kNullPluginWindow = 0; 214 const PluginWindowHandle kNullPluginWindow = 0;
215 #endif 215 #endif
216 216
217 enum SurfaceType { 217 enum SurfaceType {
218 EMPTY, 218 EMPTY,
219 NATIVE_DIRECT, 219 NATIVE_DIRECT,
220 NATIVE_TRANSPORT, 220 NULL_TRANSPORT,
221 TEXTURE_TRANSPORT, 221 SURFACE_TYPE_LAST = NULL_TRANSPORT
222 SURFACE_TYPE_LAST = TEXTURE_TRANSPORT
223 }; 222 };
224 223
225 struct GLSurfaceHandle { 224 struct GLSurfaceHandle {
226 GLSurfaceHandle() 225 GLSurfaceHandle()
227 : handle(kNullPluginWindow), 226 : handle(kNullPluginWindow),
228 transport_type(EMPTY), 227 transport_type(EMPTY),
229 parent_client_id(0) { 228 parent_client_id(0) {
230 } 229 }
231 GLSurfaceHandle(PluginWindowHandle handle_, SurfaceType transport_) 230 GLSurfaceHandle(PluginWindowHandle handle_, SurfaceType transport_)
232 : handle(handle_), 231 : handle(handle_),
233 transport_type(transport_), 232 transport_type(transport_),
234 parent_client_id(0) { 233 parent_client_id(0) {
235 DCHECK(!is_null() || handle == kNullPluginWindow); 234 DCHECK(!is_null() || handle == kNullPluginWindow);
236 DCHECK(transport_type != TEXTURE_TRANSPORT || 235 DCHECK(transport_type != NULL_TRANSPORT ||
237 handle == kNullPluginWindow); 236 handle == kNullPluginWindow);
238 } 237 }
239 bool is_null() const { return transport_type == EMPTY; } 238 bool is_null() const { return transport_type == EMPTY; }
240 bool is_transport() const { 239 bool is_transport() const {
241 return transport_type == NATIVE_TRANSPORT || 240 return transport_type == NULL_TRANSPORT;
242 transport_type == TEXTURE_TRANSPORT;
243 } 241 }
244 PluginWindowHandle handle; 242 PluginWindowHandle handle;
245 SurfaceType transport_type; 243 SurfaceType transport_type;
246 uint32 parent_client_id; 244 uint32 parent_client_id;
247 }; 245 };
248 246
249 // AcceleratedWidget provides a surface to compositors to paint pixels. 247 // AcceleratedWidget provides a surface to compositors to paint pixels.
250 #if defined(OS_WIN) 248 #if defined(OS_WIN)
251 typedef HWND AcceleratedWidget; 249 typedef HWND AcceleratedWidget;
252 const AcceleratedWidget kNullAcceleratedWidget = NULL; 250 const AcceleratedWidget kNullAcceleratedWidget = NULL;
(...skipping 12 matching lines...) Expand all
265 #elif defined(USE_OZONE) 263 #elif defined(USE_OZONE)
266 typedef intptr_t AcceleratedWidget; 264 typedef intptr_t AcceleratedWidget;
267 const AcceleratedWidget kNullAcceleratedWidget = 0; 265 const AcceleratedWidget kNullAcceleratedWidget = 0;
268 #else 266 #else
269 #error unknown platform 267 #error unknown platform
270 #endif 268 #endif
271 269
272 } // namespace gfx 270 } // namespace gfx
273 271
274 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ 272 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
OLDNEW
« no previous file with comments | « content/test/test_render_view_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698