Changeset 200037 in webkit

Timestamp:

Apr 25, 2016 11:38:56 AM (8 years ago)

Author:

Chris Dumez

Message:

[Web IDL] Specify default values for parameters of type 'unsigned short'
​https://bugs.webkit.org/show_bug.cgi?id=156967

Reviewed by Darin Adler.

Specify default values for parameters of type 'unsigned short' and let
the bindings generator use WTF::Optional<> for the ones without a
default value.

• bindings/scripts/CodeGeneratorJS.pm:

(CanUseWTFOptionalForParameter):
(GenerateParametersCheck):

• testing/Internals.cpp:

(WebCore::Internals::layerTreeAsText): Deleted.
(WebCore::Internals::displayListForElement): Deleted.
(WebCore::Internals::replayDisplayListForElement): Deleted.

• testing/Internals.h:
• testing/Internals.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (4 diffs)
• testing/Internals.cpp (modified) (3 diffs)
• testing/Internals.h (modified) (2 diffs)
• testing/Internals.idl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-25  Chris Dumez  <cdumez@apple.com>
+
+        [Web IDL] Specify default values for parameters of type 'unsigned short'
+        https://bugs.webkit.org/show_bug.cgi?id=156967
+
+        Reviewed by Darin Adler.
+
+        Specify default values for parameters of type 'unsigned short' and let
+        the bindings generator use WTF::Optional<> for the ones without a
+        default value.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (CanUseWTFOptionalForParameter):
+        (GenerateParametersCheck):
+        * testing/Internals.cpp:
+        (WebCore::Internals::layerTreeAsText): Deleted.
+        (WebCore::Internals::displayListForElement): Deleted.
+        (WebCore::Internals::replayDisplayListForElement): Deleted.
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2016-04-25  Per Arne Vollan  <peavo@outlook.com>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -3371 +3371 @@
 }
 
-sub CanUseWTFOptionalForParameterType
-{
-    my $type  = shift;
+sub CanUseWTFOptionalForParameter
+{
+    my $parameter = shift;
+    my $type = $parameter->type;
 
     # FIXME: We should progressively stop blacklisting each type below
     # and eventually get rid of this function entirely.
+    return 0 if $parameter->extendedAttributes->{"Clamp"};
+    return 0 if $parameter->isVariadic;
+    return 0 if $codeGenerator->IsCallbackInterface($type);
     return 0 if $codeGenerator->IsEnumType($type);
     return 0 if $codeGenerator->IsTypedArrayType($type);
@@ -3388 +3392 @@
     return 0 if $type eq "unrestricted double";
     return 0 if $type eq "unsigned long";
-    return 0 if $type eq "unsigned short";
 
     return 1;
@@ -3442 +3445 @@
         # Optional Dictionary arguments always considered to have default of empty dictionary.
         my $optional = $parameter->isOptional;
-        if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameterType($parameter->type) && $argType ne "Dictionary" && !$codeGenerator->IsCallbackInterface($argType)) {
+        if ($optional && !defined($parameter->default) && !CanUseWTFOptionalForParameter($parameter) && $argType ne "Dictionary" && !$codeGenerator->IsCallbackInterface($argType)) {
             # Generate early call if there are enough parameters.
             if (!$hasOptionalArguments) {
@@ -3622 +3625 @@
                     $outer = "state->argument($argsIndex).isUndefined() ? $defaultValue : ";
                     $inner = "state->uncheckedArgument($argsIndex)";
-                } elsif ($optional && !defined($parameter->default) && CanUseWTFOptionalForParameterType($parameter->type)) {
+                } elsif ($optional && !defined($parameter->default) && CanUseWTFOptionalForParameter($parameter)) {
                     # Use WTF::Optional<>() for optional parameters that are missing or undefined and that do not have
                     # a default value in the IDL.

trunk/Source/WebCore/testing/Internals.cpp

@@ -1827 +1827 @@
 // different document, and could just make the call through another Internals
 // instance instead.
-String Internals::layerTreeAsText(Document& document, ExceptionCode& ec) const
-{
-    return layerTreeAsText(document, 0, ec);
-}
-
-String Internals::layerTreeAsText(Document& document, unsigned flags, ExceptionCode& ec) const
+String Internals::layerTreeAsText(Document& document, unsigned short flags, ExceptionCode& ec) const
 {
     if (!document.frame()) {
@@ -1974 +1969 @@
 }
 
-String Internals::displayListForElement(Element& element, ExceptionCode& ec)
-{
-    return displayListForElement(element, 0, ec);
-}
-
-String Internals::displayListForElement(Element& element, unsigned flags, ExceptionCode& ec)
+String Internals::displayListForElement(Element& element, unsigned short flags, ExceptionCode& ec)
 {
     Document* document = contextDocument();
@@ -2013 +2003 @@
 }
 
-String Internals::replayDisplayListForElement(Element& element, ExceptionCode& ec)
-{
-    return replayDisplayListForElement(element, 0, ec);
-}
-
-String Internals::replayDisplayListForElement(Element& element, unsigned flags, ExceptionCode& ec)
+String Internals::replayDisplayListForElement(Element& element, unsigned short flags, ExceptionCode& ec)
 {
     Document* document = contextDocument();

trunk/Source/WebCore/testing/Internals.h

@@ -244 +244 @@
         LAYER_TREE_INCLUDES_CONTENT_LAYERS = 16
     };
-    String layerTreeAsText(Document&, unsigned flags, ExceptionCode&) const;
-    String layerTreeAsText(Document&, ExceptionCode&) const;
+    String layerTreeAsText(Document&, unsigned short flags, ExceptionCode&) const;
     String repaintRectsAsText(ExceptionCode&) const;
     String scrollingStateTreeAsText(ExceptionCode&) const;
@@ -258 +257 @@
         DISPLAY_LIST_INCLUDES_PLATFORM_OPERATIONS = 1,
     };
-    String displayListForElement(Element&, unsigned flags, ExceptionCode&);
-    String displayListForElement(Element&, ExceptionCode&);
-
-    String replayDisplayListForElement(Element&, unsigned flags, ExceptionCode&);
-    String replayDisplayListForElement(Element&, ExceptionCode&);
+    String displayListForElement(Element&, unsigned short flags, ExceptionCode&);
+
+    String replayDisplayListForElement(Element&, unsigned short flags, ExceptionCode&);
 
     void garbageCollectDocumentResources(ExceptionCode&) const;

trunk/Source/WebCore/testing/Internals.idl

@@ -227 +227 @@
     const unsigned short LAYER_TREE_INCLUDES_PAINTING_PHASES = 8;
     const unsigned short LAYER_TREE_INCLUDES_CONTENT_LAYERS = 16;
-    [RaisesException] DOMString layerTreeAsText(Document document, optional unsigned short flags);
+    [RaisesException] DOMString layerTreeAsText(Document document, optional unsigned short flags = 0);
 
     [RaisesException] DOMString scrollingStateTreeAsText();
@@ -242 +242 @@
     const unsigned short DISPLAY_LIST_INCLUDES_PLATFORM_OPERATIONS = 1;
     // Returns the recorded display list.
-    [RaisesException] DOMString displayListForElement(Element element, optional unsigned short flags);
+    [RaisesException] DOMString displayListForElement(Element element, optional unsigned short flags = 0);
     // Returns the display list that was actually painted.
-    [RaisesException] DOMString replayDisplayListForElement(Element element, optional unsigned short flags);
+    [RaisesException] DOMString replayDisplayListForElement(Element element, optional unsigned short flags = 0);
 
     [RaisesException] void garbageCollectDocumentResources();