Changeset 107191 in webkit


Ignore:
Timestamp:
Feb 9, 2012 12:55:51 AM (12 years ago)
Author:
haraken@chromium.org
Message:

Unreviewed. Fixed typo in the following files. [TreatUndefinedAs] => [TreatAsUndefined].

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateParametersCheck):

  • bindings/scripts/test/TestObj.idl:
  • bindings/scripts/test/CPP/WebDOMTestObj.cpp: Updated run-bindings-tests results.

(WebDOMTestObj::methodWithOptionalIsUndefinedString):

  • bindings/scripts/test/CPP/WebDOMTestObj.h:
  • bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:

(webkit_dom_test_obj_method_with_optional_is_undefined_string):

  • bindings/scripts/test/GObject/WebKitDOMTestObj.h:
  • bindings/scripts/test/JS/JSTestNamedConstructor.cpp:

(WebCore::JSTestNamedConstructorNamedConstructor::constructJSTestNamedConstructor):

  • bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalIsUndefinedString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalIsNullStringString):
(WebCore::jsTestObjPrototypeFunctionConvert5):

  • bindings/scripts/test/JS/JSTestObj.h:

(WebCore):

  • bindings/scripts/test/ObjC/DOMTestObj.h:
  • bindings/scripts/test/ObjC/DOMTestObj.mm:

(-[DOMTestObj methodWithOptionalIsUndefinedString:]):

  • bindings/scripts/test/V8/V8TestObj.cpp:

(WebCore::TestObjInternal::methodWithOptionalIsUndefinedStringCallback):
(WebCore):

