AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
30,554 Commits 1 Branch 0 Tags 544 MiB
b6abb9b4e0
Commit Graph

30554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wagner
b6abb9b4e0 Revert "Fix a couple float-cast-overflow in SkScan*." 
This reverts commit 3cd0bef0fd.

Reason for revert: https://bugs.chromium.org/p/skia/issues/detail?id=7143

Original change's description:
> Fix a couple float-cast-overflow in SkScan*.
> 
> Bug: skia:5060
> Change-Id: I60a48993c77631aaad9354bb86b13204dc618bf4
> Reviewed-on: https://skia-review.googlesource.com/47422
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Mike Reed <reed@google.com>

TBR=benjaminwagner@google.com,reed@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:7143
Change-Id: I0f19720a7d8344789a375bbb6b9e28bf4f4e55ae
Reviewed-on: https://skia-review.googlesource.com/57240
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
 2017-10-09 16:48:04 +00:00
Mike Reed
7281801849 Revert "Revert "change computeByteSize to return max_size_t on overflow"" 
This reverts commit 384f0a7d66.

Bug: skia:
Change-Id: I392ef5c1a5172181caf81ae270befeba6e778241
Reviewed-on: https://skia-review.googlesource.com/57084
Commit-Queue: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
 2017-10-09 16:05:34 +00:00
Chris Dalton
16e92cdd91 Fix new compiler warnings in GLInstancedRendering.cpp 
Bug: skia:7109
Change-Id: I6d42991d4aba611819260411aaebd508ff242d09
Reviewed-on: https://skia-review.googlesource.com/56921
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
 2017-10-09 15:24:33 +00:00
Ethan Nicholas
abff956455 initClassID no longer auto-allocates ids 
Auto-allocated IDs mean that the IDs depend upon the order in which
classes happen to get initialized and are therefore not consistent
from run to run. This change paves the way for a persistent shader
cache by fixing the IDs in an enum.

Bug: skia:
Change-Id: I3e923c6c54f41b3b3eb616458abee83e0909c09f
Reviewed-on: https://skia-review.googlesource.com/56401
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
 2017-10-09 15:20:33 +00:00
Brian Salomon
4e7cdd5a00 Revert "Disable GL buffer mapping on TSAN/Mac." 
This reverts commit c203e65265.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Disable GL buffer mapping on TSAN/Mac.
> 
> Also reverts 65e7063796 which disabled buffer mapping in GrResourceProvider::createPatternedIndexBuffer.
> 
> Bug: skia:7058
> Change-Id: I6816abe53251e1cd8e92eae41b8cdbe45218a341
> Reviewed-on: https://skia-review.googlesource.com/50100
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=mtklein@google.com,bsalomon@google.com,robertphillips@google.com

Change-Id: Icf0cf40ba4d6e7081971eee2eea0a41033790df7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7058
Reviewed-on: https://skia-review.googlesource.com/57220
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
 2017-10-09 15:18:45 +00:00
Mike Reed
c5eb97dd88 add helper to check for overflow 
pre-CL to aid in changing the convention for when we overflow

Bug: skia:
Change-Id: I1e34a18fefb80187787a1c0c8ed7ee3516744d24
Reviewed-on: https://skia-review.googlesource.com/57103
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-09 15:04:34 +00:00
Ben Wagner
c6b2e6b061 Omit flaky test. 
Bug: skia:6857
No-Try: true
Change-Id: I32a2a867ee52f497b39b799053020e1b875dd1a6
Reviewed-on: https://skia-review.googlesource.com/57080
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
 2017-10-09 14:54:33 +00:00
Ben Wagner
5a96580336 Mark ~LuaView as override. 
Newer clang versions report

../../samplecode/SampleLua.cpp:44:13: error:
'~LuaView' overrides a destructor but is not marked 'override'
[-Werror,-Winconsistent-missing-destructor-override]

Change-Id: I6f3e69482a79e9580e51b957fff06e6d4d270735
Reviewed-on: https://skia-review.googlesource.com/57164
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
 2017-10-09 14:53:15 +00:00
Jim Van Verth
c1720d4036 Get HelloWorld example running again 
Change-Id: I5956f7c52d265d9f52dd061f1555c54ad092fe76
Reviewed-on: https://skia-review.googlesource.com/57101
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
 2017-10-09 14:41:03 +00:00
