<!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>[179209] branches/safari-600.1.4.15-branch/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/179209">179209</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 13:19:18 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/177455">r177455</a>. rdar://problem/19445868</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoreChangeLog">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceJavaScriptCoreConfigurationsJavaScriptCorexcconfig">branches/safari-600.1.4.15-branch/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig</a></li>
<li><a href="#branchessafari6001415branchSourceWTFChangeLog">branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWTFWTFvcxprojWTFvcxproj">branches/safari-600.1.4.15-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#branchessafari6001415branchSourceWTFWTFxcodeprojprojectpbxproj">branches/safari-600.1.4.15-branch/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6001415branchSourceWTFwtfCMakeListstxt">branches/safari-600.1.4.15-branch/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreCMakeListstxt">branches/safari-600.1.4.15-branch/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreConfigurationsWebCorexcconfig">branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCorevcxprojWebCorevcxproj">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorehistoryPageCachecpp">branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageSettingsin">branches/safari-600.1.4.15-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformFeatureCounterKeysh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2SharedWebPreferencesDefinitionsh">branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPICWKPreferencescpp">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKPreferencesmm">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformFeatureCountercpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformFeatureCounterh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformiosFeatureCountermm">branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/FeatureCounter.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWTFwtfFeatureCountercpp">branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWTFwtfFeatureCounterh">branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.h</a></li>
<li><a href="#branchessafari6001415branchSourceWTFwtfiosFeatureCountermm">branches/safari-600.1.4.15-branch/Source/WTF/wtf/ios/FeatureCounter.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-27 Lucas Forschler <lforschler@apple.com>
+
+ Merge r177455
+
+ 2014-12-17 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Make it possible to toggle FeatureCounter support at runtime
+ https://bugs.webkit.org/show_bug.cgi?id=139688
+ <rdar://problem/19266254>
+
+ Reviewed by Andreas Kling.
+
+ Stop linking against AppSupport framework as the functionality is no
+ longer in WTF (it was moved to WebCore).
+
+ * Configurations/JavaScriptCore.xcconfig:
+
</ins><span class="cx"> 2015-01-26 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177328
</span></span></pre></div>
<a id="branchessafari6001415branchSourceJavaScriptCoreConfigurationsJavaScriptCorexcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_BASE = -lobjc -Wl,-Y,3 $(OTHER_LDFLAGS_HIDE_SYMBOLS);
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
</span><del>-OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework AppSupport;
</del><ins>+OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE);
</ins><span class="cx"> OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
</span><span class="cx"> OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
</span><span class="cx"> GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WTF/ChangeLog 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-27 Lucas Forschler <lforschler@apple.com>
+
+ Merge r177455
+
+ 2014-12-17 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Make it possible to toggle FeatureCounter support at runtime
+ https://bugs.webkit.org/show_bug.cgi?id=139688
+ <rdar://problem/19266254>
+
+ Reviewed by Andreas Kling.
+
+ Remove FeatureCounter API from WTF and move it to WebCore/platform
+ instead so that it can log conditionally based on a WebCore setting.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+
</ins><span class="cx"> 2015-01-26 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177328
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -72,7 +72,6 @@
</span><span class="cx"> <ClCompile Include="..\wtf\dtoa\strtod.cc" />
</span><span class="cx"> <ClCompile Include="..\wtf\FastBitVector.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\FastMalloc.cpp" />
</span><del>- <ClCompile Include="..\wtf\FeatureCounter.cpp" />
</del><span class="cx"> <ClCompile Include="..\wtf\FilePrintStream.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\FunctionDispatcher.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\gobject\GlibUtilities.cpp">
</span><span class="lines">@@ -195,7 +194,6 @@
</span><span class="cx"> <ClInclude Include="..\wtf\dtoa\utils.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\FastBitVector.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\FastMalloc.h" />
</span><del>- <ClInclude Include="..\wtf\FeatureCounter.h" />
</del><span class="cx"> <ClInclude Include="..\wtf\FeatureDefines.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\FilePrintStream.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\FlipBytes.h" />
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WTF/WTF.xcodeproj/project.pbxproj (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -73,9 +73,6 @@
</span><span class="cx"> 2CDED0EF18115C38004DBA70 /* RunLoopCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0EE18115C38004DBA70 /* RunLoopCF.cpp */; };
</span><span class="cx"> 2CDED0F318115C85004DBA70 /* RunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0F118115C85004DBA70 /* RunLoop.cpp */; };
</span><span class="cx"> 2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CDED0F218115C85004DBA70 /* RunLoop.h */; };
</span><del>- 463111841A3F729A00E925A3 /* FeatureCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 463111831A3F729A00E925A3 /* FeatureCounter.h */; };
- 463111861A3F72B800E925A3 /* FeatureCounter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 463111851A3F72B800E925A3 /* FeatureCounter.mm */; };
- 463111881A3F899100E925A3 /* FeatureCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463111871A3F899100E925A3 /* FeatureCounter.cpp */; };
</del><span class="cx"> 7CDD7FF8186D291E007433CD /* IteratorAdaptors.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CDD7FF7186D291E007433CD /* IteratorAdaptors.h */; };
</span><span class="cx"> 7CDD7FFA186D2A54007433CD /* IteratorRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CDD7FF9186D2A54007433CD /* IteratorRange.h */; };
</span><span class="cx"> 7E29C33E15FFD79B00516D61 /* ObjcRuntimeExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */; };
</span><span class="lines">@@ -358,9 +355,6 @@
</span><span class="cx"> 2CDED0F118115C85004DBA70 /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2CDED0F218115C85004DBA70 /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
</span><span class="cx"> 44DEE74A152274BB00C6EC37 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
</span><del>- 463111831A3F729A00E925A3 /* FeatureCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureCounter.h; sourceTree = "<group>"; };
- 463111851A3F72B800E925A3 /* FeatureCounter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FeatureCounter.mm; sourceTree = "<group>"; };
- 463111871A3F899100E925A3 /* FeatureCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FeatureCounter.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -609,7 +603,6 @@
</span><span class="cx"> 1FA47C87152502DA00568D1B /* ios */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 463111851A3F72B800E925A3 /* FeatureCounter.mm */,
</del><span class="cx"> 1FA47C88152502DA00568D1B /* WebCoreThread.cpp */,
</span><span class="cx"> 1FA47C89152502DA00568D1B /* WebCoreThread.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -748,8 +741,6 @@
</span><span class="cx"> 0FD81AC4154FB22E00983E72 /* FastBitVector.h */,
</span><span class="cx"> A8A472A1151A825A004123FF /* FastMalloc.cpp */,
</span><span class="cx"> A8A472A2151A825A004123FF /* FastMalloc.h */,
</span><del>- 463111871A3F899100E925A3 /* FeatureCounter.cpp */,
- 463111831A3F729A00E925A3 /* FeatureCounter.h */,
</del><span class="cx"> B38FD7BC168953E80065C969 /* FeatureDefines.h */,
</span><span class="cx"> 0F9D335B165DBA73005AD387 /* FilePrintStream.cpp */,
</span><span class="cx"> 0F9D335C165DBA73005AD387 /* FilePrintStream.h */,
</span><span class="lines">@@ -1141,7 +1132,6 @@
</span><span class="cx"> 1AFDE648195201C300C48FFA /* TypeCasts.h in Headers */,
</span><span class="cx"> A8A47423151A825B004123FF /* SimpleStats.h in Headers */,
</span><span class="cx"> A8A47424151A825B004123FF /* SinglyLinkedList.h in Headers */,
</span><del>- 463111841A3F729A00E925A3 /* FeatureCounter.h in Headers */,
</del><span class="cx"> A748745317A0BDAE00FA04CB /* SixCharacterHash.h in Headers */,
</span><span class="cx"> A8A47426151A825B004123FF /* Spectrum.h in Headers */,
</span><span class="cx"> A8A47428151A825B004123FF /* StackBounds.h in Headers */,
</span><span class="lines">@@ -1306,7 +1296,6 @@
</span><span class="cx"> A8A4739C151A825B004123FF /* CurrentTime.cpp in Sources */,
</span><span class="cx"> A8A4739E151A825B004123FF /* DataLog.cpp in Sources */,
</span><span class="cx"> A8A473A0151A825B004123FF /* DateMath.cpp in Sources */,
</span><del>- 463111861A3F72B800E925A3 /* FeatureCounter.mm in Sources */,
</del><span class="cx"> A8A473A2151A825B004123FF /* DecimalNumber.cpp in Sources */,
</span><span class="cx"> A8A473AE151A825B004123FF /* diy-fp.cc in Sources */,
</span><span class="cx"> A8A473B0151A825B004123FF /* double-conversion.cc in Sources */,
</span><span class="lines">@@ -1327,7 +1316,6 @@
</span><span class="cx"> CD5497AC15857D0300B5BC30 /* MediaTime.cpp in Sources */,
</span><span class="cx"> A8A473EC151A825B004123FF /* MetaAllocator.cpp in Sources */,
</span><span class="cx"> A8A473F4151A825B004123FF /* NumberOfCores.cpp in Sources */,
</span><del>- 463111881A3F899100E925A3 /* FeatureCounter.cpp in Sources */,
</del><span class="cx"> A8A473F7151A825B004123FF /* OSAllocatorPosix.cpp in Sources */,
</span><span class="cx"> A8A473F9151A825B004123FF /* OSRandomSource.cpp in Sources */,
</span><span class="cx"> A8A47400151A825B004123FF /* PageAllocationAligned.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WTF/wtf/CMakeLists.txt (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/wtf/CMakeLists.txt 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WTF/wtf/CMakeLists.txt 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> DisallowCType.h
</span><span class="cx"> DoublyLinkedList.h
</span><span class="cx"> FastMalloc.h
</span><del>- FeatureCounter.h
</del><span class="cx"> FeatureDefines.h
</span><span class="cx"> FilePrintStream.h
</span><span class="cx"> FlipBytes.h
</span><span class="lines">@@ -159,7 +158,6 @@
</span><span class="cx"> DecimalNumber.cpp
</span><span class="cx"> FastBitVector.cpp
</span><span class="cx"> FastMalloc.cpp
</span><del>- FeatureCounter.cpp
</del><span class="cx"> FilePrintStream.cpp
</span><span class="cx"> FunctionDispatcher.cpp
</span><span class="cx"> GregorianDateTime.cpp
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWTFwtfFeatureCountercpp"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.cpp (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.cpp 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.cpp 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * 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 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.
- */
-
-#include "config.h"
-#include "FeatureCounter.h"
-
-namespace WTF {
-
-#if !PLATFORM(IOS)
-
-void incrementFeatureCounterKey(const char* const key)
-{
- UNUSED_PARAM(key);
-}
-
-void setFeatureCounterKey(const char* const key, int64_t value)
-{
- UNUSED_PARAM(key);
- UNUSED_PARAM(value);
-}
-
-#endif
-
-} // namespace WTF
</del></span></pre></div>
<a id="branchessafari6001415branchSourceWTFwtfFeatureCounterh"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.h (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.h 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WTF/wtf/FeatureCounter.h 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * 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 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.
- */
-
-#ifndef FeatureCounter_h
-#define FeatureCounter_h
-
-namespace WTF {
-
-WTF_EXPORT_PRIVATE void incrementFeatureCounterKey(const char* const key);
-WTF_EXPORT_PRIVATE void setFeatureCounterKey(const char* const key, int64_t value);
-
-#define FEATURE_COUNTER_INCREMENT_KEY(key) WTF::incrementFeatureCounterKey(key)
-#define FEATURE_COUNTER_SET_KEY(key, value) WTF::setFeatureCounterKey(key, value)
-
-} // namespace WTF
-
-#endif // FeatureCounter_h
</del></span></pre></div>
<a id="branchessafari6001415branchSourceWTFwtfiosFeatureCountermm"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4.15-branch/Source/WTF/wtf/ios/FeatureCounter.mm (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WTF/wtf/ios/FeatureCounter.mm 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WTF/wtf/ios/FeatureCounter.mm 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * 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 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 "config.h"
-#import "FeatureCounter.h"
-
-#if PLATFORM(IOS)
-#import <AppSupport/CPAggregateDictionary.h>
-
-namespace WTF {
-
-void incrementFeatureCounterKey(const char* const key)
-{
- NSString *nsKey = [[NSString alloc] initWithCharactersNoCopy:reinterpret_cast<unichar*>(const_cast<char*>(key)) length:strlen(key) freeWhenDone:NO];
- [[CPAggregateDictionary sharedAggregateDictionary] incrementKey:nsKey];
-}
-
-void setFeatureCounterKey(const char* const key, int64_t value)
-{
- NSString *nsKey = [[NSString alloc] initWithCharactersNoCopy:reinterpret_cast<unichar*>(const_cast<char*>(key)) length:strlen(key) freeWhenDone:NO];
- [[CPAggregateDictionary sharedAggregateDictionary] setValue:value forScalarKey:nsKey];
-}
-
-} // namespace WTF
-
-#endif // PLATFORM(IOS)
</del></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/CMakeLists.txt (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/CMakeLists.txt 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/CMakeLists.txt 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1977,6 +1977,7 @@
</span><span class="cx"> platform/DisplaySleepDisabler.cpp
</span><span class="cx"> platform/DragData.cpp
</span><span class="cx"> platform/DragImage.cpp
</span><ins>+ platform/FeatureCounter.cpp
</ins><span class="cx"> platform/FileChooser.cpp
</span><span class="cx"> platform/FileStream.cpp
</span><span class="cx"> platform/FileSystem.cpp
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-01-27 Lucas Forschler <lforschler@apple.com>
+
+ Merge r177455
+
+ 2014-12-17 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Make it possible to toggle FeatureCounter support at runtime
+ https://bugs.webkit.org/show_bug.cgi?id=139688
+ <rdar://problem/19266254>
+
+ Reviewed by Andreas Kling.
+
+ Make it possible to toggle FeatureCounter support at runtime by adding
+ a setting (disabled by default) and moving the API to a new
+ FeatureCounter class under WebCore/plattorm which only logs if the
+ setting is enabled. For privacy reasons, FeatureCounter logging is also
+ disabled for private / ephemeral sessions.
+
+ No new tests, no behavior change.
+
+ * CMakeLists.txt:
+ * Configurations/WebCore.xcconfig:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * history/PageCache.cpp:
+ (WebCore::logCanCacheFrameDecision):
+ (WebCore::logCanCachePageDecision):
+ * page/Settings.in:
+ * platform/FeatureCounter.cpp: Renamed from Source/WTF/wtf/FeatureCounter.cpp.
+ (WebCore::FeatureCounter::shouldUseForPage):
+ (WebCore::FeatureCounter::incrementKey):
+ (WebCore::FeatureCounter::setKey):
+ * platform/FeatureCounter.h: Renamed from Source/WTF/wtf/FeatureCounter.h.
+ * platform/FeatureCounterKeys.h:
+ * platform/ios/FeatureCounter.mm: Renamed from Source/WTF/wtf/ios/FeatureCounter.mm.
+ (WebCore::FeatureCounter::incrementKey):
+ (WebCore::FeatureCounter::setKey):
+
</ins><span class="cx"> 2015-01-26 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177328
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/WebCore.xcconfig (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/WebCore.xcconfig 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/WebCore.xcconfig 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -71,8 +71,8 @@
</span><span class="cx"> PRODUCT_NAME = WebCore;
</span><span class="cx"> OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
</span><del>-OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
</del><ins>+OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface -framework AppSupport;
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework AppSupport -lMobileGestalt;
</ins><span class="cx"> OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
</span><span class="cx">
</span><span class="cx"> NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -7344,6 +7344,7 @@
</span><span class="cx"> <ClCompile Include="..\platform\DisplaySleepDisabler.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\DragData.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\DragImage.cpp" />
</span><ins>+ <ClCompile Include="..\platform\FeatureCounter.cpp" />
</ins><span class="cx"> <ClCompile Include="..\platform\FileChooser.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\FileStream.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\FileSystem.cpp" />
</span><span class="lines">@@ -19310,6 +19311,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\DragData.h" />
</span><span class="cx"> <ClInclude Include="..\platform\DragImage.h" />
</span><span class="cx"> <ClInclude Include="..\platform\EventLoop.h" />
</span><ins>+ <ClInclude Include="..\platform\FeatureCounter.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\FileChooser.h" />
</span><span class="cx"> <ClInclude Include="..\platform\FileMetadata.h" />
</span><span class="cx"> <ClInclude Include="..\platform\FileStream.h" />
</span><span class="lines">@@ -21356,4 +21358,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1101,6 +1101,9 @@
</span><span class="cx"> <ClCompile Include="..\platform\DragImage.cpp">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\platform\FeatureCounter.cpp">
+ <Filter>platform</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\platform\FileChooser.cpp">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -8157,6 +8160,9 @@
</span><span class="cx"> <ClInclude Include="..\platform\DragImage.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\platform\FeatureCounter.h">
+ <Filter>platform</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\platform\EventLoop.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -15458,4 +15464,4 @@
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </MASM>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1578,6 +1578,9 @@
</span><span class="cx"> 45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 45BAC2AF1360BBAB005DA258 /* IconURL.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45FEA5CD156DDE8C00654101 /* Decimal.cpp */; };
</span><span class="cx"> 45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 467438541A421330000494FB /* FeatureCounter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 467438531A421330000494FB /* FeatureCounter.mm */; };
+ 46779CE21A40B97200B6864E /* FeatureCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46779CE01A40B97100B6864E /* FeatureCounter.cpp */; };
+ 46779CE31A40B97200B6864E /* FeatureCounter.h in Headers */ = {isa = PBXBuildFile; fileRef = 46779CE11A40B97200B6864E /* FeatureCounter.h */; };
</ins><span class="cx"> 4689F1AF1267BAE100E8D380 /* FileMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 4689F1AE1267BAE100E8D380 /* FileMetadata.h */; };
</span><span class="cx"> 46BD16E30B279473001F0839 /* noneCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46BD16E20B279473001F0839 /* noneCursor.png */; };
</span><span class="cx"> 46D4F2490AF97E810035385A /* cellCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 46D4F2460AF97E810035385A /* cellCursor.png */; };
</span><span class="lines">@@ -8643,6 +8646,9 @@
</span><span class="cx"> 45BAC2AF1360BBAB005DA258 /* IconURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconURL.h; sourceTree = "<group>"; };
</span><span class="cx"> 45FEA5CD156DDE8C00654101 /* Decimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decimal.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 45FEA5CE156DDE8C00654101 /* Decimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decimal.h; sourceTree = "<group>"; };
</span><ins>+ 467438531A421330000494FB /* FeatureCounter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FeatureCounter.mm; path = ios/FeatureCounter.mm; sourceTree = "<group>"; };
+ 46779CE01A40B97100B6864E /* FeatureCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FeatureCounter.cpp; sourceTree = "<group>"; };
+ 46779CE11A40B97200B6864E /* FeatureCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeatureCounter.h; sourceTree = "<group>"; };
</ins><span class="cx"> 4689F1AE1267BAE100E8D380 /* FileMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileMetadata.h; path = platform/FileMetadata.h; sourceTree = "<group>"; };
</span><span class="cx"> 46BD16E20B279473001F0839 /* noneCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = noneCursor.png; sourceTree = "<group>"; };
</span><span class="cx"> 46D4F2460AF97E810035385A /* cellCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cellCursor.png; sourceTree = "<group>"; };
</span><span class="lines">@@ -18506,6 +18512,7 @@
</span><span class="cx"> 3140379A124BEA7F00AF40E4 /* DeviceOrientationClientIOS.mm */,
</span><span class="cx"> 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */,
</span><span class="cx"> 26F40D4914904A6300CA67C4 /* EventLoopIOS.mm */,
</span><ins>+ 467438531A421330000494FB /* FeatureCounter.mm */,
</ins><span class="cx"> 26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */,
</span><span class="cx"> 26C17A3D1491D2D400D12BA2 /* FileSystemIOS.mm */,
</span><span class="cx"> 265541371489811C000DFC5D /* KeyEventCodesIOS.h */,
</span><span class="lines">@@ -21360,6 +21367,8 @@
</span><span class="cx"> A7CFB3CF0B7ED10A0070C32D /* DragImage.cpp */,
</span><span class="cx"> A7CFB3D00B7ED10A0070C32D /* DragImage.h */,
</span><span class="cx"> 1CA19E150DC255CA0065A994 /* EventLoop.h */,
</span><ins>+ 46779CE01A40B97100B6864E /* FeatureCounter.cpp */,
+ 46779CE11A40B97200B6864E /* FeatureCounter.h */,
</ins><span class="cx"> 934FE9E40B5CA539003E4A73 /* FileChooser.cpp */,
</span><span class="cx"> 066C772A0AB603B700238CC4 /* FileChooser.h */,
</span><span class="cx"> 2EF1BFE8121C9F4200C27627 /* FileStream.cpp */,
</span><span class="lines">@@ -23596,6 +23605,7 @@
</span><span class="cx"> A80E6D040A1989CA007FB8C5 /* Counter.h in Headers */,
</span><span class="cx"> BC5EB9790E82069200B25965 /* CounterContent.h in Headers */,
</span><span class="cx"> BC5EB9510E82056B00B25965 /* CounterDirectives.h in Headers */,
</span><ins>+ 46779CE31A40B97200B6864E /* FeatureCounter.h in Headers */,
</ins><span class="cx"> 9392F14C0AD1861B00691BD4 /* CounterNode.h in Headers */,
</span><span class="cx"> D0B0556809C6700100307E43 /* CreateLinkCommand.h in Headers */,
</span><span class="cx"> 514C766E0CE923A1007EF3CD /* Credential.h in Headers */,
</span><span class="lines">@@ -28483,6 +28493,7 @@
</span><span class="cx"> 77A17AA612F28B2A004E02F6 /* JSOESVertexArrayObject.cpp in Sources */,
</span><span class="cx"> FDF6BAF8134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp in Sources */,
</span><span class="cx"> FDA9326616703BA9008982DC /* JSOfflineAudioContext.cpp in Sources */,
</span><ins>+ 46779CE21A40B97200B6864E /* FeatureCounter.cpp in Sources */,
</ins><span class="cx"> FDEA6242152102E200479DF0 /* JSOscillatorNode.cpp in Sources */,
</span><span class="cx"> FDBD1DFC167FE27D0051A11E /* JSOscillatorNodeCustom.cpp in Sources */,
</span><span class="cx"> 1A0D57400A5C7867007EDD4C /* JSOverflowEvent.cpp in Sources */,
</span><span class="lines">@@ -29419,6 +29430,7 @@
</span><span class="cx"> CD3A496417A9D01B00274E42 /* SourceBufferList.cpp in Sources */,
</span><span class="cx"> CDC8B5AA18047FF10016E685 /* SourceBufferPrivateAVFObjC.mm in Sources */,
</span><span class="cx"> 84A81F410FC7E02700955300 /* SourceGraphic.cpp in Sources */,
</span><ins>+ 467438541A421330000494FB /* FeatureCounter.mm in Sources */,
</ins><span class="cx"> 076306D717E149CF005A7C4E /* SourceInfo.cpp in Sources */,
</span><span class="cx"> D01A27AD10C9BFD800026A42 /* SpaceSplitString.cpp in Sources */,
</span><span class="cx"> 626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/history/PageCache.cpp 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "DeviceOrientationController.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><del>-#include "FeatureCounterKeys.h"
</del><ins>+#include "FeatureCounter.h"
</ins><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "FrameLoaderStateMachine.h"
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> PCLOG("+---");
</span><span class="cx"> if (!frame->loader().documentLoader()) {
</span><span class="cx"> PCLOG(" -There is no DocumentLoader object");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureNoDocumentLoaderKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureNoDocumentLoaderKey);
</ins><span class="cx"> return 1 << NoDocumentLoader;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> unsigned rejectReasons = 0;
</span><span class="cx"> if (!frame->loader().documentLoader()->mainDocumentError().isNull()) {
</span><span class="cx"> PCLOG(" -Main document has an error");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureMainDocumentErrorKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureMainDocumentErrorKey);
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> rejectReasons |= 1 << MainDocumentError;
</span><span class="cx"> #else
</span><span class="lines">@@ -127,21 +127,21 @@
</span><span class="cx"> }
</span><span class="cx"> if (frame->loader().documentLoader()->substituteData().isValid() && frame->loader().documentLoader()->substituteData().failingURL().isEmpty()) {
</span><span class="cx"> PCLOG(" -Frame is an error page");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureIsErrorPageKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureIsErrorPageKey);
</ins><span class="cx"> rejectReasons |= 1 << IsErrorPage;
</span><span class="cx"> }
</span><span class="cx"> if (frame->loader().subframeLoader().containsPlugins() && !frame->page()->settings().pageCacheSupportsPlugins()) {
</span><span class="cx"> PCLOG(" -Frame contains plugins");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureHasPlugins);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHasPlugins);
</ins><span class="cx"> rejectReasons |= 1 << HasPlugins;
</span><span class="cx"> }
</span><span class="cx"> if (frame->document()->url().protocolIs("https")
</span><span class="cx"> && (frame->loader().documentLoader()->response().cacheControlContainsNoCache()
</span><span class="cx"> || frame->loader().documentLoader()->response().cacheControlContainsNoStore())) {
</span><span class="cx"> if (frame->loader().documentLoader()->response().cacheControlContainsNoCache())
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureHTTPSNoCacheKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoCacheKey);
</ins><span class="cx"> if (frame->loader().documentLoader()->response().cacheControlContainsNoStore())
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureHTTPSNoStoreKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHTTPSNoStoreKey);
</ins><span class="cx"> PCLOG(" -Frame is HTTPS, and cache control prohibits caching or storing");
</span><span class="cx"> rejectReasons |= 1 << IsHttpsAndCacheControlled;
</span><span class="cx"> }
</span><span class="lines">@@ -157,50 +157,50 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> if (DatabaseManager::manager().hasOpenDatabases(frame->document())) {
</span><span class="cx"> PCLOG(" -Frame has open database handles");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureHasOpenDatabasesKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHasOpenDatabasesKey);
</ins><span class="cx"> rejectReasons |= 1 << HasDatabaseHandles;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(SHARED_WORKERS)
</span><span class="cx"> if (SharedWorkerRepository::hasSharedWorkers(frame->document())) {
</span><span class="cx"> PCLOG(" -Frame has associated SharedWorkers");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureHasSharedWorkersKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureHasSharedWorkersKey);
</ins><span class="cx"> rejectReasons |= 1 << HasSharedWorkers;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> if (!frame->loader().history().currentItem()) {
</span><span class="cx"> PCLOG(" -No current history item");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureNoCurrentHistoryItemKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureNoCurrentHistoryItemKey);
</ins><span class="cx"> rejectReasons |= 1 << NoHistoryItem;
</span><span class="cx"> }
</span><span class="cx"> if (frame->loader().quickRedirectComing()) {
</span><span class="cx"> PCLOG(" -Quick redirect is coming");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureQuirkRedirectComingKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureQuirkRedirectComingKey);
</ins><span class="cx"> rejectReasons |= 1 << QuickRedirectComing;
</span><span class="cx"> }
</span><span class="cx"> if (frame->loader().documentLoader()->isLoadingInAPISense()) {
</span><span class="cx"> PCLOG(" -DocumentLoader is still loading in API sense");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureLoadingAPISenseKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureLoadingAPISenseKey);
</ins><span class="cx"> rejectReasons |= 1 << IsLoadingInAPISense;
</span><span class="cx"> }
</span><span class="cx"> if (frame->loader().documentLoader()->isStopping()) {
</span><span class="cx"> PCLOG(" -DocumentLoader is in the middle of stopping");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureDocumentLoaderStoppingKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureDocumentLoaderStoppingKey);
</ins><span class="cx"> rejectReasons |= 1 << IsStopping;
</span><span class="cx"> }
</span><span class="cx"> if (!frame->document()->canSuspendActiveDOMObjects()) {
</span><span class="cx"> PCLOG(" -The document cannot suspend its active DOM Objects");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureCannotSuspendActiveDOMObjectsKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureCannotSuspendActiveDOMObjectsKey);
</ins><span class="cx"> rejectReasons |= 1 << CannotSuspendActiveDOMObjects;
</span><span class="cx"> }
</span><span class="cx"> if (!frame->loader().documentLoader()->applicationCacheHost()->canCacheInPageCache()) {
</span><span class="cx"> PCLOG(" -The DocumentLoader uses an application cache");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureApplicationCacheKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureApplicationCacheKey);
</ins><span class="cx"> rejectReasons |= 1 << DocumentLoaderUsesApplicationCache;
</span><span class="cx"> }
</span><span class="cx"> if (!frame->loader().client().canCachePage()) {
</span><span class="cx"> PCLOG(" -The client says this frame cannot be cached");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureDeniedByClientKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(frame->page(), FeatureCounterPageCacheFailureDeniedByClientKey);
</ins><span class="cx"> rejectReasons |= 1 << ClientDeniesCaching;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -252,45 +252,45 @@
</span><span class="cx"> #if ENABLE(DEVICE_ORIENTATION) && !PLATFORM(IOS)
</span><span class="cx"> if (DeviceMotionController::isActiveAt(page)) {
</span><span class="cx"> PCLOG(" -Page is using DeviceMotion");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureDeviceMotionKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureDeviceMotionKey);
</ins><span class="cx"> rejectReasons |= 1 << UsesDeviceMotion;
</span><span class="cx"> }
</span><span class="cx"> if (DeviceOrientationController::isActiveAt(page)) {
</span><span class="cx"> PCLOG(" -Page is using DeviceOrientation");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureDeviceOrientationKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureDeviceOrientationKey);
</ins><span class="cx"> rejectReasons |= 1 << UsesDeviceOrientation;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(PROXIMITY_EVENTS)
</span><span class="cx"> if (DeviceProximityController::isActiveAt(page)) {
</span><span class="cx"> PCLOG(" -Page is using DeviceProximity");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureDeviceProximityKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureDeviceProximityKey);
</ins><span class="cx"> rejectReasons |= 1 << UsesDeviceMotion;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> FrameLoadType loadType = page->mainFrame().loader().loadType();
</span><span class="cx"> if (loadType == FrameLoadType::Reload) {
</span><span class="cx"> PCLOG(" -Load type is: Reload");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureReloadKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureReloadKey);
</ins><span class="cx"> rejectReasons |= 1 << IsReload;
</span><span class="cx"> }
</span><span class="cx"> if (loadType == FrameLoadType::ReloadFromOrigin) {
</span><span class="cx"> PCLOG(" -Load type is: Reload from origin");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureReloadFromOriginKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureReloadFromOriginKey);
</ins><span class="cx"> rejectReasons |= 1 << IsReloadFromOrigin;
</span><span class="cx"> }
</span><span class="cx"> if (loadType == FrameLoadType::Same) {
</span><span class="cx"> PCLOG(" -Load type is: Same");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureSameLoadKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureSameLoadKey);
</ins><span class="cx"> rejectReasons |= 1 << IsSameLoad;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (rejectReasons) {
</span><span class="cx"> PCLOG(" Page CANNOT be cached\n--------");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheFailureKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheFailureKey);
</ins><span class="cx"> } else {
</span><span class="cx"> PCLOG(" Page CAN be cached\n--------");
</span><del>- FEATURE_COUNTER_INCREMENT_KEY(FeatureCounterPageCacheSuccessKey);
</del><ins>+ FEATURE_COUNTER_INCREMENT_KEY(page, FeatureCounterPageCacheSuccessKey);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/Settings.in (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/Settings.in 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/Settings.in 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> javaScriptExperimentsEnabled initial=false
</span><span class="cx"> scriptMarkupEnabled initial=true
</span><span class="cx"> needsSiteSpecificQuirks initial=false
</span><ins>+featureCounterEnabled initial=false
</ins><span class="cx"> webArchiveDebugModeEnabled initial=false, conditional=WEB_ARCHIVE
</span><span class="cx"> localFileContentSniffingEnabled initial=false
</span><span class="cx"> offlineWebApplicationCacheEnabled initial=false
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformFeatureCountercppfromrev177455trunkSourceWebCoreplatformFeatureCountercpp"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.cpp (from rev 177455, trunk/Source/WebCore/platform/FeatureCounter.cpp) (0 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.cpp (rev 0)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.cpp 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE 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.
+ */
+
+#include "config.h"
+#include "FeatureCounter.h"
+
+#include "Page.h"
+#include "Settings.h"
+
+namespace WebCore {
+
+bool FeatureCounter::shouldUseForPage(Page* page)
+{
+ if (!page)
+ return false;
+
+ // Log only if the setting is enabled.
+ if (!page->settings().featureCounterEnabled())
+ return false;
+
+ // Do not log if this is a private session.
+ if (page->usesEphemeralSession())
+ return false;
+
+ return true;
+}
+
+#if !PLATFORM(IOS) || !USE(APPLE_INTERNAL_SDK)
+
+void FeatureCounter::incrementKey(Page* page, const char* const key)
+{
+ UNUSED_PARAM(page);
+ UNUSED_PARAM(key);
+}
+
+void FeatureCounter::setKey(Page* page, const char* const key, int64_t value)
+{
+ UNUSED_PARAM(page);
+ UNUSED_PARAM(key);
+ UNUSED_PARAM(value);
+}
+
+#endif
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformFeatureCounterhfromrev177455trunkSourceWebCoreplatformFeatureCounterh"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.h (from rev 177455, trunk/Source/WebCore/platform/FeatureCounter.h) (0 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.h (rev 0)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounter.h 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE 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.
+ */
+
+#ifndef FeatureCounter_h
+#define FeatureCounter_h
+
+#include "FeatureCounterKeys.h"
+
+namespace WebCore {
+
+class Page;
+
+class FeatureCounter {
+public:
+ static void incrementKey(Page*, const char* const key);
+ static void setKey(Page*, const char* const key, int64_t value);
+
+private:
+ static bool shouldUseForPage(Page*);
+};
+
+} // namespace WebCore
+
+#define FEATURE_COUNTER_INCREMENT_KEY(page, key) WebCore::FeatureCounter::incrementKey(page, key)
+#define FEATURE_COUNTER_SET_KEY(page, key, value) WebCore::FeatureCounter::setKey(page, key, value)
+
+#endif // FeatureCounter_h
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformFeatureCounterKeysh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef FeatureCounterKeys_h
</span><span class="cx"> #define FeatureCounterKeys_h
</span><span class="cx">
</span><del>-#include <wtf/FeatureCounter.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // Page cache.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformiosFeatureCountermmfromrev177455trunkSourceWebCoreplatformiosFeatureCountermm"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/FeatureCounter.mm (from rev 177455, trunk/Source/WebCore/platform/ios/FeatureCounter.mm) (0 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/FeatureCounter.mm (rev 0)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/ios/FeatureCounter.mm 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE 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 "config.h"
+#import "FeatureCounter.h"
+
+#if PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)
+#import <AppSupport/CPAggregateDictionary.h>
+
+namespace WebCore {
+
+void FeatureCounter::incrementKey(Page* page, const char* const key)
+{
+ if (!shouldUseForPage(page))
+ return;
+
+ NSString *nsKey = [[NSString alloc] initWithCharactersNoCopy:reinterpret_cast<unichar*>(const_cast<char*>(key)) length:strlen(key) freeWhenDone:NO];
+ [[CPAggregateDictionary sharedAggregateDictionary] incrementKey:nsKey];
+}
+
+void FeatureCounter::setKey(Page* page, const char* const key, int64_t value)
+{
+ if (!shouldUseForPage(page))
+ return;
+
+ NSString *nsKey = [[NSString alloc] initWithCharactersNoCopy:reinterpret_cast<unichar*>(const_cast<char*>(key)) length:strlen(key) freeWhenDone:NO];
+ [[CPAggregateDictionary sharedAggregateDictionary] setValue:value forScalarKey:nsKey];
+}
+
+} // namespace WebCore
+
+#endif // PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)
+
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-01-27 Lucas Forschler <lforschler@apple.com>
+
+ Merge r177455
+
+ 2014-12-17 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Make it possible to toggle FeatureCounter support at runtime
+ https://bugs.webkit.org/show_bug.cgi?id=139688
+ <rdar://problem/19266254>
+
+ Reviewed by Andreas Kling.
+
+ Add private settings API to toggle FeatureCounter support on Safari and
+ MobileSafari.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetFeatureCounterEnabled):
+ (WKPreferencesGetFeatureCounterEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _featureCounterEnabled]):
+ (-[WKPreferences _setFeatureCounterEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2015-01-25 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177332.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
</span><span class="cx"> macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
</span><span class="cx"> macro(DNSPrefetchingEnabled, dnsPrefetchingEnabled, Bool, bool, false) \
</span><ins>+ macro(FeatureCounterEnabled, featureCounterEnabled, Bool, bool, false) \
</ins><span class="cx"> macro(WebArchiveDebugModeEnabled, webArchiveDebugModeEnabled, Bool, bool, false) \
</span><span class="cx"> macro(LocalFileContentSniffingEnabled, localFileContentSniffingEnabled, Bool, bool, false) \
</span><span class="cx"> macro(UsesPageCache, usesPageCache, Bool, bool, true) \
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -589,6 +589,16 @@
</span><span class="cx"> return toImpl(preferencesRef)->shouldPrintBackgrounds();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetFeatureCounterEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setFeatureCounterEnabled(enabled);
+}
+
+bool WKPreferencesGetFeatureCounterEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->featureCounterEnabled();
+}
+
</ins><span class="cx"> void WKPreferencesSetWebArchiveDebugModeEnabled(WKPreferencesRef preferencesRef, bool enabled)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setWebArchiveDebugModeEnabled(enabled);
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -121,6 +121,10 @@
</span><span class="cx"> WK_EXPORT WKStringRef WKPreferencesCopyFTPDirectoryTemplatePath(WKPreferencesRef preferences);
</span><span class="cx">
</span><span class="cx"> // Defaults to false.
</span><ins>+WK_EXPORT void WKPreferencesSetFeatureCounterEnabled(WKPreferencesRef preferences, bool enabled);
+WK_EXPORT bool WKPreferencesGetFeatureCounterEnabled(WKPreferencesRef preferences);
+
+// Defaults to false.
</ins><span class="cx"> WK_EXPORT void WKPreferencesSetWebArchiveDebugModeEnabled(WKPreferencesRef preferences, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetWebArchiveDebugModeEnabled(WKPreferencesRef preferences);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -113,6 +113,16 @@
</span><span class="cx"> _preferences->setTelephoneNumberParsingEnabled(telephoneNumberDetectionIsEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_featureCounterEnabled
+{
+ return _preferences->featureCounterEnabled();
+}
+
+- (void)_setFeatureCounterEnabled:(BOOL)featureCounterEnabled
+{
+ _preferences->setFeatureCounterEnabled(featureCounterEnabled);
+}
+
</ins><span class="cx"> static WebCore::SecurityOrigin::StorageBlockingPolicy toStorageBlockingPolicy(_WKStorageBlockingPolicy policy)
</span><span class="cx"> {
</span><span class="cx"> switch (policy) {
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: This property should not have the verb "is" in it.
</span><span class="cx"> @property (nonatomic, setter=_setTelephoneNumberDetectionIsEnabled:) BOOL _telephoneNumberDetectionIsEnabled;
</span><ins>+@property (nonatomic, setter=_setFeatureCounterEnabled:) BOOL _featureCounterEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx"> @property (nonatomic, setter=_setStorageBlockingPolicy:) _WKStorageBlockingPolicy _storageBlockingPolicy;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setCompositingBordersVisible:) BOOL _compositingBordersVisible;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (179208 => 179209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-27 21:10:59 UTC (rev 179208)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-27 21:19:18 UTC (rev 179209)
</span><span class="lines">@@ -2685,6 +2685,7 @@
</span><span class="cx"> settings.setJavaScriptCanOpenWindowsAutomatically(store.getBoolValueForKey(WebPreferencesKey::javaScriptCanOpenWindowsAutomaticallyKey()));
</span><span class="cx"> settings.setForceFTPDirectoryListings(store.getBoolValueForKey(WebPreferencesKey::forceFTPDirectoryListingsKey()));
</span><span class="cx"> settings.setDNSPrefetchingEnabled(store.getBoolValueForKey(WebPreferencesKey::dnsPrefetchingEnabledKey()));
</span><ins>+ settings.setFeatureCounterEnabled(store.getBoolValueForKey(WebPreferencesKey::featureCounterEnabledKey()));
</ins><span class="cx"> #if ENABLE(WEB_ARCHIVE)
</span><span class="cx"> settings.setWebArchiveDebugModeEnabled(store.getBoolValueForKey(WebPreferencesKey::webArchiveDebugModeEnabledKey()));
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>