Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39bb253a authored May 24, 2021 by Rachel Lee Committed by Automerger Merge Worker May 24, 2021

Merge "Use TraceUtils.h from gui shared library." into sc-dev am: e81c22a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14688150

Change-Id: Ie5ca551f8b08ab8a380c665f2173aba881f453df

parents 9e7f3ba3 e81c22a2

libs/hwui/HardwareBitmapUploader.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,10 +24,10 @@
	#include <GrDirectContext.h>		#include <GrDirectContext.h>
	#include <SkCanvas.h>		#include <SkCanvas.h>
	#include <SkImage.h>		#include <SkImage.h>
			#include <gui/TraceUtils.h>
	#include <utils/GLUtils.h>		#include <utils/GLUtils.h>
	#include <utils/NdkUtils.h>		#include <utils/NdkUtils.h>
	#include <utils/Trace.h>		#include <utils/Trace.h>
	#include <utils/TraceUtils.h>

	#include <thread>		#include <thread>

libs/hwui/Readback.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#include <sync/sync.h>		#include <sync/sync.h>
	#include <system/window.h>		#include <system/window.h>

			#include <gui/TraceUtils.h>
	#include "DeferredLayerUpdater.h"		#include "DeferredLayerUpdater.h"
	#include "Properties.h"		#include "Properties.h"
	#include "hwui/Bitmap.h"		#include "hwui/Bitmap.h"
	@@ -28,7 +29,6 @@
	#include "utils/Color.h"		#include "utils/Color.h"
	#include "utils/MathUtils.h"		#include "utils/MathUtils.h"
	#include "utils/NdkUtils.h"		#include "utils/NdkUtils.h"
	#include "utils/TraceUtils.h"

	using namespace android::uirenderer::renderthread;		using namespace android::uirenderer::renderthread;

libs/hwui/RenderNode.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,9 +27,9 @@
	#include "DamageAccumulator.h"		#include "DamageAccumulator.h"
	#include "pipeline/skia/SkiaDisplayList.h"		#include "pipeline/skia/SkiaDisplayList.h"
	#endif		#endif
			#include <gui/TraceUtils.h>
	#include "utils/MathUtils.h"		#include "utils/MathUtils.h"
	#include "utils/StringUtils.h"		#include "utils/StringUtils.h"
	#include "utils/TraceUtils.h"

	#include <SkPathOps.h>		#include <SkPathOps.h>
	#include <algorithm>		#include <algorithm>

libs/hwui/VectorDrawable.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,8 +30,8 @@
	#include "renderthread/RenderThread.h"		#include "renderthread/RenderThread.h"
	#endif		#endif

			#include <gui/TraceUtils.h>
	#include "utils/Macros.h"		#include "utils/Macros.h"
	#include "utils/TraceUtils.h"
	#include "utils/VectorDrawableUtils.h"		#include "utils/VectorDrawableUtils.h"

	namespace android {		namespace android {

libs/hwui/hwui/AnimatedImageDrawable.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	#include "AnimatedImageThread.h"		#include "AnimatedImageThread.h"
	#endif		#endif

	#include "utils/TraceUtils.h"		#include <gui/TraceUtils.h>
	#include "pipeline/skia/SkiaUtils.h"		#include "pipeline/skia/SkiaUtils.h"

	#include <SkPicture.h>		#include <SkPicture.h>