Brian Salomon
c203e65265 Disable GL buffer mapping on TSAN/Mac. 
Also reverts 65e7063796 which disabled buffer mapping in GrResourceProvider::createPatternedIndexBuffer.

Bug: skia:7058
Change-Id: I6816abe53251e1cd8e92eae41b8cdbe45218a341
Reviewed-on: https://skia-review.googlesource.com/50100
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
 2017-10-09 13:33:54 +00:00
Ben Wagner
67ef5d7640 Remove SkTypeface::Style use in API. 
All known callers of SkTypeface::MakeDefault call it with kNormal and
the only users specifying kNormal explicitly are in Skia, so remove the
parameter. There appear to be no users of SkTypeface::MakeFromTypeface,
so remove it. The current alternative is SkFontMgr::matchFaceStyle which
can do a better job anyway.

Change-Id: I89d94c77f9593407b0a319786848a8b823fcbae4
Reviewed-on: https://skia-review.googlesource.com/56762
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
 2017-10-09 03:13:33 +00:00
Ben Wagner
92d3bc9c9f Fix merge conflict. 
This resolves the conflict between
https://skia-review.googlesource.com/57120 and
https://skia-review.googlesource.com/57081.

No-Try: true
Change-Id: I45f47eb13dd7151b37b3b37f821232a02b9a43ff
Reviewed-on: https://skia-review.googlesource.com/57082
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
 2017-10-08 19:57:02 +00:00
Ben Wagner
2d861e9514 Add Win Clang Vulkan jobs. 
No-Try: true
Change-Id: I0b9f07e9057892443934da399f60762005495bde
Reviewed-on: https://skia-review.googlesource.com/57081
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
 2017-10-08 19:09:21 +00:00
Chris Dalton
4cad310adb CCPR: Blacklist Intel driver except on Mac 
TBR=bsalomon@google.com

Bug: skia:
Change-Id: I93306a285c5bd1d71a69c4c8a12b7fc583a52e12
Reviewed-on: https://skia-review.googlesource.com/57160
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-08 18:36:11 +00:00
UpdateSKPs
c9cb9e8147 Update SKP version 
Automatic commit by the RecreateSKPs bot.

TBR=update-skps@skia.org
NO_MERGE_BUILDS

Change-Id: I0e9f38de166cfb7823a943f28e525f0bb008f1e7
Reviewed-on: https://skia-review.googlesource.com/57120
Reviewed-by: update-skps <update-skps@skia.org>
Commit-Queue: update-skps <update-skps@skia.org>
 2017-10-08 07:54:56 +00:00
Chris Dalton
06cd6668f6 CCPR: Block older Intel/Mesa setups 
TBR=bsalomon@google.com

Bug: skia:7134
Change-Id: I71af6c8ca75804f7ac6d187ecdc1467cad686494
Reviewed-on: https://skia-review.googlesource.com/56941
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-07 21:03:25 +00:00
Ben Wagner
eeadcc1b5c Add Win Clang Vulkan builds. 
Fix Clang compiler warning.

Change-Id: Ic6f5b161058d1ed2df45e12b72dbff3b486ec986
Reviewed-on: https://skia-review.googlesource.com/56740
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
 2017-10-07 18:27:40 +00:00
Ben Wagner
3cd0bef0fd Fix a couple float-cast-overflow in SkScan*. 
Bug: skia:5060
Change-Id: I60a48993c77631aaad9354bb86b13204dc618bf4
Reviewed-on: https://skia-review.googlesource.com/47422
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Reed <reed@google.com>
 2017-10-07 18:26:51 +00:00
Chris Dalton
196efbf71c Enable coverage counting path rendering except on Android framework 
Android framework will come after collecting a bit more data.

Bug: skia:
Change-Id: I6f4738e457f09c976b8bf282153ca75160a1d91c
Reviewed-on: https://skia-review.googlesource.com/55563
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
 2017-10-07 07:34:20 +00:00
angle-deps-roller@chromium.org
b99a918e92 Roll skia/third_party/externals/angle2/ a3d384ada..359487c82 (1 commit) 
a3d384ada3..359487c822

$ git log a3d384ada..359487c82 --date=short --no-merges --format='%ad %ae %s'
2017-10-03 ynovikov Build angle_perftests on Android

Created with:
  roll-dep skia/third_party/externals/angle2
BUG=675997


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Build-Debian9-GCC-x86_64-Release-ANGLE
TBR=scroggo@google.com

