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, 0 insertions, 14 deletions

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 204a0c3..4d60569 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -162,23 +162,9 @@ RenderBlock::~RenderBlock()
 
 void RenderBlock::destroy()
 {
-<<<<<<< HEAD:WebCore/rendering/RenderBlock.cpp
-    // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will 
-    // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise. 
-    children()->destroyLeftoverChildren(); 
-
-    // Destroy our continuation before anything other than anonymous children. 
-    // The reason we don't destroy it before anonymous children is that they may 
-    // have continuations of their own that are anonymous children of our continuation. 
-    if (m_inlineContinuation) { 
-        m_inlineContinuation->destroy();
-        m_inlineContinuation = 0; 
-    }
-=======
     // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
     // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
     children()->destroyLeftoverChildren();
->>>>>>> webkit.org at r51976:WebCore/rendering/RenderBlock.cpp
 
     // Destroy our continuation before anything other than anonymous children.
     // The reason we don't destroy it before anonymous children is that they may