summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/image-decoders/skia
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-143/+0
| | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-171-0/+7
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-3/+3
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-021-0/+2
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-16/+16
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-4/+1
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-3/+2
| | | | | | | | | | | | Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
* Fix compilation error inside ImageDecoderSkia.cppBen Murdoch2009-08-171-0/+8
|
* Merge in WebKit r47029.Ben Murdoch2009-08-1118-5129/+130
|
* Get WebKit r44544.Feng Qian2009-06-176-81/+48
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-3/+4
| | | | Automated import of CL 145796
* Automated import from //branches/master/...@142337,142337Mike Reed2009-03-242-17/+48
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-0517-0/+5130