summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/ImageBufferData.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r84325: Fix ImageBufferData.hBen Murdoch2011-06-101-0/+4
| | | | | | | | | | Need to include the Android ImageBufferData header. To avoid recursive includes, rename android/ImageBufferData.h to android/ImageBufferDataAndroid.h See http://trac.webkit.org/changeset/83786 Change-Id: Ica2d0c5350810b918d034d0ac227eb6255939584
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101-0/+40
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b