- Revision
- 175698
- Author
- dba...@webkit.org
- Date
- 2014-11-06 08:40:28 -0800 (Thu, 06 Nov 2014)
Log Message
[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.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (175697 => 175698)
--- 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)
@@ -1,3 +1,50 @@
+2014-11-06 Daniel Bates <daba...@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.
+
2014-11-06 Alberto Garcia <be...@igalia.com>
[GTK] [Stable] webkitgtk 2.6.1 fails to load flashplugin
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (175697 => 175698)
--- 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)
@@ -155,6 +155,7 @@
}
m_responsivenessTimer.invalidate();
+ m_tokenForHoldingLockedFiles = nullptr;
Vector<RefPtr<WebFrameProxy>> frames;
copyValuesToVector(m_frameMap, frames);
@@ -794,4 +795,14 @@
m_throttler->didCancelProcessSuspension();
}
+void WebProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
+{
+ if (!isHoldingLockedFiles) {
+ m_tokenForHoldingLockedFiles = nullptr;
+ return;
+ }
+ if (!m_tokenForHoldingLockedFiles)
+ m_tokenForHoldingLockedFiles = std::make_unique<ProcessThrottler::BackgroundActivityToken>(*m_throttler);
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (175697 => 175698)
--- 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)
@@ -142,7 +142,9 @@
void processReadyToSuspend();
void sendCancelProcessWillSuspend();
void didCancelProcessSuspension();
-
+
+ void setIsHoldingLockedFiles(bool);
+
ProcessThrottler& throttler() { return *m_throttler; }
private:
@@ -230,6 +232,7 @@
int m_numberOfTimesSuddenTerminationWasDisabled;
std::unique_ptr<ProcessThrottler> m_throttler;
+ std::unique_ptr<ProcessThrottler::BackgroundActivityToken> m_tokenForHoldingLockedFiles;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (175697 => 175698)
--- 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)
@@ -49,4 +49,6 @@
#endif
ProcessReadyToSuspend()
DidCancelProcessSuspension()
+
+ SetIsHoldingLockedFiles(bool isHoldingLockedFiles)
}
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (175697 => 175698)
--- 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)
@@ -1593,6 +1593,8 @@
CDE6E2D319F731C400BA9688 /* WebOriginDataManagerSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE6E2D219F731C400BA9688 /* WebOriginDataManagerSupplement.h */; };
CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */; };
CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */; };
+ CEDBA84719FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEDBA84519FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp */; };
+ CEDBA84819FDA00A006866A5 /* WebSQLiteDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDBA84619FDA00A006866A5 /* WebSQLiteDatabaseTracker.h */; };
D3B9484611FF4B6500032B39 /* WebPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */; };
D3B9484711FF4B6500032B39 /* WebPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484311FF4B6500032B39 /* WebPopupMenu.h */; };
D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */; };
@@ -3689,6 +3691,8 @@
CDE6E2D219F731C400BA9688 /* WebOriginDataManagerSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebOriginDataManagerSupplement.h; path = OriginData/WebOriginDataManagerSupplement.h; sourceTree = "<group>"; };
CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAlternativeTextClient.h; sourceTree = "<group>"; };
CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebAlternativeTextClient.cpp; sourceTree = "<group>"; };
+ 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>"; };
D3B9484211FF4B6500032B39 /* WebPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPopupMenu.cpp; sourceTree = "<group>"; };
D3B9484311FF4B6500032B39 /* WebPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPopupMenu.h; sourceTree = "<group>"; };
D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSearchPopupMenu.cpp; sourceTree = "<group>"; };
@@ -5695,6 +5699,8 @@
1A1E093218861D3800D2DC49 /* WebProgressTrackerClient.h */,
D3B9484411FF4B6500032B39 /* WebSearchPopupMenu.cpp */,
D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */,
+ CEDBA84519FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp */,
+ CEDBA84619FDA00A006866A5 /* WebSQLiteDatabaseTracker.h */,
);
path = WebCoreSupport;
sourceTree = "<group>";
@@ -7335,6 +7341,7 @@
1AAB037A185A7C6A00EDF501 /* MessageSender.h in Headers */,
1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */,
1AFE436618B6C081009C7A48 /* UIDelegate.h in Headers */,
+ CEDBA84819FDA00A006866A5 /* WebSQLiteDatabaseTracker.h in Headers */,
E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */,
BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */,
BC597075116591D000551FCA /* ProcessModel.h in Headers */,
@@ -8955,6 +8962,7 @@
2D2ADF0916362DD500197E47 /* PDFPluginTextAnnotation.mm in Sources */,
BCC43ABA127B95DC00317F16 /* PlatformPopupMenuData.cpp in Sources */,
1A6FB7D211E651E200DB1371 /* Plugin.cpp in Sources */,
+ CEDBA84719FDA00A006866A5 /* WebSQLiteDatabaseTracker.cpp in Sources */,
31A67E0C165B2A99006CBA66 /* PlugInAutoStartProvider.cpp in Sources */,
1A8EF4CC1252403700F7067F /* PluginControllerProxy.cpp in Sources */,
1A2D91A61281D739001EB962 /* PluginControllerProxyMac.mm in Sources */,
Added: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp (0 => 175698)
--- 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)
@@ -0,0 +1,82 @@
+/*
+ * 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)
Property changes on: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.cpp
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h (0 => 175698)
--- 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)
@@ -0,0 +1,68 @@
+/*
+ * 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
Property changes on: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebSQLiteDatabaseTracker.h
___________________________________________________________________
Added: svn:keywords
Added: svn:eol-style
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (175697 => 175698)
--- 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)
@@ -113,7 +113,10 @@
#if ENABLE(SQL_DATABASE)
#include "WebDatabaseManager.h"
+#if PLATFORM(IOS)
+#include "WebSQLiteDatabaseTracker.h"
#endif
+#endif
#if ENABLE(BATTERY_STATUS)
#include "WebBatteryManager.h"
@@ -193,7 +196,11 @@
#if ENABLE(SQL_DATABASE)
addSupplement<WebDatabaseManager>();
+#if PLATFORM(IOS)
+ addSupplement<WebSQLiteDatabaseTracker>();
#endif
+#endif
+
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
addSupplement<WebNotificationManager>();
#endif
