Diff
Modified: trunk/Source/WebCore/ChangeLog (112206 => 112207)
--- trunk/Source/WebCore/ChangeLog 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/ChangeLog 2012-03-27 05:32:16 UTC (rev 112207)
@@ -1,3 +1,46 @@
+2012-03-26 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r112199.
+ http://trac.webkit.org/changeset/112199
+ https://bugs.webkit.org/show_bug.cgi?id=82295
+
+ Breaks Chromium Win compilation (Requested by pfeldman on
+ #webkit).
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateConstructorCallback):
+ (GenerateNamedConstructorCallback):
+ (GenerateToV8Converters):
+ (GetDomMapFunction):
+ * bindings/scripts/test/V8/V8Float64Array.cpp:
+ (WebCore::V8Float64Array::wrapSlow):
+ * bindings/scripts/test/V8/V8TestActiveDOMObject.cpp:
+ (WebCore::V8TestActiveDOMObject::wrapSlow):
+ * bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp:
+ (WebCore::V8TestCustomNamedGetter::wrapSlow):
+ * bindings/scripts/test/V8/V8TestEventConstructor.cpp:
+ (WebCore::V8TestEventConstructor::wrapSlow):
+ * bindings/scripts/test/V8/V8TestEventTarget.cpp:
+ (WebCore::V8TestEventTarget::wrapSlow):
+ * bindings/scripts/test/V8/V8TestInterface.cpp:
+ (WebCore::V8TestInterface::wrapSlow):
+ * bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:
+ (WebCore::V8TestMediaQueryListListener::wrapSlow):
+ * bindings/scripts/test/V8/V8TestNamedConstructor.cpp:
+ (WebCore::V8TestNamedConstructor::wrapSlow):
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (WebCore::V8TestObj::wrapSlow):
+ * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
+ (WebCore::V8TestSerializedScriptValueInterface::wrapSlow):
+ * bindings/v8/V8DOMWrapper.cpp:
+ (WebCore::V8DOMWrapper::setJSWrapperForDOMNode):
+ (WebCore):
+ * bindings/v8/V8DOMWrapper.h:
+ (WebCore):
+ (V8DOMWrapper):
+ (WebCore::V8DOMWrapper::setJSWrapperForDOMObject):
+ (WebCore::V8DOMWrapper::setJSWrapperForActiveDOMObject):
+
2012-03-26 David Kilzer <[email protected]>
Build system prep work for upstreaming iOS changes
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-03-27 05:32:16 UTC (rev 112207)
@@ -1752,7 +1752,13 @@
push(@implContent, " goto fail;\n");
}
- my $DOMObject = GetDomWrapperMapName($dataNode, $implClassName);
+ my $DOMObject = "DOMObject";
+ if (IsNodeSubType($dataNode)) {
+ $DOMObject = "DOMNode";
+ } elsif ($dataNode->extendedAttributes->{"ActiveDOMObject"}) {
+ $DOMObject = "ActiveDOMObject";
+ }
+
push(@implContent, <<END);
V8DOMWrapper::setDOMWrapper(wrapper, &info, impl.get());
@@ -1926,7 +1932,14 @@
push(@implContent, " goto fail;\n");
}
- my $DOMObject = GetDomWrapperMapName($dataNode, $implClassName);
+ my $DOMObject = "DOMObject";
+ # A DOMObject that is an ActiveDOMObject and also a DOMNode should be treated as an DOMNode here.
+ # setJSWrapperForDOMNode() will look if node is active and choose correct map to add node to.
+ if (IsNodeSubType($dataNode)) {
+ $DOMObject = "DOMNode";
+ } elsif ($dataNode->extendedAttributes->{"ActiveDOMObject"}) {
+ $DOMObject = "ActiveDOMObject";
+ }
push(@implContent, <<END);
V8DOMWrapper::setDOMWrapper(wrapper, &V8${implClassName}Constructor::info, impl.get());
@@ -3080,7 +3093,7 @@
my $className = shift;
my $nativeType = shift;
- my $domMapName = GetDomWrapperMapName($dataNode, $interfaceName);
+ my $domMapFunction = GetDomMapFunction($dataNode, $interfaceName);
my $forceNewObjectInput = IsDOMNodeType($interfaceName) ? ", bool forceNewObject" : "";
my $forceNewObjectCall = IsDOMNodeType($interfaceName) ? ", forceNewObject" : "";
my $wrapSlowArgumentType = GetPassRefPtrType($nativeType);
@@ -3167,7 +3180,7 @@
END
}
push(@implContent, <<END);
- V8DOMWrapper::setJSWrapperFor${domMapName}(impl, wrapperHandle);
+ ${domMapFunction}.set(impl.leakRef(), wrapperHandle);
return wrapper;
}
END
@@ -3175,19 +3188,13 @@
sub GetDomMapFunction
{
- my $mapName = GetDomWrapperMapName(@_);
- return "get${mapName}Map()";
-}
-
-sub GetDomWrapperMapName
-{
my $dataNode = shift;
my $type = shift;
- return "DOMSVGElementInstance" if $type eq "SVGElementInstance";
- return "ActiveDOMNode" if (IsNodeSubType($dataNode) && $dataNode->extendedAttributes->{"ActiveDOMObject"});
- return "DOMNode" if (IsNodeSubType($dataNode));
- return "ActiveDOMObject" if $dataNode->extendedAttributes->{"ActiveDOMObject"};
- return "DOMObject";
+ return "getDOMSVGElementInstanceMap()" if $type eq "SVGElementInstance";
+ return "getActiveDOMNodeMap()" if (IsNodeSubType($dataNode) && $dataNode->extendedAttributes->{"ActiveDOMObject"});
+ return "getDOMNodeMap()" if (IsNodeSubType($dataNode));
+ return "getActiveDOMObjectMap()" if $dataNode->extendedAttributes->{"ActiveDOMObject"};
+ return "getDOMObjectMap()";
}
sub GetNativeTypeForConversions
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -132,7 +132,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -186,7 +186,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -122,7 +122,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -157,7 +157,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -185,7 +185,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -317,7 +317,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForActiveDOMObject(impl, wrapperHandle);
+ getActiveDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -122,7 +122,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -166,7 +166,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForActiveDOMObject(impl, wrapperHandle);
+ getActiveDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -2172,7 +2172,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -288,7 +288,7 @@
if (!hasDependentLifetime)
wrapperHandle.MarkIndependent();
- V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);
+ getDOMObjectMap().set(impl.leakRef(), wrapperHandle);
return wrapper;
}
Modified: trunk/Source/WebCore/bindings/v8/V8DOMWrapper.cpp (112206 => 112207)
--- trunk/Source/WebCore/bindings/v8/V8DOMWrapper.cpp 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWrapper.cpp 2012-03-27 05:32:16 UTC (rev 112207)
@@ -66,6 +66,15 @@
namespace WebCore {
+void V8DOMWrapper::setJSWrapperForDOMNode(PassRefPtr<Node> node, v8::Persistent<v8::Object> wrapper)
+{
+ ASSERT(maybeDOMWrapper(wrapper));
+ if (node->isActiveNode())
+ getActiveDOMNodeMap().set(node.leakRef(), wrapper);
+ else
+ getDOMNodeMap().set(node.leakRef(), wrapper);
+}
+
v8::Local<v8::Function> V8DOMWrapper::getConstructor(WrapperTypeInfo* type, v8::Handle<v8::Value> objectPrototype)
{
// A DOM constructor is a function instance created from a DOM constructor
Modified: trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h (112206 => 112207)
--- trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h 2012-03-27 05:09:25 UTC (rev 112206)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h 2012-03-27 05:32:16 UTC (rev 112207)
@@ -54,7 +54,7 @@
class DOMWindow;
class EventTarget;
class Frame;
- class SVGElementInstance;
+ class Node;
class V8Proxy;
class WorkerContext;
@@ -110,10 +110,6 @@
template<typename T> static void setJSWrapperForDOMObject(PassRefPtr<T>, v8::Persistent<v8::Object>);
template<typename T> static void setJSWrapperForActiveDOMObject(PassRefPtr<T>, v8::Persistent<v8::Object>);
static void setJSWrapperForDOMNode(PassRefPtr<Node>, v8::Persistent<v8::Object>);
- static void setJSWrapperForActiveDOMNode(PassRefPtr<Node>, v8::Persistent<v8::Object>);
-#if ENABLE(SVG)
- static void setJSWrapperForDOMSVGElementInstance(PassRefPtr<SVGElementInstance>, v8::Persistent<v8::Object>);
-#endif
static bool isValidDOMObject(v8::Handle<v8::Value>);
@@ -154,7 +150,7 @@
};
template<typename T>
- inline void V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper)
+ void V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper)
{
ASSERT(maybeDOMWrapper(wrapper));
ASSERT(!domWrapperType(wrapper)->toActiveDOMObjectFunction);
@@ -162,37 +158,12 @@
}
template<typename T>
- inline void V8DOMWrapper::setJSWrapperForActiveDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper)
+ void V8DOMWrapper::setJSWrapperForActiveDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper)
{
ASSERT(maybeDOMWrapper(wrapper));
ASSERT(domWrapperType(wrapper)->toActiveDOMObjectFunction);
getActiveDOMObjectMap().set(object.leakRef(), wrapper);
}
-
- inline void V8DOMWrapper::setJSWrapperForDOMNode(PassRefPtr<Node> node, v8::Persistent<v8::Object> wrapper)
- {
- ASSERT(maybeDOMWrapper(wrapper));
- ASSERT(!domWrapperType(wrapper)->toActiveDOMObjectFunction);
- ASSERT(!node->isActiveNode());
- getDOMNodeMap().set(node.leakRef(), wrapper);
- }
-
- inline void V8DOMWrapper::setJSWrapperForActiveDOMNode(PassRefPtr<Node> node, v8::Persistent<v8::Object> wrapper)
- {
- ASSERT(maybeDOMWrapper(wrapper));
- ASSERT(domWrapperType(wrapper)->toActiveDOMObjectFunction);
- ASSERT(node->isActiveNode());
- getActiveDOMNodeMap().set(node.leakRef(), wrapper);
- }
-
-#if ENABLE(SVG)
- inline void V8DOMWrapper::setJSWrapperForDOMSVGElementInstance(PassRefPtr<SVGElementInstance> element, v8::Persistent<v8::Object> wrapper)
- {
- ASSERT(maybeDOMWrapper(wrapper));
- getDOMSVGElementInstanceMap().set(element.leakRef(), wrapper);
- }
-#endif
-
} // namespace WebCore
#endif // V8DOMWrapper_h
