Diff
Modified: trunk/Source/WebKit/ChangeLog (159272 => 159273)
--- trunk/Source/WebKit/ChangeLog 2013-11-14 03:01:16 UTC (rev 159272)
+++ trunk/Source/WebKit/ChangeLog 2013-11-14 03:08:27 UTC (rev 159273)
@@ -1,3 +1,9 @@
+2013-11-13 Joseph Pecoraro <[email protected]>
+
+ Unreviewed rollout of r159271, broke Mountain Lion build.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2013-11-13 Anders Carlsson <[email protected]>
Deprecate WebHistory methods that use NSCalendarDate
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (159272 => 159273)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-11-14 03:01:16 UTC (rev 159272)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-11-14 03:08:27 UTC (rev 159273)
@@ -1977,7 +1977,6 @@
1C6CB0510AA63EB000D23BFD /* Migrate Headers */,
939811300824BF01008DF038 /* Make Frameworks Symbolic Link */,
9398100D0824BF01008DF038 /* Headers */,
- 1A6D65BA18346ADD005AEDE9 /* Postprocess Headers */,
939810B20824BF01008DF038 /* Resources */,
939810BB0824BF01008DF038 /* Sources */,
1C395DE20C6BE8E0000D1E52 /* Generate 64-bit Export File */,
@@ -2046,21 +2045,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 1A6D65BA18346ADD005AEDE9 /* Postprocess Headers */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)/WebHistory.h",
- );
- name = "Postprocess Headers";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "cd \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n\nif [[ ${TARGET_MAC_OS_X_VERSION_MAJOR} == \"1080\" ]]; then\nUNIFDEF_OPTION=\"-U__NSd_10_9\";\nelse\nUNIFDEF_OPTION=\"-D__NSd_10_9\";\nfi\n\nfor HEADER in WebHistory.h; do\nunifdef -B ${UNIFDEF_OPTION} -o ${HEADER}.unifdef ${HEADER}\ncase $? in\n0)\nrm ${HEADER}.unifdef\n;;\n1)\nmv ${HEADER}{.unifdef,}\n;;\n*)\nexit 1\nesac\ndone\n";
- };
1C395DE20C6BE8E0000D1E52 /* Generate 64-bit Export File */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Modified: trunk/Source/WebKit/mac/ChangeLog (159272 => 159273)
--- trunk/Source/WebKit/mac/ChangeLog 2013-11-14 03:01:16 UTC (rev 159272)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-14 03:08:27 UTC (rev 159273)
@@ -1,3 +1,10 @@
+2013-11-13 Joseph Pecoraro <[email protected]>
+
+ Unreviewed rollout of r159271, broke Mountain Lion build.
+
+ * History/WebHistory.h:
+ * History/WebHistory.mm:
+
2013-11-13 Anders Carlsson <[email protected]>
Deprecate WebHistory methods that use NSCalendarDate
Modified: trunk/Source/WebKit/mac/History/WebHistory.h (159272 => 159273)
--- trunk/Source/WebKit/mac/History/WebHistory.h 2013-11-14 03:01:16 UTC (rev 159272)
+++ trunk/Source/WebKit/mac/History/WebHistory.h 2013-11-14 03:08:27 UTC (rev 159273)
@@ -28,10 +28,6 @@
#import <Foundation/Foundation.h>
-#ifndef __NSd_10_9
-#define __NSd_10_9 ,deprecated=10.9
-#endif
-
@class NSError;
@class WebHistoryItem;
@@ -120,7 +116,7 @@
or more history items, ordered from most recent to oldest.
@result Returns an array of NSCalendarDates for which history items exist in the WebHistory.
*/
-- (NSArray *)orderedLastVisitedDays NS_DEPRECATED_MAC(10_3, 10_9);
+- (NSArray *)orderedLastVisitedDays;
/*!
@method orderedItemsLastVisitedOnDay:
@@ -129,7 +125,7 @@
@param calendarDate A date identifying the unique day of interest.
@result Returns an array of WebHistoryItems last visited on the indicated day.
*/
-- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate NS_DEPRECATED_MAC(10_3, 10_9);
+- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
/*!
@method itemForURL:
Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (159272 => 159273)
--- trunk/Source/WebKit/mac/History/WebHistory.mm 2013-11-14 03:01:16 UTC (rev 159272)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2013-11-14 03:08:27 UTC (rev 159273)
@@ -92,6 +92,7 @@
- (void)rebuildHistoryByDayIfNeeded:(WebHistory *)webHistory;
- (NSArray *)orderedLastVisitedDays;
+- (NSArray *)orderedItemsLastVisitedOnDay:(NSCalendarDate *)calendarDate;
- (BOOL)containsURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURL:(NSURL *)URL;
- (WebHistoryItem *)itemForURLString:(NSString *)URLString;
@@ -100,6 +101,8 @@
- (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;
@@ -429,9 +432,6 @@
// MARK: DATE-BASED RETRIEVAL
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
- (NSArray *)orderedLastVisitedDays
{
if (!_orderedLastVisitedDays) {
@@ -462,8 +462,6 @@
return _entriesByDate->get(dateKey).get();
}
-#pragma clang diagnostic pop
-
// MARK: URL MATCHING
- (WebHistoryItem *)itemForURLString:(NSString *)URLString
@@ -514,9 +512,6 @@
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
@@ -525,8 +520,6 @@
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;
