Unreviewed, rolling out r106883.

http://trac.webkit.org/changeset/106883
https://bugs.webkit.org/show_bug.cgi?id=77852

build failure around Chromium V8 bindings

* bindings/scripts/CodeGenerator.pm:
(ShouldCheckEnums):
(GenerateCompileTimeCheckForEnumsIfNeeded):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
(GenerateImplementation):
(NativeToJSValue):
* bindings/scripts/CodeGeneratorV8.pm:
(GenerateSingleBatchedAttribute):
(GenerateFunctionCallString):
(NativeToJSValue):
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore):
* bindings/scripts/test/TestObj.idl:
* bindings/scripts/test/TestTypedArray.idl:
* bindings/scripts/test/V8/V8TestInterface.cpp:
(WebCore):
* bindings/scripts/test/V8/V8TestObj.cpp:
(WebCore):
* css/WebKitCSSFilterValue.idl:
* css/WebKitCSSTransformValue.idl:
* dom/DOMCoreException.idl:
* dom/Document.idl:
* dom/EventException.idl:
* dom/RangeException.idl:
* fileapi/FileException.idl:
* fileapi/OperationNotAllowedException.idl:
* html/HTMLFormElement.idl:
* html/canvas/Float32Array.idl:
* html/canvas/Float64Array.idl:
* html/canvas/Int16Array.idl:
* html/canvas/Int32Array.idl:
* html/canvas/Int8Array.idl:
* html/canvas/OESStandardDerivatives.idl:
* html/canvas/OESVertexArrayObject.idl:
* html/canvas/Uint16Array.idl:
* html/canvas/Uint32Array.idl:
* html/canvas/Uint8Array.idl:
* html/canvas/Uint8ClampedArray.idl:
* html/canvas/WebGLCompressedTextures.idl:
* html/canvas/WebGLDebugRendererInfo.idl:
* html/canvas/WebGLRenderingContext.idl:
* inspector/JavaScriptCallFrame.idl:
* loader/appcache/DOMApplicationCache.idl:
* page/Console.idl:
* page/DOMWindow.idl:
* page/Location.idl:
* storage/IDBCursor.idl:
* storage/IDBDatabaseException.idl:
* storage/IDBObjectStore.idl:
* storage/SQLException.idl:
* svg/SVGComponentTransferFunctionElement.idl:
* svg/SVGException.idl:
* svg/SVGFEBlendElement.idl:
* svg/SVGFEColorMatrixElement.idl:
* svg/SVGFECompositeElement.idl:
* svg/SVGFEConvolveMatrixElement.idl:
* svg/SVGFEDisplacementMapElement.idl:
* svg/SVGFEMorphologyElement.idl:
* svg/SVGFETurbulenceElement.idl:
* svg/SVGGradientElement.idl:
* xml/XMLHttpRequestException.idl:
* xml/XPathException.idl:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 91c7456..f85151e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,77 @@
+2012-02-06  Kentaro Hara  <haraken@chromium.org>
+
+        Unreviewed, rolling out r106883.
+        http://trac.webkit.org/changeset/106883
+        https://bugs.webkit.org/show_bug.cgi?id=77852
+
+        build failure around Chromium V8 bindings
+
+        * bindings/scripts/CodeGenerator.pm:
+        (ShouldCheckEnums):
+        (GenerateCompileTimeCheckForEnumsIfNeeded):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateHeader):
+        (GenerateImplementation):
+        (NativeToJSValue):
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GenerateSingleBatchedAttribute):
+        (GenerateFunctionCallString):
+        (NativeToJSValue):
+        * bindings/scripts/test/JS/JSTestInterface.cpp:
+        (WebCore):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore):
+        * bindings/scripts/test/TestObj.idl:
+        * bindings/scripts/test/TestTypedArray.idl:
+        * bindings/scripts/test/V8/V8TestInterface.cpp:
+        (WebCore):
+        * bindings/scripts/test/V8/V8TestObj.cpp:
+        (WebCore):
+        * css/WebKitCSSFilterValue.idl:
+        * css/WebKitCSSTransformValue.idl:
+        * dom/DOMCoreException.idl:
+        * dom/Document.idl:
+        * dom/EventException.idl:
+        * dom/RangeException.idl:
+        * fileapi/FileException.idl:
+        * fileapi/OperationNotAllowedException.idl:
+        * html/HTMLFormElement.idl:
+        * html/canvas/Float32Array.idl:
+        * html/canvas/Float64Array.idl:
+        * html/canvas/Int16Array.idl:
+        * html/canvas/Int32Array.idl:
+        * html/canvas/Int8Array.idl:
+        * html/canvas/OESStandardDerivatives.idl:
+        * html/canvas/OESVertexArrayObject.idl:
+        * html/canvas/Uint16Array.idl:
+        * html/canvas/Uint32Array.idl:
+        * html/canvas/Uint8Array.idl:
+        * html/canvas/Uint8ClampedArray.idl:
+        * html/canvas/WebGLCompressedTextures.idl:
+        * html/canvas/WebGLDebugRendererInfo.idl:
+        * html/canvas/WebGLRenderingContext.idl:
+        * inspector/JavaScriptCallFrame.idl:
+        * loader/appcache/DOMApplicationCache.idl:
+        * page/Console.idl:
+        * page/DOMWindow.idl:
+        * page/Location.idl:
+        * storage/IDBCursor.idl:
+        * storage/IDBDatabaseException.idl:
+        * storage/IDBObjectStore.idl:
+        * storage/SQLException.idl:
+        * svg/SVGComponentTransferFunctionElement.idl:
+        * svg/SVGException.idl:
+        * svg/SVGFEBlendElement.idl:
+        * svg/SVGFEColorMatrixElement.idl:
+        * svg/SVGFECompositeElement.idl:
+        * svg/SVGFEConvolveMatrixElement.idl:
+        * svg/SVGFEDisplacementMapElement.idl:
+        * svg/SVGFEMorphologyElement.idl:
+        * svg/SVGFETurbulenceElement.idl:
+        * svg/SVGGradientElement.idl:
+        * xml/XMLHttpRequestException.idl:
+        * xml/XPathException.idl:
+
 2012-02-06  Yongsheng Zhu  <yongsheng.zhu@intel.com>
 
         WebGL must allocate smaller drawing buffer when the allocation fails. 

