diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index bb85c15eceffa1765ae7c999a4af124d6308baac..b80546ef2f4faa57fdf6a7b161ef7f160f1bbda3 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,23 @@ +2012-02-03 Kentaro Hara + + Add the "CPP" prefix to CPP specific IDL attributes + https://bugs.webkit.org/show_bug.cgi?id=77707 + + Reviewed by Adam Barth. + + This patch adds the "CPP" prefix to a CPP specific IDL attribute. + Specifically, this patch renames [PureInterface] to [CPPPureInterface] + + No tests. No change in behavior. + + * bindings/scripts/CodeGeneratorCPP.pm: + (GenerateHeader): + (GenerateImplementation): + * css/MediaQueryListListener.idl: + * dom/EventListener.idl: + * dom/EventTarget.idl: + * dom/NodeFilter.idl: + 2012-01-27 Alexander Pavlov Implement touch event emulation in the WebCore layer diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm b/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm index b30fe74de04c3d52f4c9d85456b1c4396b47e529..71aaaa49f47bcb01430e485728fa3bbb53d17371 100644 --- a/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm +++ b/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm @@ -481,7 +481,7 @@ sub GenerateHeader $parameterIndex++; } $functionSig .= ")"; - if ($dataNode->extendedAttributes->{"PureInterface"}) { + if ($dataNode->extendedAttributes->{"CPPPureInterface"}) { push(@interfaceFunctions, " virtual " . $functionSig . " = 0;\n"); } my $functionDeclaration = $functionSig; @@ -513,9 +513,9 @@ sub GenerateHeader push(@headerContent, "};\n\n"); - # for PureInterface classes also add the interface that the client code needs to + # for CPPPureInterface classes also add the interface that the client code needs to # implement - if ($dataNode->extendedAttributes->{"PureInterface"}) { + if ($dataNode->extendedAttributes->{"CPPPureInterface"}) { push(@headerContent, "class WebUser$interfaceName {\n"); push(@headerContent, "public:\n"); push(@headerContent, " virtual void ref() = 0;\n"); @@ -529,7 +529,7 @@ sub GenerateHeader my $namespace = GetNamespaceForClass($implClassName); push(@headerContent, "$namespace" . "::$implClassName* toWebCore(const $className&);\n"); push(@headerContent, "$className toWebKit($namespace" . "::$implClassName*);\n"); - if ($dataNode->extendedAttributes->{"PureInterface"}) { + if ($dataNode->extendedAttributes->{"CPPPureInterface"}) { push(@headerContent, "$className toWebKit(WebUser$interfaceName*);\n"); } push(@headerContent, "\n#endif\n"); @@ -783,8 +783,8 @@ sub GenerateImplementation # - Functions if ($numFunctions > 0) { foreach my $function (@{$dataNode->functions}) { - # Treat PureInterface as Custom as well, since the WebCore versions will take a script context as well - next if ShouldSkipType($function) || $dataNode->extendedAttributes->{"PureInterface"}; + # Treat CPPPureInterface as Custom as well, since the WebCore versions will take a script context as well + next if ShouldSkipType($function) || $dataNode->extendedAttributes->{"CPPPureInterface"}; AddIncludesForType($function->signature->type); my $functionName = $function->signature->name; diff --git a/Source/WebCore/css/MediaQueryListListener.idl b/Source/WebCore/css/MediaQueryListListener.idl index dfe659b0d2b6c2932b22a251e831f952e751f7c7..99026080dbef99841f9c9f23806f4bb5bf9ff962 100644 --- a/Source/WebCore/css/MediaQueryListListener.idl +++ b/Source/WebCore/css/MediaQueryListListener.idl @@ -21,7 +21,7 @@ module view { interface [ NoStaticTables, ObjCProtocol, - PureInterface, + CPPPureInterface, OmitConstructor ] MediaQueryListListener { void queryChanged(in [Optional=CallWithDefaultValue] MediaQueryList list); diff --git a/Source/WebCore/dom/EventListener.idl b/Source/WebCore/dom/EventListener.idl index 023777bf3943257e9d3bc6624597e310d0e66932..21a7b1f90485f426026c5aef3d137f4c7afcc04c 100644 --- a/Source/WebCore/dom/EventListener.idl +++ b/Source/WebCore/dom/EventListener.idl @@ -24,7 +24,7 @@ module events { interface [ NoStaticTables, ObjCProtocol, - PureInterface, + CPPPureInterface, OmitConstructor ] EventListener { void handleEvent(in Event evt); diff --git a/Source/WebCore/dom/EventTarget.idl b/Source/WebCore/dom/EventTarget.idl index 8c683da1ee007ce1880d90926f7012092011ae3b..712b3b1b812e483a0f8a602e4860cd72165e2b56 100644 --- a/Source/WebCore/dom/EventTarget.idl +++ b/Source/WebCore/dom/EventTarget.idl @@ -23,7 +23,7 @@ module events { // Introduced in DOM Level 2: interface [ ObjCProtocol, - PureInterface, + CPPPureInterface, OmitConstructor ] EventTarget { [OldStyleObjC] void addEventListener(in DOMString type, diff --git a/Source/WebCore/dom/NodeFilter.idl b/Source/WebCore/dom/NodeFilter.idl index 38dac10f0354bf920060138e040c90a9ba17c484..0d796124d866e576b6e109146fa3cce2f7ce736e 100644 --- a/Source/WebCore/dom/NodeFilter.idl +++ b/Source/WebCore/dom/NodeFilter.idl @@ -25,7 +25,7 @@ module traversal { CustomMarkFunction, CustomNativeConverter, ObjCProtocol, - PureInterface + CPPPureInterface ] NodeFilter { // Constants returned by acceptNode const short FILTER_ACCEPT = 1;