diff options
Diffstat (limited to 'Source/WebCore/platform')
4 files changed, 5 insertions, 25 deletions
diff --git a/Source/WebCore/platform/ScrollView.h b/Source/WebCore/platform/ScrollView.h index 2bd1447..7df735a 100644 --- a/Source/WebCore/platform/ScrollView.h +++ b/Source/WebCore/platform/ScrollView.h @@ -162,16 +162,13 @@ public: int contentsWidth() const { return contentsSize().width(); } int contentsHeight() const { return contentsSize().height(); } virtual void setContentsSize(const IntSize&); -<<<<<<< HEAD - + #if PLATFORM(ANDROID) int actualWidth() const; int actualHeight() const; int actualScrollX() const; int actualScrollY() const; #endif -======= ->>>>>>> webkit.org at r78450 // Functions for querying the current scrolled position (both as a point, a size, or as individual X and Y values). IntPoint scrollPosition() const { return visibleContentRect().location(); } diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp index cf15462..a046775 100644 --- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -298,16 +298,6 @@ void* WebCore::Frame::dragImageForSelection() return 0; } -<<<<<<< HEAD -======= - -WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&) -{ - ASSERT(isMainThread()); - return WTF::String(); -} - ->>>>>>> webkit.org at r78450 void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {} namespace WebCore { 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); |