Change-Id: I7965662576fa4bb32ea183bab8bf6b5b5cc09015
Reviewed-on: https://skia-review.googlesource.com/56960
Commit-Queue: angle-deps-roller . <angle-deps-roller@chromium.org>
Reviewed-by: angle-deps-roller . <angle-deps-roller@chromium.org>
 2017-10-07 05:32:10 +00:00
Chris Dalton
cc604e5e9e CCPR: Add workaround for PowerVR crash 
Bug: skia:
Change-Id: Icd00f81fda5366813f9c959fdc91b0415894cbfc
Reviewed-on: https://skia-review.googlesource.com/55360
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-06 22:48:59 +00:00
Chris Dalton
4a6a732352 CCPR: Blacklist intel 4xxx and 6xxx 
Bug: skia:
Change-Id: I590725027a6ed66a5612631686f41d62aeeb09fd
Reviewed-on: https://skia-review.googlesource.com/56803
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-06 21:56:51 +00:00
Mike Reed
384f0a7d66 Revert "change computeByteSize to return max_size_t on overflow" 
This reverts commit 2429546272.

Reason for revert: broke running dm on google3

Original change's description:
> change computeByteSize to return max_size_t on overflow
> 
> Bug: skia:7132
> Change-Id: I41045640ee62b2c988a84370ead5034bbccc6daf
> Reviewed-on: https://skia-review.googlesource.com/56620
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=bungeman@google.com,herb@google.com,reed@google.com

Change-Id: I5f58ec37241d2fae3ebdb7a3d6b41f9fd6d3c2ee
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7132
Reviewed-on: https://skia-review.googlesource.com/56880
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-06 21:24:10 +00:00
Greg Daniel
e1da1d9a7d Add option to create a deferred render target context with mips 
We need this since we have texture generators that draw the base level
but nothing more. Thus we want them to be able to directly draw into
a pre allocated mipped target instead of doing a copy later.

TBR: bsalomon@google.com
Bug: skia:
Change-Id: I1dfae0da7153b21b30fdfa51a7061fc255739a1e
Reviewed-on: https://skia-review.googlesource.com/54100
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
 2017-10-06 20:28:00 +00:00
Chris Dalton
567d6f4b4b Add GS Invocations caps to SkSL StandaloneShaderCaps 
Bug: skia:
Change-Id: I58f0caf97048e62a11cf8732acc79e3c2fbc683b
Reviewed-on: https://skia-review.googlesource.com/56801
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
 2017-10-06 20:17:10 +00:00
Mike Reed
cf331a9e7c Revert[3] "remove legacy fontmgr flag from flutter" 
This reverts commit cbfd8bf7c0.

Reason for revert: broke again

../../garnet/public/lib/ui/skia/skia_font_loader.cc:29:42: error: no member named 'createFromData' in 'SkFontMgr'
                SkFontMgr::RefDefault()->createFromData(font_data.get())));

Original change's description:
> Revert "Revert "remove legacy fontmgr flag from flutter""
> 
> This reverts commit da6cf4e97c.
> 
> Reason for revert: fix landed in flutter
> 
> Original change's description:
> > Revert "remove legacy fontmgr flag from flutter"
> > 
> > This reverts commit 7077ae8555.
> > 
> > Reason for revert: Breaking flutter [1]:
> > 
> > ../../flutter/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp:136:53: error: no member named 'createFromData' in 'SkFontMgr'
> >   return sk_sp<SkTypeface>(SkFontMgr::RefDefault()->createFromData(data.get()));
> >                            ~~~~~~~~~~~~~~~~~~~~~~~  ^
> > 1 error generated.
> > 
> > [1] https://luci-logdog.appspot.com/v/?s=fuchsia%2Fbuildbucket%2Fcr-buildbucket.appspot.com%2F8966486899186212448%2F%2B%2Fsteps%2Fbuild_fuchsia%2F0%2Fsteps%2Fninja%2F0%2Fstdout
> > 
> > Original change's description:
> > > remove legacy fontmgr flag from flutter
> > > 
> > > Bug: skia:
> > > Change-Id: I82d16b398ea8bb7309378f475d94d9dea0b263d5
> > > Reviewed-on: https://skia-review.googlesource.com/56160
> > > Reviewed-by: Mike Reed <reed@google.com>
> > > Commit-Queue: Mike Reed <reed@google.com>
> > 
> > TBR=reed@google.com,reed@chromium.org
> > 
> > Change-Id: I942a9c51dd4673fb2088610ddc2bffd414fbc4d8
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/56320
> > Reviewed-by: Leon Scroggins <scroggo@google.com>
> > Commit-Queue: Leon Scroggins <scroggo@google.com>
> 
> TBR=scroggo@google.com,reed@google.com,reed@chromium.org
> 
> Change-Id: Idbb1205e4f7548b683da7d08e9a954fc97be7489
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/56761
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=scroggo@google.com,reed@google.com,reed@chromium.org

