mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge pull request #521 from sharelatex/bg-reduce-pdf-memory-usage
Revert "use a single pdfjs worker, rotated to avoid leaks"
This commit is contained in:
commit
e1efc3a7b5
1 changed files with 2 additions and 20 deletions
|
@ -6,22 +6,6 @@ define [
|
|||
|
||||
App.factory 'PDFRenderer', ['$q', '$timeout', 'pdfAnnotations', 'pdfTextLayer', 'pdfSpinner', ($q, $timeout, pdfAnnotations, pdfTextLayer, pdfSpinner) ->
|
||||
|
||||
# Have a single worker used by all rendering, to avoid reloading
|
||||
RenderThread = { worker: null, count: 0}
|
||||
|
||||
getRenderThread = () ->
|
||||
if RenderThread.count > 16 # recycle the worker periodically to avoid leaks
|
||||
RenderThread.readyToDestroy = true
|
||||
RenderThread = { worker: null, count: 0 }
|
||||
RenderThread.worker ||= new PDFJS.PDFWorker('pdfjsworker')
|
||||
RenderThread.count++
|
||||
return RenderThread
|
||||
|
||||
resetWorker = (thread) ->
|
||||
thread.worker.destroy() if thread.readyToDestroy
|
||||
|
||||
# The PDF page renderer
|
||||
|
||||
class PDFRenderer
|
||||
JOB_QUEUE_INTERVAL: 25
|
||||
PAGE_LOAD_TIMEOUT: 60*1000
|
||||
|
@ -43,8 +27,7 @@ define [
|
|||
# PDFJS.disableStream
|
||||
# PDFJS.disableRange
|
||||
@scale = @options.scale || 1
|
||||
@thread = getRenderThread()
|
||||
@pdfjs = PDFJS.getDocument {url: @url, rangeChunkSize: 2*65536, worker: @thread.worker}
|
||||
@pdfjs = PDFJS.getDocument {url: @url, rangeChunkSize: 2*65536}
|
||||
@pdfjs.onProgress = @options.progressCallback
|
||||
@document = $q.when(@pdfjs)
|
||||
@navigateFn = @options.navigateFn
|
||||
|
@ -353,9 +336,8 @@ define [
|
|||
destroy: () ->
|
||||
@shuttingDown = true
|
||||
@resetState()
|
||||
@pdfjs.then (document) =>
|
||||
@pdfjs.then (document) ->
|
||||
document.cleanup()
|
||||
document.destroy()
|
||||
resetWorker(@thread)
|
||||
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue