From 187386f3c3bb1259b23d25bbbc98210120eff7cc Mon Sep 17 00:00:00 2001 From: fitzsim Date: Sat, 28 Apr 2007 01:58:23 +0000 Subject: 2007-04-04 Francis Kung * gnu/java/awt/peer/gtk/ComponentGraphics.java (cairoDrawGlyphVector): Removed method. (cairoSetFont): Removed method. (disposeNative): Removed method. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector): Added locking. (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFont): Added locking. (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative): Added locking. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124251 138bc75d-0d04-0410-961f-82ee72b054a4 --- .../gnu/java/awt/peer/gtk/ComponentGraphics.java | 55 +++++----------------- 1 file changed, 11 insertions(+), 44 deletions(-) (limited to 'libjava/classpath/gnu') diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java b/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java index be82f81ecbd..8adf275ad44 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java @@ -544,6 +544,17 @@ public class ComponentGraphics extends CairoGraphics2D * methods ends up being called, we will deadlock. The lock is only reentrant * when called via our lock() method. */ + + /* These methods are already locked in the superclass CairoGraphics2D + * so they do not need to be overridden: + * + * public void disposeNative + * + * protected void cairoDrawGlyphVector + * + * protected void cairoSetFont + */ + @Override protected long init(long pointer) { @@ -562,20 +573,6 @@ public class ComponentGraphics extends CairoGraphics2D return ret; } - @Override - public void disposeNative(long pointer) - { - try - { - lock(); - super.disposeNative(pointer); - } - finally - { - unlock(); - } - } - @Override protected void drawPixels(long pointer, int[] pixels, int w, int h, int stride, double[] i2u, double alpha, @@ -727,36 +724,6 @@ public class ComponentGraphics extends CairoGraphics2D } } - @Override - protected void cairoDrawGlyphVector(long pointer, GdkFontPeer font, - float x, float y, int n, - int[] codes, float[] positions) - { - try - { - lock(); - super.cairoDrawGlyphVector(pointer, font, x, y, n, codes, positions); - } - finally - { - unlock(); - } - } - - @Override - protected void cairoSetFont(long pointer, GdkFontPeer font) - { - try - { - lock(); - super.cairoSetFont(pointer, font); - } - finally - { - unlock(); - } - } - @Override protected void cairoRectangle(long pointer, double x, double y, double width, double height) -- cgit v1.2.3