< prev index next >
src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java
Print this page
@@ -59,11 +59,10 @@
import java.awt.Stroke;
import java.awt.FontMetrics;
import java.awt.Rectangle;
import java.text.AttributedCharacterIterator;
import java.awt.Font;
-import java.awt.Point;
import java.awt.image.ImageObserver;
import java.awt.Transparency;
import java.awt.font.GlyphVector;
import java.awt.font.TextLayout;
@@ -97,10 +96,11 @@
import java.awt.image.MultiResolutionImage;
import static java.awt.geom.AffineTransform.TYPE_FLIP;
import static java.awt.geom.AffineTransform.TYPE_MASK_SCALE;
import static java.awt.geom.AffineTransform.TYPE_TRANSLATION;
+import java.awt.image.VolatileImage;
import sun.awt.image.MultiResolutionToolkitImage;
import sun.awt.image.ToolkitImage;
/**
* This is a the master Graphics2D superclass for all of the Sun
@@ -3084,26 +3084,34 @@
surfaceData.markDirty();
}
}
// end of text rendering methods
- private boolean isHiDPIImage(final Image img) {
- return (SurfaceManager.getImageScale(img) != 1)
- || img instanceof MultiResolutionImage;
- }
-
- private boolean drawHiDPIImage(Image img, int dx1, int dy1, int dx2,
- int dy2, int sx1, int sy1, int sx2, int sy2,
- Color bgcolor, ImageObserver observer) {
+ private Boolean drawHiDPIImage(Image img,
+ int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2,
+ Color bgcolor, ImageObserver observer,
+ AffineTransform xform) {
- if (SurfaceManager.getImageScale(img) != 1) { // Volatile Image
- final int scale = SurfaceManager.getImageScale(img);
- sx1 = Region.clipScale(sx1, scale);
- sx2 = Region.clipScale(sx2, scale);
- sy1 = Region.clipScale(sy1, scale);
- sy2 = Region.clipScale(sy2, scale);
- } else if (img instanceof MultiResolutionImage) {
+ if (img instanceof VolatileImage) {
+ final SurfaceData sd = SurfaceManager.getManager(img)
+ .getPrimarySurfaceData();
+ final double scaleX = sd.getDefaultScaleX();
+ final double scaleY = sd.getDefaultScaleY();
+ if (scaleX == 1 && scaleY == 1) {
+ return null;
+ }
+ sx1 = Region.clipScale(sx1, scaleX);
+ sx2 = Region.clipScale(sx2, scaleX);
+ sy1 = Region.clipScale(sy1, scaleY);
+ sy2 = Region.clipScale(sy2, scaleY);
+
+ return scaleImage(img, dx1, dy1, dx2, dy2,
+ sx1, sy1, sx2, sy2,
+ bgcolor, observer, xform);
+ } else if (resolutionVariantHint != SunHints.INTVAL_RESOLUTION_VARIANT_BASE
+ && (img instanceof MultiResolutionImage)) {
// get scaled destination image size
int width = img.getWidth(observer);
int height = img.getHeight(observer);
@@ -3131,13 +3139,30 @@
sx2 = Region.clipScale(sx2, widthScale);
sy2 = Region.clipScale(sy2, heightScale);
observer = rvObserver;
img = resolutionVariant;
+ return scaleImage(img, dx1, dy1, dx2, dy2,
+ sx1, sy1, sx2, sy2,
+ bgcolor, observer, xform);
}
}
}
+ return null;
+ }
+
+ private boolean scaleImage(Image img, int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2,
+ Color bgcolor, ImageObserver observer,
+ AffineTransform xform) {
+
+ AffineTransform tx = null;
+
+ if (xform != null) {
+ tx = new AffineTransform(transform);
+ transform(xform);
+ }
try {
return imagepipe.scaleImage(this, img, dx1, dy1, dx2, dy2, sx1, sy1,
sx2, sy2, bgcolor, observer);
} catch (InvalidPipeException e) {
@@ -3151,10 +3176,15 @@
// try again next time around.
return false;
}
} finally {
surfaceData.markDirty();
+
+ if (tx != null) {
+ transform.setTransform(tx);
+ invalidateTransform();
+ }
}
}
private Image getResolutionVariant(MultiResolutionImage img,
int srcWidth, int srcHeight, int dx1, int dy1, int dx2, int dy2,
@@ -3275,13 +3305,15 @@
return true;
}
final int imgW = img.getWidth(null);
final int imgH = img.getHeight(null);
- if (isHiDPIImage(img)) {
- return drawHiDPIImage(img, x, y, x + width, y + height, 0, 0, imgW,
- imgH, bg, observer);
+ Boolean hidpiImageDrawn = drawHiDPIImage(img, x, y, x + width, y + height,
+ 0, 0, imgW, imgH, bg, observer,
+ null);
+ if (hidpiImageDrawn != null) {
+ return hidpiImageDrawn;
}
if (width == imgW && height == imgH) {
return copyImage(img, x, y, 0, 0, width, height, bg, observer);
}
@@ -3321,15 +3353,17 @@
if (img == null) {
return true;
}
- if (isHiDPIImage(img)) {
final int imgW = img.getWidth(null);
final int imgH = img.getHeight(null);
- return drawHiDPIImage(img, x, y, x + imgW, y + imgH, 0, 0, imgW,
- imgH, bg, observer);
+ Boolean hidpiImageDrawn = drawHiDPIImage(img, x, y, x + imgW, y + imgH,
+ 0, 0, imgW, imgH, bg, observer,
+ null);
+ if (hidpiImageDrawn != null) {
+ return hidpiImageDrawn;
}
try {
return imagepipe.copyImage(this, img, x, y, bg, observer);
} catch (InvalidPipeException e) {
@@ -3376,13 +3410,16 @@
sx1 == sx2 || sy1 == sy2)
{
return true;
}
- if (isHiDPIImage(img)) {
- return drawHiDPIImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2,
- bgcolor, observer);
+ Boolean hidpiImageDrawn = drawHiDPIImage(img, dx1, dy1, dx2, dy2,
+ sx1, sy1, sx2, sy2,
+ bgcolor, observer, null);
+
+ if (hidpiImageDrawn != null) {
+ return hidpiImageDrawn;
}
if (((sx2 - sx1) == (dx2 - dx1)) &&
((sy2 - sy1) == (dy2 - dy1)))
{
@@ -3459,20 +3496,17 @@
if (xform == null || xform.isIdentity()) {
return drawImage(img, 0, 0, null, observer);
}
- if (isHiDPIImage(img)) {
final int w = img.getWidth(null);
final int h = img.getHeight(null);
- final AffineTransform tx = new AffineTransform(transform);
- transform(xform);
- boolean result = drawHiDPIImage(img, 0, 0, w, h, 0, 0, w, h, null,
- observer);
- transform.setTransform(tx);
- invalidateTransform();
- return result;
+ Boolean hidpiImageDrawn = drawHiDPIImage(img, 0, 0, w, h, 0, 0, w, h,
+ null, observer, xform);
+
+ if (hidpiImageDrawn != null) {
+ return hidpiImageDrawn;
}
try {
return imagepipe.transformImage(this, img, xform, observer);
} catch (InvalidPipeException e) {
< prev index next >