WIP: do not download resources separately

.eslintrc.js

@@ -25,6 +25,7 @@ module.exports = {
         "adapt": false,
         "goog": false,
         "vivliostyle": false,
+        "resources": false,
         "DataView": false
     },
     // "extends": "eslint:recommended",

src/adapt/cssvalid.js

@@ -28,6 +28,7 @@ goog.require('adapt.css');
 goog.require('adapt.csstok');
 goog.require('adapt.cssparse');
 goog.require('adapt.expr');
+goog.require('resources.txt');
 
 /**
  * @interface
@@ -2220,33 +2221,12 @@ adapt.cssvalid.ValidatorSet.prototype.validatePropertyAndHandleShorthand =
         }
     };
 
-
 /**
- * @type {adapt.taskutil.Fetcher.<adapt.cssvalid.ValidatorSet>}
- */
-adapt.cssvalid.validatorFetcher = new adapt.taskutil.Fetcher(() => {
-    /** @type {!adapt.task.Frame.<adapt.cssvalid.ValidatorSet>} */ const frame =
-        adapt.task.newFrame("loadValidatorSet.load");
-    const url = adapt.base.resolveURL("validation.txt", adapt.base.resourceBaseURL);
-    const result = adapt.net.ajax(url);
+* @return {adapt.cssvalid.ValidatorSet}
+*/
+adapt.cssvalid.baseValidatorSet = function() {
     const validatorSet = new adapt.cssvalid.ValidatorSet();
     validatorSet.initBuiltInValidators();
-    result.then(xhr => {
-        try {
-            if (xhr.responseText) {
-                validatorSet.parse(xhr.responseText);
-            } else {
-                vivliostyle.logging.logger.error("Error: missing", url);
-            }
-        } catch (err) {
-            vivliostyle.logging.logger.error(err, "Error:");
-        }
-        frame.finish(validatorSet);
-    });
-    return frame.result();
-}, "validatorFetcher");
-
-/**
- * @return {!adapt.task.Result.<adapt.cssvalid.ValidatorSet>}
- */
-adapt.cssvalid.loadValidatorSet = () => adapt.cssvalid.validatorFetcher.get();
+    validatorSet.parse(resources.txt.validation);
+    return validatorSet;
+};

src/adapt/ops.js

@@ -43,21 +43,22 @@ goog.require('adapt.font');
 goog.require('vivliostyle.break');
 goog.require('vivliostyle.page');
 goog.require('vivliostyle.column');
+goog.require('resources.css');
+goog.require('resources.xml');
 
 /**
  * @type {adapt.taskutil.Fetcher.<boolean>}
  */
 adapt.ops.uaStylesheetBaseFetcher = new adapt.taskutil.Fetcher(() => {
-    /** @type {!adapt.task.Frame.<boolean>} */ const frame =
-        adapt.task.newFrame("uaStylesheetBase");
-    adapt.cssvalid.loadValidatorSet().then(validatorSet => {
-        const url = adapt.base.resolveURL("user-agent-base.css", adapt.base.resourceBaseURL);
-        const handler = new adapt.csscasc.CascadeParserHandler(null, null, null, null, null,
-            validatorSet, true);
-        handler.startStylesheet(adapt.cssparse.StylesheetFlavor.USER_AGENT);
-        adapt.csscasc.uaBaseCascade = handler.cascade;
-        adapt.cssparse.parseStylesheetFromURL(url, handler, null, null).thenFinish(frame);
-    });
+    /** @type {!adapt.task.Frame.<boolean>} */
+    const frame = adapt.task.newFrame("uaStylesheetBase");
+    const validatorSet = adapt.cssvalid.baseValidatorSet();
+    const url = adapt.base.resolveURL("user-agent-base.css", adapt.base.resourceBaseURL);
+    const handler = new adapt.csscasc.CascadeParserHandler(null, null, null, null, null,
+        validatorSet, true);
+    handler.startStylesheet(adapt.cssparse.StylesheetFlavor.USER_AGENT);
+    adapt.csscasc.uaBaseCascade = handler.cascade;
+    adapt.cssparse.parseStylesheetFromText(resources.css.userAgentBase, handler, url, null, null).thenFinish(frame);
     return frame.result();
 }, "uaStylesheetBaseFetcher");
 
@@ -1569,15 +1570,11 @@ adapt.ops.OPSDocStore.prototype.init = function(authorStyleSheets, userStyleShee
     this.setStyleSheets(authorStyleSheets, userStyleSheets);
     const userAgentXML = adapt.base.resolveURL("user-agent.xml", adapt.base.resourceBaseURL);
     const frame = adapt.task.newFrame("OPSDocStore.init");
-    const self = this;
-    adapt.cssvalid.loadValidatorSet().then(validatorSet => {
-        self.validatorSet = validatorSet;
-        adapt.ops.loadUABase().then(() => {
-            self.load(userAgentXML).then(() => {
-                self.triggerSingleDocumentPreprocessing = true;
-                frame.finish(true);
-            });
-        });
+    this.validatorSet = adapt.cssvalid.baseValidatorSet();
+    adapt.ops.loadUABase().then(() => {
+        this.resources[userAgentXML] = resources.xml.userAgent;
+        this.triggerSingleDocumentPreprocessing = true;
+        frame.finish(true);
     });
     return frame.result();
 };
@@ -1683,7 +1680,7 @@ adapt.ops.OPSDocStore.prototype.parseOPSResource = function(response) {
         self.triggersByDocURL[url] = triggers;
         const sources = /** @type {Array.<adapt.ops.StyleSource>} */ ([]);
         const userAgentURL = adapt.base.resolveURL("user-agent-page.css", adapt.base.resourceBaseURL);
-        sources.push({url: userAgentURL, text:null,
+        sources.push({url: userAgentURL, text: resources.css.userAgentPage,
             flavor:adapt.cssparse.StylesheetFlavor.USER_AGENT, classes: null, media: null});
         const head = xmldoc.head;
         if (head) {

src/adapt/vgen.js

@@ -457,6 +457,9 @@ adapt.vgen.ViewFactory.prototype.createShadows = function(element, isRoot, cascS
         cont1.then(shadow => {
             if (computedStyle["display"] === adapt.css.ident.table_cell) {
                 const url = adapt.base.resolveURL("user-agent.xml#table-cell", adapt.base.resourceBaseURL);
+                // FIXME:
+                // What we need here is '<s:template id="table-cell"><div data-vivliostyle-flow-root="true" class="table-cell-container"><s:content/></div></s:template>'
+                // I'm not sure how I can avoid it downloading from the web.
                 cont2 = self.createRefShadow(url, adapt.vtree.ShadowType.ROOTLESS, element, shadowContext, shadow);
             } else {
                 cont2 = adapt.task.newResult(shadow);