Merge WebKit at r64523 : Fix other conflicts

- WebCore/Android.mk
  Conflict due to error introduced upstream.
  See http://trac.webkit.org/changeset/64344/trunk/WebCore/Android.mk
  and http://trac.webkit.org/changeset/60228/trunk/WebCore/Android.mk

- WebCore/html/HTMLFrameSetElement.cpp
  Conflict due to ANDROID_FLATTEN_FRAMESET
  See http://trac.webkit.org/changeset/64383

- WebCore/page/Navigator.h
  Conflict due to APPLICATION_INSTALLED
  See http://trac.webkit.org/changeset/64371

- WebCore/rendering/SVGResourcesCycleSolver.cpp
  Conflict due to local ENABLE(FILTERS) guard
  See http://trac.webkit.org/changeset/64440

Change-Id: Ibafe3b92117c3a7b3eaaa44c6cf3d04c8c6027c2

1 files changed, 15 insertions, 55 deletions

diff --git a/WebCore/page/Navigator.h b/WebCore/page/Navigator.h
index a435f74..e5dd4e8 100644
--- a/WebCore/page/Navigator.h
+++ b/WebCore/page/Navigator.h
@@ -28,45 +28,16 @@
 
 namespace WebCore {
 
-<<<<<<< HEAD
-    class DOMMimeTypeArray;
-    class DOMPluginArray;
-    class Frame;
-    class Geolocation;
-    class PluginData;
-    class String;
-#if PLATFORM(ANDROID)
-    class ApplicationInstalledCallback;
-    class Connection;
-#endif
-
-    class Navigator : public NavigatorBase, public RefCounted<Navigator> {
-    public:
-        static PassRefPtr<Navigator> create(Frame* frame) { return adoptRef(new Navigator(frame)); }
-        ~Navigator();
-
-        void disconnectFrame();
-        Frame* frame() const { return m_frame; }
-
-        String appVersion() const;
-        String language() const;
-        DOMPluginArray* plugins() const;
-        DOMMimeTypeArray* mimeTypes() const;
-        bool cookieEnabled() const;
-        bool javaEnabled() const;
-
-        virtual String userAgent() const;
-
-        Geolocation* geolocation() const;
-        // This is used for GC marking.
-        Geolocation* optionalGeolocation() const { return m_geolocation.get(); }
-=======
 class DOMMimeTypeArray;
 class DOMPluginArray;
 class Frame;
 class Geolocation;
 class PluginData;
 class String;
+#if PLATFORM(ANDROID)
+class ApplicationInstalledCallback;
+class Connection;
+#endif
 
 class Navigator : public NavigatorBase, public RefCounted<Navigator> {
 public:
@@ -88,15 +59,14 @@ public:
     Geolocation* geolocation() const;
     // This is used for GC marking.
     Geolocation* optionalGeolocation() const { return m_geolocation.get(); }
->>>>>>> webkit.org at r64523
 
 #if PLATFORM(ANDROID)
-        Connection* connection() const;
+    Connection* connection() const;
 #endif
 
 #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
-        bool isApplicationInstalled(const String& name, PassRefPtr<ApplicationInstalledCallback> callback);
-        void onPackageResult();
+    bool isApplicationInstalled(const String& name, PassRefPtr<ApplicationInstalledCallback> callback);
+    void onPackageResult();
 #endif
 
 #if ENABLE(DOM_STORAGE)
@@ -104,31 +74,21 @@ public:
     void getStorageUpdates();
 #endif
 
-<<<<<<< HEAD
-    private:
-        Navigator(Frame*);
-        Frame* m_frame;
-        mutable RefPtr<DOMPluginArray> m_plugins;
-        mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
-        mutable RefPtr<Geolocation> m_geolocation;
-#if PLATFORM(ANDROID)
-        mutable RefPtr<Connection> m_connection;
-#endif
-
-#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
-        RefPtr<ApplicationInstalledCallback> m_applicationInstalledCallback;
-        String m_applicationNameQuery;
-#endif
-    };
-=======
 private:
     Navigator(Frame*);
     Frame* m_frame;
     mutable RefPtr<DOMPluginArray> m_plugins;
     mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
     mutable RefPtr<Geolocation> m_geolocation;
+#if PLATFORM(ANDROID)
+    mutable RefPtr<Connection> m_connection;
+#endif
+
+#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
+    RefPtr<ApplicationInstalledCallback> m_applicationInstalledCallback;
+    String m_applicationNameQuery;
+#endif
 };
->>>>>>> webkit.org at r64523
 
 }