+2006-11-15 Brady Eidson <beidson@apple.com>
+
+ Reviewed by Maciej
+
+ Split much of unused WebHistoryItemPrivate.h SPI into WebHistoryItemInternal.h
+
+ * History/WebBackForwardList.m:
+ * History/WebHistory.m:
+ * History/WebHistoryItem.m:
+ (-[WebHistoryItem initWithURLString:title:lastVisitedTimeInterval:]):
+ (-[WebHistoryItem initWithURL:title:]):
+ (-[WebHistoryItem visitCount]):
+ (-[WebHistoryItem RSSFeedReferrer]):
+ (-[WebHistoryItem setRSSFeedReferrer:]):
+ (-[WebHistoryItem children]):
+ (-[WebHistoryItem dictionaryRepresentation]):
+ (-[WebHistoryItem setAlwaysAttemptToUsePageCache:]):
+ (+[WebHistoryItem _releaseAllPendingPageCaches]):
+ (-[WebHistoryItem URL]):
+ (-[WebHistoryItem target]):
+ (-[WebHistoryItem _setLastVisitedTimeInterval:]):
+ (-[WebHistoryItem _lastVisitedDate]):
+ (-[WebHistoryItem targetItem]):
+ * History/WebHistoryItemInternal.h: Added.
+ * History/WebHistoryItemPrivate.h:
+ * WebCoreSupport/WebFrameBridge.mm:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebView/WebFrame.mm:
+ * WebView/WebView.mm:
+
2006-11-14 Beth Dakin <bdakin@apple.com>
Reviewed by Geoff.
#import <JavaScriptCore/Assertions.h>
#import "WebBackForwardList.h"
+#import "WebHistoryItemInternal.h"
#import "WebHistoryItemPrivate.h"
#import "WebKitLogging.h"
#import "WebNSObjectExtras.h"
#import "WebHistoryPrivate.h"
#import "WebHistoryItem.h"
+#import "WebHistoryItemInternal.h"
#import "WebHistoryItemPrivate.h"
#import "WebKitLogging.h"
#import "WebNSCalendarDateExtras.h"
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import "WebHistoryItemInternal.h"
#import "WebHistoryItemPrivate.h"
#import "WebFrameBridge.h"
- (id)initWithURLString:(NSString *)URLString title:(NSString *)title lastVisitedTimeInterval:(NSTimeInterval)time
{
+ NSLog(@"%@ - %@", URLString, title);
+
self = [super init];
_private = [[WebHistoryItemPrivate alloc] init];
_private->lastVisitedTimeInterval = time;
@interface WebWindowWatcher : NSObject
@end
-@implementation WebHistoryItem (WebPrivate)
+@implementation WebHistoryItem (WebInternal)
- (void)_retainIconInDatabase:(BOOL)retain
{
return [[[self alloc] initWithURL:URL title:nil] autorelease];
}
-- (id)initWithURL:(NSURL *)URL title:(NSString *)title
-{
- return [self initWithURLString:[URL _web_originalDataAsString] title:title lastVisitedTimeInterval:0];
-}
-
- (id)initWithURL:(NSURL *)URL target:(NSString *)target parent:(NSString *)parent title:(NSString *)title
{
self = [self initWithURLString:[URL _web_originalDataAsString] title:title lastVisitedTimeInterval:0];
return self;
}
-- (NSURL *)URL
-{
- return _private->URLString ? [NSURL _web_URLWithDataAsString:_private->URLString] : nil;
-}
-
-- (NSString *)target
-{
- return _private->target;
-}
-
- (NSString *)parent
{
return _private->parent;
_private->parent = copy;
}
-- (void)_setLastVisitedTimeInterval:(NSTimeInterval)time
-{
- if (_private->lastVisitedTimeInterval != time) {
- _private->lastVisitedTimeInterval = time;
- [_private->lastVisitedDate release];
- _private->lastVisitedDate = nil;
- _private->visitCount++;
- }
-}
-
-// FIXME: Remove this accessor and related ivar.
-- (NSCalendarDate *)_lastVisitedDate
-{
- if (!_private->lastVisitedDate){
- _private->lastVisitedDate = [[NSCalendarDate alloc]
- initWithTimeIntervalSinceReferenceDate:_private->lastVisitedTimeInterval];
- }
- return _private->lastVisitedDate;
-}
-
-- (int)visitCount
-{
- return _private->visitCount;
-}
-
- (void)setVisitCount:(int)count
{
_private->visitCount = count;
}
}
-- (WebHistoryItem *)targetItem
-{
- if (_private->isTargetItem || !_private->subItems) {
- return self;
- } else {
- return [self _recurseToFindTargetItem];
- }
-}
-
- (void)_setFormInfoFromRequest:(NSURLRequest *)request
{
NSData *newData = nil;
return _private->formReferrer;
}
-- (NSString *)RSSFeedReferrer
-{
- return _private->RSSFeedReferrer;
-}
-
-- (void)setRSSFeedReferrer:(NSString *)referrer
-{
- NSString *copy = [referrer copy];
- [_private->RSSFeedReferrer release];
- _private->RSSFeedReferrer = copy;
-}
-
-- (NSArray *)children
-{
- return _private->subItems;
-}
-
- (void)_mergeAutoCompleteHints:(WebHistoryItem *)otherItem
{
ASSERT_ARG(otherItem, otherItem);
return nil;
}
-- (NSDictionary *)dictionaryRepresentation
-{
- NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:6];
-
- if (_private->URLString) {
- [dict setObject:_private->URLString forKey:@""];
- }
- if (_private->title) {
- [dict setObject:_private->title forKey:WebTitleKey];
- }
- if (_private->displayTitle) {
- [dict setObject:_private->displayTitle forKey:WebDisplayTitleKey];
- }
- if (_private->lastVisitedTimeInterval != 0.0) {
- // store as a string to maintain backward compatibility (see 3245793)
- [dict setObject:[NSString stringWithFormat:@"%.1lf", _private->lastVisitedTimeInterval]
- forKey:WebLastVisitedTimeIntervalKey];
- }
- if (_private->visitCount) {
- [dict setObject:[NSNumber numberWithInt:_private->visitCount] forKey:WebVisitCountKey];
- }
- if (_private->subItems != nil) {
- NSMutableArray *childDicts = [NSMutableArray arrayWithCapacity:[_private->subItems count]];
- int i;
- for (i = [_private->subItems count]; i >= 0; i--) {
- [childDicts addObject: [[_private->subItems objectAtIndex:i] dictionaryRepresentation]];
- }
- [dict setObject: childDicts forKey:WebChildrenKey];
- }
-
- return dict;
-}
-
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict
{
NSString *URLString = [dict _webkit_stringForKey:@""];
return self;
}
-- (void)setAlwaysAttemptToUsePageCache: (BOOL)flag
-{
- _private->alwaysAttemptToUsePageCache = flag;
-}
-
- (BOOL)alwaysAttemptToUsePageCache
{
return _private->alwaysAttemptToUsePageCache;
}
}
-+ (void)_releaseAllPendingPageCaches
-{
- LOG (PageCache, "releasing %d items\n", [_pendingPageCacheToRelease count]);
- [WebHistoryItem _invalidateReleaseTimer];
- [self _closeObjectsInPendingPageCaches];
- [_pendingPageCacheToRelease removeAllObjects];
-}
-
+ (void)_releasePageCache: (NSTimer *)timer
{
float userDelta;
return _private->pageCache;
}
+@end
+
+@implementation WebHistoryItem (WebPrivate)
+
+- (id)initWithURL:(NSURL *)URL title:(NSString *)title
+{
+ return [self initWithURLString:[URL _web_originalDataAsString] title:title lastVisitedTimeInterval:0];
+}
+
+- (int)visitCount
+{
+ return _private->visitCount;
+}
+
+- (NSString *)RSSFeedReferrer
+{
+ return _private->RSSFeedReferrer;
+}
+
+- (void)setRSSFeedReferrer:(NSString *)referrer
+{
+ NSString *copy = [referrer copy];
+ [_private->RSSFeedReferrer release];
+ _private->RSSFeedReferrer = copy;
+}
+
+- (NSArray *)children
+{
+ return _private->subItems;
+}
+
+- (NSDictionary *)dictionaryRepresentation
+{
+ NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:6];
+
+ if (_private->URLString) {
+ [dict setObject:_private->URLString forKey:@""];
+ }
+ if (_private->title) {
+ [dict setObject:_private->title forKey:WebTitleKey];
+ }
+ if (_private->displayTitle) {
+ [dict setObject:_private->displayTitle forKey:WebDisplayTitleKey];
+ }
+ if (_private->lastVisitedTimeInterval != 0.0) {
+ // store as a string to maintain backward compatibility (see 3245793)
+ [dict setObject:[NSString stringWithFormat:@"%.1lf", _private->lastVisitedTimeInterval]
+ forKey:WebLastVisitedTimeIntervalKey];
+ }
+ if (_private->visitCount) {
+ [dict setObject:[NSNumber numberWithInt:_private->visitCount] forKey:WebVisitCountKey];
+ }
+ if (_private->subItems != nil) {
+ NSMutableArray *childDicts = [NSMutableArray arrayWithCapacity:[_private->subItems count]];
+ int i;
+ for (i = [_private->subItems count]; i >= 0; i--) {
+ [childDicts addObject: [[_private->subItems objectAtIndex:i] dictionaryRepresentation]];
+ }
+ [dict setObject: childDicts forKey:WebChildrenKey];
+ }
+
+ return dict;
+}
+
+- (void)setAlwaysAttemptToUsePageCache: (BOOL)flag
+{
+ _private->alwaysAttemptToUsePageCache = flag;
+}
+
++ (void)_releaseAllPendingPageCaches
+{
+ LOG (PageCache, "releasing %d items\n", [_pendingPageCacheToRelease count]);
+ [WebHistoryItem _invalidateReleaseTimer];
+ [self _closeObjectsInPendingPageCaches];
+ [_pendingPageCacheToRelease removeAllObjects];
+}
+
- (id)_transientPropertyForKey:(NSString *)key
{
if (!_private->transientProperties)
[_private->transientProperties removeObjectForKey:key];
}
+- (NSURL *)URL
+{
+ return _private->URLString ? [NSURL _web_URLWithDataAsString:_private->URLString] : nil;
+}
+
+- (NSString *)target
+{
+ return _private->target;
+}
+
+- (void)_setLastVisitedTimeInterval:(NSTimeInterval)time
+{
+ if (_private->lastVisitedTimeInterval != time) {
+ _private->lastVisitedTimeInterval = time;
+ [_private->lastVisitedDate release];
+ _private->lastVisitedDate = nil;
+ _private->visitCount++;
+ }
+}
+
+// FIXME: Remove this accessor and related ivar.
+- (NSCalendarDate *)_lastVisitedDate
+{
+ if (!_private->lastVisitedDate){
+ _private->lastVisitedDate = [[NSCalendarDate alloc]
+ initWithTimeIntervalSinceReferenceDate:_private->lastVisitedTimeInterval];
+ }
+ return _private->lastVisitedDate;
+}
+
+- (WebHistoryItem *)targetItem
+{
+ if (_private->isTargetItem || !_private->subItems) {
+ return self;
+ } else {
+ return [self _recurseToFindTargetItem];
+ }
+}
+
@end
+// FIXME: This is a bizarre policy - we flush the pagecaches ANY time ANY window is closed?
@implementation WebWindowWatcher
-(void)windowWillClose:(NSNotification *)notification
{
--- /dev/null
+/*
+ * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+#import <WebKit/WebBackForwardList.h>
+#import <WebKit/WebHistoryItem.h>
+
+@interface WebHistoryItem (WebInternal)
+- (void)_retainIconInDatabase:(BOOL)retain;
+- (BOOL)hasPageCache;
+- (void)setHasPageCache:(BOOL)f;
+- (NSMutableDictionary *)pageCache;
+
++ (WebHistoryItem *)entryWithURL:(NSURL *)URL;
+
+- (id)initWithURL:(NSURL *)URL target:(NSString *)target parent:(NSString *)parent title:(NSString *)title;
+
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
+
+- (NSString *)parent;
+
+
+- (NSPoint)scrollPoint;
+- (NSArray *)documentState;
+- (BOOL)isTargetItem;
+- (NSData *)formData;
+- (NSString *)formContentType;
+- (NSString *)formReferrer;
+- (id)viewState;
+
+- (void)_mergeAutoCompleteHints:(WebHistoryItem *)otherItem;
+
+- (void)setURL:(NSURL *)URL;
+- (void)setURLString:(NSString *)string;
+- (void)setOriginalURLString:(NSString *)URL;
+- (void)setTarget:(NSString *)target;
+- (void)setParent:(NSString *)parent;
+- (void)setTitle:(NSString *)title;
+- (void)setScrollPoint:(NSPoint)p;
+- (void)setDocumentState:(NSArray *)state;
+- (void)setIsTargetItem:(BOOL)flag;
+- (void)_setFormInfoFromRequest:(NSURLRequest *)request;
+- (void)setVisitCount:(int)count;
+- (void)setViewState:(id)statePList;
+
+
+- (void)addChildItem:(WebHistoryItem *)item;
+- (WebHistoryItem *)childItemWithName:(NSString *)name;
+
+- (BOOL)alwaysAttemptToUsePageCache;
+
+
+@end
+
+@interface WebBackForwardList (WebPrivate)
+- (void)_close;
+- (BOOL)_usesPageCache;
+- (void)_clearPageCache;
+@end
+
/*
- * Copyright (C) 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#import <WebKit/WebHistoryItem.h>
@interface WebHistoryItem (WebPrivate)
-- (void)_retainIconInDatabase:(BOOL)retain;
-+ (void)_releaseAllPendingPageCaches;
-- (BOOL)hasPageCache;
-- (void)setHasPageCache:(BOOL)f;
-- (NSMutableDictionary *)pageCache;
-
-+ (WebHistoryItem *)entryWithURL:(NSURL *)URL;
-
- (id)initWithURL:(NSURL *)URL title:(NSString *)title;
-- (id)initWithURL:(NSURL *)URL target:(NSString *)target parent:(NSString *)parent title:(NSString *)title;
-
-- (NSDictionary *)dictionaryRepresentation;
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
-- (NSString *)parent;
- (NSURL *)URL;
-- (NSString *)target;
-- (NSPoint)scrollPoint;
-- (NSArray *)documentState;
-- (BOOL)isTargetItem;
-- (NSData *)formData;
-- (NSString *)formContentType;
-- (NSString *)formReferrer;
-- (NSString *)RSSFeedReferrer;
- (int)visitCount;
-- (id)viewState;
-
-- (void)_mergeAutoCompleteHints:(WebHistoryItem *)otherItem;
-
-- (void)setURL:(NSURL *)URL;
-- (void)setURLString:(NSString *)string;
-- (void)setOriginalURLString:(NSString *)URL;
-- (void)setTarget:(NSString *)target;
-- (void)setParent:(NSString *)parent;
-- (void)setTitle:(NSString *)title;
-- (void)setScrollPoint:(NSPoint)p;
-- (void)setDocumentState:(NSArray *)state;
-- (void)setIsTargetItem:(BOOL)flag;
-- (void)_setFormInfoFromRequest:(NSURLRequest *)request;
-- (void)setRSSFeedReferrer:(NSString *)referrer;
-- (void)setVisitCount:(int)count;
-- (void)setViewState:(id)statePList;
-
-- (NSArray *)children;
-- (void)addChildItem:(WebHistoryItem *)item;
-- (WebHistoryItem *)childItemWithName:(NSString *)name;
-- (WebHistoryItem *)targetItem;
+// Transient properties may be of any ObjC type. They are intended to be used to store state per back/forward list entry.
+// The properties will not be persisted; when the history item is removed, the properties will be lost.
+- (id)_transientPropertyForKey:(NSString *)key;
+- (void)_setTransientProperty:(id)property forKey:(NSString *)key;
+- (NSString *)RSSFeedReferrer;
- (void)setAlwaysAttemptToUsePageCache:(BOOL)flag;
-- (BOOL)alwaysAttemptToUsePageCache;
-
++ (void)_releaseAllPendingPageCaches;
+- (void)setRSSFeedReferrer:(NSString *)referrer;
- (NSCalendarDate *)_lastVisitedDate;
// This should not be called directly for WebHistoryItems that are already included
// in WebHistory. Use -[WebHistory setLastVisitedTimeInterval:forItem:] instead.
- (void)_setLastVisitedTimeInterval:(NSTimeInterval)time;
-
-// Transient properties may be of any ObjC type. They are intended to be used to store state per back/forward list entry.
-// The properties will not be persisted; when the history item is removed, the properties will be lost.
-- (id)_transientPropertyForKey:(NSString *)key;
-- (void)_setTransientProperty:(id)property forKey:(NSString *)key;
+- (NSDictionary *)dictionaryRepresentation;
+- (WebHistoryItem *)targetItem;
+- (NSString *)target;
+- (NSArray *)children;
@end
-@interface WebBackForwardList (WebPrivate)
-- (void)_close;
-- (BOOL)_usesPageCache;
-- (void)_clearPageCache;
-@end
+
+
#import "WebFrameViewInternal.h"
#import "WebHTMLRepresentationPrivate.h"
#import "WebHTMLViewInternal.h"
+#import "WebHistoryItemInternal.h"
#import "WebHistoryItemPrivate.h"
#import "WebIconDatabase.h"
#import "WebIconDatabasePrivate.h"
#import "WebFrameViewInternal.h"
#import "WebHTMLRepresentation.h"
#import "WebHTMLView.h"
-#import "WebHistoryItemPrivate.h"
+#import "WebHistoryItemInternal.h"
#import "WebHistoryPrivate.h"
#import "WebIconDatabaseInternal.h"
#import "WebKitErrorsPrivate.h"
4BF99F900AE050BC00815C2B /* WebEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF99F8E0AE050BC00815C2B /* WebEditorClient.h */; };
4BF99F910AE050BC00815C2B /* WebEditorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BF99F8F0AE050BC00815C2B /* WebEditorClient.mm */; };
51B2A1000ADB15D0002A9BEE /* WebIconDatabaseDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B2A0FF0ADB15D0002A9BEE /* WebIconDatabaseDelegate.h */; };
+ 51FDC4D30B0AF5C100F84EB3 /* WebHistoryItemPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FDC4D20B0AF5C100F84EB3 /* WebHistoryItemPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
650F74E409E488F70020118A /* WebUnarchivingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F74E209E488F70020118A /* WebUnarchivingState.h */; };
650F74E509E488F70020118A /* WebUnarchivingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 650F74E309E488F70020118A /* WebUnarchivingState.m */; };
65488DA1084FBCCB00831AD0 /* WebNSDictionaryExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */; };
9398105E0824BF01008DF038 /* WebPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F81C3902B67C26018635CA /* WebRenderNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 939810630824BF01008DF038 /* WebHistoryItemPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */; settings = {ATTRIBUTES = (); }; };
939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */; };
939810650824BF01008DF038 /* CarbonWindowAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9003F9DBA103CA0DE6 /* CarbonWindowAdapter.h */; };
939810660824BF01008DF038 /* CarbonWindowContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9203F9DBA103CA0DE6 /* CarbonWindowContentView.h */; };
515E27CC0458C86500CA2D3A /* WebUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebUIDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDefaultUIDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
515E27D00458CA4B00CA2D3A /* WebDefaultUIDelegate.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebDefaultUIDelegate.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- 516F296F03A6C45A00CA2D3A /* WebHistoryItemPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51863EFC065419EB00E9E8DD /* WebJavaPlugIn.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebJavaPlugIn.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51A8B52E04282B5900CA2D3A /* WebFrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51A8B52F04282B5900CA2D3A /* WebFrameView.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51E94C3506C0321200A9B09E /* WebPDFView.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPDFView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51E94C6806C0347500A9B09E /* WebPDFRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPDFRepresentation.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51E94C6906C0347500A9B09E /* WebPDFRepresentation.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPDFRepresentation.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ 51FDC4D20B0AF5C100F84EB3 /* WebHistoryItemPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemPrivate.h; sourceTree = "<group>"; };
650F74E209E488F70020118A /* WebUnarchivingState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebUnarchivingState.h; sourceTree = "<group>"; };
650F74E309E488F70020118A /* WebUnarchivingState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebUnarchivingState.m; sourceTree = "<group>"; };
65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSDictionaryExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
F520FB190221DEFD01C1A525 /* WebHistory.h */,
3944607F020F50ED0ECA1767 /* WebHistoryItem.h */,
39446080020F50ED0ECA1767 /* WebHistoryItem.m */,
- 516F296F03A6C45A00CA2D3A /* WebHistoryItemPrivate.h */,
+ 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */,
+ 51FDC4D20B0AF5C100F84EB3 /* WebHistoryItemPrivate.h */,
F5B92B820223191D01C1A525 /* WebHistoryPrivate.h */,
F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */,
F5E0A76F02B8FEE401C1A525 /* WebURLsWithTitles.m */,
9398105E0824BF01008DF038 /* WebPreferencesPrivate.h in Headers */,
9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */,
939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */,
- 939810630824BF01008DF038 /* WebHistoryItemPrivate.h in Headers */,
+ 939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */,
939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */,
939810650824BF01008DF038 /* CarbonWindowAdapter.h in Headers */,
939810660824BF01008DF038 /* CarbonWindowContentView.h in Headers */,
931633EB0AEDFF930062B92D /* WebFrameLoaderClient.h in Headers */,
14D8252F0AF955090004F057 /* WebChromeClient.h in Headers */,
9304B3000B02341500F7850D /* WebIconDatabaseInternal.h in Headers */,
+ 51FDC4D30B0AF5C100F84EB3 /* WebHistoryItemPrivate.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
+ projectRoot = "";
targets = (
9398100A0824BF01008DF038 /* WebKit */,
);
#import "WebFrameViewInternal.h"
#import "WebHTMLViewInternal.h"
#import "WebHistoryItem.h"
+#import "WebHistoryItemInternal.h"
#import "WebHistoryItemPrivate.h"
#import "WebKitLogging.h"
#import "WebKitStatisticsPrivate.h"
#import "WebFrameViewInternal.h"
#import "WebHTMLRepresentation.h"
#import "WebHTMLViewInternal.h"
-#import "WebHistoryItemPrivate.h"
+#import "WebHistoryItemInternal.h"
#import "WebIconDatabase.h"
#import "WebInspector.h"
#import "WebKitErrors.h"