Change-Id: I43a92fccae128f944ed1c6b57d635db322698545
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/56840
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-06 19:37:38 +00:00
Mike Reed
2429546272 change computeByteSize to return max_size_t on overflow 
Bug: skia:7132
Change-Id: I41045640ee62b2c988a84370ead5034bbccc6daf
Reviewed-on: https://skia-review.googlesource.com/56620
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-06 19:36:17 +00:00
Ben Wagner
9cb2cae635 Remove Perf SurfacePro2017 jobs. 
Perf numbers track closely with IntelIris540, although Perf numbers from
SurfacePro2017 are more noisy.

No-Try: true
Change-Id: I9dfefd6daf69644a1c0850453334876269cd7942
Reviewed-on: https://skia-review.googlesource.com/56540
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
 2017-10-06 19:25:47 +00:00
Mike Reed
cbfd8bf7c0 Revert "Revert "remove legacy fontmgr flag from flutter"" 
This reverts commit da6cf4e97c.

Reason for revert: fix landed in flutter

Original change's description:
> Revert "remove legacy fontmgr flag from flutter"
> 
> This reverts commit 7077ae8555.
> 
> Reason for revert: Breaking flutter [1]:
> 
> ../../flutter/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp:136:53: error: no member named 'createFromData' in 'SkFontMgr'
>   return sk_sp<SkTypeface>(SkFontMgr::RefDefault()->createFromData(data.get()));
>                            ~~~~~~~~~~~~~~~~~~~~~~~  ^
> 1 error generated.
> 
> [1] https://luci-logdog.appspot.com/v/?s=fuchsia%2Fbuildbucket%2Fcr-buildbucket.appspot.com%2F8966486899186212448%2F%2B%2Fsteps%2Fbuild_fuchsia%2F0%2Fsteps%2Fninja%2F0%2Fstdout
> 
> Original change's description:
> > remove legacy fontmgr flag from flutter
> > 
> > Bug: skia:
> > Change-Id: I82d16b398ea8bb7309378f475d94d9dea0b263d5
> > Reviewed-on: https://skia-review.googlesource.com/56160
> > Reviewed-by: Mike Reed <reed@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> 
> TBR=reed@google.com,reed@chromium.org
> 
> Change-Id: I942a9c51dd4673fb2088610ddc2bffd414fbc4d8
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/56320
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Commit-Queue: Leon Scroggins <scroggo@google.com>

TBR=scroggo@google.com,reed@google.com,reed@chromium.org

Change-Id: Idbb1205e4f7548b683da7d08e9a954fc97be7489
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/56761
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-06 19:08:17 +00:00
Chris Dalton
f1b47bb299 Add a cap for geometry shader invocations 
Bug: skia:7116
Change-Id: I3cc2ce7b2e5123c9adfd9781b2a5a8553747dfa5
Reviewed-on: https://skia-review.googlesource.com/56000
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-06 18:43:06 +00:00
Chris Dalton
1fbb07a5c0 Fix window origin on mac views 
Bug: skia:
Change-Id: I25e4e791760bd1d95a2bfac1a1b5d18d9caa78e8
Reviewed-on: https://skia-review.googlesource.com/56581
Reviewed-by: Yuqian Li <liyuqian@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-06 18:12:36 +00:00
Mike Reed
de281c98ba Revert "Revert "remove guard for computeByteSize api"" 
This reverts commit 297e4d3f27.

Reason for revert: landed fix in google3

Original change's description:
> Revert "remove guard for computeByteSize api"
> 
> This reverts commit d72747c5c3.
> 
> Reason for revert: broke //htmlrender/webkit_headless/engine/testing:platform_web_unittests
> 
> Original change's description:
> > remove guard for computeByteSize api
> > 
> > Bug: skia:
> > Change-Id: I5c66a7c79c4e71ec82194e8d37de04a516028665
> > Reviewed-on: https://skia-review.googlesource.com/56402
> > Reviewed-by: Mike Reed <reed@google.com>
> 
> TBR=reed@google.com,reed@chromium.org
> 
> Change-Id: If721607583204df9f32e54a041ecc8b34ad1a749
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/56321
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=reed@google.com,reed@chromium.org

