Changeset 17779 in webkit


Ignore:
Timestamp:
Nov 15, 2006 1:29:28 AM (17 years ago)
Author:
beidson
Message:

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:
Location:
trunk/WebKit
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit/ChangeLog

    r17777 r17779  
     12006-11-15  Brady Eidson  <beidson@apple.com>
     2
     3        Reviewed by Maciej
     4
     5        Split much of unused WebHistoryItemPrivate.h SPI into WebHistoryItemInternal.h
     6
     7        * History/WebBackForwardList.m:
     8        * History/WebHistory.m:
     9        * History/WebHistoryItem.m:
     10        (-[WebHistoryItem initWithURLString:title:lastVisitedTimeInterval:]):
     11        (-[WebHistoryItem initWithURL:title:]):
     12        (-[WebHistoryItem visitCount]):
     13        (-[WebHistoryItem RSSFeedReferrer]):
     14        (-[WebHistoryItem setRSSFeedReferrer:]):
     15        (-[WebHistoryItem children]):
     16        (-[WebHistoryItem dictionaryRepresentation]):
     17        (-[WebHistoryItem setAlwaysAttemptToUsePageCache:]):
     18        (+[WebHistoryItem _releaseAllPendingPageCaches]):
     19        (-[WebHistoryItem URL]):
     20        (-[WebHistoryItem target]):
     21        (-[WebHistoryItem _setLastVisitedTimeInterval:]):
     22        (-[WebHistoryItem _lastVisitedDate]):
     23        (-[WebHistoryItem targetItem]):
     24        * History/WebHistoryItemInternal.h: Added.
     25        * History/WebHistoryItemPrivate.h:
     26        * WebCoreSupport/WebFrameBridge.mm:
     27        * WebCoreSupport/WebFrameLoaderClient.mm:
     28        * WebKit.xcodeproj/project.pbxproj:
     29        * WebView/WebFrame.mm:
     30        * WebView/WebView.mm:
     31
    1322006-11-14  Beth Dakin  <bdakin@apple.com>
    233

  • trunk/WebKit/History/WebBackForwardList.m

    r17746 r17779  
    2929#import <JavaScriptCore/Assertions.h>
    3030#import "WebBackForwardList.h"
     31#import "WebHistoryItemInternal.h"
    3132#import "WebHistoryItemPrivate.h"
    3233#import "WebKitLogging.h"

  • trunk/WebKit/History/WebHistory.m

    r17746 r17779  
    3131
    3232#import "WebHistoryItem.h"
     33#import "WebHistoryItemInternal.h"
    3334#import "WebHistoryItemPrivate.h"
    3435#import "WebKitLogging.h"

  • trunk/WebKit/History/WebHistoryItem.m

    r17438 r17779  
    2727 */
    2828
     29#import "WebHistoryItemInternal.h"
    2930#import "WebHistoryItemPrivate.h"
    3031
    … …  
    119120- (id)initWithURLString:(NSString *)URLString title:(NSString *)title lastVisitedTimeInterval:(NSTimeInterval)time
    120121{
     122    NSLog(@"%@ - %@", URLString, title);
     123   
    121124    self = [super init];
    122125    _private = [[WebHistoryItemPrivate alloc] init];
    … …  
    273276@end
    274277
    275 @implementation WebHistoryItem (WebPrivate)
     278@implementation WebHistoryItem (WebInternal)
    276279
    277280- (void)_retainIconInDatabase:(BOOL)retain
    … …  
    292295}
    293296
    294 - (id)initWithURL:(NSURL *)URL title:(NSString *)title
    295 {
    296     return [self initWithURLString:[URL _web_originalDataAsString] title:title lastVisitedTimeInterval:0];
    297 }
    298 
    299297- (id)initWithURL:(NSURL *)URL target:(NSString *)target parent:(NSString *)parent title:(NSString *)title
    300298{
    … …  
    305303    }
    306304    return self;
    307 }
    308 
    309 - (NSURL *)URL
    310 {
    311     return _private->URLString ? [NSURL _web_URLWithDataAsString:_private->URLString] : nil;
    312 }
    313 
    314 - (NSString *)target
    315 {
    316     return _private->target;
    317305}
    318306
    … …  
    380368    [_private->parent release];
    381369    _private->parent = copy;
    382 }
    383 
    384 - (void)_setLastVisitedTimeInterval:(NSTimeInterval)time
    385 {
    386     if (_private->lastVisitedTimeInterval != time) {
    387         _private->lastVisitedTimeInterval = time;
    388         [_private->lastVisitedDate release];
    389         _private->lastVisitedDate = nil;
    390         _private->visitCount++;
    391     }
    392 }
    393 
    394 // FIXME:  Remove this accessor and related ivar.
    395 - (NSCalendarDate *)_lastVisitedDate
    396 {
    397     if (!_private->lastVisitedDate){
    398         _private->lastVisitedDate = [[NSCalendarDate alloc]
    399                     initWithTimeIntervalSinceReferenceDate:_private->lastVisitedTimeInterval];
    400     }
    401     return _private->lastVisitedDate;
    402 }
    403 
    404 - (int)visitCount
    405 {
    406     return _private->visitCount;
    407370}
    408371
    … …  
    476439}
    477440
    478 - (WebHistoryItem *)targetItem
    479 {
    480     if (_private->isTargetItem || !_private->subItems) {
    481         return self;
    482     } else {
    483         return [self _recurseToFindTargetItem];
    484     }
    485 }
    486 
    487441- (void)_setFormInfoFromRequest:(NSURLRequest *)request
    488442{
    … …  
    523477{
    524478    return _private->formReferrer;
    525 }
    526 
    527 - (NSString *)RSSFeedReferrer
    528 {
    529     return _private->RSSFeedReferrer;
    530 }
    531 
    532 - (void)setRSSFeedReferrer:(NSString *)referrer
    533 {
    534     NSString *copy = [referrer copy];
    535     [_private->RSSFeedReferrer release];
    536     _private->RSSFeedReferrer = copy;
    537 }
    538 
    539 - (NSArray *)children
    540 {
    541     return _private->subItems;
    542479}
    543480
    … …  
    570507    }
    571508    return nil;
    572 }
    573 
    574 - (NSDictionary *)dictionaryRepresentation
    575 {
    576     NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:6];
    577 
    578     if (_private->URLString) {
    579         [dict setObject:_private->URLString forKey:@""];
    580     }
    581     if (_private->title) {
    582         [dict setObject:_private->title forKey:WebTitleKey];
    583     }
    584     if (_private->displayTitle) {
    585         [dict setObject:_private->displayTitle forKey:WebDisplayTitleKey];
    586     }
    587     if (_private->lastVisitedTimeInterval != 0.0) {
    588         // store as a string to maintain backward compatibility (see 3245793)
    589         [dict setObject:[NSString stringWithFormat:@"%.1lf", _private->lastVisitedTimeInterval]
    590                  forKey:WebLastVisitedTimeIntervalKey];
    591     }
    592     if (_private->visitCount) {
    593         [dict setObject:[NSNumber numberWithInt:_private->visitCount] forKey:WebVisitCountKey];
    594     }
    595     if (_private->subItems != nil) {
    596         NSMutableArray *childDicts = [NSMutableArray arrayWithCapacity:[_private->subItems count]];
    597         int i;
    598         for (i = [_private->subItems count]; i >= 0; i--) {
    599             [childDicts addObject: [[_private->subItems objectAtIndex:i] dictionaryRepresentation]];
    600         }
    601         [dict setObject: childDicts forKey:WebChildrenKey];
    602     }
    603 
    604     return dict;
    605509}
    606510
    … …  
    645549}
    646550
    647 - (void)setAlwaysAttemptToUsePageCache: (BOOL)flag
    648 {
    649     _private->alwaysAttemptToUsePageCache = flag;
    650 }
    651 
    652551- (BOOL)alwaysAttemptToUsePageCache
    653552{
    … …  
    721620}
    722621
     622+ (void)_releasePageCache: (NSTimer *)timer
     623{
     624    float userDelta;
     625    CFAbsoluteTime loadDelta;
     626   
     627    loadDelta = CFAbsoluteTimeGetCurrent()-[WebFrame _timeOfLastCompletedLoad];
     628    userDelta = WKSecondsSinceLastInputEvent();
     629
     630    [_pageCacheReleaseTimer release];
     631    _pageCacheReleaseTimer = nil;
     632
     633    if ((userDelta < 0.5 || loadDelta < 1.25) && [_pendingPageCacheToRelease count] < 42){
     634        LOG (PageCache, "postponing again because not quiescent for more than a second (%f since last input, %f since last load).", userDelta, loadDelta);
     635        [self _scheduleReleaseTimer];
     636        return;
     637    }
     638    else
     639        LOG (PageCache, "releasing, quiescent for more than a second (%f since last input, %f since last load).", userDelta, loadDelta);
     640
     641    [WebHistoryItem _releaseAllPendingPageCaches];
     642}
     643
     644- (void)setHasPageCache: (BOOL)f
     645{
     646    if (f && !_private->pageCache)
     647        _private->pageCache = [[NSMutableDictionary alloc] init];
     648    if (!f && _private->pageCache){
     649        [self _scheduleRelease];
     650    }
     651}
     652
     653- (NSMutableDictionary *)pageCache
     654{
     655    return _private->pageCache;
     656}
     657
     658@end
     659
     660@implementation WebHistoryItem (WebPrivate)
     661
     662- (id)initWithURL:(NSURL *)URL title:(NSString *)title
     663{
     664    return [self initWithURLString:[URL _web_originalDataAsString] title:title lastVisitedTimeInterval:0];
     665}
     666
     667- (int)visitCount
     668{
     669    return _private->visitCount;
     670}
     671
     672- (NSString *)RSSFeedReferrer
     673{
     674    return _private->RSSFeedReferrer;
     675}
     676
     677- (void)setRSSFeedReferrer:(NSString *)referrer
     678{
     679    NSString *copy = [referrer copy];
     680    [_private->RSSFeedReferrer release];
     681    _private->RSSFeedReferrer = copy;
     682}
     683
     684- (NSArray *)children
     685{
     686    return _private->subItems;
     687}
     688
     689- (NSDictionary *)dictionaryRepresentation
     690{
     691    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:6];
     692
     693    if (_private->URLString) {
     694        [dict setObject:_private->URLString forKey:@""];
     695    }
     696    if (_private->title) {
     697        [dict setObject:_private->title forKey:WebTitleKey];
     698    }
     699    if (_private->displayTitle) {
     700        [dict setObject:_private->displayTitle forKey:WebDisplayTitleKey];
     701    }
     702    if (_private->lastVisitedTimeInterval != 0.0) {
     703        // store as a string to maintain backward compatibility (see 3245793)
     704        [dict setObject:[NSString stringWithFormat:@"%.1lf", _private->lastVisitedTimeInterval]
     705                 forKey:WebLastVisitedTimeIntervalKey];
     706    }
     707    if (_private->visitCount) {
     708        [dict setObject:[NSNumber numberWithInt:_private->visitCount] forKey:WebVisitCountKey];
     709    }
     710    if (_private->subItems != nil) {
     711        NSMutableArray *childDicts = [NSMutableArray arrayWithCapacity:[_private->subItems count]];
     712        int i;
     713        for (i = [_private->subItems count]; i >= 0; i--) {
     714            [childDicts addObject: [[_private->subItems objectAtIndex:i] dictionaryRepresentation]];
     715        }
     716        [dict setObject: childDicts forKey:WebChildrenKey];
     717    }
     718
     719    return dict;
     720}
     721
     722- (void)setAlwaysAttemptToUsePageCache: (BOOL)flag
     723{
     724    _private->alwaysAttemptToUsePageCache = flag;
     725}
     726
    723727+ (void)_releaseAllPendingPageCaches
    724728{
    … …  
    727731    [self _closeObjectsInPendingPageCaches];
    728732    [_pendingPageCacheToRelease removeAllObjects];
    729 }
    730 
    731 + (void)_releasePageCache: (NSTimer *)timer
    732 {
    733     float userDelta;
    734     CFAbsoluteTime loadDelta;
    735    
    736     loadDelta = CFAbsoluteTimeGetCurrent()-[WebFrame _timeOfLastCompletedLoad];
    737     userDelta = WKSecondsSinceLastInputEvent();
    738 
    739     [_pageCacheReleaseTimer release];
    740     _pageCacheReleaseTimer = nil;
    741 
    742     if ((userDelta < 0.5 || loadDelta < 1.25) && [_pendingPageCacheToRelease count] < 42){
    743         LOG (PageCache, "postponing again because not quiescent for more than a second (%f since last input, %f since last load).", userDelta, loadDelta);
    744         [self _scheduleReleaseTimer];
    745         return;
    746     }
    747     else
    748         LOG (PageCache, "releasing, quiescent for more than a second (%f since last input, %f since last load).", userDelta, loadDelta);
    749 
    750     [WebHistoryItem _releaseAllPendingPageCaches];
    751 }
    752 
    753 - (void)setHasPageCache: (BOOL)f
    754 {
    755     if (f && !_private->pageCache)
    756         _private->pageCache = [[NSMutableDictionary alloc] init];
    757     if (!f && _private->pageCache){
    758         [self _scheduleRelease];
    759     }
    760 }
    761 
    762 - (NSMutableDictionary *)pageCache
    763 {
    764     return _private->pageCache;
    765733}
    766734
    … …  
    783751}
    784752
     753- (NSURL *)URL
     754{
     755    return _private->URLString ? [NSURL _web_URLWithDataAsString:_private->URLString] : nil;
     756}
     757
     758- (NSString *)target
     759{
     760    return _private->target;
     761}
     762
     763- (void)_setLastVisitedTimeInterval:(NSTimeInterval)time
     764{
     765    if (_private->lastVisitedTimeInterval != time) {
     766        _private->lastVisitedTimeInterval = time;
     767        [_private->lastVisitedDate release];
     768        _private->lastVisitedDate = nil;
     769        _private->visitCount++;
     770    }
     771}
     772
     773// FIXME:  Remove this accessor and related ivar.
     774- (NSCalendarDate *)_lastVisitedDate
     775{
     776    if (!_private->lastVisitedDate){
     777        _private->lastVisitedDate = [[NSCalendarDate alloc]
     778                    initWithTimeIntervalSinceReferenceDate:_private->lastVisitedTimeInterval];
     779    }
     780    return _private->lastVisitedDate;
     781}
     782
     783- (WebHistoryItem *)targetItem
     784{
     785    if (_private->isTargetItem || !_private->subItems) {
     786        return self;
     787    } else {
     788        return [self _recurseToFindTargetItem];
     789    }
     790}
     791
    785792@end
    786793
     794// FIXME: This is a bizarre policy - we flush the pagecaches ANY time ANY window is closed? 
    787795@implementation WebWindowWatcher
    788796-(void)windowWillClose:(NSNotification *)notification

  • trunk/WebKit/History/WebHistoryItemPrivate.h

    r17408 r17779  
    11/*
    2  * Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
     2 * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3333
    3434@interface WebHistoryItem (WebPrivate)
    35 - (void)_retainIconInDatabase:(BOOL)retain;
     35- (id)initWithURL:(NSURL *)URL title:(NSString *)title;
     36
     37- (NSURL *)URL;
     38- (int)visitCount;
     39
     40// Transient properties may be of any ObjC type.  They are intended to be used to store state per back/forward list entry.
     41// The properties will not be persisted; when the history item is removed, the properties will be lost.
     42- (id)_transientPropertyForKey:(NSString *)key;
     43- (void)_setTransientProperty:(id)property forKey:(NSString *)key;
     44- (NSString *)RSSFeedReferrer;
     45- (void)setAlwaysAttemptToUsePageCache:(BOOL)flag;
    3646+ (void)_releaseAllPendingPageCaches;
    37 - (BOOL)hasPageCache;
    38 - (void)setHasPageCache:(BOOL)f;
    39 - (NSMutableDictionary *)pageCache;
    40 
    41 + (WebHistoryItem *)entryWithURL:(NSURL *)URL;
    42 
    43 - (id)initWithURL:(NSURL *)URL title:(NSString *)title;
    44 - (id)initWithURL:(NSURL *)URL target:(NSString *)target parent:(NSString *)parent title:(NSString *)title;
    45 
    46 - (NSDictionary *)dictionaryRepresentation;
    47 - (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
    48 
    49 - (NSString *)parent;
    50 - (NSURL *)URL;
    51 - (NSString *)target;
    52 - (NSPoint)scrollPoint;
    53 - (NSArray *)documentState;
    54 - (BOOL)isTargetItem;
    55 - (NSData *)formData;
    56 - (NSString *)formContentType;
    57 - (NSString *)formReferrer;
    58 - (NSString *)RSSFeedReferrer;
    59 - (int)visitCount;
    60 - (id)viewState;
    61 
    62 - (void)_mergeAutoCompleteHints:(WebHistoryItem *)otherItem;
    63 
    64 - (void)setURL:(NSURL *)URL;
    65 - (void)setURLString:(NSString *)string;
    66 - (void)setOriginalURLString:(NSString *)URL;
    67 - (void)setTarget:(NSString *)target;
    68 - (void)setParent:(NSString *)parent;
    69 - (void)setTitle:(NSString *)title;
    70 - (void)setScrollPoint:(NSPoint)p;
    71 - (void)setDocumentState:(NSArray *)state;
    72 - (void)setIsTargetItem:(BOOL)flag;
    73 - (void)_setFormInfoFromRequest:(NSURLRequest *)request;
    7447- (void)setRSSFeedReferrer:(NSString *)referrer;
    75 - (void)setVisitCount:(int)count;
    76 - (void)setViewState:(id)statePList;
    77 
    78 - (NSArray *)children;
    79 - (void)addChildItem:(WebHistoryItem *)item;
    80 - (WebHistoryItem *)childItemWithName:(NSString *)name;
    81 - (WebHistoryItem *)targetItem;
    82 
    83 - (void)setAlwaysAttemptToUsePageCache:(BOOL)flag;
    84 - (BOOL)alwaysAttemptToUsePageCache;
    85 
    8648- (NSCalendarDate *)_lastVisitedDate;
    8749
    … …  
    8951// in WebHistory. Use -[WebHistory setLastVisitedTimeInterval:forItem:] instead.
    9052- (void)_setLastVisitedTimeInterval:(NSTimeInterval)time;
    91 
    92 // Transient properties may be of any ObjC type.  They are intended to be used to store state per back/forward list entry.
    93 // The properties will not be persisted; when the history item is removed, the properties will be lost.
    94 - (id)_transientPropertyForKey:(NSString *)key;
    95 - (void)_setTransientProperty:(id)property forKey:(NSString *)key;
     53- (NSDictionary *)dictionaryRepresentation;
     54- (WebHistoryItem *)targetItem;
     55- (NSString *)target;
     56- (NSArray *)children;
    9657
    9758@end
    9859
    99 @interface WebBackForwardList (WebPrivate)
    100 - (void)_close;
    101 - (BOOL)_usesPageCache;
    102 - (void)_clearPageCache;
    103 @end
    10460
     61
     62

  • trunk/WebKit/WebCoreSupport/WebFrameBridge.mm

    r17777 r17779  
    4242#import "WebHTMLRepresentationPrivate.h"
    4343#import "WebHTMLViewInternal.h"
     44#import "WebHistoryItemInternal.h"
    4445#import "WebHistoryItemPrivate.h"
    4546#import "WebIconDatabase.h"

  • trunk/WebKit/WebCoreSupport/WebFrameLoaderClient.mm

    r17770 r17779  
    4949#import "WebHTMLRepresentation.h"
    5050#import "WebHTMLView.h"
    51 #import "WebHistoryItemPrivate.h"
     51#import "WebHistoryItemInternal.h"
    5252#import "WebHistoryPrivate.h"
    5353#import "WebIconDatabaseInternal.h"

  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r17777 r17779  
    4343                4BF99F910AE050BC00815C2B /* WebEditorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BF99F8F0AE050BC00815C2B /* WebEditorClient.mm */; };
    4444                51B2A1000ADB15D0002A9BEE /* WebIconDatabaseDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51B2A0FF0ADB15D0002A9BEE /* WebIconDatabaseDelegate.h */; };
     45                51FDC4D30B0AF5C100F84EB3 /* WebHistoryItemPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FDC4D20B0AF5C100F84EB3 /* WebHistoryItemPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    4546                650F74E409E488F70020118A /* WebUnarchivingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F74E209E488F70020118A /* WebUnarchivingState.h */; };
    4647                650F74E509E488F70020118A /* WebUnarchivingState.m in Sources */ = {isa = PBXBuildFile; fileRef = 650F74E309E488F70020118A /* WebUnarchivingState.m */; };
    … …  
    130131                9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F81C3902B67C26018635CA /* WebRenderNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
    131132                939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
    132                 939810630824BF01008DF038 /* WebHistoryItemPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     133                939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */; settings = {ATTRIBUTES = (); }; };
    133134                939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */; };
    134135                939810650824BF01008DF038 /* CarbonWindowAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9003F9DBA103CA0DE6 /* CarbonWindowAdapter.h */; };
    … …  
    349350                515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebDefaultUIDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    350351                515E27D00458CA4B00CA2D3A /* WebDefaultUIDelegate.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebDefaultUIDelegate.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    351                 516F296F03A6C45A00CA2D3A /* WebHistoryItemPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     352                516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    352353                51863EFC065419EB00E9E8DD /* WebJavaPlugIn.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebJavaPlugIn.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    353354                51A8B52E04282B5900CA2D3A /* WebFrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    … …  
    363364                51E94C6806C0347500A9B09E /* WebPDFRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPDFRepresentation.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    364365                51E94C6906C0347500A9B09E /* WebPDFRepresentation.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPDFRepresentation.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
     366                51FDC4D20B0AF5C100F84EB3 /* WebHistoryItemPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemPrivate.h; sourceTree = "<group>"; };
    365367                650F74E209E488F70020118A /* WebUnarchivingState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebUnarchivingState.h; sourceTree = "<group>"; };
    366368                650F74E309E488F70020118A /* WebUnarchivingState.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebUnarchivingState.m; sourceTree = "<group>"; };
    … …  
    741743                                3944607F020F50ED0ECA1767 /* WebHistoryItem.h */,
    742744                                39446080020F50ED0ECA1767 /* WebHistoryItem.m */,
    743                                 516F296F03A6C45A00CA2D3A /* WebHistoryItemPrivate.h */,
     745                                516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */,
     746                                51FDC4D20B0AF5C100F84EB3 /* WebHistoryItemPrivate.h */,
    744747                                F5B92B820223191D01C1A525 /* WebHistoryPrivate.h */,
    745748                                F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */,
    … …  
    10971100                                9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */,
    10981101                                939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */,
    1099                                 939810630824BF01008DF038 /* WebHistoryItemPrivate.h in Headers */,
     1102                                939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */,
    11001103                                939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */,
    11011104                                939810650824BF01008DF038 /* CarbonWindowAdapter.h in Headers */,
    … …  
    11871190                                14D8252F0AF955090004F057 /* WebChromeClient.h in Headers */,
    11881191                                9304B3000B02341500F7850D /* WebIconDatabaseInternal.h in Headers */,
     1192                                51FDC4D30B0AF5C100F84EB3 /* WebHistoryItemPrivate.h in Headers */,
    11891193                        );
    11901194                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    12341238                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
    12351239                        projectDirPath = "";
     1240                        projectRoot = "";
    12361241                        targets = (
    12371242                                9398100A0824BF01008DF038 /* WebKit */,

  • trunk/WebKit/WebView/WebFrame.mm

    r17740 r17779  
    4646#import "WebHTMLViewInternal.h"
    4747#import "WebHistoryItem.h"
     48#import "WebHistoryItemInternal.h"
    4849#import "WebHistoryItemPrivate.h"
    4950#import "WebKitLogging.h"

  • trunk/WebKit/WebView/WebView.mm

    r17712 r17779  
    5555#import "WebHTMLRepresentation.h"
    5656#import "WebHTMLViewInternal.h"
    57 #import "WebHistoryItemPrivate.h"
     57#import "WebHistoryItemInternal.h"
    5858#import "WebIconDatabase.h"
    5959#import "WebInspector.h"
Note: See TracChangeset for help on using the changeset viewer.