From 29a61d852e0ccad2dbbc64aadf491685cae3ca7d Mon Sep 17 00:00:00 2001 From: Leon Clarke Date: Thu, 15 Jul 2010 12:22:47 +0100 Subject: Merge Webkit at r63173 : Fix conflicts. Android.v8bindings.mk: IDBBindingUtilities caused by http://trac.webkit.org/changeset/63064 CSSCompitedStyleDeclaration.cpp conflict caused by http://trac.webkit.org/changeset/63038 'Computed style is not implemented for padding-start, padding-end, margin-start, margin-end' HTMLDocumentParser.cpp conflict caused by http://trac.webkit.org/changeset/63165 'HTML5 Parser: document.write after onload blows away document' Navigator.h conflict caused by http://trac.webkit.org/changeset/62577 Page.cpp caused by http://trac.webkit.org/changeset/62502 ResourceHandleAndroid.cpp by http://trac.webkit.org/changeset/62736 HTMLLinkElement.* by the upstreaming of link prefetching at http://trac.webkit.org/changeset/63032 Change-Id: I5b9d3eef87cd525a9fc7d862676a41fc4122cba0 --- WebCore/css/CSSComputedStyleDeclaration.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'WebCore/css') diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp index c4ccdb3..2ebab06 100644 --- a/WebCore/css/CSSComputedStyleDeclaration.cpp +++ b/WebCore/css/CSSComputedStyleDeclaration.cpp @@ -691,13 +691,10 @@ PassRefPtr CSSComputedStyleDeclaration::getPropertyCSSValue(int proper if (!style) return 0; -<<<<<<< HEAD + propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction()); #ifdef ANDROID_LAYOUT const Settings * settings = node->document()->frame() ? node->document()->frame()->settings() : 0; #endif -======= - propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction()); ->>>>>>> webkit.org at r63173 switch (static_cast(propertyID)) { case CSSPropertyInvalid: -- cgit v1.1