Change-Id: I6d26a8623122e69af550d9a257c21943fe70b9f5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/56640
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-06 17:59:50 +00:00
angle-deps-roller@chromium.org
a6e2d8b043 Roll skia/third_party/externals/angle2/ b433e872c..a3d384ada (1 commit) 
b433e872c8..a3d384ada3

$ git log b433e872c..a3d384ada --date=short --no-merges --format='%ad %ae %s'
2017-10-06 oetuaho Fix signed integer overflow in GLSL preprocessor left shift

Created with:
  roll-dep skia/third_party/externals/angle2
BUG=743136


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Build-Debian9-GCC-x86_64-Release-ANGLE
TBR=scroggo@google.com

Change-Id: I92194cd4221d516285ae06faa1331fc0f9bb92b0
Reviewed-on: https://skia-review.googlesource.com/56500
Reviewed-by: angle-deps-roller . <angle-deps-roller@chromium.org>
Commit-Queue: angle-deps-roller . <angle-deps-roller@chromium.org>
 2017-10-06 16:59:24 +00:00
Leon Scroggins III
981a31e6a8 Generate warning settings for Android framework 
Bug: b/66996870

Android wants to build with warnings as errors. Keep the external/skia
warnings in sync with other Skia builds by pulling them from the json
generated by GN.

Fix a couple small errors that show up in the framework build.

Uploaded in response to AOSP's
https://android-review.googlesource.com/#/c/platform/external/skia/+/498211/

Change-Id: I4d791d43a9b00f9d6b79ecf16839716f241cba99
Reviewed-on: https://skia-review.googlesource.com/55703
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
 2017-10-06 16:18:34 +00:00
Chris Dalton
1265894423 Don't execute onFlush op lists until after GPU data is uploaded 
Bug: skia:
Change-Id: Ide85e802fd6e6a19412457dbaded3545b962c240
Reviewed-on: https://skia-review.googlesource.com/55562
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-06 16:04:14 +00:00
angle-deps-roller@chromium.org
d9a6224386 Roll skia/third_party/externals/angle2/ a87121f9d..b433e872c (1 commit) 
a87121f9d1..b433e872c8

$ git log a87121f9d..b433e872c --date=short --no-merges --format='%ad %ae %s'
2017-10-05 geofflang Change robust resource init into a context creation attribute.

Created with:
  roll-dep skia/third_party/externals/angle2


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Build-Debian9-GCC-x86_64-Release-ANGLE
TBR=scroggo@google.com

Change-Id: I582df11b720d24783e428e3074f211ed76c3da30
Reviewed-on: https://skia-review.googlesource.com/56421
Commit-Queue: angle-deps-roller . <angle-deps-roller@chromium.org>
Reviewed-by: angle-deps-roller . <angle-deps-roller@chromium.org>
 2017-10-06 15:47:34 +00:00
Mike Reed
297e4d3f27 Revert "remove guard for computeByteSize api" 
This reverts commit d72747c5c3.

Reason for revert: broke //htmlrender/webkit_headless/engine/testing:platform_web_unittests

Original change's description:
> remove guard for computeByteSize api
> 
> Bug: skia:
> Change-Id: I5c66a7c79c4e71ec82194e8d37de04a516028665
> Reviewed-on: https://skia-review.googlesource.com/56402
> Reviewed-by: Mike Reed <reed@google.com>

TBR=reed@google.com,reed@chromium.org

Change-Id: If721607583204df9f32e54a041ecc8b34ad1a749
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/56321
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-06 15:27:45 +00:00
Chris Dalton
d151322b6c CCPR: Don't forget resource provider in Pipeline InitArgs 
Ideally this would use an initializer list to guarantee we never
forget another value in the future, but the default member values
don't allow it.

Bug: skia:
Change-Id: I21e5b33bb99c4e0d42a7988b444d08266320bf37
Reviewed-on: https://skia-review.googlesource.com/56262
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
 2017-10-06 14:57:54 +00:00
Mike Reed
d72747c5c3 remove guard for computeByteSize api 
Bug: skia:
Change-Id: I5c66a7c79c4e71ec82194e8d37de04a516028665
Reviewed-on: https://skia-review.googlesource.com/56402
Reviewed-by: Mike Reed <reed@google.com>
 2017-10-06 14:28:43 +00:00
