Merge Webkit at r58956: Fix conflicts.

Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to
    recently upstreamed change http://trac.webkit.org/changeset/58110

Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can
    be removed post-merge.

Fix conflict: WebCore/platform/ScrollView.cpp
Fix conflict: WebCore/platform/ScrollView.h
Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove
    ScrollView::platformProhibitsScrolling and
    ScrollView::scrollRectIntoViewRecursively as they have been
    removed upstream in http://trac.webkit.org/changeset/58428,
    http://trac.webkit.org/changeset/58445 and
    http://trac.webkit.org/changeset/58611.
    platformProhibitsScrolling was an Android specific function
    called only from scrollRectIntoViewRecursively.

Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both
    (we have an Android specific addition).

Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs,
    our fix has been upstreamed in
    http://trac.webkit.org/changeset/58490.

Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs.
    See http://trac.webkit.org/changeset/58177

Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android
    specific addition).

Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific
    addition).

Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs.
    see http://trac.webkit.org/changeset/58775

Fix conflict: FileSystemAndroid.cpp:
Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been
    upstreamed but beyond 58596. See
    http://trac.webkit.org/changeset/59226

Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf

12 files changed, 26 insertions, 116 deletions

diff --git a/WebCore/bindings/v8/ScriptCallStack.cpp b/WebCore/bindings/v8/ScriptCallStack.cpp
index 6ca952e..10a31d6 100644
--- a/WebCore/bindings/v8/ScriptCallStack.cpp
+++ b/WebCore/bindings/v8/ScriptCallStack.cpp
@@ -54,14 +54,10 @@ ScriptCallStack* ScriptCallStack::create(const v8::Arguments& arguments, unsigne
 
 bool ScriptCallStack::callLocation(String* sourceName, int* sourceLineNumber, String* functionName)
 {
-<<<<<<< HEAD:WebCore/bindings/v8/ScriptCallStack.cpp
 #if PLATFORM(ANDROID)
     return false;
 #else
-    if (!ScriptDebugServer::topStackFrame(*sourceName, *sourceLineNumber, *functionName))
-=======
     if (!topStackFrame(*sourceName, *sourceLineNumber, *functionName))
->>>>>>> webkit.org at r58956:WebCore/bindings/v8/ScriptCallStack.cpp
         return false;
     *sourceLineNumber += 1;
     return true;
diff --git a/WebCore/bridge/jni/jni_jsobject.h b/WebCore/bridge/jni/jni_jsobject.h
index 3c87043..34a78ba 100644
--- a/WebCore/bridge/jni/jni_jsobject.h
+++ b/WebCore/bridge/jni/jni_jsobject.h
@@ -128,10 +128,6 @@ jstring KJS_JSObject_JSObjectToString(JNIEnv*, jclass, jlong nativeJSObject);
 
 #endif // PLATFORM(MAC)
 
-<<<<<<< HEAD:WebCore/bridge/jni/jni_jsobject.h
-#endif // ENABLE(MAC_JAVA_BRIDGE)
-=======
 #endif // ENABLE(JAVA_BRIDGE)
->>>>>>> webkit.org at r58956:WebCore/bridge/jni/jni_jsobject.h
 
 #endif // JAVASCRIPTCORE_BINDINGS_JNI_JSOBJECT_H
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 8983eeb..5ab686f 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -1754,20 +1754,21 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSSPropertyTextUnderline:
     case CSSPropertyWebkitVariableDeclarationBlock:
         return false;
-<<<<<<< HEAD:WebCore/css/CSSParser.cpp
-#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
-    case CSSPropertyWebkitTapHighlightColor:
-        parsedValue = parseColor();
-        if (parsedValue)
-            m_valueList->next();
-=======
+
 #if ENABLE(WCSS)
     case CSSPropertyWapInputFormat:
         validPrimitive = true;
         break;
     case CSSPropertyWapInputRequired:
         parsedValue = parseWCSSInputProperty();
->>>>>>> webkit.org at r58956:WebCore/css/CSSParser.cpp
+        break;
+#endif
+
+#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
+    case CSSPropertyWebkitTapHighlightColor:
+        parsedValue = parseColor();
+        if (parsedValue)
+            m_valueList->next();
         break;
 #endif
 
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 389bd11..eae36ac 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -5320,19 +5320,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
     case CSSPropertyWebkitTextStroke:
     case CSSPropertyWebkitVariableDeclarationBlock:
         return;
-<<<<<<< HEAD:WebCore/css/CSSStyleSelector.cpp
-#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
-    case CSSPropertyWebkitTapHighlightColor: {
-        HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor);
-        if (!primitiveValue)
-            break;
-
-        Color col = getColorFromPrimitiveValue(primitiveValue).blendWithWhite();
-        m_style->setTapHighlightColor(col);
-        return;
-    }
-#endif
-=======
 #if ENABLE(WCSS)
     case CSSPropertyWapInputFormat:
         if (primitiveValue && m_element->hasTagName(WebCore::inputTag)) {
@@ -5350,7 +5337,18 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         return;
 #endif 
 
->>>>>>> webkit.org at r58956:WebCore/css/CSSStyleSelector.cpp
+#ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR
+    case CSSPropertyWebkitTapHighlightColor: {
+        HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor);
+        if (!primitiveValue)
+            break;
+
+        Color col = getColorFromPrimitiveValue(primitiveValue).blendWithWhite();
+        m_style->setTapHighlightColor(col);
+        return;
+    }
+#endif
+
 #if ENABLE(SVG)
     default:
         // Try the SVG properties
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index 83aef21..bda4aa9 100644
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -103,13 +103,12 @@
 #include "HTMLNoScriptElement.h"
 #endif
 
-<<<<<<< HEAD:WebCore/dom/Node.cpp
-#if ENABLE(TOUCH_EVENTS)
-#include "ChromeClient.h"
-=======
 #if USE(JSC)
 #include <runtime/JSGlobalData.h>
->>>>>>> webkit.org at r58956:WebCore/dom/Node.cpp
+#endif
+
+#if ENABLE(TOUCH_EVENTS)
+#include "ChromeClient.h"
 #endif
 
 #define DUMP_NODE_STATISTICS 0
diff --git a/WebCore/html/HTMLOptionElement.cpp b/WebCore/html/HTMLOptionElement.cpp
index 1280d32..1e07221 100644
--- a/WebCore/html/HTMLOptionElement.cpp
+++ b/WebCore/html/HTMLOptionElement.cpp
@@ -190,15 +190,7 @@ void HTMLOptionElement::childrenChanged(bool changedByParser, Node* beforeChange
 HTMLSelectElement* HTMLOptionElement::ownerSelectElement() const
 {
     Node* select = parentNode();
-<<<<<<< HEAD:WebCore/html/HTMLOptionElement.cpp
-#ifdef ANDROID_FIX
     while (select && !(select->hasTagName(selectTag) || select->hasTagName(keygenTag)))
-#else
-    while (select && !select->hasTagName(selectTag))
-#endif
-=======
-    while (select && !(select->hasTagName(selectTag) || select->hasTagName(keygenTag)))
->>>>>>> webkit.org at r58956:WebCore/html/HTMLOptionElement.cpp
         select = select->parentNode();
 
     if (!select)
diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp
index f0e705e..9694b28 100644
--- a/WebCore/platform/ScrollView.cpp
+++ b/WebCore/platform/ScrollView.cpp
@@ -296,39 +296,6 @@ void ScrollView::valueChanged(Scrollbar* scrollbar)
     scrollContents(scrollDelta);
 }
 
-<<<<<<< HEAD:WebCore/platform/ScrollView.cpp
-void ScrollView::scrollRectIntoViewRecursively(const IntRect& r)
-{
-#if PLATFORM(ANDROID)
-    if (platformProhibitsScrolling())
-        return;
-#endif
-    // FIXME: This method is not transform-aware.  It should just be moved to FrameView so that an accurate
-    // position for the child view can be determined.
-    IntRect rect = r;
-    ScrollView* view = this;
-    while (view) {
-        if (view->prohibitsScrolling()) // Allow the views to scroll into view recursively until we hit one that prohibits scrolling.
-            return;
-        view->setScrollPosition(rect.location());
-        rect.move(view->x() - view->scrollOffset().width(), view->y() - view->scrollOffset().height());
-        if (view->parent())
-            rect.intersect(view->frameRect());
-        view = view->parent();
-    }
-    
-    // We may be embedded inside some containing platform scroll view that we don't manage.  This is the case
-    // in Mail.app on OS X, for example, where the WebKit view for message bodies is inside a Cocoa NSScrollView
-    // that contains both it and message headers.  Let the HostWindow know about this scroll so that it can pass the message
-    // on up the view chain.
-    // This rect is not clamped, since Mail actually relies on receiving an unclamped rect with negative coordinates in order to
-    // expose the headers.
-    if (hostWindow())
-        hostWindow()->scrollRectIntoView(rect, this);
-}
-
-=======
->>>>>>> webkit.org at r58956:WebCore/platform/ScrollView.cpp
 void ScrollView::setScrollPosition(const IntPoint& scrollPoint)
 {
     if (prohibitsScrolling())
diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h
index b103d22..e0c50d3 100644
--- a/WebCore/platform/ScrollView.h
+++ b/WebCore/platform/ScrollView.h
@@ -344,15 +344,12 @@ private:
     ScrollViewPrivate* m_data;
 #endif
 
-#if PLATFORM(ANDROID)
-public:
-    bool platformProhibitsScrolling();
 #ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS
+public:
     // capture parts of rect not contained by vis
     void platformOffscreenContentRectangle(const IntRect& vis,
         const IntRect& rect);
 #endif
-#endif
 }; // class ScrollView
 
 } // namespace WebCore
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp
index 520bc7d..3d841d7 100644
--- a/WebCore/platform/android/FileSystemAndroid.cpp
+++ b/WebCore/platform/android/FileSystemAndroid.cpp
@@ -75,23 +75,6 @@ bool unloadModule(PlatformModule module)
     return !dlclose(module);
 }
 
