<!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>[210532] 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/210532">210532</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-09 16:46:04 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Drop VNodeTracker
https://bugs.webkit.org/show_bug.cgi?id=166868
<rdar://problem/29937587>
Reviewed by Andreas Kling.
Source/WebCore:
Drop VNodeTracker on iOS. This was introduced a while back to try and
address vnode exhaustion issues in long running page load tests.
However, there was no evidence that the VNodeTracker functionality
helped so there is little point in keeping the extra code complexity.
* WebCore.xcodeproj/project.pbxproj:
* platform/SharedBuffer.h:
* platform/VNodeTracker.cpp: Removed.
* platform/VNodeTracker.h: Removed.
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::SharedBuffer):
* platform/cocoa/VNodeTrackerCocoa.cpp: Removed.
Source/WebKit2:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcfSharedBufferCFcpp">trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformVNodeTrackercpp">trunk/Source/WebCore/platform/VNodeTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformVNodeTrackerh">trunk/Source/WebCore/platform/VNodeTracker.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaVNodeTrackerCocoacpp">trunk/Source/WebCore/platform/cocoa/VNodeTrackerCocoa.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/ChangeLog 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-09 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Drop VNodeTracker
+ https://bugs.webkit.org/show_bug.cgi?id=166868
+ <rdar://problem/29937587>
+
+ Reviewed by Andreas Kling.
+
+ Drop VNodeTracker on iOS. This was introduced a while back to try and
+ address vnode exhaustion issues in long running page load tests.
+ However, there was no evidence that the VNodeTracker functionality
+ helped so there is little point in keeping the extra code complexity.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/SharedBuffer.h:
+ * platform/VNodeTracker.cpp: Removed.
+ * platform/VNodeTracker.h: Removed.
+ * platform/cf/SharedBufferCF.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ * platform/cocoa/VNodeTrackerCocoa.cpp: Removed.
+
</ins><span class="cx"> 2017-01-09 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> File scheme should not allow access of a resource on a different volume.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -288,7 +288,6 @@
</span><span class="cx"> platform/LocalizedStrings.cpp
</span><span class="cx"> platform/RuntimeApplicationChecks.mm
</span><span class="cx"> platform/ScrollableArea.cpp
</span><del>- platform/VNodeTracker.cpp
</del><span class="cx">
</span><span class="cx"> platform/audio/AudioSession.cpp
</span><span class="cx">
</span><span class="lines">@@ -331,7 +330,6 @@
</span><span class="cx"> platform/cocoa/SystemVersion.mm
</span><span class="cx"> platform/cocoa/TelephoneNumberDetectorCocoa.cpp
</span><span class="cx"> platform/cocoa/ThemeCocoa.mm
</span><del>- platform/cocoa/VNodeTrackerCocoa.cpp
</del><span class="cx"> platform/cocoa/WebCoreNSErrorExtras.mm
</span><span class="cx">
</span><span class="cx"> platform/crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/PlatformWin.cmake 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> platform/KillRingNone.cpp
</span><span class="cx"> platform/LocalizedStrings.cpp
</span><span class="cx"> platform/StaticPasteboard.cpp
</span><del>- platform/VNodeTracker.cpp
</del><span class="cx">
</span><span class="cx"> platform/audio/PlatformMediaSessionManager.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -1746,14 +1746,11 @@
</span><span class="cx"> 46B63F6C1C6E8D19002E914B /* JSEventTargetCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 46B63F6B1C6E8CDF002E914B /* JSEventTargetCustom.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 46C83EFD1A9BBE2900A79A41 /* GeoNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46C83EFB1A9BBE2900A79A41 /* GeoNotifier.cpp */; };
</span><span class="cx"> 46C83EFE1A9BBE2900A79A41 /* GeoNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C83EFC1A9BBE2900A79A41 /* GeoNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 46DB7D571B20FE46005651B2 /* VNodeTrackerCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46DB7D561B20FE3C005651B2 /* VNodeTrackerCocoa.cpp */; };
</del><span class="cx"> 46DBB6501AB8C96F00D9A813 /* PowerObserverMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DBB64E1AB8C96F00D9A813 /* PowerObserverMac.h */; };
</span><span class="cx"> 46DFF4981DC2603100B80B48 /* ShadowRootMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DFF4961DC2601300B80B48 /* ShadowRootMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 46DFF49B1DC2620B00B80B48 /* JSShadowRootMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46DFF4991DC261F900B80B48 /* JSShadowRootMode.cpp */; };
</span><span class="cx"> 46DFF49C1DC2620B00B80B48 /* JSShadowRootMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DFF49A1DC261F900B80B48 /* JSShadowRootMode.h */; };
</span><span class="cx"> 46EBEA021B7D4D6500BE4941 /* CollectionTraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = 46EBEA011B7D4D5D00BE4941 /* CollectionTraversal.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 46F3E3F91B2109000087ED13 /* VNodeTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46DB7D581B20FE58005651B2 /* VNodeTracker.cpp */; };
- 46F3E3FA1B2109100087ED13 /* VNodeTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 46DB7D591B20FE58005651B2 /* VNodeTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 46FCB6181A70820E00C5A21E /* DiagnosticLoggingKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = CD37B37515C1A7E1006DC898 /* DiagnosticLoggingKeys.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */; };
</span><span class="cx"> 490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */; };
</span><span class="lines">@@ -8939,9 +8936,6 @@
</span><span class="cx"> 46B63F6B1C6E8CDF002E914B /* JSEventTargetCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSEventTargetCustom.h; sourceTree = "<group>"; };
</span><span class="cx"> 46C83EFB1A9BBE2900A79A41 /* GeoNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeoNotifier.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 46C83EFC1A9BBE2900A79A41 /* GeoNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeoNotifier.h; sourceTree = "<group>"; };
</span><del>- 46DB7D561B20FE3C005651B2 /* VNodeTrackerCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VNodeTrackerCocoa.cpp; sourceTree = "<group>"; };
- 46DB7D581B20FE58005651B2 /* VNodeTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VNodeTracker.cpp; sourceTree = "<group>"; };
- 46DB7D591B20FE58005651B2 /* VNodeTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VNodeTracker.h; sourceTree = "<group>"; };
</del><span class="cx"> 46DBB64E1AB8C96F00D9A813 /* PowerObserverMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PowerObserverMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 46DFF4961DC2601300B80B48 /* ShadowRootMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowRootMode.h; sourceTree = "<group>"; };
</span><span class="cx"> 46DFF4971DC2601300B80B48 /* ShadowRootMode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ShadowRootMode.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -19798,7 +19792,6 @@
</span><span class="cx"> 7CC564B918BAC720001B9652 /* TelephoneNumberDetectorCocoa.cpp */,
</span><span class="cx"> 310D71941B335C9D009C7B73 /* ThemeCocoa.h */,
</span><span class="cx"> 310D71931B335C9D009C7B73 /* ThemeCocoa.mm */,
</span><del>- 46DB7D561B20FE3C005651B2 /* VNodeTrackerCocoa.cpp */,
</del><span class="cx"> CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
</span><span class="cx"> CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
</span><span class="cx"> 5DFEBAB618592B6D00C75BEB /* WebKitAvailability.h */,
</span><span class="lines">@@ -22671,8 +22664,6 @@
</span><span class="cx"> 2E3BBF061162DA1100B9409A /* UUID.h */,
</span><span class="cx"> 83C45B8D1DC2B67C008871BA /* ValidationBubble.h */,
</span><span class="cx"> 9A1142031832D134000BB8AD /* ValueToString.h */,
</span><del>- 46DB7D581B20FE58005651B2 /* VNodeTracker.cpp */,
- 46DB7D591B20FE58005651B2 /* VNodeTracker.h */,
</del><span class="cx"> 515F79511CFCA3C700CCED93 /* WebCoreCrossThreadCopier.cpp */,
</span><span class="cx"> 515F79521CFCA3C700CCED93 /* WebCoreCrossThreadCopier.h */,
</span><span class="cx"> 9380F47109A11AB4001FDB34 /* Widget.cpp */,
</span><span class="lines">@@ -28184,7 +28175,6 @@
</span><span class="cx"> 93309E1E099E64920056E581 /* VisibleUnits.h in Headers */,
</span><span class="cx"> 419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */,
</span><span class="cx"> 1ABA80001897341200DCE9D6 /* VisitedLinkStore.h in Headers */,
</span><del>- 46F3E3FA1B2109100087ED13 /* VNodeTracker.h in Headers */,
</del><span class="cx"> E44613B60CD6344E00FADA75 /* VoidCallback.h in Headers */,
</span><span class="cx"> BE20507A18A4586B0080647E /* VTTCue.h in Headers */,
</span><span class="cx"> 7AF9B20318CFB2DF00C64BEF /* VTTRegion.h in Headers */,
</span><span class="lines">@@ -31682,8 +31672,6 @@
</span><span class="cx"> 93309E1D099E64920056E581 /* VisibleUnits.cpp in Sources */,
</span><span class="cx"> 419BC2DE1685329900D64D6D /* VisitedLinkState.cpp in Sources */,
</span><span class="cx"> 1AF4CEEC18BC3C1B00BC2D34 /* VisitedLinkStore.cpp in Sources */,
</span><del>- 46F3E3F91B2109000087ED13 /* VNodeTracker.cpp in Sources */,
- 46DB7D571B20FE46005651B2 /* VNodeTrackerCocoa.cpp in Sources */,
</del><span class="cx"> BE20507918A458680080647E /* VTTCue.cpp in Sources */,
</span><span class="cx"> 7AF9B20218CFB2DF00C64BEF /* VTTRegion.cpp in Sources */,
</span><span class="cx"> 7AF9B20518CFB2DF00C64BEF /* VTTRegionList.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if USE(CF)
</span><del>-#include "VNodeTracker.h"
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -172,7 +171,6 @@
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> explicit SharedBuffer(CFDataRef);
</span><span class="cx"> RetainPtr<CFDataRef> m_cfData;
</span><del>- VNodeTracker::Token m_vnodeToken;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformVNodeTrackercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/VNodeTracker.cpp (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/VNodeTracker.cpp 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/platform/VNodeTracker.cpp 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -1,91 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 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 "VNodeTracker.h"
-
-#include "Logging.h"
-#include <wtf/NeverDestroyed.h>
-
-namespace WebCore {
-
-VNodeTracker& VNodeTracker::singleton()
-{
- static NeverDestroyed<VNodeTracker> vnodeTracker;
- return vnodeTracker;
-}
-
-VNodeTracker::VNodeTracker()
- : m_vnodeCounter([this](RefCounterEvent event) { if (event == RefCounterEvent::Increment) checkPressureState(); })
- , m_pressureWarningTimer(*this, &VNodeTracker::pressureWarningTimerFired)
- , m_lastWarningTime(std::chrono::steady_clock::now())
-{
- platformInitialize();
-
- LOG(MemoryPressure, "Using following vnode limits for this process: soft=%u, hard=%u", m_softVNodeLimit, m_hardVNodeLimit);
-}
-
-void VNodeTracker::checkPressureState()
-{
- ASSERT(m_pressureHandler);
-
- if (m_vnodeCounter.value() <= m_softVNodeLimit)
- return;
-
- if (!m_pressureWarningTimer.isActive())
- m_pressureWarningTimer.startOneShot(nextPressureWarningInterval());
-}
-
-void VNodeTracker::pressureWarningTimerFired()
-{
- if (m_vnodeCounter.value() <= m_softVNodeLimit)
- return;
-
- m_lastWarningTime = std::chrono::steady_clock::now();
- unsigned vnodeCount = m_vnodeCounter.value();
- auto critical = vnodeCount > m_hardVNodeLimit ? Critical::Yes : Critical::No;
- m_pressureHandler(critical);
- LOG(MemoryPressure, "vnode pressure handler freed %lu vnodes out of %u (critical pressure: %s)", vnodeCount - m_vnodeCounter.value(), vnodeCount, critical == Critical::Yes ? "Yes" : "No");
-}
-
-std::chrono::milliseconds VNodeTracker::nextPressureWarningInterval() const
-{
- // We run the vnode pressure handler every 30 seconds at most.
- static const auto minimumWarningInterval = std::chrono::seconds { 30 };
- auto timeSinceLastWarning = std::chrono::steady_clock::now() - m_lastWarningTime;
- if (timeSinceLastWarning < minimumWarningInterval)
- return std::chrono::duration_cast<std::chrono::milliseconds>(minimumWarningInterval - timeSinceLastWarning);
- return std::chrono::milliseconds { 0 };
-}
-
-#if !PLATFORM(COCOA)
-
-void VNodeTracker::platformInitialize()
-{
-}
-
-#endif
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformVNodeTrackerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/VNodeTracker.h (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/VNodeTracker.h 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/platform/VNodeTracker.h 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -1,80 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 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 VNodeTracker_h
-#define VNodeTracker_h
-
-#include "MemoryPressureHandler.h"
-#include "Timer.h"
-#include <chrono>
-#include <wtf/Forward.h>
-#include <wtf/RefCounter.h>
-
-namespace WebCore {
-
-class VNodeTracker {
- friend class WTF::NeverDestroyed<VNodeTracker>;
-public:
- using PressureHandler = std::function<void(Critical)>;
-
- enum VNodeCounterType { };
- using VNodeCounter = RefCounter<VNodeCounterType>;
- using Token = VNodeCounter::Token;
-
- WEBCORE_EXPORT static VNodeTracker& singleton();
-
- void setPressureHandler(PressureHandler);
- Token token();
-
-private:
- VNodeTracker();
-
- void checkPressureState();
- void pressureWarningTimerFired();
- std::chrono::milliseconds nextPressureWarningInterval() const;
-
- void platformInitialize();
-
- unsigned m_hardVNodeLimit { 400 };
- unsigned m_softVNodeLimit { 300 };
- PressureHandler m_pressureHandler;
- VNodeCounter m_vnodeCounter;
- Timer m_pressureWarningTimer;
- std::chrono::steady_clock::time_point m_lastWarningTime;
-};
-
-inline void VNodeTracker::setPressureHandler(PressureHandler handler)
-{
- m_pressureHandler = handler;
-}
-
-inline auto VNodeTracker::token() -> Token
-{
- return m_pressureHandler ? m_vnodeCounter.count() : Token();
-}
-
-} // namespace WebCore
-
-#endif // VNodeTracker_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformcfSharedBufferCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> SharedBuffer::SharedBuffer(CFDataRef cfData)
</span><span class="cx"> : m_buffer(adoptRef(*new DataBuffer))
</span><span class="cx"> , m_cfData(cfData)
</span><del>- , m_vnodeToken(VNodeTracker::singleton().token())
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaVNodeTrackerCocoacpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/cocoa/VNodeTrackerCocoa.cpp (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/VNodeTrackerCocoa.cpp 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebCore/platform/cocoa/VNodeTrackerCocoa.cpp 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 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. ``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
- * 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 "VNodeTracker.h"
-
-#include "Logging.h"
-#include <algorithm>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-
-namespace WebCore {
-
-void VNodeTracker::platformInitialize()
-{
- unsigned systemMaxVNodes = 0;
- size_t len = sizeof(systemMaxVNodes);
-
- // Query the maximum number of vnodes on the system and use 15% of that value as soft limit for this process,
- // and 20% of that value as hard limit.
- if (sysctlbyname("kern.maxvnodes", &systemMaxVNodes, &len, nullptr, 0))
- return;
-
- LOG(MemoryPressure, "System vnode limit is %u", systemMaxVNodes);
-
- m_softVNodeLimit = std::max(m_softVNodeLimit, static_cast<unsigned>(systemMaxVNodes * 0.15));
- m_hardVNodeLimit = std::max(m_hardVNodeLimit, static_cast<unsigned>(systemMaxVNodes * 0.2));
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-09 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Drop VNodeTracker
+ https://bugs.webkit.org/show_bug.cgi?id=166868
+ <rdar://problem/29937587>
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2017-01-09 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Selection animation flashing on editable content when zooming.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (210531 => 210532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-01-10 00:32:24 UTC (rev 210531)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2017-01-10 00:46:04 UTC (rev 210532)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> #import <WebCore/NSAccessibilitySPI.h>
</span><span class="cx"> #import <WebCore/PerformanceLogging.h>
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><del>-#import <WebCore/VNodeTracker.h>
</del><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><span class="cx"> #import <WebCore/pthreadSPI.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="lines">@@ -124,15 +123,6 @@
</span><span class="cx"> WebCore::registerMemoryReleaseNotifyCallbacks();
</span><span class="cx"> MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- // Track the number of vnodes we are using on iOS and make sure we only use a
- // reasonable amount because limits are fairly low on iOS devices and we can
- // get killed when reaching the limit.
- VNodeTracker::singleton().setPressureHandler([] (Critical critical) {
- MemoryPressureHandler::singleton().releaseMemory(critical);
- });
-#endif
-
</del><span class="cx"> setEnhancedAccessibility(parameters.accessibilityEnhancedUserInterfaceEnabled);
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span></span></pre>
</div>
</div>
</body>
</html>