[webkit-changes] cvs commit: WebKit/WebView.subproj WebFrame.m
Adele
adele at opensource.apple.com
Wed Aug 3 14:49:42 PDT 2005
adele 05/08/03 14:49:42
Modified: . Tag: Safari-2-0-branch ChangeLog
WebView.subproj Tag: Safari-2-0-branch WebFrame.m
Log:
Merged fix from TOT. Also fixes:
<rdar://problem/4077814> Gradual slowing down of Safari eventually requiring Quit and relaunch
2005-07-26 Maciej Stachowiak <mjs at apple.com>
Reviewed by Dave Hyatt.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4153
* WebView.subproj/WebFrame.m:
(-[WebFrame _purgePageCache]): Find the oldest candidate for
purging that is not a snapback item.
Revision Changes Path
No revision
No revision
1.3118.4.31 +67 -51 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3118.4.30
retrieving revision 1.3118.4.31
diff -u -r1.3118.4.30 -r1.3118.4.31
--- ChangeLog 2 Aug 2005 22:50:22 -0000 1.3118.4.30
+++ ChangeLog 3 Aug 2005 21:49:37 -0000 1.3118.4.31
@@ -1,57 +1,73 @@
+2005-08-03 Adele Peterson <adele at apple.com>
+
+ Merged fix from TOT. Also fixes:
+ <rdar://problem/4077814> Gradual slowing down of Safari eventually requiring Quit and relaunch
+
+ 2005-07-26 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4153
+
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame _purgePageCache]): Find the oldest candidate for
+ purging that is not a snapback item.
+
2005-08-02 Geoffrey Garen <ggaren at apple.com>
+
Merged fix from TOT to Safari-2-0-branch
- mjs 05/07/29 20:00:34
-
- Changes by Michael Kahl, reviewed by me.
-
- Test cases added: No tests, this code only affects debugging.
-
- - fixed <rdar://problem/4164112> MASTER: JavaScript debugging support
-
- * WebCoreSupport.subproj/WebBridge.m:
- (-[WebBridge windowObjectCleared]):
- * WebCoreSupport.subproj/WebSubresourceLoader.m:
- * WebKit.xcodeproj/project.pbxproj:
- * WebView.subproj/WebDefaultScriptDebugDelegate.h: Added.
- * WebView.subproj/WebDefaultScriptDebugDelegate.m: Added.
- (+[WebDefaultScriptDebugDelegate sharedScriptDebugDelegate]):
- (-[WebDefaultScriptDebugDelegate webView:didParseSource:fromURL:sourceId:forWebFrame:]):
- (-[WebDefaultScriptDebugDelegate webView:didEnterCallFrame:sourceId:line:forWebFrame:]):
- (-[WebDefaultScriptDebugDelegate webView:willExecuteStatement:sourceId:line:forWebFrame:]):
- (-[WebDefaultScriptDebugDelegate webView:willLeaveCallFrame:sourceId:line:forWebFrame:]):
- * WebView.subproj/WebFrame.m:
- (-[WebFramePrivate dealloc]):
- (-[WebFrame _attachScriptDebugger]):
- * WebView.subproj/WebFramePrivate.h:
- * WebView.subproj/WebScriptDebugDelegate.h: Added.
- * WebView.subproj/WebScriptDebugDelegate.m: Added.
- (-[WebScriptDebugger initWithWebFrame:]):
- (-[WebScriptDebugger dealloc]):
- (-[WebScriptDebugger globalObject]):
- (-[WebScriptDebugger newWrapperForFrame:]):
- (-[WebScriptDebugger parsedSource:fromURL:sourceId:]):
- (-[WebScriptDebugger enteredFrame:sourceId:line:]):
- (-[WebScriptDebugger hitStatement:sourceId:line:]):
- (-[WebScriptDebugger leavingFrame:sourceId:line:]):
- (-[WebScriptCallFrame _initWithFrame:]):
- (-[WebScriptCallFrame dealloc]):
- (-[WebScriptCallFrame setUserInfo:]):
- (-[WebScriptCallFrame userInfo]):
- (-[WebScriptCallFrame caller]):
- (-[WebScriptCallFrame scopeChain]):
- (-[WebScriptCallFrame functionName]):
- (-[WebScriptCallFrame exception]):
- (-[WebScriptCallFrame evaluateWebScript:]):
- * WebView.subproj/WebScriptDebugDelegatePrivate.h: Added.
- * WebView.subproj/WebView.h:
- * WebView.subproj/WebView.m:
- (-[WebViewPrivate dealloc]):
- (-[WebView _scriptDebugDelegateForwarder]):
- (-[WebView setScriptDebugDelegate:]):
- (-[WebView scriptDebugDelegate]):
- * WebView.subproj/WebViewInternal.h:
- * WebView.subproj/WebViewPrivate.h:
+ mjs 05/07/29 20:00:34
+
+ Changes by Michael Kahl, reviewed by me.
+
+ Test cases added: No tests, this code only affects debugging.
+
+ - fixed <rdar://problem/4164112> MASTER: JavaScript debugging support
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge windowObjectCleared]):
+ * WebCoreSupport.subproj/WebSubresourceLoader.m:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebView.subproj/WebDefaultScriptDebugDelegate.h: Added.
+ * WebView.subproj/WebDefaultScriptDebugDelegate.m: Added.
+ (+[WebDefaultScriptDebugDelegate sharedScriptDebugDelegate]):
+ (-[WebDefaultScriptDebugDelegate webView:didParseSource:fromURL:sourceId:forWebFrame:]):
+ (-[WebDefaultScriptDebugDelegate webView:didEnterCallFrame:sourceId:line:forWebFrame:]):
+ (-[WebDefaultScriptDebugDelegate webView:willExecuteStatement:sourceId:line:forWebFrame:]):
+ (-[WebDefaultScriptDebugDelegate webView:willLeaveCallFrame:sourceId:line:forWebFrame:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFramePrivate dealloc]):
+ (-[WebFrame _attachScriptDebugger]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebScriptDebugDelegate.h: Added.
+ * WebView.subproj/WebScriptDebugDelegate.m: Added.
+ (-[WebScriptDebugger initWithWebFrame:]):
+ (-[WebScriptDebugger dealloc]):
+ (-[WebScriptDebugger globalObject]):
+ (-[WebScriptDebugger newWrapperForFrame:]):
+ (-[WebScriptDebugger parsedSource:fromURL:sourceId:]):
+ (-[WebScriptDebugger enteredFrame:sourceId:line:]):
+ (-[WebScriptDebugger hitStatement:sourceId:line:]):
+ (-[WebScriptDebugger leavingFrame:sourceId:line:]):
+ (-[WebScriptCallFrame _initWithFrame:]):
+ (-[WebScriptCallFrame dealloc]):
+ (-[WebScriptCallFrame setUserInfo:]):
+ (-[WebScriptCallFrame userInfo]):
+ (-[WebScriptCallFrame caller]):
+ (-[WebScriptCallFrame scopeChain]):
+ (-[WebScriptCallFrame functionName]):
+ (-[WebScriptCallFrame exception]):
+ (-[WebScriptCallFrame evaluateWebScript:]):
+ * WebView.subproj/WebScriptDebugDelegatePrivate.h: Added.
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ (-[WebViewPrivate dealloc]):
+ (-[WebView _scriptDebugDelegateForwarder]):
+ (-[WebView setScriptDebugDelegate:]):
+ (-[WebView scriptDebugDelegate]):
+ * WebView.subproj/WebViewInternal.h:
+ * WebView.subproj/WebViewPrivate.h:
2005-08-02 Adele Peterson <adele at apple.com>
No revision
No revision
1.223.8.8 +7 -7 WebKit/WebView.subproj/WebFrame.m
Index: WebFrame.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
retrieving revision 1.223.8.7
retrieving revision 1.223.8.8
diff -u -r1.223.8.7 -r1.223.8.8
--- WebFrame.m 2 Aug 2005 22:50:27 -0000 1.223.8.7
+++ WebFrame.m 3 Aug 2005 21:49:41 -0000 1.223.8.8
@@ -908,22 +908,22 @@
unsigned pagesCached = 0;
WebBackForwardList *backForwardList = [[self webView] backForwardList];
NSArray *backList = [backForwardList backListWithLimit: 999999];
- WebHistoryItem *oldestItem = nil;
+ WebHistoryItem *oldestNonSnapbackItem = nil;
unsigned i;
for (i = 0; i < [backList count]; i++){
WebHistoryItem *item = [backList objectAtIndex: i];
if ([item hasPageCache]){
- if (oldestItem == nil)
- oldestItem = item;
+ if (oldestNonSnapbackItem == nil && ![item alwaysAttemptToUsePageCache])
+ oldestNonSnapbackItem = item;
pagesCached++;
}
}
-
+
// Snapback items are never directly purged here.
- if (pagesCached >= sizeLimit && ![oldestItem alwaysAttemptToUsePageCache]){
- LOG(PageCache, "Purging back/forward cache, %@\n", [oldestItem URL]);
- [oldestItem setHasPageCache: NO];
+ if (pagesCached >= sizeLimit) {
+ LOG(PageCache, "Purging back/forward cache, %@\n", [oldestNonSnapbackItem URL]);
+ [oldestNonSnapbackItem setHasPageCache:NO];
}
}
More information about the webkit-changes
mailing list