Diff
Modified: trunk/Source/WebCore/ChangeLog (184739 => 184740)
--- trunk/Source/WebCore/ChangeLog 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebCore/ChangeLog 2015-05-22 00:34:12 UTC (rev 184740)
@@ -1,3 +1,20 @@
+2015-05-21 Daniel Bates <daba...@apple.com>
+
+ Rollout <http://trac.webkit.org/changeset/183909>
+ (https://bugs.webkit.org/show_bug.cgi?id=144657)
+
+ Revert <http://trac.webkit.org/changeset/183909> since pausing the database
+ thread prevents in-progress transactions from completing. We need to think
+ about this change some more.
+
+ * Modules/webdatabase/AbstractDatabaseServer.h:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::setPauseAllDatabases): Deleted.
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ (WebCore::DatabaseServer::setPauseAllDatabases): Deleted.
+ * Modules/webdatabase/DatabaseServer.h:
+
2015-05-21 Jake Nielsen <jacob_niel...@apple.com>
r184718 and r184725 caused four tests to begin crashing
Modified: trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h (184739 => 184740)
--- trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-05-22 00:34:12 UTC (rev 184740)
@@ -73,8 +73,6 @@
virtual bool deleteOrigin(SecurityOrigin*) = 0;
virtual bool deleteDatabase(SecurityOrigin*, const String& name) = 0;
- virtual void setPauseAllDatabases(bool) = 0;
-
virtual void interruptAllDatabasesForContext(const DatabaseContext*) = 0;
protected:
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (184739 => 184740)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-05-22 00:34:12 UTC (rev 184740)
@@ -397,11 +397,6 @@
return m_server->deleteDatabase(origin, name);
}
-void DatabaseManager::setPauseAllDatabases(bool pauseAllDatabases)
-{
- m_server->setPauseAllDatabases(pauseAllDatabases);
-}
-
void DatabaseManager::closeAllDatabases()
{
m_server->closeAllDatabases();
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h (184739 => 184740)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-05-22 00:34:12 UTC (rev 184740)
@@ -106,8 +106,6 @@
WEBCORE_EXPORT bool deleteOrigin(SecurityOrigin*);
WEBCORE_EXPORT bool deleteDatabase(SecurityOrigin*, const String& name);
- WEBCORE_EXPORT void setPauseAllDatabases(bool);
-
void interruptAllDatabasesForContext(ScriptExecutionContext*);
private:
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (184739 => 184740)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-05-22 00:34:12 UTC (rev 184740)
@@ -108,15 +108,6 @@
return DatabaseTracker::tracker().deleteDatabase(origin, name);
}
-void DatabaseServer::setPauseAllDatabases(bool pauseAllDatabases)
-{
-#if PLATFORM(IOS)
- DatabaseTracker::tracker().setDatabasesPaused(pauseAllDatabases);
-#else
- UNUSED_PARAM(pauseAllDatabases);
-#endif
-}
-
void DatabaseServer::closeAllDatabases()
{
DatabaseTracker::tracker().closeAllDatabases();
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h (184739 => 184740)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-05-22 00:34:12 UTC (rev 184740)
@@ -62,8 +62,6 @@
virtual bool deleteOrigin(SecurityOrigin*);
virtual bool deleteDatabase(SecurityOrigin*, const String& name);
- void setPauseAllDatabases(bool) override;
-
virtual void interruptAllDatabasesForContext(const DatabaseContext*);
protected:
Modified: trunk/Source/WebKit2/ChangeLog (184739 => 184740)
--- trunk/Source/WebKit2/ChangeLog 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-22 00:34:12 UTC (rev 184740)
@@ -1,3 +1,26 @@
+2015-05-21 Daniel Bates <daba...@apple.com>
+
+ Rollout <http://trac.webkit.org/changeset/183909>
+ (https://bugs.webkit.org/show_bug.cgi?id=144657)
+
+ Revert <http://trac.webkit.org/changeset/183909> since pausing the database
+ thread prevents in-progress transactions from completing. We need to think
+ about this change some more.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _applicationDidEnterBackground:]): Deleted.
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidEnterBackground): Deleted.
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ (WebKit::WebDatabaseManager::setPauseAllDatabases): Deleted.
+ * WebProcess/WebCoreSupport/WebDatabaseManager.h:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::applicationWillEnterForeground): Deleted.
+ (WebKit::WebPage::applicationDidEnterBackground): Deleted.
+
2015-05-21 Enrica Casucci <enr...@apple.com>
[iOS] Crash when taking a snapshot of a large PDF.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (184739 => 184740)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-22 00:34:12 UTC (rev 184740)
@@ -497,12 +497,9 @@
void setAssistedNodeValue(const String&);
void setAssistedNodeValueAsNumber(double);
void setAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection = false);
-
void applicationWillEnterForeground();
- void applicationDidEnterBackground();
void applicationWillResignActive();
void applicationDidBecomeActive();
-
void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
void commitPotentialTapFailed();
void didNotHandleTapAsClick(const WebCore::IntPoint&);
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (184739 => 184740)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-05-22 00:34:12 UTC (rev 184740)
@@ -549,7 +549,6 @@
- (void)_applicationDidEnterBackground:(NSNotification*)notification
{
_isBackground = YES;
- _page->applicationDidEnterBackground();
_page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow);
}
Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (184739 => 184740)
--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-05-22 00:34:12 UTC (rev 184740)
@@ -598,12 +598,6 @@
m_process->send(Messages::WebPage::ApplicationWillEnterForeground(), m_pageID);
}
-void WebPageProxy::applicationDidEnterBackground()
-{
- uint64_t callbackID = m_callbacks.put(VoidCallback::create([](CallbackBase::Error) { }, m_process->throttler().backgroundActivityToken()));
- m_process->send(Messages::WebPage::ApplicationDidEnterBackground(callbackID), m_pageID);
-}
-
void WebPageProxy::applicationWillResignActive()
{
m_process->send(Messages::WebPage::ApplicationWillResignActive(), m_pageID);
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (184739 => 184740)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-05-22 00:34:12 UTC (rev 184740)
@@ -137,11 +137,6 @@
DatabaseManager::singleton().deleteAllDatabases();
}
-void WebDatabaseManager::setPauseAllDatabases(bool pauseAllDatabases)
-{
- DatabaseManager::singleton().setPauseAllDatabases(pauseAllDatabases);
-}
-
void WebDatabaseManager::closeAllDatabases() const
{
DatabaseManager::singleton().closeAllDatabases();
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h (184739 => 184740)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-05-22 00:34:12 UTC (rev 184740)
@@ -46,8 +46,6 @@
void setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const;
void deleteAllDatabases() const;
- void setPauseAllDatabases(bool);
-
void closeAllDatabases() const;
private:
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (184739 => 184740)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-22 00:34:12 UTC (rev 184740)
@@ -786,12 +786,9 @@
void updateVisibleContentRects(const VisibleContentRectUpdateInfo&, double oldestTimestamp);
bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
void willStartUserTriggeredZooming();
-
void applicationWillResignActive();
void applicationWillEnterForeground();
- void applicationDidEnterBackground(uint64_t callbackID);
void applicationDidBecomeActive();
-
void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
void completePendingSyntheticClickForContentChangeObserver();
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (184739 => 184740)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-22 00:34:12 UTC (rev 184740)
@@ -87,12 +87,9 @@
SetAssistedNodeValue(String value)
SetAssistedNodeValueAsNumber(double value)
SetAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection)
-
ApplicationWillResignActive()
ApplicationWillEnterForeground()
- ApplicationDidEnterBackground(uint64_t callbackID)
ApplicationDidBecomeActive()
-
ContentSizeCategoryDidChange(String contentSizeCategory)
ExecuteEditCommandWithCallback(String name, uint64_t callbackID)
GetLookupContextAtPoint(WebCore::IntPoint point, uint64_t callbackID)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (184739 => 184740)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-05-22 00:31:07 UTC (rev 184739)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-05-22 00:34:12 UTC (rev 184740)
@@ -42,7 +42,6 @@
#import "WKAccessibilityWebPageObjectIOS.h"
#import "WebChromeClient.h"
#import "WebCoreArgumentCoders.h"
-#import "WebDatabaseManager.h"
#import "WebFrame.h"
#import "WebImage.h"
#import "WebKitSystemInterface.h"
@@ -2721,16 +2720,9 @@
void WebPage::applicationWillEnterForeground()
{
- WebProcess::singleton().supplement<WebDatabaseManager>()->setPauseAllDatabases(false);
[[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationWillEnterForegroundNotification object:nil];
}
-void WebPage::applicationDidEnterBackground(uint64_t callbackID)
-{
- WebProcess::singleton().supplement<WebDatabaseManager>()->setPauseAllDatabases(true);
- send(Messages::WebPageProxy::VoidCallback(callbackID));
-}
-
void WebPage::applicationDidBecomeActive()
{
[[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationDidBecomeActiveNotification object:nil];
