Commit Graph

17 Commits

Author SHA1 Message Date
Mike Reed
1af6daa832 add flag for flutter
Bug: skia:
Change-Id: I73b6045aa17c7a38fcbd3245be926a5097d165ee
Reviewed-on: https://skia-review.googlesource.com/92684
Reviewed-by: Mike Reed <reed@google.com>
2018-01-09 21:43:49 +00:00
Robert Phillips
193de5d7ea Preemptively disable upcoming Skia features in Flutter/Fuchsia
Change-Id: I8be706846fecde704a29ba1dda0d7329046980b4
Reviewed-on: https://skia-review.googlesource.com/69840
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
2017-11-10 13:52:57 +00:00
Mike Reed
f6ad341641 remove legacy font api flag for flutter
Bug: skia:
Change-Id: I318f06f93d42ea74ea2eeb93ff3b69335f93a62c
Reviewed-on: https://skia-review.googlesource.com/58240
Reviewed-by: Mike Reed <reed@google.com>
2017-10-11 13:41:54 +00:00
Mike Reed
6245143594 use new computeByteSize api
Bug: skia:
Change-Id: If88f6e5fe7c7856ea7ce4780deaf88214f51bf0c
Reviewed-on: https://skia-review.googlesource.com/58040
Reviewed-by: Mike Reed <reed@google.com>
2017-10-10 21:10:19 +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
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
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
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
Mike Reed
f0ffb8943b Revert[4] "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"
This reverts commit 5a2e50edc5.

Bug: skia:
Change-Id: I8d28b5c07d90130e5a1653923740eaf189ecb954
Reviewed-on: https://skia-review.googlesource.com/53900
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2017-10-03 20:03:35 +00:00
Mike Reed
5a2e50edc5 Revert "Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"""
This reverts commit cd284c5323.

Reason for revert:

assert fired in SkMallocPixelRef.cpp:61: fatal error: "assert(info.computeByteSize(rowBytes) == info.getSafeSize(rowBytes))"

google3 thinks it was from surface_rowbytes

Original change's description:
> Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap""
> 
> This reverts commit 809cbedd4b.
> 
> Bug: skia:
> Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d
> Reviewed-on: https://skia-review.googlesource.com/52665
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>

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

Change-Id: I41e3f7a3f791cc8183291847e783ed8a53bc91d2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/53802
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2017-10-02 13:44:18 +00:00
Mike Reed
cd284c5323 Revert "Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap""
This reverts commit 809cbedd4b.

Bug: skia:
Change-Id: I680d8daeeeeb15526b44c1305d8fb0c6bfa38e1d
Reviewed-on: https://skia-review.googlesource.com/52665
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
2017-10-02 12:55:37 +00:00
Jim Van Verth
809cbedd4b Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"
This reverts commit 88757dacd4.

Reason for revert: Still seems to be failing Chromium "telemetry_perf_unittests (with patch) on Android" on android_n5x_swarming_rel.

Original change's description:
> guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
> 
> Now with legacy behavior for allocpixels
> 
> This was reverted, so the current CL is a "fix" on top of ...
> https://skia-review.googlesource.com/c/skia/+/50980
> 
> Related update to Chrome (in preparation for this change)
> https://chromium-review.googlesource.com/c/chromium/src/+/685719
> 
> Bug: skia:
> Change-Id: I4b370ee7e95083ab27421f008132219c9c7b86e9
> Reviewed-on: https://skia-review.googlesource.com/51341
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>

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

Change-Id: I827a0ca1d1e3909e648fde3342cdb8601d34da8d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/52381
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-09-27 23:15:07 +00:00
Mike Reed
88757dacd4 guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
Now with legacy behavior for allocpixels

This was reverted, so the current CL is a "fix" on top of ...
https://skia-review.googlesource.com/c/skia/+/50980

Related update to Chrome (in preparation for this change)
https://chromium-review.googlesource.com/c/chromium/src/+/685719

Bug: skia:
Change-Id: I4b370ee7e95083ab27421f008132219c9c7b86e9
Reviewed-on: https://skia-review.googlesource.com/51341
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
2017-09-27 14:36:07 +00:00
Greg Daniel
f46633f8af Revert "guard old apis for querying byte-size of a bitmap/imageinfo/pixmap"
This reverts commit 98a6216b18.

Reason for revert: breaking the chrome roll. Looks like they may be writing data to create an image across all the row bytes and thus writing to unalloced data on the last row. Link to example failing bot:
 https://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/539960

Original change's description:
> guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
> 
> Previously we had size_t and uint64_t variations.
> 
> The new (simpler) API always..
> - returns size_t, or 0 if the calculation overflowed
> - returns the trimmed size (does not include rowBytes padding for the last row)
> 
> Bug: skia:
> Change-Id: I05173e877918327c7b207d2f7f1ab0db36892e2e
> Reviewed-on: https://skia-review.googlesource.com/50980
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Leon Scroggins <scroggo@google.com>

TBR=mtklein@google.com,herb@google.com,scroggo@google.com,fmalita@chromium.org,reed@google.com

Change-Id: I726f6ab1b36b14979ba6f37105e0a469b3f0dbc0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/51262
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
2017-09-26 20:08:07 +00:00
Mike Reed
98a6216b18 guard old apis for querying byte-size of a bitmap/imageinfo/pixmap
Previously we had size_t and uint64_t variations.

The new (simpler) API always..
- returns size_t, or 0 if the calculation overflowed
- returns the trimmed size (does not include rowBytes padding for the last row)

Bug: skia:
Change-Id: I05173e877918327c7b207d2f7f1ab0db36892e2e
Reviewed-on: https://skia-review.googlesource.com/50980
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
2017-09-26 17:07:16 +00:00
Mike Reed
592273965a Revert "Revert "migrate to sk_sp for SkFontMgr API""
This reverts commit f40ae1a4b5.

Bug: skia:
Change-Id: I752606de92ea405d6e50219c98030409b00a2841
Reviewed-on: https://skia-review.googlesource.com/51160
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2017-09-26 14:05:18 +00:00
Brian Osman
f2c901474c Add GN arg to allow Flutter-specific API guards
Bug: skia:
Change-Id: I5a97da664626eebf30bba3f391fff0d8b9e62ea5
Reviewed-on: https://skia-review.googlesource.com/23042
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
2017-07-14 18:54:24 +00:00