Attachment 348689 Details for Bug 189216 – Patch

[patch] Patch

bug-189216-20180831173910.patch (text/plain), 19.49 KB, created by Woodrow Wang on 2018-08-31 17:39:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Woodrow Wang

Created: 2018-08-31 17:39:11 PDT

Size: 19.49 KB

patch

obsolete

>Subversion Revision: 235561
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 419ea9c99c654386a88bd8fff3fa07b0c6c2a1f5..06a56fa9b049d906d3e10a8f4fa6283ee7ed6ee5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-08-31  Woodrow Wang  <woodrow_wang@apple.com>
>+
>+        Added dumping function for testing resource load statistics
>+        https://bugs.webkit.org/show_bug.cgi?id=189213
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * loader/ResourceLoadStatistics.h:
>+
> 2018-08-31  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Add margin box verification back now that Display::Box has non-computed horizontal margin.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 118567858bd63fbcfa61080050e1df637327cf43..2088cb0473e5631d95f3d11594e6f09be11bdd44 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-08-31  Woodrow Wang  <woodrow_wang@apple.com>
>+
>+        Added dumping function for testing resource load statistics
>+        https://bugs.webkit.org/show_bug.cgi?id=189213
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
>+        (WKWebsiteDataStoreDumpResourceLoadStatistics):
>+        * UIProcess/API/C/WKWebsiteDataStoreRef.h:
>+        * UIProcess/ResourceLoadStatisticsMemoryStore.cpp:
>+        (WebKit::ResourceLoadStatisticsMemoryStore::dumpResourceLoadStatistics const):
>+        * UIProcess/ResourceLoadStatisticsMemoryStore.h:
>+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
>+        (WebKit::WebResourceLoadStatisticsStore::dumpResourceLoadStatistics):
>+        * UIProcess/WebResourceLoadStatisticsStore.h:
>+
> 2018-08-31  Antti Koivisto  <antti@apple.com>
> 
>         Replace OptionSet |= and -= operators with add() and remove() functions
>diff --git a/Source/WebCore/loader/ResourceLoadStatistics.h b/Source/WebCore/loader/ResourceLoadStatistics.h
>index 8c9ed4c2ba1fb34a59b6322d9beebaff83b62d40..27a17ff93551619013ebb8ec05ac25d3d561b668 100644
>--- a/Source/WebCore/loader/ResourceLoadStatistics.h
>+++ b/Source/WebCore/loader/ResourceLoadStatistics.h
>@@ -58,7 +58,7 @@ struct ResourceLoadStatistics {
>     WEBCORE_EXPORT void encode(KeyedEncoder&) const;
>     WEBCORE_EXPORT bool decode(KeyedDecoder&, unsigned modelVersion);
> 
>-    String toString() const;
>+    WEBCORE_EXPORT String toString() const;
> 
>     WEBCORE_EXPORT void merge(const ResourceLoadStatistics&);
> 
>diff --git a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>index 802d1cd938d83022e061cdacfa4e3371f9c68966..2c893ee25f4242f900a599bb7c12c0de862eb6ba 100644
>--- a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>+++ b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
>@@ -30,6 +30,7 @@
> #include "APIWebsiteDataStore.h"
> #include "WKAPICast.h"
> #include "WKSecurityOriginRef.h"
>+#include "WKString.h"
> #include "WebResourceLoadStatisticsStore.h"
> #include "WebResourceLoadStatisticsTelemetry.h"
> #include "WebsiteData.h"
>@@ -143,6 +144,19 @@ void WKWebsiteDataStoreSetStatisticsVeryPrevalentResource(WKWebsiteDataStoreRef
>         });
> }
> 
>+void WKWebsiteDataStoreDumpResourceLoadStatistics(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreDumpResourceLoadStatisticsFunction callback)
>+{
>+    auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
>+    if (!store) {
>+        callback(WKStringCreateWithUTF8CString(""), context);
>+        return;
>+    }
>+
>+    store->dumpResourceLoadStatistics([context, callback] (String dumpResourceLoadStatistics) {
>+        callback(WKStringCreateWithUTF8CString(dumpResourceLoadStatistics.utf8().data()), context);
>+    });
>+}
>+
> void WKWebsiteDataStoreIsStatisticsPrevalentResource(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, void* context, WKWebsiteDataStoreIsStatisticsPrevalentResourceFunction callback)
> {
>     auto* store = WebKit::toImpl(dataStoreRef)->websiteDataStore().resourceLoadStatistics();
>diff --git a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h
>index 0662dcf2807783c01912e8cdd77087fee1f9354f..81511e8be8544c7c1ece98176d875614eea23dfe 100644
>--- a/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h
>+++ b/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h
>@@ -49,6 +49,8 @@ typedef void (*WKWebsiteDataStoreStatisticsPrevalentResourceFunction)(void* func
> WK_EXPORT void WKWebsiteDataStoreSetStatisticsPrevalentResource(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, bool value, void* context, WKWebsiteDataStoreStatisticsPrevalentResourceFunction completionHandler);
> typedef void (*WKWebsiteDataStoreStatisticsVeryPrevalentResourceFunction)(void* functionContext);
> WK_EXPORT void WKWebsiteDataStoreSetStatisticsVeryPrevalentResource(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, bool value, void* context, WKWebsiteDataStoreStatisticsVeryPrevalentResourceFunction completionHandler);
>+typedef void (*WKWebsiteDataStoreDumpResourceLoadStatisticsFunction)(WKStringRef dumpResourceLoadStatistics, void* functionContext);
>+WK_EXPORT void WKWebsiteDataStoreDumpResourceLoadStatistics(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreDumpResourceLoadStatisticsFunction callback);
> typedef void (*WKWebsiteDataStoreIsStatisticsPrevalentResourceFunction)(bool isPrevalentResource, void* functionContext);
> WK_EXPORT void WKWebsiteDataStoreIsStatisticsPrevalentResource(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, void* context, WKWebsiteDataStoreIsStatisticsPrevalentResourceFunction callback);
> WK_EXPORT void WKWebsiteDataStoreIsStatisticsVeryPrevalentResource(WKWebsiteDataStoreRef dataStoreRef, WKStringRef host, void* context, WKWebsiteDataStoreIsStatisticsPrevalentResourceFunction callback);
>diff --git a/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp b/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp
>index 17ce7bd05c9453985930ce4e362e3a542f539b2b..a7992d6c75b8e75856dc2380345ebf71caf0c58c 100644
>--- a/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp
>+++ b/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp
>@@ -671,7 +671,18 @@ void ResourceLoadStatisticsMemoryStore::setPrevalentResource(WebCore::ResourceLo
>         mapEntry->value.isPrevalentResource = true;
>     }
> }
>-
>+    
>+String ResourceLoadStatisticsMemoryStore::dumpResourceLoadStatistics() const
>+{
>+    ASSERT(!RunLoop::isMain());
>+    
>+    StringBuilder dumpResourceLoadStatisticsMapString;
>+    dumpResourceLoadStatisticsMapString.appendLiteral("Resource load statistics:\n\n");
>+    for (auto& mapEntry : m_resourceStatisticsMap.values())
>+        dumpResourceLoadStatisticsMapString.append(mapEntry.toString());
>+    return dumpResourceLoadStatisticsMapString.toString();
>+}
>+    
> bool ResourceLoadStatisticsMemoryStore::isPrevalentResource(const String& primaryDomain) const
> {
>     ASSERT(!RunLoop::isMain());
>diff --git a/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.h b/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.h
>index b79f0fe504f79283e3d6706092fa8e4a07ddc45b..634b82d1fe848e4175b4011d96c0531383dda5a4 100644
>--- a/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.h
>+++ b/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.h
>@@ -83,6 +83,7 @@ public:
>     bool isRegisteredAsRedirectingTo(const String& hostRedirectedFromPrimaryDomain, const String& hostRedirectedToPrimaryDomain) const;
> 
>     void clearPrevalentResource(const String& primaryDomain);
>+    String dumpResourceLoadStatistics() const;
>     bool isPrevalentResource(const String& primaryDomain) const;
>     bool isVeryPrevalentResource(const String& primaryDomain) const;
>     void setPrevalentResource(const String& primaryDomain);
>diff --git a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>index 6cd9dc4b7d74e0087901b05903b3bd2336a7a40d..fc59f428973036538c8bc177e81b26446f9a6bad 100644
>--- a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>+++ b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp
>@@ -493,6 +493,18 @@ void WebResourceLoadStatisticsStore::setVeryPrevalentResource(const URL& url, Co
>         postTaskReply(WTFMove(completionHandler));
>     });
> }
>+    
>+void WebResourceLoadStatisticsStore::dumpResourceLoadStatistics(CompletionHandler<void(String)>&& completionHandler)
>+{
>+    ASSERT(RunLoop::isMain());
>+    
>+    postTask([this, completionHandler = WTFMove(completionHandler)] () mutable {
>+        String dumpResourceLoadStatistics = m_memoryStore ? m_memoryStore->dumpResourceLoadStatistics() : emptyString();
>+        postTaskReply([dumpResourceLoadStatistics, completionHandler = WTFMove(completionHandler)] () mutable {
>+            completionHandler(dumpResourceLoadStatistics);
>+        });
>+    });
>+}
> 
> void WebResourceLoadStatisticsStore::isPrevalentResource(const URL& url, CompletionHandler<void (bool)>&& completionHandler)
> {
>diff --git a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h
>index fb2440887d6a28e626169197b69c916e286ea423..826086307ec17b09d619f25ab55045aa17e302e8 100644
>--- a/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h
>+++ b/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.h
>@@ -91,6 +91,7 @@ public:
>     void setLastSeen(const WebCore::URL&, Seconds, CompletionHandler<void()>&&);
>     void setPrevalentResource(const WebCore::URL&, CompletionHandler<void()>&&);
>     void setVeryPrevalentResource(const WebCore::URL&, CompletionHandler<void()>&&);
>+    void dumpResourceLoadStatistics(CompletionHandler<void(String)>&&);
>     void isPrevalentResource(const WebCore::URL&, CompletionHandler<void(bool)>&&);
>     void isVeryPrevalentResource(const WebCore::URL&, CompletionHandler<void(bool)>&&);
>     void isRegisteredAsSubresourceUnder(const WebCore::URL& subresource, const WebCore::URL& topFrame, CompletionHandler<void(bool)>&&);
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 88b94941a7a4383b08df30f284b46ea3c245f265..0dda0c46aecbc97a75942fa7d7c1c1d65e3caaf1 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,27 @@
>+2018-08-31  Woodrow Wang  <woodrow_wang@apple.com>
>+
>+        Added dumping function for testing resource load statistics
>+        https://bugs.webkit.org/show_bug.cgi?id=189213
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added functionality to set a boolean to dump the resource load statistics
>+        at the conclusion of a test. 
>+
>+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
>+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
>+        (WTR::TestRunner::setDumpResourceLoadStatistics):
>+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::resourceStatisticsStringResultCallback):
>+        (WTR::TestController::dumpResourceLoadStatistics):
>+        * WebKitTestRunner/TestController.h:
>+        * WebKitTestRunner/TestInvocation.cpp:
>+        (WTR::TestInvocation::dumpResults):
>+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
>+        (WTR::TestInvocation::setDumpResourceLoadStatistics):
>+        * WebKitTestRunner/TestInvocation.h:
>+
> 2018-08-31  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Add margin box verification back now that Display::Box has non-computed horizontal margin.
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>index a46c46e5b0f94533ff4511f298ea93fab32b4d07..ecdde6e5f4cf6cb5b9f88cd4a899a1d566ebf9eb 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>@@ -268,6 +268,7 @@ interface TestRunner {
>     void disconnectMockGamepad(unsigned long index);
> 
>     // Resource Load Statistics
>+    void setDumpResourceLoadStatistics(boolean shouldDump);
>     void installStatisticsDidModifyDataRecordsCallback(object callback);
>     void installStatisticsDidScanDataRecordsCallback(object callback);
>     void installStatisticsDidRunTelemetryCallback(object callback);
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>index d4bcaaef023ac95122c1ef720c712d19c6ae20ba..57af92747e473215813afae21c1ce0ac88958ec6 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>@@ -1455,7 +1455,14 @@ void TestRunner::statisticsCallDidSetVeryPrevalentResourceCallback()
> {
>     callTestRunnerCallback(SetStatisticsVeryPrevalentResourceCallbackID);
> }
>-
>+    
>+void TestRunner::setDumpResourceLoadStatistics(bool shouldDump)
>+{
>+    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("setDumpResourceLoadStatistics"));
>+    WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(shouldDump));
>+    WKBundlePagePostSynchronousMessageForTesting(InjectedBundle::singleton().page()->page(), messageName.get(), messageBody.get(), nullptr);
>+}
>+    
> bool TestRunner::isStatisticsPrevalentResource(JSStringRef hostName)
> {
>     WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("IsStatisticsPrevalentResource"));
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>index bb7a0cfd4e95873cecd2cee69159ad0cd79c1c8c..948cc008dd3d553755edfe130ad80decc1956998 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>@@ -391,6 +391,7 @@ public:
>     void statisticsCallDidSetPrevalentResourceCallback();
>     void setStatisticsVeryPrevalentResource(JSStringRef hostName, bool value, JSValueRef completionHandler);
>     void statisticsCallDidSetVeryPrevalentResourceCallback();
>+    void setDumpResourceLoadStatistics(bool shouldDump);
>     bool isStatisticsPrevalentResource(JSStringRef hostName);
>     bool isStatisticsVeryPrevalentResource(JSStringRef hostName);
>     bool isStatisticsRegisteredAsSubresourceUnder(JSStringRef subresourceHost, JSStringRef topFrameHost);
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 7cdaaf0a869abac2ba66d57fbfeea2d732791a4f..aac1eebae400e780f8b7d2330c3226bd09af7916 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -2805,7 +2805,16 @@ struct ResourceStatisticsCallbackContext {
>     TestController& testController;
>     bool done { false };
>     bool result { false };
>+    WKStringRef dump;
> };
>+    
>+static void resourceStatisticsStringResultCallback(WKStringRef dump, void* userData)
>+{
>+    auto* context = static_cast<ResourceStatisticsCallbackContext*>(userData);
>+    context->dump = dump;
>+    context->done = true;
>+    context->testController.notifyDone();
>+}
> 
> static void resourceStatisticsVoidResultCallback(void* userData)
> {
>@@ -2866,6 +2875,15 @@ void TestController::setStatisticsVeryPrevalentResource(WKStringRef host, bool v
>     runUntil(context.done, noTimeout);
>     m_currentInvocation->didSetVeryPrevalentResource();
> }
>+    
>+WKStringRef TestController::dumpResourceLoadStatistics()
>+{
>+    auto* dataStore = WKContextGetWebsiteDataStore(platformContext());
>+    ResourceStatisticsCallbackContext context(*this);
>+    WKWebsiteDataStoreDumpResourceLoadStatistics(dataStore, &context, resourceStatisticsStringResultCallback);
>+    runUntil(context.done, noTimeout);
>+    return context.dump;
>+}
> 
> bool TestController::isStatisticsPrevalentResource(WKStringRef host)
> {
>diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
>index cf75d6676bfb46135c640618306419de17c895ca..aa4e3fe907119e44a6857c243fcb837362416fad 100644
>--- a/Tools/WebKitTestRunner/TestController.h
>+++ b/Tools/WebKitTestRunner/TestController.h
>@@ -191,6 +191,7 @@ public:
>     void setStatisticsLastSeen(WKStringRef hostName, double seconds);
>     void setStatisticsPrevalentResource(WKStringRef hostName, bool value);
>     void setStatisticsVeryPrevalentResource(WKStringRef hostName, bool value);
>+    WKStringRef dumpResourceLoadStatistics();
>     bool isStatisticsPrevalentResource(WKStringRef hostName);
>     bool isStatisticsVeryPrevalentResource(WKStringRef hostName);
>     bool isStatisticsRegisteredAsSubresourceUnder(WKStringRef subresourceHost, WKStringRef topFrameHost);
>diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp
>index 13b21bedd5174071bda7b61b390efd788533c409..50ac8e702cd3d3b67cacb57f8a380f5d6016c3ab 100644
>--- a/Tools/WebKitTestRunner/TestInvocation.cpp
>+++ b/Tools/WebKitTestRunner/TestInvocation.cpp
>@@ -250,6 +250,9 @@ void TestInvocation::forceRepaintDoneCallback(WKErrorRef error, void* context)
> 
> void TestInvocation::dumpResults()
> {
>+    if (m_shouldDumpResourceLoadStatistics)
>+        m_textOutput.append(m_savedResourceLoadStatistics.isEmpty() ? toWTFString(TestController::singleton().dumpResourceLoadStatistics()) : m_savedResourceLoadStatistics);
>+
>     if (m_textOutput.length() || !m_audioResult)
>         dump(m_textOutput.toString().utf8().data());
>     else
>@@ -1069,6 +1072,14 @@ WKRetainPtr<WKTypeRef> TestInvocation::didReceiveSynchronousMessageFromInjectedB
>         return nullptr;
>     }
>     
>+    if (WKStringIsEqualToUTF8CString(messageName, "setDumpResourceLoadStatistics")) {
>+        ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID());
>+
>+        WKBooleanRef shouldDump = static_cast<WKBooleanRef>(messageBody);
>+        setDumpResourceLoadStatistics(WKBooleanGetValue(shouldDump));
>+        return nullptr;
>+    }
>+    
>     if (WKStringIsEqualToUTF8CString(messageName, "IsStatisticsPrevalentResource")) {
>         ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID());
> 
>@@ -1351,6 +1362,8 @@ WKRetainPtr<WKTypeRef> TestInvocation::didReceiveSynchronousMessageFromInjectedB
>     }
>     
>     if (WKStringIsEqualToUTF8CString(messageName, "StatisticsResetToConsistentState")) {
>+        if (m_shouldDumpResourceLoadStatistics)
>+            m_savedResourceLoadStatistics = toWTFString(TestController::singleton().dumpResourceLoadStatistics());
>         TestController::singleton().statisticsResetToConsistentState();
>         return nullptr;
>     }
>@@ -1579,5 +1592,10 @@ void TestInvocation::didRemoveAllSessionCredentials()
>     WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("CallDidRemoveAllSessionCredentialsCallback"));
>     WKPagePostMessageToInjectedBundle(TestController::singleton().mainWebView()->page(), messageName.get(), 0);
> }
>+    
>+void TestInvocation::setDumpResourceLoadStatistics(bool shouldDump)
>+{
>+    m_shouldDumpResourceLoadStatistics = shouldDump;
>+}
> 
> } // namespace WTR
>diff --git a/Tools/WebKitTestRunner/TestInvocation.h b/Tools/WebKitTestRunner/TestInvocation.h
>index 3c050edadb1cefda962a5c47319b8f11bcd26af3..73d6cb2400c96c8d923f24c763e38b7cc12a4c49 100644
>--- a/Tools/WebKitTestRunner/TestInvocation.h
>+++ b/Tools/WebKitTestRunner/TestInvocation.h
>@@ -83,6 +83,8 @@ public:
> 
>     void didRemoveAllSessionCredentials();
>     
>+    void setDumpResourceLoadStatistics(bool shouldDump);
>+    
> private:
>     WKRetainPtr<WKMutableDictionaryRef> createTestSettingsDictionary();
> 
>@@ -129,9 +131,11 @@ private:
>     bool m_dumpFrameLoadCallbacks { false };
>     bool m_dumpPixels { false };
>     bool m_pixelResultIsPending { false };
>+    bool m_shouldDumpResourceLoadStatistics { false };
>     WhatToDump m_whatToDump { WhatToDump::RenderTree };
> 
>     StringBuilder m_textOutput;
>+    String m_savedResourceLoadStatistics;
>     WKRetainPtr<WKDataRef> m_audioResult;
>     WKRetainPtr<WKImageRef> m_pixelResult;
>     WKRetainPtr<WKArrayRef> m_repaintRects;

Actions: View | Formatted Diff | Diff

Attachments on bug 189216: 348689 | 348691 | 348819 | 348860