Merge "Reimplement the native matrix method using the new delegate way." (0424d69d) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/.classpath

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
		<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/layoutlib_api/layoutlib_api-prebuilt.jar"/>
		<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/>
		<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/layoutlib.jar" sourcepath="/ANDROID_SRC/frameworks/base/core/java"/>
		<classpathentry kind="var" path="ANDROID_PLAT_OUT_FRAMEWORK/layoutlib.jar" sourcepath="/ANDROID_PLAT_SRC/frameworks/base"/>
		<classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/ninepatch.jar" sourcepath="/ANDROID_SRC/development/tools/ninepatch/src"/>
		<classpathentry kind="output" path="bin"/>
		</classpath>

tools/layoutlib/bridge/src/android/graphics/Canvas.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -18,13 +18,6 @@ package android.graphics;

		import com.android.layoutlib.api.ILayoutLog;

		import android.graphics.DrawFilter;
		import android.graphics.Picture;
		import android.graphics.PorterDuff;
		import android.graphics.Rect;
		import android.graphics.RectF;
		import android.graphics.Region;
		import android.graphics.Xfermode;
		import android.graphics.Paint.Align;
		import android.graphics.Paint.FontInfo;
		import android.graphics.Paint.Style;
		@@ -42,8 +35,6 @@ import java.awt.image.BufferedImage;
		import java.util.List;
		import java.util.Stack;

		import javax.microedition.khronos.opengles.GL;

		/**
		* Re-implementation of the Canvas, 100% in java on top of a BufferedImage.
		*/
		@@ -509,7 +500,7 @@ public class Canvas extends _Original_Canvas {
		// get the Graphics2D current matrix
		AffineTransform currentTx = g.getTransform();
		// get the AffineTransform from the matrix
		AffineTransform matrixTx = matrix.getTransform();
		AffineTransform matrixTx = Matrix_Delegate.getAffineTransform(matrix);

		// combine them so that the matrix is applied after.
		currentTx.preConcatenate(matrixTx);
		@@ -969,9 +960,9 @@ public class Canvas extends _Original_Canvas {
		Graphics2D g = getGraphics2d();

		// and apply the matrix
		g.setTransform(matrix.getTransform());
		g.setTransform(Matrix_Delegate.getAffineTransform(matrix));

		if (mLogger != null && matrix.hasPerspective()) {
		if (mLogger != null && Matrix_Delegate.hasPerspective(matrix)) {
		mLogger.warning("android.graphics.Canvas#setMatrix(android.graphics.Matrix) only supports affine transformations in the Layout Editor.");
		}
		}
		@@ -987,7 +978,7 @@ public class Canvas extends _Original_Canvas {
		// get its current matrix
		AffineTransform currentTx = g.getTransform();
		// get the AffineTransform of the given matrix
		AffineTransform matrixTx = matrix.getTransform();
		AffineTransform matrixTx = Matrix_Delegate.getAffineTransform(matrix);

		// combine them so that the given matrix is applied after.
		currentTx.preConcatenate(matrixTx);

tools/layoutlib/bridge/src/android/graphics/Matrix.java

deleted100644 → 0

+0 −1032

File deleted.

Preview size limit exceeded, changes collapsed.

tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java

0 → 100644

+1011 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/DelegateManager.java

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.layoutlib.bridge;

		import android.util.SparseArray;

		/**
		* Manages native delegates.
		*
		* This is used in conjunction with layoublib_create: certain Android java classes are mere
		* wrappers around a heavily native based implementation, and we need a way to run these classes
		* in our Eclipse rendering framework without bringing all the native code from the Android
		* platform.
		*
		* Thus we instruct layoutlib_create to modify the bytecode of these classes to replace their
		* native methods by "delegate calls".
		*
		* For example, a native method android.graphics.Matrix.init(...) will actually become
		* a call to android.graphics.Matrix_Delegate.init(...).
		*
		* The Android java classes that use native code uses an int (Java side) to reference native
		* objects. This int is generally directly the pointer to the C structure counterpart.
		* Typically a creation method will return such an int, and then this int will be passed later
		* to a Java method to identify the C object to manipulate.
		*
		* Since we cannot use the Java object reference as the int directly, DelegateManager manages the
		* int -> Delegate class link.
		*
		* Native methods usually always have the int as parameters. The first thing the delegate method
		* will do is call {@link #getDelegate(int)} to get the Java object matching the int.
		*
		* Typical native init methods are returning a new int back to the Java class, so
		* {@link #addDelegate(Object)} does the same.
		*
		* @param <T> the delegate class to manage
		*/
		public final class DelegateManager<T> {

		private final SparseArray<T> mDelegates = new SparseArray<T>();
		private int mDelegateCounter = 0;

		/**
		* Returns the delegate from the given native int.
		* @param native_object the native int.
		* @return the delegate or null if not found.
		*/
		public T getDelegate(int native_object) {
		synchronized (mDelegates) {
		return mDelegates.get(native_object);
		}
		}

		/**
		* Adds a delegate to the manager and returns the native int used to identify it.
		* @param newDelegate the delegate to add
		* @return a unique native int to identify the delegate
		*/
		public int addDelegate(T newDelegate) {
		synchronized (mDelegates) {
		int native_object = ++mDelegateCounter;
		mDelegates.put(native_object, newDelegate);
		return native_object;
		}
		}

		/**
		* Removes the delegate matching the given native int.
		* @param native_object the native int.
		*/
		public void removeDelegate(int native_object) {
		synchronized (mDelegates) {
		mDelegates.remove(native_object);
		}
		}
		}