git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 01ffdff)
Reviewed by Anders.
authorrwlbuis <rwlbuis@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jul 2006 20:18:49 +0000 (20:18 +0000)
committerrwlbuis <rwlbuis@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 27 Jul 2006 20:18:49 +0000 (20:18 +0000)
        http://bugzilla.opendarwin.org/show_bug.cgi?id=8992
        Some HTML DOM attributes have incorrect types

        Adjust idl and dom source code for HTMLImageElement and
        HTMLBaseFontElement to choose correct type for
        HTMLImageElement::border and HTMLBaseFontElement::size
        attributes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/dom/html-attribute-types-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/dom/html-attribute-types.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog patch | blob | history
WebCore/html/HTMLBaseFontElement.cpp patch | blob | history
WebCore/html/HTMLBaseFontElement.h patch | blob | history
WebCore/html/HTMLBaseFontElement.idl patch | blob | history
WebCore/html/HTMLImageElement.cpp patch | blob | history
WebCore/html/HTMLImageElement.h patch | blob | history
WebCore/html/HTMLImageElement.idl patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0fe45e8477d4b8c25afc6739cf20e3bbe292587f..b44e9d14f025caae964b472d98e2715e77794b0a 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-27  Rob Buis  <buis@kde.org>
+
+        Reviewed by Anders.
+
+        Testcase for and from:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8992
+        Some HTML DOM attributes have incorrect types
+
+        * fast/dom/html-attribute-types-expected.txt: Added.
+        * fast/dom/html-attribute-types.html: Added.
+
 2006-07-27  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by levi
diff --git a/LayoutTests/fast/dom/html-attribute-types-expected.txt b/LayoutTests/fast/dom/html-attribute-types-expected.txt
new file mode 100644 (file)
index 0000000..f90da47
--- /dev/null
+++ b/LayoutTests/fast/dom/html-attribute-types-expected.txt
@@ -0,0 +1,5 @@
+This checks the types of some HTML DOM attributes whose types currently clash with our implementation.
+PASS typeof img.border is 'string'
+PASS typeof pre.width is 'number'
+PASS typeof basefont.size is 'number'
+
diff --git a/LayoutTests/fast/dom/html-attribute-types.html b/LayoutTests/fast/dom/html-attribute-types.html
new file mode 100644 (file)
index 0000000..b977fb4
--- /dev/null
+++ b/LayoutTests/fast/dom/html-attribute-types.html
@@ -0,0 +1,27 @@
+<head>
+<script src="../js/resources/js-test-pre.js"></script>
+<script>
+var img;
+var pre;
+var basefont;
+
+function test() {
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    img = document.createElement('img');
+    shouldBe("typeof img.border", "'string'");
+
+    pre = document.createElement('pre');
+    shouldBe("typeof pre.width", "'number'");
+    
+    basefont = document.createElement('basefont');
+    shouldBe("typeof basefont.size", "'number'")
+}
+</script>
+</head>
+<body onload="test()">
+This checks the types of some HTML DOM attributes whose types currently clash with our implementation.
+<div id="console"></div>
+</body>
+
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e323955372eaffd631dc52e4aec724c1d416712c..4a8df995cd410aa04eda09518931acf1edd4d5fe 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2006-07-27  Rob Buis  <buis@kde.org>
+
+        Reviewed by Anders.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8992
+        Some HTML DOM attributes have incorrect types
+
+        Adjust idl and dom source code for HTMLImageElement and
+        HTMLBaseFontElement to choose correct type for
+        HTMLImageElement::border and HTMLBaseFontElement::size
+        attributes.
+
+        * html/HTMLBaseFontElement.cpp:
+        (WebCore::HTMLBaseFontElement::size):
+        (WebCore::HTMLBaseFontElement::setSize):
+        * html/HTMLBaseFontElement.h:
+        * html/HTMLBaseFontElement.idl:
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::border):
+        (WebCore::HTMLImageElement::setBorder):
+        * html/HTMLImageElement.h:
+        * html/HTMLImageElement.idl:
+
 2006-07-27  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by levi
diff --git a/WebCore/html/HTMLBaseFontElement.cpp b/WebCore/html/HTMLBaseFontElement.cpp
index 3685212d0bc7aa7174830e94f0d58203f93f34c7..518b07b1d431df2bcf274dd31968a0332c6c1bd0 100644 (file)
--- a/WebCore/html/HTMLBaseFontElement.cpp
+++ b/WebCore/html/HTMLBaseFontElement.cpp
@@ -54,14 +54,14 @@ void HTMLBaseFontElement::setFace(const String &value)
     setAttribute(faceAttr, value);
 }
 
