Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(785)

Unified Diff: components/dom_distiller/core/javascript/domdistiller.js

Issue 995343002: Integrate iOS specific changes in the core domdistiller.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/dom_distiller/ios/javascript/domdistiller.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/dom_distiller/core/javascript/domdistiller.js
diff --git a/components/dom_distiller/core/javascript/domdistiller.js b/components/dom_distiller/core/javascript/domdistiller.js
index 8bf3d8c945254caf12fe14378e3e08ea88ab5c8a..8f010d9d64b55e6f5dece729d2bbd8c5339161ef 100644
--- a/components/dom_distiller/core/javascript/domdistiller.js
+++ b/components/dom_distiller/core/javascript/domdistiller.js
@@ -14,7 +14,16 @@
// This include will be processed at build time by grit.
<include src="../../../../third_party/dom_distiller_js/package/js/domdistiller.js"/>
}
- var context = Object.create(window);
+ <if expr="is_ios">
+ // UIWebView's JavaScript engine has a bug that causes crashes when
+ // creating a separate window object, so allow the script to run directly
+ // in the window until a better solution is created.
+ // TODO(kkhorimoto): investigate whether this is necessary for WKWebView.
+ var context = window;
+ </if>
+ <if expr="not is_ios">
+ var context = Object.create(window);
+ </if>
context.setTimeout = function() {};
context.clearTimeout = function() {};
initialize(context);
@@ -23,7 +32,13 @@
// runtime.
var distiller = context.org.chromium.distiller.DomDistiller;
var res = distiller.applyWithOptions($$OPTIONS);
+ <if expr="is_ios">
+ // UIWebView requires javascript to return a single string value.
+ return JSON.stringify(res);
+ </if>
+ <if expr="not is_ios">
return res;
+ </if>
} catch (e) {
window.console.error("Error during distillation: " + e);
if (e.stack != undefined) window.console.error(e.stack);
« no previous file with comments | « no previous file | components/dom_distiller/ios/javascript/domdistiller.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698