Merge webkit.org at r51976 : Fix general conflicts.

Notes ...
For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644
For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636
For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257
For Geolocation.cpp, see http://trac.webkit.org/changeset/50605
For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004
For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523
For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996
For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465
Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial.

Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7

1 files changed, 4 insertions, 6 deletions

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index ba6dc97..85966d7 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -387,14 +387,11 @@ Document::Document(Frame* frame, bool isXHTML)
     m_ignoreAutofocus = false;
 
     m_frame = frame;
-<<<<<<< HEAD:WebCore/dom/Document.cpp
-    m_renderArena = 0;
-#if !PLATFORM(ANDROID)
-=======
 
->>>>>>> webkit.org at r51976:WebCore/dom/Document.cpp
+#if !PLATFORM(ANDROID)
     m_axObjectCache = 0;
-#endif    
+#endif
+    
     m_docLoader = new DocLoader(this);
 
     visuallyOrdered = false;
@@ -1439,6 +1436,7 @@ void Document::attach()
 #if !PLATFORM(ANDROID)    
     ASSERT(!m_axObjectCache);
 #endif
+
     if (!m_renderArena)
         m_renderArena = new RenderArena();