[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:24:51 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3bcacf49ce6d88a13c8cd184895c59df47fd0a18
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 30 21:00:38 2004 +0000
Fix a regression I introduced in my atomicstring patch. I meant to say !attr->isNull() in the contentedtiable
attribute parsing code.
Reviewed by cblu
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::parseAttribute):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6011 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6d1033c..0a88d7f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
2004-01-30 David Hyatt <hyatt at apple.com>
+ Fix a regression I introduced in my atomicstring patch. I meant to say !attr->isNull() in the contentedtiable
+ attribute parsing code.
+
+ Reviewed by cblu
+
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::parseAttribute):
+
+2004-01-30 David Hyatt <hyatt at apple.com>
+
Make m_lineHeight be cached on RenderFlow instead of RenderText and avoid recomputing it so much when it
is not set by CSS (since calls to fontMetrics().lineSpacing() are expensive).
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index b467a56..a3d0d07 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -193,7 +193,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
setChanged();
break;
case ATTR_CONTENTEDITABLE:
- if (attr->isNull())
+ if (!attr->isNull())
setContentEditable(attr->value());
else
removeCSSProperty(CSS_PROP__KHTML_USER_MODIFY);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list