<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184759] branches/safari-601.1.32.2-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184759">184759</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 23:36:57 -0700 (Thu, 21 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184740">r184740</a>. rdar://problem/21068522</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceWebCoreChangeLog">branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreModuleswebdatabaseAbstractDatabaseServerh">branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseManagercpp">branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseManagerh">branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseServercpp">branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseServerh">branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2ChangeLog">branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessiosWKContentViewmm">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessiosWebPageProxyIOSmm">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp">branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagerh">branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2WebProcessWebPageWebPagemessagesin">branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-05-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184740.
+
+ 2015-05-21 Daniel Bates <dabates@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 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184728.
</span><span class="cx">
</span><span class="cx"> 2015-05-21 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreModuleswebdatabaseAbstractDatabaseServerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -71,8 +71,6 @@
</span><span class="cx"> virtual bool deleteOrigin(SecurityOrigin*) = 0;
</span><span class="cx"> virtual bool deleteDatabase(SecurityOrigin*, const String& name) = 0;
</span><span class="cx">
</span><del>- virtual void setPauseAllDatabases(bool) = 0;
-
</del><span class="cx"> virtual void interruptAllDatabasesForContext(const DatabaseContext*) = 0;
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -397,11 +397,6 @@
</span><span class="cx"> return m_server->deleteDatabase(origin, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseManager::setPauseAllDatabases(bool pauseAllDatabases)
-{
- m_server->setPauseAllDatabases(pauseAllDatabases);
-}
-
</del><span class="cx"> void DatabaseManager::interruptAllDatabasesForContext(ScriptExecutionContext* context)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<DatabaseContext> databaseContext = existingDatabaseContextFor(context);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -103,8 +103,6 @@
</span><span class="cx"> WEBCORE_EXPORT bool deleteOrigin(SecurityOrigin*);
</span><span class="cx"> WEBCORE_EXPORT bool deleteDatabase(SecurityOrigin*, const String& name);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setPauseAllDatabases(bool);
-
</del><span class="cx"> void interruptAllDatabasesForContext(ScriptExecutionContext*);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseServercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -108,15 +108,6 @@
</span><span class="cx"> return DatabaseTracker::tracker().deleteDatabase(origin, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseServer::setPauseAllDatabases(bool pauseAllDatabases)
-{
-#if PLATFORM(IOS)
- DatabaseTracker::tracker().setDatabasesPaused(pauseAllDatabases);
-#else
- UNUSED_PARAM(pauseAllDatabases);
-#endif
-}
-
</del><span class="cx"> void DatabaseServer::interruptAllDatabasesForContext(const DatabaseContext* context)
</span><span class="cx"> {
</span><span class="cx"> DatabaseTracker::tracker().interruptAllDatabasesForContext(context);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreModuleswebdatabaseDatabaseServerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.h (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.h 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -60,8 +60,6 @@
</span><span class="cx"> virtual bool deleteOrigin(SecurityOrigin*);
</span><span class="cx"> virtual bool deleteDatabase(SecurityOrigin*, const String& name);
</span><span class="cx">
</span><del>- void setPauseAllDatabases(bool) override;
-
</del><span class="cx"> virtual void interruptAllDatabasesForContext(const DatabaseContext*);
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-05-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184740.
+
+ 2015-05-21 Daniel Bates <dabates@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 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184739.
</span><span class="cx">
</span><span class="cx"> 2015-05-21 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -493,12 +493,9 @@
</span><span class="cx"> void setAssistedNodeValue(const String&);
</span><span class="cx"> void setAssistedNodeValueAsNumber(double);
</span><span class="cx"> void setAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection = false);
</span><del>-
</del><span class="cx"> void applicationWillEnterForeground();
</span><del>- void applicationDidEnterBackground();
</del><span class="cx"> void applicationWillResignActive();
</span><span class="cx"> void applicationDidBecomeActive();
</span><del>-
</del><span class="cx"> void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
</span><span class="cx"> void commitPotentialTapFailed();
</span><span class="cx"> void didNotHandleTapAsClick(const WebCore::IntPoint&);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -549,7 +549,6 @@
</span><span class="cx"> - (void)_applicationDidEnterBackground:(NSNotification*)notification
</span><span class="cx"> {
</span><span class="cx"> _isBackground = YES;
</span><del>- _page->applicationDidEnterBackground();
</del><span class="cx"> _page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -598,12 +598,6 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ApplicationWillEnterForeground(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> void WebPageProxy::applicationWillResignActive()
</span><span class="cx"> {
</span><span class="cx"> m_process->send(Messages::WebPage::ApplicationWillResignActive(), m_pageID);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -137,11 +137,6 @@
</span><span class="cx"> DatabaseManager::singleton().deleteAllDatabases();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDatabaseManager::setPauseAllDatabases(bool pauseAllDatabases)
-{
- DatabaseManager::singleton().setPauseAllDatabases(pauseAllDatabases);
-}
-
</del><span class="cx"> void WebDatabaseManager::setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const
</span><span class="cx"> {
</span><span class="cx"> // If the quota is set to a value lower than the current usage, that quota will
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -46,8 +46,6 @@
</span><span class="cx"> void setQuotaForOrigin(const String& originIdentifier, unsigned long long quota) const;
</span><span class="cx"> void deleteAllDatabases() const;
</span><span class="cx">
</span><del>- void setPauseAllDatabases(bool);
-
</del><span class="cx"> private:
</span><span class="cx"> // WebProcessSupplement
</span><span class="cx"> virtual void initialize(const WebProcessCreationParameters&) override;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -786,12 +786,9 @@
</span><span class="cx"> void updateVisibleContentRects(const VisibleContentRectUpdateInfo&, double oldestTimestamp);
</span><span class="cx"> bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
</span><span class="cx"> void willStartUserTriggeredZooming();
</span><del>-
</del><span class="cx"> void applicationWillResignActive();
</span><span class="cx"> void applicationWillEnterForeground();
</span><del>- void applicationDidEnterBackground(uint64_t callbackID);
</del><span class="cx"> void applicationDidBecomeActive();
</span><del>-
</del><span class="cx"> void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale);
</span><span class="cx"> void completePendingSyntheticClickForContentChangeObserver();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -87,12 +87,9 @@
</span><span class="cx"> SetAssistedNodeValue(String value)
</span><span class="cx"> SetAssistedNodeValueAsNumber(double value)
</span><span class="cx"> SetAssistedNodeSelectedIndex(uint32_t index, bool allowMultipleSelection)
</span><del>-
</del><span class="cx"> ApplicationWillResignActive()
</span><span class="cx"> ApplicationWillEnterForeground()
</span><del>- ApplicationDidEnterBackground(uint64_t callbackID)
</del><span class="cx"> ApplicationDidBecomeActive()
</span><del>-
</del><span class="cx"> ContentSizeCategoryDidChange(String contentSizeCategory)
</span><span class="cx"> ExecuteEditCommandWithCallback(String name, uint64_t callbackID)
</span><span class="cx"> GetLookupContextAtPoint(WebCore::IntPoint point, uint64_t callbackID)
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (184758 => 184759)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-05-22 06:35:57 UTC (rev 184758)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-05-22 06:36:57 UTC (rev 184759)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #import "WKAccessibilityWebPageObjectIOS.h"
</span><span class="cx"> #import "WebChromeClient.h"
</span><span class="cx"> #import "WebCoreArgumentCoders.h"
</span><del>-#import "WebDatabaseManager.h"
</del><span class="cx"> #import "WebFrame.h"
</span><span class="cx"> #import "WebImage.h"
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="lines">@@ -2721,16 +2720,9 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::applicationWillEnterForeground()
</span><span class="cx"> {
</span><del>- WebProcess::singleton().supplement<WebDatabaseManager>()->setPauseAllDatabases(false);
</del><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationWillEnterForegroundNotification object:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::applicationDidEnterBackground(uint64_t callbackID)
-{
- WebProcess::singleton().supplement<WebDatabaseManager>()->setPauseAllDatabases(true);
- send(Messages::WebPageProxy::VoidCallback(callbackID));
-}
-
</del><span class="cx"> void WebPage::applicationDidBecomeActive()
</span><span class="cx"> {
</span><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:WebUIApplicationDidBecomeActiveNotification object:nil];
</span></span></pre>
</div>
</div>
</body>
</html>