[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:41:26 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 06c4ceff7ac9fa75168fcf46c82a9747422b855c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon May 24 20:14:26 2004 +0000
Reviewed by Hyatt
* khtml/css/css_computedstyle.cpp:
(DOM::CSSComputedStyleDeclarationImpl::getPropertyValue): Fixed to return the property value,
as it should, instead of the whole property, as it was doing before.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6673 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index faed693..db572e5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2004-05-24 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Hyatt
+
+ * khtml/css/css_computedstyle.cpp:
+ (DOM::CSSComputedStyleDeclarationImpl::getPropertyValue): Fixed to return the property value,
+ as it should, instead of the whole property, as it was doing before.
+
2004-05-23 Darin Adler <darin at apple.com>
Reviewed by Ken.
diff --git a/WebCore/khtml/css/css_computedstyle.cpp b/WebCore/khtml/css/css_computedstyle.cpp
index e8b8aa6..7f6dbb9 100644
--- a/WebCore/khtml/css/css_computedstyle.cpp
+++ b/WebCore/khtml/css/css_computedstyle.cpp
@@ -692,9 +692,10 @@ CSSValueImpl *CSSComputedStyleDeclarationImpl::getPropertyCSSValue(int propertyI
DOMString CSSComputedStyleDeclarationImpl::getPropertyValue(int propertyID) const
{
- CSSProperty var = property(propertyID);
- DOMString str = var.cssText();
- return str;
+ CSSValueImpl* value = getPropertyCSSValue(propertyID);
+ if (value)
+ return value->cssText();
+ return "";
}
bool CSSComputedStyleDeclarationImpl::getPropertyPriority(int) const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list