From 09b60ab8488b362c96df8f268613aafaeebfcfa1 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 18 May 2011 14:41:47 +0100
Subject: 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
---
 Source/WebCore/platform/image-decoders/ImageDecoder.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Source/WebCore/platform/image-decoders/ImageDecoder.cpp')

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"
-- 
cgit v1.1