<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192750] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192750">192750</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-23 11:57:28 -0800 (Mon, 23 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WebCore namespace for generated bindings for supplemental method calls
https://bugs.webkit.org/show_bug.cgi?id=151431
Patch by Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au> on 2015-11-23
Reviewed by Alex Christensen.
Address build failures for generated supplemental method calls which are in the WebCore namespace.
The bindings are outside the WebCore namespace - so add WebCore namespace specifier where required.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
(GenerateImplementation):
(GenerateParametersCheck):
* bindings/scripts/CodeGeneratorObjC.pm:
(GenerateImplementation):
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr):
(WebCore::jsTestInterfaceConstructorSupplementalStaticAttr):
(WebCore::jsTestInterfaceSupplementalStr1):
(WebCore::jsTestInterfaceSupplementalStr2):
(WebCore::jsTestInterfaceSupplementalNode):
(WebCore::setJSTestInterfaceConstructorSupplementalStaticAttr):
(WebCore::setJSTestInterfaceSupplementalStr2):
(WebCore::setJSTestInterfaceSupplementalNode):
(WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod1):
(WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod2):
(WebCore::jsTestInterfaceConstructorFunctionSupplementalMethod4):
* bindings/scripts/test/ObjC/DOMTestInterface.mm:
(-[DOMTestInterface supplementalStr1]):
(-[DOMTestInterface supplementalStr2]):
(-[DOMTestInterface setSupplementalStr2:]):
(-[DOMTestInterface supplementalStr3]):
(-[DOMTestInterface setSupplementalStr3:]):
(-[DOMTestInterface supplementalNode]):
(-[DOMTestInterface setSupplementalNode:]):
(-[DOMTestInterface builtinAttribute]):
(-[DOMTestInterface setBuiltinAttribute:]):
(-[DOMTestInterface supplementalMethod1]):
(-[DOMTestInterface supplementalMethod2:objArg:]):
(-[DOMTestInterface supplementalMethod3]):
(-[DOMTestInterface supplementalMethod4]):
(-[DOMTestInterface builtinFunction]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestInterfacemm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192749 => 192750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-23 19:48:50 UTC (rev 192749)
+++ trunk/Source/WebCore/ChangeLog 2015-11-23 19:57:28 UTC (rev 192750)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-11-23 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
+
+ Add WebCore namespace for generated bindings for supplemental method calls
+ https://bugs.webkit.org/show_bug.cgi?id=151431
+
+ Reviewed by Alex Christensen.
+
+ Address build failures for generated supplemental method calls which are in the WebCore namespace.
+ The bindings are outside the WebCore namespace - so add WebCore namespace specifier where required.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ (GenerateImplementation):
+ (GenerateParametersCheck):
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ (WebCore::jsTestInterfaceConstructorSupplementalStaticReadOnlyAttr):
+ (WebCore::jsTestInterfaceConstructorSupplementalStaticAttr):
+ (WebCore::jsTestInterfaceSupplementalStr1):
+ (WebCore::jsTestInterfaceSupplementalStr2):
+ (WebCore::jsTestInterfaceSupplementalNode):
+ (WebCore::setJSTestInterfaceConstructorSupplementalStaticAttr):
+ (WebCore::setJSTestInterfaceSupplementalStr2):
+ (WebCore::setJSTestInterfaceSupplementalNode):
+ (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod1):
+ (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod2):
+ (WebCore::jsTestInterfaceConstructorFunctionSupplementalMethod4):
+ * bindings/scripts/test/ObjC/DOMTestInterface.mm:
+ (-[DOMTestInterface supplementalStr1]):
+ (-[DOMTestInterface supplementalStr2]):
+ (-[DOMTestInterface setSupplementalStr2:]):
+ (-[DOMTestInterface supplementalStr3]):
+ (-[DOMTestInterface setSupplementalStr3:]):
+ (-[DOMTestInterface supplementalNode]):
+ (-[DOMTestInterface setSupplementalNode:]):
+ (-[DOMTestInterface builtinAttribute]):
+ (-[DOMTestInterface setBuiltinAttribute:]):
+ (-[DOMTestInterface supplementalMethod1]):
+ (-[DOMTestInterface supplementalMethod2:objArg:]):
+ (-[DOMTestInterface supplementalMethod3]):
+ (-[DOMTestInterface supplementalMethod4]):
+ (-[DOMTestInterface builtinFunction]):
+
</ins><span class="cx"> 2015-11-23 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: When a transaction is aborted, call onerror handlers for all in-progress requests.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (192749 => 192750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-11-23 19:48:50 UTC (rev 192749)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-11-23 19:57:28 UTC (rev 192750)
</span><span class="lines">@@ -2439,7 +2439,7 @@
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
</span><span class="cx"> my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
</span><span class="cx"> $implIncludes{"${implementedBy}.h"} = 1;
</span><del>- $functionName = "${implementedBy}::${functionName}";
</del><ins>+ $functionName = "WebCore::${implementedBy}::${functionName}";
</ins><span class="cx"> unshift(@arguments, "&impl") if !$attribute->isStatic;
</span><span class="cx"> } elsif ($attribute->isStatic) {
</span><span class="cx"> $functionName = "${interfaceName}::${functionName}";
</span><span class="lines">@@ -2798,7 +2798,7 @@
</span><span class="cx"> my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
</span><span class="cx"> AddToImplIncludes("${implementedBy}.h", $attribute->signature->extendedAttributes->{"Conditional"});
</span><span class="cx"> unshift(@arguments, "&impl") if !$attribute->isStatic;
</span><del>- $functionName = "${implementedBy}::${functionName}";
</del><ins>+ $functionName = "WebCore::${implementedBy}::${functionName}";
</ins><span class="cx"> } elsif ($attribute->isStatic) {
</span><span class="cx"> $functionName = "${interfaceName}::${functionName}";
</span><span class="cx"> } else {
</span><span class="lines">@@ -3317,7 +3317,7 @@
</span><span class="cx"> if ($implementedBy) {
</span><span class="cx"> AddToImplIncludes("${implementedBy}.h", $function->signature->extendedAttributes->{"Conditional"});
</span><span class="cx"> unshift(@arguments, "&impl") if !$function->isStatic;
</span><del>- $functionName = "${implementedBy}::${functionImplementationName}";
</del><ins>+ $functionName = "WebCore::${implementedBy}::${functionImplementationName}";
</ins><span class="cx"> } elsif ($function->isStatic) {
</span><span class="cx"> $functionName = "${interfaceName}::${functionImplementationName}";
</span><span class="cx"> } elsif ($svgPropertyOrListPropertyType and !$svgListPropertyType) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (192749 => 192750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-11-23 19:48:50 UTC (rev 192749)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-11-23 19:57:28 UTC (rev 192750)
</span><span class="lines">@@ -1298,7 +1298,7 @@
</span><span class="cx"> if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
</span><span class="cx"> my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
</span><span class="cx"> $implIncludes{"${implementedBy}.h"} = 1;
</span><del>- $getterContentHead = "${implementedBy}::${getterExpressionPrefix}IMPL";
</del><ins>+ $getterContentHead = "WebCore::${implementedBy}::${getterExpressionPrefix}IMPL";
</ins><span class="cx"> } else {
</span><span class="cx"> $getterContentHead = "IMPL->$getterExpressionPrefix";
</span><span class="cx"> }
</span><span class="lines">@@ -1444,7 +1444,7 @@
</span><span class="cx"> my $implementedBy = $attribute->signature->extendedAttributes->{"ImplementedBy"};
</span><span class="cx"> $implIncludes{"${implementedBy}.h"} = 1;
</span><span class="cx"> unshift(@arguments, "IMPL");
</span><del>- $functionName = "${implementedBy}::${functionName}";
</del><ins>+ $functionName = "WebCore::${implementedBy}::${functionName}";
</ins><span class="cx"> } else {
</span><span class="cx"> $functionName = "IMPL->${functionName}";
</span><span class="cx"> }
</span><span class="lines">@@ -1572,7 +1572,7 @@
</span><span class="cx"> my $implementedBy = $function->signature->extendedAttributes->{"ImplementedBy"};
</span><span class="cx"> $implIncludes{"${implementedBy}.h"} = 1;
</span><span class="cx"> unshift(@parameterNames, $caller);
</span><del>- $content = "${implementedBy}::" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
</del><ins>+ $content = "WebCore::${implementedBy}::" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
</ins><span class="cx"> } else {
</span><span class="cx"> my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} || $codeGenerator->WK_lcfirst($functionName);
</span><span class="cx"> $content = "$caller->" . $functionImplementationName . "(" . join(", ", @parameterNames) . ")";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (192749 => 192750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2015-11-23 19:48:50 UTC (rev 192749)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2015-11-23 19:57:28 UTC (rev 192750)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><del>- JSValue result = jsNumber(TestSupplemental::supplementalStaticReadOnlyAttr());
</del><ins>+ JSValue result = jsNumber(WebCore::TestSupplemental::supplementalStaticReadOnlyAttr());
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(slotBase);
</span><span class="cx"> UNUSED_PARAM(thisValue);
</span><del>- JSValue result = jsStringWithCache(state, TestSupplemental::supplementalStaticAttr());
</del><ins>+ JSValue result = jsStringWithCache(state, WebCore::TestSupplemental::supplementalStaticAttr());
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> return throwGetterTypeError(*state, "TestInterface", "supplementalStr1");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- JSValue result = jsStringWithCache(state, TestSupplemental::supplementalStr1(&impl));
</del><ins>+ JSValue result = jsStringWithCache(state, WebCore::TestSupplemental::supplementalStr1(&impl));
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> return throwGetterTypeError(*state, "TestInterface", "supplementalStr2");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- JSValue result = jsStringWithCache(state, TestSupplemental::supplementalStr2(&impl));
</del><ins>+ JSValue result = jsStringWithCache(state, WebCore::TestSupplemental::supplementalStr2(&impl));
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> return throwGetterTypeError(*state, "TestInterface", "supplementalNode");
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- JSValue result = toJS(state, castedThis->globalObject(), WTF::getPtr(TestSupplemental::supplementalNode(&impl)));
</del><ins>+ JSValue result = toJS(state, castedThis->globalObject(), WTF::getPtr(WebCore::TestSupplemental::supplementalNode(&impl)));
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -719,7 +719,7 @@
</span><span class="cx"> String nativeValue = value.toString(state)->value(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return;
</span><del>- TestSupplemental::setSupplementalStaticAttr(nativeValue);
</del><ins>+ WebCore::TestSupplemental::setSupplementalStaticAttr(nativeValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx"> String nativeValue = value.toString(state)->value(state);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return;
</span><del>- TestSupplemental::setSupplementalStr2(&impl, nativeValue);
</del><ins>+ WebCore::TestSupplemental::setSupplementalStr2(&impl, nativeValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -777,7 +777,7 @@
</span><span class="cx"> Node* nativeValue = JSNode::toWrapped(value);
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return;
</span><del>- TestSupplemental::setSupplementalNode(&impl, nativeValue);
</del><ins>+ WebCore::TestSupplemental::setSupplementalNode(&impl, nativeValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -862,7 +862,7 @@
</span><span class="cx"> return throwThisTypeError(*state, "TestInterface", "supplementalMethod1");
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestInterface::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- TestSupplemental::supplementalMethod1(&impl);
</del><ins>+ WebCore::TestSupplemental::supplementalMethod1(&impl);
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -889,7 +889,7 @@
</span><span class="cx"> TestObj* objArg = JSTestObj::toWrapped(state->argument(1));
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- JSValue result = toJS(state, castedThis->globalObject(), WTF::getPtr(TestSupplemental::supplementalMethod2(&impl, scriptContext, strArg, objArg, ec)));
</del><ins>+ JSValue result = toJS(state, castedThis->globalObject(), WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(&impl, scriptContext, strArg, objArg, ec)));
</ins><span class="cx">
</span><span class="cx"> setDOMException(state, ec);
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx"> #if ENABLE(Condition11) || ENABLE(Condition12)
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestInterfaceConstructorFunctionSupplementalMethod4(ExecState* state)
</span><span class="cx"> {
</span><del>- TestSupplemental::supplementalMethod4();
</del><ins>+ WebCore::TestSupplemental::supplementalMethod4();
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm (192749 => 192750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm 2015-11-23 19:48:50 UTC (rev 192749)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestInterface.mm 2015-11-23 19:57:28 UTC (rev 192750)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> - (NSString *)supplementalStr1
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return TestSupplemental::supplementalStr1(IMPL);
</del><ins>+ return WebCore::TestSupplemental::supplementalStr1(IMPL);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -132,13 +132,13 @@
</span><span class="cx"> - (NSString *)supplementalStr2
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return TestSupplemental::supplementalStr2(IMPL);
</del><ins>+ return WebCore::TestSupplemental::supplementalStr2(IMPL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setSupplementalStr2:(NSString *)newSupplementalStr2
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- TestSupplemental::setSupplementalStr2(IMPL, newSupplementalStr2);
</del><ins>+ WebCore::TestSupplemental::setSupplementalStr2(IMPL, newSupplementalStr2);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -146,13 +146,13 @@
</span><span class="cx"> - (NSString *)supplementalStr3
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return TestSupplemental::supplementalStr3(IMPL);
</del><ins>+ return WebCore::TestSupplemental::supplementalStr3(IMPL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setSupplementalStr3:(NSString *)newSupplementalStr3
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- TestSupplemental::setSupplementalStr3(IMPL, newSupplementalStr3);
</del><ins>+ WebCore::TestSupplemental::setSupplementalStr3(IMPL, newSupplementalStr3);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> - (DOMNode *)supplementalNode
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return kit(WTF::getPtr(TestSupplemental::supplementalNode(IMPL)));
</del><ins>+ return kit(WTF::getPtr(WebCore::TestSupplemental::supplementalNode(IMPL)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setSupplementalNode:(DOMNode *)newSupplementalNode
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> ASSERT(newSupplementalNode);
</span><span class="cx">
</span><del>- TestSupplemental::setSupplementalNode(IMPL, core(newSupplementalNode));
</del><ins>+ WebCore::TestSupplemental::setSupplementalNode(IMPL, core(newSupplementalNode));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -176,13 +176,13 @@
</span><span class="cx"> - (unsigned short)builtinAttribute
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return TestSupplemental::builtinAttribute(IMPL);
</del><ins>+ return WebCore::TestSupplemental::builtinAttribute(IMPL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setBuiltinAttribute:(unsigned short)newBuiltinAttribute
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- TestSupplemental::setBuiltinAttribute(IMPL, newBuiltinAttribute);
</del><ins>+ WebCore::TestSupplemental::setBuiltinAttribute(IMPL, newBuiltinAttribute);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> - (void)supplementalMethod1
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- TestSupplemental::supplementalMethod1(IMPL);
</del><ins>+ WebCore::TestSupplemental::supplementalMethod1(IMPL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><span class="cx"> WebCore::ExceptionCode ec = 0;
</span><del>- DOMTestObj *result = kit(WTF::getPtr(TestSupplemental::supplementalMethod2(IMPL, strArg, core(objArg), ec)));
</del><ins>+ DOMTestObj *result = kit(WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(IMPL, strArg, core(objArg), ec)));
</ins><span class="cx"> WebCore::raiseOnDOMError(ec);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> - (void)supplementalMethod3
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- TestSupplemental::supplementalMethod3(IMPL);
</del><ins>+ WebCore::TestSupplemental::supplementalMethod3(IMPL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> - (void)supplementalMethod4
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- TestSupplemental::supplementalMethod4(IMPL);
</del><ins>+ WebCore::TestSupplemental::supplementalMethod4(IMPL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> - (void)builtinFunction
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- TestSupplemental::builtinFunction(IMPL);
</del><ins>+ WebCore::TestSupplemental::builtinFunction(IMPL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>