summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/BitmapImage.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-041-1/+1
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-1/+1
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-0/+1
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-1/+1
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-3/+3
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.Steve Block2010-01-051-1/+1
| | | | | | | | | | | | 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
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-4/+6
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-2/+13
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-11/+1
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-1/+11
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-1/+6
|
* Get WebKit r44544.Feng Qian2009-06-171-6/+4
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-2/+12
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-18/+22
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+258
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-258/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-26/+64
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+13
|
* external/webkit r30707Upstream1970-01-121-0/+207