diff --git a/gm/text_scale_skew.cpp b/gm/text_scale_skew.cpp
new file mode 100644
index 0000000000..31b6e0359b
--- /dev/null
+++ b/gm/text_scale_skew.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm.h"
+
+// http://bug.skia.org/7315
+DEF_SIMPLE_GM(text_scale_skew, canvas, 256, 128) {
+    SkPaint p;
+    p.setTextSize(18.0f);
+    p.setAntiAlias(true);
+    p.setTextAlign(SkPaint::kCenter_Align);
+    float y = 10.0f;
+    for (float scale : { 0.5f, 0.71f, 1.0f, 1.41f, 2.0f }) {
+        p.setTextScaleX(scale);
+        y += p.getFontSpacing();
+        float x = 50.0f;
+        for (float skew : { -0.5f, 0.0f, 0.5f }) {
+            p.setTextSkewX(skew);
+            canvas->drawString("Skia", x, y, p);
+            x += 78.0f;
+        }
+    }
+}
diff --git a/gn/gm.gni b/gn/gm.gni
index ad542fb976..6892406edb 100644
--- a/gn/gm.gni
+++ b/gn/gm.gni
@@ -306,6 +306,7 @@ gm_sources = [
   "$_gm/textblobtransforms.cpp",
   "$_gm/textblobuseaftergpufree.cpp",
   "$_gm/texteffects.cpp",
+  "$_gm/text_scale_skew.cpp",
   "$_gm/texturedomaineffect.cpp",
   "$_gm/thinconcavepaths.cpp",
   "$_gm/thinrects.cpp",
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 10ec6911a2..aae792bb8b 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -414,7 +414,7 @@ void GraphicStackState::updateDrawingState(const SkPDFDevice::GraphicStateEntry&
 
     if (state.fTextScaleX) {
         if (state.fTextScaleX != currentEntry()->fTextScaleX) {
-            SkScalar pdfScale = state.fTextScaleX * 1000;
+            SkScalar pdfScale = state.fTextScaleX * 100;
             SkPDFUtils::AppendScalar(pdfScale, fContentStream);
             fContentStream->writeText(" Tz\n");
             currentEntry()->fTextScaleX = state.fTextScaleX;