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

5 files changed, 6 insertions, 32 deletions

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 03ad8e7..2528b3a 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -432,14 +432,10 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
 
 #if !PLATFORM(ANDROID)
     m_axObjectCache = 0;
-<<<<<<< HEAD
 #endif
-    
-=======
 
     m_markers = new DocumentMarkerController();
 
->>>>>>> webkit.org at r66079
     m_docLoader = new DocLoader(this);
 
     m_visuallyOrdered = false;
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index ff7e646..18dc838 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -1169,18 +1169,10 @@ private:
 
     OwnPtr<RenderArena> m_renderArena;
 
-<<<<<<< HEAD
-    typedef std::pair<Vector<DocumentMarker>, Vector<IntRect> > MarkerMapVectorPair;
-    typedef HashMap<RefPtr<Node>, MarkerMapVectorPair*> MarkerMap;
-    MarkerMap m_markers;
-
 #if !PLATFORM(ANDROID)
     mutable AXObjectCache* m_axObjectCache;
 #endif
-=======
-    mutable AXObjectCache* m_axObjectCache;
     OwnPtr<DocumentMarkerController> m_markers;
->>>>>>> webkit.org at r66079
     
     Timer<Document> m_updateFocusAppearanceTimer;
 
@@ -1202,13 +1194,6 @@ private:
     RefPtr<Document> m_transformSourceDocument;
 #endif
 
-<<<<<<< HEAD
-#if ENABLE(XBL)
-    OwnPtr<XBLBindingManager> m_bindingManager; // The access point through which documents and elements communicate with XBL.
-#endif
-
-=======
->>>>>>> webkit.org at r66079
     typedef HashMap<AtomicStringImpl*, HTMLMapElement*> ImageMapsByName;
     ImageMapsByName m_imageMapsByName;
 
diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp
index a271603..0a1208d 100644
--- a/WebCore/html/HTMLDocumentParser.cpp
+++ b/WebCore/html/HTMLDocumentParser.cpp
@@ -282,15 +282,13 @@ void HTMLDocumentParser::insert(const SegmentedString& source)
     if (m_parserStopped)
         return;
 
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter);
 #endif
-=======
+
     // pumpTokenizer can cause this parser to be detached from the Document,
     // but we need to ensure it isn't deleted yet.
     RefPtr<HTMLDocumentParser> protect(this);
->>>>>>> webkit.org at r66079
 
     {
         NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel);
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.
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 01797e5..a17d327 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -43,16 +43,15 @@
 #include <wtf/Vector.h>
 #include <wtf/text/CString.h>
 
-<<<<<<< HEAD
+#if ENABLE(NETSCAPE_PLUGIN_API)
+#include "PluginStream.h"
+#include "npruntime_internal.h"
+#endif
+
 // ANDROID
 // TODO: Upstream to webkit.org
 #ifdef PLUGIN_SCHEDULE_TIMER
 #include "PluginTimer.h"
-=======
-#if ENABLE(NETSCAPE_PLUGIN_API)
-#include "PluginStream.h"
-#include "npruntime_internal.h"
->>>>>>> webkit.org at r66079
 #endif
 
 #if OS(WINDOWS) && (PLATFORM(QT) || PLATFORM(WX))