Title: [159480] trunk/Source/WebKit/mac
- Revision
- 159480
- Author
- [email protected]
- Date
- 2013-11-18 21:14:36 -0800 (Mon, 18 Nov 2013)
Log Message
Disable deprecation warnings related to NSCalendarDate in WebHistory.
Reviewed by Anders Carlsson.
* History/WebHistory.h: Use a #pragma to have the compiler treat this header as
a system header, even when not included from a system location. This has the effect
of suppressing warnings when including this header. It's a more general effect than
we're after but is also less invasive than disabling deprecation warnings around
the APIs that are defined in terms of NSCalendarDate. We'll hopefully revisit this
in the future.
* History/WebHistory.mm: Disable deprecation warnings around uses of NSCalendarDate.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (159479 => 159480)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-19 04:55:03 UTC (rev 159479)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-19 05:14:36 UTC (rev 159480)
@@ -1,3 +1,17 @@
+2013-11-18 Mark Rowe <[email protected]>
+
+ Disable deprecation warnings related to NSCalendarDate in WebHistory.
+
+ Reviewed by Anders Carlsson.
+
+ * History/WebHistory.h: Use a #pragma to have the compiler treat this header as
+ a system header, even when not included from a system location. This has the effect
+ of suppressing warnings when including this header. It's a more general effect than
+ we're after but is also less invasive than disabling deprecation warnings around
+ the APIs that are defined in terms of NSCalendarDate. We'll hopefully revisit this
+ in the future.
+ * History/WebHistory.mm: Disable deprecation warnings around uses of NSCalendarDate.
+
2013-11-18 David Hyatt <[email protected]>
Add a quirk to not respect center text-align when positioning
Modified: trunk/Source/WebKit/mac/History/WebHistory.h (159479 => 159480)
--- trunk/Source/WebKit/mac/History/WebHistory.h 2013-11-19 04:55:03 UTC (rev 159479)
+++ trunk/Source/WebKit/mac/History/WebHistory.h 2013-11-19 05:14:36 UTC (rev 159480)
@@ -28,6 +28,8 @@
#import <Foundation/Foundation.h>
+#pragma GCC system_header
+
@class NSError;
@class WebHistoryItem;
Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (159479 => 159480)
--- trunk/Source/WebKit/mac/History/WebHistory.mm 2013-11-19 04:55:03 UTC (rev 159479)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2013-11-19 05:14:36 UTC (rev 159480)
@@ -92,7 +92,6 @@
- (void)rebuildHistoryByDayIfNeeded:(WebHistory *)webHistory;
- (NSArray *)orderedLastVisitedDays;
-- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
- (BOOL)containsURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURLString:(NSString *)URLString;
@@ -101,8 +100,6 @@
- (BOOL)loadFromURL:(NSURL *)URL collectDiscardedItemsInto:(NSMutableArray *)discardedItems error:(NSError **)error;
- (BOOL)saveToURL:(NSURL *)URL error:(NSError **)error;
-- (NSCalendarDate *)ageLimitDate;
-
- (void)setHistoryItemLimit:(int)limit;
- (int)historyItemLimit;
- (void)setHistoryAgeInDaysLimit:(int)limit;
@@ -445,6 +442,9 @@
// MARK: DATE-BASED RETRIEVAL
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
- (NSArray *)orderedLastVisitedDays
{
if (!_orderedLastVisitedDays) {
@@ -475,6 +475,8 @@
return _entriesByDate->get(dateKey).get();
}
+#pragma clang diagnostic pop
+
// MARK: URL MATCHING
- (WebHistoryItem *)itemForURLString:(NSString *)URLString
@@ -525,6 +527,9 @@
return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitHistoryItemLimit"];
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
// Return a date that marks the age limit for history entries saved to or
// loaded from disk. Any entry older than this item should be rejected.
- (NSCalendarDate *)ageLimitDate
@@ -533,6 +538,8 @@
hours:0 minutes:0 seconds:0];
}
+#pragma clang diagnostic pop
+
- (BOOL)loadHistoryGutsFromURL:(NSURL *)URL savedItemsCount:(int *)numberOfItemsLoaded collectDiscardedItemsInto:(NSMutableArray *)discardedItems error:(NSError **)error
{
*numberOfItemsLoaded = 0;
@@ -774,11 +781,16 @@
return [_historyPrivate orderedLastVisitedDays];
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)date
{
return [_historyPrivate orderedItemsLastVisitedOnDay:date];
}
+#pragma clang diagnostic pop
+
// MARK: URL MATCHING
- (BOOL)containsURL:(NSURL *)URL
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
