[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Close page before closing the browser

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394623 )

Change subject: Close page before closing the browser
......................................................................

Close page before closing the browser

This may prevent memory leaks.

Change-Id: Ic38bbd725931403c4f04cfdbfdc59859e8174794
---
M lib/renderer.js
1 file changed, 19 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render 
refs/changes/23/394623/1

diff --git a/lib/renderer.js b/lib/renderer.js
index 1809e78..148ae3b 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -10,16 +10,25 @@
 module.exports = class Renderer {
     constructor() {
         this._browser = null;
+        this._page = null;
         this._renderAborted = false;
     }
 
     /**
-     * Closes any open browser instance
+     * Close page and browser instances
      */
-    _closeBrowser() {
-        if (this._browser) {
-            this._browser.close();
-            this._browser = null;
+    _cleanup() {
+        let page = this._page;
+        let browser = this._browser;
+
+        if (page) {
+            page.close().then(() => {
+                if (browser) {
+                    browser.close();
+                    browser = null;
+                }
+                page = null;
+            });
         }
     }
 
@@ -43,8 +52,8 @@
                 that._browser = browser;
                 return browser.newPage();
             })
-            .then((page_) => {
-                page = page_;
+            .then((page) => {
+                that._page = page;
                 return page.goto(url, { waitUntil: 'networkidle2' });
             })
             .then(() => {
@@ -53,12 +62,12 @@
             .catch((error) => {
                 // Only thrown an error if we didn't close the browser 
ourselves
                 if (!this._renderAborted) {
-                    that._closeBrowser();
+                    that._cleanup();
                     throw error;
                 }
             })
             .then((pdf) => {
-                that._closeBrowser();
+                that._cleanup();
                 return pdf;
             });
     }
@@ -68,7 +77,7 @@
      * Should be called after calling articleToPdf
      */
     abortRender() {
-        this._closeBrowser();
+        this._cleanup();
         this._renderAborted = true;
     }
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/394623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic38bbd725931403c4f04cfdbfdc59859e8174794
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits