Make channel preemption not require view contexts for hookup

ui/gfx/native_widget_types.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
@@ skipping 192 matching lines @@
 // PluginWindowHandle is an abstraction wrapping "the types of windows
 // used by NPAPI plugins". On Windows it's an HWND, on X it's an X
 // window id.
 #if defined(OS_WIN)
   typedef HWND PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = NULL;
 #elif defined(USE_X11)
   typedef unsigned long PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #elif defined(OS_ANDROID)
-  typedef uint64 PluginWindowHandle;
+  typedef uint32 PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #elif defined(USE_OZONE)
   typedef intptr_t PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #else
   // On Mac we don't have windowed plugins. We use a NULL/0 PluginWindowHandle
   // in shared code to indicate there is no window present.
   typedef bool PluginWindowHandle;
   const PluginWindowHandle kNullPluginWindow = 0;
 #endif
 
 enum SurfaceType {
   EMPTY,
   NATIVE_DIRECT,
   NULL_TRANSPORT,
   SURFACE_TYPE_LAST = NULL_TRANSPORT
 };
 
 struct GLSurfaceHandle {
-  GLSurfaceHandle()
-      : handle(kNullPluginWindow),
-        transport_type(EMPTY),
-        parent_client_id(0) {
-  }
+  GLSurfaceHandle() : handle(kNullPluginWindow), transport_type(EMPTY) {}
   GLSurfaceHandle(PluginWindowHandle handle_, SurfaceType transport_)
-      : handle(handle_),
-        transport_type(transport_),
-        parent_client_id(0) {
+      : handle(handle_), transport_type(transport_) {
     DCHECK(!is_null() || handle == kNullPluginWindow);
     DCHECK(transport_type != NULL_TRANSPORT ||
            handle == kNullPluginWindow);
   }
   bool is_null() const { return transport_type == EMPTY; }
   bool is_transport() const {
     return transport_type == NULL_TRANSPORT;
   }
   PluginWindowHandle handle;
   SurfaceType transport_type;
-  uint32 parent_client_id;
 };
 
 // AcceleratedWidget provides a surface to compositors to paint pixels.
 #if defined(OS_WIN)
 typedef HWND AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = NULL;
 #elif defined(USE_X11)
 typedef unsigned long AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_IOS)
 typedef UIView* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_MACOSX)
 typedef NSView* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(OS_ANDROID)
 typedef ANativeWindow* AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #elif defined(USE_OZONE)
 typedef intptr_t AcceleratedWidget;
 const AcceleratedWidget kNullAcceleratedWidget = 0;
 #else
 #error unknown platform
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GFX_NATIVE_WIDGET_TYPES_H_