Skip to content

fix(android): There were invalidate conflicts due to asynchronous executions #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2021
Merged

fix(android): There were invalidate conflicts due to asynchronous executions #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../canvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/CPUView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class CPUView @JvmOverloads constructor(
canvas.queueEvent {
TNSCanvas.nativeCustomWithBitmapFlush(canvas.nativeContext, it)
handler!!.post {
canvas.pendingInvalidate = false
canvas.invalidateState = TNSCanvas.InvalidateState.NONE
invalidate()
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...anvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/GLContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,19 @@ internal class GLContext {
queueEvent {
if (reference != null) {
val canvasView = reference!!.get()
if (canvasView != null && canvasView.nativeContext != 0L && canvasView.pendingInvalidate) {
if (canvasView != null && canvasView.nativeContext != 0L && canvasView.invalidateState == TNSCanvas.InvalidateState.INVALIDATING) {
TNSCanvas.nativeFlush(canvasView.nativeContext)
if (!mGLThread!!.getPaused() && !swapBuffers(mEGLSurface)) {
Log.e("JS", "GLContext: Cannot swap buffers!")
}
canvasView.pendingInvalidate = false
canvasView.invalidateState = TNSCanvas.InvalidateState.NONE
} else {
// WebGL
if (!mGLThread!!.getPaused() && !swapBuffers(mEGLSurface)) {
Log.e("JS", "GLContext: Cannot swap buffers!")
}
if (canvasView != null) {
canvasView.pendingInvalidate = false
canvasView.invalidateState = TNSCanvas.InvalidateState.NONE
}
}
}
Expand Down
9 changes: 7 additions & 2 deletions ...anvas/src-native/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvas.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {
}

@JvmField
internal var pendingInvalidate = false
internal var invalidateState = InvalidateState.NONE
internal var contextType = ContextType.NONE
internal var actualContextType = ""
internal var useCpu = false
Expand Down Expand Up @@ -122,9 +122,14 @@ class TNSCanvas : FrameLayout, FrameCallback, ActivityLifecycleCallbacks {

private val mainHandler = Handler(Looper.getMainLooper())

enum class InvalidateState {
NONE, PENDING, INVALIDATING
}

override fun doFrame(frameTimeNanos: Long) {
if (!isHandleInvalidationManually) {
if (pendingInvalidate) {
if (invalidateState == InvalidateState.PENDING) {
invalidateState = InvalidateState.INVALIDATING
flush()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...anvas-android/canvas/src/main/java/org/nativescript/canvas/TNSCanvasRenderingContext2D.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ class TNSCanvasRenderingContext2D internal constructor(val canvas: TNSCanvas) :

private fun updateCanvas() {
// synchronized (canvasView.lock) {
canvas.pendingInvalidate = true
canvas.invalidateState = TNSCanvas.InvalidateState.PENDING
//}
}

Expand Down
2 changes: 1 addition & 1 deletion ...e/canvas-android/canvas/src/main/java/org/nativescript/canvas/TNSWebGLRenderingContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ open class TNSWebGLRenderingContext : TNSCanvasRenderingContext {

fun updateCanvas() {
// synchronized (canvasView.lock) {
canvas.pendingInvalidate = true
canvas.invalidateState = TNSCanvas.InvalidateState.PENDING
//}
}

Expand Down
10 changes: 9 additions & 1 deletion packages/canvas/typings/android.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ declare module org {
export module canvas {
export class TNSCanvas {
public static class: java.lang.Class<org.nativescript.canvas.TNSCanvas>;
public pendingInvalidate: boolean;
public invalidateState: org.nativescript.canvas.TNSCanvas.ContextType;
public contextAlpha: boolean;
public contextAntialias: boolean;
public contextDepth: boolean;
Expand Down Expand Up @@ -459,6 +459,14 @@ declare module org {
public constructor();
public onResult(param0: string): void;
}
export class InvalidateState {
public static class: java.lang.Class<org.nativescript.canvas.TNSCanvas.InvalidateState>;
public static NONE: org.nativescript.canvas.TNSCanvas.InvalidateState;
public static PENDING: org.nativescript.canvas.TNSCanvas.InvalidateState;
public static INVALIDATING: org.nativescript.canvas.TNSCanvas.InvalidateState;
public static valueOf(param0: string): org.nativescript.canvas.TNSCanvas.InvalidateState;
public static values(): androidNative.Array<org.nativescript.canvas.TNSCanvas.InvalidateState>;
}
export class Listener {
public static class: java.lang.Class<org.nativescript.canvas.TNSCanvas.Listener>;
/**
Expand Down