Merge WebKit at r67908: Fix conflicts

Whitespace difference in config.h - http://trac.webkit.org/changeset/67323
- WebCore/config.h

Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882
- WebCore/css/CSSComputedStyleDeclaration.cpp

Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704
- WebCore/css/CSSParser.cpp

Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667
- WebCore/css/CSSParser.cpp
- WebCore/css/CSSStyleSelector.cpp

Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292
- WebCore/dom/Document.cpp

Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903
- WebCore/html/HTMLInputElement.cpp

Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198
- WebCore/loader/DocumentLoader.cpp
- WebCore/loader/FrameLoader.cpp

Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253
- WebCore/loader/FrameLoader.cpp

Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762
- WebCore/page/DOMWindow.cpp

Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h

Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375
- WebCore/platform/MIMETypeRegistry.cpp

Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325
- WebCore/plugins/PluginView.cpp

Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBlockLineLayout.cpp

Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBox.h
- WebCore/rendering/RenderTable.cpp

Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862
- WebCore/rendering/RenderTableCell.cpp

Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667
- WebCore/rendering/style/RenderStyle.h

Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c

fix conflicts

Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673

1 files changed, 19 insertions, 24 deletions

diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index d4fb713..502bc77 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -377,15 +377,13 @@ void CSSParser::parseSelector(const String& string, Document* doc, CSSSelectorLi
 
 bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const String& string, CSSStyleSourceData* styleSourceData)
 {
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter);
 #endif
-=======
+
     // Length of the "@-webkit-decls{" prefix.
     static const unsigned prefixLength = 15;
 
->>>>>>> webkit.org at r67908
     ASSERT(!declaration->stylesheet() || declaration->stylesheet()->isCSSStyleSheet());
     m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet());
     m_currentStyleData = styleSourceData;
@@ -403,11 +401,6 @@ bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const
         clearProperties();
     }
 
-<<<<<<< HEAD
-#ifdef ANDROID_INSTRUMENT
-    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
-#endif
-=======
     if (m_currentStyleData) {
         m_currentStyleData->styleBodyRange.start = 0;
         m_currentStyleData->styleBodyRange.end = string.length();
@@ -419,7 +412,11 @@ bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const
 
     if (!m_ruleRangeMap)
         m_currentStyleData = 0;
->>>>>>> webkit.org at r67908
+
+#ifdef ANDROID_INSTRUMENT
+    android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__);
+#endif
+
     return ok;
 }
 
@@ -1828,7 +1825,19 @@ bool CSSParser::parseValue(int propId, bool important)
         break;
 #endif
 
-<<<<<<< HEAD
+    // CSS Text Layout Module Level 3: Vertical writing support
+    case CSSPropertyWebkitBlockFlow:
+        // [ "tb" | "rl" | "lr" | "bt" ]
+        if (id == CSSValueTb || id == CSSValueRl || id == CSSValueLr || id == CSSValueBt)
+            validPrimitive = true;
+        break;
+
+    case CSSPropertyWebkitWritingMode:
+        // [ "lr-tb" | "rl-tb" | "tb-rl" | "bt-rl" | "tb-lr" | "bt-lr" ]
+        if (id == CSSValueLrTb || id == CSSValueRlTb || id == CSSValueTbRl || id == CSSValueBtRl || id == CSSValueTbLr || id == CSSValueBtLr)
+            validPrimitive = true;
+        break;
+
 #ifdef ANDROID_CSS_RING
     case CSSPropertyWebkitRing:
     {
@@ -1866,20 +1875,6 @@ bool CSSParser::parseValue(int propId, bool important)
             m_valueList->next();
         break;
 #endif
-=======
-    // CSS Text Layout Module Level 3: Vertical writing support
-    case CSSPropertyWebkitBlockFlow:
-        // [ "tb" | "rl" | "lr" | "bt" ]
-        if (id == CSSValueTb || id == CSSValueRl || id == CSSValueLr || id == CSSValueBt)
-            validPrimitive = true;
-        break;
-
-    case CSSPropertyWebkitWritingMode:
-        // [ "lr-tb" | "rl-tb" | "tb-rl" | "bt-rl" | "tb-lr" | "bt-lr" ]
-        if (id == CSSValueLrTb || id == CSSValueRlTb || id == CSSValueTbRl || id == CSSValueBtRl || id == CSSValueTbLr || id == CSSValueBtLr)
-            validPrimitive = true;
-        break;
->>>>>>> webkit.org at r67908
 
 #if ENABLE(SVG)
     default: