diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
| commit | 1020ce5944edde4364baef4d371cd4f9b0dae721 (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/gnu/java/awt/java2d/AbstractGraphics2D.h | |
| parent | 9f41ce98ce6f4f7c8ac5e2c4b6e5d27e10201015 (diff) | |
| download | ppe42-gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.tar.gz ppe42-gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.zip | |
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/awt/java2d/AbstractGraphics2D.h')
| -rw-r--r-- | libjava/gnu/java/awt/java2d/AbstractGraphics2D.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h index 03567167734..92f78733b29 100644 --- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h +++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h @@ -23,6 +23,7 @@ extern "Java" class ScanlineConverter; class ScanlineCoverage; class ShapeCache; + class TextCacheKey; } } } @@ -170,7 +171,6 @@ public: // actually protected virtual ::java::awt::Rectangle * getDeviceBounds(); virtual void rawDrawLine(jint, jint, jint, jint); virtual void rawDrawRect(jint, jint, jint, jint); - virtual void rawDrawString(::java::lang::String *, jint, jint); virtual void rawClearRect(jint, jint, jint, jint); virtual void rawFillRect(jint, jint, jint, jint); virtual jboolean rawDrawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *); @@ -187,11 +187,15 @@ private: void updateOptimization(); static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *); void updateClip(::java::awt::geom::AffineTransform *); - ::gnu::java::awt::java2d::ShapeCache * getShapeCache(); ::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter(); + void freeScanlineConverter(::gnu::java::awt::java2d::ScanlineConverter *); + static jboolean DEFAULT_TEXT_AA; static ::java::awt::Font * FONT; - static ::java::lang::ThreadLocal * shapeCache; - static ::java::lang::ThreadLocal * scanlineConverters; + static const jint GV_CACHE_SIZE = 50; + static ::gnu::java::awt::java2d::ShapeCache * shapeCache; + static ::java::util::LinkedList * scanlineConverters; + static ::java::util::Map * gvCache; + static ::gnu::java::awt::java2d::TextCacheKey * searchTextKey; public: // actually protected ::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__; private: |
