<!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>[212555] trunk/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/212555">212555</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-17 10:48:11 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop backing up localStorage databases to iCloud by default.
<rdar://problem/29045531> and https://bugs.webkit.org/show_bug.cgi?id=168388
Reviewed by Geoffrey Garen.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
* Misc/WebKitVersionChecks.h:
* Misc/WebKitVersionChecks.mm: Renamed from Source/WebKit/mac/Misc/WebKitVersionChecks.m.
(WebKitLinkedOnOrAfter):
(setWebKitLinkTimeVersion):
(WebKitLinkTimeVersion):
(linkedOnOrAfter):
* Storage/WebStorageManager.mm:
(WebKitInitializeStorageIfNecessary):
Source/WebKit2:
* UIProcess/Cocoa/VersionChecks.h:
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::LocalStorageDatabaseTracker::databasePath):
* UIProcess/Storage/LocalStorageDatabaseTracker.h:
* UIProcess/Storage/ios/LocalStorageDatabaseTrackerIOS.mm: Copied from Source/WebKit2/UIProcess/Cocoa/VersionChecks.h.
(WebKit::LocalStorageDatabaseTracker::platformExcludeFromBackup):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitVersionChecksh">trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebStorageManagermm">trunk/Source/WebKit/mac/Storage/WebStorageManager.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaVersionChecksh">trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacMiscWebKitVersionChecksmm">trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.mm</a></li>
<li>trunk/Source/WebKit2/UIProcess/Storage/ios/</li>
<li><a href="#trunkSourceWebKit2UIProcessStorageiosLocalStorageDatabaseTrackerIOSmm">trunk/Source/WebKit2/UIProcess/Storage/ios/LocalStorageDatabaseTrackerIOS.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacMiscWebKitVersionChecksm">trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit/ChangeLog 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-02-15 Brady Eidson <beidson@apple.com>
+
+ Stop backing up localStorage databases to iCloud by default.
+ <rdar://problem/29045531> and https://bugs.webkit.org/show_bug.cgi?id=168388
+
+ Reviewed by Geoffrey Garen.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2017-02-15 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> revert DOMTextEvent.h and DOMHTMLCanvasElement.h to private header
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -89,7 +89,6 @@
</span><span class="cx"> 1AEA6A500DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA6A4E0DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.h */; };
</span><span class="cx"> 1AEA6A510DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEA6A4F0DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.mm */; };
</span><span class="cx"> 1C0D40870AC1C8F40009C113 /* WebKitVersionChecks.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C0D40850AC1C8F40009C113 /* WebKitVersionChecks.h */; };
</span><del>- 1C0D40880AC1C8F40009C113 /* WebKitVersionChecks.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C0D40860AC1C8F40009C113 /* WebKitVersionChecks.m */; };
</del><span class="cx"> 1C68F66F095B5FC100C2984E /* WebNodeHighlight.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C68F663095B5FC100C2984E /* WebNodeHighlight.h */; };
</span><span class="cx"> 1C68F670095B5FC100C2984E /* WebNodeHighlight.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1C68F664095B5FC100C2984E /* WebNodeHighlight.mm */; };
</span><span class="cx"> 1C68F671095B5FC100C2984E /* WebNodeHighlightView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C68F665095B5FC100C2984E /* WebNodeHighlightView.h */; };
</span><span class="lines">@@ -130,6 +129,7 @@
</span><span class="cx"> 511F3FD60CECC88F00852565 /* WebDatabaseManagerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F3FD20CECC88F00852565 /* WebDatabaseManagerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 511F3FD70CECC88F00852565 /* WebDatabaseManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F3FD30CECC88F00852565 /* WebDatabaseManagerClient.h */; };
</span><span class="cx"> 511F3FD80CECC88F00852565 /* WebDatabaseManagerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F3FD40CECC88F00852565 /* WebDatabaseManagerClient.mm */; };
</span><ins>+ 5120C82C1E54CE8A0025B250 /* WebKitVersionChecks.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5120C82B1E54CE8A0025B250 /* WebKitVersionChecks.mm */; };
</ins><span class="cx"> 512BDB531C471591006494DF /* WebDatabaseProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 512BDB521C471591006494DF /* WebDatabaseProvider.mm */; };
</span><span class="cx"> 51494CD60C7EBDE0004178C5 /* WebIconDatabaseClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 51494CD40C7EBDE0004178C5 /* WebIconDatabaseClient.h */; };
</span><span class="cx"> 51494CD70C7EBDE0004178C5 /* WebIconDatabaseClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51494CD50C7EBDE0004178C5 /* WebIconDatabaseClient.mm */; };
</span><span class="lines">@@ -884,7 +884,6 @@
</span><span class="cx"> 1AEA6A4E0DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandlerCocoa.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AEA6A4F0DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapePluginEventHandlerCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1C0D40850AC1C8F40009C113 /* WebKitVersionChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitVersionChecks.h; sourceTree = "<group>"; };
</span><del>- 1C0D40860AC1C8F40009C113 /* WebKitVersionChecks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitVersionChecks.m; sourceTree = "<group>"; };
</del><span class="cx"> 1C68F663095B5FC100C2984E /* WebNodeHighlight.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNodeHighlight.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; wrapsLines = 0; };
</span><span class="cx"> 1C68F664095B5FC100C2984E /* WebNodeHighlight.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebNodeHighlight.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 1C68F665095B5FC100C2984E /* WebNodeHighlightView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNodeHighlightView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="lines">@@ -950,6 +949,7 @@
</span><span class="cx"> 511F3FD20CECC88F00852565 /* WebDatabaseManagerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 511F3FD30CECC88F00852565 /* WebDatabaseManagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDatabaseManagerClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 511F3FD40CECC88F00852565 /* WebDatabaseManagerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDatabaseManagerClient.mm; sourceTree = "<group>"; };
</span><ins>+ 5120C82B1E54CE8A0025B250 /* WebKitVersionChecks.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitVersionChecks.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 512BDB521C471591006494DF /* WebDatabaseProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebDatabaseProvider.mm; sourceTree = "<group>"; };
</span><span class="cx"> 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPolicyDelegate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="lines">@@ -1804,7 +1804,7 @@
</span><span class="cx"> F53444CF02E87CBA018635CA /* WebKitStatistics.m */,
</span><span class="cx"> F53444D202E87D4B018635CA /* WebKitStatisticsPrivate.h */,
</span><span class="cx"> 1C0D40850AC1C8F40009C113 /* WebKitVersionChecks.h */,
</span><del>- 1C0D40860AC1C8F40009C113 /* WebKitVersionChecks.m */,
</del><ins>+ 5120C82B1E54CE8A0025B250 /* WebKitVersionChecks.mm */,
</ins><span class="cx"> BEE18F990472B73200CA289C /* WebLocalizableStrings.h */,
</span><span class="cx"> ED5B9523111B725A00472298 /* WebLocalizableStrings.mm */,
</span><span class="cx"> BC42D322131ED1E00075FA4B /* WebLocalizableStringsInternal.h */,
</span><span class="lines">@@ -3565,6 +3565,7 @@
</span><span class="cx"> 512BDB531C471591006494DF /* WebDatabaseProvider.mm in Sources */,
</span><span class="cx"> A5DEFC1011D5343E00885273 /* WebDatabaseQuotaManager.mm in Sources */,
</span><span class="cx"> 939810ED0824BF01008DF038 /* WebDataSource.mm in Sources */,
</span><ins>+ 5120C82C1E54CE8A0025B250 /* WebKitVersionChecks.mm in Sources */,
</ins><span class="cx"> 939810EF0824BF01008DF038 /* WebDefaultContextMenuDelegate.mm in Sources */,
</span><span class="cx"> 9398111B0824BF01008DF038 /* WebDefaultEditingDelegate.m in Sources */,
</span><span class="cx"> A10C1D1918202F9C0036883A /* WebDefaultFormDelegate.m in Sources */,
</span><span class="lines">@@ -3622,7 +3623,6 @@
</span><span class="cx"> 1AAF5D000EDDE604008D883D /* WebKitPluginClient.defs in Sources */,
</span><span class="cx"> 1AAF5CF10EDDE586008D883D /* WebKitPluginHost.defs in Sources */,
</span><span class="cx"> 939810C50824BF01008DF038 /* WebKitStatistics.m in Sources */,
</span><del>- 1C0D40880AC1C8F40009C113 /* WebKitVersionChecks.m in Sources */,
</del><span class="cx"> ED5B9524111B725A00472298 /* WebLocalizableStrings.mm in Sources */,
</span><span class="cx"> BC42D34D131ED3880075FA4B /* WebLocalizableStringsInternal.mm in Sources */,
</span><span class="cx"> 072E5F461ABF88750003B164 /* WebMediaPlaybackTargetPicker.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-15 Brady Eidson <beidson@apple.com>
+
+ Stop backing up localStorage databases to iCloud by default.
+ <rdar://problem/29045531> and https://bugs.webkit.org/show_bug.cgi?id=168388
+
+ Reviewed by Geoffrey Garen.
+
+ * Misc/WebKitVersionChecks.h:
+ * Misc/WebKitVersionChecks.mm: Renamed from Source/WebKit/mac/Misc/WebKitVersionChecks.m.
+ (WebKitLinkedOnOrAfter):
+ (setWebKitLinkTimeVersion):
+ (WebKitLinkTimeVersion):
+ (linkedOnOrAfter):
+
+ * Storage/WebStorageManager.mm:
+ (WebKitInitializeStorageIfNecessary):
+
</ins><span class="cx"> 2017-02-16 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Chromium-specific code to call FrameLoaderClient::redirectDataToPlugin(nullptr)
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitVersionChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import <wtf/spi/darwin/dyldSPI.h>
+
</ins><span class="cx"> /*
</span><span class="cx"> Version numbers are based on the 'current library version' specified in the WebKit build rules.
</span><span class="cx"> All of these methods return or take version numbers with each part shifted to the left 2 bytes.
</span><span class="lines">@@ -78,6 +80,14 @@
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION 3555
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><ins>+enum class SDKVersion : uint32_t {
+#if PLATFORM(IOS)
+ FirstToExcludeLocalStorageFromBackup = DYLD_IOS_VERSION_11_0,
+#endif
+};
+
+bool linkedOnOrAfter(SDKVersion);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitVersionChecksm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.m (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.m 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.m 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 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.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-
-#import "WebKitVersionChecks.h"
-#import <mach-o/dyld.h>
-
-static int WebKitLinkTimeVersion(void);
-static int overridenWebKitLinkTimeVersion;
-
-BOOL WebKitLinkedOnOrAfter(int version)
-{
-#if !PLATFORM(IOS)
- return (WebKitLinkTimeVersion() >= version);
-#else
- int32_t linkTimeVersion = WebKitLinkTimeVersion();
- int32_t majorVersion = linkTimeVersion >> 16 & 0x0000FFFF;
-
- // The application was not linked against UIKit so assume most recent WebKit
- if (linkTimeVersion == -1)
- return YES;
-
- return (majorVersion >= version);
-#endif
-}
-
-void setWebKitLinkTimeVersion(int version)
-{
- overridenWebKitLinkTimeVersion = version;
-}
-
-static int WebKitLinkTimeVersion(void)
-{
- if (overridenWebKitLinkTimeVersion)
- return overridenWebKitLinkTimeVersion;
-
-#if !PLATFORM(IOS)
- return NSVersionOfLinkTimeLibrary("WebKit");
-#else
- // <rdar://problem/6627758> Need to implement WebKitLinkedOnOrAfter
- // Third party applications do not link against WebKit, but rather against UIKit.
- return NSVersionOfLinkTimeLibrary("UIKit");
-#endif
-}
</del></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitVersionChecksmmfromrev212554trunkSourceWebKitmacMiscWebKitVersionChecksm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.mm (from rev 212554, trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.m) (0 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.mm (rev 0)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.mm 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * Copyright (C) 2006 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.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
+ */
+
+#import "WebKitVersionChecks.h"
+
+#import <mach-o/dyld.h>
+
+static int WebKitLinkTimeVersion(void);
+static int overridenWebKitLinkTimeVersion;
+
+BOOL WebKitLinkedOnOrAfter(int version)
+{
+#if !PLATFORM(IOS)
+ return (WebKitLinkTimeVersion() >= version);
+#else
+ int32_t linkTimeVersion = WebKitLinkTimeVersion();
+ int32_t majorVersion = linkTimeVersion >> 16 & 0x0000FFFF;
+
+ // The application was not linked against UIKit so assume most recent WebKit
+ if (linkTimeVersion == -1)
+ return YES;
+
+ return (majorVersion >= version);
+#endif
+}
+
+void setWebKitLinkTimeVersion(int version)
+{
+ overridenWebKitLinkTimeVersion = version;
+}
+
+static int WebKitLinkTimeVersion(void)
+{
+ if (overridenWebKitLinkTimeVersion)
+ return overridenWebKitLinkTimeVersion;
+
+#if !PLATFORM(IOS)
+ return NSVersionOfLinkTimeLibrary("WebKit");
+#else
+ // <rdar://problem/6627758> Need to implement WebKitLinkedOnOrAfter
+ // Third party applications do not link against WebKit, but rather against UIKit.
+ return NSVersionOfLinkTimeLibrary("UIKit");
+#endif
+}
+
+bool linkedOnOrAfter(SDKVersion sdkVersion)
+{
+ return dyld_get_program_sdk_version() >= static_cast<uint32_t>(sdkVersion);
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebStorageManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebStorageManager.mm (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebStorageManager.mm 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit/mac/Storage/WebStorageManager.mm 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #import "WebStorageManagerInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "StorageTracker.h"
</span><ins>+#import "WebKitVersionChecks.h"
</ins><span class="cx"> #import "WebSecurityOriginInternal.h"
</span><span class="cx"> #import "WebStorageNamespaceProvider.h"
</span><span class="cx"> #import "WebStorageTrackerClient.h"
</span><span class="lines">@@ -141,9 +142,15 @@
</span><span class="cx"> static BOOL initialized = NO;
</span><span class="cx"> if (initialized)
</span><span class="cx"> return;
</span><del>-
- WebKit::StorageTracker::initializeTracker([WebStorageManager _storageDirectoryPath], WebStorageTrackerClient::sharedWebStorageTrackerClient());
-
</del><ins>+
+ auto *storagePath = [WebStorageManager _storageDirectoryPath];
+ WebKit::StorageTracker::initializeTracker(storagePath, WebStorageTrackerClient::sharedWebStorageTrackerClient());
+
+#if PLATFORM(IOS)
+ if (linkedOnOrAfter(SDKVersion::FirstToExcludeLocalStorageFromBackup))
+ [[NSURL fileURLWithPath:storagePath] setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
+#endif
+
</ins><span class="cx"> initialized = YES;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-15 Brady Eidson <beidson@apple.com>
+
+ Stop backing up localStorage databases to iCloud by default.
+ <rdar://problem/29045531> and https://bugs.webkit.org/show_bug.cgi?id=168388
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/Cocoa/VersionChecks.h:
+
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::databasePath):
+ * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+ * UIProcess/Storage/ios/LocalStorageDatabaseTrackerIOS.mm: Copied from Source/WebKit2/UIProcess/Cocoa/VersionChecks.h.
+ (WebKit::LocalStorageDatabaseTracker::platformExcludeFromBackup):
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2017-02-16 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused methods WKPageGetDebugPaintFlags and WKPageSetDebugPaintFlags
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaVersionChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> FirstWithNetworkCache = DYLD_IOS_VERSION_9_0,
</span><span class="cx"> FirstWithMediaTypesRequiringUserActionForPlayback = DYLD_IOS_VERSION_10_0,
</span><span class="cx"> FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_IOS_VERSION_11_0,
</span><ins>+ FirstToExcludeLocalStorageFromBackup = DYLD_IOS_VERSION_11_0,
</ins><span class="cx"> #elif PLATFORM(MAC)
</span><span class="cx"> FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,
</span><span class="cx"> FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_13,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -210,6 +210,10 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ platformMaybeExcludeFromBackup();
+#endif
+
</ins><span class="cx"> return pathByAppendingComponent(m_localStorageDirectory, filename);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -90,6 +90,12 @@
</span><span class="cx">
</span><span class="cx"> WebCore::SQLiteDatabase m_database;
</span><span class="cx"> HashSet<String> m_origins;
</span><ins>+
+#if PLATFORM(IOS)
+ void platformMaybeExcludeFromBackup() const;
+
+ mutable bool m_hasExcludedFromBackup { false };
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageiosLocalStorageDatabaseTrackerIOSmmfromrev212554trunkSourceWebKit2UIProcessCocoaVersionChecksh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Storage/ios/LocalStorageDatabaseTrackerIOS.mm (from rev 212554, trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h) (0 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/ios/LocalStorageDatabaseTrackerIOS.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Storage/ios/LocalStorageDatabaseTrackerIOS.mm 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2017 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 "LocalStorageDatabaseTracker.h"
+
+#if PLATFORM(IOS)
+
+#include "VersionChecks.h"
+
+namespace WebKit {
+
+void LocalStorageDatabaseTracker::platformMaybeExcludeFromBackup() const
+{
+ if (m_hasExcludedFromBackup)
+ return;
+
+ m_hasExcludedFromBackup = true;
+
+ if (linkedOnOrAfter(SDKVersion::FirstToExcludeLocalStorageFromBackup))
+ [[NSURL fileURLWithPath:(NSString *)m_localStorageDirectory] setResourceValue:@YES forKey:NSURLIsExcludedFromBackupKey error:nil];
+}
+
+} // namespace WebKit
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (212554 => 212555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-17 18:41:50 UTC (rev 212554)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-17 18:48:11 UTC (rev 212555)
</span><span class="lines">@@ -934,6 +934,7 @@
</span><span class="cx"> 511B24AB132E097200065A0C /* WebIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B24A9132E097200065A0C /* WebIconDatabase.h */; };
</span><span class="cx"> 511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */; };
</span><span class="cx"> 511F8A81138B485D00A95F44 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
</span><ins>+ 5120C8311E54EDDE0025B250 /* LocalStorageDatabaseTrackerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5120C8301E54E2650025B250 /* LocalStorageDatabaseTrackerIOS.mm */; };
</ins><span class="cx"> 512127C31908239A00DAF35C /* WebPasteboardOverrides.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 512127C11908239A00DAF35C /* WebPasteboardOverrides.cpp */; };
</span><span class="cx"> 512127C41908239A00DAF35C /* WebPasteboardOverrides.h in Headers */ = {isa = PBXBuildFile; fileRef = 512127C21908239A00DAF35C /* WebPasteboardOverrides.h */; };
</span><span class="cx"> 51217460164C20E30037A5C1 /* ShareableResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5121745E164C20E30037A5C1 /* ShareableResource.cpp */; };
</span><span class="lines">@@ -3097,6 +3098,7 @@
</span><span class="cx"> 511B24A9132E097200065A0C /* WebIconDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabase.h; sourceTree = "<group>"; };
</span><span class="cx"> 511F8A77138B460900A95F44 /* SecItemShimLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecItemShimLibrary.h; path = ../../WebProcess/mac/SecItemShimLibrary.h; sourceTree = "<group>"; };
</span><span class="cx"> 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SecItemShimLibrary.mm; path = ../../WebProcess/mac/SecItemShimLibrary.mm; sourceTree = "<group>"; };
</span><ins>+ 5120C8301E54E2650025B250 /* LocalStorageDatabaseTrackerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalStorageDatabaseTrackerIOS.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 512127C11908239A00DAF35C /* WebPasteboardOverrides.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPasteboardOverrides.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 512127C21908239A00DAF35C /* WebPasteboardOverrides.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPasteboardOverrides.h; sourceTree = "<group>"; };
</span><span class="cx"> 5121745E164C20E30037A5C1 /* ShareableResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShareableResource.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4507,6 +4509,7 @@
</span><span class="cx"> 1A44B95816B73F8C00B7BBD8 /* Storage */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 5120C82D1E54E2040025B250 /* ios */,
</ins><span class="cx"> 1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */,
</span><span class="cx"> 1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */,
</span><span class="cx"> 1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */,
</span><span class="lines">@@ -5772,6 +5775,14 @@
</span><span class="cx"> path = IndexedDB;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 5120C82D1E54E2040025B250 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ 5120C8301E54E2650025B250 /* LocalStorageDatabaseTrackerIOS.mm */,
+ );
+ path = ios;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 5123CF18133D25E60056F800 /* cg */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -9821,6 +9832,7 @@
</span><span class="cx"> BCDE059C11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp in Sources */,
</span><span class="cx"> 51871B5B127CB89D00F76232 /* WebContextMenu.cpp in Sources */,
</span><span class="cx"> BC111A5B112F4FBB00337BAB /* WebContextMenuClient.cpp in Sources */,
</span><ins>+ 5120C8311E54EDDE0025B250 /* LocalStorageDatabaseTrackerIOS.mm in Sources */,
</ins><span class="cx"> 51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */,
</span><span class="cx"> 512935D71288D19400A4B695 /* WebContextMenuItem.cpp in Sources */,
</span><span class="cx"> 510FBB9A1288C95E00AFFDF4 /* WebContextMenuItemData.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>