From e7bbc0900fd93114f04d2690ce8eab67b784b8c8 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 5 May 2011 14:51:35 +0100 Subject: Merge WebKit at r74534: Fix conflicts. .gitignore - keep ours Android.mk http://trac.webkit.org/changeset/74431 Parser.cpp http://trac.webkit.org/changeset/74377 ImageDecoder.cpp http://trac.webkit.org/changeset/73819 GraphicsContext.cpp http://trac.webkit.org/changeset/73729 ContextMenuItem.h http://trac.webkit.org/changeset/74028 SVGFontFaceUriElement.h http://trac.webkit.org/changeset/74493 RenderView.h http://trac.webkit.org/changeset/74524 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 InlineTextBox.cpp http://trac.webkit.org/changeset/73548 SliderThumbElement.cpp RenderSlider.cpp http://trac.webkit.org/changeset/74044 StyleRareInheritedData.cpp|h CSSStyleSelector.cpp CSSParser.cpp http://trac.webkit.org/changeset/73219 RenderBox.h http://trac.webkit.org/changeset/73385 FrameLoader.cpp http://trac.webkit.org/changeset/73486 http://trac.webkit.org/changeset/74426 ResourceLoader.cpp http://trac.webkit.org/changeset/74453 DOMWindow.cpp|h http://trac.webkit.org/changeset/73829 HTMLLinkElement.cpp http://trac.webkit.org/changeset/74476 V8NPUtils.cpp: Do not undo http://trac.webkit.org/changeset/78994 RenderSVGResourceSolidColor.cpp http://trac.webkit.org/changeset/72926 Remove loader.cpp http://trac.webkit.org/changeset/74049 Change-Id: I8e97de5b2237d85310e1005e067f0b3a6b14432f --- WebCore/css/CSSParser.cpp | 8 ++- WebCore/css/CSSStyleSelector.cpp | 102 +++++++++++++++++++-------------------- 2 files changed, 53 insertions(+), 57 deletions(-) (limited to 'WebCore/css') diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp index dbc5877..65d90e5 100644 --- a/WebCore/css/CSSParser.cpp +++ b/WebCore/css/CSSParser.cpp @@ -1855,7 +1855,9 @@ bool CSSParser::parseValue(int propId, bool important) validPrimitive = true; break; -<<<<<<< HEAD + case CSSPropertyWebkitTextEmphasisStyle: + return parseTextEmphasisStyle(important); + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: { @@ -1893,10 +1895,6 @@ bool CSSParser::parseValue(int propId, bool important) m_valueList->next(); break; #endif -======= - case CSSPropertyWebkitTextEmphasisStyle: - return parseTextEmphasisStyle(important); ->>>>>>> webkit.org at r74534 (trunk) #if ENABLE(SVG) default: diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp index 492047d..e442b17 100644 --- a/WebCore/css/CSSStyleSelector.cpp +++ b/WebCore/css/CSSStyleSelector.cpp @@ -5562,7 +5562,56 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textCombine, TextCombine) return; -<<<<<<< HEAD + case CSSPropertyWebkitTextEmphasisPosition: + HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textEmphasisPosition, TextEmphasisPosition) + return; + + case CSSPropertyWebkitTextEmphasisStyle: + HANDLE_INHERIT_AND_INITIAL(textEmphasisFill, TextEmphasisFill) + HANDLE_INHERIT_AND_INITIAL(textEmphasisMark, TextEmphasisMark) + HANDLE_INHERIT_AND_INITIAL(textEmphasisCustomMark, TextEmphasisCustomMark) + if (isInherit || isInitial) + return; + + if (value->isValueList()) { + CSSValueList* list = static_cast(value); + ASSERT(list->length() == 2); + if (list->length() != 2) + return; + for (unsigned i = 0; i < 2; ++i) { + ASSERT(list->itemWithoutBoundsCheck(i)->isPrimitiveValue()); + CSSPrimitiveValue* value = static_cast(list->itemWithoutBoundsCheck(i)); + if (value->getIdent() == CSSValueFilled || value->getIdent() == CSSValueOpen) + m_style->setTextEmphasisFill(*value); + else + m_style->setTextEmphasisMark(*value); + } + m_style->setTextEmphasisCustomMark(nullAtom); + return; + } + + if (!primitiveValue) + return; + + if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_STRING) { + m_style->setTextEmphasisFill(TextEmphasisFillFilled); + m_style->setTextEmphasisMark(TextEmphasisMarkCustom); + m_style->setTextEmphasisCustomMark(primitiveValue->getStringValue()); + return; + } + + m_style->setTextEmphasisCustomMark(nullAtom); + + if (primitiveValue->getIdent() == CSSValueFilled || primitiveValue->getIdent() == CSSValueOpen) { + m_style->setTextEmphasisFill(*primitiveValue); + m_style->setTextEmphasisMark(TextEmphasisMarkAuto); + } else { + m_style->setTextEmphasisFill(TextEmphasisFillFilled); + m_style->setTextEmphasisMark(*primitiveValue); + } + + return; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return; @@ -5706,57 +5755,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; } #endif -======= - case CSSPropertyWebkitTextEmphasisPosition: - HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textEmphasisPosition, TextEmphasisPosition) - return; - - case CSSPropertyWebkitTextEmphasisStyle: - HANDLE_INHERIT_AND_INITIAL(textEmphasisFill, TextEmphasisFill) - HANDLE_INHERIT_AND_INITIAL(textEmphasisMark, TextEmphasisMark) - HANDLE_INHERIT_AND_INITIAL(textEmphasisCustomMark, TextEmphasisCustomMark) - if (isInherit || isInitial) - return; - - if (value->isValueList()) { - CSSValueList* list = static_cast(value); - ASSERT(list->length() == 2); - if (list->length() != 2) - return; - for (unsigned i = 0; i < 2; ++i) { - ASSERT(list->itemWithoutBoundsCheck(i)->isPrimitiveValue()); - CSSPrimitiveValue* value = static_cast(list->itemWithoutBoundsCheck(i)); - if (value->getIdent() == CSSValueFilled || value->getIdent() == CSSValueOpen) - m_style->setTextEmphasisFill(*value); - else - m_style->setTextEmphasisMark(*value); - } - m_style->setTextEmphasisCustomMark(nullAtom); - return; - } - - if (!primitiveValue) - return; - - if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_STRING) { - m_style->setTextEmphasisFill(TextEmphasisFillFilled); - m_style->setTextEmphasisMark(TextEmphasisMarkCustom); - m_style->setTextEmphasisCustomMark(primitiveValue->getStringValue()); - return; - } - - m_style->setTextEmphasisCustomMark(nullAtom); - - if (primitiveValue->getIdent() == CSSValueFilled || primitiveValue->getIdent() == CSSValueOpen) { - m_style->setTextEmphasisFill(*primitiveValue); - m_style->setTextEmphasisMark(TextEmphasisMarkAuto); - } else { - m_style->setTextEmphasisFill(TextEmphasisFillFilled); - m_style->setTextEmphasisMark(*primitiveValue); - } - - return; ->>>>>>> webkit.org at r74534 (trunk) #if ENABLE(SVG) default: -- cgit v1.1