Skip to content

Revert 0.8.22 changes: remove PictureFilterCanvas #1013

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
MatkovIvan merged 1 commit into from
Jan 20, 2025
Merged

Revert 0.8.22 changes: remove PictureFilterCanvas #1013

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
48 changes: 0 additions & 48 deletions skiko/src/commonMain/kotlin/org/jetbrains/skia/PictureFilterCanvas.kt
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions skiko/src/commonTest/kotlin/org/jetbrains/skia/PictureFilterCanvasTest.kt
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions skiko/src/jvmMain/cpp/common/PictureFilterCanvas.cc
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions skiko/src/jvmMain/cpp/common/interop.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,39 +653,6 @@ namespace skija {
}
}

namespace PictureFilterCanvas {
JavaVM* _vm;
jmethodID onDrawPictureId;

void onLoad(JNIEnv* env) {
env->GetJavaVM(&_vm);
jclass local = env->FindClass("org/jetbrains/skia/PictureFilterCanvas");
onDrawPictureId = env->GetMethodID(local, "onDrawPicture", "(JJJ)Z");
}

void onUnload(JNIEnv* env) {
}

bool onDrawPicture(jobject obj, const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint) {
JNIEnv *env;
_vm->AttachCurrentThread(AS_JNI_ENV_PTR(&env), NULL);
jboolean result = env->CallBooleanMethod(obj, onDrawPictureId, reinterpret_cast<jlong>(picture), reinterpret_cast<jlong>(matrix), reinterpret_cast<jlong>(paint));
_vm->DetachCurrentThread();
return result;
}

jobject attach(JNIEnv* env, jobject obj) {
return env->NewGlobalRef(obj);
}

void detach(jobject obj) {
JNIEnv *env;
_vm->AttachCurrentThread(AS_JNI_ENV_PTR(&env), NULL);
env->DeleteGlobalRef(obj);
_vm->DetachCurrentThread();
}
}

namespace Rect {
jclass cls;
jmethodID makeLTRB;
Expand Down Expand Up @@ -930,7 +897,6 @@ namespace skija {
PathSegment::onLoad(env);
Point::onLoad(env);
PaintFilterCanvas::onLoad(env);
PictureFilterCanvas::onLoad(env);
Rect::onLoad(env);
RRect::onLoad(env);
RSXform::onLoad(env);
Expand All @@ -943,7 +909,6 @@ namespace skija {
RRect::onUnload(env);
Rect::onUnload(env);
PaintFilterCanvas::onUnload(env);
PictureFilterCanvas::onUnload(env);
Point::onUnload(env);
PathSegment::onUnload(env);
Path::onUnload(env);
Expand Down
9 changes: 0 additions & 9 deletions skiko/src/jvmMain/cpp/common/interop.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,6 @@ namespace skija {
void detach(jobject obj);
}

namespace PictureFilterCanvas {
extern jmethodID onDrawPictureId;
void onLoad(JNIEnv* env);
void onUnload(JNIEnv* env);
bool onDrawPicture(jobject obj, const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint);
jobject attach(JNIEnv* env, jobject obj);
void detach(jobject obj);
}

namespace Rect {
extern jclass cls;
extern jmethodID makeLTRB;
Expand Down
9 changes: 0 additions & 9 deletions skiko/src/jvmMain/kotlin/org/jetbrains/skia/PictureFilterCanvas.jvm.kt
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions skiko/src/nativeJsMain/cpp/PictureFilterCanvas.cc
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions skiko/src/nativeJsMain/kotlin/org/jetbrains/skia/PictureFilterCanvas.nativeJs.kt
View file
Open in desktop

This file was deleted.

Loading