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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 99ceb4d896cac59c5e44d951a625c55d3794a278
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 11 21:51:46 2003 +0000

            Reviewed by John.
    
    	- fixed 3475272 - custom property on CSSStyleObject won't hold a value
    
            * khtml/ecma/kjs_css.cpp:
            (DOMCSSStyleDeclaration::tryPut): If the property is not a css property,
    	save it as a custom object property in the normal way.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5456 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 88ba364..923c17f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-11-11  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3475272 - custom property on CSSStyleObject won't hold a value
+
+        * khtml/ecma/kjs_css.cpp:
+        (DOMCSSStyleDeclaration::tryPut): If the property is not a css property,
+	save it as a custom object property in the normal way.
+
 2003-11-11  John Sullivan  <sullivan at apple.com>
 
         - fixed <rdar://problem/3480421>: Focus rings around links are too thick, 
diff --git a/WebCore/khtml/ecma/kjs_css.cpp b/WebCore/khtml/ecma/kjs_css.cpp
index 3c2735e..d287ba2 100644
--- a/WebCore/khtml/ecma/kjs_css.cpp
+++ b/WebCore/khtml/ecma/kjs_css.cpp
@@ -164,26 +164,29 @@ Value DOMCSSStyleDeclaration::tryGet(ExecState *exec, const Identifier &property
 }
 
 
-void DOMCSSStyleDeclaration::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int )
+void DOMCSSStyleDeclaration::tryPut(ExecState *exec, const Identifier &propertyName, const Value& value, int attr )
 {
 #ifdef KJS_VERBOSE
   kdDebug(6070) << "DOMCSSStyleDeclaration::tryPut " << propertyName.qstring() << endl;
 #endif
   if (propertyName == "cssText") {
     styleDecl.setCssText(value.toString(exec).string());
-  }
-  else {
+  } else {
     bool pixelOrPos;
     QString prop = cssPropertyName(propertyName, &pixelOrPos);
-    QString propvalue = value.toString(exec).qstring();
-    if (pixelOrPos)
-      propvalue += "px";
+    if (prop.isAllASCII() && DOM::getPropertyID(prop.ascii(), prop.length())) {
+      QString propvalue = value.toString(exec).qstring();
+      if (pixelOrPos)
+	propvalue += "px";
 #ifdef KJS_VERBOSE
-    kdDebug(6070) << "DOMCSSStyleDeclaration: prop=" << prop << " propvalue=" << propvalue << endl;
+      kdDebug(6070) << "DOMCSSStyleDeclaration: prop=" << prop << " propvalue=" << propvalue << endl;
 #endif
-    styleDecl.removeProperty(prop);
-    if(!propvalue.isEmpty())
-      styleDecl.setProperty(prop,DOM::DOMString(propvalue),""); // ### is "" ok for priority?
+      styleDecl.removeProperty(prop);
+      if(!propvalue.isEmpty())
+	styleDecl.setProperty(prop,DOM::DOMString(propvalue),""); // ### is "" ok for priority?
+    } else {
+      DOMObject::tryPut(exec, propertyName, value, attr);
+    }
   }
 }
 

-- 
WebKit Debian packaging