Changeset 43937 in webkit

Timestamp:

May 20, 2009 3:35:10 PM (15 years ago)

Author:

beidson@apple.com

Message:

2009-05-20 Brady Eidson <​beidson@apple.com>

Reviewed by Darin Adler.

<rdar://problem/6905336> REGRESSION: "Clear History" does not save empty history to disk

• History/WebHistory.mm: (-[WebHistoryPrivate data]): If there are no entries, return an empty NSData instead of nil.

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• History/WebHistory.mm (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-05-20  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/6905336> REGRESSION: "Clear History" does not save empty history to disk
+
+        * History/WebHistory.mm:
+        (-[WebHistoryPrivate data]): If there are no entries, return an empty NSData instead of nil.
+
 2009-05-20  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/mac/History/WebHistory.mm

@@ -582 +582 @@
 - (NSData *)data
 {
-    if (_entriesByDate->isEmpty())
-        return nil;
+    if (_entriesByDate->isEmpty()) {
+        static NSData *emptyHistoryData = (NSData *)CFDataCreate(0, 0, 0);
+        return emptyHistoryData;
+    }
     
     // Ignores the date and item count limits; these are respected when loading instead of when saving, so