Diff
Modified: trunk/Source/WebKit2/ChangeLog (183277 => 183278)
--- trunk/Source/WebKit2/ChangeLog 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-24 20:48:32 UTC (rev 183278)
@@ -1,3 +1,23 @@
+2015-04-24 Anders Carlsson <ander...@apple.com>
+
+ Rename -[WKWebsiteDataStore isNonPersistent] to -[WKWebsiteDataStore isPersistent]
+ https://bugs.webkit.org/show_bug.cgi?id=144158
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/APIWebsiteDataStore.cpp:
+ (API::WebsiteDataStore::isPersistent):
+ (API::WebsiteDataStore::isNonPersistent): Deleted.
+ * UIProcess/API/APIWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore isPersistent]):
+ (-[WKWebsiteDataStore isNonPersistent]): Deleted.
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (-[_WKWebsiteDataStore isNonPersistent]):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+
2015-04-24 Brent Fulgham <bfulg...@apple.com>
Immediate action not functional for embedded PDFs
Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp (183277 => 183278)
--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.cpp 2015-04-24 20:48:32 UTC (rev 183278)
@@ -61,9 +61,9 @@
{
}
-bool WebsiteDataStore::isNonPersistent()
+bool WebsiteDataStore::isPersistent()
{
- return m_websiteDataStore->isNonPersistent();
+ return !m_websiteDataStore->isNonPersistent();
}
#if !PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h (183277 => 183278)
--- trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsiteDataStore.h 2015-04-24 20:48:32 UTC (rev 183278)
@@ -40,7 +40,7 @@
static RefPtr<WebsiteDataStore> create(WebKit::WebsiteDataStore::Configuration);
virtual ~WebsiteDataStore();
- bool isNonPersistent();
+ bool isPersistent();
WebKit::WebsiteDataStore& websiteDataStore() { return *m_websiteDataStore; }
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (183277 => 183278)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2015-04-24 20:48:32 UTC (rev 183278)
@@ -49,8 +49,8 @@
- (instancetype)init WK_UNAVAILABLE;
-/*! @abstract Whether the data store is non-persistent or not. */
-@property (readonly, getter=isNonPersistent) BOOL nonPersistent;
+/*! @abstract Whether the data store is persistent or not. */
+@property (nonatomic, readonly, getter=isPersistent) BOOL persistent;
/*! @abstract Returns a set of all available website data types. */
+ (WK_SET(NSString *) *)allWebsiteDataTypes;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (183277 => 183278)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-24 20:48:32 UTC (rev 183278)
@@ -50,9 +50,9 @@
[super dealloc];
}
-- (BOOL)isNonPersistent
+- (BOOL)isPersistent
{
- return _websiteDataStore->isNonPersistent();
+ return _websiteDataStore->isPersistent();
}
+ (NSSet *)allWebsiteDataTypes
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (183277 => 183278)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-24 20:48:32 UTC (rev 183278)
@@ -40,6 +40,8 @@
+ (_WKWebsiteDataStore *)defaultDataStore;
+ (_WKWebsiteDataStore *)nonPersistentDataStore;
+@property (readonly, getter=isNonPersistent) BOOL nonPersistent;
+
- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)(void))completionHandler;
- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (183277 => 183278)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-24 20:48:32 UTC (rev 183278)
@@ -75,6 +75,11 @@
return (_WKWebsiteDataStore *)[WKWebsiteDataStore nonPersistentDataStore];
}
+- (BOOL)isNonPersistent
+{
+ return !self.persistent;
+}
+
- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler
{
[super fetchDataRecordsOfTypes:toWKWebsiteDataTypes(websiteDataTypes).get() completionHandler:completionHandler];
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (183277 => 183278)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2015-04-24 20:48:32 UTC (rev 183278)
@@ -57,6 +57,7 @@
uint64_t identifier() const { return m_identifier; }
+ // FIXME: Change this to isPersistent() and update callers.
bool isNonPersistent() const { return m_sessionID.isEphemeral(); }
WebCore::SessionID sessionID() const { return m_sessionID; }
Modified: trunk/Tools/ChangeLog (183277 => 183278)
--- trunk/Tools/ChangeLog 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Tools/ChangeLog 2015-04-24 20:48:32 UTC (rev 183278)
@@ -1,3 +1,13 @@
+2015-04-24 Anders Carlsson <ander...@apple.com>
+
+ Rename -[WKWebsiteDataStore isNonPersistent] to -[WKWebsiteDataStore isPersistent]
+ https://bugs.webkit.org/show_bug.cgi?id=144158
+
+ Reviewed by Beth Dakin.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController initWithConfiguration:]):
+
2015-04-24 Doug Russell <d_russ...@apple.com>
AX: richer text change notifications (142719)
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (183277 => 183278)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-24 19:33:10 UTC (rev 183277)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-24 20:48:32 UTC (rev 183278)
@@ -78,7 +78,7 @@
return nil;
_configuration = [configuration copy];
- _isPrivateBrowsingWindow = _configuration.websiteDataStore.isNonPersistent;
+ _isPrivateBrowsingWindow = !_configuration.websiteDataStore.isPersistent;
return self;
}
