Changeset 19013 in webkit

Timestamp:

Jan 21, 2007 12:51:34 PM (17 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Darin.

Test for: <rdar://problem/4928583> Memory usage grows when reloading google.com/ig

• fast/dom/gc-10-expected.txt: Added.
• fast/dom/gc-10.html: Added.
• fast/dom/resources/gc-10-frame.html: Added.

WebCore:

Reviewed by Darin.

Fix for: <rdar://problem/4928583> Memory usage grows when reloading google.com/ig

JSDocuments are now responsible for marking the DOM wrappers associated with them, when they get marked.
This fixes a JS object leak when a DOM wrapper has a reference to a JSDocument that is otherwise not reachable.

Test: fast/dom/gc-10.html

• WebCore.vcproj/WebCore/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSDocumentCustom.cpp: Added. (WebCore::JSDocument::mark):
• bindings/js/kjs_binding.cpp: (KJS::ScriptInterpreter::markDOMNodesForDocument): (KJS::ScriptInterpreter::mark):
• bindings/js/kjs_binding.h:
• dom/Document.idl:

WebKitTools:

Reviewed by Darin.

Test support for: <rdar://problem/4928583> Memory usage grows when reloading google.com/ig

This adds a getJSObjectCount test-accessible function to allow test scripts to track JSObject usage.

• DumpRenderTree/GCController.h:
• DumpRenderTree/GCController.mm: (+[GCController isSelectorExcludedFromWebScript:]): (-[GCController getJSObjectCount]):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/gc-10-expected.txt (added)
• LayoutTests/fast/dom/gc-10.html (added)
• LayoutTests/fast/dom/resources/gc-10-frame.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.vcproj/WebCore/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/bindings/js/JSDocumentCustom.cpp (added)
• WebCore/bindings/js/kjs_binding.cpp (modified) (2 diffs)
• WebCore/bindings/js/kjs_binding.h (modified) (1 diff)
• WebCore/dom/Document.idl (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/GCController.h (modified) (1 diff)
• WebKitTools/DumpRenderTree/GCController.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-21  Sanjay Madhav  <sanjay12@gmail.com>
+
+        Reviewed by Darin.
+
+        Test for: <rdar://problem/4928583> Memory usage grows when reloading google.com/ig
+
+        * fast/dom/gc-10-expected.txt: Added.
+        * fast/dom/gc-10.html: Added.
+        * fast/dom/resources/gc-10-frame.html: Added.
+
 2007-01-21  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-21  Sanjay Madhav  <sanjay12@gmail.com>
+
+        Reviewed by Darin.
+
+        Fix for: <rdar://problem/4928583> Memory usage grows when reloading google.com/ig
+
+        JSDocuments are now responsible for marking the DOM wrappers associated with them, when they get marked.
+        This fixes a JS object leak when a DOM wrapper has a reference to a JSDocument that is otherwise not reachable.
+
+        Test: fast/dom/gc-10.html
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSDocumentCustom.cpp: Added.
+        (WebCore::JSDocument::mark):
+        * bindings/js/kjs_binding.cpp:
+        (KJS::ScriptInterpreter::markDOMNodesForDocument):
+        (KJS::ScriptInterpreter::mark):
+        * bindings/js/kjs_binding.h:
+        * dom/Document.idl:
+
 2007-01-21  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj

@@ -5423 +5423 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\bindings\js\JSDocumentCustom.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\bindings\js\JSHTMLElementWrapperFactory.cpp"
                                         >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1347 +1347 @@
                 85FF315A0AAFBFCB00374F38 /* DOMKeyboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85FF31580AAFBFCB00374F38 /* DOMKeyboardEvent.h */; };
                 85FF315B0AAFBFCB00374F38 /* DOMKeyboardEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85FF31590AAFBFCB00374F38 /* DOMKeyboardEvent.mm */; };
+                929264770B61FC7200B41D34 /* JSDocumentCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 929264760B61FC7200B41D34 /* JSDocumentCustom.cpp */; };
                 9305B24D098F1B6B00C28855 /* Timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9305B24C098F1B6B00C28855 /* Timer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9307056C09E0AF8F00B17FE4 /* csshelper.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4786097CAAC80094C9E4 /* csshelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -4370 +4371 @@
                 85FF31580AAFBFCB00374F38 /* DOMKeyboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMKeyboardEvent.h; sourceTree = "<group>"; };
                 85FF31590AAFBFCB00374F38 /* DOMKeyboardEvent.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMKeyboardEvent.mm; sourceTree = "<group>"; };
+                929264760B61FC7200B41D34 /* JSDocumentCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDocumentCustom.cpp; sourceTree = "<group>"; };
                 9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timer.h; sourceTree = "<group>"; };
                 9307059009E0C75800B17FE4 /* CSSPrimitiveValue.idl */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 4; path = CSSPrimitiveValue.idl; sourceTree = "<group>"; };
