Merge Webkit at r73109: Fix conflicts

1. WebCore/Android.jscbindings.mk
http://trac.webkit.org/changeset/72590
http://trac.webkit.org/changeset/72344

2. WebCore/WebCore.vcproj/WebCore.vcproj
too many changes between 72274 and 73109
http://trac.webkit.org/log/trunk/WebCore/WebCore.vcproj/WebCore.vcproj
also due to Android change.
https://android-git.corp.google.com/g/#change,37374

3. WebCore/platform/android/PlatformBridge.h
http://trac.webkit.org/changeset/72631

4. WebCore/rendering/RenderSVGResourceSolidColor.cpp
http://trac.webkit.org/changeset/72926
our code is not upstreamed

5. WebCore/rendering/RenderView.h
http://trac.webkit.org/changeset/72852
http://trac.webkit.org/changeset/73063

Change-Id: Id7a1dbdfef6327b4fe08c9884122bf9decd039ca

1 files changed, 0 insertions, 6 deletions

diff --git a/WebCore/platform/android/PlatformBridge.h b/WebCore/platform/android/PlatformBridge.h
index f518fe1..c67c865 100644
--- a/WebCore/platform/android/PlatformBridge.h
+++ b/WebCore/platform/android/PlatformBridge.h
@@ -82,13 +82,10 @@ class NPObject;
 
 namespace WebCore {
 
-<<<<<<< HEAD
 class Document;
 class FrameView;
 class Node;
-=======
 class ScrollView;
->>>>>>> webkit.org at r73109
 class Widget;
 
 // An interface to the embedding layer, which has the ability to answer
@@ -112,7 +109,6 @@ public:
     static bool cookiesEnabled(const Document*);
     // Plugin
     static NPObject* pluginScriptableObject(Widget*);
-<<<<<<< HEAD
     // Popups
     static bool popupsAllowed(NPP);
 
@@ -141,10 +137,8 @@ public:
     static void updateViewport(FrameView*);
 
     static void updateTextfield(FrameView*, Node*, bool changeToPassword, const WTF::String& text);
-=======
 
     static void setScrollPosition(ScrollView*, int x, int y);
->>>>>>> webkit.org at r73109
 
     // Language
     static String computeDefaultLanguage();