Changeset 20948 in webkit

Timestamp:

Apr 19, 2007 6:09:49 AM (17 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Darin.

• Test for ​http://bugs.webkit.org/show_bug.cgi?id=12249 FCKeditor: <hr>, <ul> and <ol> have id="undefined"

• editing/execCommand/arguments-combinations-expected.txt: Added.
• editing/execCommand/arguments-combinations.html: Added.

WebCore:

Reviewed by Darin.

• Patch for ​http://bugs.webkit.org/show_bug.cgi?id=12249 FCKeditor: <hr>, <ul> and <ol> have id="undefined"

Convert undefined and null to a null string for third argument of
execCommand();

Test: editing/execCommand/arguments-combinations.html

• WebCore.xcodeproj/project.pbxproj:
• bindings/js/kjs_binding.cpp: (KJS::valueToStringWithUndefinedOrNullCheck):
• bindings/js/kjs_binding.h:
• bindings/scripts/CodeGeneratorJS.pm:
• dom/Document.idl:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/arguments-combinations-expected.txt (added)
• LayoutTests/editing/execCommand/arguments-combinations.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/bindings/js/kjs_binding.cpp (modified) (2 diffs)
• WebCore/bindings/js/kjs_binding.h (modified) (2 diffs)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (2 diffs)
• WebCore/dom/Document.idl (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-04-19  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin.
+
+        - Test for http://bugs.webkit.org/show_bug.cgi?id=12249
+          FCKeditor: <hr>, <ul> and <ol> have id="undefined"
+
+        * editing/execCommand/arguments-combinations-expected.txt: Added.
+        * editing/execCommand/arguments-combinations.html: Added.
+
 2007-04-18  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-19  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Darin.
+
+        - Patch for http://bugs.webkit.org/show_bug.cgi?id=12249
+          FCKeditor: <hr>, <ul> and <ol> have id="undefined"
+
+        Convert undefined and null to a null string for third argument of
+        execCommand(); 
+
+        Test: editing/execCommand/arguments-combinations.html
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/kjs_binding.cpp:
+        (KJS::valueToStringWithUndefinedOrNullCheck):
+        * bindings/js/kjs_binding.h:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        * dom/Document.idl:
+
 2007-04-19  Alp Toker  <alp@atoker.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -8955 +8955 @@
                                 93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
                                 1A9EF4560A1B957D00332B63 /* JSCanvasRenderingContext2DCustom.cpp */,
+                                E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
                                 E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */,
-                                E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
                                 929264760B61FC7200B41D34 /* JSDocumentCustom.cpp */,
                                 938E65F609F0985D008A48EC /* JSHTMLElementWrapperFactory.cpp */,

trunk/WebCore/bindings/js/kjs_binding.cpp

@@ -3 +3 @@
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
  *  Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ *  Copyright (C) 2007 Samuel Weinig <sam@webkit.org>
  *
  *  This library is free software; you can redistribute it and/or
@@ -319 +320 @@
 {
     if (val->isNull())
+        return String();
+    return val->toString(exec);
+}
+
+String valueToStringWithUndefinedOrNullCheck(ExecState* exec, JSValue* val)
+{
+    if (val->isUndefinedOrNull())
         return String();
     return val->toString(exec);

trunk/WebCore/bindings/js/kjs_binding.h

@@ -4 +4 @@
  *  Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
  *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
+ *  Copyright (C) 2007 Samuel Weinig <sam@webkit.org>
  *
  *  This library is free software; you can redistribute it and/or
@@ -148 +149 @@
     JSValue* jsStringOrFalse(const WebCore::String&); // boolean false if the string is null
     WebCore::String valueToStringWithNullCheck(ExecState*, JSValue*); // null String if the value is null
+    WebCore::String valueToStringWithUndefinedOrNullCheck(ExecState*, JSValue*); // null String if the value is null or undefined
 
     template <typename T> inline JSValue* toJS(ExecState* exec, PassRefPtr<T> ptr) { return toJS(exec, ptr.get()); }

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -2 +2 @@
 # Copyright (C) 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
-# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+# Copyright (C) 2006, 2007 Samuel Weinig <sam@webkit.org>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
@@ -1272 +1272 @@
     if ($type eq "DOMString") {
         return "valueToStringWithNullCheck(exec, $value)" if $signature->extendedAttributes->{"ConvertNullToNullString"};
+        return "valueToStringWithUndefinedOrNullCheck(exec, $value)" if $signature->extendedAttributes->{"ConvertUndefinedOrNullToNullString"};
         return "$value->toString(exec)";
     }

trunk/WebCore/dom/Document.idl

@@ -1 +1 @@
 /*
  * Copyright (C) 2006 Apple Computer, Inc.
- * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+ * Copyright (C) 2006, 2007 Samuel Weinig <sam@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
@@ -36 +36 @@
         CDATASection       createCDATASection(in DOMString data)
             raises(DOMException);
-        [OldStyleObjC] ProcessingInstruction createProcessingInstruction(in DOMString target, 
+        [OldStyleObjC] ProcessingInstruction createProcessingInstruction(in DOMString target,
                                                                          in DOMString data)
             raises (DOMException);
@@ -87 +87 @@
 
 #if !defined(LANGUAGE_OBJECTIVE_C)
-        NodeIterator       createNodeIterator(in Node root, 
+        NodeIterator       createNodeIterator(in Node root,
                                               in unsigned long whatToShow,
                                               in NodeFilter filter,
                                               in boolean entityReferenceExpansion)
             raises(DOMException);
-        TreeWalker createTreeWalker(in Node root, 
-                                    in unsigned long whatToShow, 
-                                    in NodeFilter filter, 
-                                    in boolean entityReferenceExpansion)
+        TreeWalker         createTreeWalker(in Node root,
+                                            in unsigned long whatToShow,
+                                            in NodeFilter filter,
+                                            in boolean entityReferenceExpansion)
             raises(DOMException);
 #endif
@@ -109 +109 @@
         // DOM Level 2 Style (DocumentCSS interface)
 
-        [OldStyleObjC] CSSStyleDeclaration getOverrideStyle(in Element element, 
+        [OldStyleObjC] CSSStyleDeclaration getOverrideStyle(in Element element,
                                                             in DOMString pseudoElement);
 
@@ -119 +119 @@
         XPathNSResolver    createNSResolver(in Node nodeResolver);
         [OldStyleObjC] XPathResult evaluate(in DOMString expression,
-                                            in Node contextNode, 
+                                            in Node contextNode,
                                             in XPathNSResolver resolver,
                                             in unsigned short type,
@@ -128 +128 @@
         // Common extensions
 
-        boolean execCommand(in DOMString command, 
-                            in [Optional] boolean userInterface, 
-                            in [Optional] DOMString value);
-        boolean queryCommandEnabled(in DOMString command);
-        boolean queryCommandIndeterm(in DOMString command);
-        boolean queryCommandState(in DOMString command);
-        boolean queryCommandSupported(in DOMString command);
+        boolean            execCommand(in DOMString command,
+                                       in boolean userInterface,
+                                       in [ConvertUndefinedOrNullToNullString] DOMString value);
+
+#if defined(LANGUAGE_OBJECTIVE_C)
+        // FIXME: remove the these two versions once [Optional] is implemented for Objective-C.
+        boolean            execCommand(in DOMString command,
+                                       in boolean userInterface);
+        boolean            execCommand(in DOMString command);
+#endif
+
+        boolean            queryCommandEnabled(in DOMString command);
+        boolean            queryCommandIndeterm(in DOMString command);
+        boolean            queryCommandState(in DOMString command);
+        boolean            queryCommandSupported(in DOMString command);
         [ConvertNullStringTo=False] DOMString queryCommandValue(in DOMString command);