Title: [192066] trunk/Source/WebCore
Revision
192066
Author
[email protected]
Date
2015-11-05 11:40:01 -0800 (Thu, 05 Nov 2015)

Log Message

Rename the variable to avoid conflict between the variable and the parameter.
https://bugs.webkit.org/show_bug.cgi?id=150019.

Patch by Zhuo Li <[email protected]> on 2015-11-05
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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (192065 => 192066)


--- trunk/Source/WebCore/ChangeLog	2015-11-05 19:35:22 UTC (rev 192065)
+++ trunk/Source/WebCore/ChangeLog	2015-11-05 19:40:01 UTC (rev 192066)
@@ -1,3 +1,14 @@
+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-11-05  Joseph Pecoraro  <[email protected]>
 
         Web Inspector: Clean up InjectedScript uses

Modified: trunk/Source/WebCore/platform/cocoa/SearchPopupMenuCocoa.mm (192065 => 192066)


--- trunk/Source/WebCore/platform/cocoa/SearchPopupMenuCocoa.mm	2015-11-05 19:35:22 UTC (rev 192065)
+++ trunk/Source/WebCore/platform/cocoa/SearchPopupMenuCocoa.mm	2015-11-05 19:40:01 UTC (rev 192066)
@@ -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

Reply via email to