Merge in WebKit r47029.

1 files changed, 28 insertions, 30 deletions

diff --git a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.h b/WebCore/platform/graphics/gtk/VideoSinkGStreamer.h
index 2a706fb..be2c94c 100644
--- a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.h
+++ b/WebCore/platform/graphics/gtk/VideoSinkGStreamer.h
@@ -29,54 +29,52 @@ G_BEGIN_DECLS
 #define WEBKIT_TYPE_VIDEO_SINK webkit_video_sink_get_type()
 
 #define WEBKIT_VIDEO_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSink))
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+    WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSink))
 
 #define WEBKIT_VIDEO_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkClass))
+    (G_TYPE_CHECK_CLASS_CAST((klass), \
+    WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkClass))
 
 #define WEBKIT_IS_VIDEO_SINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  WEBKIT_TYPE_VIDEO_SINK))
+    (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+    WEBKIT_TYPE_VIDEO_SINK))
 
 #define WEBKIT_IS_VIDEO_SINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  WEBKIT_TYPE_VIDEO_SINK))
+    (G_TYPE_CHECK_CLASS_TYPE((klass), \
+    WEBKIT_TYPE_VIDEO_SINK))
 
 #define WEBKIT_VIDEO_SINK_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkClass))
+    (G_TYPE_INSTANCE_GET_CLASS((obj), \
+    WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkClass))
 
 typedef struct _WebKitVideoSink        WebKitVideoSink;
 typedef struct _WebKitVideoSinkClass   WebKitVideoSinkClass;
 typedef struct _WebKitVideoSinkPrivate WebKitVideoSinkPrivate;
 
-struct _WebKitVideoSink
-{
-  /*< private >*/
-  GstBaseSink                 parent;
-  WebKitVideoSinkPrivate *priv;
+struct _WebKitVideoSink {
+    /*< private >*/
+    GstBaseSink parent;
+    WebKitVideoSinkPrivate *priv;
 };
 
-struct _WebKitVideoSinkClass
-{
-  /*< private >*/
-  GstBaseSinkClass parent_class;
-
-  /* Future padding */
-  void (* _webkit_reserved1) (void);
-  void (* _webkit_reserved2) (void);
-  void (* _webkit_reserved3) (void);
-  void (* _webkit_reserved4) (void);
-  void (* _webkit_reserved5) (void);
-  void (* _webkit_reserved6) (void);
+struct _WebKitVideoSinkClass {
+    /*< private >*/
+    GstBaseSinkClass parent_class;
+
+    /* Future padding */
+    void (* _webkit_reserved1)(void);
+    void (* _webkit_reserved2)(void);
+    void (* _webkit_reserved3)(void);
+    void (* _webkit_reserved4)(void);
+    void (* _webkit_reserved5)(void);
+    void (* _webkit_reserved6)(void);
 };
 
-GType       webkit_video_sink_get_type    (void) G_GNUC_CONST;
-GstElement *webkit_video_sink_new         (cairo_surface_t *surface);
+GType       webkit_video_sink_get_type(void) G_GNUC_CONST;
+GstElement *webkit_video_sink_new(cairo_surface_t *surface);
 
-void webkit_video_sink_set_surface         (WebKitVideoSink *sink, cairo_surface_t *surface);
+void webkit_video_sink_set_surface(WebKitVideoSink *sink, cairo_surface_t *surface);
 
 G_END_DECLS