angle-deps-roller@chromium.org
bbff616dcd Roll skia/third_party/externals/angle2/ e159717d4..a87121f9d (1 commit) 
e159717d4b..a87121f9d1

$ git log e159717d4..a87121f9d --date=short --no-merges --format='%ad %ae %s'
2017-10-06 oetuaho Fix build warning by specializing clampCast

Created with:
  roll-dep skia/third_party/externals/angle2


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Build-Debian9-GCC-x86_64-Release-ANGLE
TBR=scroggo@google.com

Change-Id: I5ccb29d4cad7df1e3e698aa543704eb312d016fe
Reviewed-on: https://skia-review.googlesource.com/56380
Reviewed-by: angle-deps-roller . <angle-deps-roller@chromium.org>
Commit-Queue: angle-deps-roller . <angle-deps-roller@chromium.org>
 2017-10-06 14:26:24 +00:00
Leon Scroggins
da6cf4e97c Revert "remove legacy fontmgr flag from flutter" 
This reverts commit 7077ae8555.

Reason for revert: Breaking flutter [1]:

../../flutter/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp:136:53: error: no member named 'createFromData' in 'SkFontMgr'
  return sk_sp<SkTypeface>(SkFontMgr::RefDefault()->createFromData(data.get()));
                           ~~~~~~~~~~~~~~~~~~~~~~~  ^
1 error generated.

[1] https://luci-logdog.appspot.com/v/?s=fuchsia%2Fbuildbucket%2Fcr-buildbucket.appspot.com%2F8966486899186212448%2F%2B%2Fsteps%2Fbuild_fuchsia%2F0%2Fsteps%2Fninja%2F0%2Fstdout

Original change's description:
> remove legacy fontmgr flag from flutter
> 
> Bug: skia:
> Change-Id: I82d16b398ea8bb7309378f475d94d9dea0b263d5
> Reviewed-on: https://skia-review.googlesource.com/56160
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>

TBR=reed@google.com,reed@chromium.org

Change-Id: I942a9c51dd4673fb2088610ddc2bffd414fbc4d8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/56320
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
 2017-10-06 11:46:56 +00:00
recipe-roller
b3255260ef Roll recipe dependencies (trivial). 
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
depot_tools:
  https://crrev.com/d325eb349608f54d84a74ce124331a3fa170e5dc gclient: make predefined variables native (phajdan.jr@chromium.org)
  https://crrev.com/3ba2a7cf3801c62ef583761493c5e4cd4f717c27 gclient config: add support for custom vars (phajdan.jr@chromium.org)
  https://crrev.com/a58f1dacf1574708c916ece68b7edf3a27251010 [vpython] Roll CIPD version. (dnj@chromium.org)
  https://crrev.com/b5807979e8a9515f57cece1df7b19808b83d24ab Use HTTPS links in CheckAuthorizedAuthor (xiaoyin.l@outlook.com)
recipe_engine:
  https://crrev.com/3e09a61a1ad7c8f21e2ce2afd7240855c318d7ce Update source_manifest to e8149bf in luci-go (hinoka@google.com)


TBR=borenet@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ic8f593e6f56863d34e11cff62643300dd336aa57
Reviewed-on: https://skia-review.googlesource.com/56300
Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
Commit-Queue: Recipe Roller <recipe-roller@chromium.org>
 2017-10-06 00:46:34 +00:00
angle-deps-roller@chromium.org
5f3c798f6a Roll skia/third_party/externals/angle2/ af143feff..e159717d4 (1 commit) 
af143feff9..e159717d4b

$ git log af143feff..e159717d4 --date=short --no-merges --format='%ad %ae %s'
2017-10-05 geofflang Filter EGL attributes before passing them to the native driver.

Created with:
  roll-dep skia/third_party/externals/angle2


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Build-Debian9-GCC-x86_64-Release-ANGLE
TBR=scroggo@google.com

Change-Id: If0e1c134267019ebea0e7ae3b092b48ac8f00705
Reviewed-on: https://skia-review.googlesource.com/56003
Reviewed-by: angle-deps-roller . <angle-deps-roller@chromium.org>
Commit-Queue: angle-deps-roller . <angle-deps-roller@chromium.org>
 2017-10-05 23:00:04 +00:00
