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

3 files changed, 0 insertions, 17 deletions

diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp
index 227c437..a868134 100644
--- a/WebCore/history/CachedFrame.cpp
+++ b/WebCore/history/CachedFrame.cpp
@@ -99,13 +99,10 @@ void CachedFrameBase::restore()
     for (unsigned i = 0; i < m_childFrames.size(); ++i)
         m_childFrames[i]->open();
 
-<<<<<<< HEAD:WebCore/history/CachedFrame.cpp
 #ifdef ANDROID_PAGE_CACHE_UNLOAD
     // matches pageshowEvent as in Document::implicitClose()
     m_document->dispatchWindowLoadEvent();
 #endif
-=======
->>>>>>> webkit.org at r51976:WebCore/history/CachedFrame.cpp
     m_document->dispatchWindowEvent(PageTransitionEvent::create(eventNames().pageshowEvent, true), m_document);
 }
 
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp
index f6fbd59..21e67ca 100644
--- a/WebCore/history/HistoryItem.cpp
+++ b/WebCore/history/HistoryItem.cpp
@@ -393,8 +393,6 @@ void HistoryItem::setIsTargetItem(bool flag)
 #if PLATFORM(ANDROID)
     notifyHistoryItemChanged(this);
 #endif
-<<<<<<< HEAD:WebCore/history/HistoryItem.cpp
-=======
 }
 
 void HistoryItem::setStateObject(PassRefPtr<SerializedScriptValue> object)
@@ -421,7 +419,6 @@ void HistoryItem::documentDetached(Document* document)
     ASSERT_UNUSED(document, m_document == document);
     m_document = 0;
     m_stateObject = 0;
->>>>>>> webkit.org at r51976:WebCore/history/HistoryItem.cpp
 }
 
 void HistoryItem::addChildItem(PassRefPtr<HistoryItem> child)
diff --git a/WebCore/history/android/AndroidWebHistoryBridge.h b/WebCore/history/android/AndroidWebHistoryBridge.h
index c6d5147..b401933 100644
--- a/WebCore/history/android/AndroidWebHistoryBridge.h
+++ b/WebCore/history/android/AndroidWebHistoryBridge.h
@@ -34,19 +34,11 @@ class HistoryItem;
 
 class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> {
 public:
-<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h
     AndroidWebHistoryBridge(HistoryItem* item)
-=======
-    AndroidWebHistoryBridge()
->>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h
         : m_scale(100)
         , m_screenWidthScale(100)
         , m_active(false)
-<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h
         , m_historyItem(item) { }
-=======
-        , m_historyItem(0) { }
->>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h
     virtual ~AndroidWebHistoryBridge() { }
     virtual void updateHistoryItem(HistoryItem* item) = 0;
 
@@ -54,10 +46,7 @@ public:
     void setScreenWidthScale(int s) { m_screenWidthScale = s; }
     int scale() const { return m_scale; }
     int screenWidthScale() const { return m_screenWidthScale; }
-<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h
     void detachHistoryItem() { m_historyItem = 0; }
-=======
->>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h
     HistoryItem* historyItem() const { return m_historyItem; }
     void setActive() { m_active = true; }