msarett
b917e04d51
Update libjpeg-turbo to 1.4.90
...
Google3, Chrome, and Android are considering updates. Let's start
testing Skia on the newest version.
https://critique.corp.google.com/#review/116667446
https://codereview.chromium.org/1934113002
https://buganizer.corp.google.com/u/0/issues/28268702
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
Committed: https://skia.googlesource.com/skia/+/3994c161ec5a2b83e8f6bab4d9c469eec2668d92
Review-Url: https://codereview.chromium.org/1940903002
2016-05-02 10:43:22 -07:00
msarett
a13efa6906
Revert of Update libjpeg-turbo to 1.4.90 (patchset #1 id:20001 of https://codereview.chromium.org/1940903002/ )
...
Reason for revert:
Clang wants "strbeq" and gcc wants "streqb". Uggh.
https://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-Arm7-Debug-Android/builds/1766/steps/compile_skia%20on%20Mac/logs/stdio
Original issue's description:
> Update libjpeg-turbo to 1.4.90
>
> Google3, Chrome, and Android are considering updates. Let's start
> testing Skia on the newest version.
> https://critique.corp.google.com/#review/116667446
> https://codereview.chromium.org/1934113002
> https://buganizer.corp.google.com/u/0/issues/28268702
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
>
> Committed: https://skia.googlesource.com/skia/+/3994c161ec5a2b83e8f6bab4d9c469eec2668d92
TBR=scroggo@google.com ,djsollen@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/1937143002
2016-05-02 09:14:23 -07:00
msarett
3994c161ec
Update libjpeg-turbo to 1.4.90
...
Google3, Chrome, and Android are considering updates. Let's start
testing Skia on the newest version.
https://critique.corp.google.com/#review/116667446
https://codereview.chromium.org/1934113002
https://buganizer.corp.google.com/u/0/issues/28268702
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
Review-Url: https://codereview.chromium.org/1940903002
2016-05-02 07:48:59 -07:00
borenet
43bf511ead
Delete ChromeOS code
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926163002
Review-Url: https://codereview.chromium.org/1926163002
2016-04-29 14:01:34 -07:00
djsollen
affacce4c6
Require Android SDK copy of CMake to build Vulkan on Android.
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1930423002
Review-Url: https://codereview.chromium.org/1930423002
2016-04-29 08:09:43 -07:00
yujieqin
97920b4092
Update DNG SDK version
...
* Add PATENTS file
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1897773003
Review URL: https://codereview.chromium.org/1897773003
2016-04-24 08:14:57 -07:00
djsollen
12d62a7d51
VulkanViewer on Android
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003
Review URL: https://codereview.chromium.org/1903253003
2016-04-21 07:59:44 -07:00
egdaniel
cd07bedbe6
Update to ToT shaderc
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1898863002
Review URL: https://codereview.chromium.org/1898863002
2016-04-18 13:42:02 -07:00
mtklein
fbcfd6d060
mojo -> nojo
...
BUG=skia:4891
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1889543003
Review URL: https://codereview.chromium.org/1889543003
2016-04-14 09:42:34 -07:00
yujieqin
e34635dee1
Since PIEX can now return an uncompressed RGB thumbnail, check the type of the image before treating it as a JPEG.
...
Highlights of new PIEX:
* PIEX can now return JPEG compressed image or uncompressed RGB image
* Add IsOfType() and GEtNumberofBytesForIsOfType() to image_type_recognition_lite
* Add GetDngInformation() and GetOrientation() to piex
* Remove deprecated data entries from piex_types
BUG=b/27214608, b/28119810
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1883783002
Review URL: https://codereview.chromium.org/1883783002
2016-04-14 07:04:00 -07:00
yujieqin
4334ff29b4
Enable RAW codec for Windows
...
BUG=skia:4890 b/26973157
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1853093002
Review URL: https://codereview.chromium.org/1853093002
2016-04-06 06:47:15 -07:00
mtklein
77304a5b76
Get back on mainline libpng 1.6 now that 3bpp perf patches are merged.
...
Checked manually in Instruments that we're still running our SSE filters for both RGB and RGBA PNGs.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1865633002
Review URL: https://codereview.chromium.org/1865633002
2016-04-05 13:46:00 -07:00
mtklein
c19201f315
Roll up to use >=4.
...
d0513638e7
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1854293002
Review URL: https://codereview.chromium.org/1854293002
2016-04-04 13:48:41 -07:00
mtklein
85ad730113
Point libpng at upstream libpng 1.6 + my new perf patch.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852363002
Review URL: https://codereview.chromium.org/1852363002
2016-04-04 12:08:46 -07:00
egdaniel
b90e67f8ea
Update shaderc to ToT.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847643002
Review URL: https://codereview.chromium.org/1847643002
2016-03-31 06:16:32 -07:00
yujieqin
246723f7e7
Update to new DNG SDK: Integrate integer overflow fixes
...
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1801063002
Review URL: https://codereview.chromium.org/1801063002
2016-03-16 05:57:38 -07:00
msarett
6b563156eb
Update libjpeg-turbo with security fixes from upstream
...
This includes:
0463f7c9aa
a572622dd6
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789693002
Review URL: https://codereview.chromium.org/1789693002
2016-03-11 09:24:21 -08:00
borenet
51b56c9041
Move llvm from deps to deps_os
...
Re-upload of https://codereview.chromium.org/1721943003/
TBR=bsalomon
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782793003
Review URL: https://codereview.chromium.org/1782793003
2016-03-10 05:49:48 -08:00
yujieqin
412f534563
Update DNG SDK version.
...
* Integrate integer overflow changes from security branch
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
Committed: https://skia.googlesource.com/skia/+/62c0f75159674087079140e09ef1396316577754
Review URL: https://codereview.chromium.org/1748363004
2016-03-08 11:47:31 -08:00
bsalomon
de7bbab699
Pull and build shaderc rather than use checked in lib/header
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1760493003
Committed: https://skia.googlesource.com/skia/+/7d4490ecfa4d974003f675ef004e77f85ecfadd2
Review URL: https://codereview.chromium.org/1760493003
2016-03-03 15:43:04 -08:00
yujieqin
99354b81c3
Revert of Update DNG SDK version. (patchset #4 id:60001 of https://codereview.chromium.org/1748363004/ )
...
Reason for revert:
Sorry for breaking the build again...
Original issue's description:
> Update DNG SDK version.
>
> * Integrate integer overflow changes from security branch
>
> BUG=b/26535130
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
>
> Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
>
> Committed: https://skia.googlesource.com/skia/+/62c0f75159674087079140e09ef1396316577754
TBR=msarett@google.com ,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=b/26535130
Review URL: https://codereview.chromium.org/1755283004
2016-03-03 06:56:19 -08:00
yujieqin
62c0f75159
Update DNG SDK version.
...
* Integrate integer overflow changes from security branch
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
Review URL: https://codereview.chromium.org/1748363004
2016-03-03 06:41:48 -08:00
Eric Boren
b5f0d40935
Revert "Pull and build shaderc rather than use checked in lib/header"
...
This reverts commit 7d4490ecfa
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1757253002
Review URL: https://codereview.chromium.org/1757253002 .
2016-03-03 08:01:33 -05:00
bsalomon
7d4490ecfa
Pull and build shaderc rather than use checked in lib/header
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1760493003
Review URL: https://codereview.chromium.org/1760493003
2016-03-02 15:59:24 -08:00
yujieqin
62c9c4ba61
Revert of Update DNG SDK version. (patchset #3 id:40001 of https://codereview.chromium.org/1748363004/ )
...
Reason for revert:
This breaks the ChromeOS build. E.g. https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-CrOS_Link/builds/5215/steps/build%20most/logs/stdio
Original issue's description:
> Update DNG SDK version.
>
> * Integrate integer overflow changes from security branch
>
> BUG=b/26535130
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
>
> Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
TBR=msarett@google.com ,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=b/26535130
Review URL: https://codereview.chromium.org/1755743003
2016-03-02 04:57:09 -08:00
yujieqin
be2924ad17
Update DNG SDK version.
...
* Integrate integer overflow changes from security branch
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
Review URL: https://codereview.chromium.org/1748363004
2016-03-02 03:30:38 -08:00
yujieqin
cf16e67f84
Update PIEX: Prepares support for uncompressed thumbnails
...
The new version of PIEX added new API for adding support to thumbnails. It also marks some old API as deprecate.
BUG=b/26894354
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1723123002
Review URL: https://codereview.chromium.org/1723123002
2016-02-23 06:18:14 -08:00
msarett
91c22b2ea6
Use new jpeg_crop_scanlines() API to optimize jpeg subset decodes
...
This was adapted from:
https://codereview.chromium.org/1530933003
Subset Decode Runtime (Original / Optimized) on Nexus 6P
TopLeft 0.51x
TopRight 0.56x
Middle 0.71x
BottomLeft 0.79x
BottomRight 0.79x
BUG=skia:4256
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1719073002
Review URL: https://codereview.chromium.org/1719073002
2016-02-22 12:27:46 -08:00
msarett
740668d907
Update libpng to 1.6.22beta
...
Intel SSE filter optimizations have been upstreamed. Let's test on
the upstream version (which we can use in Android).
BUG=skia:4573
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1710083007
Review URL: https://codereview.chromium.org/1710083007
2016-02-19 11:14:43 -08:00
scroggo
77b798ce8e
Update the version of libpng used by Skia tests
...
The version of libpng we were using has some security vulnerabilities.
Update to a newer version - 1.6.20 (047737496a
/).
Update pnglibconf.h. The new version is a copy of the newer version of
the file, with our /* custom settings */ tacked onto the end. (The
custom settings are unchanged from the last version.)
Update the LICENSE. The new version is a copy of the LICENSE that
libpng now includes as a separate file.
Update the README file to reflect the change in source of the LICENSE
file.
BUG=skia:4573
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1453373003
Review URL: https://codereview.chromium.org/1453373003
2016-02-19 06:33:07 -08:00
yujieqin
879adccf60
Update PIEX version. This should solve the stack buffer overflow issue
...
BUG=skia:4902
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1690853003
Review URL: https://codereview.chromium.org/1690853003
2016-02-17 06:12:12 -08:00
mtklein
0da8537555
MSAN: build libc++ with MSAN, link to it.
...
The errors that we see should now change to the unexplainable,
rather than the explainable errors at head.
We suspect that the original reason to blacklist was this,
not building libc++ with MSAN. So unblacklist everything to start fresh.
BUG=skia:4903,skia:4900
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1694353004
Review URL: https://codereview.chromium.org/1694353004
2016-02-16 14:03:15 -08:00
msarett
dae774eff4
Sync DEPS to clang compatible arm v8 assembly for libjpeg-turbo
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1697623002
Review URL: https://codereview.chromium.org/1697623002
2016-02-12 13:06:30 -08:00
mtklein
c089ba5d69
followups
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693823005
Review URL: https://codereview.chromium.org/1693823005
2016-02-12 12:58:10 -08:00
mtklein
013475a272
Put all XSAN bots on the same DEPS-sourced build of Clang.
...
This adds LLVM, Clang, and compiler-rt (*san tools) to DEPS,
then uses them from xsan_build, building them if needed.
This is similar to how the CMake bots bootstrap CMake if needed.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693733003
Review URL: https://codereview.chromium.org/1693733003
2016-02-12 12:15:23 -08:00
mtklein
4e79f33452
msan: build expat from source
...
This should let us test it on the MSAN bot.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674053002
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot
Review URL: https://codereview.chromium.org/1674053002
2016-02-07 13:31:23 -08:00
halcanary
7a76f9c8f4
SkMojo: test linking Skia against the Mojo SDK
...
TODO: build on systems other than Linux.
Add mojo_skd to the DEPS.
Add a DM::Via called `mojo-`.
everything is hidden behind the gyp variable `skia_mojo`.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1644043003
Review URL: https://codereview.chromium.org/1644043003
2016-02-03 11:53:19 -08:00
bungeman
84de5c86f9
Roll third_party/externals/gyp 08429da795..87ac4d0e63fc (63 commits).
...
08429da795..87ac4d0e63
This is primarily to pick up changes to the CMake generator for Mac.
Review URL: https://codereview.chromium.org/1669503003
2016-02-03 11:25:26 -08:00
yujieqin
8f9447cf60
Update the dng_sdk version. The new version handles the posix_memalign() better
...
Remove the '-DNO_POSIX_MEMALIGN'
With this change, most new Android (API>=17) should be able to use posix_memalign()
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1655933002
Review URL: https://codereview.chromium.org/1655933002
2016-02-03 00:50:10 -08:00
yujieqin
076d83d09a
Enable RAW codec for Windows
...
* Use new DNG SDK version from ASOP, which fixed some build issues.
* Fix SkRawCodec.
* Fix gyp files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1641533004
Review URL: https://codereview.chromium.org/1641533004
2016-01-27 08:25:53 -08:00
yujieqin
8f5175842d
Update DEPS to use new PIEX version from AOSP.
...
Highlight:
* Better support for reading GPS tags
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1646433003
Review URL: https://codereview.chromium.org/1646433003
2016-01-27 07:32:43 -08:00
yujieqin
916de9ff18
Add RAW decoding into Skia.
...
TBR=reed@google.com
BUG=skia:
(Based on the work from ebrauer in https://codereview.chromium.org/1459473007 )
(Based on the work from adaubert in https://codereview.chromium.org/1494003003 )
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003
Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308
Review URL: https://codereview.chromium.org/1520403003
2016-01-25 08:26:16 -08:00
msarett
c85a9fde77
Revert of Prototype of RAW decoding in Skia. (patchset #32 id:610001 of https://codereview.chromium.org/1520403003/ )
...
Reason for revert:
A few build failures on Chrome OS/Android.
Original issue's description:
> Add RAW decoding into Skia.
>
> TBR=reed@google.com
>
> BUG=skia:
>
> (Based on the work from ebrauer in https://codereview.chromium.org/1459473007 )
> (Based on the work from adaubert in https://codereview.chromium.org/1494003003 )
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003
>
> Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308
TBR=scroggo@google.com ,adaubert@google.com,yujieqin@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/1635443002
2016-01-25 06:05:19 -08:00
yujieqin
6bd8639f8c
Add RAW decoding into Skia.
...
TBR=reed@google.com
BUG=skia:
(Based on the work from ebrauer in https://codereview.chromium.org/1459473007 )
(Based on the work from adaubert in https://codereview.chromium.org/1494003003 )
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003
Review URL: https://codereview.chromium.org/1520403003
2016-01-25 05:29:03 -08:00
joshualitt
e36d40e7fd
Update deps to pull microhttpd
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1620813004
Review URL: https://codereview.chromium.org/1620813004
2016-01-22 11:17:46 -08:00
scroggo
0ac723b6f4
Update libwebp to version 0.5.0
...
This is the version used by Android.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1601253003
Review URL: https://codereview.chromium.org/1601253003
2016-01-22 06:58:27 -08:00
benjaminwagner
e83c8ebbc4
Revert of Update libwebp to version 0.5.0 (patchset #2 id:20001 of https://codereview.chromium.org/1601253003/ )
...
Reason for revert:
Seems to be causing bots to fail:
https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Release-Android_NoNeon/builds/4032
https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3239
https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release/builds/1887
https://build.chromium.org/p/client.skia.fyi/builders/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify/builds/2075
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Debug/builds/2136
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3850
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug/builds/2078
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release/builds/2000
https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon/builds/4098
Original issue's description:
> Update libwebp to version 0.5.0
>
> This is the version used by Android.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1601253003
>
> Committed: https://skia.googlesource.com/skia/+/fe35455210294c3d9de9d0d9534743acfade523d
TBR=msarett@google.com ,scroggo@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/1601083004
2016-01-19 09:50:17 -08:00
scroggo
fe35455210
Update libwebp to version 0.5.0
...
This is the version used by Android.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1601253003
Review URL: https://codereview.chromium.org/1601253003
2016-01-19 08:54:18 -08:00
djsollen
950e626fb4
Update our version of jsoncpp to fix a memory alignment bug in the library.
...
This upgrades the library to 1.0.0 instead of the most recent release, since more recent releases require exceptions to be enabled.
BUG=skia:4775
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1575973003
Review URL: https://codereview.chromium.org/1575973003
2016-01-11 11:36:33 -08:00
msarett
5c2cbf23bb
Cherry pick one more commit into libjpeg-turbo
...
I forgot to add the last fix for the skip scanlines patch.
BUG=skia:
Review URL: https://codereview.chromium.org/1476483002
2015-11-24 07:14:35 -08:00
msarett
266f24aa94
Switch Skia's libjpeg-turbo to 1.4.2
...
The Android security team wants Android to be on the latest version
of libjpeg-turbo, so Skia should test on this version as well.
This shouldn't affect Gold.
I wouldn't be surprised if this causes a few ASAN/valgrind issues
that we need to fix.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/8e8eda9d4d2e6e65e3339eaaaf8144a4ef6c721c
Review URL: https://codereview.chromium.org/1469553002
2015-11-23 11:09:14 -08:00
msarett
4b9596109a
Revert of Switch Skia's libjpeg-turbo to 1.4.2 (patchset #2 id:160001 of https://codereview.chromium.org/1469553002/ )
...
Reason for revert:
Breaking jpeg decodes everywhere. I need to look into this.
Original issue's description:
> Switch Skia's libjpeg-turbo to 1.4.2
>
> The Android security team wants Android to be on the latest version
> of libjpeg-turbo, so Skia should test on this version as well.
>
> This shouldn't affect Gold.
>
> I wouldn't be surprised if this causes a few ASAN/valgrind issues
> that we need to fix.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/8e8eda9d4d2e6e65e3339eaaaf8144a4ef6c721c
TBR=scroggo@google.com ,djsollen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1468073002
2015-11-23 07:25:53 -08:00
msarett
8e8eda9d4d
Switch Skia's libjpeg-turbo to 1.4.2
...
The Android security team wants Android to be on the latest version
of libjpeg-turbo, so Skia should test on this version as well.
This shouldn't affect Gold.
I wouldn't be surprised if this causes a few ASAN/valgrind issues
that we need to fix.
BUG=skia:
Review URL: https://codereview.chromium.org/1469553002
2015-11-23 06:34:25 -08:00
halcanary
6950de6c41
Comments Style: s/skbug.com/bug.skia.org/
...
DOCS_PREVIEW= https://skia.org/?cl=1432503003
Review URL: https://codereview.chromium.org/1432503003
2015-11-07 05:29:00 -08:00
msarett
b747b90501
Remove dependencies on Android's forked decoder libraries
...
Disable SkImageDecoder's code which relies on Android's customized
libpng and libjpeg. Build standard versions of libpng and libjpeg-turbo
everywhere. The SkImageDecoder code has been replaced with SkCodec, which
can decode subsets using standard library APIs
BUG=skia:
Review URL: https://codereview.chromium.org/1406153015
2015-11-06 11:15:49 -08:00
halcanary
21adcb9fa0
DEPS: roll zlib: 20 new commits
...
List of changes at
4ba7cdd0e7..c4e33043fb
Of particular interest is
"Fix VC++ 2015 64-bit truncation warning in zlib".
Review URL: https://codereview.chromium.org/1416043007
2015-10-30 08:40:55 -07:00
joshualitt
b5068fce36
Update deps to pull sdl
...
BUG=skia:
Review URL: https://codereview.chromium.org/1425033003
2015-10-28 13:28:54 -07:00
hendrikw
aef4971443
skia: Roll latest angle
...
Required to fix a mac build error with command buffer, and possible
memory allocation issue when used with skia_angle on linux.
Review URL: https://codereview.chromium.org/1413403005
2015-10-27 13:34:31 -07:00
bungeman
13dd023882
Update Android FreeType version.
...
Update FreeType to a newer version. Because this caused issues in
finding the correct ftoptions.h and ftmodule.h [1], be sure to state
the ones we want explicitly.
This also add gzip.c which is needed for WOFF support [2].
[1] FreeType "Simplify header file hierarchy."
fae382076409db198dfbff36ac4cbb97b05b30a1
[2] FreeType "[gzip] New function `FT_Gzip_Uncompress'."
dc240524ff31891a442225430b28e9620c1fa89f
Review URL: https://codereview.chromium.org/833103004
2015-10-27 08:39:39 -07:00
scroggo
f174e92873
Update libwebp and resume testing scaled webp
...
libwebp has a fix for [1]. Update to the commit that contains the fix.
Update libwebp.gypi, corresponding to libwebp's latest makefile.
Turn back on DM testing for scaled webp, now that it should no longer
use uninitialized memory.
[1] https://code.google.com/p/webp/issues/detail?id=254
BUG=skia:4038
Committed: https://skia.googlesource.com/skia/+/0575d3e6c272744a66ab3281f9871366717df339
Review URL: https://codereview.chromium.org/1280073002
2015-10-01 10:56:08 -07:00
hendrikw
03ba61436b
skia: roll ANGLE and remove compile flags
...
Recent angle change allows us to remove some of the ANGLE specific
compile flags
Review URL: https://codereview.chromium.org/1376803003
2015-09-29 10:30:31 -07:00
hendrikw
caf2df8608
skia: ANGLE roll
...
Review URL: https://codereview.chromium.org/1337943008
2015-09-15 13:47:25 -07:00
mtklein
a22eabedef
CMake bot script
...
- Add CMake v3.3.1 (latest) to DEPS.
- Add cmake/bot-cmake.sh to bootstrap CMake then build Skia using that.
Works on my Mac and Linux box, both with no system CMake installation.
CMake will be ~100M on disk. The first bootstrap takes a couple minutes,
and a no-op re-run of bot-cmake.sh takes 15-20 seconds. I thought about
having bot-cmake.sh fetch CMake instead of DEPS, but I'm not sure I can
handle updates, etc. as robustly as it can.
This will only work on Linux and Mac. CMake requires an older CMake on
Windows. It doesn't have an equivalent ./bootstrap there. Will have to
think about how Windows bots will work!
BUG=skia:4269
Review URL: https://codereview.chromium.org/1339603003
2015-09-14 10:02:50 -07:00
msarett
0e6ff3882d
Update giflib to 5.1.1 (AOSP hash)
...
This also disables warnings in giflib and fixes
compile warnings in icu, in order to fix a skia
bug.
BUG=skia:4220
Review URL: https://codereview.chromium.org/1314633002
2015-08-24 12:00:15 -07:00
msarett
3011711d5d
Revert of Update skia to test with libpng to 1.6.10 (patchset #3 id:60001 of https://codereview.chromium.org/1301523005/ )
...
Reason for revert:
DM is failing on gm tests on Android bots. Cause is not yet clear.
Original issue's description:
> Update skia to test with libpng to 1.6.10
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/f272bb03df9b86e7ea2cf23fb4d5cc56624e0118
TBR=djsollen@google.com ,scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1298223002
2015-08-18 11:36:44 -07:00
msarett
f272bb03df
Update skia to test with libpng to 1.6.10
...
BUG=skia:
Review URL: https://codereview.chromium.org/1301523005
2015-08-18 10:46:01 -07:00
mtklein
dcbaa8ab6d
Revert of Depend on ETC1 via DEPS instead of a direct third_party checkin. (patchset #1 id:1 of https://codereview.chromium.org/1296253003/ )
...
Reason for revert:
This will make the google3 roll awkward. Reverting.
Original issue's description:
> Depend on ETC1 via DEPS instead of a direct third_party checkin.
>
> Yes, this does mean we'll check out ~40M of code for 2 files...
>
> I think these trybots are moot... they gclient sync before patching.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ca01d179347b5e848ded97c8228b79ffc6b5e7bf
TBR=robertphillips@google.com ,djsollen@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1290913008
2015-08-17 11:15:00 -07:00
mtklein
ca01d17934
Depend on ETC1 via DEPS instead of a direct third_party checkin.
...
Yes, this does mean we'll check out ~40M of code for 2 files...
I think these trybots are moot... they gclient sync before patching.
BUG=skia:
Review URL: https://codereview.chromium.org/1296253003
2015-08-17 10:20:16 -07:00
msarett
fcaaadee71
Switching Skia to chromium's libjpeg-turbo
...
Compile SkJpegCodec and SkImageDecoder_libjpeg with
chromium's libjpeg-turbo. SkImageDecoder_libjpeg still uses
libjpeg on Android and the Android framework. SkJpegCodec is
still not compiled on the Android framework.
BUG=skia:
Review URL: https://codereview.chromium.org/1275773004
2015-08-11 13:32:54 -07:00
scroggo
0df0e43488
Revert of Update libwebp and resume testing scaled webp (patchset #2 id:20001 of https://codereview.chromium.org/1280073002/ )
...
Reason for revert:
Compile failures, e.g.
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon/builds/1427/steps/build%20most/logs/stdio
Original issue's description:
> Update libwebp and resume testing scaled webp
>
> libwebp has a fix for [1]. Update to the commit that contains the fix.
>
> Update libwebp.gypi, corresponding to libwebp's latest makefile.
>
> Turn back on DM testing for scaled webp, now that it should no longer
> use uninitialized memory.
>
> Fix a warning in config.h
>
> [1] https://code.google.com/p/webp/issues/detail?id=254
>
> BUG=skia:4038
>
> Committed: https://skia.googlesource.com/skia/+/0575d3e6c272744a66ab3281f9871366717df339
TBR=djsollen@google.com ,msarett@google.com,scroggo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4038
Review URL: https://codereview.chromium.org/1278173004
2015-08-07 12:53:25 -07:00
scroggo
0575d3e6c2
Update libwebp and resume testing scaled webp
...
libwebp has a fix for [1]. Update to the commit that contains the fix.
Update libwebp.gypi, corresponding to libwebp's latest makefile.
Turn back on DM testing for scaled webp, now that it should no longer
use uninitialized memory.
Fix a warning in config.h
[1] https://code.google.com/p/webp/issues/detail?id=254
BUG=skia:4038
Review URL: https://codereview.chromium.org/1280073002
2015-08-07 12:49:16 -07:00
hendrikw
4e34001ec0
Skia: ANGLE Roll
...
Includes fix for vertex index.
BUG=510585
Review URL: https://codereview.chromium.org/1246143005
2015-07-23 11:56:40 -07:00
hendrikw
10b371c6e3
ANGLE deps roll
...
If we ever want to allow the command buffer as a skia gles2 backend,
we need a more up to date version of ANGLE, specifically there are
4 defines that differ between newer and older versions of ANGLE which
we use in skia, I've updated these in this change.
I'm not quite sure if what I've done for the 'angle_path' is correct,
I tried setting it to a path relative to skia, and to '<(DEPTH)', both
of which do not compile correctly, only '../' worked.
Committed: https://skia.googlesource.com/skia/+/db0b1e796ddbd08e6be8a666537318b1c0e2ce56
Review URL: https://codereview.chromium.org/1244843003
2015-07-21 14:50:08 -07:00
hendrikw
cd94d7341f
Revert of skia: ANGLE deps roll (patchset #1 id:1 of https://codereview.chromium.org/1244843003/ )
...
Reason for revert:
Compile error that the try bots didn't catch :(
Original issue's description:
> ANGLE deps roll
>
> If we ever want to allow the command buffer as a skia gles2 backend,
> we need a more up to date version of ANGLE, specifically there are
> 4 defines that differ between newer and older versions of ANGLE which
> we use in skia, I've updated these in this change.
>
> I'm not quite sure if what I've done for the 'angle_path' is correct,
> I tried setting it to a path relative to skia, and to '<(DEPTH)', both
> of which do not compile correctly, only '../' worked.
>
> Committed: https://skia.googlesource.com/skia/+/db0b1e796ddbd08e6be8a666537318b1c0e2ce56
TBR=bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1245223007
2015-07-21 14:06:10 -07:00
hendrikw
db0b1e796d
ANGLE deps roll
...
If we ever want to allow the command buffer as a skia gles2 backend,
we need a more up to date version of ANGLE, specifically there are
4 defines that differ between newer and older versions of ANGLE which
we use in skia, I've updated these in this change.
I'm not quite sure if what I've done for the 'angle_path' is correct,
I tried setting it to a path relative to skia, and to '<(DEPTH)', both
of which do not compile correctly, only '../' worked.
Review URL: https://codereview.chromium.org/1244843003
2015-07-21 13:18:27 -07:00
msarett
02b5aa3cac
Fixed valgrind issues with libjpeg-turbo
...
The fixes are in the updated libjpeg-turbo repository
pulled in by DEPS. The fixes are detailed in the linked
skia bug. To summarize briefly, we now use calloc()
instead of malloc().
BUG=skia:4030
Review URL: https://codereview.chromium.org/1237213004
2015-07-14 14:39:59 -07:00
scroggo
139491fbaa
Use the upstream version of libwebp, v0.4.3.
...
DEPS:
Update to pull v0.4.3 of libwebp from upstream
gyp/libwebp.gyp:
Add new files, as referenced by the gyp file used by Chromium.
resource/tests:
Add regression tests for particular images.
BUG=skia:3442
BUG=skia:3315
BUG=skia:3429
Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1
Review URL: https://codereview.chromium.org/1178013008
2015-07-10 09:32:09 -07:00
scroggo
c1d1dd738e
Revert of Use the upstream version of libwebp, v0.4.3. (patchset #6 id:70001 of https://codereview.chromium.org/1178013008/ )
...
Reason for revert:
Breaking the build e.g. http://build.chromium.org/p/client.skia/builders/Perf-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release/builds/1082/steps/build%20nanobench/logs/stdio
../../../third_party/externals/libwebp/src/utils/./endian_inl.h:51:10: error: use of unknown builtin '__builtin_bswap16' [-Wimplicit-function-declaration]
return __builtin_bswap16(x);
^
1 error generated.
Original issue's description:
> Use the upstream version of libwebp, v0.4.3.
>
> DEPS:
> Update to pull v0.4.3 of libwebp from upstream
>
> gyp/libwebp.gyp:
> Add new files, as referenced by the gyp file used by Chromium.
>
> resource/tests:
> Add regression tests for particular images.
>
> BUG=skia:3442
> BUG=skia:3315
> BUG=skia:3429
>
> Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1
TBR=djsollen@google.com ,jzern@chromium.org,msarett@google.com,emmaleer@google.com,scroggo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3442
Review URL: https://codereview.chromium.org/1223583004
2015-07-08 10:57:22 -07:00
scroggo
3aa0fb4d80
Use the upstream version of libwebp, v0.4.3.
...
DEPS:
Update to pull v0.4.3 of libwebp from upstream
gyp/libwebp.gyp:
Add new files, as referenced by the gyp file used by Chromium.
resource/tests:
Add regression tests for particular images.
BUG=skia:3442
BUG=skia:3315
BUG=skia:3429
Review URL: https://codereview.chromium.org/1178013008
2015-07-08 10:48:40 -07:00
msarett
1c8a587120
Add libjpeg-turbo library (depends on yasm)
...
Mangle external function names to avoid conflict with libjpeg
Take advantage of direct color conversion (RGBA, BGRA, 565)
Prepare to use jpeg_skip_scanlines (when it is upstreamed)
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75
Committed: https://skia.googlesource.com/skia/+/40141b57f061fbfcc2fa38da942d9efe25aca4d0
Review URL: https://codereview.chromium.org/1180983002
2015-07-07 08:50:01 -07:00
jvanverth
94a2fbc6cf
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #29 id:750001 of https://codereview.chromium.org/1180983002/ )
...
Reason for revert:
DEPS roll failing
Original issue's description:
> Add libjpeg-turbo library (depends on yasm)
> Mangle external function names to avoid conflict with libjpeg
> Take advantage of direct color conversion (RGBA, BGRA, 565)
> Prepare to use jpeg_skip_scanlines (when it is upstreamed)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
>
> Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
>
> Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75
>
> Committed: https://skia.googlesource.com/skia/+/40141b57f061fbfcc2fa38da942d9efe25aca4d0
TBR=scroggo@google.com ,djsollen@google.com,emmaleer@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1226543003
2015-07-02 10:40:24 -07:00
jvanverth
f1b44cb6f7
Revert of Fix libjpeg-turbo deps file (patchset #2 id:2 of https://codereview.chromium.org/1216303007/ )
...
Reason for revert:
DEPS roll failing
Original issue's description:
> Fix libjpeg-turbo deps file
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4380f06a124c28a47dc99956d48c2d4c5bcb78e0
TBR=msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1226453003
2015-07-02 10:35:08 -07:00
Matt Sarett
4380f06a12
Fix libjpeg-turbo deps file
...
BUG=skia:
Review URL: https://codereview.chromium.org/1216303007 .
2015-07-01 18:56:52 -04:00
msarett
40141b57f0
Add libjpeg-turbo library (depends on yasm)
...
Mangle external function names to avoid conflict with libjpeg
Take advantage of direct color conversion (RGBA, BGRA, 565)
Prepare to use jpeg_skip_scanlines (when it is upstreamed)
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75
Review URL: https://codereview.chromium.org/1180983002
2015-07-01 14:41:02 -07:00
msarett
aa2a7de0ff
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #28 id:710001 of https://codereview.chromium.org/1180983002/ )
...
Reason for revert:
Broke iOS build.
Original issue's description:
> Add libjpeg-turbo library (depends on yasm)
> Mangle external function names to avoid conflict with libjpeg
> Take advantage of direct color conversion (RGBA, BGRA, 565)
> Prepare to use jpeg_skip_scanlines (when it is upstreamed)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
>
> Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
>
> Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75
TBR=scroggo@google.com ,djsollen@google.com,emmaleer@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1213093003
2015-07-01 13:11:08 -07:00
msarett
e9e3ee33f3
Add libjpeg-turbo library (depends on yasm)
...
Mangle external function names to avoid conflict with libjpeg
Take advantage of direct color conversion (RGBA, BGRA, 565)
Prepare to use jpeg_skip_scanlines (when it is upstreamed)
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
Review URL: https://codereview.chromium.org/1180983002
2015-07-01 12:36:18 -07:00
msarett
f657b1093e
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #25 id:680001 of https://codereview.chromium.org/1180983002/ )
...
Reason for revert:
yasm is leaking memory :(.
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN/builds/926/steps/build%20dm/logs/stdio
Original issue's description:
> Add libjpeg-turbo library (depends on yasm)
> Mangle external function names to avoid conflict with libjpeg
> Take advantage of direct color conversion (RGBA, BGRA, 565)
> Prepare to use jpeg_skip_scanlines (when it is upstreamed)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
>
> Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
TBR=scroggo@google.com ,djsollen@google.com,emmaleer@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1214023003
2015-06-29 10:30:59 -07:00
msarett
f8bf9181d7
Add libjpeg-turbo library (depends on yasm)
...
Mangle external function names to avoid conflict with libjpeg
Take advantage of direct color conversion (RGBA, BGRA, 565)
Prepare to use jpeg_skip_scanlines (when it is upstreamed)
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
Review URL: https://codereview.chromium.org/1180983002
2015-06-29 10:14:11 -07:00
mtklein
c0bdecb920
Revert of Switch SkJpegCode to libjpeg-turbo (patchset #11 id:540001 of https://codereview.chromium.org/1180983002/ )
...
Reason for revert:
https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-MipsDSP2-Debug-Android/builds/1136/steps/build%20most/logs/stdio
Original issue's description:
> Add libjpeg-turbo library (depends on yasm)
> Mangle external function names to avoid conflict with libjpeg
> Take advantage of direct color conversion (RGBA, BGRA, 565)
> Prepare to use jpeg_skip_scanlines (when it is upstreamed)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
TBR=scroggo@google.com ,djsollen@google.com,emmaleer@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1199253006
2015-06-24 15:14:48 -07:00
msarett
b60c3f8291
Add libjpeg-turbo library (depends on yasm)
...
Mangle external function names to avoid conflict with libjpeg
Take advantage of direct color conversion (RGBA, BGRA, 565)
Prepare to use jpeg_skip_scanlines (when it is upstreamed)
BUG=skia:
Review URL: https://codereview.chromium.org/1180983002
2015-06-24 15:10:25 -07:00
bungeman
a35778ba32
Roll third_party/externals/gyp dd831fd:08429da
...
Summary of changes available at:
dd831fd..08429da
Review URL: https://codereview.chromium.org/1162453005
2015-06-01 07:25:18 -07:00
halcanary
7be0ce0ab1
SkPDF: Add Sfntly to DEPS, gyp
...
Note: this can be disabled via:
GYP_DEFINES='skia_pdf_use_sfntly=0
Warning: dm is 34% slower and uses 9% more memory. This is
okay.
Motivation: We want to test this code path in DM, since it is
always used by Chromium and Android.
BUG=skia:3563
Committed: https://skia.googlesource.com/skia/+/6a53b04e26749ea61f690ece408f2a1c0a5ad5bb
Review URL: https://codereview.chromium.org/1134683006
2015-05-18 13:15:56 -07:00
halcanary
9bedfc23fe
Revert of SkPDF: Add Sfntly to DEPS, gyp, SkUserConfig (patchset #7 id:570001 of https://codereview.chromium.org/1134683006/ )
...
Reason for revert:
break cros build
Original issue's description:
> SkPDF: Add Sfntly to DEPS, gyp
>
> Note: this can be disabled via:
> GYP_DEFINES='skia_pdf_use_sfntly=0
>
> Warning: dm is 34% slower and uses 9% more memory. This is
> okay.
>
> Motivation: We want to test this code path in DM, since it is
> always used by Chromium and Android.
>
> BUG=skia:3563
>
> Committed: https://skia.googlesource.com/skia/+/6a53b04e26749ea61f690ece408f2a1c0a5ad5bb
TBR=reed@google.com ,mtklein@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3563
Review URL: https://codereview.chromium.org/1128353004
2015-05-18 10:27:16 -07:00
halcanary
6a53b04e26
SkPDF: Add Sfntly to DEPS, gyp
...
Note: this can be disabled via:
GYP_DEFINES='skia_pdf_use_sfntly=0
Warning: dm is 34% slower and uses 9% more memory. This is
okay.
Motivation: We want to test this code path in DM, since it is
always used by Chromium and Android.
BUG=skia:3563
Review URL: https://codereview.chromium.org/1134683006
2015-05-18 10:18:58 -07:00
scroggo
29ccd898d1
Update our libjpeg to the version used by Chromium.
...
We had previously not updated since 2013. This includes the fix
for http://seclists.org/fulldisclosure/2013/Nov/83
BUG=skia:3744
Review URL: https://codereview.chromium.org/1097943002
2015-04-20 06:58:49 -07:00
borenet
a49a742f76
Roll common DEPS: fix string concat error in gs_utils upload
...
TBR=jcgregorio
BUG=skia:3723
Review URL: https://codereview.chromium.org/1057653006
2015-04-15 04:49:32 -07:00
borenet
b5de630d10
Update common DEPS: adding retries to GS upload
...
BUG=skia:3723
Review URL: https://codereview.chromium.org/1083663006
2015-04-14 10:37:33 -07:00
djsollen
7178a3b595
Update DEPS to use a cloned copy of libpng
...
BUG=skia:3689
Review URL: https://codereview.chromium.org/1077673002
2015-04-09 07:33:23 -07:00
msarett
6d0e7b2031
WIP: Added support for giflib, updated jpeg and png
...
BUG=skia:3257
Committed: https://skia.googlesource.com/skia/+/255dcd11992ebe74eb54202c48cf5394d33a8ce6
Review URL: https://codereview.chromium.org/1038863003
2015-03-30 07:52:52 -07:00
borenet
00c95098c3
Revert of WIP: Added support for giflib, updated jpeg and png (patchset #8 id:260001 of https://codereview.chromium.org/1038863003/ )
...
Reason for revert:
Trying out revert to see if it fixes Android bots.
Original issue's description:
> WIP: Added support for giflib, updated jpeg and png
>
> BUG=skia:3257
>
> Committed: https://skia.googlesource.com/skia/+/255dcd11992ebe74eb54202c48cf5394d33a8ce6
TBR=djsollen@google.com ,scroggo@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3257
Review URL: https://codereview.chromium.org/1048713003
2015-03-30 05:51:49 -07:00
msarett
255dcd1199
WIP: Added support for giflib, updated jpeg and png
...
BUG=skia:3257
Review URL: https://codereview.chromium.org/1038863003
2015-03-27 12:17:00 -07:00
scroggo
f24f2247c2
Add SkCodec, including PNG implementation.
...
DM:
Add a flag to use SkCodec instead of SkImageDecoder.
SkCodec:
Base class for codecs, allowing creation from an SkStream or an SkData.
An SkCodec, on creation, knows properties of the data like its width and height. Further calls can be used to generate the image.
TODO: Add scanline iterator
SkPngCodec:
New decoder for png. Wraps libpng. The code has been repurposed from SkImageDecoder_libpng.
TODO: Handle other destination colortypes
TODO: Substitute the transpose color
TODO: Allow silencing warnings
TODO: Use RGB instead of filler?
TODO: sRGB
SkSwizzler:
Simplified version of SkScaledSampler. Unlike the sampler, this object does no sampling.
TODO: Implement other swizzles.
Requires a gclient sync to pull down libpng.
BUG=skia:3257
Committed: https://skia.googlesource.com/skia/+/ca358852b4fed656d11107b2aaf28318a4518b49
(and then reverted)
Review URL: https://codereview.chromium.org/930283002
2015-03-03 08:59:20 -08:00
scroggo
ee1a726aed
Revert of Add SkCodec, including PNG implementation. (patchset #24 id:460001 of https://codereview.chromium.org/930283002/ )
...
Reason for revert:
Breaking windows bots all over the place :(
Original issue's description:
> Add SkCodec, including PNG implementation.
>
> DM:
> Add a flag to use SkCodec instead of SkImageDecoder.
>
> SkCodec:
> Base class for codecs, allowing creation from an SkStream or an SkData.
> An SkCodec, on creation, knows properties of the data like its width and height. Further calls can be used to generate the image.
> TODO: Add scanline iterator
>
> SkPngCodec:
> New decoder for png. Wraps libpng. The code has been repurposed from SkImageDecoder_libpng.
> TODO: Handle other destination colortypes
> TODO: Substitute the transpose color
> TODO: Allow silencing warnings
> TODO: Use RGB instead of filler?
> TODO: sRGB
>
> SkSwizzler:
> Simplified version of SkScaledSampler. Unlike the sampler, this object does no sampling.
> TODO: Implement other swizzles.
>
> BUG=skia:3257
>
> Committed: https://skia.googlesource.com/skia/+/ca358852b4fed656d11107b2aaf28318a4518b49
TBR=reed@google.com ,djsollen@google.com,msarett@google.com,mtklein@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3257
Review URL: https://codereview.chromium.org/972743003
2015-03-02 12:31:12 -08:00
scroggo
ca358852b4
Add SkCodec, including PNG implementation.
...
DM:
Add a flag to use SkCodec instead of SkImageDecoder.
SkCodec:
Base class for codecs, allowing creation from an SkStream or an SkData.
An SkCodec, on creation, knows properties of the data like its width and height. Further calls can be used to generate the image.
TODO: Add scanline iterator
SkPngCodec:
New decoder for png. Wraps libpng. The code has been repurposed from SkImageDecoder_libpng.
TODO: Handle other destination colortypes
TODO: Substitute the transpose color
TODO: Allow silencing warnings
TODO: Use RGB instead of filler?
TODO: sRGB
SkSwizzler:
Simplified version of SkScaledSampler. Unlike the sampler, this object does no sampling.
TODO: Implement other swizzles.
BUG=skia:3257
Review URL: https://codereview.chromium.org/930283002
2015-03-02 12:23:48 -08:00
scroggo
3da9181cd5
On windows, build zlib as a static library.
...
Partially in preparation for building libpng on Windows.
Also, this makes us consistent across platforms for PDF.
Uses the version of zlib checked into the Chromium tree.
Remove miniz, which is replaced by zlib.
Review URL: https://codereview.chromium.org/966963002
2015-03-02 06:24:15 -08:00
bsalomon
c78ae2d2bb
roll gyp
...
TBR=mtklein@google.com
Review URL: https://codereview.chromium.org/954673003
2015-02-25 08:58:09 -08:00
bsalomon
17203020d7
Roll ANGLE
...
TBR=egdaniel@google.com
Review URL: https://codereview.chromium.org/946293005
2015-02-23 06:57:54 -08:00
mtklein
d160192fd9
Revert of GYP groudwork for half-float opts support. (patchset #1 id:1 of https://codereview.chromium.org/915693002/ )
...
Reason for revert:
Going to punt on 16-bit float support for now. Can't figure out ARM 64.
Original issue's description:
> GYP groudwork for half-float opts support.
>
> This sets us up two new opts targets with the immediate goal of adding half-float (SkHalf.h) opts:
> - opts_neon_fp16: uses hardware support on most ARM chips with NEON to do 4 conversions at a time;
> - opts_avx: uses hardware support on Intel chips with AVX to do 8 conversions at a time.
>
> opts_avx will be a handy thing to have around later too, especially if we want to work with floats.
>
> This doesn't actually add any new source files to these libraries yet, so they're no-ops for now.
> I'll need to write a parallel change to Chrome's GN and GYPs before we can start adding sources.
>
> This also rolls GYP up to head, to get suppport for EnableEnhancedInstructionSet: '3' on Windows,
> which is how we turn on AVX there. There's no Mac-specific flag, so we use OTHER_CPLUSPLUSFLAGS.
>
> BUG=skia:
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/46b80833394d7919cadf2abf2b93802141dd21c5
TBR=reed@google.com ,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/912223002
2015-02-10 18:18:18 -08:00
mtklein
46b8083339
GYP groudwork for half-float opts support.
...
This sets us up two new opts targets with the immediate goal of adding half-float (SkHalf.h) opts:
- opts_neon_fp16: uses hardware support on most ARM chips with NEON to do 4 conversions at a time;
- opts_avx: uses hardware support on Intel chips with AVX to do 8 conversions at a time.
opts_avx will be a handy thing to have around later too, especially if we want to work with floats.
This doesn't actually add any new source files to these libraries yet, so they're no-ops for now.
I'll need to write a parallel change to Chrome's GN and GYPs before we can start adding sources.
This also rolls GYP up to head, to get suppport for EnableEnhancedInstructionSet: '3' on Windows,
which is how we turn on AVX there. There's no Mac-specific flag, so we use OTHER_CPLUSPLUSFLAGS.
BUG=skia:
TBR=reed@google.com
Review URL: https://codereview.chromium.org/915693002
2015-02-10 09:17:05 -08:00
mtklein
449998d3f0
Revert of Roll libwebp to v0.4.2 (latest stable) to fix annoying build warning. (patchset #1 id:1 of https://codereview.chromium.org/807553002/ )
...
Reason for revert:
uses __builtins not available on all our compilers
Original issue's description:
> Roll libwebp to v0.4.2 (latest stable) to fix annoying build warning.
>
> This warning should now go away:
>
> ../../third_party/externals/libwebp/src/enc/quant.c:105:23: warning: unused variable 'kCoeffThresh' [-Wunused-const-variable]
> static const uint16_t kCoeffThresh[16] = {
>
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/e655557a551c545f4153b0764269298cd01cd0c0
TBR=caryclark@google.com ,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/795823005
2014-12-15 12:23:00 -08:00
mtklein
e655557a55
Roll libwebp to v0.4.2 (latest stable) to fix annoying build warning.
...
This warning should now go away:
../../third_party/externals/libwebp/src/enc/quant.c:105:23: warning: unused variable 'kCoeffThresh' [-Wunused-const-variable]
static const uint16_t kCoeffThresh[16] = {
BUG=skia:
Review URL: https://codereview.chromium.org/807553002
2014-12-15 12:11:49 -08:00
bsalomon
81a6c3cc75
Roll ANGLE
...
BUG=skia:3192
Review URL: https://codereview.chromium.org/788373002
2014-12-12 08:46:38 -08:00
mtklein
76b3ac9eff
Simplfy DEPS: always pull all deps, remove unused barelinux platform.
...
Left some notes about where we might further clean up.
BUG=skia:
Review URL: https://codereview.chromium.org/753633002
2014-11-21 11:41:35 -08:00
bungeman
e454327d73
Roll gyp.
...
Summary of changes available at:
3917682a16..f1c42f73e4
Review URL: https://codereview.chromium.org/724883002
2014-11-13 11:21:30 -08:00
bungeman
bd1b76c40c
Roll common to d7c2e2b9464.
...
Picks up code removal and changes to download_file.
https://skia.googlesource.com/common.git/+log/5eee100ab..d7c2e2b9464
Review URL: https://codereview.chromium.org/700763003
2014-11-04 07:55:41 -08:00
mtklein
efb7e42e37
Add harfbuzz to DEPS
...
https://skia.googlesource.com/third_party/harfbuzz/
BUG=skia:3067
Review URL: https://codereview.chromium.org/679733002
2014-10-24 10:20:22 -07:00
jcgregorio
cee4ddf1c4
Re-add in v8 to DEPS.
...
BUG=skia:
Review URL: https://codereview.chromium.org/673713004
2014-10-24 05:57:37 -07:00
borenet
dc89ca56e6
Add recreate_skps script
...
BUG=skia:3008
Review URL: https://codereview.chromium.org/655313003
2014-10-17 07:37:05 -07:00
mtklein
71b5628a37
Pull nanomsg from our mirror instead of from github.
...
https://skia.googlesource.com/third_party/nanomsg/
BUG=skia:3027
Review URL: https://codereview.chromium.org/657113004
2014-10-16 09:23:17 -07:00
Thiago Farina
8f1f7f821c
Use the function recently added to common in svndiff.py
...
GetModifiedFiles() function was added to common repo in
https://skia.googlesource.com/common/+/af1de867422c42855ae54ed3838c62ea445ea6b4
BUG=None
TEST=None
R=borenet@google.com
Review URL: https://codereview.chromium.org/634313006
2014-10-10 00:25:29 -03:00
epoger
2c4352bb9d
rebaseline_server: allow users to generate SKP diff patches on a shared instance
...
This will allow developers to maintain SKP baselines without ever running their
own rebaseline_server instance!
For now, the developer must manually apply the resulting patchset to his local
Skia checkout to actually modify expectations; in the near future, we hope to
make the UI upload the patchset to Rietveld on the user's behalf.
BUG=skia:1918
NOTRY=true
R=stephana@google.com , rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/487853004
2014-08-20 08:00:28 -07:00
mtklein
3ba54fa0ad
Roll jsoncpp, drop dependency on Chromium overrides.
...
This rolls jsoncpp to head, crucially past "Added missing includes for
std::istream." which has given us some grief in the past. And it's required to
build jsoncpp against libc++.
Vanilla jsoncpp works just fine for us, so no need for Chromium's overrides.
Like all DEPS, only tools depend on jsoncpp.
BUG=skia:
R=bungeman@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/481823003
2014-08-19 07:21:00 -07:00
epoger
536e9539b4
roll common deps
...
NOTRY=true
R=borenet@google.com
TBR=borenet
Author: epoger@google.com
Review URL: https://codereview.chromium.org/469043003
2014-08-13 12:51:57 -07:00
halcanary
b6c8cc31dd
Roll android/third_party/jpeg DEPS
...
BUG=skia:2791
R=djsollen@google.com
TBR=djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/449493004
2014-08-06 11:07:11 -07:00
epoger
0b7127635d
teach rebaseline_server to generate diffs of rendered SKPs
...
Creates a new live-view.html page, served by the rebaseline_server, that will display diffs between two sets of rendered SKP images.
BUG=skia:1942
NOTRY=true
R=rmistry@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/424263005
2014-08-05 10:07:22 -07:00
epoger
20fa24cb3d
roll common DEPS
...
R=borenet@google.com
TBR=borenet
Author: epoger@google.com
Review URL: https://codereview.chromium.org/411063006
2014-07-24 10:39:01 -07:00
epoger
b0a46413e4
roll common DEPS
...
R=borenet@google.com
TBR=borenet
Author: epoger@google.com
Review URL: https://codereview.chromium.org/404823005
2014-07-21 13:55:57 -07:00
epoger
03f3db02c1
roll common DEPS, now using recursedeps
...
BUG=skia:2618
R=borenet@google.com , cmp@chromium.org
Author: epoger@google.com
Review URL: https://codereview.chromium.org/392353003
2014-07-16 14:45:48 -07:00
epoger
133931f4ab
roll "common" DEPS, and replace tools/pyutils with it
...
BUG=skia:2682
R=borenet@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/385783002
2014-07-11 08:52:35 -07:00
jcgregorio
d081cf661a
Pin to a newer version of ANGLE than M36 branch.
...
R=robertphillips@google.com
TBR=robertphillips@google.com
BUG=skia:
NOTRY=true
NOTREECHECKS=true
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/390433002
2014-07-11 06:51:59 -07:00
jcgregorio
24969a3146
Pin to a specific version of ANGLE.
...
Pulling from HEAD is dangerous, as we now know. This change is a temporary fix
to open the tree, we need a system for which version of ANGLE we are pinning to.
BUG=skia:
NOTRY=true
NOTREECHECKS=true
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/387893002
2014-07-11 06:30:55 -07:00
epoger
fd429991e9
import google-api-python-client using DEPS
...
BUG=skia:2641
R=jcgregorio@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/381933002
2014-07-10 09:03:26 -07:00
Eric Boren
bb0ef0a134
Use new common tools in Python scripts
...
BUG=skia:2682
R=rmistry@google.com
Review URL: https://codereview.chromium.org/330423004
2014-06-25 11:13:27 -04:00
borenet
f6fb36eebc
Add DEPS entry for common repo
...
BUG=skia:
R=reed@google.com , rmistry@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/334633008
2014-06-20 07:55:03 -07:00
Brian Salomon
08fe01362d
Try to roll angle again.
...
BUG=skia:2272
NOTRY=True
NOTREECHECKS=True
R=reed@google.com
Review URL: https://codereview.chromium.org/306483014
2014-06-17 17:28:17 -04:00
mtklein
4aa000df08
Split out DEPS change from 294873004 to land first.
...
BUG=skia:
R=mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/331913004
2014-06-16 20:03:43 -07:00
mtklein
1a50651524
Pull in GYP_LINK_CONCURRENCY=N support.
...
BUG=skia:
R=borenet@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/315183003
2014-06-06 07:37:46 -07:00
bungeman
5d3f9c765f
Update gyp for msvs-ninja clean.
...
BUG=skia:2439
R=borenet@google.com , epoger@google.com
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/317833005
2014-06-05 12:14:44 -07:00
epoger
b144271179
reland "rebaseline_server: download actual-results.json files from GCS instead of SVN"
...
relands https://codereview.chromium.org/310093003 with modifications.
BUG=skia:2641
R=jcgregorio@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/313343003
2014-06-05 10:30:37 -07:00
bungeman
c3f100b0ff
Update gyp for msvs-ninja.
...
BUG=skia:2439
R=borenet@google.com , epoger@google.com
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/311213002
2014-06-04 11:35:03 -07:00
epoger
55ada0630e
download_actuals.py: download JSON files from Google Storage instead of skia-autogen
...
uses google-api-python-client instead of gsutil binary to interact with Google Storage
BUG=skia:553
R=rmistry@google.com , bensong@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/309653005
2014-06-03 10:35:28 -07:00
commit-bot@chromium.org
3056bdd236
Since we're only using it on Linux now, just require poppler as a system dependency.
...
The Ubuntu package needed is libpoppler-cpp-dev.
iconv and fontconfig were only used as Poppler dependencies. bson_c is also unused.
BUG=skia:
R=reed@google.com , rmistry@google.com , borenet@google.com , halcanary@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/294683003
git-svn-id: http://skia.googlecode.com/svn/trunk@14802 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-20 15:07:53 +00:00
commit-bot@chromium.org
1d146d431a
Revert of Roll ANGLE. ( https://codereview.chromium.org/237173002/ )
...
Reason for revert:
breaking the buildbots (see http://108.170.220.76:10117/builders/Build-Win7-VS2010-x86-Release-ANGLE/builds/3198 ).
NOTRY=true
Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243
>
> Committed: http://code.google.com/p/skia/source/detail?r=14509
R=bsalomon@chromium.org , bsalomon@google.com , geofflang@chromium.org , djsollen@google.com , mtklein@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/264733006
git-svn-id: http://skia.googlecode.com/svn/trunk@14517 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 20:20:50 +00:00
commit-bot@chromium.org
1267219c53
Roll ANGLE.
...
BUG=skia:2272
Committed: http://code.google.com/p/skia/source/detail?r=14243
R=bsalomon@chromium.org , bsalomon@google.com
Author: geofflang@chromium.org
Review URL: https://codereview.chromium.org/237173002
git-svn-id: http://skia.googlecode.com/svn/trunk@14509 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:22:22 +00:00
commit-bot@chromium.org
4e3d760af8
roll DEPS/android/jpeg to current master.
...
R=djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/255953003
git-svn-id: http://skia.googlecode.com/svn/trunk@14394 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28 13:19:40 +00:00
commit-bot@chromium.org
0b17feaa64
Revert of Roll ANGLE. ( https://codereview.chromium.org/237173002/ )
...
Reason for revert:
http://skbug.com/2437
Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243
R=bsalomon@chromium.org , geofflang@chromium.org
TBR=bsalomon@chromium.org , geofflang@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:2272
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/238863006
git-svn-id: http://skia.googlecode.com/svn/trunk@14248 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 21:31:32 +00:00
commit-bot@chromium.org
cd66af0ae0
Roll ANGLE.
...
BUG=skia:2272
R=bsalomon@chromium.org , bsalomon@google.com
Author: geofflang@chromium.org
Review URL: https://codereview.chromium.org/237173002
git-svn-id: http://skia.googlecode.com/svn/trunk@14243 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 18:29:06 +00:00
commit-bot@chromium.org
fa443be95b
Roll ANGLE.
...
Contains small changes to ANGLE to pass skia tests.
BUG=skia:2272
R=bsalomon@google.com
Author: geofflang@chromium.org
Review URL: https://codereview.chromium.org/235923020
git-svn-id: http://skia.googlecode.com/svn/trunk@14228 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-16 20:31:54 +00:00
commit-bot@chromium.org
0b352ed264
Pull ANGLE's new repository to third_party/external/angle2.
...
BUG=skia:2272
R=bsalomon@chromium.org , bsalomon@google.com
Author: geofflang@chromium.org
Review URL: https://codereview.chromium.org/239593002
git-svn-id: http://skia.googlecode.com/svn/trunk@14211 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 21:11:09 +00:00
commit-bot@chromium.org
f84722e477
Build Skia for a bare-bones embedded Linux system.
...
Motivation:
I have downloaded a barebones Linux system built for 64-bit ARM
from linaro.org and a ARMv8 Foundation Model from arm.com to run
it on. This will let us build and test Skia on ARM64 before we
aquire hardware to allow that. This CL introduces the changes to
the build files necessary to build Skia on a barebones embedded
Linux system. I tested it with the aarch64 GCC compiler provided
by linaro.org.
Changes:
Add a "barelinux" target_os for the DEPS file. Add an optional
git download of zlib.
Changes to gyp files: these changes abstract out libpng, libz, and
giflib so that images.gyp doesn't know whether they are static or
dynamically linked. I also add the variables skia_giflib_static,
skia_libpng_static, skia_zlib_static, and skia_freetype_static,
all of which default to false but when set to true will override
the behavior of the giflib, libpng, zlib, and freetype build
targets to require them to build statically. Also, the
skia_no_fontconfig variable turns off use of the fontconfig service.
Scripts in platform_tools/barelinux/bin:
arm64_download - this script downloads the Linaro's ARMv8 Aarch64
toolchain and minimal embedded Linux system as well as ARM's
foundation model. The required files are mirrored on Google
Cloud. The script then starts a emulated Arm64 Linux system in
the background. After the boot is complete, you can SSH into the
system at port 8022 via user@localhost. The SSH key will be
downloaded into the working directery as well.
download_deps - Uses gclient to download Skia's dependencies for a
bare Linux system (the normal dependecies plus giflib, libpng, and
zlib.)
barelinux_make - this script builds a version of skia that does
not depend on external libraries, perfect for putting in an
embedded system running Linux. Assumes you have run download_deps
first.
To test:
To build a barelinux target, use the barelinux_make script.
To build for a armv8 system: skia_arch_type=arm arm_neon=0 armv7=1
armv8=1 arm_thumb=0 skia_arch_width=64 and set the CC and CXX
variables to point at the cross-compiler downloaded by
arm64_download.
R=djsollen@google.com , scroggo@google.com , borenet@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/152513007
git-svn-id: http://skia.googlecode.com/svn/trunk@13570 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-24 20:22:34 +00:00
commit-bot@chromium.org
fa190be48a
Roll fontconfig to 2.11.0 and reenable poppler on mac
...
R=mtklein@google.com , epoger@google.com
Author: vandebo@chromium.org
Review URL: https://codereview.chromium.org/138843002
git-svn-id: http://skia.googlecode.com/svn/trunk@13091 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 17:24:22 +00:00
commit-bot@chromium.org
b163984ae7
Move v8 into third_party.
...
BUG=
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/116693004
git-svn-id: http://skia.googlecode.com/svn/trunk@12954 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 15:14:09 +00:00
commit-bot@chromium.org
30289512f9
Try another GYP DEPS
...
This one is just before the introduction of the Python 2.7 requirement.
BUG=
R=rmistry@google.com , robertphillips@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/99583004
git-svn-id: http://skia.googlecode.com/svn/trunk@12651 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12 20:55:00 +00:00
borenet@google.com
d98b11367b
Revert r12648
...
Review URL: https://codereview.chromium.org/114453002
git-svn-id: http://skia.googlecode.com/svn/trunk@12650 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12 19:58:10 +00:00
commit-bot@chromium.org
baf5a3ba7b
Update GYP DEPS to obtain VS 2013 support
...
R=rmistry@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/103893006
git-svn-id: http://skia.googlecode.com/svn/trunk@12648 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12 19:39:04 +00:00
rmistry@google.com
d6bab02386
Reverting r12427
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 13:50:38 +00:00
skia.committer@gmail.com
5b39f5ba9c
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 13:36:22 +00:00
commit-bot@chromium.org
361270e6b9
move to newer angle
...
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/86423002
git-svn-id: http://skia.googlecode.com/svn/trunk@12416 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 15:43:22 +00:00
bungeman@google.com
556ee8b3ac
Roll gyp deps from 1765 to 1796.
...
This also adds gyp_skia.py which defers to gyp_skia.
This matches Chromium usage and allows parallel gyp-ing
(now the default) to work on Windows.
R=epoger@google.com
Review URL: https://codereview.chromium.org/81073002
git-svn-id: http://skia.googlecode.com/svn/trunk@12350 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-21 18:11:14 +00:00
bungeman@google.com
0d00976bd3
Roll gyp from r1684 to r1765.
...
R=epoger@google.com
Review URL: https://codereview.chromium.org/32963002
git-svn-id: http://skia.googlecode.com/svn/trunk@11892 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-21 18:49:43 +00:00
commit-bot@chromium.org
0837bcdafd
Adds poppler and dependencies to DEPS. This is a pre-CL for 20220002, and getting DEPS committed first is necessary to get the trybots to run on the larger CL (since the trybots do 'gclient sync' before patching).
...
R=vandebo@chromium.org , edisonn@google.com , djsollen@chromium.org , bungeman@chromium.org , djsollen@google.com
Author: richardlin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/21945002
git-svn-id: http://skia.googlecode.com/svn/trunk@10521 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-02 19:10:06 +00:00
djsollen@google.com
bcc6d7d390
Update freetype to version 2.5.0.1 when building it from source.
...
R=bungeman@google.com
Review URL: https://codereview.chromium.org/19625006
git-svn-id: http://skia.googlecode.com/svn/trunk@10273 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 15:51:12 +00:00
borenet@google.com
672222e400
Update gyp DEPS
...
R=djsollen@google.com
Review URL: https://codereview.chromium.org/19996003
git-svn-id: http://skia.googlecode.com/svn/trunk@10266 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 14:46:58 +00:00
djsollen@google.com
f8f89701ce
Roll freetype back to 2.4.9 until Android/NaCL errors are resolved.
...
R=borenet@google.com , fmalita@google.com
Review URL: https://codereview.chromium.org/19956003
git-svn-id: http://skia.googlecode.com/svn/trunk@10264 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 13:54:58 +00:00
djsollen@google.com
2e767c35ca
Update freetype DEPS to version 2.5 with PNG encoded color bitmap glyphs
...
R=bungeman@google.com
Review URL: https://codereview.chromium.org/19931003
git-svn-id: http://skia.googlecode.com/svn/trunk@10259 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 12:22:11 +00:00
edisonn@google.com
2854e24f53
remove podofo from deps
...
Review URL: https://codereview.chromium.org/18539008
git-svn-id: http://skia.googlecode.com/svn/trunk@9963 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-10 17:11:29 +00:00
borenet@google.com
5ec130524e
Use "Simple Chrome for Chrome OS Workflow" to build Skia for ChromeOS
...
(SkipBuildbotRuns) since this isn't used yet.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/17412007
git-svn-id: http://skia.googlecode.com/svn/trunk@9681 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-19 15:13:32 +00:00
djsollen@google.com
5065cbe689
revert DEPS for angle until tools are fixed
...
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/16788003
git-svn-id: http://skia.googlecode.com/svn/trunk@9517 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 20:16:48 +00:00
djsollen@google.com
7815c9efdf
update WebP to a dev version of 0.3.1
...
This is necessary to pick up a NEON fix for the iOS build.
R=borenet@google.com
Review URL: https://codereview.chromium.org/16318003
git-svn-id: http://skia.googlecode.com/svn/trunk@9516 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 20:03:50 +00:00
borenet@google.com
05d550ed36
GYP Changes and Scripts for Compiling Skia for ChromeOS
...
For now, this requires having a complete ChromeOS checkout.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/16099011
git-svn-id: http://skia.googlecode.com/svn/trunk@9505 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 15:52:19 +00:00
djsollen@google.com
42416ee303
Update DEPS to use only googlesource.com repositories.
...
R=borenet@google.com , scroggo@google.com
Review URL: https://codereview.chromium.org/16136013
git-svn-id: http://skia.googlecode.com/svn/trunk@9488 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-10 15:19:33 +00:00
commit-bot@chromium.org
f111851ce4
Add dependency to podofo at skia_ext branch.
...
R=djsollen@google.com
Author: edisonn@google.com
Review URL: https://chromiumcodereview.appspot.com/16026009
git-svn-id: http://skia.googlecode.com/svn/trunk@9464 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-06 18:39:53 +00:00
bungeman@google.com
f51e125b94
Update gyp from 1563 to 1643 (take two).
...
Re-land 9445 (reverted 9448), but add back the libs no longer provided by gyp.
git-svn-id: http://skia.googlecode.com/svn/trunk@9450 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 18:35:22 +00:00
bungeman@google.com
4609b9ca9d
Reverting gyp roll in 9445 due to Windows failures.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@9448 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 17:32:27 +00:00
bungeman@google.com
6b98fbb0da
Update gyp from 1563 to 1643.
...
https://codereview.chromium.org/16384005/
git-svn-id: http://skia.googlecode.com/svn/trunk@9445 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 16:15:15 +00:00
epoger@google.com
0a117be391
Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gyp
...
R=rmistry@google.com
Review URL: https://codereview.chromium.org/15060008/
git-svn-id: http://skia.googlecode.com/svn/trunk@9064 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 16:04:02 +00:00
epoger@google.com
e8d08a0fc2
Roll out r9059 to unbreak bots
...
git-svn-id: http://skia.googlecode.com/svn/trunk@9060 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 15:22:36 +00:00
epoger@google.com
aaf7343e16
Remove third-party cityhash, unused since r8992
...
R=djsollen@google.com
Review URL: https://codereview.chromium.org/15027013
git-svn-id: http://skia.googlecode.com/svn/trunk@9059 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-08 14:49:50 +00:00
djsollen@google.com
4b32101a15
Update DEPS and GYP to use the copy of Android in platform_tools.
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/13898019
git-svn-id: http://skia.googlecode.com/svn/trunk@8951 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-02 12:27:21 +00:00
commit-bot@chromium.org
a936e37cc7
Upstream Android modifications to the image encoders/decoders.
...
This CL does not update the libjpeg as that change is large enough
to warrant its own CL.
Author: djsollen@google.com
Reviewed By: reed@google.com ,robertphillips@google.com,scroggo@google.com
Review URL: https://chromiumcodereview.appspot.com/12604006
git-svn-id: http://skia.googlecode.com/svn/trunk@8155 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-03-14 14:42:18 +00:00
bungeman@google.com
8e4adb0e01
Update gyp revision.
...
Now allows out-of-source output directories.
git-svn-id: http://skia.googlecode.com/svn/trunk@7288 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-18 21:20:16 +00:00
epoger@google.com
5a5e29e00d
Separate our jsoncpp dependency from Chromium's jsoncpp overrides.
...
BUG=https://code.google.com/p/skia/issues/detail?id=909
Review URL: https://codereview.appspot.com/7098047
git-svn-id: http://skia.googlecode.com/svn/trunk@7187 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-01-15 17:16:51 +00:00
epoger@google.com
0bba6bd78a
Replace SkConsistentChecksum with SkCityHash (now including CityHash via DEPS)
...
Alternative to https://codereview.appspot.com/6847087/ ('Change SkConsistentChecksum to use SuperFastHash')
Review URL: https://codereview.appspot.com/6867060
git-svn-id: http://skia.googlecode.com/svn/trunk@6701 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-12-07 15:12:01 +00:00
borenet@google.com
7158e6acca
Improve NaCl support
...
- Add nacl_make script to build Skia targets for NaCl using gyp
- Add nacl_interface for command-line apps
- Add nacl_sample as front-end for SampleApp
- Add freetype to DEPS
- Various gyp tweaks for NaCl
TODO:
- Implement GL interface
- Implement font host
- Fix plumbing so that SampleApp works properly
Review URL: https://codereview.appspot.com/6671044
git-svn-id: http://skia.googlecode.com/svn/trunk@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-11-01 17:43:44 +00:00
epoger@google.com
11b0dddd59
Revert r6051, re-adding json to DEPS file
...
Review URL: https://codereview.appspot.com/6816059
git-svn-id: http://skia.googlecode.com/svn/trunk@6202 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-30 16:25:17 +00:00
borenet@google.com
c8707d4686
Remove extra dependencies on json-cpp
...
Review URL: https://codereview.appspot.com/6752052
git-svn-id: http://skia.googlecode.com/svn/trunk@6051 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-23 16:00:02 +00:00
borenet@google.com
efb1d77ad2
Build Skia as a static library
...
- Roll GYP so that we get non-thin archives on Linux
- Add merge_static_libs.py
- Add skia_core_lib target which builds core, ports, opts*, and utils
- Replace dependencies on core/ports/opts/utils with skia_core_libs
- Rename exportable libraries with "skia_"
Review URL: https://codereview.appspot.com/6619049
git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-10 19:45:51 +00:00
bungeman@google.com
8d25eb138a
Roll gyp to 1509 for ninja compatibility.
...
https://codereview.appspot.com/6588059/
git-svn-id: http://skia.googlecode.com/svn/trunk@5765 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-02 13:40:30 +00:00
borenet@google.com
e33073bac8
Revert r5520
...
Unfortunately, since we can only build ANGLE by including a gypi, and since
gyp cannot process includes conditionally, we *have* to have a build_angle.gypi
file in the third_party/externals/ANGLE/src directory. We could do a hack
where we create an empty gypi if ANGLE is not checked out, but for now we just
check out ANGLE on all platforms.
git-svn-id: http://skia.googlecode.com/svn/trunk@5521 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 14:53:15 +00:00
borenet@google.com
45bfcbcfba
Only check out ANGLE on Windows
...
Review URL: https://codereview.appspot.com/6500118
git-svn-id: http://skia.googlecode.com/svn/trunk@5520 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-13 14:38:04 +00:00
borenet@google.com
623ff0a5f7
Add ANGLE to DEPS, integrate build
...
Review URL: https://codereview.appspot.com/6494052
git-svn-id: http://skia.googlecode.com/svn/trunk@5387 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-09-04 16:45:05 +00:00
djsollen@google.com
aba0e3b6bc
Add JSON dependency to build.
...
This dependency is a mirror of the one that Chrome
uses to import jsoncpp.
Review URL: https://codereview.appspot.com/6269043
git-svn-id: http://skia.googlecode.com/svn/trunk@4251 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-13 18:21:47 +00:00
thakis@chromium.org
0379ea275f
Update skia's gyp to r1320.
...
Allows buildilng skia with make on OS X.
BUG=chromium:102033
Review URL: https://codereview.appspot.com/5985066
git-svn-id: http://skia.googlecode.com/svn/trunk@3628 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-09 13:57:45 +00:00
bungeman@google.com
2227306aea
Update skia's gyp to 1284 (was 1139).
...
http://codereview.appspot.com/5935050/
git-svn-id: http://skia.googlecode.com/svn/trunk@3525 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-28 18:18:26 +00:00
epoger@google.com
bb2d36dfc9
Add libjpeg source as third_party/externals dependency
...
Review URL: https://codereview.appspot.com/5773043
git-svn-id: http://skia.googlecode.com/svn/trunk@3334 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-07 17:15:54 +00:00
bungeman@google.com
81f41d75cd
Roll gyp to 1139.
...
http://codereview.appspot.com/5529070/
git-svn-id: http://skia.googlecode.com/svn/trunk@3017 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-11 19:17:20 +00:00
bungeman@google.com
983297e813
Roll gyp and add librarian settings (now supported).
...
http://codereview.appspot.com/5169048/
git-svn-id: http://skia.googlecode.com/svn/trunk@2397 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-03 19:36:51 +00:00
epoger@google.com
06546d81f2
gyp DEPS roll, and remove no-longer-needed msvs_abspath_output flag
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2115 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-15 19:53:17 +00:00
epoger@google.com
2e7de5a1a7
revert r2110, which broke Mac builds
...
git-svn-id: http://skia.googlecode.com/svn/trunk@2111 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-15 17:12:59 +00:00
epoger@google.com
3f0254da54
Update gyp so that we no longer need msvs_abspath_output generator flag.
...
Review URL: http://codereview.appspot.com/4905044
git-svn-id: http://skia.googlecode.com/svn/trunk@2110 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-15 17:04:51 +00:00
epoger@google.com
0fb2125814
enable "make XXX" command-line builds on Windows
...
http://codereview.appspot.com/4717044/
git-svn-id: http://skia.googlecode.com/svn/trunk@1853 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-13 21:30:14 +00:00
epoger@google.com
e620ad299f
Revert r1768
...
git-svn-id: http://skia.googlecode.com/svn/trunk@1771 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-30 21:03:02 +00:00
epoger@google.com
72798e4808
Roll gyp version from 907 to 936
...
git-svn-id: http://skia.googlecode.com/svn/trunk@1768 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-30 16:51:49 +00:00
epoger@google.com
3cbd375350
roll back runhooks to fix production buildbot
...
git-svn-id: http://skia.googlecode.com/svn/trunk@1618 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 18:24:11 +00:00
epoger@google.com
0045eddac6
Add "runhooks" to run gyp step upon gclient sync, for buildbot
...
git-svn-id: http://skia.googlecode.com/svn/trunk@1617 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-16 18:19:46 +00:00
epoger@google.com
8cdb78c4fd
set externals/gyp dependency to same version as manually imported gyp code
...
git-svn-id: http://skia.googlecode.com/svn/trunk@1571 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 18:45:15 +00:00
epoger@google.com
cc9cf9ac6e
Modify DEPS so that it works properly for the buildbot
...
git-svn-id: http://skia.googlecode.com/svn/trunk@1570 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 18:08:41 +00:00
epoger@google.com
fc0685652e
Add DEPS file in an attempt to make both gclient and svn update bring in
...
third_party/externals.
git-svn-id: http://skia.googlecode.com/svn/trunk@1566 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-06-13 16:04:25 +00:00