callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Remove _gdk_drawable_ref_cairo_surface()

Browse Source 
Instead, call the vfunc directly from gdkWindow.c
This commit is contained in:
Benjamin Otte
2010-11-23 01:32:19 +01:00
parent 9d2abf81d2
commit 62d004cf8f
3 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gdk/gdkdraw.c
View File

@ -50,22 +50,3 @@ gdk_drawable_init (GdkDrawable *drawable)
{
}
/**
* _gdk_drawable_ref_cairo_surface:
* @drawable: a #GdkDrawable
*
* Obtains a #cairo_surface_t for the given drawable. If a
* #cairo_surface_t for the drawable already exists, it will be
* referenced, otherwise a new surface will be created.
*
* Return value: a newly referenced #cairo_surface_t that points
* to @drawable. Unref with cairo_surface_destroy()
**/
cairo_surface_t *
_gdk_drawable_ref_cairo_surface (GdkDrawable *drawable)
{
g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
return GDK_DRAWABLE_GET_CLASS (drawable)->ref_cairo_surface (drawable);
}

2
gdk/gdkinternals.h
View File

@ -309,8 +309,6 @@ GdkDeviceManager * _gdk_device_manager_new (GdkDisplay *display);
gboolean _gdk_cairo_surface_extents (cairo_surface_t *surface,
GdkRectangle *extents);
cairo_surface_t *_gdk_drawable_ref_cairo_surface (GdkDrawable *drawable);
/*************************************
* Interfaces used by windowing code *
*************************************/

10
gdk/gdkwindow.c
View File

@ -2733,13 +2733,19 @@ gdk_window_begin_implicit_paint (GdkWindow *window, GdkRectangle *rect)
return TRUE;
}
static cairo_surface_t *
gdk_window_ref_impl_surface (GdkWindow *window)
{
return GDK_DRAWABLE_GET_CLASS (window->impl)->ref_cairo_surface (window->impl);
}
static cairo_t *
gdk_cairo_create_for_impl (GdkWindow *window)
{
cairo_surface_t *surface;
cairo_t *cr;
surface = _gdk_drawable_ref_cairo_surface (window->impl);
surface = gdk_window_ref_impl_surface (window);
cr = cairo_create (surface);
cairo_surface_destroy (surface);
@ -3604,7 +3610,7 @@ gdk_window_create_cairo_surface (GdkWindow *window,
{
cairo_surface_t *surface, *subsurface;
surface = _gdk_drawable_ref_cairo_surface (window->impl);
surface = gdk_window_ref_impl_surface (window);
if (gdk_window_has_impl (window))
return surface;