Location:
trunk/Source/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r107189 r107191  
     12012-02-09  Kentaro Hara  <haraken@chromium.org>
     2
     3        Unreviewed. Fixed typo in the following files. [TreatUndefinedAs] => [TreatAsUndefined].
     4
     5        * bindings/scripts/CodeGeneratorJS.pm:
     6        (GenerateParametersCheck):
     7
     8        * bindings/scripts/test/TestObj.idl:
     9
     10        * bindings/scripts/test/CPP/WebDOMTestObj.cpp: Updated run-bindings-tests results.
     11        (WebDOMTestObj::methodWithOptionalIsUndefinedString):
     12        * bindings/scripts/test/CPP/WebDOMTestObj.h:
     13        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
     14        (webkit_dom_test_obj_method_with_optional_is_undefined_string):
     15        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
     16        * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
     17        (WebCore::JSTestNamedConstructorNamedConstructor::constructJSTestNamedConstructor):
     18        * bindings/scripts/test/JS/JSTestObj.cpp:
     19        (WebCore):
     20        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalIsUndefinedString):
     21        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalIsNullStringString):
     22        (WebCore::jsTestObjPrototypeFunctionConvert5):
     23        * bindings/scripts/test/JS/JSTestObj.h:
     24        (WebCore):
     25        * bindings/scripts/test/ObjC/DOMTestObj.h:
     26        * bindings/scripts/test/ObjC/DOMTestObj.mm:
     27        (-[DOMTestObj methodWithOptionalIsUndefinedString:]):
     28        * bindings/scripts/test/V8/V8TestObj.cpp:
     29        (WebCore::TestObjInternal::methodWithOptionalIsUndefinedStringCallback):
     30        (WebCore):
     31
    1322012-02-09  Kentaro Hara  <haraken@chromium.org>
    233

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

    r107186 r107191  
    24972497
    24982498            my $parameterMissingPolicy = "MissingIsUndefinedValue";
    2499             if ($parameter->extendedAttributes->{"TreatAsUndefined"} and $parameter->extendedAttributes->{"TreatAsUndefined"} eq "NullString") {
     2499            if ($parameter->extendedAttributes->{"TreatUndefinedAs"} and $parameter->extendedAttributes->{"TreatUndefinedAs"} eq "NullString") {
    25002500                $parameterMissingPolicy = "MissingIsNullValue";
    25012501            }

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp

    r107182 r107191  
    952952}
    953953
    954 void WebDOMTestObj::methodWithOptionalIsTreatAsUndefinedString(const WebDOMString& str)
    955 {
    956     if (!impl())
    957         return;
    958 
    959     impl()->methodWithOptionalIsTreatAsUndefinedString(str);
     954void WebDOMTestObj::methodWithOptionalIsUndefinedString(const WebDOMString& str)
     955{
     956    if (!impl())
     957        return;
     958
     959    impl()->methodWithOptionalIsUndefinedString(str);
    960960}
    961961

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h

    r107182 r107191  
    188188    void methodWithNonOptionalArgAndTwoOptionalArgs(int nonOpt, int opt1, int opt2);
    189189    void methodWithOptionalString(const WebDOMString& str);
    190     void methodWithOptionalIsTreatAsUndefinedString(const WebDOMString& str);
     190    void methodWithOptionalIsUndefinedString(const WebDOMString& str);
    191191    void methodWithOptionalIsNullStringString(const WebDOMString& str);
    192192    WebDOMString conditionalMethod1();

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp

    r107182 r107191  
    347347
    348348void
    349 webkit_dom_test_obj_method_with_optional_is_treat_as_undefined_string(WebKitDOMTestObj* self, const gchar* str)
     349webkit_dom_test_obj_method_with_optional_is_undefined_string(WebKitDOMTestObj* self, const gchar* str)
    350350{
    351351    g_return_if_fail(self);
    … …  
    354354    g_return_if_fail(str);
    355355    WTF::String converted_str = WTF::String::fromUTF8(str);
    356     item->methodWithOptionalIsTreatAsUndefinedString(converted_str);
     356    item->methodWithOptionalIsUndefinedString(converted_str);
    357357}
    358358

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h

    r107182 r107191  
    274274
    275275/**
    276  * webkit_dom_test_obj_method_with_optional_is_treat_as_undefined_string:
     276 * webkit_dom_test_obj_method_with_optional_is_undefined_string:
    277277 * @self: A #WebKitDOMTestObj
    278278 * @str: A #gchar
    … …  
    282282**/
    283283WEBKIT_API void
    284 webkit_dom_test_obj_method_with_optional_is_treat_as_undefined_string(WebKitDOMTestObj* self, const gchar* str);
     284webkit_dom_test_obj_method_with_optional_is_undefined_string(WebKitDOMTestObj* self, const gchar* str);
    285285
    286286/**

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp

    r107182 r107191  
    104104    if (exec->hadException())
    105105        return JSValue::encode(jsUndefined());
    106     const String& str3(ustringToString(MAYBE_MISSING_PARAMETER(exec, 2, MissingIsUndefinedValue).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 2, MissingIsUndefinedValue).toString(exec)->value(exec)));
     106    const String& str3(ustringToString(MAYBE_MISSING_PARAMETER(exec, 2, MissingIsNullValue).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 2, MissingIsNullValue).toString(exec)->value(exec)));
    107107    if (exec->hadException())
    108108        return JSValue::encode(jsUndefined());

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

    r107182 r107191  
    271271    { "methodWithNonOptionalArgAndTwoOptionalArgs", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs), (intptr_t)3, NoIntrinsic },
    272272    { "methodWithOptionalString", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalString), (intptr_t)1, NoIntrinsic },
    273     { "methodWithOptionalIsTreatAsUndefinedString", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalIsTreatAsUndefinedString), (intptr_t)1, NoIntrinsic },
     273    { "methodWithOptionalIsUndefinedString", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalIsUndefinedString), (intptr_t)1, NoIntrinsic },
    274274    { "methodWithOptionalIsNullStringString", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithOptionalIsNullStringString), (intptr_t)1, NoIntrinsic },
    275275    { "methodWithCallbackArg", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionMethodWithCallbackArg), (intptr_t)1, NoIntrinsic },
    … …  
    299299};
    300300
    301 static const HashTable JSTestObjPrototypeTable = { 265, 255, JSTestObjPrototypeTableValues, 0 };
     301static const HashTable JSTestObjPrototypeTable = { 266, 255, JSTestObjPrototypeTableValues, 0 };
    302302const ClassInfo JSTestObjPrototype::s_info = { "TestObjPrototype", &Base::s_info, &JSTestObjPrototypeTable, 0, CREATE_METHOD_TABLE(JSTestObjPrototype) };
    303303
    … …  
    16301630}
    16311631
    1632 EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalIsTreatAsUndefinedString(ExecState* exec)
     1632EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalIsUndefinedString(ExecState* exec)
    16331633{
    16341634    JSValue thisValue = exec->hostThisValue();
    … …  
    16411641    if (exec->hadException())
    16421642        return JSValue::encode(jsUndefined());
    1643     impl->methodWithOptionalIsTreatAsUndefinedString(str);
     1643    impl->methodWithOptionalIsUndefinedString(str);
    16441644    return JSValue::encode(jsUndefined());
    16451645}
    … …  
    16531653    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    16541654    TestObj* impl = static_cast<TestObj*>(castedThis->impl());
    1655     const String& str(ustringToString(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefinedValue).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefinedValue).toString(exec)->value(exec)));
     1655    const String& str(ustringToString(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsNullValue).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 0, MissingIsNullValue).toString(exec)->value(exec)));
    16561656    if (exec->hadException())
    16571657        return JSValue::encode(jsUndefined());
    … …  
    20812081    if (exec->argumentCount() < 1)
    20822082        return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
    2083     e* (toe(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefinedValue)));
     2083    e* (toe(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsNullValue)));
    20842084    if (exec->hadException())
    20852085        return JSValue::encode(jsUndefined());

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h

    r107182 r107191  
    176176JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs(JSC::ExecState*);
    177177JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalString(JSC::ExecState*);
    178 JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalIsTreatAsUndefinedString(JSC::ExecState*);
     178JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalIsUndefinedString(JSC::ExecState*);
    179179JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithOptionalIsNullStringString(JSC::ExecState*);
    180180JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionMethodWithCallbackArg(JSC::ExecState*);

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h

    r107182 r107191  
    185185- (void)methodWithNonOptionalArgAndTwoOptionalArgs:(int)nonOpt opt1:(int)opt1 opt2:(int)opt2;
    186186- (void)methodWithOptionalString:(NSString *)str;
    187 - (void)methodWithOptionalIsTreatAsUndefinedString:(NSString *)str;
     187- (void)methodWithOptionalIsUndefinedString:(NSString *)str;
    188188- (void)methodWithOptionalIsNullStringString:(NSString *)str;
    189189- (NSString *)conditionalMethod1;

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm

    r107182 r107191  
    807807}
    808808
    809 - (void)methodWithOptionalIsTreatAsUndefinedString:(NSString *)str
    810 {
    811     WebCore::JSMainThreadNullState state;
    812     IMPL->methodWithOptionalIsTreatAsUndefinedString(str);
     809- (void)methodWithOptionalIsUndefinedString:(NSString *)str
     810{
     811    WebCore::JSMainThreadNullState state;
     812    IMPL->methodWithOptionalIsUndefinedString(str);
    813813}
    814814

  • trunk/Source/WebCore/bindings/scripts/test/TestObj.idl

    r107189 r107191  
    120120        void    methodWithNonOptionalArgAndTwoOptionalArgs(in long nonOpt, in [Optional] long opt1, in [Optional] long opt2);
    121121        void    methodWithOptionalString(in [Optional] DOMString str);
    122         void    methodWithOptionalIsTreatAsUndefinedString(in [Optional=TreatAsUndefined] DOMString str);
     122        void    methodWithOptionalIsUndefinedString(in [Optional=TreatAsUndefined] DOMString str);
    123123        void    methodWithOptionalIsNullStringString(in [Optional=TreatAsUndefined, TreatUndefinedAs=NullString] DOMString str);
    124124

  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

    r107182 r107191  
    11871187}
    11881188
    1189 static v8::Handle<v8::Value> methodWithOptionalIsTreatAsUndefinedStringCallback(const v8::Arguments& args)
    1190 {
    1191     INC_STATS("DOM.TestObj.methodWithOptionalIsTreatAsUndefinedString");
     1189static v8::Handle<v8::Value> methodWithOptionalIsUndefinedStringCallback(const v8::Arguments& args)
     1190{
     1191    INC_STATS("DOM.TestObj.methodWithOptionalIsUndefinedString");
    11921192    TestObj* imp = V8TestObj::toNative(args.Holder());
    11931193    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, str, MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefinedValue));
    1194     imp->methodWithOptionalIsTreatAsUndefinedString(str);
     1194    imp->methodWithOptionalIsUndefinedString(str);
    11951195    return v8::Handle<v8::Value>();
    11961196}
    … …  
    17191719    {"methodWithNonOptionalArgAndTwoOptionalArgs", TestObjInternal::methodWithNonOptionalArgAndTwoOptionalArgsCallback},
    17201720    {"methodWithOptionalString", TestObjInternal::methodWithOptionalStringCallback},
    1721     {"methodWithOptionalIsTreatAsUndefinedString", TestObjInternal::methodWithOptionalIsTreatAsUndefinedStringCallback},
     1721    {"methodWithOptionalIsUndefinedString", TestObjInternal::methodWithOptionalIsUndefinedStringCallback},
    17221722    {"methodWithOptionalIsNullStringString", TestObjInternal::methodWithOptionalIsNullStringStringCallback},
    17231723    {"methodWithCallbackArg", TestObjInternal::methodWithCallbackArgCallback},
Note: See TracChangeset for help on using the changeset viewer.