diff options
Diffstat (limited to 'WebCore/css')
| -rw-r--r-- | WebCore/css/CSSComputedStyleDeclaration.cpp | 6 | ||||
| -rw-r--r-- | WebCore/css/CSSParser.cpp | 13 |
2 files changed, 4 insertions, 15 deletions
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp index 44cfd74..9f4c3be 100644 --- a/WebCore/css/CSSComputedStyleDeclaration.cpp +++ b/WebCore/css/CSSComputedStyleDeclaration.cpp @@ -754,14 +754,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper if (!style) return 0; -<<<<<<< HEAD - propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction(), style->blockFlow()); + propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction(), style->writingMode()); #ifdef ANDROID_LAYOUT const Settings * settings = node->document()->frame() ? node->document()->frame()->settings() : 0; #endif -======= - propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction(), style->writingMode()); ->>>>>>> webkit.org at r70209 switch (static_cast<CSSPropertyID>(propertyID)) { case CSSPropertyInvalid: diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp index f098a9f..e75e017 100644 --- a/WebCore/css/CSSParser.cpp +++ b/WebCore/css/CSSParser.cpp @@ -412,20 +412,13 @@ bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const } } -<<<<<<< HEAD - if (!m_ruleRangeMap) - m_currentStyleData = 0; - -#ifdef ANDROID_INSTRUMENT - android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__); -#endif - -======= if (styleSourceData) { *styleSourceData = m_currentRuleData->styleSourceData.release(); m_currentRuleData = 0; } ->>>>>>> webkit.org at r70209 +#ifdef ANDROID_INSTRUMENT + android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__); +#endif return ok; } |