<!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>[184590] trunk/Tools</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/184590">184590</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 14:37:49 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add alternate menu items for performing operations on the default data store
https://bugs.webkit.org/show_bug.cgi?id=145184
Reviewed by Sam Weinig.
This makes it possible to test WKWebsiteDataStore code paths when there are no live web views
associated with a data store.
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate fetchDefaultStoreWebsiteData:]):
(-[BrowserAppDelegate fetchAndClearDefaultStoreWebsiteData:]):
(-[BrowserAppDelegate clearDefaultStoreWebsiteData:]):
* MiniBrowser/mac/MainMenu.xib:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacMainMenuxib">trunk/Tools/MiniBrowser/mac/MainMenu.xib</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184589 => 184590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-19 21:27:34 UTC (rev 184589)
+++ trunk/Tools/ChangeLog 2015-05-19 21:37:49 UTC (rev 184590)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-19 Anders Carlsson <andersca@apple.com>
+
+ Add alternate menu items for performing operations on the default data store
+ https://bugs.webkit.org/show_bug.cgi?id=145184
+
+ Reviewed by Sam Weinig.
+
+ This makes it possible to test WKWebsiteDataStore code paths when there are no live web views
+ associated with a data store.
+
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate fetchDefaultStoreWebsiteData:]):
+ (-[BrowserAppDelegate fetchAndClearDefaultStoreWebsiteData:]):
+ (-[BrowserAppDelegate clearDefaultStoreWebsiteData:]):
+ * MiniBrowser/mac/MainMenu.xib:
+
</ins><span class="cx"> 2015-05-19 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix tautological-compare warning in AtomicString.cpp
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (184589 => 184590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2015-05-19 21:27:34 UTC (rev 184589)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2015-05-19 21:37:49 UTC (rev 184590)
</span><span class="lines">@@ -228,6 +228,32 @@
</span><span class="cx"> {
</span><span class="cx"> return defaultConfiguration().userContentController;
</span><span class="cx"> }
</span><ins>+
+- (IBAction)fetchDefaultStoreWebsiteData:(id)sender
+{
+ [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray *websiteDataRecords) {
+ NSLog(@"did fetch default store website data %@.", websiteDataRecords);
+ }];
+}
+
+- (IBAction)fetchAndClearDefaultStoreWebsiteData:(id)sender
+{
+ [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray *websiteDataRecords) {
+ [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] forDataRecords:websiteDataRecords completionHandler:^{
+ [[WKWebsiteDataStore defaultDataStore] fetchDataRecordsOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] completionHandler:^(NSArray *websiteDataRecords) {
+ NSLog(@"did clear default store website data, after clearing data is %@.", websiteDataRecords);
+ }];
+ }];
+ }];
+}
+
+- (IBAction)clearDefaultStoreWebsiteData:(id)sender
+{
+ [[WKWebsiteDataStore defaultDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^{
+ NSLog(@"Did clear default store website data.");
+ }];
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (184589 => 184590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2015-05-19 21:27:34 UTC (rev 184589)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2015-05-19 21:37:49 UTC (rev 184590)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
</span><del>-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8040.1" systemVersion="14D106" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</del><ins>+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8096.6" systemVersion="15A178f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
</ins><span class="cx"> <dependencies>
</span><del>- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8040.1"/>
</del><ins>+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8096.6"/>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> <objects>
</span><span class="cx"> <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
</span><span class="lines">@@ -11,10 +12,10 @@
</span><span class="cx"> </customObject>
</span><span class="cx"> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
</span><span class="cx"> <customObject id="-3" userLabel="Application" customClass="NSObject"/>
</span><del>- <menu title="AMainMenu" systemMenu="main" id="29">
</del><ins>+ <menu title="AMainMenu" systemMenu="main" userInterfaceLayoutDirection="leftToRight" id="29">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="MiniBrowser" id="56">
</span><del>- <menu key="submenu" title="MiniBrowser" systemMenu="apple" id="57">
</del><ins>+ <menu key="submenu" title="MiniBrowser" systemMenu="apple" userInterfaceLayoutDirection="leftToRight" id="57">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="About MiniBrowser" id="58">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="lines">@@ -30,7 +31,7 @@
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Services" id="131">
</span><del>- <menu key="submenu" title="Services" systemMenu="services" id="130"/>
</del><ins>+ <menu key="submenu" title="Services" systemMenu="services" userInterfaceLayoutDirection="leftToRight" id="130"/>
</ins><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem isSeparatorItem="YES" id="144">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span class="lines">@@ -63,7 +64,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="File" id="83">
</span><del>- <menu key="submenu" title="File" id="81">
</del><ins>+ <menu key="submenu" title="File" userInterfaceLayoutDirection="leftToRight" id="81">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Open Location " tag="1" keyEquivalent="l" id="82">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -93,7 +94,7 @@
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Open Recent" id="124">
</span><del>- <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
</del><ins>+ <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" userInterfaceLayoutDirection="leftToRight" id="125">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Clear Menu" id="126">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -146,7 +147,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Edit" id="217">
</span><del>- <menu key="submenu" title="Edit" id="205">
</del><ins>+ <menu key="submenu" title="Edit" userInterfaceLayoutDirection="leftToRight" id="205">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Undo" keyEquivalent="z" id="207">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -197,7 +198,7 @@
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Find" id="218">
</span><del>- <menu key="submenu" title="Find" id="220">
</del><ins>+ <menu key="submenu" title="Find" userInterfaceLayoutDirection="leftToRight" id="220">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -229,7 +230,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Spelling and Grammar" id="216">
</span><del>- <menu key="submenu" title="Spelling and Grammar" id="200">
</del><ins>+ <menu key="submenu" title="Spelling and Grammar" userInterfaceLayoutDirection="leftToRight" id="200">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -262,7 +263,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Substitutions" id="348">
</span><del>- <menu key="submenu" title="Substitutions" id="349">
</del><ins>+ <menu key="submenu" title="Substitutions" userInterfaceLayoutDirection="leftToRight" id="349">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Show Substitutions" id="457">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="lines">@@ -304,7 +305,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Transformations" id="450">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="Transformations" id="451">
</del><ins>+ <menu key="submenu" title="Transformations" userInterfaceLayoutDirection="leftToRight" id="451">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Make Upper Case" id="452">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="lines">@@ -328,7 +329,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Speech" id="211">
</span><del>- <menu key="submenu" title="Speech" id="212">
</del><ins>+ <menu key="submenu" title="Speech" userInterfaceLayoutDirection="leftToRight" id="212">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Start Speaking" id="196">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -347,7 +348,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="View" id="295">
</span><del>- <menu key="submenu" title="View" id="296">
</del><ins>+ <menu key="submenu" title="View" userInterfaceLayoutDirection="leftToRight" id="296">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span><span class="lines">@@ -384,7 +385,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="View Scale" id="8UY-Pj-H13">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="View Scale" id="Ml8-mk-ffu">
</del><ins>+ <menu key="submenu" title="View Scale" userInterfaceLayoutDirection="leftToRight" id="Ml8-mk-ffu">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="100%" state="on" tag="1" keyEquivalent="1" id="EAm-Xn-VrC">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -419,7 +420,7 @@
</span><span class="cx"> </menu>
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Window" id="19">
</span><del>- <menu key="submenu" title="Window" systemMenu="window" id="24">
</del><ins>+ <menu key="submenu" title="Window" systemMenu="window" userInterfaceLayoutDirection="leftToRight" id="24">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Minimize" keyEquivalent="m" id="23">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -444,7 +445,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Help" id="490">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="Help" systemMenu="help" id="491">
</del><ins>+ <menu key="submenu" title="Help" systemMenu="help" userInterfaceLayoutDirection="leftToRight" id="491">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="MiniBrowser Help" keyEquivalent="?" id="492">
</span><span class="cx"> <connections>
</span><span class="lines">@@ -456,7 +457,7 @@
</span><span class="cx"> </menuItem>
</span><span class="cx"> <menuItem title="Debug" id="534">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><del>- <menu key="submenu" title="Debug" id="535">
</del><ins>+ <menu key="submenu" title="Debug" userInterfaceLayoutDirection="leftToRight" id="535">
</ins><span class="cx"> <items>
</span><span class="cx"> <menuItem title="Force Repaint" keyEquivalent="r" id="545">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span><span class="lines">@@ -490,18 +491,36 @@
</span><span class="cx"> <action selector="fetchWebsiteData:" target="-1" id="pVk-bR-Z4t"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem title="Fetch Default Store Website Data" alternate="YES" id="hGe-aG-Hya">
+ <modifierMask key="keyEquivalentModifierMask" option="YES"/>
+ <connections>
+ <action selector="fetchDefaultStoreWebsiteData:" target="-1" id="4Dx-M1-kNg"/>
+ </connections>
+ </menuItem>
</ins><span class="cx"> <menuItem title="Clear Website Data" id="bfj-13-wQ4">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <connections>
</span><span class="cx"> <action selector="clearWebsiteData:" target="-1" id="pEC-gb-vGm"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem title="Clear Default Store Website Data" alternate="YES" id="YZt-aI-HG8">
+ <modifierMask key="keyEquivalentModifierMask" option="YES"/>
+ <connections>
+ <action selector="clearDefaultStoreWebsiteData:" target="-1" id="HDz-DK-I9T"/>
+ </connections>
+ </menuItem>
</ins><span class="cx"> <menuItem title="Fetch And Clear Website Data" id="VDP-iU-836">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask"/>
</span><span class="cx"> <connections>
</span><span class="cx"> <action selector="fetchAndClearWebsiteData:" target="-1" id="R06-l2-tP0"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem title="Fetch And Clear Default Store Website Data" alternate="YES" id="VDT-W7-H7E">
+ <modifierMask key="keyEquivalentModifierMask" option="YES"/>
+ <connections>
+ <action selector="fetchAndClearDefaultStoreWebsiteData:" target="-1" id="B75-Hd-TIT"/>
+ </connections>
+ </menuItem>
</ins><span class="cx"> <menuItem isSeparatorItem="YES" id="uef-kb-r9n"/>
</span><span class="cx"> <menuItem title="Show Extensions Manager" keyEquivalent="m" id="2f0-pH-KRx">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
</span></span></pre>
</div>
</div>
</body>
</html>