From 5ae8a0bd0a12beb5ce726357aa6b4467cc95962f Mon Sep 17 00:00:00 2001 From: uTen2c Date: Mon, 1 Jan 2024 09:40:37 +0900 Subject: [PATCH 1/7] Update CI --- .github/workflows/build-jcef.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-jcef.yml b/.github/workflows/build-jcef.yml index 95349ce3..35ff070f 100644 --- a/.github/workflows/build-jcef.yml +++ b/.github/workflows/build-jcef.yml @@ -33,8 +33,8 @@ jobs: run: echo "${{ secrets.S3_CFG }}" > ~/.s3cfg - name: Upload java-cef build run: | - s3cmd put -P /home/runner/work/java-cef/java-cef/jcef_build/linux_${{ matrix.platform }}.tar.gz s3://mcef-us-1/java-cef-builds/${{ github.sha }}/linux_${{ matrix.platform }}.tar.gz - s3cmd put -P /home/runner/work/java-cef/java-cef/jcef_build/linux_${{ matrix.platform }}.tar.gz.sha256 s3://mcef-us-1/java-cef-builds/${{ github.sha }}/linux_${{ matrix.platform }}.tar.gz.sha256 + s3cmd put -P /home/runner/work/java-cef/java-cef/jcef_build/linux_${{ matrix.platform }}.tar.gz s3://${{ secrets.S3_BUCKET }}/java-cef-builds/${{ github.sha }}/linux_${{ matrix.platform }}.tar.gz + s3cmd put -P /home/runner/work/java-cef/java-cef/jcef_build/linux_${{ matrix.platform }}.tar.gz.sha256 s3://${{ secrets.S3_BUCKET }}/java-cef-builds/${{ github.sha }}/linux_${{ matrix.platform }}.tar.gz.sha256 java-cef-windows: runs-on: [windows-2022] strategy: @@ -65,8 +65,8 @@ jobs: run: echo "${{ secrets.S3_CFG }}" > "$HOME\AppData\Roaming\s3cmd.ini" - name: Upload java-cef build run: | - python D:\s3cmd\s3cmd-master\s3cmd put -P D:\a\java-cef\java-cef\jcef_build\windows_${{ matrix.platform }}.tar.gz s3://mcef-us-1/java-cef-builds/${{ github.sha }}/windows_${{ matrix.platform }}.tar.gz - python D:\s3cmd\s3cmd-master\s3cmd put -P D:\a\java-cef\java-cef\jcef_build\windows_${{ matrix.platform }}.tar.gz.sha256 s3://mcef-us-1/java-cef-builds/${{ github.sha }}/windows_${{ matrix.platform }}.tar.gz.sha256 + python D:\s3cmd\s3cmd-master\s3cmd put -P D:\a\java-cef\java-cef\jcef_build\windows_${{ matrix.platform }}.tar.gz s3://${{ secrets.S3_BUCKET }}/java-cef-builds/${{ github.sha }}/windows_${{ matrix.platform }}.tar.gz + python D:\s3cmd\s3cmd-master\s3cmd put -P D:\a\java-cef\java-cef\jcef_build\windows_${{ matrix.platform }}.tar.gz.sha256 s3://${{ secrets.S3_BUCKET }}/java-cef-builds/${{ github.sha }}/windows_${{ matrix.platform }}.tar.gz.sha256 java-cef-macos: runs-on: [macos-12] strategy: @@ -91,5 +91,5 @@ jobs: run: echo "${{ secrets.S3_CFG }}" > ~/.s3cfg - name: Upload java-cef build run: | - s3cmd put -P /Users/runner/work/java-cef/java-cef/jcef_build/macos_${{ matrix.platform }}.tar.gz s3://mcef-us-1/java-cef-builds/${{ github.sha }}/macos_${{ matrix.platform }}.tar.gz - s3cmd put -P /Users/runner/work/java-cef/java-cef/jcef_build/macos_${{ matrix.platform }}.tar.gz.sha256 s3://mcef-us-1/java-cef-builds/${{ github.sha }}/macos_${{ matrix.platform }}.tar.gz.sha256 + s3cmd put -P /Users/runner/work/java-cef/java-cef/jcef_build/macos_${{ matrix.platform }}.tar.gz s3://${{ secrets.S3_BUCKET }}/java-cef-builds/${{ github.sha }}/macos_${{ matrix.platform }}.tar.gz + s3cmd put -P /Users/runner/work/java-cef/java-cef/jcef_build/macos_${{ matrix.platform }}.tar.gz.sha256 s3://${{ secrets.S3_BUCKET }}/java-cef-builds/${{ github.sha }}/macos_${{ matrix.platform }}.tar.gz.sha256 From c84aab96d22dff841070eb9f7975eafd68f5680e Mon Sep 17 00:00:00 2001 From: uTen2c Date: Mon, 1 Jan 2024 10:20:34 +0900 Subject: [PATCH 2/7] 120 fps --- native/CefBrowser_N.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/native/CefBrowser_N.cpp b/native/CefBrowser_N.cpp index f7f17cd8..0a3d2c03 100644 --- a/native/CefBrowser_N.cpp +++ b/native/CefBrowser_N.cpp @@ -933,6 +933,7 @@ void create(std::shared_ptr objs, CefBrowserSettings settings; + settings.windowless_frame_rate = 120; if (transparent == JNI_FALSE) { // Specify an opaque background color (white) to disable transparency. settings.background_color = CefColorSetARGB(255, 255, 255, 255); @@ -1385,6 +1386,7 @@ Java_org_cef_browser_CefBrowser_1N_N_1SetFocus(JNIEnv* env, jboolean enable) { CefRefPtr browser = JNI_GET_BROWSER_OR_RETURN(env, obj); browser->GetHost()->SetFocus(enable != JNI_FALSE); + browser->GetHost()->SetWindowlessFrameRate(120); } JNIEXPORT void JNICALL @@ -1392,6 +1394,7 @@ Java_org_cef_browser_CefBrowser_1N_N_1SetWindowVisibility(JNIEnv* env, jobject obj, jboolean visible) { CefRefPtr browser = JNI_GET_BROWSER_OR_RETURN(env, obj); + browser->GetHost()->SetWindowlessFrameRate(120); #if defined(OS_MACOSX) if (!browser->GetHost()->IsWindowRenderingDisabled()) { From f620a9acf7d49ad3502694785504b310ee390a64 Mon Sep 17 00:00:00 2001 From: uTen2c Date: Mon, 1 Jan 2024 10:28:11 +0900 Subject: [PATCH 3/7] 120 fps --- native/CefBrowser_N.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/native/CefBrowser_N.cpp b/native/CefBrowser_N.cpp index 0a3d2c03..313b1b93 100644 --- a/native/CefBrowser_N.cpp +++ b/native/CefBrowser_N.cpp @@ -1549,6 +1549,8 @@ Java_org_cef_browser_CefBrowser_1N_N_1WasResized(JNIEnv* env, } } #endif + + browser->GetHost()->SetWindowlessFrameRate(120); } JNIEXPORT void JNICALL From 79a39da8707b9ec241b3c3a1fe0266f1ee72b982 Mon Sep 17 00:00:00 2001 From: uTen2c Date: Mon, 1 Jan 2024 11:27:20 +0900 Subject: [PATCH 4/7] Update CI --- .github/workflows/build-jcef.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-jcef.yml b/.github/workflows/build-jcef.yml index 35ff070f..cacd9892 100644 --- a/.github/workflows/build-jcef.yml +++ b/.github/workflows/build-jcef.yml @@ -75,6 +75,9 @@ jobs: steps: - name: Upload mask run: echo "::add-mask::${{ secrets.UPLOAD_URL }}" + - uses: actions/setup-python@v5 + with: + python-version: '2.7.x' - uses: actions/checkout@v3 - run: | brew install ninja From ba1b05fde9b3e0b98d84d779dceb62e78a637b97 Mon Sep 17 00:00:00 2001 From: uTen2c Date: Mon, 1 Jan 2024 11:32:23 +0900 Subject: [PATCH 5/7] Update CI --- .github/workflows/build-jcef.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-jcef.yml b/.github/workflows/build-jcef.yml index cacd9892..5914f92e 100644 --- a/.github/workflows/build-jcef.yml +++ b/.github/workflows/build-jcef.yml @@ -75,9 +75,10 @@ jobs: steps: - name: Upload mask run: echo "::add-mask::${{ secrets.UPLOAD_URL }}" - - uses: actions/setup-python@v5 + - uses: MatteoH2O1999/setup-python@v2 with: - python-version: '2.7.x' + python-version: '2.7' + cache: pip - uses: actions/checkout@v3 - run: | brew install ninja From 6de6acd394c3c31af1ec36b92cacb01d438013c9 Mon Sep 17 00:00:00 2001 From: uTen2c Date: Mon, 1 Jan 2024 11:42:24 +0900 Subject: [PATCH 6/7] Update CI --- .github/workflows/build-jcef.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-jcef.yml b/.github/workflows/build-jcef.yml index 5914f92e..ab4f2161 100644 --- a/.github/workflows/build-jcef.yml +++ b/.github/workflows/build-jcef.yml @@ -75,11 +75,11 @@ jobs: steps: - name: Upload mask run: echo "::add-mask::${{ secrets.UPLOAD_URL }}" + - uses: actions/checkout@v3 - uses: MatteoH2O1999/setup-python@v2 with: python-version: '2.7' cache: pip - - uses: actions/checkout@v3 - run: | brew install ninja brew install coreutils From f7caffa0911d288f6b945fa8f9a34577ba56ff5b Mon Sep 17 00:00:00 2001 From: uTen2c Date: Mon, 1 Jan 2024 11:52:44 +0900 Subject: [PATCH 7/7] Update CI --- .github/workflows/build-jcef.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-jcef.yml b/.github/workflows/build-jcef.yml index ab4f2161..d9d606d1 100644 --- a/.github/workflows/build-jcef.yml +++ b/.github/workflows/build-jcef.yml @@ -79,7 +79,6 @@ jobs: - uses: MatteoH2O1999/setup-python@v2 with: python-version: '2.7' - cache: pip - run: | brew install ninja brew install coreutils