diff --git a/.github/workflows/build-jcef.yml b/.github/workflows/build-jcef.yml index 95349ce3..d9d606d1 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: @@ -76,6 +76,9 @@ jobs: - name: Upload mask run: echo "::add-mask::${{ secrets.UPLOAD_URL }}" - uses: actions/checkout@v3 + - uses: MatteoH2O1999/setup-python@v2 + with: + python-version: '2.7' - run: | brew install ninja brew install coreutils @@ -91,5 +94,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 diff --git a/native/CefBrowser_N.cpp b/native/CefBrowser_N.cpp index f7f17cd8..313b1b93 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()) { @@ -1546,6 +1549,8 @@ Java_org_cef_browser_CefBrowser_1N_N_1WasResized(JNIEnv* env, } } #endif + + browser->GetHost()->SetWindowlessFrameRate(120); } JNIEXPORT void JNICALL