Hal Canary
b88ca7eca4
Revert "SkImageEncoder::* going away"
...
This reverts commit d7e16661bb
.
Reason for revert: breaking g3
NOTRY=true
Change-Id: I56d53adca64a94b4f66dd0539634804a96e92ddf
Reviewed-on: https://skia-review.googlesource.com/5672
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Herb Derby <herb@google.com>
2016-12-07 16:50:32 +00:00
Hal Canary
d7e16661bb
SkImageEncoder::* going away
...
Approval from https://review.skia.org/5006
TBR=reed@google.com
Change-Id: I43d1a24fa3e924b3c24b224f2451ab990b440dc8
Reviewed-on: https://skia-review.googlesource.com/5413
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2016-12-07 16:02:33 +00:00
Ben Wagner
59f9edb321
Merge changes from internal cl/140385880.
...
BUG=skia:
Change-Id: I1c4994a83a1669032b8dc2620fd5c3258f82a222
Reviewed-on: https://skia-review.googlesource.com/5282
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
2016-11-28 22:21:34 +00:00
Mike Reed
db0199b317
hide accessBitmap from g3
...
BUG=skia:
Change-Id: I00e8121751e640ee3b449d27b6ccfcc1491964a7
Reviewed-on: https://skia-review.googlesource.com/5224
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-11-24 03:06:28 +00:00
Mike Reed
e68872b030
remove xfermode flag (again) for g3
...
BUG=skia:
Change-Id: Ib6842553ff5e8b3003769ac352287dc0e0f7e691
NOTRY=True
Reviewed-on: https://skia-review.googlesource.com/5222
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
2016-11-23 21:29:13 +00:00
Hal Canary
db6830162e
SkImageEncoder: simplify API
...
(re-land 248ff02
& 2cb6cb7
, with changes)
- Hide SkImageEncoder class in private header.
- SkImageEncoder::Type becomes SkEncodedImageFormat
- SkEncodedFormat becomes SkEncodedImageFormat
- SkImageEncoder static functions replaced with
single function EncodeImage()
- utility wrappers for EncodeImage() are in
sk_tool_utils.h
TODO: remove link-time registration mechanism.
TODO: clean up clients use of API and flip the flag.
TODO: implement EncodeImage() in chromeium/skia/ext
Change-Id: I47d451e50be4d5c6c130869c7fa7c2857243d9f0
Reviewed-on: https://skia-review.googlesource.com/4909
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-on: https://skia-review.googlesource.com/5186
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
2016-11-23 16:40:32 +00:00
Greg Daniel
3761f85040
Revert "hide xfermode for g3"
...
This reverts commit a5b2376365
.
Reason for revert: breaking google3
Original change's description:
> hide xfermode for g3
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5132
>
> Change-Id: I374abc04856e27df718145f9ae57cc83a447ba3e
> Reviewed-on: https://skia-review.googlesource.com/5132
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=reed@google.com ,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I115bc7814d6c96d897b8ae86a917ce2365c6b0b4
Reviewed-on: https://skia-review.googlesource.com/5185
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2016-11-23 15:32:39 +00:00
Mike Reed
a5b2376365
hide xfermode for g3
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5132
Change-Id: I374abc04856e27df718145f9ae57cc83a447ba3e
Reviewed-on: https://skia-review.googlesource.com/5132
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-11-23 14:14:02 +00:00
Hal Canary
a2b4bdce8c
Revert 248ff023
& 2cb6cb72
...
Revert "SkImageEncoder: simplify API"
This reverts commit 248ff02331
.
Revert "Fix bug: can't convert nullptr -> bool"
This reverts commit 2cb6cb7218
.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5151
NOTRY=true
Change-Id: I5f6414392d6545f74db0b5bb50608d04f053a8ec
Reviewed-on: https://skia-review.googlesource.com/5151
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
2016-11-22 21:23:51 +00:00
Hal Canary
248ff02331
SkImageEncoder: simplify API
...
- Hide SkImageEncoder class in private header.
- SkImageEncoder::Type becomes SkEncodedImageFormat
- SkEncodedFormat becomes SkEncodedImageFormat
- SkImageEncoder static functions replaced with
single function EncodeImage()
- utility wrappers for EncodeImage() are in
sk_tool_utils.h
TODO: remove link-time registration mechanism.
TODO: clean up clients use of API and flip the flag.
TODO: implement EncodeImage() in chromeium/skia/ext
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4909
Change-Id: Ib48b31fdc05cf23cda7f56ebfd67c841c149ce70
Reviewed-on: https://skia-review.googlesource.com/4909
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
2016-11-22 18:25:55 +00:00
Mike Klein
9de9230b6c
update G3 build after crrev.com/2500113004
...
crrev.com/2500113004 removed SkBitmapProcState_opts_arm.cpp.
ARM targets now use SkBitmapProcState_opts_none.cpp, so stop filtering it out.
(See the gn/opts.gni change.)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4996
Change-Id: Ib46ac5d9e908e8043aaec1f462672d9f9710431d
Reviewed-on: https://skia-review.googlesource.com/4996
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
2016-11-18 17:28:48 +00:00
Mike Reed
ebd5d34751
remove CANVAS_IS_REFCNT flag from public.bzl
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4914
Change-Id: I3ea6c2b96dd79da9ebba659726cbab52bda21651
Reviewed-on: https://skia-review.googlesource.com/4914
Reviewed-by: Mike Reed <reed@google.com>
2016-11-16 20:55:18 +00:00
Mike Reed
d470673928
make SkXfermode.h go away
...
This is step one:
- make SkXfermode useless to public clients
- everything they should need is in SkBlendMode.h
Step two:
- remove SkXfermode.h entirely (since skia core will already be using SkXfermodePriv.h)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4534
Change-Id: If2cea9f71df92430ed6644edb98dd306c5572cbc
Reviewed-on: https://skia-review.googlesource.com/4534
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
2016-11-16 15:38:11 +00:00
Yuqian Li
8622b72cfa
Temporarily Disable analytic AA for Google3
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4782
Change-Id: Iba7ea0a5aaaf3ba3821094c527ddc4fe4e32cb79
Reviewed-on: https://skia-review.googlesource.com/4782
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Yuqian Li <liyuqian@google.com>
2016-11-14 21:34:00 +00:00
Mike Reed
5df4934b3e
Revert[2] "Change SkCanvas to *not* inherit from SkRefCnt"
...
Changes over original:
- conditionalize ownership in SkPictureRecorder
- conditionalize ownership in SkCanvasStateUtils
This reverts commit b613c266df
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4742
Change-Id: Ib25514d6f546c69b6650b5c957403b04f7380dc2
Reviewed-on: https://skia-review.googlesource.com/4742
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-11-13 18:31:13 +00:00
Heather Miller
b613c266df
Revert "Change SkCanvas to *not* inherit from SkRefCnt"
...
This reverts commit 8240750718
.
Reason for revert: Breaking WebView (chromium:663959)
Original change's description:
> Change SkCanvas to *not* inherit from SkRefCnt
>
> Definitely tricky for classes like SkNWayCanvas, where the caller (today)
> need not pay attention to ownership of the canvases it gave the NWay
> (after this CL, the caller *must* managed ownership)
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4441
>
> DOCS_PREVIEW= https://skia.org/?cl=4441
>
> Change-Id: Ib1ac07a3cdf0686d78e7aaa4735d45cc90bea081
> Reviewed-on: https://skia-review.googlesource.com/4441
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
>
TBR=djsollen@google.com ,mtklein@google.com,halcanary@google.com,robertphillips@google.com,fmalita@chromium.org,fmalita@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I5e3b3e876b7d2c09833cf841801321033b6b968b
Reviewed-on: https://skia-review.googlesource.com/4687
Commit-Queue: Heather Miller <hcm@google.com>
Reviewed-by: Heather Miller <hcm@google.com>
2016-11-10 21:25:44 +00:00
Mike Reed
8240750718
Change SkCanvas to *not* inherit from SkRefCnt
...
Definitely tricky for classes like SkNWayCanvas, where the caller (today)
need not pay attention to ownership of the canvases it gave the NWay
(after this CL, the caller *must* managed ownership)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4441
DOCS_PREVIEW= https://skia.org/?cl=4441
Change-Id: Ib1ac07a3cdf0686d78e7aaa4735d45cc90bea081
Reviewed-on: https://skia-review.googlesource.com/4441
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Robert Phillips <robertphillips@google.com>
2016-11-09 19:40:06 +00:00
Mike Reed
9d34db4aa5
remove obsolete flags from public.bzl
...
BUG=skia:
NOTRY=True
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4495
Change-Id: I79635fee732135a1ac33aceee30e5f2d4aa08ac2
Reviewed-on: https://skia-review.googlesource.com/4495
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
2016-11-07 17:50:35 +00:00
Mike Reed
faba3715b8
remove unused code around SK_SUPPORT_LEGACY_XFERMODE_PARAM
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4384
Change-Id: I5121acd027d935ade169ff65941f29f654a47bd0
Reviewed-on: https://skia-review.googlesource.com/4384
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-11-03 19:54:08 +00:00
Mike Reed
08ed0d4926
remove legacy flags from g3
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4225
Change-Id: Icb3e8f132975d1ef2b6b89de05b49f89e2424f78
Reviewed-on: https://skia-review.googlesource.com/4225
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-11-01 19:44:15 +00:00
Mike Reed
5e25717ab6
hide setImageFilter(ptr)
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4184
Change-Id: Iad792cfdf54087ad4c424fd268559c162a9a5f5c
Reviewed-on: https://skia-review.googlesource.com/4184
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
2016-11-01 16:05:41 +00:00
Mike Reed
32b66237c4
remove bunch of legacy flags
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4203
Change-Id: I0e23437a77cd8f70595ca54ae421a420e2bb9b43
Reviewed-on: https://skia-review.googlesource.com/4203
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-31 17:18:37 +00:00
Mike Reed
7d954ad797
remove xfermode from public api
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4020
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Change-Id: I19cd056f2af778f10e8c6c2b7b2735593b43dbac
Reviewed-on: https://skia-review.googlesource.com/4020
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-28 20:06:17 +00:00
scroggo
e9db0b7f0e
Do not exclude Gif on iOS
...
We no longer depend on an external library, so there is no reason to
exclude it.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2447973004
NOTREECHECKS=true
Review-Url: https://codereview.chromium.org/2447973004
2016-10-25 12:43:50 -07:00
Ben Wagner
d0a3b06ce2
Add gif sources to public.bzl.
...
This also removes SK_HAS_GIF_LIBRARY since it does not appear in the
code.
Change-Id: I6e4d6ed560eb2877e6db61edf15f6be832166b44
Reviewed-on: https://skia-review.googlesource.com/3752
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2016-10-24 19:26:22 +00:00
Ben Wagner
a8834bb323
SkShader* refAs... to sk_sp<SkShader> makeAs...
...
There appear to be no existing overriders of the refAs.. method outside
Skia.
Change-Id: Iab174e83023093b4d7fc0bd8907666b66ddb1eea
Reviewed-on: https://skia-review.googlesource.com/3746
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2016-10-24 16:40:01 +00:00
Brian Osman
526972ecb5
Rename all color space factories from New* to Make*
...
Matches our naming convention for all other types - factories that
return sk_sp (or any type that intelligently manages its own
lifetime) are named Make.
Previous factories are still around, assuming
SK_SUPPORT_LEGACY_COLOR_SPACE_FACTORIES is defined. Enable that
define for Android, etc.
See also: https://codereview.chromium.org/2442053002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3822
Change-Id: Iaea9376490736b494e8ffc820831f052bbe1478d
Reviewed-on: https://skia-review.googlesource.com/3822
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
2016-10-24 14:02:27 +00:00
Mike Reed
95f6b399e5
remove some legacy flags for g3
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3672
Change-Id: Idc30ed9d367026352747619580bf12da7aa9ffe5
Reviewed-on: https://skia-review.googlesource.com/3672
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-20 17:07:01 +00:00
reed
374772bd61
Revert[8] "replace SkXfermode obj with SkBlendMode enum in paints"
...
This reverts commit c245574ba3
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2396953002
TBR=
Review-Url: https://codereview.chromium.org/2396953002
2016-10-05 17:33:03 -07:00
Mike Reed
c245574ba3
Revert[7] "replace SkXfermode obj with SkBlendMode enum in paints"
...
This reverts commit Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8.
Reason for revert: new assert from 100K bot
Original change's description:
> Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
>
> - perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
> This reverts commit 3ed485f424
.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
>
> Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
> Reviewed-on: https://skia-review.googlesource.com/2992
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=reed@google.com ,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I848e5a69c5cd67f2c14889f4f0a346652578c4ff
Reviewed-on: https://skia-review.googlesource.com/3023
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
2016-10-05 20:20:14 +00:00
Mike Reed
2b2fc7db4f
Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
...
- perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
This reverts commit 3ed485f424
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
Reviewed-on: https://skia-review.googlesource.com/2992
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-05 18:31:17 +00:00
Mike Reed
3ed485f424
Revert[5] "replace SkXfermode obj with SkBlendMode enum in paints"
...
This reverts commit I0fa5c58af428f3da8565465d1219a34ef8417d9a.
Reason for revert: failing to deserialize some of the 100K
Original change's description:
> Revert[4] "replace SkXfermode obj with SkBlendMode enum in paints"
>
> This reverts commit 2cbcd12281
.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2924
>
> Change-Id: I0fa5c58af428f3da8565465d1219a34ef8417d9a
> Reviewed-on: https://skia-review.googlesource.com/2924
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=reed@google.com ,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I1805a57eef5ebcac203da5989c8539345ecf806f
Reviewed-on: https://skia-review.googlesource.com/2962
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-04 21:35:56 +00:00
Ben Wagner
8174ebe303
Remove SK_SUPPORT_LEGACY_TEXTBLOB_BUILDER from public.bzl
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2960
Change-Id: I945782a5aaf416b630181bf65f517f89bae95d9f
Reviewed-on: https://skia-review.googlesource.com/2960
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
2016-10-04 21:30:46 +00:00
Mike Reed
1834242ec6
Revert[4] "replace SkXfermode obj with SkBlendMode enum in paints"
...
This reverts commit 2cbcd12281
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2924
Change-Id: I0fa5c58af428f3da8565465d1219a34ef8417d9a
Reviewed-on: https://skia-review.googlesource.com/2924
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-04 20:09:34 +00:00
Ben Wagner
95ea469c6a
Remove SkFontConfigInterface_direct_google3.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2931
Change-Id: I4aa4e94453601e566e30d61ad286f58786477cfb
Reviewed-on: https://skia-review.googlesource.com/2931
Reviewed-by: Ben Wagner <bungeman@google.com>
2016-10-04 18:53:19 +00:00
Mike Reed
2cbcd12281
Revert "Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints"""
...
This reverts commit I86875511a13497112827cbaed1dbd7639e9e3d10.
legacy (100K) skp failure
Original change's description:
> Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints""
>
> This reverts commit ce02e71758
.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2878
>
> Change-Id: I86875511a13497112827cbaed1dbd7639e9e3d10
> Reviewed-on: https://skia-review.googlesource.com/2878
> Reviewed-by: Matt Sarett <msarett@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=msarett@google.com ,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ife6f0cf3a22b3e8cf885a188f7f44e1ff62e06a5
Reviewed-on: https://skia-review.googlesource.com/2881
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-03 21:34:36 +00:00
Mike Reed
70cdb396eb
Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints""
...
This reverts commit ce02e71758
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2878
Change-Id: I86875511a13497112827cbaed1dbd7639e9e3d10
Reviewed-on: https://skia-review.googlesource.com/2878
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-03 20:02:20 +00:00
Mike Reed
ce02e71758
Revert "replace SkXfermode obj with SkBlendMode enum in paints"
...
This reverts commit I4fb489ba6b3f77b458f7e4a99f79c7ad10859135.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> replace SkXfermode obj with SkBlendMode enum in paints
>
> BUG=skia:5814
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714
>
> Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135
> Reviewed-on: https://skia-review.googlesource.com/2714
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=bsalomon@google.com ,fmalita@chromium.org,fmalita@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I3e43f79ef5c1709929663fe63cc1f67cd78270b7
Reviewed-on: https://skia-review.googlesource.com/2871
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-03 18:03:29 +00:00
Mike Reed
0591897548
replace SkXfermode obj with SkBlendMode enum in paints
...
BUG=skia:5814
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714
Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135
Reviewed-on: https://skia-review.googlesource.com/2714
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2016-10-03 17:17:10 +00:00
benjaminwagner
c8962518dd
Unomit SkSL in public.bzl.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2380563006
Review-Url: https://codereview.chromium.org/2380563006
2016-09-30 12:06:27 -07:00
Mike Klein
c8deb02334
Clean up public.bzl after G3-side CL.
...
One more tiny G3 CL after this...
BUG=skia:
NOTRY=true
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2847
Change-Id: Id237ca3853614c2b9b68eb0a679f6e64b3e95983
Reviewed-on: https://skia-review.googlesource.com/2847
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-09-30 17:38:30 +00:00
Mike Klein
7147505955
Fix G3 excludes lists for AVX2 -> HSW.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2843
Change-Id: I8dfd4133808dd768217a7978d7ae3f6d518cd744
Reviewed-on: https://skia-review.googlesource.com/2843
Reviewed-by: Mike Klein <mtklein@chromium.org>
2016-09-30 15:35:24 +00:00
Mike Klein
78d5a3bac5
Add an SkOpts target for Haswell+ Intel chips.
...
Haswell brought a whole slew of handy new instructions for us (AVX2, FMA, BMI1+BMI2) and also feature F16C, which came one generation earlier on Ivybridge. We work with integers often enough that we really want to target AVX2 instead of AVX, and this means it's pretty practical to ask for all those other goodies along with it.
Chrome's GN files and Google3's BUILD file will need an update, before or after this CL.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2840
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Change-Id: I826daf77b5104664c5d31ddaabee347e287b87a2
Reviewed-on: https://skia-review.googlesource.com/2840
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
2016-09-30 15:10:48 +00:00
benjaminwagner
6b1da0a538
Revert of Add SK_SUPPORT_LEGACY_HAIRLINE_END_CAP to work around dependent test failure. (patchset #1 id:1 of https://codereview.chromium.org/2379843002/ )
...
Reason for revert:
Dependent test has been fixed.
Original issue's description:
> Add SK_SUPPORT_LEGACY_HAIRLINE_END_CAP to work around dependent test failure.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2379843002
>
> Committed: https://skia.googlesource.com/skia/+/aa6ef3ebc60e0f70db0e599f4cd34d5be06486c9
TBR=caryclark@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2379993004
2016-09-29 09:36:29 -07:00
benjaminwagner
aa6ef3ebc6
Add SK_SUPPORT_LEGACY_HAIRLINE_END_CAP to work around dependent test failure.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2379843002
Review-Url: https://codereview.chromium.org/2379843002
2016-09-29 06:42:52 -07:00
Mike Reed
627778d5ba
isABitmap is deprecated, use isAImage
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2748
Change-Id: I7006a3231ff0e9e39b187deae550364bc97f49d6
Reviewed-on: https://skia-review.googlesource.com/2748
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
2016-09-28 21:42:04 +00:00
benjaminwagner
b3a3b58c4e
Add SK_SUPPORT_LEGACY_ARITHMETICMODE flag to public.bzl.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2372703007
Review-Url: https://codereview.chromium.org/2372703007
2016-09-27 12:28:20 -07:00
Mike Klein
9466379541
Include GLTestContext_command_buffer.cpp in G3 build.
...
This is now required to build our GPU testing tools.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2587
NOTREECHECKS=true
Change-Id: I219665fbe50e9bbea9abb88a6d63c34b76ca92e6
Reviewed-on: https://skia-review.googlesource.com/2587
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
2016-09-23 16:06:53 +00:00
reed
73603f3c52
abstract name of clipping ops, to transtion to a more restricted set
...
SkRegion::Op --> SkCanvas::ClipOp (alias) --> SkClipOp
pre-CL needed in chrome : https://codereview.chromium.org/2355583002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2355483002
Review-Url: https://codereview.chromium.org/2355483002
2016-09-20 08:42:39 -07:00
fmalita
37283c28aa
Use sk_sp text blob APIs
...
SkTextBlobBuilder::build() -> make()
SkAutoTUnref<const SkTextBlob> -> sk_sp<SkTextBlob>
drawTextBlob(const SkTextBlob*) -> drawTextBlob(const sk_sp<SkTextBlob>&)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2335493005
Review-Url: https://codereview.chromium.org/2335493005
2016-09-13 10:00:23 -07:00
reed
42943c8aa9
change SkStreams to work with sk_sp<SkData> instead of SkData*
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2333713002
Review-Url: https://codereview.chromium.org/2333713002
2016-09-12 12:01:44 -07:00
bsalomon
bd4569c232
Remove SkBitmap::getTexture()
...
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2289313002
Review-Url: https://codereview.chromium.org/2289313002
2016-08-30 12:52:49 -07:00
halcanary
650e20d705
SkPDF: Stop #include PREPROCESSOR_DEFINE
pattern
...
No more:
#include SK_SFNTLY_SUBSETTER
#include ZLIB_INCLUDE
Also, rename SK_SFNTLY_SUBSETTER to SK_PDF_USE_SFNTLY
to follow my pattern of prefixing SkPDF-specific defines
with 'SK_PDF_'.
The ZLIB_INCLUDE define is no longer is used by anyone.
TODO: rename Sfntly to something pronounceable.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2273343002
Review-Url: https://codereview.chromium.org/2273343002
2016-08-25 09:07:02 -07:00
mtklein
da19f6f3b5
Assume all TURBO_HAS_* are true.
...
Should be everyone's on libjpeg-turbo >= 1.5.0.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2274643002
Review-Url: https://codereview.chromium.org/2274643002
2016-08-23 11:49:29 -07:00
reed
dfd32b705b
add legacy flag for google3
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2234373002
TBR=
Review-Url: https://codereview.chromium.org/2234373002
2016-08-11 05:04:52 -07:00
robertphillips
0652baa23e
Revert of Cleanup use of legacy SkSurface creation methods a bit (patchset #2 id:20001 of https://codereview.chromium.org/2223023002/ )
...
Reason for revert:
webkit_headless!
Original issue's description:
> Cleanup use of legacy SkSurface creation methods a bit
>
> This:
> removes the SK_SUPPORT_LEGACY_NEW_SURFACE_API flag from the bzl build
> cleans up some remaining uses of the old API
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2223023002
>
> Committed: https://skia.googlesource.com/skia/+/f21cd16228c20927fa4e9b937d6951471cfaa37a
TBR=benjaminwagner@google.com ,egdaniel@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2220933004
2016-08-08 09:17:20 -07:00
bungeman
f95388da1a
Remove SK_SUPPORT_LEGACY_DATA_FACTORIES.
...
The code protected by this flag is no longer used. Remove the flag and
code. This also removes SK_SUPPORT_LEGACY_TYPEFACE_PTR from Android, as
it is no longer needed.
TBR=reed
Only removes already guarded API.
Review-Url: https://codereview.chromium.org/2223933002
2016-08-08 08:09:10 -07:00
robertphillips
f21cd16228
Cleanup use of legacy SkSurface creation methods a bit
...
This:
removes the SK_SUPPORT_LEGACY_NEW_SURFACE_API flag from the bzl build
cleans up some remaining uses of the old API
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2223023002
Review-Url: https://codereview.chromium.org/2223023002
2016-08-08 06:57:38 -07:00
ethannicholas
f789b38935
added initial GLSL support to skslc
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2185393003
Review-Url: https://codereview.chromium.org/2185393003
2016-08-03 12:43:36 -07:00
bungeman
38d909ec28
Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.
...
This moves Skia code off of SK_SUPPORT_LEGACY_DATA_FACTORIES.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2206633004
Review-Url: https://codereview.chromium.org/2206633004
2016-08-02 14:40:46 -07:00
bungeman
b605f89398
Remove now unused source files.
...
These files have been renamed and exist only as stubs for transition
reasons. Remove these now unused stubs.
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review-Url: https://codereview.chromium.org/2197423003
2016-08-02 11:18:48 -07:00
bungeman
7d0e3bc785
Rename FontConfigInterface font manager files.
...
These files are now so badly misnamed that it is causing problems.
The original files are kept as shells until Chromium and PDFium can
be updated. After Chromium and PDFium builds are updated, the old
files will be removed and the cmake and bzl builds will be updated.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2199973002
CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review-Url: https://codereview.chromium.org/2199973002
2016-08-02 07:07:33 -07:00
benjaminwagner
99fb670977
Update public.bzl based on internal cl/128616707.
...
TBR=mtklein@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2186373002
Review-Url: https://codereview.chromium.org/2186373002
2016-07-28 15:12:21 -07:00
benjaminwagner
cb571e1148
Rename textual includes as *.inc.
...
This makes it easier to distinguish source files that can stand on their own vs files meant to be #included into other source files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184143002
Review-Url: https://codereview.chromium.org/2184143002
2016-07-27 11:12:12 -07:00
reed
d9ddad2952
add SK_SUPPORT_LEGACY_BITMAP_GETTEXTURE for out-of-date google3 callers
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2177993002
Review-Url: https://codereview.chromium.org/2177993002
2016-07-25 09:41:58 -07:00
benjaminwagner
1d35231e7b
Remove long-running sk_linear_to_srgb test for ASAN in public.bzl.
...
This unit test takes >~5m and causes the ASAN test to time out.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2175303002
Review-Url: https://codereview.chromium.org/2175303002
2016-07-25 06:32:13 -07:00
benjaminwagner
bddb372ae9
Add SK_SUPPORT_LEGACY_ACCESSBITMAP to public.bzl.
...
BUG=skia:
TBR=robertphillips
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165633008
Review-Url: https://codereview.chromium.org/2165633008
2016-07-22 06:19:21 -07:00
caryclark
523e76d279
exclude test that fails on google3 asan
...
R=dogben@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2164703002
Review-Url: https://codereview.chromium.org/2164703002
2016-07-19 12:27:32 -07:00
msarett
7f119caecb
Enable libjpeg-turbo features
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2161843002
Review-Url: https://codereview.chromium.org/2161843002
2016-07-19 10:48:58 -07:00
benjaminwagner
921e48bf23
Exclude XML and dependencies from Bazel build.
...
Depends on https://codereview.chromium.org/2150353002
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147303004
Review-Url: https://codereview.chromium.org/2147303004
2016-07-15 11:27:27 -07:00
benjaminwagner
2214de4ade
Exclude SkSL in public.bzl.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2122463002
TBR=ethannicholas
NOTREECHECKS=true
Review-Url: https://codereview.chromium.org/2122463002
2016-07-02 05:12:46 -07:00
benjaminwagner
b5188624f6
Disable PathOpsFailOp test for Bazel ASAN test, because there are double->float cast overflows in PathOps code.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104303003
Review-Url: https://codereview.chromium.org/2104303003
2016-06-29 10:26:44 -07:00
scroggo
7732c0cae7
Revert of Bring back compiling third_party/libpng in public.bzl (patchset #3 id:40001 of https://codereview.chromium.org/2044703006/ )
...
Reason for revert:
Breaking Google3
Original issue's description:
> Bring back compiling third_party/libpng in public.bzl
>
> Disable the optimizations for simplicity, as suggested in [1].
>
> Remove PNG_SKIP_SETJMP_CHECK, which is not defined in version 1.6.22.
>
> [1] https://codereview.chromium.org/2033063003/diff/20001/public.bzl#newcode84
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2044703006
>
> Committed: https://skia.googlesource.com/skia/+/e6939c15dc0c09f1348988dc56e50b6bea27b7ce
TBR=benjaminwagner@google.com ,msarett@google.com,mtklein@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2090643002
2016-06-22 07:25:16 -07:00
scroggo
e6939c15dc
Bring back compiling third_party/libpng in public.bzl
...
Disable the optimizations for simplicity, as suggested in [1].
Remove PNG_SKIP_SETJMP_CHECK, which is not defined in version 1.6.22.
[1] https://codereview.chromium.org/2033063003/diff/20001/public.bzl#newcode84
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2044703006
Review-Url: https://codereview.chromium.org/2044703006
2016-06-21 14:13:40 -07:00
scroggo
faa9036ff1
Stop trying to build files that are not there
...
The bzl version of Skia does not have these files. Don't try to
build them.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2045263003
Review-Url: https://codereview.chromium.org/2045263003
2016-06-08 14:32:00 -07:00
scroggo
3965825b97
Check libpng directly into third_party/
...
With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.
This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.
- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2033063003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review-Url: https://codereview.chromium.org/2033063003
2016-06-02 12:59:59 -07:00
sdefresne
e3fa811657
[GN] Add support for disabling opts via SK_BUILD_NO_OPTS define.
...
When targetting iOS and using gyp to generate the build files, it is not
possible to select files to build depending on the architecture. Due to
that, the skia code was disabling all optimisation when SK_BUILD_FOR_IOS
was defined.
Since it is possible to select the correct optimised version when using
gn, this pessimisation is hurting the build. Introduce a new define to
disable the optimisation SK_BUILD_NO_OPTS. It will be used by Chromium
when building skia for iOS with gyp but not gn.
Define SK_BUILD_NO_OPTS along-side SK_BUILD_FOR_IOS for all files that
look like build configuration (Xcode projects, gyp configuration files,
public.bzl) in order to avoid introducing breakage on those builds.
BUG=607933
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002423002
Review-Url: https://codereview.chromium.org/2002423002
2016-06-01 07:08:56 -07:00
bungeman
13b9c95295
Move SkTypeface to sk_sp.
...
Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933393002
Review-Url: https://codereview.chromium.org/1933393002
2016-05-12 10:09:31 -07:00
scroggo
9a9a7b29e5
Revert of Move SkTypeface to sk_sp. (patchset #5 id:80001 of https://codereview.chromium.org/1933393002/ )
...
Reason for revert:
fontmgr_iterAndroid failing to draw emoji. E.g. https://gold.skia.org/search2?blame=6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm
Original issue's description:
> Move SkTypeface to sk_sp.
>
> Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
TBR=reed@google.com ,fmalita@chromium.org,tomhudson@google.com,bungeman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1974783002
2016-05-12 06:22:30 -07:00
bungeman
6296da736f
Move SkTypeface to sk_sp.
...
Review-Url: https://codereview.chromium.org/1933393002
2016-05-11 12:38:18 -07:00
msarett
ad3a5c634d
Compile SkForceLinking on CMake
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1956573002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review-Url: https://codereview.chromium.org/1956573002
2016-05-06 07:21:26 -07:00
benjaminwagner
83906aedb9
Patch in internal cl/121138374.
...
TBR=mtklein
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1939483002
Review-Url: https://codereview.chromium.org/1939483002
2016-05-01 15:02:25 -07:00
robertphillips
36736a2dae
Remove SkCanvas::LayerIter guard
...
The LayerIter is no longer required by the Bazel build.
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1917693002
Review URL: https://codereview.chromium.org/1917693002
2016-04-23 08:26:44 -07:00
robertphillips
cb61a6452f
Add compile guard for SkCanvas::LayerIter
...
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1911893002
Review URL: https://codereview.chromium.org/1911893002
2016-04-21 15:22:14 -07:00
brianosman
6d3119c9fc
Fix DM blaze build (PNG output is now dependent on picture_utils)
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1902333002
Review URL: https://codereview.chromium.org/1902333002
2016-04-19 19:41:54 -07:00
reed
2a04104ba0
exernalize imagefactory guard
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1897453002
TBR=
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1897453002
2016-04-15 10:56:52 -07:00
iroth
849b175c02
Separate private headers for condition inclusion in BUILD file.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1878753002
Review URL: https://codereview.chromium.org/1878753002
2016-04-11 13:45:51 -07:00
reed
efdfd51b68
switch maskfilters to sk_sp
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852113003
Review URL: https://codereview.chromium.org/1852113003
2016-04-04 10:02:58 -07:00
benjaminwagner
31dcc2a16f
Add SK_SUPPORT_LEGACY_IMAGEFILTER_PTR to public.bzl DEFINES to fix build.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1853773002
Review URL: https://codereview.chromium.org/1853773002
2016-04-01 06:54:35 -07:00
benjaminwagner
38d68bc31d
In public.bzl, change file locations after https://codereview.chromium.org/1815823002
...
Depends on https://codereview.chromium.org/1847923002
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842363002
Review URL: https://codereview.chromium.org/1842363002
2016-04-01 05:00:51 -07:00
reed
cfb6bdf767
switch xfermodes over to sk_sp
...
waiting on https://codereview.chromium.org/1835163002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832223002
Review URL: https://codereview.chromium.org/1832223002
2016-03-29 11:32:50 -07:00
msarett
5cd0ed38ab
Delete SkImageDecoder_empty
...
We no longer need this now that the Chrome build files have been
updated to use SkImageEncoder_none (which is an identical file).
TBR=djsollen@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832363002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1832363002
2016-03-28 13:57:10 -07:00
benjaminwagner
af3b35ec35
Remove GLFW from public.bzl.
...
Added in https://codereview.chromium.org/1842463002
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1835363002
Review URL: https://codereview.chromium.org/1835363002
2016-03-28 13:27:28 -07:00
msarett
c1d0312b22
Rename encoders to Sk*ImageEncoder
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1836493002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1836493002
2016-03-25 08:58:55 -07:00
fmalita
41c409634c
Relocate SK_SUPPORT_LEGACY_PICTURE_PTR
...
Move to platform-specific defines.
(Chromium already has this guard)
R=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1831053002
Review URL: https://codereview.chromium.org/1831053002
2016-03-24 11:05:29 -07:00
reed
e8f3062a36
switch surface to sk_sp
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1817383002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1817383002
2016-03-23 18:59:25 -07:00
reed
d053ce9c54
Reland of [2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o … (patchset #1 id:1 of https://codereview.chromium.org/1821103004/ )
...
Reason for revert:
guard has now landed in chrome
Original issue's description:
> Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o … (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ )
>
> Reason for revert:
> CreateModeFilter not compiling
>
> Original issue's description:
> > Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
> >
> > Fixed legacy withColorFilter to call new(er) make method
> >
> > This reverts commit 1eb81db650
.
> >
> > BUG=skia:
> > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
> >
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381
>
> TBR=
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d6889293dd0942f27f9593f679722c956831f2c4
TBR=
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:
Review URL: https://codereview.chromium.org/1827433002
2016-03-22 10:17:23 -07:00
reed
d6889293dd
Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o … (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ )
...
Reason for revert:
CreateModeFilter not compiling
Original issue's description:
> Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
>
> Fixed legacy withColorFilter to call new(er) make method
>
> This reverts commit 1eb81db650
.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381
TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1821103004
2016-03-22 08:59:19 -07:00
reed
4c9776b046
Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
...
Fixed legacy withColorFilter to call new(er) make method
This reverts commit 1eb81db650
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
TBR=
Review URL: https://codereview.chromium.org/1825073002
2016-03-22 08:10:17 -07:00
reed
1eb81db650
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
...
Reason for revert:
need to fix unguarded makeWithFilter
Original issue's description:
> switch colorfilters to sk_sp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
>
> Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1820303002
2016-03-22 07:35:17 -07:00
reed
f809d7687a
switch colorfilters to sk_sp
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
Review URL: https://codereview.chromium.org/1822623002
2016-03-22 07:23:24 -07:00
reed
7b380d0d0e
guard rasterizer and drawlooper setters
...
Need to land https://codereview.chromium.org/1823513002/ first
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1821533002
Review URL: https://codereview.chromium.org/1821533002
2016-03-21 13:25:16 -07:00
benjaminwagner
d9dd581566
Exclude new file in Google3 build.
...
The new file was added in https://codereview.chromium.org/1817633002
Review URL: https://codereview.chromium.org/1823703002
2016-03-21 10:45:01 -07:00
reed
b95f55510b
add SK_SUPPORT_LEGACY_PATHEFFECT_PTR for google3 roll fix
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1817113002
TBR=mtklein
NOTRY=True
Review URL: https://codereview.chromium.org/1817113002
2016-03-21 08:30:19 -07:00
msarett
fc0b6d1053
Add SkImageGeneratorWIC
...
This will be a replacement for SkImageDecoder_WIC.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1785613010
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1785613010
2016-03-17 13:50:18 -07:00
mtklein
9552ed31c1
Google3 apps are still using Create* shader methods.
...
This may need to go in DEFINES_ALL,
but definitely needs to affect the main _UNIX builds.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1808723002
Review URL: https://codereview.chromium.org/1808723002
2016-03-16 06:34:59 -07:00
benjaminwagner
ca26a180c3
Fix Google3 build by updating pdf path after https://codereview.chromium.org/1781773002
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1802553003
Review URL: https://codereview.chromium.org/1802553003
2016-03-14 15:21:12 -07:00
mtklein
3f193a9b9b
exclude src/ports/*CG* for all targets
...
We were not excluding it from iOS builds, which fails including MobileCoreServices.h. (Odd!)
Also remove some redudant exclusions of src/ports/SkImageDecoder_CG.cpp, and sorts.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782903002
Review URL: https://codereview.chromium.org/1782903002
2016-03-10 08:52:05 -08:00
msarett
6b4985c6d1
Do not compile CG on Google3 Linux/Android
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1783553003
Review URL: https://codereview.chromium.org/1783553003
2016-03-10 07:15:59 -08:00
benjaminwagner
f6bfccd562
Cleanups related to SkFixed.
...
This CL relands https://codereview.chromium.org/1683743005/ with two fixes:
- Removing the test for vertical text. Vertical text doesn't work on Windows and breakText isn't supported for non-trivial text.
- Omit PaintBreakTextTest in Google3 because we don't have the correct font setup yet.
Remove SK_FixedNaN. It does not seem to be supported or used anywhere in Skia, Chromium, Android, or Google3, (except accidentally by TwoPtRadial::kDontDrawT). I think supporting it would erase any benefit of SkFixed over float.
Remove SkBitmapFilter::lookup. It does not appear to be used anywhere in Skia, Chromium, Android, or Google3.
Fix a bug in SkPaint::breakText that limited it to ~5kB of text. Now it can handle more than 1GB.
BUG=skia:4632
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1683743005
Committed: https://skia.googlesource.com/skia/+/7ea5cb18389db11a94175de95c9db2b44972630c
patch from issue 1683743005 at patchset 120001 (http://crrev.com/1683743005#ps120001 )
Review URL: https://codereview.chromium.org/1739453002
2016-02-25 10:28:11 -08:00
benjaminwagner
bc9a9b4cdc
Fix DM_INCLUDES after https://codereview.chromium.org/1688543002
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1719253002
Review URL: https://codereview.chromium.org/1719253002
2016-02-22 13:30:39 -08:00
egdaniel
32119f1ba0
Fix to bazel build file to exclude vulkan files
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1723593002
Review URL: https://codereview.chromium.org/1723593002
2016-02-22 10:07:54 -08:00
msarett
2775cf548c
Speculative fix for Google3 iOS build
...
Now that SkImageGenerator is hooked up to use SkCodec by default,
we need to compile SkCodec in order to compile Skia.
The good news is that we can now turn on/off individual codecs.
This CL enables SkCodec on iOS, but does not turn on any of the
codecs that require third_party libraries.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1710493002
Review URL: https://codereview.chromium.org/1710493002
2016-02-17 14:14:25 -08:00
iroth
5f0de06c43
Enable GL interfaces for iOS build
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1703923002
Review URL: https://codereview.chromium.org/1703923002
2016-02-17 12:47:27 -08:00
msarett
8715d47e24
Make SkPicture/SkImageGenerator default to SkCodec
...
Remove reference to SkImageDecoder from SkPicture. Make the default
InstallPixelRefProc passed to CreateFromStream use
SkImageGenerator::NewFromEncoded instead.
Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
Remove the old version that used SkImageDecoder.
Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
now behaves lazily.
Update all clients to use the default.
Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.
This is a rebased version of:
https://codereview.chromium.org/1671193002/
TBR=reed@google.com
BUG=skia:4691
BUG=skia:4290
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1699183004
Review URL: https://codereview.chromium.org/1699183004
2016-02-17 10:02:29 -08:00
msarett
39b2d5a1ac
Individually enable and disable SkCodecs
...
BUG=skia:4956
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1702533004
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1702533004
2016-02-17 08:26:32 -08:00
iroth
ab669def65
Fix linker errors when skia_ios target is used a dependency of an iOS app.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1701153002
Review URL: https://codereview.chromium.org/1701153002
2016-02-16 19:17:01 -08:00
msarett
70e418b468
Make SkJpegCodec compatible with libjpeg
...
BUG=skia:4470
BUG=skia:4520
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1687863003
Review URL: https://codereview.chromium.org/1687863003
2016-02-12 12:35:49 -08:00
benjaminwagner
186e0b9f59
Enable RAW codec for Google3.
...
This CL depends on internal cl/113089689.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1692513003
Review URL: https://codereview.chromium.org/1692513003
2016-02-11 16:00:24 -08:00
kjlubick
1de415f2c3
Revert of Make SkPicture/SkImageGenerator default to SkCodec (patchset #7 id:120001 of https://codereview.chromium.org/1671193002/ )
...
Reason for revert:
Breaks Ubuntu and Mac CMAKE
Original issue's description:
> Make SkPicture/SkImageGenerator default to SkCodec
>
> Remove reference to SkImageDecoder from SkPicture. Make the default
> InstallPixelRefProc passed to CreateFromStream use
> SkImageGenerator::NewFromEncoded instead.
>
> Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
> Remove the old version that used SkImageDecoder.
>
> Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
> now behaves lazily.
>
> Update all clients to use the default.
>
> Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.
>
> BUG=skia:4691
> BUG=skia:4290
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002
>
> Committed: https://skia.googlesource.com/skia/+/026388a01864c74208ad57d1ba4f711602d101c6
TBR=msarett@google.com ,reed@google.com,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4691
Review URL: https://codereview.chromium.org/1685963004
2016-02-10 11:25:07 -08:00
scroggo
026388a018
Make SkPicture/SkImageGenerator default to SkCodec
...
Remove reference to SkImageDecoder from SkPicture. Make the default
InstallPixelRefProc passed to CreateFromStream use
SkImageGenerator::NewFromEncoded instead.
Make SkImageGenerator::NewFromEncoded create an SkCodecImageGenerator.
Remove the old version that used SkImageDecoder.
Remove all versions of lazy_decode_bitmap/LazyDecodeBitmap. The default
now behaves lazily.
Update all clients to use the default.
Move SkImageDecoderGenerator into KtxTest.cpp, and use it directly.
BUG=skia:4691
BUG=skia:4290
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1671193002
Review URL: https://codereview.chromium.org/1671193002
2016-02-10 11:15:21 -08:00
ethannicholas
3cb954245c
moved debugger support files from src/utils/debugger to tools/debugger
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1678893003
Review URL: https://codereview.chromium.org/1678893003
2016-02-09 12:44:06 -08:00
mtklein
e1fc452d92
update DM deps in g3 build
...
Added https://skia.googlesource.com/skia/+/f1d415188ffb4c34e2886c2cfceb363a148333f1
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1683803002
Review URL: https://codereview.chromium.org/1683803002
2016-02-09 12:32:52 -08:00
benjaminwagner
b1fe8f6f6f
Add dm to DM_INCLUDES to fix Google3 build.
...
It seems that #including a file in the same directory works without the directory being in INCLUDES, but https://codereview.chromium.org/1631053003 #included DMGpuSupport.h from a test.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1657703002
Review URL: https://codereview.chromium.org/1657703002
2016-02-01 09:05:08 -08:00
robertphillips
188d44c549
Move SkPixelXorXfermode.h to include/client/android
...
This intended to make clients aware that the SkPixelXorXfermode is Android-specific
This needs to land after the Chromium CL https://codereview.chromium.org/1647953006/ (Add include/client/android to skia .gn & .gypi files)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1645093002
Committed: https://skia.googlesource.com/skia/+/aa9cb62901075e9d2858353cb041e5e6d4719614
Review URL: https://codereview.chromium.org/1645093002
2016-02-01 04:54:15 -08:00
iroth
d2ccc772d4
Changes to public.bzl to support building on iOS with objc_library bazel target.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1639443002
Review URL: https://codereview.chromium.org/1639443002
2016-01-25 11:24:57 -08:00
benjaminwagner
89061ed2e7
Remove RAW Codec from Google3 build.
...
This should fix the build after https://codereview.chromium.org/1520403003 and allow the autoroller to complete. I will follow up to see if it will be simple to re-enable this codec.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1628393002
Review URL: https://codereview.chromium.org/1628393002
2016-01-25 09:29:09 -08:00
benjaminwagner
56f6d0652c
Reland of Move BUILD.public to public.bzl. (patchset #1 id:1 of https://codereview.chromium.org/1580923002/ )
...
Reason for revert:
Internal cl/111468120 is now ready to go.
Original issue's description:
> Revert of Move BUILD.public to public.bzl. (patchset #1 id:1 of https://codereview.chromium.org/1577353002/ )
>
> Reason for revert:
> Corresponding google-private changes not ready.
>
> Original issue's description:
> > Move BUILD.public to public.bzl.
> >
> > This allows building with bazel (see http://bazel.io ).
> >
> > BUG=skia:
> > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1577353002
> >
> > Committed: https://skia.googlesource.com/skia/+/eeebfff54877b24151570c4f02b2299e3f9ef967
>
> TBR=benjaminwagner@google.com ,mtklein@google.com
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/330043c073de2ee63faa1caa3cb4170da68a79f2
TBR=mtklein@google.com ,iroth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1584563004
2016-01-13 10:45:19 -08:00
iroth
330043c073
Revert of Move BUILD.public to public.bzl. (patchset #1 id:1 of https://codereview.chromium.org/1577353002/ )
...
Reason for revert:
Corresponding google-private changes not ready.
Original issue's description:
> Move BUILD.public to public.bzl.
>
> This allows building with bazel (see http://bazel.io ).
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1577353002
>
> Committed: https://skia.googlesource.com/skia/+/eeebfff54877b24151570c4f02b2299e3f9ef967
TBR=benjaminwagner@google.com ,mtklein@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1580923002
2016-01-12 14:22:24 -08:00
iroth
eeebfff548
Move BUILD.public to public.bzl.
...
This allows building with bazel (see http://bazel.io ).
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1577353002
Review URL: https://codereview.chromium.org/1577353002
2016-01-12 12:00:49 -08:00