diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:22:47 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | 29a61d852e0ccad2dbbc64aadf491685cae3ca7d (patch) | |
| tree | c5baf6755603e451239bb547cb055ba5998a5c5e /WebCore/css | |
| parent | e458d70a0d18538346f41b503114c9ebe6b2ce12 (diff) | |
| download | external_webkit-29a61d852e0ccad2dbbc64aadf491685cae3ca7d.zip external_webkit-29a61d852e0ccad2dbbc64aadf491685cae3ca7d.tar.gz external_webkit-29a61d852e0ccad2dbbc64aadf491685cae3ca7d.tar.bz2 | |
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
Diffstat (limited to 'WebCore/css')
| -rw-r--r-- | WebCore/css/CSSComputedStyleDeclaration.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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<CSSValue> 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<CSSPropertyID>(propertyID)) { case CSSPropertyInvalid: |