Merge WebKit at r72272: Fix conflicts.

WebCore/Android.v8bindings.mk
http://trac.webkit.org/changeset/71802

WebCore/bindings/v8/V8Proxy.cpp
http://trac.webkit.org/changeset/71735

WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/71767
http://trac.webkit.org/changeset/72116 (several APIs purged)

WebCore/loader/ResourceLoader.cpp
http://trac.webkit.org/changeset/71884

WebCore/platform/graphics/MediaPlayer.cpp
http://trac.webkit.org/changeset/72117

WebCore/platform/image-decoders/ImageDecoder.cpp
http://trac.webkit.org/changeset/72130

WebCore/rendering/RenderBlockLineLayout.cpp
http://trac.webkit.org/changeset/72235

WebCore/rendering/RenderView.cpp
http://trac.webkit.org/changeset/71851

Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a

1 files changed, 4 insertions, 82 deletions

diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index df222b9..1e30272 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -363,15 +363,13 @@ void CSSParser::parseSelector(const String& string, Document* doc, CSSSelectorLi
     cssyyparse(this);
 
     m_selectorListForParseSelector = 0;
-<<<<<<< HEAD
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
-=======
 
     // The style sheet will be deleted right away, so it won't outlive the document.
     ASSERT(dummyStyleSheet->hasOneRef());
->>>>>>> webkit.org at r72274
+
+#ifdef ANDROID_INSTRUMENT
+    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
+#endif
 }
 
 bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const String& string, RefPtr<CSSStyleSourceData>* styleSourceData)
@@ -5643,82 +5641,6 @@ void CSSParser::endDeclarationsForMarginBox()
     m_numParsedPropertiesBeforeMarginBox = INVALID_NUM_PARSED_PROPERTIES;
 }
 
-<<<<<<< HEAD
-void CSSParser::clearVariables()
-{
-    m_variableNames.clear();
-    m_variableValues.clear();
-}
-
-bool CSSParser::parseVariable(CSSVariablesDeclaration* declaration, const String& variableName, const String& variableValue)
-{
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
-#endif
-    m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
-
-    String nameValuePair = variableName + ": ";
-    nameValuePair += variableValue;
-
-    setupParser("@-webkit-variables-decls{", nameValuePair, "} ");
-    cssyyparse(this);
-    m_rule = 0;
-
-    bool ok = false;
-    if (m_variableNames.size()) {
-        ok = true;
-        declaration->addParsedVariable(variableName, m_variableValues[0]);
-    }
-
-    clearVariables();
-
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
-    return ok;
-}
-
-void CSSParser::parsePropertyWithResolvedVariables(int propId, bool isImportant, CSSMutableStyleDeclaration* declaration, CSSParserValueList* list)
-{
-    m_valueList = list;
-    m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
-
-    if (parseValue(propId, isImportant))
-        declaration->addParsedProperties(m_parsedProperties, m_numParsedProperties);
-
-    clearProperties();
-    m_valueList = 0;
-}
-
-bool CSSParser::checkForVariables(CSSParserValueList* valueList)
-{
-    if (!valueList || !valueList->containsVariables())
-        return false;
-
-    bool hasVariables = false;
-    for (unsigned i = 0; i < valueList->size(); ++i) {
-        if (valueList->valueAt(i)->isVariable()) {
-            hasVariables = true;
-            break;
-        }
-
-        if (valueList->valueAt(i)->unit == CSSParserValue::Function && checkForVariables(valueList->valueAt(i)->function->args.get())) {
-            hasVariables = true;
-            break;
-        }
-    }
-
-    return hasVariables;
-}
-
-void CSSParser::addUnresolvedProperty(int propId, bool important)
-{
-    RefPtr<CSSVariableDependentValue> val = CSSVariableDependentValue::create(CSSValueList::createFromParserValueList(m_valueList));
-    addProperty(propId, val.release(), important);
-}
-
-=======
->>>>>>> webkit.org at r72274
 void CSSParser::deleteFontFaceOnlyValues()
 {
     ASSERT(m_hasFontFaceOnlyValues);