In the generated fiddle, set the portable fonts flag first.

BUG=skia:
TBR=jcgregorio

Review URL: https://codereview.chromium.org/635373002

2 files changed, 5 insertions, 3 deletions

diff --git a/experimental/webtry/build b/experimental/webtry/build
index ace33b1e0b..0dc6b639fb 100755
--- a/experimental/webtry/build
+++ b/experimental/webtry/build
@@ -20,6 +20,7 @@ cd ${SKIA_ROOT}/include
 echo "Creating compile template..."
 find core effects pathops  -maxdepth 1 -name "*.h" | sed "s/.*\///" | sed "s/\(.*\)/#include \"\1\"/" | sort > ${WEBTRY_ROOT}/templates/template.cpp
 echo '#include "sk_tool_utils.h"' >> ${WEBTRY_ROOT}/templates/template.cpp
+echo '#include "SkCommandLineFlags.h"' >> ${WEBTRY_ROOT}/templates/template.cpp
 echo '' >> ${WEBTRY_ROOT}/templates/template.cpp
 echo "SkBitmap source;" >> ${WEBTRY_ROOT}/templates/template.cpp
 echo "{{.Code}}" >> ${WEBTRY_ROOT}/templates/template.cpp
diff --git a/experimental/webtry/webtry.go b/experimental/webtry/webtry.go
index 36c7afe5db..947eca7aa0 100644
--- a/experimental/webtry/webtry.go
+++ b/experimental/webtry/webtry.go
@@ -372,11 +372,12 @@ func expandCode(code string, source int) (string, error) {
 	// TODO(humper):  Make this more robust, supporting things like setTypeface
 
 	inputCodeLines := strings.Split(code, "\n")
-	outputCodeLines := []string{}
+	outputCodeLines := []string{"DECLARE_bool(portableFonts);"}
 	for _, line := range inputCodeLines {
 		outputCodeLines = append(outputCodeLines, line)
-		if strings.HasPrefix(strings.TrimSpace(line), "SkPaint ") {
-			outputCodeLines = append(outputCodeLines, "sk_tool_utils::set_portable_typeface(&p);")
+		if strings.HasPrefix(strings.TrimSpace(line), "SkPaint p") {
+			outputCodeLines = append(outputCodeLines, "FLAGS_portableFonts = true;")
+			outputCodeLines = append(outputCodeLines, "sk_tool_utils::set_portable_typeface(&p, \"Helvetica\", SkTypeface::kNormal);")
 		}
 	}