diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 14:41:47 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:49 +0100 |
commit | 09b60ab8488b362c96df8f268613aafaeebfcfa1 (patch) | |
tree | 1623751ea9c32fc80fa309017b5d9ea3c7871415 /Source/WebCore/platform/image-decoders | |
parent | d73b16bdebb9d20b17be0a30e626dc9e66b6d868 (diff) | |
download | external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.zip external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.tar.gz external_webkit-09b60ab8488b362c96df8f268613aafaeebfcfa1.tar.bz2 |
Merge WebKit at r78450: Fix remaining conflicts
- Document.cpp
Conflict due to AX object cache disabled on Android
See http://trac.webkit.org/changeset/78314
- CachedResourceLoader.cpp/h
Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/76701
- Source/WebCore/page/ChromeClient.h
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
See http://trac.webkit.org/changeset/77509
- FrameView.cpp
Conflict due to Android FrameView::updatePositionedObjects()
See http://trac.webkit.org/changeset/77274
- ScrollView.h
Conflict due to Android
ScrollView::actualWidth/Height/ScrollX/ScrollY()
See http://trac.webkit.org/changeset/76831
- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
conflict due to Android stubbed out
MIMETypeRegistry::getMIMETypeForExtension()
See http://trac.webkit.org/changeset/77368 and
https://android-git.corp.google.com/g/#change,37272
- ImageDecoder.cpp
Conflict due to Android excluding code
See http://trac.webkit.org/changeset/77427
- ImageDecoder.h
Conflict due to ANDROID guard upstreamed as SKIA guard
See http://trac.webkit.org/changeset/77946
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/76743 and
http://trac.webkit.org/changeset/77286
- RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT
See http://trac.webkit.org/changeset/77062
Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
Diffstat (limited to 'Source/WebCore/platform/image-decoders')
-rw-r--r-- | Source/WebCore/platform/image-decoders/ImageDecoder.cpp | 11 | ||||
-rw-r--r-- | Source/WebCore/platform/image-decoders/ImageDecoder.h | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp index 2aae205..840ab98 100644 --- a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp +++ b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp @@ -55,12 +55,6 @@ unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const SharedB return bytesExtracted; } -<<<<<<< HEAD -#if !OS(ANDROID) -// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and -// JPEGDecoder, which aren't used on Android, and which don't all compile. -// TODO: Find a better fix. -======= bool matchesGIFSignature(char* contents) { return !memcmp(contents, "GIF8", 4); @@ -100,7 +94,10 @@ bool matchesCURSignature(char* contents) } ->>>>>>> webkit.org at r78450 +#if !OS(ANDROID) +// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and +// JPEGDecoder, which aren't used on Android, and which don't all compile. +// TODO: Find a better fix. ImageDecoder* ImageDecoder::create(const SharedBuffer& data, ImageSource::AlphaOption alphaOption, ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption) { static const unsigned lengthOfLongestSignature = 14; // To wit: "RIFF????WEBPVP" diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.h b/Source/WebCore/platform/image-decoders/ImageDecoder.h index 7d0d0d4..e07f4f2 100644 --- a/Source/WebCore/platform/image-decoders/ImageDecoder.h +++ b/Source/WebCore/platform/image-decoders/ImageDecoder.h @@ -180,11 +180,7 @@ namespace WebCore { g = static_cast<unsigned>(g * alphaPercent); b = static_cast<unsigned>(b * alphaPercent); } -<<<<<<< HEAD -#if PLATFORM(ANDROID) -======= #if PLATFORM(SKIA) ->>>>>>> webkit.org at r78450 *dest = SkPackARGB32(a, r, g, b); #else *dest = (a << 24 | r << 16 | g << 8 | b); |