Merge "Remove dead code" (413a3c38) · Commits · e / os / android_frameworks_base

core/java/android/view/ThreadedRenderer.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -907,10 +907,6 @@ public final class ThreadedRenderer {
		animator.getAnimatorNativePtr());
		}

		public void serializeDisplayListTree() {
		nSerializeDisplayListTree(mNativeProxy);
		}

		public static int copySurfaceInto(Surface surface, Rect srcRect, Bitmap bitmap) {
		if (srcRect == null) {
		// Empty rect means entire surface
		@@ -1202,8 +1198,6 @@ public final class ThreadedRenderer {
		private static native void nStopDrawing(long nativeProxy);
		private static native void nNotifyFramePending(long nativeProxy);

		private static native void nSerializeDisplayListTree(long nativeProxy);

		private static native void nDumpProfileInfo(long nativeProxy, FileDescriptor fd,
		@DumpFlags int dumpFlags);

core/java/android/view/ViewRootImpl.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -2961,9 +2961,6 @@ public final class ViewRootImpl implements ViewParent,
		*/
		void outputDisplayList(View view) {
		view.mRenderNode.output();
		if (mAttachInfo.mThreadedRenderer != null) {
		mAttachInfo.mThreadedRenderer.serializeDisplayListTree();
		}
		}

		/**

core/jni/android_view_ThreadedRenderer.cpp

+0 −7

Original line number	Diff line number	Diff line
		@@ -813,12 +813,6 @@ static void android_view_ThreadedRenderer_notifyFramePending(JNIEnv* env, jobjec
		proxy->notifyFramePending();
		}

		static void android_view_ThreadedRenderer_serializeDisplayListTree(JNIEnv* env, jobject clazz,
		jlong proxyPtr) {
		RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);
		proxy->serializeDisplayListTree();
		}

		static void android_view_ThreadedRenderer_dumpProfileInfo(JNIEnv* env, jobject clazz,
		jlong proxyPtr, jobject javaFileDescriptor, jint dumpFlags) {
		RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);
		@@ -1081,7 +1075,6 @@ static const JNINativeMethod gMethods[] = {
		{ "nFence", "(J)V", (void*) android_view_ThreadedRenderer_fence },
		{ "nStopDrawing", "(J)V", (void*) android_view_ThreadedRenderer_stopDrawing },
		{ "nNotifyFramePending", "(J)V", (void*) android_view_ThreadedRenderer_notifyFramePending },
		{ "nSerializeDisplayListTree", "(J)V", (void*) android_view_ThreadedRenderer_serializeDisplayListTree },
		{ "nDumpProfileInfo", "(JLjava/io/FileDescriptor;I)V", (void*) android_view_ThreadedRenderer_dumpProfileInfo },
		{ "setupShadersDiskCache", "(Ljava/lang/String;Ljava/lang/String;)V",
		(void*) android_view_ThreadedRenderer_setupShadersDiskCache },

libs/hwui/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -269,13 +269,8 @@ cc_defaults {
		"TextureCache.cpp",
		"VectorDrawable.cpp",
		"VkLayer.cpp",
		"protos/hwui.proto",
		],

		proto: {
		export_proto_headers: true,
		},

		export_include_dirs: ["."],
		export_shared_lib_headers: ["libRScpp"],
		}

libs/hwui/RenderNode.cpp

+0 −74

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@
		#include "utils/StringUtils.h"
		#include "utils/TraceUtils.h"

		#include "protos/ProtoHelpers.h"
		#include "protos/hwui.pb.h"

		#include <SkPathOps.h>
		#include <algorithm>
		#include <sstream>
		@@ -101,77 +98,6 @@ void RenderNode::output(std::ostream& output, uint32_t level) {
		output << std::endl;
		}

		void RenderNode::copyTo(proto::RenderNode* pnode) {
		pnode->set_id(static_cast<uint64_t>(reinterpret_cast<uintptr_t>(this)));
		pnode->set_name(mName.string(), mName.length());

		proto::RenderProperties* pprops = pnode->mutable_properties();
		pprops->set_left(properties().getLeft());
		pprops->set_top(properties().getTop());
		pprops->set_right(properties().getRight());
		pprops->set_bottom(properties().getBottom());
		pprops->set_clip_flags(properties().getClippingFlags());
		pprops->set_alpha(properties().getAlpha());
		pprops->set_translation_x(properties().getTranslationX());
		pprops->set_translation_y(properties().getTranslationY());
		pprops->set_translation_z(properties().getTranslationZ());
		pprops->set_elevation(properties().getElevation());
		pprops->set_rotation(properties().getRotation());
		pprops->set_rotation_x(properties().getRotationX());
		pprops->set_rotation_y(properties().getRotationY());
		pprops->set_scale_x(properties().getScaleX());
		pprops->set_scale_y(properties().getScaleY());
		pprops->set_pivot_x(properties().getPivotX());
		pprops->set_pivot_y(properties().getPivotY());
		pprops->set_has_overlapping_rendering(properties().getHasOverlappingRendering());
		pprops->set_pivot_explicitly_set(properties().isPivotExplicitlySet());
		pprops->set_project_backwards(properties().getProjectBackwards());
		pprops->set_projection_receiver(properties().isProjectionReceiver());
		set(pprops->mutable_clip_bounds(), properties().getClipBounds());

		const Outline& outline = properties().getOutline();
		if (outline.getType() != Outline::Type::None) {
		proto::Outline* poutline = pprops->mutable_outline();
		poutline->clear_path();
		if (outline.getType() == Outline::Type::Empty) {
		poutline->set_type(proto::Outline_Type_Empty);
		} else if (outline.getType() == Outline::Type::ConvexPath) {
		poutline->set_type(proto::Outline_Type_ConvexPath);
		if (const SkPath* path = outline.getPath()) {
		set(poutline->mutable_path(), *path);
		}
		} else if (outline.getType() == Outline::Type::RoundRect) {
		poutline->set_type(proto::Outline_Type_RoundRect);
		} else {
		ALOGW("Uknown outline type! %d", static_cast<int>(outline.getType()));
		poutline->set_type(proto::Outline_Type_None);
		}
		poutline->set_should_clip(outline.getShouldClip());
		poutline->set_alpha(outline.getAlpha());
		poutline->set_radius(outline.getRadius());
		set(poutline->mutable_bounds(), outline.getBounds());
		} else {
		pprops->clear_outline();
		}

		const RevealClip& revealClip = properties().getRevealClip();
		if (revealClip.willClip()) {
		proto::RevealClip* prevealClip = pprops->mutable_reveal_clip();
		prevealClip->set_x(revealClip.getX());
		prevealClip->set_y(revealClip.getY());
		prevealClip->set_radius(revealClip.getRadius());
		} else {
		pprops->clear_reveal_clip();
		}

		pnode->clear_children();
		if (mDisplayList) {
		for (auto&& child : mDisplayList->getChildren()) {
		child->renderNode->copyTo(pnode->add_children());
		}
		}
		}

		int RenderNode::getDebugSize() {
		int size = sizeof(RenderNode);
		if (mStagingDisplayList) {