aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrTextureProxy.cpp
diff options
context:
space:
mode:
authorGravatar Ravi Mistry <rmistry@google.com>2017-01-27 14:39:46 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-27 14:40:01 +0000
commitbcda1f07d5e1b8d080e0134a24c5bc1707ef3985 (patch)
tree1dd49a45fbbaea5874cbc6d68fb8adf0994a1351 /src/gpu/GrTextureProxy.cpp
parent2b270e566263e93bcdfe00f858dba1970f5091f4 (diff)
Revert "Revert "SkUserConfig.h: remove out-of-date comment on SK_SFNTLY_SUBSETTER""
This reverts commit 156a749eb15d18539a58436d767e9401de413eb3. Reason for revert: Reverting this makes it much easier to test the merge_into_android.py script. I also stopped the Android autoroller for now. Original change's description: > Revert "SkUserConfig.h: remove out-of-date comment on SK_SFNTLY_SUBSETTER" > > This reverts commit 68fc549e840d1efc6285c301da1bf52c04e57e0a. > > Reason for revert: Breaking the Android roll. > > (The change is fine, but the script for merging did not consider that we might edit this file. We can reland this after we update the script.) > > Original change's description: > > SkUserConfig.h: remove out-of-date comment on SK_SFNTLY_SUBSETTER > > > > Change-Id: I6894fe43de071999e4923e1515a951b73e2ba0b1 > > Reviewed-on: https://skia-review.googlesource.com/7619 > > Reviewed-by: Ben Wagner <bungeman@google.com> > > Commit-Queue: Hal Canary <halcanary@google.com> > > > > TBR=halcanary@google.com,bungeman@google.com,reed@google.com > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Ib1a2c9faa79d1186705d87c5e17f20fe49b82bb1 > Reviewed-on: https://skia-review.googlesource.com/7641 > Reviewed-by: Leon Scroggins <scroggo@google.com> > Commit-Queue: Leon Scroggins <scroggo@google.com> > TBR=mtklein@chromium.org,halcanary@google.com,bungeman@google.com,scroggo@google.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ifa42e4fb48bbe9dac40c57cf09cf9586ca86c6df Reviewed-on: https://skia-review.googlesource.com/7649 Commit-Queue: Ravi Mistry <rmistry@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'src/gpu/GrTextureProxy.cpp')
0 files changed, 0 insertions, 0 deletions