drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 613aef87: am 86bff0bb: am 0e20bd8e: Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev

Browse Source 
* commit '613aef87cf6a5958ff2fd255348f92f8d3de152e':
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.
This commit is contained in:
Diego Perez
2015-05-07 00:47:08 +00:00
committed by Android Git Automerger
parent 9af506fb5b 613aef87cf
commit c2ba739170
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java
View File

@ -86,11 +86,14 @@ public class BridgeRenderSession extends RenderSession {
}
@Override
public Result render(long timeout) {
public Result render(long timeout, boolean forceMeasure) {
try {
Bridge.prepareThread();
mLastResult = mSession.acquire(timeout);
if (mLastResult.isSuccess()) {
if (forceMeasure) {
mSession.invalidateRenderingSize();
}
mLastResult = mSession.render(false /*freshRender*/);
}
} finally {

19
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/GcSnapshot.java
View File

@ -35,6 +35,7 @@ import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.geom.AffineTransform;
@ -615,8 +616,22 @@ public class GcSnapshot {
return;
}
int width = layer.getImage().getWidth();
int height = layer.getImage().getHeight();
int width;
int height;
Rectangle clipBounds = originalGraphics.getClipBounds();
if (clipBounds != null) {
if (clipBounds.width == 0 || clipBounds.height == 0) {
// Clip is 0 so no need to paint anything.
return;
}
// If we have clipBounds available, use them as they will always be
// smaller than the full layer size.
width = clipBounds.width;
height = clipBounds.height;
} else {
width = layer.getImage().getWidth();
height = layer.getImage().getHeight();
}
// Create a temporary image to which the color filter will be applied.
BufferedImage image = new BufferedImage(width, height,

19
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@ -554,7 +554,14 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
// draw the views
// create the BufferedImage into which the layout will be rendered.
boolean newImage = false;
if (newRenderSize || mCanvas == null) {
// When disableBitmapCaching is true, we do not reuse mImage and
// we create a new one in every render.
// This is useful when mImage is just a wrapper of Graphics2D so
// it doesn't get cached.
boolean disableBitmapCaching = Boolean.TRUE.equals(params.getFlag(
RenderParamsFlags.FLAG_KEY_DISABLE_BITMAP_CACHING));
if (newRenderSize || mCanvas == null || disableBitmapCaching) {
if (params.getImageFactory() != null) {
mImage = params.getImageFactory().getImage(
mMeasuredScreenWidth,
@ -581,8 +588,12 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
Bitmap bitmap = Bitmap_Delegate.createBitmap(mImage,
true /*isMutable*/, hardwareConfig.getDensity());
// create a Canvas around the Android bitmap
mCanvas = new Canvas(bitmap);
if (mCanvas == null) {
// create a Canvas around the Android bitmap
mCanvas = new Canvas(bitmap);
} else {
mCanvas.setBitmap(bitmap);
}
mCanvas.setDensity(hardwareConfig.getDensity().getDpiValue());
}
@ -1631,7 +1642,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
return null;
}
private void invalidateRenderingSize() {
public void invalidateRenderingSize() {
mMeasuredScreenWidth = mMeasuredScreenHeight = -1;
}