aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2018-06-18 14:24:44 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-18 19:15:48 +0000
commit1c477fc263cf37c27cd92740d9328445420a926d (patch)
tree646d1276502c26a9fb8296e4b08e9b7721fae10a
parentc00d8627ff8adbc9ba49ab6fcbc356c6db9ffb84 (diff)
Remove old references to SampleApp
Docs-Preview: https://skia.org/?cl=135570 Change-Id: I330ffa964c2d90ca8d3cd844aabcd8616ccd0540 Reviewed-on: https://skia-review.googlesource.com/135570 Reviewed-by: Cary Clark <caryclark@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
-rw-r--r--.gitignore1
-rw-r--r--gm/image.h14
-rw-r--r--site/dev/contrib/submit.md7
-rw-r--r--site/dev/testing/tests.md6
-rw-r--r--site/user/api/skcanvas_creation.md2
-rw-r--r--site/user/special/lua.md2
-rw-r--r--src/core/SkStrokeRec.cpp2
7 files changed, 9 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
index cb51cb284a..77f711db2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ platform_tools/android/apps/build
platform_tools/android/apps/*.properties
platform_tools/android/apps/*/build
platform_tools/android/apps/*/src/main/libs
-sampleapp_prefs.txt
/skps
third_party/externals
tools/skp/page_sets/data/*.json
diff --git a/gm/image.h b/gm/image.h
deleted file mode 100644
index 25711be61d..0000000000
--- a/gm/image.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// image.h
-// SampleApp
-//
-// Created by Mike Reed on 7/27/12.
-//
-//
-
-#ifndef __SampleApp__image__
-#define __SampleApp__image__
-
-#include <iostream>
-
-#endif /* defined(__SampleApp__image__) */
diff --git a/site/dev/contrib/submit.md b/site/dev/contrib/submit.md
index 1d36e1f9d7..6627546b61 100644
--- a/site/dev/contrib/submit.md
+++ b/site/dev/contrib/submit.md
@@ -45,10 +45,9 @@ Test code is located under the 'tests' directory.
See [Writing Unit and Rendering Tests](../testing/tests) for details.
Unit tests are best, but if your change touches rendering and you can't think of
-an automated way to verify the results, consider writing a GM test or a new page
-of SampleApp. Also, if your change is the GPU code, you may not be able to write
-it as part of the standard unit test suite, but there are GPU-specific testing
-paths you can extend.
+an automated way to verify the results, consider writing a GM test. Also, if your
+change is in the GPU code, you may not be able to write it as part of the standard
+unit test suite, but there are GPU-specific testing paths you can extend.
Submitting a patch
------------------
diff --git a/site/dev/testing/tests.md b/site/dev/testing/tests.md
index c24a1731e0..d9c0798b6c 100644
--- a/site/dev/testing/tests.md
+++ b/site/dev/testing/tests.md
@@ -78,12 +78,12 @@ Writing a Rendering Test
ninja -C out/Debug dm
out/Debug/dm --match newgmtest
-4. Run the GM inside SampleApp:
+4. Run the GM inside Viewer:
<!--?prettify lang=sh?-->
- ninja -C out/Debug SampleApp
- out/Debug/SampleApp --slide GM:newgmtest
+ ninja -C out/Debug viewer
+ out/Debug/viewer --slide GM_newgmtest
<span id="bench"></span>
diff --git a/site/user/api/skcanvas_creation.md b/site/user/api/skcanvas_creation.md
index 4055923904..de54dd9bbf 100644
--- a/site/user/api/skcanvas_creation.md
+++ b/site/user/api/skcanvas_creation.md
@@ -158,7 +158,7 @@ The SkPicture backend uses SkPictureRecorder instead of SkSurface.
draw(recordingCanvas);
sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
SkFILEWStream skpStream(path);
- // Open SKP files with `SampleApp --picture SKP_FILE`
+ // Open SKP files with `viewer --skps PATH_TO_SKP --slide SKP_FILE`
picture->serialize(&skpStream);
}
diff --git a/site/user/special/lua.md b/site/user/special/lua.md
index b8a9cd5c9b..9798273ca9 100644
--- a/site/user/special/lua.md
+++ b/site/user/special/lua.md
@@ -21,7 +21,7 @@ Try It Out
----------
The tools `lua_app` and `lua_pictures` should now be available when you compile,
-and `SampleApp` should now have a `Lua` sample.
+and `Viewer` should now have a `Lua` sample.
To-Do
diff --git a/src/core/SkStrokeRec.cpp b/src/core/SkStrokeRec.cpp
index 7e667bc668..1b4007cd83 100644
--- a/src/core/SkStrokeRec.cpp
+++ b/src/core/SkStrokeRec.cpp
@@ -97,7 +97,7 @@ void SkStrokeRec::setStrokeStyle(SkScalar width, bool strokeAndFill) {
#include "SkStroke.h"
#ifdef SK_DEBUG
- // enables tweaking these values at runtime from SampleApp
+ // enables tweaking these values at runtime from Viewer
bool gDebugStrokerErrorSet = false;
SkScalar gDebugStrokerError;
#endif