-<<<<<<< HEAD:WebCore/platform/android/FileSystemAndroid.cpp
-=======
-int writeToFile(PlatformFileHandle handle, const char* data, int length)
-{
-    int totalBytesWritten = 0;
-    while (totalBytesWritten < length) {
-        int bytesWritten = write(handle, data, (size_t)(length - totalBytesWritten));
-        if (bytesWritten < 0 && errno != EINTR)
-            return -1;
-        if (bytesWritten > 0)
-            totalBytesWritten += bytesWritten;
-    }
-
-    return totalBytesWritten;
-}
-
->>>>>>> webkit.org at r58956:WebCore/platform/android/FileSystemAndroid.cpp
 String homeDirectoryPath() 
 {
     return sPluginPath;
diff --git a/WebCore/platform/android/ScrollViewAndroid.cpp b/WebCore/platform/android/ScrollViewAndroid.cpp
index 90a988d..e45df53 100644
--- a/WebCore/platform/android/ScrollViewAndroid.cpp
+++ b/WebCore/platform/android/ScrollViewAndroid.cpp
@@ -87,19 +87,6 @@ void ScrollView::platformScrollbarModes(ScrollbarMode& h, ScrollbarMode& v) cons
     v = m_verticalScrollbarMode;
 }
 
-bool ScrollView::platformProhibitsScrolling()
-{
-    if (!isFrameView())
-        return false;
-    FrameView* view = static_cast<FrameView*>(this);
-    // We want to ignore requests to scroll that were not initiated by the user.  An
-    // example of this is when text is inserted into a textfield/area, which results in
-    // a scroll.  We ignore this because we now how to do this ourselves in the UI thread.
-    // An example of it being initiated by the user is if the user clicks an anchor
-    // element which simply scrolls the page.
-    return !android::WebFrame::getWebFrame(view->frame())->userInitiatedClick();
-}
-
 void ScrollView::platformRepaintContentRectangle(const IntRect &rect, bool now)
 {
     android::WebViewCore::getWebViewCore(this)->contentInvalidate(rect);
diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp
index ba17d39..ac8c7fa 100644
--- a/WebCore/platform/posix/FileSystemPOSIX.cpp
+++ b/WebCore/platform/posix/FileSystemPOSIX.cpp
@@ -116,7 +116,6 @@ bool truncateFile(PlatformFileHandle handle, long long offset)
     return !ftruncate(handle, offset);
 }
 
-#if !PLATFORM(ANDROID)
 int writeToFile(PlatformFileHandle handle, const char* data, int length)
 {
     do {
@@ -126,7 +125,6 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length)
     } while (errno == EINTR);
     return -1;
 }
-#endif
 
 int readFromFile(PlatformFileHandle handle, char* data, int length)
 {
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index e38cf25..9204b64 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -1320,12 +1320,8 @@ void RenderBox::calcWidth()
         if (treatAsReplaced) {
 #else
         if (treatAsReplaced)
-<<<<<<< HEAD:WebCore/rendering/RenderBox.cpp
 #endif
-            setWidth(max(w.value() + borderLeft() + borderRight() + paddingLeft() + paddingRight(), minPrefWidth()));
-=======
             setWidth(max(w.value() + borderAndPaddingWidth(), minPrefWidth()));
->>>>>>> webkit.org at r58956:WebCore/rendering/RenderBox.cpp
 
 #ifdef ANDROID_LAYOUT
             // in SSR mode with replaced box, if the box width is wider than the container width,