[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 f31fa4014388c0754e2be6d66e4784702f531906
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 16 23:29:17 2004 +0000

            Reviewed by Hyatt
    
            * khtml/html/html_elementimpl.cpp:
            (HTMLElementImpl::isContentEditable): Call getDocument()->updateRendering() to make sure
            outstanding changes for this attribute are applied.
            (HTMLElementImpl::contentEditable): Call getDocument()->updateRendering() to make sure
            outstanding changes for this attribute are applied.
            (HTMLElementImpl::setContentEditable): Call enabled.isEmpty() before strcasecmp(enabled, "true").
            It's cheaper.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6415 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8f03d12..5a3b989 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,18 @@
 
         Reviewed by Hyatt
 
+        * khtml/html/html_elementimpl.cpp:
+        (HTMLElementImpl::isContentEditable): Call getDocument()->updateRendering() to make sure 
+        outstanding changes for this attribute are applied.
+        (HTMLElementImpl::contentEditable): Call getDocument()->updateRendering() to make sure 
+        outstanding changes for this attribute are applied.
+        (HTMLElementImpl::setContentEditable): Call enabled.isEmpty() before strcasecmp(enabled, "true").
+        It's cheaper.
+
+2004-04-16  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Hyatt
+
         * khtml/editing/htmlediting_impl.cpp: New helper.
         (DeleteSelectionCommandImpl::containsOnlyWhitespace): Fix deleting collapsed whitespace 
         at the end of a line where text has flowed to the next line and the caret is at the 
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index a0476ea..2d8c634 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -821,6 +821,8 @@ bool HTMLElementImpl::isFocusable() const
 
 bool HTMLElementImpl::isContentEditable() const 
 {
+    getDocument()->updateRendering();
+
     if (!renderer()) {
         if (parentNode())
             return parentNode()->isContentEditable();
@@ -831,7 +833,10 @@ bool HTMLElementImpl::isContentEditable() const
     return renderer()->style()->userModify() == READ_WRITE;
 }
 
-DOMString HTMLElementImpl::contentEditable() const {
+DOMString HTMLElementImpl::contentEditable() const 
+{
+    getDocument()->updateRendering();
+
     if (!renderer())
         return "false";
     
@@ -849,7 +854,7 @@ DOMString HTMLElementImpl::contentEditable() const {
 void HTMLElementImpl::setContentEditable(HTMLAttributeImpl* attr) 
 {
     const AtomicString& enabled = attr->value();
-    if (strcasecmp(enabled, "true") == 0 || enabled.isEmpty())
+    if (enabled.isEmpty() || strcasecmp(enabled, "true") == 0)
         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