Merge WebKit at r66079 : Fix conflicts

- WebCore/dom/Document.cpp
  Conflict due to Android guards around m_axObjectCache
  See http://trac.webkit.org/changeset/65787

- WebCore/dom/Document.h
  Conflict due to Android guards around m_axObjectCache whitespace diff
  See http://trac.webkit.org/changeset/65787
  and http://trac.webkit.org/changeset/66037

- WebCore/html/HTMLDocumentParser.cpp
  Conflict due to ANDROID_INSTRUMENT
  See http://trac.webkit.org/changeset/65692

- WebCore/platform/image-decoders/ImageDecoder.cpp
  Conflict due to Android not implementing ImageDecoder::create()
  See http://trac.webkit.org/changeset/66039

- WebCore/plugins/PluginView.h
  Conflict due to PLUGIN_SCHEDULE_TIMER
  See http://trac.webkit.org/changeset/65697

Change-Id: I5dc94bad471ea566dbabf965425938b732735d02

1 files changed, 0 insertions, 4 deletions

diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp
index d4518fe..475bd9f 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/ImageDecoder.cpp
@@ -52,15 +52,11 @@ static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const
     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.
-ImageDecoder* ImageDecoder::create(const SharedBuffer& data)
-=======
 ImageDecoder* ImageDecoder::create(const SharedBuffer& data, bool premultiplyAlpha)
->>>>>>> webkit.org at r66079
 {
     // We need at least 4 bytes to figure out what kind of image we're dealing
     // with.