[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 7dd2569008fba479f408acd01492bae37e78815f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 12 01:15:12 2002 +0000

            Fixed 3123375.  Provide SPI to release all pending page caches
    
            Reviewed by kocienda.
    
            * History.subproj/WebBackForwardList.m:
            * History.subproj/WebHistoryItem.h:
            * History.subproj/WebHistoryItem.m:
            * History.subproj/WebHistoryItemPrivate.h: Added.
            * WebCoreSupport.subproj/WebBridge.m:
            * WebKit.pbproj/project.pbxproj:
            * WebView.subproj/WebFramePrivate.m:
    
            Fixed 3123375.  Call SPI to release all pending page caches
    
            Reviewed by kocienda.
    
            * Test/PageLoadTestController.m:
            (-[PageLoadTestController anyWindowWillClose:]):
            * Test/PageLoadTestRunner.m:
            (-[PageLoadTestRunner closeBrowserWindowsAndFinishCheckingForWorldLeaks]):
            (-[PageLoadTestRunner checkForWorldLeaksSoon]):
            (-[PageLoadTestRunner checkForWorldLeaksNow]):
            (-[PageLoadTestRunner startTest]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3007 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index e5760c7..91d889f 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -1,13 +1,9 @@
-//
-//  WebBackForwardList.m
-//  WebKit
-//
-//  Created by Kenneth Kocienda on Thu Nov 29 2001.
-//  Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
-//
-
+/*
+    WebBackForwardList.m
+    Copyright 2001, 2002, Apple, Inc. All rights reserved.
+*/
 #import <WebKit/WebBackForwardList.h>
-#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebHistoryItemPrivate.h>
 #import <WebKit/WebPreferencesPrivate.h>
 
 #import <WebFoundation/WebAssertions.h>
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 201ae8b..7fdce44 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -83,10 +83,3 @@
 - (BOOL)alwaysAttemptToUsePageCache;
 
 @end
-
- at interface WebHistoryItem (WebPrivate)
-+ (void)_releaseAllPendingPageCaches;
-- (BOOL)hasPageCache;
-- (void)setHasPageCache: (BOOL)f;
-- (NSMutableDictionary *)pageCache;
- at end
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 836dc26..cefee4c 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -3,7 +3,7 @@
     Copyright 2001, 2002, Apple, Inc. All rights reserved.
 */
 
-#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebHistoryItemPrivate.h>
 
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebIconDatabase.h>
diff --git a/WebKit/History.subproj/WebHistoryItemPrivate.h b/WebKit/History.subproj/WebHistoryItemPrivate.h
new file mode 100644
index 0000000..f860726
--- /dev/null
+++ b/WebKit/History.subproj/WebHistoryItemPrivate.h
@@ -0,0 +1,15 @@
+/*
+    WebHistoryItemPrivate.h
+    Copyright 2001, 2002, Apple, Inc. All rights reserved.
+ */
+#import <Cocoa/Cocoa.h>
+
+#import <WebKit/WebHistoryItem.h>
+
+
+ at interface WebHistoryItem (WebPrivate)
++ (void)_releaseAllPendingPageCaches;
+- (BOOL)hasPageCache;
+- (void)setHasPageCache: (BOOL)f;
+- (NSMutableDictionary *)pageCache;
+ at end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 207559b..d4653d3 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -11,7 +11,7 @@
 #import <WebKit/WebControllerPrivate.h>
 #import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebHistoryItemPrivate.h>
 #import <WebKit/WebHTMLRepresentationPrivate.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebKitErrors.h>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 8452bab..a0e65c5 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -185,6 +185,7 @@
 </dict>
 </plist>
 ";
+			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
@@ -299,6 +300,7 @@
 				39446092020F50ED0ECA1767,
 				39446093020F50ED0ECA1767,
 				511D5554033FD51000CA2ACD,
+				516F297003A6C45A00CA2D3A,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -554,6 +556,7 @@
 				39446080020F50ED0ECA1767,
 				F5E0A76E02B8FEE401C1A525,
 				F5E0A76F02B8FEE401C1A525,
+				516F296F03A6C45A00CA2D3A,
 			);
 			isa = PBXGroup;
 			name = History;
@@ -1252,6 +1255,21 @@
 			settings = {
 			};
 		};
+		516F296F03A6C45A00CA2D3A = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = WebHistoryItemPrivate.h;
+			refType = 4;
+		};
+		516F297003A6C45A00CA2D3A = {
+			fileRef = 516F296F03A6C45A00CA2D3A;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Private,
+				);
+			};
+		};
 		517FA6A903709FCE00CA2D3A = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 47c73bc..e9eba15 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -17,7 +17,7 @@
 #import <WebKit/WebDocument.h>
 #import <WebKit/WebDynamicScrollBarsView.h>
 #import <WebKit/WebHistory.h>
-#import <WebKit/WebHistoryItem.h>
+#import <WebKit/WebHistoryItemPrivate.h>
 #import <WebKit/WebHTMLView.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebKitLogging.h>

-- 
WebKit Debian packaging