<!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>[177868] 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/177868">177868</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-01-02 12:07:40 -0800 (Fri, 02 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove now unused storage tracker glue from DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=140045
Reviewed by Darin Adler.
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
* DumpRenderTree/StorageTrackerDelegate.h: Removed.
* DumpRenderTree/StorageTrackerDelegate.mm: Removed.
* DumpRenderTree/TestRunner.cpp:
(TestRunner::staticFunctions):
(syncLocalStorageCallback): Deleted.
(observeStorageTrackerNotificationsCallback): Deleted.
(deleteAllLocalStorageCallback): Deleted.
(deleteLocalStorageForOriginCallback): Deleted.
(localStorageDiskUsageForOriginCallback): Deleted.
(originsWithLocalStorageCallback): Deleted.
* DumpRenderTree/TestRunner.h:
* DumpRenderTree/mac/DumpRenderTree.mm:
(allocateGlobalControllers):
(releaseGlobalControllers):
* DumpRenderTree/mac/DumpRenderTreeMac.h:
* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::syncLocalStorage): Deleted.
(TestRunner::localStorageDiskUsageForOrigin): Deleted.
(TestRunner::observeStorageTrackerNotifications): Deleted.
(TestRunner::deleteAllLocalStorage): Deleted.
(TestRunner::originsWithLocalStorage): Deleted.
(TestRunner::deleteLocalStorageForOrigin): Deleted.
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::syncLocalStorage): Deleted.
(TestRunner::localStorageDiskUsageForOrigin): Deleted.
(TestRunner::observeStorageTrackerNotifications): Deleted.
(TestRunner::deleteAllLocalStorage): Deleted.
(TestRunner::originsWithLocalStorage): Deleted.
(TestRunner::deleteLocalStorageForOrigin): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnerh">trunk/Tools/DumpRenderTree/TestRunner.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeMach">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsDumpRenderTreeStorageTrackerDelegateh">trunk/Tools/DumpRenderTree/StorageTrackerDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeStorageTrackerDelegatemm">trunk/Tools/DumpRenderTree/StorageTrackerDelegate.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/ChangeLog 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-01-02 Anders Carlsson <andersca@apple.com>
+
+ Remove now unused storage tracker glue from DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=140045
+
+ Reviewed by Darin Adler.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/StorageTrackerDelegate.h: Removed.
+ * DumpRenderTree/StorageTrackerDelegate.mm: Removed.
+ * DumpRenderTree/TestRunner.cpp:
+ (TestRunner::staticFunctions):
+ (syncLocalStorageCallback): Deleted.
+ (observeStorageTrackerNotificationsCallback): Deleted.
+ (deleteAllLocalStorageCallback): Deleted.
+ (deleteLocalStorageForOriginCallback): Deleted.
+ (localStorageDiskUsageForOriginCallback): Deleted.
+ (originsWithLocalStorageCallback): Deleted.
+ * DumpRenderTree/TestRunner.h:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (allocateGlobalControllers):
+ (releaseGlobalControllers):
+ * DumpRenderTree/mac/DumpRenderTreeMac.h:
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::syncLocalStorage): Deleted.
+ (TestRunner::localStorageDiskUsageForOrigin): Deleted.
+ (TestRunner::observeStorageTrackerNotifications): Deleted.
+ (TestRunner::deleteAllLocalStorage): Deleted.
+ (TestRunner::originsWithLocalStorage): Deleted.
+ (TestRunner::deleteLocalStorageForOrigin): Deleted.
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::syncLocalStorage): Deleted.
+ (TestRunner::localStorageDiskUsageForOrigin): Deleted.
+ (TestRunner::observeStorageTrackerNotifications): Deleted.
+ (TestRunner::deleteAllLocalStorage): Deleted.
+ (TestRunner::originsWithLocalStorage): Deleted.
+ (TestRunner::deleteLocalStorageForOrigin): Deleted.
+
</ins><span class="cx"> 2015-01-01 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> We often misspell identifier as "identifer"
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> 2CE88FA217124D8C00734FC0 /* JavaScriptThreading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE88FA117124CEE00734FC0 /* JavaScriptThreading.cpp */; };
</span><span class="cx"> 2D403F1B15087209005358D2 /* LayoutTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D403EA215087142005358D2 /* LayoutTestHelper.m */; };
</span><span class="cx"> 31117B3D15D9A56A00163BC8 /* MockWebNotificationProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31117B3B15D9A56A00163BC8 /* MockWebNotificationProvider.mm */; };
</span><del>- 3A5626CB131CA02A002BE6D9 /* StorageTrackerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */; };
</del><span class="cx"> 440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */; };
</span><span class="cx"> 4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */; };
</span><span class="cx"> 4AD6A11413C8124000EA9737 /* FormValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD6A11313C8124000EA9737 /* FormValue.cpp */; };
</span><span class="lines">@@ -250,8 +249,6 @@
</span><span class="cx"> 375F09770DAC3CB600C8B4E5 /* WebKitWeightWatcher700.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher700.ttf; path = fonts/WebKitWeightWatcher700.ttf; sourceTree = "<group>"; };
</span><span class="cx"> 375F09780DAC3CB600C8B4E5 /* WebKitWeightWatcher800.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher800.ttf; path = fonts/WebKitWeightWatcher800.ttf; sourceTree = "<group>"; };
</span><span class="cx"> 375F09790DAC3CB600C8B4E5 /* WebKitWeightWatcher900.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher900.ttf; path = fonts/WebKitWeightWatcher900.ttf; sourceTree = "<group>"; };
</span><del>- 3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerDelegate.h; sourceTree = "<group>"; };
- 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageTrackerDelegate.mm; sourceTree = "<group>"; };
</del><span class="cx"> 417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebCoreTestSupport.h; path = WebCoreTestSupport/WebCoreTestSupport.h; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebArchiveDumpSupportMac.mm; path = mac/WebArchiveDumpSupportMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebArchiveDumpSupport.h; path = cf/WebArchiveDumpSupport.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -531,8 +528,6 @@
</span><span class="cx"> BCA18B5C0C9B08C200114369 /* PolicyDelegate.mm */,
</span><span class="cx"> BCA18B5D0C9B08C200114369 /* ResourceLoadDelegate.h */,
</span><span class="cx"> BCA18B5E0C9B08C200114369 /* ResourceLoadDelegate.mm */,
</span><del>- 3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */,
- 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */,
</del><span class="cx"> BCA18B5F0C9B08C200114369 /* UIDelegate.h */,
</span><span class="cx"> BCA18B600C9B08C200114369 /* UIDelegate.mm */,
</span><span class="cx"> );
</span><span class="lines">@@ -982,7 +977,6 @@
</span><span class="cx"> BCB284D60CFA83D1007E533E /* PixelDumpSupportMac.mm in Sources */,
</span><span class="cx"> BCA18B660C9B08C200114369 /* PolicyDelegate.mm in Sources */,
</span><span class="cx"> BCA18B680C9B08C200114369 /* ResourceLoadDelegate.mm in Sources */,
</span><del>- 3A5626CB131CA02A002BE6D9 /* StorageTrackerDelegate.mm in Sources */,
</del><span class="cx"> BC0131DA0C9772010087317D /* TestRunner.cpp in Sources */,
</span><span class="cx"> BCA18B240C9B014B00114369 /* TestRunnerMac.mm in Sources */,
</span><span class="cx"> BCA18B490C9B02C400114369 /* TextInputController.m in Sources */,
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeStorageTrackerDelegateh"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/DumpRenderTree/StorageTrackerDelegate.h (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/StorageTrackerDelegate.h 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/StorageTrackerDelegate.h 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-class TestRunner;
-
-@interface StorageTrackerDelegate : NSObject {
- unsigned numberOfNotificationsToLog;
- TestRunner* controllerToNotifyDone;
-}
-
-- (void)logNotifications:(unsigned)number controller:(TestRunner*)controller;
-- (void)originModified:(NSNotification *)notification;
-- (void)setControllerToNotifyDone:(TestRunner*)controller;
-
-@end
</del></span></pre></div>
<a id="trunkToolsDumpRenderTreeStorageTrackerDelegatemm"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/DumpRenderTree/StorageTrackerDelegate.mm (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/StorageTrackerDelegate.mm 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/StorageTrackerDelegate.mm 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "StorageTrackerDelegate.h"
-
-#import "TestRunner.h"
-#import <WebKit/WebSecurityOriginPrivate.h>
-#import <WebKit/WebStorageManagerPrivate.h>
-
-@implementation StorageTrackerDelegate
-
-- (id)init
-{
- self = [super init];
- if (!self)
- return nil;
-
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(originModified:) name:WebStorageDidModifyOriginNotification object:nil];
-
- return self;
-}
-
-- (void)logNotifications:(unsigned)number controller:(TestRunner*)controller
-{
- controllerToNotifyDone = controller;
-
- numberOfNotificationsToLog = number;
-}
-
-- (void)originModified:(NSNotification *)notification
-{
- if (!numberOfNotificationsToLog)
- return;
-
- numberOfNotificationsToLog--;
-
- if (numberOfNotificationsToLog == 0 && controllerToNotifyDone) {
- NSArray *origins = [[WebStorageManager sharedWebStorageManager] origins];
- for (WebSecurityOrigin *origin in origins)
- printf("Origin identifier: '%s'\n", [[origin databaseIdentifier] UTF8String]);
-
- controllerToNotifyDone->notifyDone();
- }
-}
-
-- (void)dealloc
-{
- [[NSNotificationCenter defaultCenter] removeObserver:self name:WebStorageDidModifyOriginNotification object:nil];
-
- [super dealloc];
-}
-
-- (void)setControllerToNotifyDone:(TestRunner*)controller
-{
- controllerToNotifyDone = controller;
-}
-
-
-@end
</del></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -467,73 +467,6 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static JSValueRef syncLocalStorageCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
-
- controller->syncLocalStorage();
-
- return JSValueMakeUndefined(context);
-}
-
-static JSValueRef observeStorageTrackerNotificationsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
-
- if (argumentCount < 1)
- return JSValueMakeUndefined(context);
-
- unsigned numNotifications = JSValueToNumber(context, arguments[0], exception);
-
- ASSERT(!*exception);
-
- controller->observeStorageTrackerNotifications(numNotifications);
-
- return JSValueMakeUndefined(context);
-}
-
-static JSValueRef deleteAllLocalStorageCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- controller->deleteAllLocalStorage();
-
- return JSValueMakeUndefined(context);
-}
-
-static JSValueRef deleteLocalStorageForOriginCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
-
- if (argumentCount < 1)
- return JSValueMakeUndefined(context);
-
- JSRetainPtr<JSStringRef> url(Adopt, JSValueToStringCopy(context, arguments[0], exception));
- ASSERT(!*exception);
-
- controller->deleteLocalStorageForOrigin(url.get());
-
- return JSValueMakeUndefined(context);
-}
-
-static JSValueRef localStorageDiskUsageForOriginCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
-
- if (argumentCount < 1)
- return JSValueMakeUndefined(context);
-
- JSRetainPtr<JSStringRef> originURL(Adopt, JSValueToStringCopy(context, arguments[0], exception));
- ASSERT(!*exception);
-
- return JSValueMakeNumber(context, controller->localStorageDiskUsageForOrigin(originURL.get()));
-}
-
-static JSValueRef originsWithLocalStorageCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- return controller->originsWithLocalStorage(context);
-}
-
</del><span class="cx"> static JSValueRef clearBackForwardListCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> // Has mac & windows implementation
</span><span class="lines">@@ -2186,12 +2119,6 @@
</span><span class="cx"> { "addOriginAccessWhitelistEntry", addOriginAccessWhitelistEntryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setScrollbarPolicy", setScrollbarPolicyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "authenticateSession", authenticateSessionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><del>- { "deleteAllLocalStorage", deleteAllLocalStorageCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "syncLocalStorage", syncLocalStorageCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "observeStorageTrackerNotifications", observeStorageTrackerNotificationsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "deleteLocalStorageForOrigin", deleteLocalStorageForOriginCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "localStorageDiskUsageForOrigin", localStorageDiskUsageForOriginCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "originsWithLocalStorage", originsWithLocalStorageCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</del><span class="cx"> { "setShouldPaintBrokenImage", setShouldPaintBrokenImageCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setTextDirection", setTextDirectionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setShouldStayOnPageAfterHandlingBeforeUnload", setShouldStayOnPageAfterHandlingBeforeUnloadCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.h (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.h 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -333,13 +333,6 @@
</span><span class="cx"> // Simulate a request an embedding application could make, populating per-session credential storage.
</span><span class="cx"> void authenticateSession(JSStringRef url, JSStringRef username, JSStringRef password);
</span><span class="cx">
</span><del>- JSValueRef originsWithLocalStorage(JSContextRef);
- void deleteAllLocalStorage();
- void deleteLocalStorageForOrigin(JSStringRef originIdentifier);
- long long localStorageDiskUsageForOrigin(JSStringRef originIdentifier);
- void observeStorageTrackerNotifications(unsigned number);
- void syncLocalStorage();
-
</del><span class="cx"> void setShouldPaintBrokenImage(bool);
</span><span class="cx"> bool shouldPaintBrokenImage() const { return m_shouldPaintBrokenImage; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> #import "PixelDumpSupport.h"
</span><span class="cx"> #import "PolicyDelegate.h"
</span><span class="cx"> #import "ResourceLoadDelegate.h"
</span><del>-#import "StorageTrackerDelegate.h"
</del><span class="cx"> #import "TestRunner.h"
</span><span class="cx"> #import "UIDelegate.h"
</span><span class="cx"> #import "WebArchiveDumpSupport.h"
</span><span class="lines">@@ -189,7 +188,6 @@
</span><span class="cx"> static HistoryDelegate *historyDelegate;
</span><span class="cx"> PolicyDelegate *policyDelegate;
</span><span class="cx"> DefaultPolicyDelegate *defaultPolicyDelegate;
</span><del>-StorageTrackerDelegate *storageDelegate;
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static ScrollViewResizerDelegate *scrollViewResizerDelegate;
</span><span class="cx"> #endif
</span><span class="lines">@@ -991,7 +989,6 @@
</span><span class="cx"> resourceLoadDelegate = [[ResourceLoadDelegate alloc] init];
</span><span class="cx"> policyDelegate = [[PolicyDelegate alloc] init];
</span><span class="cx"> historyDelegate = [[HistoryDelegate alloc] init];
</span><del>- storageDelegate = [[StorageTrackerDelegate alloc] init];
</del><span class="cx"> defaultPolicyDelegate = [[DefaultPolicyDelegate alloc] init];
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> scrollViewResizerDelegate = [[ScrollViewResizerDelegate alloc] init];
</span><span class="lines">@@ -1013,7 +1010,6 @@
</span><span class="cx"> releaseAndZero(&resourceLoadDelegate);
</span><span class="cx"> releaseAndZero(&uiDelegate);
</span><span class="cx"> releaseAndZero(&policyDelegate);
</span><del>- releaseAndZero(&storageDelegate);
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> releaseAndZero(&scrollViewResizerDelegate);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeMach"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> extern DumpRenderTreeDraggingInfo *draggingInfo;
</span><span class="cx"> extern NavigationController* gNavigationController;
</span><span class="cx"> extern PolicyDelegate* policyDelegate;
</span><del>-extern StorageTrackerDelegate* storageDelegate;
</del><span class="cx"> extern DefaultPolicyDelegate *defaultPolicyDelegate;
</span><span class="cx">
</span><span class="cx"> void setWaitToDumpWatchdog(CFRunLoopTimerRef);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import "MockGeolocationProvider.h"
</span><span class="cx"> #import "MockWebNotificationProvider.h"
</span><span class="cx"> #import "PolicyDelegate.h"
</span><del>-#import "StorageTrackerDelegate.h"
</del><span class="cx"> #import "UIDelegate.h"
</span><span class="cx"> #import "WorkQueue.h"
</span><span class="cx"> #import "WorkQueueItem.h"
</span><span class="lines">@@ -162,25 +161,6 @@
</span><span class="cx"> return usage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::syncLocalStorage()
-{
- [[WebStorageManager sharedWebStorageManager] syncLocalStorage];
-}
-
-long long TestRunner::localStorageDiskUsageForOrigin(JSStringRef url)
-{
- RetainPtr<CFStringRef> urlCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, url));
- WebSecurityOrigin *origin = [[WebSecurityOrigin alloc] initWithURL:[NSURL URLWithString:(NSString *)urlCF.get()]];
- long long usage = [[WebStorageManager sharedWebStorageManager] diskUsageForOrigin:origin];
- [origin release];
- return usage;
-}
-
-void TestRunner::observeStorageTrackerNotifications(unsigned number)
-{
- [storageDelegate logNotifications:number controller:this];
-}
-
</del><span class="cx"> void TestRunner::clearApplicationCacheForOrigin(JSStringRef url)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFStringRef> urlCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, url));
</span><span class="lines">@@ -215,11 +195,6 @@
</span><span class="cx"> [[WebDatabaseManager sharedWebDatabaseManager] deleteAllDatabases];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::deleteAllLocalStorage()
-{
- [[WebStorageManager sharedWebStorageManager] deleteAllOrigins];
-}
-
</del><span class="cx"> void TestRunner::setStorageDatabaseIdleInterval(double interval)
</span><span class="cx"> {
</span><span class="cx"> [WebStorageManager setStorageDatabaseIdleInterval:interval];
</span><span class="lines">@@ -230,20 +205,6 @@
</span><span class="cx"> [WebStorageManager closeIdleLocalStorageDatabases];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValueRef TestRunner::originsWithLocalStorage(JSContextRef context)
-{
- return originsArrayToJS(context, [[WebStorageManager sharedWebStorageManager] origins]);
-}
-
-void TestRunner::deleteLocalStorageForOrigin(JSStringRef URL)
-{
- RetainPtr<CFStringRef> urlCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, URL));
-
- WebSecurityOrigin *origin = [[WebSecurityOrigin alloc] initWithURL:[NSURL URLWithString:(NSString *)urlCF.get()]];
- [[WebStorageManager sharedWebStorageManager] deleteOrigin:origin];
- [origin release];
-}
-
</del><span class="cx"> void TestRunner::clearBackForwardList()
</span><span class="cx"> {
</span><span class="cx"> WebBackForwardList *backForwardList = [[mainFrame webView] backForwardList];
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (177867 => 177868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-01-02 19:57:00 UTC (rev 177867)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2015-01-02 20:07:40 UTC (rev 177868)
</span><span class="lines">@@ -124,25 +124,6 @@
</span><span class="cx"> return usage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::syncLocalStorage()
-{
- // FIXME: Implement. Requires non-existant (on Windows) WebStorageManager
- printf("ERROR: TestRunner::syncLocalStorage() not implemented\n");
-}
-
-long long TestRunner::localStorageDiskUsageForOrigin(JSStringRef originIdentifier)
-{
- // FIXME: Implement to support getting local storage disk usage for an origin. (Ditto WebStorageManager)
- printf("ERROR: TestRunner::localStorageDiskUsageForOrigin(JSStringRef) not implemented\n");
- return 0;
-}
-
-void TestRunner::observeStorageTrackerNotifications(unsigned number)
-{
- // FIXME: Implement. Requires non-existant (on Windows) WebStorageManager
- printf("ERROR: TestRunner::observeStorageTrackerNotifications(unsigned) not implemented\n");
-}
-
</del><span class="cx"> void TestRunner::clearApplicationCacheForOrigin(JSStringRef origin)
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebSecurityOrigin> securityOrigin;
</span><span class="lines">@@ -180,12 +161,6 @@
</span><span class="cx"> databaseManager->deleteAllDatabases();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TestRunner::deleteAllLocalStorage()
-{
- // FIXME: Implement. Requires non-existant (on Windows) WebStorageManager
- printf("ERROR: TestRunner::deleteAllLocalStorage() not implemented\n");
-}
-
</del><span class="cx"> void TestRunner::setStorageDatabaseIdleInterval(double)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Implement. Requires non-existant (on Windows) WebStorageManager
</span><span class="lines">@@ -198,19 +173,6 @@
</span><span class="cx"> printf("ERROR: TestRunner::closeIdleLocalStorageDatabases(double) not implemented\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValueRef TestRunner::originsWithLocalStorage(JSContextRef context)
-{
- // FIXME: Implement. Requires non-existant (on Windows) WebStorageManager
- printf("ERROR: TestRunner::originsWithLocalStorage(JSContextRef) not implemented\n");
- return JSValueMakeUndefined(context);
-}
-
-void TestRunner::deleteLocalStorageForOrigin(JSStringRef URL)
-{
- // FIXME: Implement. Requires non-existant (on Windows) WebStorageManager
- printf("ERROR: TestRunner::deleteLocalStorageForOrigin(JSStringRef) not implemented\n");
-}
-
</del><span class="cx"> void TestRunner::clearBackForwardList()
</span><span class="cx"> {
</span><span class="cx"> COMPtr<IWebView> webView;
</span></span></pre>
</div>
</div>
</body>
</html>