summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/ImageSource.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-4/+4
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Merge WebKit at r80534: Update uses of PLATFORM(SKIA).Ben Murdoch2011-06-021-6/+2
| | | | | | | | | PLATFORM(SKIA) is replaced with USE(SKIA), see http://trac.webkit.org/changeset/79578 Fix conflicts and update our code to reflect this. Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021-1/+7
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-231-1/+2
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check ↵Steve Block2011-05-191-2/+2
| | | | | | | | | | supportsAlpha() GIFImageDecoder::supportsAlpha() always returns true and this method will be removed in http://trac.webkit.org/changeset/77427, so updating our code now to avoid problems later. Change-Id: I2a6500608eb661ee50a7ed315e7ece49508d0f82
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121-0/+228
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84