Mike Reed
7077ae8555 remove legacy fontmgr flag from flutter 
Bug: skia:
Change-Id: I82d16b398ea8bb7309378f475d94d9dea0b263d5
Reviewed-on: https://skia-review.googlesource.com/56160
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
 2017-10-05 21:41:04 +00:00
angle-deps-roller@chromium.org
c00d36bb0f Roll skia/third_party/externals/angle2/ 000dab88d..af143feff (1 commit) 
000dab88d3..af143feff9

$ git log 000dab88d..af143feff --date=short --no-merges --format='%ad %ae %s'
2017-10-05 geofflang Refactor the eglQueryContext entry point.

Created with:
  roll-dep skia/third_party/externals/angle2


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Build-Debian9-GCC-x86_64-Release-ANGLE
TBR=scroggo@google.com

Change-Id: I76deed54e115650aecde765d0f6278d3ab1d717c
Reviewed-on: https://skia-review.googlesource.com/56080
Reviewed-by: angle-deps-roller . <angle-deps-roller@chromium.org>
Commit-Queue: angle-deps-roller . <angle-deps-roller@chromium.org>
 2017-10-05 21:39:44 +00:00
Greg Daniel
3e70fa3505 When mip mapping, do YUV mip generation on CPU then upload to GPU. 
Bug: skia:
Change-Id: I930508b38e828652dfbb7c3f9d934d206cf1d72a
Reviewed-on: https://skia-review.googlesource.com/56060
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
 2017-10-05 20:51:04 +00:00
Mike Reed
ef8ce2858b experiments to speed up drawing 32bit images into 565 
New (legacy style) blitters only coded for shaders (and very restricted blendmodes)

Bug: skia:
See https://buganizer.corp.google.com/issues/64884885

Change-Id: Ie2546093bfe1e670a825dfd9542d252d53732c40
Reviewed-on: https://skia-review.googlesource.com/54103
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Herb Derby <herb@google.com>
 2017-10-05 20:25:04 +00:00
angle-deps-roller@chromium.org
ded7aa82af Roll skia/third_party/externals/angle2/ 63c5a5974..000dab88d (1 commit) 
63c5a59741..000dab88d3

$ git log 63c5a5974..000dab88d --date=short --no-merges --format='%ad %ae %s'
2017-09-27 geofflang Make pack and unpack image extensions enableable.

Created with:
  roll-dep skia/third_party/externals/angle2


Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Perf-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-ANGLE,Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE,Test-Win10-MSVC-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-ANGLE,Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE,Build-Debian9-GCC-x86_64-Release-ANGLE
TBR=scroggo@google.com

Change-Id: I1896e2cc9b21c012c4f72af8f4d6bc5d290582cb
Reviewed-on: https://skia-review.googlesource.com/55920
Reviewed-by: angle-deps-roller . <angle-deps-roller@chromium.org>
Commit-Queue: angle-deps-roller . <angle-deps-roller@chromium.org>
 2017-10-05 19:55:14 +00:00
Ben Wagner
04eb02f405 Fewer atomic ops in debug with SkBufferHead. 
In debug builds an assert would do an atomic load to assert the
reference count was greater than zero, then a fetch_add would access the
value again to do the reference counting. Instead just assert in debug
on the value produced by the reference counting. This both improves
debug performance and (more importantly) makes the debug asserts correct
instead of mearly opprotunistic.

Change-Id: Ic4ce788930d2564b5f86ab0e09fcd66006c8b73d
Reviewed-on: https://skia-review.googlesource.com/55880
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
 2017-10-05 19:03:34 +00:00
Chris Dalton
38ace8a133 Revert "Attempt both GL and GLES for GPU unit tests" 
This reverts commit 454818b80a.

Reason for revert:  the GPU unit tests on Chromebook that this change enabled are not surprisingly broken.

Original change's description:
> Attempt both GL and GLES for GPU unit tests
> 
> The hardcoded logic was not all inclusive and caused Chromebooks to
> not run GPU unit tests.
> 
> Bug: skia:
> Change-Id: I7688adab314d12234ee03363609a1c4bf8f2edb5
> Reviewed-on: https://skia-review.googlesource.com/55561
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=bsalomon@google.com,brianosman@google.com,csmartdalton@google.com

Change-Id: I48a6fdf0b21d3f3a795d9cf20564208f7c35ff5b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/55960
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
 2017-10-05 18:58:35 +00:00