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

Merge "Fix a crash caused by transaction" into sc-dev

Browse Source
This commit is contained in:
Huihong Luo
2021-06-24 20:27:48 +00:00
committed by Android (Google) Code Review
parent cf49f78265 4df4151bc0
commit 7580a2dd98
9 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/SurfaceControl.java
View File

@@ -2610,16 +2610,6 @@ public final class SurfaceControl implements Parcelable {
= sRegistry.registerNativeAllocation(this, mNativeObject);
}
/**
* Create a transaction object that wraps a native peer.
* @hide
*/
Transaction(long nativeObject) {
mNativeObject = nativeObject;
mFreeNativeResources =
sRegistry.registerNativeAllocation(this, mNativeObject);
}
private Transaction(Parcel in) {
readFromParcel(in);
}

8
core/java/android/view/ViewRootImpl.java
View File

@@ -1371,8 +1371,12 @@ public final class ViewRootImpl implements ViewParent,
HardwareRenderer.ASurfaceTransactionCallback callback = (nativeTransactionObj,
nativeSurfaceControlObj,
frameNr) -> {
Transaction t = new Transaction(nativeTransactionObj);
mergeWithNextTransaction(t, frameNr);
if (mBlastBufferQueue == null) {
return false;
} else {
mBlastBufferQueue.mergeWithNextTransaction(nativeTransactionObj, frameNr);
return true;
}
};
mAttachInfo.mThreadedRenderer.setASurfaceTransactionCallback(callback);
}

8
graphics/java/android/graphics/BLASTBufferQueue.java
View File

@@ -131,4 +131,12 @@ public final class BLASTBufferQueue {
nativeMergeWithNextTransaction(mNativeObject, t.mNativeObject, frameNumber);
}
/**
* Merge the transaction passed in to the next transaction in BlastBufferQueue.
* @param nativeTransaction native handle passed from native c/c++ code.
*/
public void mergeWithNextTransaction(long nativeTransaction, long frameNumber) {
nativeMergeWithNextTransaction(mNativeObject, nativeTransaction, frameNumber);
}
}

2
graphics/java/android/graphics/HardwareRenderer.java
View File

@@ -912,7 +912,7 @@ public class HardwareRenderer {
* @param aSurfaceControlNativeObj ASurfaceControl native object handle
* @param frame The id of the frame being drawn.
*/
void onMergeTransaction(long aSurfaceTranactionNativeObj,
boolean onMergeTransaction(long aSurfaceTranactionNativeObj,
long aSurfaceControlNativeObj, long frame);
}

14
libs/hwui/jni/android_graphics_HardwareRenderer.cpp
View File

@@ -662,16 +662,18 @@ static void android_view_ThreadedRenderer_setASurfaceTransactionCallback(
auto globalCallbackRef =
std::make_shared<JWeakGlobalRefHolder>(vm, aSurfaceTransactionCallback);
proxy->setASurfaceTransactionCallback(
[globalCallbackRef](int64_t transObj, int64_t scObj, int64_t frameNr) {
[globalCallbackRef](int64_t transObj, int64_t scObj, int64_t frameNr) -> bool {
JNIEnv* env = getenv(globalCallbackRef->vm());
jobject localref = env->NewLocalRef(globalCallbackRef->ref());
if (CC_UNLIKELY(!localref)) {
return;
return false;
}
env->CallVoidMethod(localref, gASurfaceTransactionCallback.onMergeTransaction,
static_cast<jlong>(transObj), static_cast<jlong>(scObj),
static_cast<jlong>(frameNr));
jboolean ret = env->CallBooleanMethod(
localref, gASurfaceTransactionCallback.onMergeTransaction,
static_cast<jlong>(transObj), static_cast<jlong>(scObj),
static_cast<jlong>(frameNr));
env->DeleteLocalRef(localref);
return ret;
});
}
}
@@ -1064,7 +1066,7 @@ int register_android_view_ThreadedRenderer(JNIEnv* env) {
jclass aSurfaceTransactionCallbackClass =
FindClassOrDie(env, "android/graphics/HardwareRenderer$ASurfaceTransactionCallback");
gASurfaceTransactionCallback.onMergeTransaction =
GetMethodIDOrDie(env, aSurfaceTransactionCallbackClass, "onMergeTransaction", "(JJJ)V");
GetMethodIDOrDie(env, aSurfaceTransactionCallbackClass, "onMergeTransaction", "(JJJ)Z");
jclass prepareSurfaceControlForWebviewCallbackClass = FindClassOrDie(
env, "android/graphics/HardwareRenderer$PrepareSurfaceControlForWebviewCallback");

5
libs/hwui/renderthread/CanvasContext.cpp
View File

@@ -910,9 +910,8 @@ CanvasContext* CanvasContext::getActiveContext() {
bool CanvasContext::mergeTransaction(ASurfaceTransaction* transaction, ASurfaceControl* control) {
if (!mASurfaceTransactionCallback) return false;
std::invoke(mASurfaceTransactionCallback, reinterpret_cast<int64_t>(transaction),
reinterpret_cast<int64_t>(control), getFrameNumber());
return true;
return std::invoke(mASurfaceTransactionCallback, reinterpret_cast<int64_t>(transaction),
reinterpret_cast<int64_t>(control), getFrameNumber());
}
void CanvasContext::prepareSurfaceControlForWebview() {

4
libs/hwui/renderthread/CanvasContext.h
View File

@@ -206,7 +206,7 @@ public:
ASurfaceControlStats* stats);
void setASurfaceTransactionCallback(
const std::function<void(int64_t, int64_t, int64_t)>& callback) {
const std::function<bool(int64_t, int64_t, int64_t)>& callback) {
mASurfaceTransactionCallback = callback;
}
@@ -317,7 +317,7 @@ private:
// If set to true, we expect that callbacks into onSurfaceStatsAvailable
bool mExpectSurfaceStats = false;
std::function<void(int64_t, int64_t, int64_t)> mASurfaceTransactionCallback;
std::function<bool(int64_t, int64_t, int64_t)> mASurfaceTransactionCallback;
std::function<void()> mPrepareSurfaceControlForWebviewCallback;
void cleanupResources();

2
libs/hwui/renderthread/RenderProxy.cpp
View File

@@ -314,7 +314,7 @@ void RenderProxy::setPictureCapturedCallback(
}
void RenderProxy::setASurfaceTransactionCallback(
const std::function<void(int64_t, int64_t, int64_t)>& callback) {
const std::function<bool(int64_t, int64_t, int64_t)>& callback) {
mRenderThread.queue().post(
[this, cb = callback]() { mContext->setASurfaceTransactionCallback(cb); });
}

2
libs/hwui/renderthread/RenderProxy.h
View File

@@ -123,7 +123,7 @@ public:
void setContentDrawBounds(int left, int top, int right, int bottom);
void setPictureCapturedCallback(const std::function<void(sk_sp<SkPicture>&&)>& callback);
void setASurfaceTransactionCallback(
const std::function<void(int64_t, int64_t, int64_t)>& callback);
const std::function<bool(int64_t, int64_t, int64_t)>& callback);
void setPrepareSurfaceControlForWebviewCallback(const std::function<void()>& callback);
void setFrameCallback(std::function<void(int64_t)>&& callback);
void setFrameCompleteCallback(std::function<void(int64_t)>&& callback);