diff --git a/Source/WebCore/bindings/scripts/CodeGenerator.pm b/Source/WebCore/bindings/scripts/CodeGenerator.pm
index d5b6bdf..86a0cc5 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGenerator.pm
+++ b/Source/WebCore/bindings/scripts/CodeGenerator.pm
@@ -589,7 +589,7 @@ sub SetterExpression
 sub ShouldCheckEnums
 {
     my $dataNode = shift;
-    return not $dataNode->extendedAttributes->{"DoNotCheckConstants"};
+    return not $dataNode->extendedAttributes->{"DontCheckEnums"};
 }
 
 sub GenerateConditionalStringFromAttributeValue
@@ -627,7 +627,7 @@ sub GenerateCompileTimeCheckForEnumsIfNeeded
                 push(@checks, "#if ${conditionalString}\n");
             }
 
-            push(@checks, "COMPILE_ASSERT($value == ${interfaceName}::$name, ${interfaceName}Enum${name}IsWrongUseDoNotCheckConstants);\n");
+            push(@checks, "COMPILE_ASSERT($value == ${interfaceName}::$name, ${interfaceName}Enum${name}IsWrongUseDontCheckEnums);\n");
 
             if ($conditional) {
                 push(@checks, "#endif\n");

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 933e245..a5bb7b5 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -891,7 +891,7 @@ sub GenerateHeader
         foreach my $function (@{$dataNode->functions}) {
             next unless $function->signature->extendedAttributes->{"Custom"} or $function->signature->extendedAttributes->{"JSCustom"};
             next if $function->{overloads} && $function->{overloadIndex} != 1;
-            my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} || $codeGenerator->WK_lcfirst($function->signature->name);
+            my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementationFunction"} || $codeGenerator->WK_lcfirst($function->signature->name);
             push(@headerContent, "    JSC::JSValue " . $functionImplementationName . "(JSC::ExecState*);\n");
         }
     }
@@ -1684,7 +1684,7 @@ sub GenerateImplementation
 
                 if ($dataNode->extendedAttributes->{"CheckDomainSecurity"} && 
                         !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurity"} &&
-                        !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurityOnGetter"}) {
+                        !$attribute->signature->extendedAttributes->{"DoNotCheckDomainSecurityOnGet"}) {
                     push(@implContent, "    if (!castedThis->allowsAccessFrom(exec))\n");
                     push(@implContent, "        return jsUndefined();\n");
                 }
@@ -2074,7 +2074,7 @@ sub GenerateImplementation
                 push(@implContent, "static ");
             }
 
-            my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} || $codeGenerator->WK_lcfirst($function->signature->name);
+            my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementationFunction"} || $codeGenerator->WK_lcfirst($function->signature->name);
 
             push(@implContent, "EncodedJSValue JSC_HOST_CALL ${functionName}(ExecState* exec)\n");
             push(@implContent, "{\n");
@@ -2992,7 +2992,7 @@ sub NativeToJSValue
 
     return $value if $codeGenerator->IsSVGAnimatedType($type);
 
