commit fb4b77f2c73594fad564d0f41d4d300db4a86b46
author Ben Wagner <bungeman@google.com> Fri Mar 10 13:08:15 2017 -0500
committer android-build-team Robot <android-build-team-robot@google.com> Fri Nov 03 21:16:45 2017 +0000
tree efd439721338bb1c738575ce58ea937faebcbec4
parent cdcc0efc89704fb693fa3c8908b92eac97496d2b

Fix SkFILEStream.

Cherry-picked from upstream Skia:
4d1955c43aaab045511b74a495dfbea4ef0057c5

Differences:
- include <memory> instead of <memory.h>, to compile.
- re-include "SkString.h", so we don't have to fix downstream
  clients that do not IWYU.
- Stop building SkRTConf and its test. SkRTConf uses code that
  this patch deletes in SkOSFile. SkRTConf itself is deleted in
  upstream's 4e44efe50474d4eebcb30b762e784b3ef2126750. For
  simplicity in cherry-picking further back this CL does not
  delete the code, but simply disables it by not building it.
  (It is only used if SK_DEVELOPER is defined anyway, which
  is not the case on Android.)

Bug: 65646012
Bug: 65426286
Test: I863385d797d7a6c54e37904b4f023ff694e01785

(Original) Change-Id: I8c66e4e3e857227aed3d0bc497982f4c0d96d917
Merged-In: I220ec2e2e83f4a002846e89dce855ed5926ca4a1
Merged-In: Ia36e16282eaf294709ce41f57a0f40fe887c1546
Merged-In: Ief1b80a012affeda2068b70405ab1a9f08b36867
Reviewed-on: https://skia-review.googlesource.com/9498
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

Conflicts:
    include/core/SkStream.h
    src/core/SkStream.cpp
    src/pdf/SkPDFConvertType1FontStream.cpp
    src/ports/SkImageEncoder_WIC.cpp
    src/utils/SkShadowUtils.cpp

Change-Id: Ib7aaf367f68f8764147887d858f65ee14fa7a1d9

Exempt-From-Owner-Approval: I should be an OWNER
(cherry picked from commit 67f9bd2acfd17f64a33ae8ad14806a0c93b921d8)

Change-Id: Id550086f24cccbf0be994ee19cb4e369745739a4