Index: ui/gfx/native_widget_types.h |
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h |
index 4a4fb33ada47b4c18017756b161320cf3f3dacca..4341b1ccf89555bbb6b87e14714e9f3dba55cff5 100644 |
--- a/ui/gfx/native_widget_types.h |
+++ b/ui/gfx/native_widget_types.h |
@@ -217,9 +217,8 @@ typedef intptr_t NativeViewId; |
enum SurfaceType { |
EMPTY, |
NATIVE_DIRECT, |
- NATIVE_TRANSPORT, |
- TEXTURE_TRANSPORT, |
- SURFACE_TYPE_LAST = TEXTURE_TRANSPORT |
+ NULL_TRANSPORT, |
+ SURFACE_TYPE_LAST = NULL_TRANSPORT |
}; |
struct GLSurfaceHandle { |
@@ -233,13 +232,12 @@ struct GLSurfaceHandle { |
transport_type(transport_), |
parent_client_id(0) { |
DCHECK(!is_null() || handle == kNullPluginWindow); |
- DCHECK(transport_type != TEXTURE_TRANSPORT || |
+ DCHECK(transport_type != NULL_TRANSPORT || |
handle == kNullPluginWindow); |
} |
bool is_null() const { return transport_type == EMPTY; } |
bool is_transport() const { |
- return transport_type == NATIVE_TRANSPORT || |
- transport_type == TEXTURE_TRANSPORT; |
+ return transport_type == NULL_TRANSPORT; |
} |
PluginWindowHandle handle; |
SurfaceType transport_type; |