commit 4d1955c43aaab045511b74a495dfbea4ef0057c5
author Ben Wagner <bungeman@google.com> Fri Mar 10 13:08:15 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 10 19:58:46 2017 +0000
tree 23d0f457f69b98bde35dc9a3afa32451ee5f6694
parent dc9f0dbe4cdcdf6fead5fc28532d58f7d998a447

Fix SkFILEStream.

Change-Id: I8c66e4e3e857227aed3d0bc497982f4c0d96d917
Reviewed-on: https://skia-review.googlesource.com/9498
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

tests/PathOpsExtendedTest.cpp

diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index 279faa4..8f24adf 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -616,7 +616,7 @@
             inData.setCount((int) inFile.getLength());
             size_t inLen = inData.count();
             inFile.read(inData.begin(), inLen);
-            inFile.setPath(nullptr);
+            inFile.close();
             char* insert = strstr(inData.begin(), marker);
             if (insert) {
                 insert += sizeof(marker) - 1;

tests/StreamTest.cpp

diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index fba09c9..2e476a1 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -69,7 +69,7 @@
 
     {
         FILE* file = ::fopen(path.c_str(), "rb");
-        SkFILEStream stream(file, SkFILEStream::kCallerPasses_Ownership);
+        SkFILEStream stream(file);
         REPORTER_ASSERT(reporter, stream.isValid());
         test_loop_stream(reporter, &stream, s, 26, 100);