Title: [193962] branches/safari-601-branch/Source/WebCore
- Revision
- 193962
- Author
- [email protected]
- Date
- 2015-12-11 10:26:21 -0800 (Fri, 11 Dec 2015)
Log Message
Merge r192066. rdar://problem/23715623
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193961 => 193962)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-11 18:26:18 UTC (rev 193961)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-11 18:26:21 UTC (rev 193962)
@@ -1,5 +1,20 @@
2015-12-11 Matthew Hanson <[email protected]>
+ Merge r192066. rdar://problem/23715623
+
+ 2015-11-05 Zhuo Li <[email protected]>
+
+ Rename the variable to avoid conflict between the variable and the parameter.
+ https://bugs.webkit.org/show_bug.cgi?id=150019.
+
+ Reviewed by Dan Bernstein.
+
+ * platform/cocoa/SearchPopupMenuCocoa.mm:
+ (WebCore::typeCheckedRecentSearchesRemovingRecentSearchesAddedAfterDate): Rename `date`
+ to `dateAdded` so that it does not have the same name as the parameter passed in.
+
+2015-12-11 Matthew Hanson <[email protected]>
+
Merge r191628. rdar://problem/23715623
2015-10-27 Zhuo Li <[email protected]>
Modified: branches/safari-601-branch/Source/WebCore/platform/cocoa/SearchPopupMenuCocoa.mm (193961 => 193962)
--- branches/safari-601-branch/Source/WebCore/platform/cocoa/SearchPopupMenuCocoa.mm 2015-12-11 18:26:18 UTC (rev 193961)
+++ branches/safari-601-branch/Source/WebCore/platform/cocoa/SearchPopupMenuCocoa.mm 2015-12-11 18:26:21 UTC (rev 193962)
@@ -112,11 +112,11 @@
RetainPtr<NSMutableArray> entriesToRemove = adoptNS([[NSMutableArray alloc] init]);
for (NSDictionary *recentSearch in recentSearches) {
- NSDate *date = typeCheckedDateInRecentSearch(recentSearch);
- if (!date)
+ NSDate *dateAdded = typeCheckedDateInRecentSearch(recentSearch);
+ if (!dateAdded)
return nil;
- if ([date compare:date] == NSOrderedDescending)
+ if ([dateAdded compare:date] == NSOrderedDescending)
[entriesToRemove addObject:recentSearch];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
