diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-10 18:17:16 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:35:59 -0800 |
| commit | a884348a07235d658b6337f68cf977cecba570f6 (patch) | |
| tree | 5dd8a3432270f24647498639c89ac6460688c450 /WebCore/css | |
| parent | 28040489d744e0c5d475a88663056c9040ed5320 (diff) | |
| download | external_webkit-a884348a07235d658b6337f68cf977cecba570f6.zip external_webkit-a884348a07235d658b6337f68cf977cecba570f6.tar.gz external_webkit-a884348a07235d658b6337f68cf977cecba570f6.tar.bz2 | |
Merge Webkit at r71558: Fix conflicts.
WebCore/loader/FrameLoader.cpp
http://trac.webkit.org/changeset/70960
http://trac.webkit.org/changeset/70971
WebCore/css/CSSStyleSelector.cpp
http://trac.webkit.org/changeset/71218
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/71218
WebCore/html/HTMLLinkElement.cpp
http://trac.webkit.org/changeset/71159
WebCore/platform/android/PlatformBridge.h
http://trac.webkit.org/changeset/71484
WebCore/platform/android/TemporaryLinkStubs.cpp
http://trac.webkit.org/changeset/71484
WebCore/rendering/RenderTableSection.cpp
http://trac.webkit.org/changeset/71382
http://trac.webkit.org/changeset/71251
WebCore/rendering/RenderLayer.cpp
http://trac.webkit.org/changeset/71536
WebCore/rendering/RenderTable.cpp
http://trac.webkit.org/changeset/71382
WebCore/Android.v8bindings.mk
http://trac.webkit.org/changeset/71515
WebCore/bindings/scripts/CodeGeneratorV8.pm
http://trac.webkit.org/changeset/71227
http://trac.webkit.org/changeset/71230
Change-Id: I3ad8c6bc6e36c90aedebedf915a8614b2c786550
Diffstat (limited to 'WebCore/css')
| -rw-r--r-- | WebCore/css/CSSParser.cpp | 12 | ||||
| -rw-r--r-- | WebCore/css/CSSStyleSelector.cpp | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp index f98036f..dcff1ac 100644 --- a/WebCore/css/CSSParser.cpp +++ b/WebCore/css/CSSParser.cpp @@ -1840,7 +1840,11 @@ bool CSSParser::parseValue(int propId, bool important) validPrimitive = true; break; -<<<<<<< HEAD + case CSSPropertyWebkitTextCombine: + if (id == CSSValueNone || id == CSSValueCluster || id == CSSValueUpright) + validPrimitive = true; + break; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: { @@ -1878,12 +1882,6 @@ bool CSSParser::parseValue(int propId, bool important) m_valueList->next(); break; #endif -======= - case CSSPropertyWebkitTextCombine: - if (id == CSSValueNone || id == CSSValueCluster || id == CSSValueUpright) - validPrimitive = true; - break; ->>>>>>> webkit.org at r71558 #if ENABLE(SVG) default: diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp index ec56916..750f6e7 100644 --- a/WebCore/css/CSSStyleSelector.cpp +++ b/WebCore/css/CSSStyleSelector.cpp @@ -5616,7 +5616,10 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; } -<<<<<<< HEAD + case CSSPropertyWebkitTextCombine: + HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textCombine, TextCombine) + return; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return; @@ -5760,11 +5763,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; } #endif -======= - case CSSPropertyWebkitTextCombine: - HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textCombine, TextCombine) - return; ->>>>>>> webkit.org at r71558 #if ENABLE(SVG) default: |