<!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>[175698] trunk/Source/WebKit2</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/175698">175698</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-06 08:40:28 -0800 (Thu, 06 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] WebProcess needs to take a background task assertion to prevent being killed
for "suspended with locked system files"
https://bugs.webkit.org/show_bug.cgi?id=138155
<rdar://problem/17939303>
Reviewed by Anders Carlsson.
Mitigates an issue where the WebProcess may be killed when suspended holding locked files
by allowing the WebProcess to notify the UIProcess when it is holding such files so that
both can continue to run for a period of time after the UIProcess transitions to the
background. In particular, the WebProcess notifies the UIProcess that it is holding- or
relinquished- a locked file when it begins and ends a sequence of SQLite transactions,
respectively.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::disconnect): Relinquish an existing background task assertion
when the WebProcess disconnects. Among other situations, the WebProcess may disconnect as
a result of being suspended holding locked files even when the UIProcess requested a
background task assertion (i.e. it may have exceeded its background time limit).
(WebKit::WebProcessProxy::setIsHoldingLockedFiles): Added. Either acquires a new background
task assertion or relinquishes an existing one.
* UIProcess/WebProcessProxy.h:
* UIProcess/WebProcessProxy.messages.in: Added message SetIsHoldingLockedFiles(bool). The WebProcess
dispatches this message to inform the UIProcess that it is holding- or relinquished- a locked file.
* WebKit2.xcodeproj/project.pbxproj: Added files WebSQLiteDatabaseTracker.{cpp, h}.
* WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp: Added.
(WebKit::WebSQLiteDatabaseTracker::supplementName): Added.
(WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker): Added.
(WebKit::WebSQLiteDatabaseTracker::initialize): Register to receive SQLiteDatabaseTrackerClient callbacks.
(WebKit::WebSQLiteDatabaseTracker::willBeginFirstTransaction): Inform the HysteresisActivity object on
the main thread that we began a transaction so that it calls WebSQLiteDatabaseTracker::started().
(WebKit::WebSQLiteDatabaseTracker::didFinishLastTransaction): Inform the HysteresisActivity object on
the main thread that we finished a transaction so that it may eventually call WebSQLiteDatabaseTracker::stopped().
(WebKit::WebSQLiteDatabaseTracker::started): Notify the UIProcess that the WebProcess is holding
a locked file.
(WebKit::WebSQLiteDatabaseTracker::stopped): Notify the UIProcess that the WebProcess has
relinquished the locked file.
* WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h: Added. We use a HysteresisActivity object
to coalesce SetIsHoldingLockedFiles(false) messages as an optimization to minimize the number of
messages exchanged between the UIProcess and WebProcess when a web page performs SQLite transactions
in batches.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess): Instantiate the supplement WebSQLiteDatabaseTracker when building
for iOS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackercpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackerh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175697 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-06 16:00:24 UTC (rev 175697)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2014-11-06 Daniel Bates <dabates@apple.com>
+
+ [iOS] WebProcess needs to take a background task assertion to prevent being killed
+ for "suspended with locked system files"
+ https://bugs.webkit.org/show_bug.cgi?id=138155
+ <rdar://problem/17939303>
+
+ Reviewed by Anders Carlsson.
+
+ Mitigates an issue where the WebProcess may be killed when suspended holding locked files
+ by allowing the WebProcess to notify the UIProcess when it is holding such files so that
+ both can continue to run for a period of time after the UIProcess transitions to the
+ background. In particular, the WebProcess notifies the UIProcess that it is holding- or
+ relinquished- a locked file when it begins and ends a sequence of SQLite transactions,
+ respectively.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::disconnect): Relinquish an existing background task assertion
+ when the WebProcess disconnects. Among other situations, the WebProcess may disconnect as
+ a result of being suspended holding locked files even when the UIProcess requested a
+ background task assertion (i.e. it may have exceeded its background time limit).
+ (WebKit::WebProcessProxy::setIsHoldingLockedFiles): Added. Either acquires a new background
+ task assertion or relinquishes an existing one.
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/WebProcessProxy.messages.in: Added message SetIsHoldingLockedFiles(bool). The WebProcess
+ dispatches this message to inform the UIProcess that it is holding- or relinquished- a locked file.
+ * WebKit2.xcodeproj/project.pbxproj: Added files WebSQLiteDatabaseTracker.{cpp, h}.
+ * WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp: Added.
+ (WebKit::WebSQLiteDatabaseTracker::supplementName): Added.
+ (WebKit::WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker): Added.
+ (WebKit::WebSQLiteDatabaseTracker::initialize): Register to receive SQLiteDatabaseTrackerClient callbacks.
+ (WebKit::WebSQLiteDatabaseTracker::willBeginFirstTransaction): Inform the HysteresisActivity object on
+ the main thread that we began a transaction so that it calls WebSQLiteDatabaseTracker::started().
+ (WebKit::WebSQLiteDatabaseTracker::didFinishLastTransaction): Inform the HysteresisActivity object on
+ the main thread that we finished a transaction so that it may eventually call WebSQLiteDatabaseTracker::stopped().
+ (WebKit::WebSQLiteDatabaseTracker::started): Notify the UIProcess that the WebProcess is holding
+ a locked file.
+ (WebKit::WebSQLiteDatabaseTracker::stopped): Notify the UIProcess that the WebProcess has
+ relinquished the locked file.
+ * WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h: Added. We use a HysteresisActivity object
+ to coalesce SetIsHoldingLockedFiles(false) messages as an optimization to minimize the number of
+ messages exchanged between the UIProcess and WebProcess when a web page performs SQLite transactions
+ in batches.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess): Instantiate the supplement WebSQLiteDatabaseTracker when building
+ for iOS.
+
</ins><span class="cx"> 2014-11-06 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [Stable] webkitgtk 2.6.1 fails to load flashplugin
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (175697 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-11-06 16:00:24 UTC (rev 175697)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_responsivenessTimer.invalidate();
</span><ins>+ m_tokenForHoldingLockedFiles = nullptr;
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebFrameProxy>> frames;
</span><span class="cx"> copyValuesToVector(m_frameMap, frames);
</span><span class="lines">@@ -794,4 +795,14 @@
</span><span class="cx"> m_throttler->didCancelProcessSuspension();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
+{
+ if (!isHoldingLockedFiles) {
+ m_tokenForHoldingLockedFiles = nullptr;
+ return;
+ }
+ if (!m_tokenForHoldingLockedFiles)
+ m_tokenForHoldingLockedFiles = std::make_unique<ProcessThrottler::BackgroundActivityToken>(*m_throttler);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (175697 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-11-06 16:00:24 UTC (rev 175697)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -142,7 +142,9 @@
</span><span class="cx"> void processReadyToSuspend();
</span><span class="cx"> void sendCancelProcessWillSuspend();
</span><span class="cx"> void didCancelProcessSuspension();
</span><del>-
</del><ins>+
+ void setIsHoldingLockedFiles(bool);
+
</ins><span class="cx"> ProcessThrottler& throttler() { return *m_throttler; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -230,6 +232,7 @@
</span><span class="cx">
</span><span class="cx"> int m_numberOfTimesSuddenTerminationWasDisabled;
</span><span class="cx"> std::unique_ptr<ProcessThrottler> m_throttler;
</span><ins>+ std::unique_ptr<ProcessThrottler::BackgroundActivityToken> m_tokenForHoldingLockedFiles;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (175697 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2014-11-06 16:00:24 UTC (rev 175697)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -49,4 +49,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> ProcessReadyToSuspend()
</span><span class="cx"> DidCancelProcessSuspension()
</span><ins>+
+ SetIsHoldingLockedFiles(bool isHoldingLockedFiles)
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (175697 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-11-06 16:00:24 UTC (rev 175697)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -1593,6 +1593,8 @@
</span><span class="cx"> CDE6E2D319F731C400BA9688 /* WebOriginDataManagerSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE6E2D219F731C400BA9688 /* WebOriginDataManagerSupplement.h */; };
</span><span class="cx"> CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */; };
</span><span class="cx"> CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */; };
</span><ins>+ CEDBA84719FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEDBA84519FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp */; };
+ CEDBA84819FDA00A006866A5 /* WebSQLiteDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDBA84619FDA00A006866A5 /* WebSQLiteDatabaseTracker.h */; };
</ins><span class="cx"> D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */; };
</span><span class="cx"> D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
</span><span class="cx"> D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */; };
</span><span class="lines">@@ -3689,6 +3691,8 @@
</span><span class="cx"> CDE6E2D219F731C400BA9688 /* WebOriginDataManagerSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebOriginDataManagerSupplement.h; path = OriginData/WebOriginDataManagerSupplement.h; sourceTree = "<group>"; };
</span><span class="cx"> CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAlternativeTextClient.h; sourceTree = "<group>"; };
</span><span class="cx"> CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebAlternativeTextClient.cpp; sourceTree = "<group>"; };
</span><ins>+ CEDBA84519FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSQLiteDatabaseTracker.cpp; sourceTree = "<group>"; };
+ CEDBA84619FDA00A006866A5 /* WebSQLiteDatabaseTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSQLiteDatabaseTracker.h; sourceTree = "<group>"; };
</ins><span class="cx"> D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; };
</span><span class="cx"> D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; };
</span><span class="cx"> D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5695,6 +5699,8 @@
</span><span class="cx"> 1A1E093218861D3800D2DC49 /* WebProgressTrackerClient.h */,
</span><span class="cx"> D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */,
</span><span class="cx"> D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */,
</span><ins>+ CEDBA84519FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp */,
+ CEDBA84619FDA00A006866A5 /* WebSQLiteDatabaseTracker.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = WebCoreSupport;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7335,6 +7341,7 @@
</span><span class="cx"> 1AAB037A185A7C6A00EDF501 /* MessageSender.h in Headers */,
</span><span class="cx"> 1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */,
</span><span class="cx"> 1AFE436618B6C081009C7A48 /* UIDelegate.h in Headers */,
</span><ins>+ CEDBA84819FDA00A006866A5 /* WebSQLiteDatabaseTracker.h in Headers */,
</ins><span class="cx"> E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */,
</span><span class="cx"> BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */,
</span><span class="cx"> BC597075116591D000551FCA /* ProcessModel.h in Headers */,
</span><span class="lines">@@ -8955,6 +8962,7 @@
</span><span class="cx"> 2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
</span><span class="cx"> BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
</span><span class="cx"> 1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
</span><ins>+ CEDBA84719FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp in Sources */,
</ins><span class="cx"> 31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */,
</span><span class="cx"> 1A8EF4CC1252403700F7067F /* PluginControllerProxy.cpp in Sources */,
</span><span class="cx"> 1A2D91A61281D739001EB962 /* PluginControllerProxyMac.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackercpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp (0 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebSQLiteDatabaseTracker.h"
+
+#if ENABLE(SQL_DATABASE)
+
+#include "WebProcess.h"
+#include "WebProcessProxyMessages.h"
+#include <WebCore/SQLiteDatabaseTracker.h>
+#include <wtf/MainThread.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+const char* WebSQLiteDatabaseTracker::supplementName()
+{
+ return "WebSQLiteDatabaseTracker";
+}
+
+WebSQLiteDatabaseTracker::WebSQLiteDatabaseTracker(WebProcess* process)
+ : m_process(process)
+ , m_hysteresis(*this)
+{
+}
+
+void WebSQLiteDatabaseTracker::initialize(const WebProcessCreationParameters&)
+{
+ SQLiteDatabaseTracker::setClient(this);
+}
+
+void WebSQLiteDatabaseTracker::willBeginFirstTransaction()
+{
+ callOnMainThread([this] {
+ m_hysteresis.start();
+ });
+}
+
+void WebSQLiteDatabaseTracker::didFinishLastTransaction()
+{
+ callOnMainThread([this] {
+ m_hysteresis.stop();
+ });
+}
+
+void WebSQLiteDatabaseTracker::started()
+{
+ m_process->parentProcessConnection()->send(Messages::WebProcessProxy::SetIsHoldingLockedFiles(true), 0);
+}
+
+void WebSQLiteDatabaseTracker::stopped()
+{
+ m_process->parentProcessConnection()->send(Messages::WebProcessProxy::SetIsHoldingLockedFiles(false), 0);
+}
+
+} // namespace WebKit
+
+#endif // ENABLE(SQL_DATABASE)
</ins><span class="cx">Property changes on: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebSQLiteDatabaseTrackerh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h (0 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebSQLiteDatabaseTracker_h
+#define WebSQLiteDatabaseTracker_h
+
+#include "WebProcessSupplement.h"
+#include <WebCore/HysteresisActivity.h>
+#include <WebCore/SQLiteDatabaseTrackerClient.h>
+#include <wtf/Noncopyable.h>
+
+#if ENABLE(SQL_DATABASE)
+
+namespace WebKit {
+
+class WebProcess;
+
+class WebSQLiteDatabaseTracker : public WebCore::SQLiteDatabaseTrackerClient, public WebProcessSupplement {
+ WTF_MAKE_NONCOPYABLE(WebSQLiteDatabaseTracker);
+public:
+ explicit WebSQLiteDatabaseTracker(WebProcess*);
+
+ static const char* supplementName();
+
+ // WebSupplement
+ virtual void initialize(const WebProcessCreationParameters&) override;
+
+ // WebCore::SQLiteDatabaseTrackerClient
+ virtual void willBeginFirstTransaction() override;
+ virtual void didFinishLastTransaction() override;
+
+private:
+ // WebCore::HysteresisActivity
+ friend class WebCore::HysteresisActivity<WebSQLiteDatabaseTracker>;
+ void started();
+ void stopped();
+
+ WebProcess* m_process;
+ WebCore::HysteresisActivity<WebSQLiteDatabaseTracker> m_hysteresis;
+};
+
+} // namespace WebKit
+
+#endif // ENABLE(SQL_DATABASE)
+
+#endif // WebSQLiteDatabaseTracker_h
</ins><span class="cx">Property changes on: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (175697 => 175698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-11-06 16:00:24 UTC (rev 175697)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-11-06 16:40:28 UTC (rev 175698)
</span><span class="lines">@@ -113,7 +113,10 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> #include "WebDatabaseManager.h"
</span><ins>+#if PLATFORM(IOS)
+#include "WebSQLiteDatabaseTracker.h"
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> #include "WebBatteryManager.h"
</span><span class="lines">@@ -193,7 +196,11 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> addSupplement<WebDatabaseManager>();
</span><ins>+#if PLATFORM(IOS)
+ addSupplement<WebSQLiteDatabaseTracker>();
</ins><span class="cx"> #endif
</span><ins>+#endif
+
</ins><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> addSupplement<WebNotificationManager>();
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>