[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 95ed98c9f72436a3260f25589ddeca227ab38b0e
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 16 22:25:51 2004 +0000

    Ahh! I checked in changes in my tree when I rolled out. Rolling those changes out.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6410 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 2d8c634..a0476ea 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -821,8 +821,6 @@ bool HTMLElementImpl::isFocusable() const
 
 bool HTMLElementImpl::isContentEditable() const 
 {
-    getDocument()->updateRendering();
-
     if (!renderer()) {
         if (parentNode())
             return parentNode()->isContentEditable();
@@ -833,10 +831,7 @@ bool HTMLElementImpl::isContentEditable() const
     return renderer()->style()->userModify() == READ_WRITE;
 }
 
-DOMString HTMLElementImpl::contentEditable() const 
-{
-    getDocument()->updateRendering();
-
+DOMString HTMLElementImpl::contentEditable() const {
     if (!renderer())
         return "false";
     
@@ -854,7 +849,7 @@ DOMString HTMLElementImpl::contentEditable() const
 void HTMLElementImpl::setContentEditable(HTMLAttributeImpl* attr) 
 {
     const AtomicString& enabled = attr->value();
-    if (enabled.isEmpty() || strcasecmp(enabled, "true") == 0)
+    if (strcasecmp(enabled, "true") == 0 || enabled.isEmpty())
         addCSSProperty(attr, CSS_PROP__KHTML_USER_MODIFY, CSS_VAL_READ_WRITE);
     else if (strcasecmp(enabled, "false") == 0)
         addCSSProperty(attr, CSS_PROP__KHTML_USER_MODIFY, CSS_VAL_READ_ONLY);

-- 
WebKit Debian packaging