diff options
| author |  Joe Gregorio <jcgregorio@google.com> | 2018-05-18 09:02:48 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-18 14:10:14 +0000 |
| commit | 26171e8927008f90c29d55b19a241ad541b40d3d (patch) | |
| tree | 17688f68afeddb3234515e2473b88579a9df8f6e /tools/skiaserve | |
| parent | 4f3ad4e2d1ebfbdec52f976c765691eafd55bcb9 (diff) | |
[skiaserver] Start loading html/css/js from https://debugger-assets.skia.org.
Also clean up quoting and fix a hard-coded URL to https://debugger.skia.org.
Bug: skia:
Change-Id: I31283f3769c81a138d82c03214f005c7fb82c5b2
Reviewed-on: https://skia-review.googlesource.com/129164
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Diffstat (limited to 'tools/skiaserve')
| -rw-r--r-- | tools/skiaserve/Response.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/skiaserve/Response.cpp b/tools/skiaserve/Response.cpp index 61470f122a..ca13b4e5ae 100644 --- a/tools/skiaserve/Response.cpp +++ b/tools/skiaserve/Response.cpp @@ -15,7 +15,7 @@ #include "SkData.h" #include "SkString.h" -DEFINE_string(source, "https://debugger.skia.org", "Where to load the web UI from."); +DEFINE_string(source, "https://debugger-assets.skia.org", "Where to load the web UI from."); static SkString generate_template(SkString source) { SkString debuggerTemplate; @@ -24,18 +24,18 @@ static SkString generate_template(SkString source) { "<html>\n" "<head>\n" " <title>SkDebugger</title>\n" - " <meta charset=\"utf-8\" />\n" - " <meta http-equiv=\"X-UA-Compatible\" content=\"IE=egde,chrome=1\">\n" - " <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n" - " <script src=\"%s/res/js/core.js\" type=\"text/javascript\" charset=\"utf-8\"></script>\n" - " <link href=\"%s/res/vul/elements.html\" rel=\"import\" />\n" - " <link rel='shortcut icon' href='https://debugger.skia.org/res/img/favicon.ico' type='image/x-icon'/ >" + " <meta charset='utf-8' />\n" + " <meta http-equiv='X-UA-Compatible' content='IE=egde,chrome=1'>\n" + " <meta name='viewport' content='width=device-width, initial-scale=1.0'>\n" + " <script src='%s/res/js/core.js' type='text/javascript' charset='utf-8'></script>\n" + " <link href='%s/res/vul/elements.html' rel='import' />\n" + " <link rel='shortcut icon' href='%s/res/img/favicon.ico' type='image/x-icon'/ >" "</head>\n" - "<body class=\"fullbleed layout vertical\">\n" + "<body class='fullbleed layout vertical'>\n" " <debugger-app-sk>This is the app." " </debugger-app-sk>\n" "</body>\n" - "</html>", source.c_str(), source.c_str()); + "</html>", source.c_str(), source.c_str(), source.c_str()); return debuggerTemplate; } |