-String HTMLBaseFontElement::size() const
+int HTMLBaseFontElement::size() const
 {
-    return getAttribute(sizeAttr);
+    return getAttribute(sizeAttr).toInt();
 }
 
-void HTMLBaseFontElement::setSize(const String &value)
+void HTMLBaseFontElement::setSize(int value)
 {
-    setAttribute(sizeAttr, value);
+    setAttribute(sizeAttr, String::number(value));
 }
 
 }
diff --git a/WebCore/html/HTMLBaseFontElement.h b/WebCore/html/HTMLBaseFontElement.h
index 36f7ced465a32fede9faef4c5d2cd1ac7370998c..1087caa93a7bc62bb16c85baaa62e2ce53b0cd9c 100644 (file)
--- a/WebCore/html/HTMLBaseFontElement.h
+++ b/WebCore/html/HTMLBaseFontElement.h
@@ -42,8 +42,8 @@ public:
     String face() const;
     void setFace(const String &);
 
-    String size() const;
-    void setSize(const String &);
+    int size() const;
+    void setSize(int);
 };
 
 } //namespace
diff --git a/WebCore/html/HTMLBaseFontElement.idl b/WebCore/html/HTMLBaseFontElement.idl
index fc62f2b13b59b5105d2525ddfbafa9595dfe67d4..f5e84ac1642d98396c8fcbb3cf5bd58f6d78d2cc 100644 (file)
--- a/WebCore/html/HTMLBaseFontElement.idl
+++ b/WebCore/html/HTMLBaseFontElement.idl
@@ -22,9 +22,6 @@ module html {
     interface [LegacyParent=KJS::JSHTMLElement] HTMLBaseFontElement : HTMLElement {
         attribute DOMString color;
         attribute DOMString face;
-        
-        // FIXME: According to the DOM spec, this should be long instead of DOMString
-        // see http://bugzilla.opendarwin.org/show_bug.cgi?id=8992
-        attribute DOMString size;    
+        attribute long size;    
     };
 }
diff --git a/WebCore/html/HTMLImageElement.cpp b/WebCore/html/HTMLImageElement.cpp
index 1480885d65a44badf4bda4e8f510f8bcaad13919..e31585ee2fcf4cb528fdbf80bf9d4934cbd0bc7d 100644 (file)
--- a/WebCore/html/HTMLImageElement.cpp
+++ b/WebCore/html/HTMLImageElement.cpp
@@ -269,15 +269,14 @@ void HTMLImageElement::setAlt(const String& value)
     setAttribute(altAttr, value);
 }
 
-int HTMLImageElement::border() const
+String HTMLImageElement::border() const
 {
-    // ### return value in pixels
-    return getAttribute(borderAttr).toInt();
+    return getAttribute(borderAttr);
 }
 
-void HTMLImageElement::setBorder(int value)
+void HTMLImageElement::setBorder(const String &value)
 {
-    setAttribute(borderAttr, String::number(value));
+    setAttribute(borderAttr, value);
 }
 
 void HTMLImageElement::setHeight(int value)
diff --git a/WebCore/html/HTMLImageElement.h b/WebCore/html/HTMLImageElement.h
index f8b7cd1dc4ab820c353991b82a2ae620314c333c..afdf1d248066510a039ad2ab363836043aa79919 100644 (file)
--- a/WebCore/html/HTMLImageElement.h
+++ b/WebCore/html/HTMLImageElement.h
@@ -76,8 +76,8 @@ public:
     String alt() const;
     void setAlt(const String&);
 
-    int border() const;
-    void setBorder(int);
+    String border() const;
+    void setBorder(const String&);
 
     void setHeight(int);
 
diff --git a/WebCore/html/HTMLImageElement.idl b/WebCore/html/HTMLImageElement.idl
index b089f7669794273eca2e4a73292c4965aa973b3b..3dd5b045f32ac609810f9f76e261721e6af65565 100644 (file)
--- a/WebCore/html/HTMLImageElement.idl
+++ b/WebCore/html/HTMLImageElement.idl
@@ -22,9 +22,7 @@ module html {
         attribute DOMString name;
         attribute DOMString align;
         attribute DOMString alt;
-        // FIXME: According to the DOM spec border should be of type DOMString
-        // see http://bugzilla.opendarwin.org/show_bug.cgi?id=8992
-        attribute long border;        
+        attribute DOMString border;        
         attribute long height;
         attribute long hspace;
         attribute boolean isMap;
Mirror of the WebKit open source project from svn.webkit.org.