diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 15:08:28 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:36:19 +0100 |
| commit | c6634addb52424058f3938093ca0c5a29a9df6c3 (patch) | |
| tree | 3636a24b768d7926ec2e0a2f2c0a2bf3290aa619 /Source | |
| parent | 7fb1198349cf58688611c0b98189560871faa49f (diff) | |
| download | external_webkit-c6634addb52424058f3938093ca0c5a29a9df6c3.zip external_webkit-c6634addb52424058f3938093ca0c5a29a9df6c3.tar.gz external_webkit-c6634addb52424058f3938093ca0c5a29a9df6c3.tar.bz2 | |
Merge WebKit at r80534: Fix ImageSourceAndroid.cpp
SharedBuffer::buffer now private, we should use SharedBuffer::data()
instead.
See http://trac.webkit.org/changeset/78548
Add implementation of bytesDecodedToDetermineProperties.
See http://trac.webkit.org/changeset/78652
Change-Id: Ic113f711f3b8d553e35ba98246fd6bd9093fdb06
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp index 65b2314..5a35dd4 100644 --- a/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/ImageSourceAndroid.cpp @@ -264,9 +264,8 @@ void ImageSource::setData(SharedBuffer* data, bool allDataReceived) #ifdef ANDROID_ANIMATED_GIF // First, check to see if this is an animated GIF - const Vector<char>& buffer = data->buffer(); - const char* contents = buffer.data(); - if (buffer.size() > 3 && strncmp(contents, "GIF8", 4) == 0 + const char* contents = data->data(); + if (data->size() > 3 && strncmp(contents, "GIF8", 4) == 0 && should_use_animated_gif(origW, origH) && !disabledAnimatedGif) { // This means we are looking at a GIF, so create special @@ -499,4 +498,9 @@ bool ImageSource::getHotSpot(IntPoint&) const return false; } +size_t ImageSource::bytesDecodedToDetermineProperties() const +{ + return 0; +} + } |