Reverting 20516.

base/gfx/native_widget_types.h

 // Copyright (c) 2008 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 BASE_GFX_NATIVE_WIDGET_TYPES_H_
 #define BASE_GFX_NATIVE_WIDGET_TYPES_H_
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
 
@@ skipping 32 matching lines @@
 @class NSTextField;
 #else
 class NSView;
 class NSWindow;
 class NSTextField;
 #endif  // __OBJC__
 #elif defined(OS_LINUX)
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
-typedef struct _cairo_surface cairo_surface_t;
+typedef struct _cairo cairo_t;
 #endif
 
 namespace gfx {
 
 #if defined(OS_WIN)
 typedef HWND NativeView;
 typedef HWND NativeWindow;
 typedef HWND NativeEditView;
 typedef HDC NativeDrawingContext;
 typedef HCURSOR NativeCursor;
 typedef HMENU NativeMenu;
 #elif defined(OS_MACOSX)
 typedef NSView* NativeView;
 typedef NSWindow* NativeWindow;
 typedef NSTextField* NativeEditView;
 typedef CGContext* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
 #elif defined(OS_LINUX)
 typedef GtkWidget* NativeView;
 typedef GtkWindow* NativeWindow;
 typedef GtkWidget* NativeEditView;
-typedef cairo_surface_t* NativeDrawingContext;
+typedef cairo_t* NativeDrawingContext;
 typedef GdkCursor* NativeCursor;
 typedef GtkWidget* NativeMenu;
 #endif
 
 // Note: for test_shell we're packing a pointer into the NativeViewId. So, if
 // you make it a type which is smaller than a pointer, you have to fix
 // test_shell.
 //
 // See comment at the top of the file for usage.
 typedef intptr_t NativeViewId;
@@ skipping 47 matching lines @@
 #else
   // On OS X we don't have windowed plugins.
   // We use a NULL/0 PluginWindowHandle in shared code to indicate there
   // is no window present, so mirror that behavior here.
   typedef bool PluginWindowHandle;
 #endif
 
 }  // namespace gfx
 
 #endif  // BASE_GFX_NATIVE_WIDGET_TYPES_H_