Changeset 112207 in webkit
- Timestamp:
- Mar 26, 2012 10:32:16 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r112203 r112207 1 2012-03-26 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r112199. 4 http://trac.webkit.org/changeset/112199 5 https://bugs.webkit.org/show_bug.cgi?id=82295 6 7 Breaks Chromium Win compilation (Requested by pfeldman on 8 #webkit). 9 10 * bindings/scripts/CodeGeneratorV8.pm: 11 (GenerateConstructorCallback): 12 (GenerateNamedConstructorCallback): 13 (GenerateToV8Converters): 14 (GetDomMapFunction): 15 * bindings/scripts/test/V8/V8Float64Array.cpp: 16 (WebCore::V8Float64Array::wrapSlow): 17 * bindings/scripts/test/V8/V8TestActiveDOMObject.cpp: 18 (WebCore::V8TestActiveDOMObject::wrapSlow): 19 * bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp: 20 (WebCore::V8TestCustomNamedGetter::wrapSlow): 21 * bindings/scripts/test/V8/V8TestEventConstructor.cpp: 22 (WebCore::V8TestEventConstructor::wrapSlow): 23 * bindings/scripts/test/V8/V8TestEventTarget.cpp: 24 (WebCore::V8TestEventTarget::wrapSlow): 25 * bindings/scripts/test/V8/V8TestInterface.cpp: 26 (WebCore::V8TestInterface::wrapSlow): 27 * bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp: 28 (WebCore::V8TestMediaQueryListListener::wrapSlow): 29 * bindings/scripts/test/V8/V8TestNamedConstructor.cpp: 30 (WebCore::V8TestNamedConstructor::wrapSlow): 31 * bindings/scripts/test/V8/V8TestObj.cpp: 32 (WebCore::V8TestObj::wrapSlow): 33 * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp: 34 (WebCore::V8TestSerializedScriptValueInterface::wrapSlow): 35 * bindings/v8/V8DOMWrapper.cpp: 36 (WebCore::V8DOMWrapper::setJSWrapperForDOMNode): 37 (WebCore): 38 * bindings/v8/V8DOMWrapper.h: 39 (WebCore): 40 (V8DOMWrapper): 41 (WebCore::V8DOMWrapper::setJSWrapperForDOMObject): 42 (WebCore::V8DOMWrapper::setJSWrapperForActiveDOMObject): 43 1 44 2012-03-26 David Kilzer <ddkilzer@apple.com> 2 45 -
trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
r112199 r112207 1753 1753 } 1754 1754 1755 my $DOMObject = GetDomWrapperMapName($dataNode, $implClassName); 1755 my $DOMObject = "DOMObject"; 1756 if (IsNodeSubType($dataNode)) { 1757 $DOMObject = "DOMNode"; 1758 } elsif ($dataNode->extendedAttributes->{"ActiveDOMObject"}) { 1759 $DOMObject = "ActiveDOMObject"; 1760 } 1761 1756 1762 push(@implContent, <<END); 1757 1763 … … 1927 1933 } 1928 1934 1929 my $DOMObject = GetDomWrapperMapName($dataNode, $implClassName); 1935 my $DOMObject = "DOMObject"; 1936 # A DOMObject that is an ActiveDOMObject and also a DOMNode should be treated as an DOMNode here. 1937 # setJSWrapperForDOMNode() will look if node is active and choose correct map to add node to. 1938 if (IsNodeSubType($dataNode)) { 1939 $DOMObject = "DOMNode"; 1940 } elsif ($dataNode->extendedAttributes->{"ActiveDOMObject"}) { 1941 $DOMObject = "ActiveDOMObject"; 1942 } 1930 1943 push(@implContent, <<END); 1931 1944 … … 3081 3094 my $nativeType = shift; 3082 3095 3083 my $domMap Name = GetDomWrapperMapName($dataNode, $interfaceName);3096 my $domMapFunction = GetDomMapFunction($dataNode, $interfaceName); 3084 3097 my $forceNewObjectInput = IsDOMNodeType($interfaceName) ? ", bool forceNewObject" : ""; 3085 3098 my $forceNewObjectCall = IsDOMNodeType($interfaceName) ? ", forceNewObject" : ""; … … 3168 3181 } 3169 3182 push(@implContent, <<END); 3170 V8DOMWrapper::setJSWrapperFor${domMapName}(impl, wrapperHandle);3183 ${domMapFunction}.set(impl.leakRef(), wrapperHandle); 3171 3184 return wrapper; 3172 3185 } … … 3175 3188 3176 3189 sub GetDomMapFunction 3177 {3178 my $mapName = GetDomWrapperMapName(@_);3179 return "get${mapName}Map()";3180 }3181 3182 sub GetDomWrapperMapName3183 3190 { 3184 3191 my $dataNode = shift; 3185 3192 my $type = shift; 3186 return " DOMSVGElementInstance" if $type eq "SVGElementInstance";3187 return " ActiveDOMNode" if (IsNodeSubType($dataNode) && $dataNode->extendedAttributes->{"ActiveDOMObject"});3188 return " DOMNode" if (IsNodeSubType($dataNode));3189 return " ActiveDOMObject" if $dataNode->extendedAttributes->{"ActiveDOMObject"};3190 return " DOMObject";3193 return "getDOMSVGElementInstanceMap()" if $type eq "SVGElementInstance"; 3194 return "getActiveDOMNodeMap()" if (IsNodeSubType($dataNode) && $dataNode->extendedAttributes->{"ActiveDOMObject"}); 3195 return "getDOMNodeMap()" if (IsNodeSubType($dataNode)); 3196 return "getActiveDOMObjectMap()" if $dataNode->extendedAttributes->{"ActiveDOMObject"}; 3197 return "getDOMObjectMap()"; 3191 3198 } 3192 3199 -
trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp
r112199 r112207 133 133 if (!hasDependentLifetime) 134 134 wrapperHandle.MarkIndependent(); 135 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);135 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 136 136 return wrapper; 137 137 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp
r112199 r112207 187 187 if (!hasDependentLifetime) 188 188 wrapperHandle.MarkIndependent(); 189 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);189 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 190 190 return wrapper; 191 191 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp
r112199 r112207 123 123 if (!hasDependentLifetime) 124 124 wrapperHandle.MarkIndependent(); 125 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);125 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 126 126 return wrapper; 127 127 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp
r112199 r112207 158 158 if (!hasDependentLifetime) 159 159 wrapperHandle.MarkIndependent(); 160 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);160 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 161 161 return wrapper; 162 162 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp
r112199 r112207 186 186 if (!hasDependentLifetime) 187 187 wrapperHandle.MarkIndependent(); 188 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);188 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 189 189 return wrapper; 190 190 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp
r112199 r112207 318 318 if (!hasDependentLifetime) 319 319 wrapperHandle.MarkIndependent(); 320 V8DOMWrapper::setJSWrapperForActiveDOMObject(impl, wrapperHandle);320 getActiveDOMObjectMap().set(impl.leakRef(), wrapperHandle); 321 321 return wrapper; 322 322 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp
r112199 r112207 123 123 if (!hasDependentLifetime) 124 124 wrapperHandle.MarkIndependent(); 125 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);125 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 126 126 return wrapper; 127 127 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp
r112199 r112207 167 167 if (!hasDependentLifetime) 168 168 wrapperHandle.MarkIndependent(); 169 V8DOMWrapper::setJSWrapperForActiveDOMObject(impl, wrapperHandle);169 getActiveDOMObjectMap().set(impl.leakRef(), wrapperHandle); 170 170 return wrapper; 171 171 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
r112199 r112207 2173 2173 if (!hasDependentLifetime) 2174 2174 wrapperHandle.MarkIndependent(); 2175 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);2175 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 2176 2176 return wrapper; 2177 2177 } -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp
r112199 r112207 289 289 if (!hasDependentLifetime) 290 290 wrapperHandle.MarkIndependent(); 291 V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapperHandle);291 getDOMObjectMap().set(impl.leakRef(), wrapperHandle); 292 292 return wrapper; 293 293 } -
trunk/Source/WebCore/bindings/v8/V8DOMWrapper.cpp
r112199 r112207 67 67 namespace WebCore { 68 68 69 void V8DOMWrapper::setJSWrapperForDOMNode(PassRefPtr<Node> node, v8::Persistent<v8::Object> wrapper) 70 { 71 ASSERT(maybeDOMWrapper(wrapper)); 72 if (node->isActiveNode()) 73 getActiveDOMNodeMap().set(node.leakRef(), wrapper); 74 else 75 getDOMNodeMap().set(node.leakRef(), wrapper); 76 } 77 69 78 v8::Local<v8::Function> V8DOMWrapper::getConstructor(WrapperTypeInfo* type, v8::Handle<v8::Value> objectPrototype) 70 79 { -
trunk/Source/WebCore/bindings/v8/V8DOMWrapper.h
r112199 r112207 55 55 class EventTarget; 56 56 class Frame; 57 class SVGElementInstance;57 class Node; 58 58 class V8Proxy; 59 59 class WorkerContext; … … 111 111 template<typename T> static void setJSWrapperForActiveDOMObject(PassRefPtr<T>, v8::Persistent<v8::Object>); 112 112 static void setJSWrapperForDOMNode(PassRefPtr<Node>, v8::Persistent<v8::Object>); 113 static void setJSWrapperForActiveDOMNode(PassRefPtr<Node>, v8::Persistent<v8::Object>);114 #if ENABLE(SVG)115 static void setJSWrapperForDOMSVGElementInstance(PassRefPtr<SVGElementInstance>, v8::Persistent<v8::Object>);116 #endif117 113 118 114 static bool isValidDOMObject(v8::Handle<v8::Value>); … … 155 151 156 152 template<typename T> 157 inlinevoid V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper)153 void V8DOMWrapper::setJSWrapperForDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper) 158 154 { 159 155 ASSERT(maybeDOMWrapper(wrapper)); … … 163 159 164 160 template<typename T> 165 inlinevoid V8DOMWrapper::setJSWrapperForActiveDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper)161 void V8DOMWrapper::setJSWrapperForActiveDOMObject(PassRefPtr<T> object, v8::Persistent<v8::Object> wrapper) 166 162 { 167 163 ASSERT(maybeDOMWrapper(wrapper)); … … 169 165 getActiveDOMObjectMap().set(object.leakRef(), wrapper); 170 166 } 171 172 inline void V8DOMWrapper::setJSWrapperForDOMNode(PassRefPtr<Node> node, v8::Persistent<v8::Object> wrapper)173 {174 ASSERT(maybeDOMWrapper(wrapper));175 ASSERT(!domWrapperType(wrapper)->toActiveDOMObjectFunction);176 ASSERT(!node->isActiveNode());177 getDOMNodeMap().set(node.leakRef(), wrapper);178 }179 180 inline void V8DOMWrapper::setJSWrapperForActiveDOMNode(PassRefPtr<Node> node, v8::Persistent<v8::Object> wrapper)181 {182 ASSERT(maybeDOMWrapper(wrapper));183 ASSERT(domWrapperType(wrapper)->toActiveDOMObjectFunction);184 ASSERT(node->isActiveNode());185 getActiveDOMNodeMap().set(node.leakRef(), wrapper);186 }187 188 #if ENABLE(SVG)189 inline void V8DOMWrapper::setJSWrapperForDOMSVGElementInstance(PassRefPtr<SVGElementInstance> element, v8::Persistent<v8::Object> wrapper)190 {191 ASSERT(maybeDOMWrapper(wrapper));192 getDOMSVGElementInstanceMap().set(element.leakRef(), wrapper);193 }194 #endif195 196 167 } // namespace WebCore 197 168
Note: See TracChangeset
for help on using the changeset viewer.