opendev/gerrit
Code Issues Proposed changes

Defer our large JavaScript parsing until later

Browse Source 
The host page data doesn't have to be on the page until after the
rest of the UI on the page has been able to be created.  Move it
to the end of the page and mark it defer so the browser can avoid
running this large block of JavaScript until the other UI has had
a chance to layout.

Change-Id: Id7f70092a428961c937bf03001905470bdda9f3a
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-12-19 20:23:48 -08:00
parent 21a846b87c
commit 4811392146
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java
View File

@@ -74,9 +74,9 @@ public class HostPageServlet extends HttpServlet {
if (devmode != null) {
devmode.getParentNode().removeChild(devmode);
}
fixModuleReference(hostDoc, servletContext);
}
fixModuleReference(hostDoc, servletContext);
injectCssFile(hostDoc, "gerrit_sitecss", site.site_css);
injectXmlFile(hostDoc, "gerrit_header", site.site_header);
injectXmlFile(hostDoc, "gerrit_footer", site.site_footer);
@@ -147,10 +147,14 @@ public class HostPageServlet extends HttpServlet {
w.write("_obj=");
JsonServlet.defaultGsonBuilder().create().toJson(obj, w);
w.write(";\n// -->\n");
asScript(scriptNode);
scriptNode.appendChild(hostDoc.createCDATASection(w.toString()));
}
private void asScript(final Element scriptNode) {
scriptNode.removeAttribute("id");
scriptNode.setAttribute("type", "text/javascript");
scriptNode.setAttribute("language", "javascript");
scriptNode.appendChild(hostDoc.createCDATASection(w.toString()));
}
private void fixModuleReference(final Document hostDoc,
@@ -159,31 +163,33 @@ public class HostPageServlet extends HttpServlet {
if (scriptNode == null) {
throw new IOException("No gerrit_module to rewrite in host document");
}
scriptNode.removeAttribute("id");
final String src = scriptNode.getAttribute("src");
InputStream in = servletContext.getResourceAsStream("/" + src);
if (in == null) {
throw new IOException("No " + src + " in webapp root");
}
final MessageDigest md = Constants.newMessageDigest();
try {
try {
final byte[] buf = new byte[1024];
int n;
while ((n = in.read(buf)) > 0) {
md.update(buf, 0, n);
}
} finally {
in.close();
String src = "gerrit/gerrit.nocache.js";
if (!IS_DEV) {
InputStream in = servletContext.getResourceAsStream("/" + src);
if (in == null) {
throw new IOException("No " + src + " in webapp root");
}
} catch (IOException e) {
throw new IOException("Failed reading " + src, e);
}
final String vstr = ObjectId.fromRaw(md.digest()).name();
scriptNode.setAttribute("src", src + "?content=" + vstr);
final MessageDigest md = Constants.newMessageDigest();
try {
try {
final byte[] buf = new byte[1024];
int n;
while ((n = in.read(buf)) > 0) {
md.update(buf, 0, n);
}
} finally {
in.close();
}
} catch (IOException e) {
throw new IOException("Failed reading " + src, e);
}
src += "?content=" + ObjectId.fromRaw(md.digest()).name();
}
scriptNode.setAttribute("src", src);
asScript(scriptNode);
}
@Override

4
gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/HostPage.html
View File

@@ -30,8 +30,8 @@
}
})();
</script>
<script id="gerrit_hostpagedata"></script>
<script id="gerrit_module" type="text/javascript" language="javascript" src="gerrit/gerrit.nocache.js"></script>
<script id="gerrit_hostpagedata" defer="defer"></script>
<script id="gerrit_module" defer="defer"></script>
<script src="prettify/20090521.js" type="text/javascript" language="javascript" defer="true"></script>
<style id="gerrit_sitecss" type="text/css"></style>
<link rel="icon" type="image/gif" href="favicon.ico" />