diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /WebKit/mac/History | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'WebKit/mac/History')
| -rw-r--r-- | WebKit/mac/History/WebHistory.mm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/WebKit/mac/History/WebHistory.mm b/WebKit/mac/History/WebHistory.mm index af40a24..00cee78 100644 --- a/WebKit/mac/History/WebHistory.mm +++ b/WebKit/mac/History/WebHistory.mm @@ -110,7 +110,7 @@ private: @implementation WebHistoryPrivate -#pragma mark OBJECT FRAMEWORK +// MARK: OBJECT FRAMEWORK + (void)initialize { @@ -146,7 +146,7 @@ private: [super finalize]; } -#pragma mark MODIFYING CONTENTS +// MARK: MODIFYING CONTENTS static void getDayBoundaries(NSTimeInterval interval, NSTimeInterval& beginningOfDay, NSTimeInterval& beginningOfNextDay) { @@ -399,7 +399,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date) [self addItem:entry discardDuplicate:NO]; } -#pragma mark DATE-BASED RETRIEVAL +// MARK: DATE-BASED RETRIEVAL - (NSArray *)orderedLastVisitedDays { @@ -431,7 +431,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date) return _entriesByDate->get(dateKey).get(); } -#pragma mark URL MATCHING +// MARK: URL MATCHING - (WebHistoryItem *)itemForURLString:(NSString *)URLString { @@ -453,7 +453,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date) return [_entriesByURL allValues]; } -#pragma mark ARCHIVING/UNARCHIVING +// MARK: ARCHIVING/UNARCHIVING - (void)setHistoryAgeInDaysLimit:(int)limit { @@ -676,7 +676,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date) [super dealloc]; } -#pragma mark MODIFYING CONTENTS +// MARK: MODIFYING CONTENTS - (void)_sendNotification:(NSString *)name entries:(NSArray *)entries { @@ -707,7 +707,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date) entries:newEntries]; } -#pragma mark DATE-BASED RETRIEVAL +// MARK: DATE-BASED RETRIEVAL - (NSArray *)orderedLastVisitedDays { @@ -719,7 +719,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date) return [_historyPrivate orderedItemsLastVisitedOnDay:date]; } -#pragma mark URL MATCHING +// MARK: URL MATCHING - (BOOL)containsURL:(NSURL *)URL { @@ -731,7 +731,7 @@ static inline WebHistoryDateKey dateKey(NSTimeInterval date) return [_historyPrivate itemForURL:URL]; } -#pragma mark SAVING TO DISK +// MARK: SAVING TO DISK - (BOOL)loadFromURL:(NSURL *)URL error:(NSError **)error { |