From 74ee772b3c1ea8b557e5a596e9cbc655d1c0e161 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 8 Jun 2011 10:42:08 +0100 Subject: Merge WebKit at r82507: Fix conflicts - RenderLayerBacking.cpp Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81715 - Document.cpp Due to domTreeVersion and ANDROID_STYLE_VERSION http://trac.webkit.org/changeset/80797 - CachedResourceLoader.cpp Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE http://trac.webkit.org/changeset/80695 - Settings.cpp/h http://trac.webkit.org/changeset/81289 http://trac.webkit.org/changeset/81635 - MediaPlayer.cpp Whitespace only http://trac.webkit.org/changeset/80874 - RenderBox.cpp Due to isHorizontalWritingMode http://trac.webkit.org/changeset/81716 - RenderLayer.cpp/h Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81981 - CSSStyleSelector.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/80993 http://trac.webkit.org/changeset/80998 http://trac.webkit.org/changeset/81684 http://trac.webkit.org/changeset/82378 - CSSParser.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/81684 - StyleElement.cpp Due to cherry pick of http://trac.webkit.org/changeset/80787 http://trac.webkit.org/changeset/82054 - EventHandler.cpp Due to ANDROID_PLUGINS http://trac.webkit.org/changeset/81618 http://trac.webkit.org/changeset/81835 - SliderThumbElement.cpp Due to touch events http://trac.webkit.org/changeset/81216 - MediaControls.cpp Due to touch events http://trac.webkit.org/changeset/80857 Note that the WebKit history for this file is confusing as it was renamed in http://trac.webkit.org/changeset/83545 and then re-added in http://trac.webkit.org/changeset/84222 but trac is not smart enough to track history backwards from http://trac.webkit.org/changeset/84222. Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e --- Source/WebCore/css/CSSParser.cpp | 28 ++++----- Source/WebCore/css/CSSStyleSelector.cpp | 104 ++++++++++++++++---------------- 2 files changed, 64 insertions(+), 68 deletions(-) (limited to 'Source/WebCore/css') diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp index 02733ae..a941600 100644 --- a/Source/WebCore/css/CSSParser.cpp +++ b/Source/WebCore/css/CSSParser.cpp @@ -1893,7 +1893,19 @@ bool CSSParser::parseValue(int propId, bool important) case CSSPropertyWebkitTextEmphasisStyle: return parseTextEmphasisStyle(important); -<<<<<<< HEAD + case CSSPropertyWebkitTextOrientation: + // FIXME: For now just support upright and vertical-right. + if (id == CSSValueVerticalRight || id == CSSValueUpright) + validPrimitive = true; + break; + + case CSSPropertyWebkitLineBoxContain: + if (id == CSSValueNone) + validPrimitive = true; + else + return parseLineBoxContain(important); + break; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: { @@ -1931,20 +1943,6 @@ bool CSSParser::parseValue(int propId, bool important) m_valueList->next(); break; #endif -======= - case CSSPropertyWebkitTextOrientation: - // FIXME: For now just support upright and vertical-right. - if (id == CSSValueVerticalRight || id == CSSValueUpright) - validPrimitive = true; - break; - - case CSSPropertyWebkitLineBoxContain: - if (id == CSSValueNone) - validPrimitive = true; - else - return parseLineBoxContain(important); - break; ->>>>>>> webkit.org at r82507 #if ENABLE(SVG) default: diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp index d41e41b..7387089 100644 --- a/Source/WebCore/css/CSSStyleSelector.cpp +++ b/Source/WebCore/css/CSSStyleSelector.cpp @@ -6159,7 +6159,57 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; -<<<<<<< HEAD + case CSSPropertyWebkitTextOrientation: { + if (!isInherit && !isInitial && !primitiveValue) + return; + + TextOrientation result; + if (isInherit) + result = m_parentStyle->fontDescription().textOrientation(); + else if (isInitial) + result = RenderStyle::initialTextOrientation(); + else + result = *primitiveValue; + + FontDescription fontDescription = m_style->fontDescription(); + if (fontDescription.textOrientation() != result) { + fontDescription.setTextOrientation(result); + if (m_style->setFontDescription(fontDescription)) + m_fontDirty = true; + } + return; + } + + case CSSPropertyWebkitLineBoxContain: { + HANDLE_INHERIT_AND_INITIAL(lineBoxContain, LineBoxContain) + if (primitiveValue && primitiveValue->getIdent() == CSSValueNone) { + m_style->setLineBoxContain(LineBoxContainNone); + return; + } + + if (!value->isCSSLineBoxContainValue()) + return; + + CSSLineBoxContainValue* lineBoxContainValue = static_cast(value); + m_style->setLineBoxContain(lineBoxContainValue->value()); + return; + } + + // These properties are implemented in the CSSStyleApplyProperty lookup table. + case CSSPropertyColor: + case CSSPropertyBackgroundColor: + case CSSPropertyBorderBottomColor: + case CSSPropertyBorderLeftColor: + case CSSPropertyBorderRightColor: + case CSSPropertyBorderTopColor: + case CSSPropertyOutlineColor: + case CSSPropertyWebkitColumnRuleColor: + case CSSPropertyWebkitTextEmphasisColor: + case CSSPropertyWebkitTextFillColor: + case CSSPropertyWebkitTextStrokeColor: + ASSERT_NOT_REACHED(); + return; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return; @@ -6303,58 +6353,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; } #endif -======= - case CSSPropertyWebkitTextOrientation: { - if (!isInherit && !isInitial && !primitiveValue) - return; - - TextOrientation result; - if (isInherit) - result = m_parentStyle->fontDescription().textOrientation(); - else if (isInitial) - result = RenderStyle::initialTextOrientation(); - else - result = *primitiveValue; - - FontDescription fontDescription = m_style->fontDescription(); - if (fontDescription.textOrientation() != result) { - fontDescription.setTextOrientation(result); - if (m_style->setFontDescription(fontDescription)) - m_fontDirty = true; - } - return; - } - - case CSSPropertyWebkitLineBoxContain: { - HANDLE_INHERIT_AND_INITIAL(lineBoxContain, LineBoxContain) - if (primitiveValue && primitiveValue->getIdent() == CSSValueNone) { - m_style->setLineBoxContain(LineBoxContainNone); - return; - } - - if (!value->isCSSLineBoxContainValue()) - return; - - CSSLineBoxContainValue* lineBoxContainValue = static_cast(value); - m_style->setLineBoxContain(lineBoxContainValue->value()); - return; - } - - // These properties are implemented in the CSSStyleApplyProperty lookup table. - case CSSPropertyColor: - case CSSPropertyBackgroundColor: - case CSSPropertyBorderBottomColor: - case CSSPropertyBorderLeftColor: - case CSSPropertyBorderRightColor: - case CSSPropertyBorderTopColor: - case CSSPropertyOutlineColor: - case CSSPropertyWebkitColumnRuleColor: - case CSSPropertyWebkitTextEmphasisColor: - case CSSPropertyWebkitTextFillColor: - case CSSPropertyWebkitTextStrokeColor: - ASSERT_NOT_REACHED(); - return; ->>>>>>> webkit.org at r82507 #if ENABLE(SVG) default: -- cgit v1.1