-    if ($signature->extendedAttributes->{"ReturnNewObject"}) {
+    if ($signature->extendedAttributes->{"ReturnsNew"}) {        
         return "toJSNewlyCreated(exec, $globalObject, WTF::getPtr($value))";
     }
 

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
index ae26a74..064f28c 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -1932,9 +1932,9 @@ sub GenerateSingleBatchedAttribute
     my $attrExt = $attribute->signature->extendedAttributes;
 
     my $accessControl = "v8::DEFAULT";
-    if ($attrExt->{"DoNotCheckDomainSecurityOnGetter"}) {
+    if ($attrExt->{"DoNotCheckDomainSecurityOnGet"}) {
         $accessControl = "v8::ALL_CAN_READ";
-    } elsif ($attrExt->{"DoNotCheckDomainSecurityOnSetter"}) {
+    } elsif ($attrExt->{"DoNotCheckDomainSecurityOnSet"}) {
         $accessControl = "v8::ALL_CAN_WRITE";
     } elsif ($attrExt->{"DoNotCheckDomainSecurity"}) {
         $accessControl = "v8::ALL_CAN_READ";
@@ -3184,8 +3184,8 @@ sub GenerateFunctionCallString()
     my $isSVGTearOffType = ($codeGenerator->IsSVGTypeNeedingTearOff($returnType) and not $implClassName =~ /List$/);
     $nativeReturnType = $codeGenerator->GetSVGWrappedTypeNeedingTearOff($returnType) if $isSVGTearOffType;
 
-    if ($function->signature->extendedAttributes->{"ImplementedAs"}) {
-        $name = $function->signature->extendedAttributes->{"ImplementedAs"};
+    if ($function->signature->extendedAttributes->{"ImplementationFunction"}) {
+        $name = $function->signature->extendedAttributes->{"ImplementationFunction"};
     }
 
     my $index = 0;
@@ -3738,7 +3738,7 @@ sub NativeToJSValue
 
     # special case for non-DOM node interfaces
     if (IsDOMNodeType($type)) {
-        return "toV8(${value}" . ($signature->extendedAttributes->{"ReturnNewObject"} ? ", true)" : ")");
+        return "toV8(${value}" . ($signature->extendedAttributes->{"ReturnsNew"} ? ", true)" : ")");
     }
 
     if ($type eq "EventTarget") {

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
index 476d725..04c937f 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
@@ -80,10 +80,10 @@ static const HashTableValue JSTestInterfaceConstructorTableValues[] =
 static const HashTable JSTestInterfaceConstructorTable = { 4, 3, JSTestInterfaceConstructorTableValues, 0 };
 
 #if ENABLE(Condition11) || ENABLE(Condition12)
-COMPILE_ASSERT(1 == TestInterface::SUPPLEMENTALCONSTANT1, TestInterfaceEnumSUPPLEMENTALCONSTANT1IsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(1 == TestInterface::SUPPLEMENTALCONSTANT1, TestInterfaceEnumSUPPLEMENTALCONSTANT1IsWrongUseDontCheckEnums);
 #endif
 #if ENABLE(Condition11) || ENABLE(Condition12)
-COMPILE_ASSERT(2 == TestInterface::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(2 == TestInterface::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDontCheckEnums);
 #endif
 
 ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSTestInterfaceConstructor);

diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
index 98e79b3..f864960 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
@@ -172,20 +172,20 @@ static const HashTableValue JSTestObjConstructorTableValues[] =
 static const HashTable JSTestObjConstructorTable = { 36, 31, JSTestObjConstructorTableValues, 0 };
 
 #if ENABLE(Condition1)
-COMPILE_ASSERT(0 == TestObj::CONDITIONAL_CONST, TestObjEnumCONDITIONAL_CONSTIsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(0 == TestObj::CONDITIONAL_CONST, TestObjEnumCONDITIONAL_CONSTIsWrongUseDontCheckEnums);
 #endif
-COMPILE_ASSERT(0 == TestObj::CONST_VALUE_0, TestObjEnumCONST_VALUE_0IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(1 == TestObj::CONST_VALUE_1, TestObjEnumCONST_VALUE_1IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(2 == TestObj::CONST_VALUE_2, TestObjEnumCONST_VALUE_2IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(4 == TestObj::CONST_VALUE_4, TestObjEnumCONST_VALUE_4IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(8 == TestObj::CONST_VALUE_8, TestObjEnumCONST_VALUE_8IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(-1 == TestObj::CONST_VALUE_9, TestObjEnumCONST_VALUE_9IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT("my constant string" == TestObj::CONST_VALUE_10, TestObjEnumCONST_VALUE_10IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0xffffffff == TestObj::CONST_VALUE_11, TestObjEnumCONST_VALUE_11IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0x01 == TestObj::CONST_VALUE_12, TestObjEnumCONST_VALUE_12IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0X20 == TestObj::CONST_VALUE_13, TestObjEnumCONST_VALUE_13IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0x1abc == TestObj::CONST_VALUE_14, TestObjEnumCONST_VALUE_14IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(15 == TestObj::CONST_IMPL, TestObjEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(0 == TestObj::CONST_VALUE_0, TestObjEnumCONST_VALUE_0IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(1 == TestObj::CONST_VALUE_1, TestObjEnumCONST_VALUE_1IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(2 == TestObj::CONST_VALUE_2, TestObjEnumCONST_VALUE_2IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(4 == TestObj::CONST_VALUE_4, TestObjEnumCONST_VALUE_4IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(8 == TestObj::CONST_VALUE_8, TestObjEnumCONST_VALUE_8IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(-1 == TestObj::CONST_VALUE_9, TestObjEnumCONST_VALUE_9IsWrongUseDontCheckEnums);
+COMPILE_ASSERT("my constant string" == TestObj::CONST_VALUE_10, TestObjEnumCONST_VALUE_10IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0xffffffff == TestObj::CONST_VALUE_11, TestObjEnumCONST_VALUE_11IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0x01 == TestObj::CONST_VALUE_12, TestObjEnumCONST_VALUE_12IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0X20 == TestObj::CONST_VALUE_13, TestObjEnumCONST_VALUE_13IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0x1abc == TestObj::CONST_VALUE_14, TestObjEnumCONST_VALUE_14IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(15 == TestObj::CONST_IMPL, TestObjEnumCONST_IMPLIsWrongUseDontCheckEnums);
 
 ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSTestObjConstructor);
 

diff --git a/Source/WebCore/bindings/scripts/test/TestObj.idl b/Source/WebCore/bindings/scripts/test/TestObj.idl
index 94e89e1..36c1fba 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/TestObj.idl
+++ b/Source/WebCore/bindings/scripts/test/TestObj.idl
@@ -199,7 +199,7 @@ module test {
         SVGPoint mutablePointFunction();
         [Immutable] SVGPoint immutablePointFunction();
 
-        [ImplementedAs=banana] void orange();
+        [ImplementationFunction=banana] void orange();
 
         attribute [StrictTypeChecking] float strictFloat;
         [StrictTypeChecking] bool strictFunction(in DOMString str, in float a, in int b)

diff --git a/Source/WebCore/bindings/scripts/test/TestTypedArray.idl b/Source/WebCore/bindings/scripts/test/TestTypedArray.idl
index a8b3751..0f11008 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/TestTypedArray.idl
+++ b/Source/WebCore/bindings/scripts/test/TestTypedArray.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Float64Array : ArrayBufferView {
         Int32Array foo(in Float32Array array);
     };

diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp b/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp
index 0477223..76ac345 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp
@@ -157,10 +157,10 @@ static const BatchedConstant TestInterfaceConsts[] = {
 
 
 #if ENABLE(Condition11) || ENABLE(Condition12)
-COMPILE_ASSERT(1 == TestInterface::SUPPLEMENTALCONSTANT1, TestInterfaceEnumSUPPLEMENTALCONSTANT1IsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(1 == TestInterface::SUPPLEMENTALCONSTANT1, TestInterfaceEnumSUPPLEMENTALCONSTANT1IsWrongUseDontCheckEnums);
 #endif
 #if ENABLE(Condition11) || ENABLE(Condition12)
-COMPILE_ASSERT(2 == TestInterface::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(2 == TestInterface::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDontCheckEnums);
 #endif
 
 v8::Handle<v8::Value> V8TestInterface::constructorCallback(const v8::Arguments& args)

diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp b/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
index 2ece582..c06803f 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
+++ b/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
@@ -1726,20 +1726,20 @@ static const BatchedConstant TestObjConsts[] = {
 
 
 #if ENABLE(Condition1)
-COMPILE_ASSERT(0 == TestObj::CONDITIONAL_CONST, TestObjEnumCONDITIONAL_CONSTIsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(0 == TestObj::CONDITIONAL_CONST, TestObjEnumCONDITIONAL_CONSTIsWrongUseDontCheckEnums);
 #endif
-COMPILE_ASSERT(0 == TestObj::CONST_VALUE_0, TestObjEnumCONST_VALUE_0IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(1 == TestObj::CONST_VALUE_1, TestObjEnumCONST_VALUE_1IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(2 == TestObj::CONST_VALUE_2, TestObjEnumCONST_VALUE_2IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(4 == TestObj::CONST_VALUE_4, TestObjEnumCONST_VALUE_4IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(8 == TestObj::CONST_VALUE_8, TestObjEnumCONST_VALUE_8IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(-1 == TestObj::CONST_VALUE_9, TestObjEnumCONST_VALUE_9IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT("my constant string" == TestObj::CONST_VALUE_10, TestObjEnumCONST_VALUE_10IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0xffffffff == TestObj::CONST_VALUE_11, TestObjEnumCONST_VALUE_11IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0x01 == TestObj::CONST_VALUE_12, TestObjEnumCONST_VALUE_12IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0X20 == TestObj::CONST_VALUE_13, TestObjEnumCONST_VALUE_13IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(0x1abc == TestObj::CONST_VALUE_14, TestObjEnumCONST_VALUE_14IsWrongUseDoNotCheckConstants);
-COMPILE_ASSERT(15 == TestObj::CONST_IMPL, TestObjEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
+COMPILE_ASSERT(0 == TestObj::CONST_VALUE_0, TestObjEnumCONST_VALUE_0IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(1 == TestObj::CONST_VALUE_1, TestObjEnumCONST_VALUE_1IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(2 == TestObj::CONST_VALUE_2, TestObjEnumCONST_VALUE_2IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(4 == TestObj::CONST_VALUE_4, TestObjEnumCONST_VALUE_4IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(8 == TestObj::CONST_VALUE_8, TestObjEnumCONST_VALUE_8IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(-1 == TestObj::CONST_VALUE_9, TestObjEnumCONST_VALUE_9IsWrongUseDontCheckEnums);
+COMPILE_ASSERT("my constant string" == TestObj::CONST_VALUE_10, TestObjEnumCONST_VALUE_10IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0xffffffff == TestObj::CONST_VALUE_11, TestObjEnumCONST_VALUE_11IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0x01 == TestObj::CONST_VALUE_12, TestObjEnumCONST_VALUE_12IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0X20 == TestObj::CONST_VALUE_13, TestObjEnumCONST_VALUE_13IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(0x1abc == TestObj::CONST_VALUE_14, TestObjEnumCONST_VALUE_14IsWrongUseDontCheckEnums);
+COMPILE_ASSERT(15 == TestObj::CONST_IMPL, TestObjEnumCONST_IMPLIsWrongUseDontCheckEnums);
 
 v8::Handle<v8::Value> V8TestObj::constructorCallback(const v8::Arguments& args)
 {

diff --git a/Source/WebCore/css/WebKitCSSFilterValue.idl b/Source/WebCore/css/WebKitCSSFilterValue.idl
index 3f21913..57ec380 100644 (file)
--- a/Source/WebCore/css/WebKitCSSFilterValue.idl
+++ b/Source/WebCore/css/WebKitCSSFilterValue.idl
@@ -28,7 +28,7 @@ module css {
     interface [
             Conditional=CSS_FILTERS,
             IndexedGetter,
-            DoNotCheckConstants
+            DontCheckEnums
     ] WebKitCSSFilterValue : CSSValueList {
 
         // OperationTypes

diff --git a/Source/WebCore/css/WebKitCSSTransformValue.idl b/Source/WebCore/css/WebKitCSSTransformValue.idl
index 92fde1d..a4145fb 100644 (file)
--- a/Source/WebCore/css/WebKitCSSTransformValue.idl
+++ b/Source/WebCore/css/WebKitCSSTransformValue.idl
@@ -30,7 +30,7 @@ module css {
 
     interface [
             IndexedGetter,
-            DoNotCheckConstants
+            DontCheckEnums
     ] WebKitCSSTransformValue : CSSValueList {
 
         // OperationTypes

diff --git a/Source/WebCore/dom/DOMCoreException.idl b/Source/WebCore/dom/DOMCoreException.idl
index 3f25b02..10b5b1f 100644 (file)
--- a/Source/WebCore/dom/DOMCoreException.idl
+++ b/Source/WebCore/dom/DOMCoreException.idl
@@ -30,7 +30,7 @@ module core {
 
     interface [
         JSNoStaticTables,
-        DoNotCheckConstants
+        DontCheckEnums
     ] DOMCoreException {
 
         readonly attribute unsigned short   code;

diff --git a/Source/WebCore/dom/Document.idl b/Source/WebCore/dom/Document.idl
index 3a97756..f5ed877 100644 (file)
--- a/Source/WebCore/dom/Document.idl
+++ b/Source/WebCore/dom/Document.idl
@@ -31,40 +31,32 @@ module core {
         readonly attribute DOMImplementation implementation;
         readonly attribute Element documentElement;
 
-        [ReturnNewObject] Element createElement(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString tagName)
+        [ReturnsNew] Element createElement(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString tagName)
             raises (DOMException);
         DocumentFragment   createDocumentFragment();
-        [ReturnNewObject] Text createTextNode(in [Optional=CallWithDefaultValue] DOMString data);
-        [ReturnNewObject] Comment createComment(in [Optional=CallWithDefaultValue] DOMString data);
-        [ReturnNewObject] CDATASection createCDATASection(in [Optional=CallWithDefaultValue] DOMString data)
+        [ReturnsNew] Text createTextNode(in [Optional=CallWithDefaultValue] DOMString data);
+        [ReturnsNew] Comment createComment(in [Optional=CallWithDefaultValue] DOMString data);
+        [ReturnsNew] CDATASection createCDATASection(in [Optional=CallWithDefaultValue] DOMString data)
             raises(DOMException);
-        [ObjCLegacyUnnamedParameters, ReturnNewObject] ProcessingInstruction createProcessingInstruction(in [Optional=CallWithDefaultValue] DOMString target,
+        [ObjCLegacyUnnamedParameters, ReturnsNew] ProcessingInstruction createProcessingInstruction(in [Optional=CallWithDefaultValue] DOMString target,
                                                                                      in [Optional=CallWithDefaultValue] DOMString data)
             raises (DOMException);
-        [ReturnNewObject] Attr createAttribute(in [Optional=CallWithDefaultValue] DOMString name)
+        [ReturnsNew] Attr createAttribute(in [Optional=CallWithDefaultValue] DOMString name)
             raises (DOMException);
-        [ReturnNewObject] EntityReference createEntityReference(in [Optional=CallWithDefaultValue] DOMString name)
+        [ReturnsNew] EntityReference createEntityReference(in [Optional=CallWithDefaultValue] DOMString name)
             raises(DOMException);
         NodeList           getElementsByTagName(in [Optional=CallWithDefaultValue] DOMString tagname);
 
         // Introduced in DOM Level 2:
 
-        [ObjCLegacyUnnamedParameters, ReturnNewObject] Node importNode(in [Optional=CallWithDefaultValue] Node importedNode,
+        [ObjCLegacyUnnamedParameters, ReturnsNew] Node importNode(in [Optional=CallWithDefaultValue] Node importedNode,
                                                    in [Optional] boolean deep)
             raises (DOMException);
-<<<<<<< HEAD
         [ObjCLegacyUnnamedParameters, ReturnsNew] Element createElementNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                                            in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName)
             raises (DOMException);
         [ObjCLegacyUnnamedParameters, ReturnsNew] Attr createAttributeNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                                           in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString qualifiedName)
-=======
-        [ObjCLegacyUnnamedParameters, ReturnNewObject] Element createElementNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
-                                                           in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName)
-            raises (DOMException);
-        [ObjCLegacyUnnamedParameters, ReturnNewObject] Attr createAttributeNS(in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString namespaceURI,
-                                                          in [TreatNullAs=EmptyString,Optional=CallWithDefaultValue] DOMString qualifiedName)
->>>>>>> temp
             raises (DOMException);
         [ObjCLegacyUnnamedParameters] NodeList getElementsByTagNameNS(in [TreatNullAs=NullString,Optional=CallWithDefaultValue] DOMString namespaceURI,
                                                        in [Optional=CallWithDefaultValue] DOMString localName);
@@ -333,7 +325,7 @@ module core {
 #endif
 
 #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-        [ReturnNewObject, V8EnabledAtRuntime] Touch createTouch(in [Optional=CallWithDefaultValue] DOMWindow window,
+        [ReturnsNew, V8EnabledAtRuntime] Touch createTouch(in [Optional=CallWithDefaultValue] DOMWindow window,
                                                          in [Optional=CallWithDefaultValue] EventTarget target,
                                                          in [Optional=CallWithDefaultValue] long identifier,
                                                          in [Optional=CallWithDefaultValue] long pageX,
@@ -345,7 +337,7 @@ module core {
                                                          in [Optional=CallWithDefaultValue] float webkitRotationAngle,
                                                          in [Optional=CallWithDefaultValue] float webkitForce)
             raises (DOMException);
-        [ReturnNewObject, V8EnabledAtRuntime, Custom] TouchList createTouchList()
+        [ReturnsNew, V8EnabledAtRuntime, Custom] TouchList createTouchList()
             raises (DOMException);
 #endif
 

diff --git a/Source/WebCore/dom/EventException.idl b/Source/WebCore/dom/EventException.idl
index 28bcf91..21aa448 100644 (file)
--- a/Source/WebCore/dom/EventException.idl
+++ b/Source/WebCore/dom/EventException.idl
@@ -31,7 +31,7 @@ module events {
     // Introduced in DOM Level 2:
     interface [
         JSNoStaticTables,
-        DoNotCheckConstants
+        DontCheckEnums
     ] EventException {
 
         readonly attribute unsigned short   code;

diff --git a/Source/WebCore/dom/RangeException.idl b/Source/WebCore/dom/RangeException.idl
index b2dfc6c..5c86d1d 100644 (file)
--- a/Source/WebCore/dom/RangeException.idl
+++ b/Source/WebCore/dom/RangeException.idl
@@ -20,7 +20,7 @@
 module ranges {
 
     interface [
-        DoNotCheckConstants
+        DontCheckEnums
     ] RangeException {
 
         readonly attribute unsigned short   code;

diff --git a/Source/WebCore/fileapi/FileException.idl b/Source/WebCore/fileapi/FileException.idl
index 65de225..da535f9 100644 (file)
--- a/Source/WebCore/fileapi/FileException.idl
+++ b/Source/WebCore/fileapi/FileException.idl
@@ -31,7 +31,7 @@
 module html {
     interface [
         Conditional=BLOB|FILE_SYSTEM,
-        DoNotCheckConstants,
+        DontCheckEnums,
         JSNoStaticTables
     ] FileException {
 

diff --git a/Source/WebCore/fileapi/OperationNotAllowedException.idl b/Source/WebCore/fileapi/OperationNotAllowedException.idl
index d01a377..fdb0802 100644 (file)
--- a/Source/WebCore/fileapi/OperationNotAllowedException.idl
+++ b/Source/WebCore/fileapi/OperationNotAllowedException.idl
@@ -31,7 +31,7 @@
 module html {
     interface [
         Conditional=BLOB|FILE_SYSTEM,
-        DoNotCheckConstants,
+        DontCheckEnums,
         JSNoStaticTables
     ] OperationNotAllowedException {
         readonly attribute unsigned short   code;

diff --git a/Source/WebCore/html/HTMLFormElement.idl b/Source/WebCore/html/HTMLFormElement.idl
index 521416d..3a2f8a8 100644 (file)
--- a/Source/WebCore/html/HTMLFormElement.idl
+++ b/Source/WebCore/html/HTMLFormElement.idl
@@ -38,7 +38,7 @@ module html {
         attribute [Reflect] DOMString autocomplete;
         
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-        [ImplementedAs=submitFromJavaScript] void submit();
+        [ImplementationFunction=submitFromJavaScript] void submit();
 #else
         void submit();
 #endif

diff --git a/Source/WebCore/html/canvas/Float32Array.idl b/Source/WebCore/html/canvas/Float32Array.idl
index aadb5d9..c6338e2 100644 (file)
--- a/Source/WebCore/html/canvas/Float32Array.idl
+++ b/Source/WebCore/html/canvas/Float32Array.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Float32Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 4;
 

diff --git a/Source/WebCore/html/canvas/Float64Array.idl b/Source/WebCore/html/canvas/Float64Array.idl
index 0672808..f03ae60 100644 (file)
--- a/Source/WebCore/html/canvas/Float64Array.idl
+++ b/Source/WebCore/html/canvas/Float64Array.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Float64Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 8;
 

diff --git a/Source/WebCore/html/canvas/Int16Array.idl b/Source/WebCore/html/canvas/Int16Array.idl
index ae399a0..4a835d3 100644 (file)
--- a/Source/WebCore/html/canvas/Int16Array.idl
+++ b/Source/WebCore/html/canvas/Int16Array.idl
@@ -31,7 +31,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Int16Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 2;
 

diff --git a/Source/WebCore/html/canvas/Int32Array.idl b/Source/WebCore/html/canvas/Int32Array.idl
index 0b7061d..8355ca3 100644 (file)
--- a/Source/WebCore/html/canvas/Int32Array.idl
+++ b/Source/WebCore/html/canvas/Int32Array.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Int32Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 4;
 

diff --git a/Source/WebCore/html/canvas/Int8Array.idl b/Source/WebCore/html/canvas/Int8Array.idl
index c7def77..91e7dc7 100644 (file)
--- a/Source/WebCore/html/canvas/Int8Array.idl
+++ b/Source/WebCore/html/canvas/Int8Array.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Int8Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 1;
 

diff --git a/Source/WebCore/html/canvas/OESStandardDerivatives.idl b/Source/WebCore/html/canvas/OESStandardDerivatives.idl
index 93f0a01..0f50bc6 100644 (file)
--- a/Source/WebCore/html/canvas/OESStandardDerivatives.idl
+++ b/Source/WebCore/html/canvas/OESStandardDerivatives.idl
@@ -28,7 +28,7 @@ module html {
         Conditional=WEBGL,
         JSGenerateIsReachable=ImplContext,
         OmitConstructor,
-        DoNotCheckConstants
+        DontCheckEnums
     ] OESStandardDerivatives {
         const unsigned int FRAGMENT_SHADER_DERIVATIVE_HINT_OES = 0x8B8B;
     };

diff --git a/Source/WebCore/html/canvas/OESVertexArrayObject.idl b/Source/WebCore/html/canvas/OESVertexArrayObject.idl
index c4adf99..f3977f6 100644 (file)
--- a/Source/WebCore/html/canvas/OESVertexArrayObject.idl
+++ b/Source/WebCore/html/canvas/OESVertexArrayObject.idl
@@ -28,7 +28,7 @@ module html {
         Conditional=WEBGL, 
         JSGenerateIsReachable=ImplContext,
         OmitConstructor, 
-        DoNotCheckConstants
+        DontCheckEnums
     ] OESVertexArrayObject {
         const unsigned int VERTEX_ARRAY_BINDING_OES = 0x85B5;
         

diff --git a/Source/WebCore/html/canvas/Uint16Array.idl b/Source/WebCore/html/canvas/Uint16Array.idl
index 0929e2f..68b2756 100644 (file)
--- a/Source/WebCore/html/canvas/Uint16Array.idl
+++ b/Source/WebCore/html/canvas/Uint16Array.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Uint16Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 2;
 

diff --git a/Source/WebCore/html/canvas/Uint32Array.idl b/Source/WebCore/html/canvas/Uint32Array.idl
index 9aad103..52afa26 100644 (file)
--- a/Source/WebCore/html/canvas/Uint32Array.idl
+++ b/Source/WebCore/html/canvas/Uint32Array.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Uint32Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 4;
 

diff --git a/Source/WebCore/html/canvas/Uint8Array.idl b/Source/WebCore/html/canvas/Uint8Array.idl
index 9bdc5a5..34370f3 100644 (file)
--- a/Source/WebCore/html/canvas/Uint8Array.idl
+++ b/Source/WebCore/html/canvas/Uint8Array.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Uint8Array : ArrayBufferView {
         const unsigned int BYTES_PER_ELEMENT = 1;
 

diff --git a/Source/WebCore/html/canvas/Uint8ClampedArray.idl b/Source/WebCore/html/canvas/Uint8ClampedArray.idl
index 68d6fd8..50f51fe 100644 (file)
--- a/Source/WebCore/html/canvas/Uint8ClampedArray.idl
+++ b/Source/WebCore/html/canvas/Uint8ClampedArray.idl
@@ -32,7 +32,7 @@ module html {
         GenerateNativeConverter,
         JSNoStaticTables,
         JSCustomToJS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] Uint8ClampedArray : Uint8Array {
         const unsigned int BYTES_PER_ELEMENT = 1;
 

diff --git a/Source/WebCore/html/canvas/WebGLCompressedTextures.idl b/Source/WebCore/html/canvas/WebGLCompressedTextures.idl
index 808b60a..0f25edc 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLCompressedTextures.idl
+++ b/Source/WebCore/html/canvas/WebGLCompressedTextures.idl
@@ -28,7 +28,7 @@ module html {
         Conditional=WEBGL,
         JSGenerateIsReachable=ImplContext,
         OmitConstructor,
-        DoNotCheckConstants
+        DontCheckEnums
     ] WebGLCompressedTextures {
         /* Compressed Texture Formats */
         const unsigned int COMPRESSED_RGB_S3TC_DXT1_EXT        = 0x83F0;

diff --git a/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl b/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl
index b307a14..14f9c00 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl
+++ b/Source/WebCore/html/canvas/WebGLDebugRendererInfo.idl
@@ -28,7 +28,7 @@ module html {
         Conditional=WEBGL,
         JSGenerateIsReachable=ImplContext,
         OmitConstructor,
-        DoNotCheckConstants
+        DontCheckEnums
     ] WebGLDebugRendererInfo {
         const unsigned int UNMASKED_VENDOR_WEBGL = 0x9245;
         const unsigned int UNMASKED_RENDERER_WEBGL = 0x9246;

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.idl b/Source/WebCore/html/canvas/WebGLRenderingContext.idl
index 4d992c1..f524dfd 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.idl
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.idl
@@ -28,7 +28,7 @@ module html {
     interface [
         Conditional=WEBGL,
         JSCustomMarkFunction,
-        DoNotCheckConstants
+        DontCheckEnums
     ] WebGLRenderingContext : CanvasRenderingContext {
 
         /* ClearBufferMask */

diff --git a/Source/WebCore/inspector/JavaScriptCallFrame.idl b/Source/WebCore/inspector/JavaScriptCallFrame.idl
index 47ca5d1..db0e0a6 100644 (file)
--- a/Source/WebCore/inspector/JavaScriptCallFrame.idl
+++ b/Source/WebCore/inspector/JavaScriptCallFrame.idl
@@ -28,7 +28,7 @@ module inspector {
     interface [
         Conditional=JAVASCRIPT_DEBUGGER,
         OmitConstructor,
-        DoNotCheckConstants
+        DontCheckEnums
     ] JavaScriptCallFrame {
 
         // Scope type

diff --git a/Source/WebCore/loader/appcache/DOMApplicationCache.idl b/Source/WebCore/loader/appcache/DOMApplicationCache.idl
index a35fa47..d9bef2b 100644 (file)
--- a/Source/WebCore/loader/appcache/DOMApplicationCache.idl
+++ b/Source/WebCore/loader/appcache/DOMApplicationCache.idl
@@ -28,7 +28,7 @@ module offline {
     interface [
         EventTarget,
         OmitConstructor,
-        DoNotCheckConstants,
+        DontCheckEnums,
         JSGenerateIsReachable=ImplFrame
     ] DOMApplicationCache {
         // update status

diff --git a/Source/WebCore/page/Console.idl b/Source/WebCore/page/Console.idl
index 42cd187..8f7f4be 100644 (file)
--- a/Source/WebCore/page/Console.idl
+++ b/Source/WebCore/page/Console.idl
@@ -41,7 +41,7 @@ module window {
         [CustomArgumentHandling] void dir();
         [CustomArgumentHandling] void dirxml();
         [V8Custom, CustomArgumentHandling] void trace();
-        [V8Custom, CustomArgumentHandling, ImplementedAs=assertCondition] void assert(in boolean condition);
+        [V8Custom, CustomArgumentHandling, ImplementationFunction=assertCondition] void assert(in boolean condition);
         [CustomArgumentHandling] void count();
         [CustomArgumentHandling] void markTimeline();
 

diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl
index 6609dfe..91def38 100644 (file)
--- a/Source/WebCore/page/DOMWindow.idl
+++ b/Source/WebCore/page/DOMWindow.idl
@@ -43,7 +43,7 @@ module window {
     ] DOMWindow {
         // DOM Level 0
         attribute [Replaceable] Screen screen;
-        attribute [Replaceable, DoNotCheckDomainSecurityOnGetter, JSCustomGetter] History history;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet, JSCustomGetter] History history;
         attribute [Replaceable] BarInfo locationbar;
         attribute [Replaceable] BarInfo menubar;
         attribute [Replaceable] BarInfo personalbar;
@@ -115,7 +115,7 @@ module window {
 
         readonly attribute [DoNotCheckDomainSecurity] boolean closed;
 
-        attribute [Replaceable, DoNotCheckDomainSecurityOnGetter] unsigned long length;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet] unsigned long length;
 
         attribute DOMString name;
 
@@ -127,13 +127,13 @@ module window {
 #endif
 
         // Self referential attributes
-        attribute [Replaceable, DoNotCheckDomainSecurityOnGetter] DOMWindow self;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet] DOMWindow self;
         readonly attribute [DoNotCheckDomainSecurity, V8Unforgeable] DOMWindow window;
-        attribute [Replaceable, DoNotCheckDomainSecurityOnGetter] DOMWindow frames;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet] DOMWindow frames;
 
-        attribute [Replaceable, DoNotCheckDomainSecurityOnGetter, V8CustomSetter] DOMWindow opener;
-        attribute [Replaceable, DoNotCheckDomainSecurityOnGetter] DOMWindow parent;
-        attribute [Replaceable, DoNotCheckDomainSecurityOnGetter, V8Unforgeable, V8ReadOnly] DOMWindow top;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet, V8CustomSetter] DOMWindow opener;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet] DOMWindow parent;
+        attribute [Replaceable, DoNotCheckDomainSecurityOnGet, V8Unforgeable, V8ReadOnly] DOMWindow top;
 
         // DOM Level 2 AbstractView Interface
         readonly attribute Document document;

diff --git a/Source/WebCore/page/Location.idl b/Source/WebCore/page/Location.idl
index 8919592..625c9db 100644 (file)
--- a/Source/WebCore/page/Location.idl
+++ b/Source/WebCore/page/Location.idl
@@ -43,7 +43,7 @@ module window {
         OmitConstructor
     ] Location {
 #if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
-                 attribute [DoNotCheckDomainSecurityOnSetter, CustomSetter, V8Unforgeable] DOMString href;
+                 attribute [DoNotCheckDomainSecurityOnSet, CustomSetter, V8Unforgeable] DOMString href;
 #endif
 
         [Custom, V8OnInstance] void assign(in [Optional=CallWithDefaultValue] DOMString url);
@@ -64,7 +64,7 @@ module window {
 #endif
 
 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-        [NotEnumerable, Custom, V8OnInstance, V8ReadOnly, ImplementedAs=toStringFunction] DOMString toString();
+        [NotEnumerable, Custom, V8OnInstance, V8ReadOnly, ImplementationFunction=toStringFunction] DOMString toString();
 #endif
 #if defined(V8_BINDING) && V8_BINDING
         [NotEnumerable, Custom, V8OnInstance, V8ReadOnly] DOMObject valueOf();

diff --git a/Source/WebCore/storage/IDBCursor.idl b/Source/WebCore/storage/IDBCursor.idl
index 41540e2..e13f658 100644 (file)
--- a/Source/WebCore/storage/IDBCursor.idl
+++ b/Source/WebCore/storage/IDBCursor.idl
@@ -40,9 +40,9 @@ module storage {
 
         [CallWith=ScriptExecutionContext] IDBRequest update(in SerializedScriptValue value)
             raises (IDBDatabaseException);
-        [ImplementedAs=continueFunction] void continue(in [Optional] IDBKey key)
+        [ImplementationFunction=continueFunction] void continue(in [Optional] IDBKey key)
             raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete()
+        [CallWith=ScriptExecutionContext, ImplementationFunction=deleteFunction] IDBRequest delete()
             raises (IDBDatabaseException);
     };
 }

diff --git a/Source/WebCore/storage/IDBDatabaseException.idl b/Source/WebCore/storage/IDBDatabaseException.idl
index c8e1b35..6938f5d 100644 (file)
--- a/Source/WebCore/storage/IDBDatabaseException.idl
+++ b/Source/WebCore/storage/IDBDatabaseException.idl
@@ -27,7 +27,7 @@ module storage {
 
     interface [
         Conditional=INDEXED_DATABASE,
-        DoNotCheckConstants
+        DontCheckEnums
     ] IDBDatabaseException {
 
         readonly attribute unsigned short   code;

diff --git a/Source/WebCore/storage/IDBObjectStore.idl b/Source/WebCore/storage/IDBObjectStore.idl
index 0a91253..eae0bec 100644 (file)
--- a/Source/WebCore/storage/IDBObjectStore.idl
+++ b/Source/WebCore/storage/IDBObjectStore.idl
@@ -37,7 +37,7 @@ module storage {
             raises (IDBDatabaseException);
         [CallWith=ScriptExecutionContext] IDBRequest add(in SerializedScriptValue value, in [Optional] IDBKey key)
             raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete(in IDBKey key)
+        [CallWith=ScriptExecutionContext, ImplementationFunction=deleteFunction] IDBRequest delete(in IDBKey key)
             raises (IDBDatabaseException);
         [CallWith=ScriptExecutionContext] IDBRequest clear()
             raises (IDBDatabaseException);

diff --git a/Source/WebCore/storage/SQLException.idl b/Source/WebCore/storage/SQLException.idl
index 39e58d6..749d958 100644 (file)
--- a/Source/WebCore/storage/SQLException.idl
+++ b/Source/WebCore/storage/SQLException.idl
@@ -33,7 +33,7 @@ module storage {
     interface [
         Conditional=SQL_DATABASE,
         JSNoStaticTables,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SQLException {
         readonly attribute unsigned long code;
         readonly attribute DOMString message;

diff --git a/Source/WebCore/svg/SVGComponentTransferFunctionElement.idl b/Source/WebCore/svg/SVGComponentTransferFunctionElement.idl
index 1edd5cf..e4a2596 100644 (file)
--- a/Source/WebCore/svg/SVGComponentTransferFunctionElement.idl
+++ b/Source/WebCore/svg/SVGComponentTransferFunctionElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGComponentTransferFunctionElement : SVGElement {
         // Component Transfer Types
         const unsigned short SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN  = 0;

diff --git a/Source/WebCore/svg/SVGException.idl b/Source/WebCore/svg/SVGException.idl
index 9b3a6a8..07684ce 100644 (file)
--- a/Source/WebCore/svg/SVGException.idl
+++ b/Source/WebCore/svg/SVGException.idl
@@ -22,7 +22,7 @@ module svg {
 
     interface [
         Conditional=SVG,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGException {
 
         readonly attribute unsigned short   code;

diff --git a/Source/WebCore/svg/SVGFEBlendElement.idl b/Source/WebCore/svg/SVGFEBlendElement.idl
index 288059c..03a5543 100644 (file)
--- a/Source/WebCore/svg/SVGFEBlendElement.idl
+++ b/Source/WebCore/svg/SVGFEBlendElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGFEBlendElement : SVGElement,
                           SVGFilterPrimitiveStandardAttributes {
         // Blend Mode Types

diff --git a/Source/WebCore/svg/SVGFEColorMatrixElement.idl b/Source/WebCore/svg/SVGFEColorMatrixElement.idl
index 6b18061..01f57fd 100644 (file)
--- a/Source/WebCore/svg/SVGFEColorMatrixElement.idl
+++ b/Source/WebCore/svg/SVGFEColorMatrixElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGFEColorMatrixElement : SVGElement,
                                 SVGFilterPrimitiveStandardAttributes {
         // Color Matrix Types

diff --git a/Source/WebCore/svg/SVGFECompositeElement.idl b/Source/WebCore/svg/SVGFECompositeElement.idl
index 76840e5..dc7fd8d 100644 (file)
--- a/Source/WebCore/svg/SVGFECompositeElement.idl
+++ b/Source/WebCore/svg/SVGFECompositeElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGFECompositeElement : SVGElement,
                               SVGFilterPrimitiveStandardAttributes {
         // Composite Operators

diff --git a/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl b/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl
index e78219d..d880aa7 100644 (file)
--- a/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl
+++ b/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGFEConvolveMatrixElement : SVGElement,
                                    SVGFilterPrimitiveStandardAttributes {
         // Edge Mode Values

diff --git a/Source/WebCore/svg/SVGFEDisplacementMapElement.idl b/Source/WebCore/svg/SVGFEDisplacementMapElement.idl
index 0729586..0fb4e63 100644 (file)
--- a/Source/WebCore/svg/SVGFEDisplacementMapElement.idl
+++ b/Source/WebCore/svg/SVGFEDisplacementMapElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGFEDisplacementMapElement : SVGElement,
                                     SVGFilterPrimitiveStandardAttributes {
         // Channel Selectors

diff --git a/Source/WebCore/svg/SVGFEMorphologyElement.idl b/Source/WebCore/svg/SVGFEMorphologyElement.idl
index b31d74f..37de353 100644 (file)
--- a/Source/WebCore/svg/SVGFEMorphologyElement.idl
+++ b/Source/WebCore/svg/SVGFEMorphologyElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGFEMorphologyElement : SVGElement,
                                SVGFilterPrimitiveStandardAttributes {
         // Morphology Operators

diff --git a/Source/WebCore/svg/SVGFETurbulenceElement.idl b/Source/WebCore/svg/SVGFETurbulenceElement.idl
index 0060fbf..bd538bd 100644 (file)
--- a/Source/WebCore/svg/SVGFETurbulenceElement.idl
+++ b/Source/WebCore/svg/SVGFETurbulenceElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG&FILTERS,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGFETurbulenceElement : SVGElement,
                                SVGFilterPrimitiveStandardAttributes {
         // Turbulence Types

diff --git a/Source/WebCore/svg/SVGGradientElement.idl b/Source/WebCore/svg/SVGGradientElement.idl
index 6db27fb..853081f 100644 (file)
--- a/Source/WebCore/svg/SVGGradientElement.idl
+++ b/Source/WebCore/svg/SVGGradientElement.idl
@@ -27,7 +27,7 @@ module svg {
 
     interface [
         Conditional=SVG,
-        DoNotCheckConstants
+        DontCheckEnums
     ] SVGGradientElement : SVGElement,
                            SVGURIReference,
                            SVGExternalResourcesRequired,

diff --git a/Source/WebCore/xml/XMLHttpRequestException.idl b/Source/WebCore/xml/XMLHttpRequestException.idl
index c448155..3372ab2 100644 (file)
--- a/Source/WebCore/xml/XMLHttpRequestException.idl
+++ b/Source/WebCore/xml/XMLHttpRequestException.idl
@@ -30,7 +30,7 @@ module xml {
 
     interface [
         JSNoStaticTables,
-        DoNotCheckConstants
+        DontCheckEnums
     ] XMLHttpRequestException {
 
         readonly attribute unsigned short   code;

diff --git a/Source/WebCore/xml/XPathException.idl b/Source/WebCore/xml/XPathException.idl
index 8196cbe..fdd0791 100644 (file)
--- a/Source/WebCore/xml/XPathException.idl
+++ b/Source/WebCore/xml/XPathException.idl
@@ -29,7 +29,7 @@
 module xpath {
 
     interface [
-        DoNotCheckConstants
+        DontCheckEnums
     ] XPathException {
 
         readonly attribute unsigned short   code;