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

Merge "Rename callDrawGLFunction" into lmp-mr1-dev

Browse Source
This commit is contained in:
John Reck
2014-11-20 23:26:06 +00:00
committed by Android (Google) Code Review
parent 002bc81088 680df8d60e
commit 0b2dac3452
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ class GLES20Canvas extends HardwareCanvas {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@Override @Override
public int callDrawGLFunction(long drawGLFunction) { public int callDrawGLFunction2(long drawGLFunction) {
return nCallDrawGLFunction(mRenderer, drawGLFunction); return nCallDrawGLFunction(mRenderer, drawGLFunction);
} }

5
core/java/android/view/HardwareCanvas.java
View File

@@ -105,10 +105,7 @@ public abstract class HardwareCanvas extends Canvas {
* *
* @hide * @hide
*/ */
public int callDrawGLFunction(long drawGLFunction) { public abstract int callDrawGLFunction2(long drawGLFunction);
// Noop - this is done in the display list recorder subclass
return RenderNode.STATUS_DONE;
}
public abstract void drawCircle(CanvasProperty<Float> cx, CanvasProperty<Float> cy, public abstract void drawCircle(CanvasProperty<Float> cx, CanvasProperty<Float> cy,
CanvasProperty<Float> radius, CanvasProperty<Paint> paint); CanvasProperty<Float> radius, CanvasProperty<Paint> paint);

2
core/java/android/webkit/WebViewDelegate.java
View File

@@ -107,7 +107,7 @@ public final class WebViewDelegate {
throw new IllegalArgumentException(canvas.getClass().getName() throw new IllegalArgumentException(canvas.getClass().getName()
+ " is not hardware accelerated"); + " is not hardware accelerated");
} }
((HardwareCanvas) canvas).callDrawGLFunction(nativeDrawGLFunctor); ((HardwareCanvas) canvas).callDrawGLFunction2(nativeDrawGLFunctor);
} }
/** /**