diff --git a/gfx/src/gtk/nsGCCache.cpp b/gfx/src/gtk/nsGCCache.cpp index a08153b9e0d8..002d213fee2d 100644 --- a/gfx/src/gtk/nsGCCache.cpp +++ b/gfx/src/gtk/nsGCCache.cpp @@ -119,7 +119,7 @@ void nsGCCache::Flush(unsigned long flags) } } -GdkGC *nsGCCache::GetGCFromDW(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask flags, GdkRegion *clipRegion) +GdkGC *nsGCCache::GetGC(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask flags, GdkRegion *clipRegion) { PRCList *iter; diff --git a/gfx/src/gtk/nsGCCache.h b/gfx/src/gtk/nsGCCache.h index 505490726d0c..f77e90300bd9 100644 --- a/gfx/src/gtk/nsGCCache.h +++ b/gfx/src/gtk/nsGCCache.h @@ -55,16 +55,8 @@ class nsGCCache void Flush(unsigned long flags); - GdkGC *GetGCFromDW(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask flags, GdkRegion *clipRegion); + GdkGC *GetGC(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask flags, GdkRegion *clipRegion); - GdkGC *GetClipGC(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask flags, GdkRegion *clipRegion) { - return GetGCFromDW(window, gcv, flags, clipRegion); - } - - GdkGC *GetGC(GdkWindow *window, GdkGCValues *gcv, GdkGCValuesMask flags) { - return GetGCFromDW(window, gcv, flags, NULL); - } - private: PRCList GCCache; PRCList GCFreeList; diff --git a/gfx/src/gtk/nsRenderingContextGTK.cpp b/gfx/src/gtk/nsRenderingContextGTK.cpp index 586b698614e0..6c4e1342bcb2 100644 --- a/gfx/src/gtk/nsRenderingContextGTK.cpp +++ b/gfx/src/gtk/nsRenderingContextGTK.cpp @@ -505,10 +505,10 @@ void nsRenderingContextGTK::UpdateGC() mClipRegion->GetNativeRegion((void*&)rgn); } - mGC = gcCache.GetClipGC(mSurface->GetDrawable(), - &values, - valuesMask, - rgn); + mGC = gcCache.GetGC(mSurface->GetDrawable(), + &values, + valuesMask, + rgn); } NS_IMETHODIMP nsRenderingContextGTK::SetClipRegion(const nsIRegion& aRegion,