Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1aae1c2a: am 8f36bedc: Merge "Don\'t attempt to create empty layers. Bug #3369888" into honeycomb

Browse Source 
* commit '1aae1c2a9ba7ad229e8c2ba8ad1befc598986e57':
  Don't attempt to create empty layers. Bug #3369888
This commit is contained in:
Romain Guy
2011-01-19 14:41:29 -08:00
committed by Android Git Automerger
parent d097e87a14 1aae1c2a9b
commit cf4b6c7cd6
3 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/view/GLES20Canvas.java
View File

@@ -452,11 +452,14 @@ class GLES20Canvas extends HardwareCanvas {
@Override
public int saveLayer(float left, float top, float right, float bottom, Paint paint,
int saveFlags) {
boolean hasColorFilter = paint != null && setupColorFilter(paint);
final int nativePaint = paint == null ? 0 : paint.mNativePaint;
int count = nSaveLayer(mRenderer, left, top, right, bottom, nativePaint, saveFlags);
if (hasColorFilter) nResetModifiers(mRenderer);
return count;
if (left < right && top < bottom) {
boolean hasColorFilter = paint != null && setupColorFilter(paint);
final int nativePaint = paint == null ? 0 : paint.mNativePaint;
int count = nSaveLayer(mRenderer, left, top, right, bottom, nativePaint, saveFlags);
if (hasColorFilter) nResetModifiers(mRenderer);
return count;
}
return save(saveFlags);
}
private native int nSaveLayer(int renderer, float left, float top, float right, float bottom,
@@ -471,7 +474,10 @@ class GLES20Canvas extends HardwareCanvas {
@Override
public int saveLayerAlpha(float left, float top, float right, float bottom, int alpha,
int saveFlags) {
return nSaveLayerAlpha(mRenderer, left, top, right, bottom, alpha, saveFlags);
if (left < right && top < bottom) {
return nSaveLayerAlpha(mRenderer, left, top, right, bottom, alpha, saveFlags);
}
return save(saveFlags);
}
private native int nSaveLayerAlpha(int renderer, float left, float top, float right,