diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-06 11:58:37 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:33 +0100 |
| commit | e14154f9546f59f069b1f1f2633750e6443b4d87 (patch) | |
| tree | 8f7a6bbd72f6a9b2eccea9dff35f7ccd36984dfb /WebCore | |
| parent | aa3c571eb58ddae5c8d2de8a7899e8d7f3f80b0e (diff) | |
| download | external_webkit-e14154f9546f59f069b1f1f2633750e6443b4d87.zip external_webkit-e14154f9546f59f069b1f1f2633750e6443b4d87.tar.gz external_webkit-e14154f9546f59f069b1f1f2633750e6443b4d87.tar.bz2 | |
Merge WebKit at r74534: Fix ImageBufferAndroid.cpp
Update our platform ImageBuffer class after new features added
upstream.
See http://trac.webkit.org/changeset/73949 and
http://trac.webkit.org/changeset/73925
Change-Id: I40a982c855faabbbdbc0cb13dd503d3bbe76f3ef
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/ImageBufferAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp index 2f9e543..c7adb25 100644 --- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp +++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp @@ -50,7 +50,7 @@ ImageBufferData::ImageBufferData(const IntSize&) { } -ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, bool& success) +ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, RenderingMode, bool& success) : m_data(size) , m_size(size) { |