Changeset 86234 in webkit
- Timestamp:
- May 11, 2011 8:24:32 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 9 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r86233 r86234 1 2011-05-11 Julien Chaffraix <jchaffraix@webkit.org> 2 3 Reviewed by Geoffrey Garen. 4 5 Tests for: XPathResult should keep its node set's JS wrappers alive 6 https://bugs.webkit.org/show_bug.cgi?id=34231 7 8 * fast/xpath/xpath-result-eventlistener-crash-expected.txt: Added. 9 * fast/xpath/xpath-result-eventlistener-crash.html: Added. 10 Test that an event listener registered on an XPATH result snapshots' node does 11 not crash. This case was already fixed prior to this change. However it is better 12 to keep it as a regression test. 13 14 * fast/xpath/xpath-snapshot-result-should-mark-its-nodeset-expected.txt: Added. 15 * fast/xpath/xpath-snapshot-result-should-mark-its-nodeset.html: Added. 16 Test that an XPath snapshot result keeps its node wrapper alive. 17 18 * fast/xpath/xpath-iterator-result-should-mark-its-nodeset-expected.txt: Added. 19 * fast/xpath/xpath-iterator-result-should-mark-its-nodeset.html: Added. 20 Test that an XPath iterator result keeps its node wrapper alive. 21 22 * fast/xpath/xpath-other-nodeset-result-should-mark-its-nodeset-expected.txt: Added. 23 * fast/xpath/xpath-other-nodeset-result-should-mark-its-nodeset.html: Added. 24 Test that other XPath result that holds nodes keeps their wrapper alive. 25 1 26 2011-05-11 Jessie Berlin <jberlin@apple.com> 2 27 -
trunk/Source/WebCore/ChangeLog
r86232 r86234 1 2011-05-11 Julien Chaffraix <jchaffraix@webkit.org> 2 3 Reviewed by Geoffrey Garen. 4 5 XPathResult should keep its node set's JS wrappers alive 6 https://bugs.webkit.org/show_bug.cgi?id=34231 7 8 The change added a custom mark function for JSC. V8 was already properly 9 marking the nodes so no change were done on the V8 side. 10 11 Tests: fast/xpath/xpath-iterator-result-should-mark-its-nodeset.html 12 fast/xpath/xpath-other-nodeset-result-should-mark-its-nodeset.html 13 fast/xpath/xpath-result-eventlistener-crash.html 14 fast/xpath/xpath-snapshot-result-should-mark-its-nodeset.html 15 16 * Android.jscbindings.mk: 17 * GNUmakefile.list.am: 18 * UseJSC.cmake: 19 * WebCore.gypi: 20 * WebCore.pro: 21 * WebCore.vcproj/WebCore.vcproj: 22 * WebCore.xcodeproj/project.pbxproj: 23 * bindings/js/JSBindingsAllInOne.cpp: 24 Added the new file to our build systems. 25 26 * bindings/js/JSXPathResultCustom.cpp: Added. 27 (WebCore::JSXPathResult::markChildren): Added code to mark the 28 XPathResult snapshot's nodes. 29 * xml/XPathResult.h: 30 (WebCore::XPathResult::value): Exposed this getter so that we can 31 mark our XPathValue. 32 * xml/XPathResult.idl: Told the IDL parser that we now need 33 a custom mark function. 34 1 35 2011-05-04 Philippe Normand <pnormand@igalia.com> 2 36 -
trunk/Source/WebCore/GNUmakefile.list.am
r86197 r86234 799 799 Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp \ 800 800 Source/WebCore/bindings/js/JSXMLHttpRequestUploadCustom.cpp \ 801 Source/WebCore/bindings/js/JSXPathResultCustom.cpp \ 801 802 Source/WebCore/bindings/js/JSXSLTProcessorCustom.cpp \ 802 803 Source/WebCore/bindings/js/JavaScriptCallFrame.cpp \ -
trunk/Source/WebCore/UseJSC.cmake
r84991 r86234 140 140 bindings/js/JSXMLHttpRequestUploadCustom.cpp 141 141 bindings/js/JSXSLTProcessorCustom.cpp 142 bindings/js/JSXPathResultCustom.cpp 142 143 bindings/js/JavaScriptCallFrame.cpp 143 144 bindings/js/PageScriptDebugServer.cpp -
trunk/Source/WebCore/WebCore.gypi
r86197 r86234 1870 1870 'bindings/js/JSXMLHttpRequestCustom.cpp', 1871 1871 'bindings/js/JSXMLHttpRequestUploadCustom.cpp', 1872 'bindings/js/JSXPathResultCustom.cpp', 1872 1873 'bindings/js/JSXSLTProcessorCustom.cpp', 1873 1874 'bindings/js/JavaScriptCallFrame.cpp', -
trunk/Source/WebCore/WebCore.pro
r86197 r86234 344 344 bindings/js/JSXMLHttpRequestCustom.cpp \ 345 345 bindings/js/JSXMLHttpRequestUploadCustom.cpp \ 346 bindings/js/JSXPathResultCustom.cpp \ 346 347 bindings/js/PageScriptDebugServer.cpp \ 347 348 bindings/js/ScheduledAction.cpp \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r86197 r86234 62922 62922 </File> 62923 62923 <File 62924 RelativePath="..\bindings\js\JSXPathResultCustom.cpp" 62925 > 62926 <FileConfiguration 62927 Name="Debug|Win32" 62928 ExcludedFromBuild="true" 62929 > 62930 <Tool 62931 Name="VCCLCompilerTool" 62932 /> 62933 </FileConfiguration> 62934 <FileConfiguration 62935 Name="Release|Win32" 62936 ExcludedFromBuild="true" 62937 > 62938 <Tool 62939 Name="VCCLCompilerTool" 62940 /> 62941 </FileConfiguration> 62942 <FileConfiguration 62943 Name="Debug_Cairo_CFLite|Win32" 62944 ExcludedFromBuild="true" 62945 > 62946 <Tool 62947 Name="VCCLCompilerTool" 62948 /> 62949 </FileConfiguration> 62950 <FileConfiguration 62951 Name="Release_Cairo_CFLite|Win32" 62952 ExcludedFromBuild="true" 62953 > 62954 <Tool 62955 Name="VCCLCompilerTool" 62956 /> 62957 </FileConfiguration> 62958 <FileConfiguration 62959 Name="Debug_All|Win32" 62960 ExcludedFromBuild="true" 62961 > 62962 <Tool 62963 Name="VCCLCompilerTool" 62964 /> 62965 </FileConfiguration> 62966 <FileConfiguration 62967 Name="Production|Win32" 62968 ExcludedFromBuild="true" 62969 > 62970 <Tool 62971 Name="VCCLCompilerTool" 62972 /> 62973 </FileConfiguration> 62974 </File> 62975 <File 62924 62976 RelativePath="..\bindings\js\JSXSLTProcessorCustom.cpp" 62925 62977 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r86197 r86234 3141 3141 A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; }; 3142 3142 A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; }; 3143 A1C7FAA2133A5D3500D6732D /* JSXPathResultCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1C7FAA1133A5D3500D6732D /* JSXPathResultCustom.cpp */; }; 3143 3144 A1E1154413015C3D0054AC8C /* DistantLightSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1154313015C3D0054AC8C /* DistantLightSource.cpp */; }; 3144 3145 A1E1154613015C4E0054AC8C /* PointLightSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1E1154513015C4E0054AC8C /* PointLightSource.cpp */; }; … … 9638 9639 A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; }; 9639 9640 A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; }; 9641 A1C7FAA1133A5D3500D6732D /* JSXPathResultCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXPathResultCustom.cpp; sourceTree = "<group>"; }; 9640 9642 A1E1154313015C3D0054AC8C /* DistantLightSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DistantLightSource.cpp; path = filters/DistantLightSource.cpp; sourceTree = "<group>"; }; 9641 9643 A1E1154513015C4E0054AC8C /* PointLightSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PointLightSource.cpp; path = filters/PointLightSource.cpp; sourceTree = "<group>"; }; … … 18033 18035 isa = PBXGroup; 18034 18036 children = ( 18037 A1C7FAA1133A5D3500D6732D /* JSXPathResultCustom.cpp */, 18035 18038 BC275CB211C5E85C00C9206C /* JSArrayBufferCustom.cpp */, 18036 18039 86243D0011BC31F700CC006A /* JSArrayBufferViewHelper.h */, … … 24620 24623 1A762C770A074F2600989F5B /* JSXPathNSResolver.cpp in Sources */, 24621 24624 1A762C790A074F2600989F5B /* JSXPathResult.cpp in Sources */, 24625 A1C7FAA2133A5D3500D6732D /* JSXPathResultCustom.cpp in Sources */, 24622 24626 BCEFE1EA0DCA5F6400739219 /* JSXSLTProcessor.cpp in Sources */, 24623 24627 BCEFE1E50DCA5F3300739219 /* JSXSLTProcessorCustom.cpp in Sources */, -
trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
r84991 r86234 157 157 #include "JSXMLHttpRequestCustom.cpp" 158 158 #include "JSXMLHttpRequestUploadCustom.cpp" 159 #include "JSXPathResultCustom.cpp" 159 160 #include "JSXSLTProcessorCustom.cpp" 160 161 #include "JavaScriptCallFrame.cpp" -
trunk/Source/WebCore/xml/XPathResult.h
r80797 r86234 73 73 Node* snapshotItem(unsigned long index, ExceptionCode&); 74 74 75 const XPath::Value& value() const { return m_value; } 76 75 77 private: 76 78 XPathResult(Document*, const XPath::Value&); -
trunk/Source/WebCore/xml/XPathResult.idl
r52537 r86234 20 20 module xpath { 21 21 22 interface [Conditional=XPATH ] XPathResult {22 interface [Conditional=XPATH, CustomMarkFunction] XPathResult { 23 23 const unsigned short ANY_TYPE = 0; 24 24 const unsigned short NUMBER_TYPE = 1;
Note: See TracChangeset
for help on using the changeset viewer.