-
Notifications
You must be signed in to change notification settings - Fork 449
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4780 from nextcloud/backport/4678/stable20
[stable20] Fix Chromium performance hit in calls due to blur filter
- Loading branch information
Showing
8 changed files
with
273 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/** | ||
* | ||
* @copyright Copyright (c) 2020, Daniel Calviño Sánchez (danxuliu@gmail.com) | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
import { generateFilePath } from '@nextcloud/router' | ||
|
||
const worker = new Worker(generateFilePath('spreed', '', 'js/image-blurrer-worker.js')) | ||
|
||
const pendingResults = {} | ||
let pendingResultsNextId = 0 | ||
|
||
worker.onmessage = function(message) { | ||
const pendingResult = pendingResults[message.data.id] | ||
if (!pendingResult) { | ||
console.debug('No pending result for blurring image with id ' + message.data.id) | ||
|
||
return | ||
} | ||
|
||
pendingResult(message.data.blurredImageAsDataUrl) | ||
|
||
delete pendingResults[message.data.id] | ||
} | ||
|
||
function blurSync(image, width, height, blurRadius) { | ||
return new Promise((resolve, reject) => { | ||
const canvas = document.createElement('canvas') | ||
canvas.width = width | ||
canvas.height = height | ||
|
||
const context = canvas.getContext('2d') | ||
context.filter = `blur(${blurRadius}px)` | ||
context.drawImage(image, 0, 0, canvas.width, canvas.height) | ||
|
||
resolve(canvas.toDataURL()) | ||
}) | ||
} | ||
|
||
export default function blur(image, width, height, blurRadius) { | ||
if (typeof OffscreenCanvas === 'undefined') { | ||
return blurSync(image, width, height, blurRadius) | ||
} | ||
|
||
const id = pendingResultsNextId | ||
|
||
pendingResultsNextId++ | ||
|
||
return new Promise((resolve, reject) => { | ||
pendingResults[id] = resolve | ||
|
||
worker.postMessage({ | ||
id: id, | ||
image: image, | ||
width: width, | ||
height: height, | ||
blurRadius: blurRadius, | ||
}) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/** | ||
* | ||
* @copyright Copyright (c) 2020, Daniel Calviño Sánchez (danxuliu@gmail.com) | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
|
||
const fileReaderSync = new global.FileReaderSync() | ||
|
||
onmessage = function(message) { | ||
const offscreenCanvas = new OffscreenCanvas(message.data.width, message.data.height) | ||
|
||
const context = offscreenCanvas.getContext('2d') | ||
context.filter = `blur(${message.data.blurRadius}px)` | ||
context.drawImage(message.data.image, 0, 0, offscreenCanvas.width, offscreenCanvas.height) | ||
|
||
offscreenCanvas.convertToBlob().then(blob => { | ||
postMessage({ | ||
id: message.data.id, | ||
blurredImageAsDataUrl: fileReaderSync.readAsDataURL(blob), | ||
}) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters