<!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>[185308] trunk/Source/WebKit</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/185308">185308</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-07 17:05:13 -0700 (Sun, 07 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove WebKitSystemBits
https://bugs.webkit.org/show_bug.cgi?id=145746
Reviewed by Dan Bernstein.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
Fold WebVolumeFreeSize into its only caller and get rid of WebKitSystemBits.
* Misc/WebKitSystemBits.h: Removed.
* Misc/WebKitSystemBits.m: Removed.
* WebView/WebPreferences.mm:
* WebView/WebView.mm:
(+[WebView _setCacheModel:]):</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="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacMiscWebKitSystemBitsh">trunk/Source/WebKit/mac/Misc/WebKitSystemBits.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitSystemBitsm">trunk/Source/WebKit/mac/Misc/WebKitSystemBits.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (185307 => 185308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-06-07 23:54:31 UTC (rev 185307)
+++ trunk/Source/WebKit/ChangeLog 2015-06-08 00:05:13 UTC (rev 185308)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-06-07 Anders Carlsson <andersca@apple.com>
+
+ Remove WebKitSystemBits
+ https://bugs.webkit.org/show_bug.cgi?id=145746
+
+ Reviewed by Dan Bernstein.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-06-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove SPI that's no longer used
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (185307 => 185308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2015-06-07 23:54:31 UTC (rev 185307)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2015-06-08 00:05:13 UTC (rev 185308)
</span><span class="lines">@@ -254,7 +254,6 @@
</span><span class="cx"> 939810760824BF01008DF038 /* WebDefaultUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */; };
</span><span class="cx"> 939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 939810790824BF01008DF038 /* WebLocalizableStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE18F990472B73200CA289C /* WebLocalizableStrings.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 9398107A0824BF01008DF038 /* WebKitSystemBits.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE52D4A0473032500CA289C /* WebKitSystemBits.h */; };
</del><span class="cx"> 9398107E0824BF01008DF038 /* WebNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = BE6DC39904C62C4E004D0EF6 /* WebNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 9398107F0824BF01008DF038 /* WebDocumentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = ED21B9810528F7AA003299AC /* WebDocumentInternal.h */; };
</span><span class="cx"> 939810800824BF01008DF038 /* WebDocumentPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 833987810543012D00EE146E /* WebDocumentPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -328,7 +327,6 @@
</span><span class="cx"> 939811070824BF01008DF038 /* WebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51A8B57A042834F700CA2D3A /* WebView.mm */; };
</span><span class="cx"> 939811080824BF01008DF038 /* WebPolicyDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51443F9B0429392B00CA2D3A /* WebPolicyDelegate.mm */; };
</span><span class="cx"> 9398110A0824BF01008DF038 /* WebDefaultUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 515E27D00458CA4B00CA2D3A /* WebDefaultUIDelegate.m */; };
</span><del>- 9398110E0824BF01008DF038 /* WebKitSystemBits.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE52D4B0473032500CA289C /* WebKitSystemBits.m */; };
</del><span class="cx"> 939811120824BF01008DF038 /* WebNSURLExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = BE6DC39A04C62C4E004D0EF6 /* WebNSURLExtras.mm */; };
</span><span class="cx"> 939811130824BF01008DF038 /* WebHistory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65DA2608052CC18700A97B31 /* WebHistory.mm */; };
</span><span class="cx"> 939811150824BF01008DF038 /* WebNSDataExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = BECD142A0565830A005BB09C /* WebNSDataExtras.m */; };
</span><span class="lines">@@ -854,8 +852,6 @@
</span><span class="cx"> BECD14290565830A005BB09C /* WebNSDataExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSDataExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> BECD142A0565830A005BB09C /* WebNSDataExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSDataExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> BEE18F990472B73200CA289C /* WebLocalizableStrings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebLocalizableStrings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><del>- BEE52D4A0473032500CA289C /* WebKitSystemBits.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitSystemBits.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- BEE52D4B0473032500CA289C /* WebKitSystemBits.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitSystemBits.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</del><span class="cx"> C0167BF60D7F5DD00028696E /* WebScriptDebugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptDebugger.h; sourceTree = "<group>"; };
</span><span class="cx"> C0167BF70D7F5DD00028696E /* WebScriptDebugger.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptDebugger.mm; sourceTree = "<group>"; };
</span><span class="cx"> C0B1F7E510AC8E3100C925D9 /* WebScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptWorld.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -1127,8 +1123,6 @@
</span><span class="cx"> F53444CE02E87CBA018635CA /* WebKitStatistics.h */,
</span><span class="cx"> F53444CF02E87CBA018635CA /* WebKitStatistics.m */,
</span><span class="cx"> F53444D202E87D4B018635CA /* WebKitStatisticsPrivate.h */,
</span><del>- BEE52D4A0473032500CA289C /* WebKitSystemBits.h */,
- BEE52D4B0473032500CA289C /* WebKitSystemBits.m */,
</del><span class="cx"> 1C0D40850AC1C8F40009C113 /* WebKitVersionChecks.h */,
</span><span class="cx"> 1C0D40860AC1C8F40009C113 /* WebKitVersionChecks.m */,
</span><span class="cx"> BEE18F990472B73200CA289C /* WebLocalizableStrings.h */,
</span><span class="lines">@@ -1866,7 +1860,6 @@
</span><span class="cx"> 9398101F0824BF01008DF038 /* WebKitStatistics.h in Headers */,
</span><span class="cx"> 939810200824BF01008DF038 /* WebKitStatisticsPrivate.h in Headers */,
</span><span class="cx"> A10C1D3D18202FC50036883A /* WebUIKitSupport.h in Headers */,
</span><del>- 9398107A0824BF01008DF038 /* WebKitSystemBits.h in Headers */,
</del><span class="cx"> 1C0D40870AC1C8F40009C113 /* WebKitVersionChecks.h in Headers */,
</span><span class="cx"> 939810790824BF01008DF038 /* WebLocalizableStrings.h in Headers */,
</span><span class="cx"> BC42D324131ED1E00075FA4B /* WebLocalizableStringsInternal.h in Headers */,
</span><span class="lines">@@ -2275,7 +2268,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>- 9398110E0824BF01008DF038 /* WebKitSystemBits.m in Sources */,
</del><span class="cx"> 1C0D40880AC1C8F40009C113 /* WebKitVersionChecks.m in Sources */,
</span><span class="cx"> ED5B9524111B725A00472298 /* WebLocalizableStrings.mm in Sources */,
</span><span class="cx"> BC42D34D131ED3880075FA4B /* WebLocalizableStringsInternal.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185307 => 185308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-07 23:54:31 UTC (rev 185307)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-08 00:05:13 UTC (rev 185308)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-06-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Remove WebKitSystemBits
+ https://bugs.webkit.org/show_bug.cgi?id=145746
+
+ Reviewed by Dan Bernstein.
+
+ Fold WebVolumeFreeSize into its only caller and get rid of WebKitSystemBits.
+
+ * Misc/WebKitSystemBits.h: Removed.
+ * Misc/WebKitSystemBits.m: Removed.
+ * WebView/WebPreferences.mm:
+ * WebView/WebView.mm:
+ (+[WebView _setCacheModel:]):
+
+2015-06-07 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove another SPI method that hasn't been used since Tiger
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145745
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitSystemBitsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/Misc/WebKitSystemBits.h (185307 => 185308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitSystemBits.h 2015-06-07 23:54:31 UTC (rev 185307)
+++ trunk/Source/WebKit/mac/Misc/WebKitSystemBits.h 2015-06-08 00:05:13 UTC (rev 185308)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005 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 <Foundation/Foundation.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-unsigned long long WebVolumeFreeSize(NSString *path);
-int WebNumberOfCPUs(void);
-
-#ifdef __cplusplus
-}
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitSystemBitsm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/Misc/WebKitSystemBits.m (185307 => 185308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitSystemBits.m 2015-06-07 23:54:31 UTC (rev 185307)
+++ trunk/Source/WebKit/mac/Misc/WebKitSystemBits.m 2015-06-08 00:05:13 UTC (rev 185308)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2005 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 "WebKitSystemBits.h"
-
-#import "WebNSFileManagerExtras.h"
-#import <mach/host_info.h>
-#import <mach/mach.h>
-#import <mach/mach_error.h>
-#import <sys/sysctl.h>
-#import <sys/types.h>
-#import <wtf/Assertions.h>
-
-int WebNumberOfCPUs(void)
-{
- static int numCPUs = 0;
-
- if (numCPUs == 0) {
- int mib[2];
- size_t len;
-
- mib[0] = CTL_HW;
- mib[1] = HW_NCPU;
- len = sizeof(numCPUs);
- sysctl(mib, 2, &numCPUs, &len, NULL, 0);
- }
- return numCPUs;
-}
-
-unsigned long long WebVolumeFreeSize(NSString *path)
-{
- NSDictionary *fileSystemAttributesDictionary = [[NSFileManager defaultManager] attributesOfFileSystemForPath:path error:NULL];
- return [[fileSystemAttributesDictionary objectForKey:NSFileSystemFreeSize] unsignedLongLongValue];
-}
</del></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (185307 => 185308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-06-07 23:54:31 UTC (rev 185307)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-06-08 00:05:13 UTC (rev 185308)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #import "WebFrameNetworkingContext.h"
</span><span class="cx"> #import "WebKitLogging.h"
</span><span class="cx"> #import "WebKitNSStringExtras.h"
</span><del>-#import "WebKitSystemBits.h"
</del><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import "WebKitVersionChecks.h"
</span><span class="cx"> #import "WebNSDictionaryExtras.h"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (185307 => 185308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-06-07 23:54:31 UTC (rev 185307)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-06-08 00:05:13 UTC (rev 185308)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx"> #import "WebKitLogging.h"
</span><span class="cx"> #import "WebKitNSStringExtras.h"
</span><span class="cx"> #import "WebKitStatisticsPrivate.h"
</span><del>-#import "WebKitSystemBits.h"
</del><span class="cx"> #import "WebKitVersionChecks.h"
</span><span class="cx"> #import "WebLocalizableStrings.h"
</span><span class="cx"> #import "WebNSDataExtras.h"
</span><span class="lines">@@ -7714,7 +7713,10 @@
</span><span class="cx"> nsurlCacheDirectory = NSHomeDirectory();
</span><span class="cx">
</span><span class="cx"> static uint64_t memSize = ramSize() / 1024 / 1024;
</span><del>- unsigned long long diskFreeSize = WebVolumeFreeSize(nsurlCacheDirectory) / 1024 / 1000;
</del><ins>+
+ NSDictionary *fileSystemAttributesDictionary = [[NSFileManager defaultManager] attributesOfFileSystemForPath:nsurlCacheDirectory error:nullptr];
+ unsigned long long diskFreeSize = [fileSystemAttributesDictionary[NSFileSystemFreeSize] unsignedLongLongValue] / 1024 / 1000;
+
</ins><span class="cx"> NSURLCache *nsurlCache = [NSURLCache sharedURLCache];
</span><span class="cx">
</span><span class="cx"> unsigned cacheTotalCapacity = 0;
</span></span></pre>
</div>
</div>
</body>
</html>