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

2 files changed, 21 insertions, 22 deletions

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