commit a479aa1366734f80360a00e3020f5b148cb3c060
author zachr@google.com <zachr@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 02 15:54:30 2013 +0000
committer zachr@google.com <zachr@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Aug 02 15:54:30 2013 +0000
tree 45f634109d0ed6d430f5fbbb80ce4a3b15aca797
parent 89066e5cd50b81d3703b449bea242aac70833211

fix skpdiff viewer bug when using relative paths

BUG=skia:1463
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10515 2bbb7eff-a529-9590-31e7-b0007b416f81

tools/skpdiff/SkDiffContext.cpp

diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp
index cf2654a..f551ff3 100644
--- a/tools/skpdiff/SkDiffContext.cpp
+++ b/tools/skpdiff/SkDiffContext.cpp
@@ -164,12 +164,15 @@
     while (NULL != currentRecord) {
         stream.writeText("        {\n");
 
+            SkString baselineAbsPath = get_absolute_path(currentRecord->fBaselinePath);
+            SkString testAbsPath = get_absolute_path(currentRecord->fTestPath);
+
             stream.writeText("            \"baselinePath\": \"");
-            stream.writeText(currentRecord->fBaselinePath.c_str());
+            stream.writeText(baselineAbsPath.c_str());
             stream.writeText("\",\n");
 
             stream.writeText("            \"testPath\": \"");
-            stream.writeText(currentRecord->fTestPath.c_str());
+            stream.writeText(testAbsPath.c_str());
             stream.writeText("\",\n");
 
             stream.writeText("            \"diffs\": [\n");