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

4 files changed, 15 insertions, 151 deletions

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index bc7cc1e..deff632 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -823,15 +823,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	storage/IDBObjectStoreRequest.cpp \
 	storage/IDBRequest.cpp \
 	storage/IDBSuccessEvent.cpp \
-<<<<<<< HEAD
-	storage/IndexedDatabase.cpp \
-	storage/IndexedDatabaseImpl.cpp \
-	storage/IndexedDatabaseRequest.cpp \
-=======
 	storage/IDBFactory.cpp \
 	storage/IDBFactoryBackendInterface.cpp \
 	storage/IDBFactoryBackendImpl.cpp \
->>>>>>> webkit.org at r64523
 	storage/LocalStorageTask.cpp \
 	storage/LocalStorageThread.cpp \
 	storage/OriginQuotaManager.cpp \
diff --git a/WebCore/html/HTMLFrameSetElement.cpp b/WebCore/html/HTMLFrameSetElement.cpp
index d0f84ef..09c153d 100644
--- a/WebCore/html/HTMLFrameSetElement.cpp
+++ b/WebCore/html/HTMLFrameSetElement.cpp
@@ -208,14 +208,10 @@ void HTMLFrameSetElement::recalcStyle(StyleChange ch)
 {
     if (needsStyleRecalc() && renderer()) {
         renderer()->setNeedsLayout(true);
-<<<<<<< HEAD
 #ifdef ANDROID_FLATTEN_FRAMESET
         static_cast<RenderFrameSet*>(renderer())->setGridNeedsLayout();
 #endif
-        setNeedsStyleRecalc(NoStyleChange);
-=======
         clearNeedsStyleRecalc();
->>>>>>> webkit.org at r64523
     }
     HTMLElement::recalcStyle(ch);
 }
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
 
 }
 
diff --git a/WebCore/rendering/SVGResourcesCycleSolver.cpp b/WebCore/rendering/SVGResourcesCycleSolver.cpp
index ec2e036..8cd2e80 100644
--- a/WebCore/rendering/SVGResourcesCycleSolver.cpp
+++ b/WebCore/rendering/SVGResourcesCycleSolver.cpp
@@ -94,92 +94,6 @@ bool SVGResourcesCycleSolver::resourceContainsCycles(RenderObject* renderer) con
     return false;
 }
 
-<<<<<<< HEAD
-static inline String targetReferenceFromResource(SVGElement* element, bool& isValid)
-{
-    String target;
-    if (element->hasTagName(SVGNames::patternTag))
-        target = static_cast<SVGPatternElement*>(element)->href();
-    else if (element->hasTagName(SVGNames::linearGradientTag) || element->hasTagName(SVGNames::radialGradientTag))
-        target = static_cast<SVGGradientElement*>(element)->href();
-// ANDROID
-// This is deleted upstream so we cannot upstream the guard
-// http://trac.webkit.org/changeset/64440/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp
-#if ENABLE(FILTERS)
-    else if (element->hasTagName(SVGNames::filterTag))
-        target = static_cast<SVGFilterElement*>(element)->href();
-#endif
-    else {
-        isValid = false;
-        return target;
-    }
-
-    return SVGURIReference::getTarget(target);
-}
-
-static inline void setFollowLinkForChainableResource(SVGElement*, bool)
-{
-    // FIXME: Enable once the follow-up patch for bug 43031 lands
-}
-
-bool SVGResourcesCycleSolver::chainableResourceContainsCycles(RenderSVGResourceContainer* container) const
-{
-    ASSERT(container);
-    ASSERT(container->node());
-    ASSERT(container->node()->isSVGElement());
-
-    // Chainable resources cycle detection is performed in the DOM tree.
-    SVGElement* element = static_cast<SVGElement*>(container->node());
-    ASSERT(element);
-
-    HashSet<SVGElement*> processedObjects;
-
-    bool isValid = true;
-    String target = targetReferenceFromResource(element, isValid);
-    ASSERT(isValid);
-
-    SVGElement* previousElement = element;
-    while (!target.isEmpty()) {
-        Node* targetNode = element->document()->getElementById(target);
-        if (!targetNode || !targetNode->isSVGElement())
-            break;
-
-        // Catch cylic chaining, otherwhise we'll run into an infinite loop here.
-        // <pattern id="foo" xlink:href="#bar"/> <pattern id="bar xlink:href="#foo"/>
-        SVGElement* targetElement = static_cast<SVGElement*>(targetNode);
-
-        bool followLink = true;
-        if (processedObjects.contains(targetElement) || targetElement == element)
-            followLink = false;
-
-        setFollowLinkForChainableResource(previousElement, followLink);
-        if (!followLink)
-            return false;
-
-        previousElement = targetElement;
-        processedObjects.add(targetElement);
-        target = targetReferenceFromResource(targetElement, isValid);
-        if (!isValid)
-            break;
-    }
-
-    // Couldn't find any direct cycle in the xlink:href chain, maybe there's an indirect one.
-    // <pattern id="foo" xlink:href="#bar"/> <pattern id="bar"> <rect fill="url(#foo)"...
-    HashSet<SVGElement*>::iterator end = processedObjects.end();
-    for (HashSet<SVGElement*>::iterator it = processedObjects.begin(); it != end; ++it) {
-        RenderObject* renderer = (*it)->renderer();
-        if (!renderer)
-            continue;
-        ASSERT(renderer->isSVGResourceContainer());
-        if (m_allResources.contains(renderer->toRenderSVGResourceContainer()))
-            return true;
-    }
-
-    return false;
-}
-
-=======
->>>>>>> webkit.org at r64523
 void SVGResourcesCycleSolver::resolveCycles()
 {
     ASSERT(m_allResources.isEmpty());