@@ -8781 +8783 @@
                                 93F8B3060A300FEA00F61AB8 /* CodeGeneratorJS.pm */,
                                 1A9EF4560A1B957D00332B63 /* JSCanvasRenderingContext2DCustom.cpp */,
+                                929264760B61FC7200B41D34 /* JSDocumentCustom.cpp */,
                                 938E65F609F0985D008A48EC /* JSHTMLElementWrapperFactory.cpp */,
                                 938E65F009F09840008A48EC /* JSHTMLElementWrapperFactory.h */,
@@ -12344 +12347 @@
                                 1A2A68230B5BEDE70002A480 /* ProgressTracker.cpp in Sources */,
                                 A80CEBAD0B60FC49007637C1 /* SVGMPathElement.cpp in Sources */,
+                                929264770B61FC7200B41D34 /* JSDocumentCustom.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/bindings/js/kjs_binding.cpp

@@ -198 +198 @@
 }
 
-void ScriptInterpreter::mark(bool currentThreadIsMainThread)
-{
-    NodePerDocMap::iterator dictEnd = domNodesPerDocument().end();
-    for (NodePerDocMap::iterator dictIt = domNodesPerDocument().begin(); dictIt != dictEnd; ++dictIt) {
+void ScriptInterpreter::markDOMNodesForDocument(Document* doc)
+{
+    NodePerDocMap::iterator dictIt = domNodesPerDocument().find(doc);
+    if (dictIt != domNodesPerDocument().end()) {
         NodeMap* nodeDict = dictIt->second;
         NodeMap::iterator nodeEnd = nodeDict->end();
@@ -213 +213 @@
         }
     }
-
+}
+
+void ScriptInterpreter::mark(bool currentThreadIsMainThread)
+{
     if (!currentThreadIsMainThread) {
         // On alternate threads, DOMObjects remain in the cache because they're not collected.

trunk/WebCore/bindings/js/kjs_binding.h

@@ -77 +77 @@
         static void forgetAllDOMNodesForDocument(WebCore::Document*);
         static void updateDOMNodeDocument(WebCore::Node*, WebCore::Document* oldDoc, WebCore::Document* newDoc);
+        static void markDOMNodesForDocument(WebCore::Document*);
 
         WebCore::Frame* frame() const { return m_frame; }

trunk/WebCore/dom/Document.idl

@@ -21 +21 @@
 module core {
 
-    interface [LegacyParent=KJS::DOMEventTargetNode, GenerateConstructor] Document : EventTargetNode {
+    interface [LegacyParent=KJS::DOMEventTargetNode, GenerateConstructor, CustomMarkFunction] Document : EventTargetNode {
 
         // DOM Level 1 Core

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-01-21  Sanjay Madhav  <sanjay12@gmail.com>
+
+        Reviewed by Darin.
+
+        Test support for: <rdar://problem/4928583> Memory usage grows when reloading google.com/ig
+
+        This adds a getJSObjectCount test-accessible function to allow test scripts to track JSObject usage.
+
+        * DumpRenderTree/GCController.h:
+        * DumpRenderTree/GCController.mm:
+        (+[GCController isSelectorExcludedFromWebScript:]):
+        (-[GCController getJSObjectCount]):
+
 2007-01-20  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/DumpRenderTree/GCController.h

@@ -35 +35 @@
 - (void)collect;
 - (void)collectOnAlternateThread:(BOOL)waitUntilDone;
+- (size_t)getJSObjectCount;
 @end

trunk/WebKitTools/DumpRenderTree/GCController.mm

@@ -38 +38 @@
     if (aSelector == @selector(collectOnAlternateThread:))
         return NO;
+    if (aSelector == @selector(getJSObjectCount))
+        return NO;
+    
     return YES;
 }
@@ -58 +61 @@
     [WebCoreStatistics garbageCollectJavaScriptObjectsOnAlternateThread:waitUntilDone];
 }
+
+- (size_t)getJSObjectCount
+{
+    return [WebCoreStatistics javaScriptObjectsCount];
+}
 @end