⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 269124 in webkit


Ignore:
Timestamp:
Oct 28, 2020, 2:16:49 PM (6 years ago)
Author:
Conrad Shultz
Message:

Remove diagnostic logging for plug-ins
​https://bugs.webkit.org/show_bug.cgi?id=218304

Reviewed by Tim Horton.

There's no longer a need to pipe diagnostic logging up to clients.

  • history/BackForwardCache.cpp:

(WebCore::canCacheFrame):

  • loader/SubframeLoader.cpp:

(WebCore::logPluginRequest):
Remove a now-unused parameter.
(WebCore::FrameLoader::SubframeLoader::requestObject):
(WebCore::FrameLoader::SubframeLoader::createJavaAppletWidget):

  • page/DiagnosticLoggingKeys.cpp:

(WebCore::DiagnosticLoggingKeys::pluginLoadedKey): Deleted.
(WebCore::DiagnosticLoggingKeys::pluginLoadingFailedKey): Deleted.
(WebCore::DiagnosticLoggingKeys::pageContainsPluginKey): Deleted.
(WebCore::DiagnosticLoggingKeys::pageContainsAtLeastOnePluginKey): Deleted.
(WebCore::DiagnosticLoggingKeys::hasPluginsKey): Deleted.

  • page/DiagnosticLoggingKeys.h:
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r269121 r269124  
     12020-10-28  Conrad Shultz  <conrad_shultz@apple.com>
     2
     3        Remove diagnostic logging for plug-ins
     4        https://bugs.webkit.org/show_bug.cgi?id=218304
     5
     6        Reviewed by Tim Horton.
     7
     8        There's no longer a need to pipe diagnostic logging up to clients.
     9
     10        * history/BackForwardCache.cpp:
     11        (WebCore::canCacheFrame):
     12
     13        * loader/SubframeLoader.cpp:
     14        (WebCore::logPluginRequest):
     15        Remove a now-unused parameter.
     16        (WebCore::FrameLoader::SubframeLoader::requestObject):
     17        (WebCore::FrameLoader::SubframeLoader::createJavaAppletWidget):
     18
     19        * page/DiagnosticLoggingKeys.cpp:
     20        (WebCore::DiagnosticLoggingKeys::pluginLoadedKey): Deleted.
     21        (WebCore::DiagnosticLoggingKeys::pluginLoadingFailedKey): Deleted.
     22        (WebCore::DiagnosticLoggingKeys::pageContainsPluginKey): Deleted.
     23        (WebCore::DiagnosticLoggingKeys::pageContainsAtLeastOnePluginKey): Deleted.
     24        (WebCore::DiagnosticLoggingKeys::hasPluginsKey): Deleted.
     25
     26        * page/DiagnosticLoggingKeys.h:
     27
    1282020-10-28  Jer Noble  <jer.noble@apple.com>
    229

  • trunk/Source/WebCore/history/BackForwardCache.cpp

    r262978 r269124  
    138138    if (frameLoader.subframeLoader().containsPlugins() && !frame.page()->settings().backForwardCacheSupportsPlugins()) {
    139139        PCLOG("   -Frame contains plugins");
    140         logBackForwardCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::hasPluginsKey());
    141140        isCacheable = false;
    142141    }

  • trunk/Source/WebCore/loader/SubframeLoader.cpp

    r268162 r269124  
    189189}
    190190
    191 static void logPluginRequest(Page* page, const String& mimeType, const URL& url, bool success)
     191static void logPluginRequest(Page* page, const String& mimeType, const URL& url)
    192192{
    193193    if (!page)
    … …  
    204204    String pluginFile = page->pluginData().pluginFileForWebVisibleMimeType(newMIMEType);
    205205    String description = !pluginFile ? newMIMEType : pluginFile;
    206 
    207     DiagnosticLoggingClient& diagnosticLoggingClient = page->diagnosticLoggingClient();
    208     diagnosticLoggingClient.logDiagnosticMessage(success ? DiagnosticLoggingKeys::pluginLoadedKey() : DiagnosticLoggingKeys::pluginLoadingFailedKey(), description, ShouldSample::No);
    209 
    210     if (!page->hasSeenAnyPlugin())
    211         diagnosticLoggingClient.logDiagnosticMessage(DiagnosticLoggingKeys::pageContainsAtLeastOnePluginKey(), emptyString(), ShouldSample::No);
    212 
    213     if (!page->hasSeenPlugin(description))
    214         diagnosticLoggingClient.logDiagnosticMessage(DiagnosticLoggingKeys::pageContainsPluginKey(), description, ShouldSample::No);
    215 
    216206    page->sawPlugin(description);
    217207}
    … …  
    235225    if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent, useFallback)) {
    236226        bool success = requestPlugin(ownerElement, completedURL, mimeType, paramNames, paramValues, useFallback);
    237         logPluginRequest(document.page(), mimeType, completedURL, success);
     227        logPluginRequest(document.page(), mimeType, completedURL);
    238228        return success;
    239229    }
    … …  
    281271        widget = m_frame.loader().client().createJavaAppletWidget(size, element, baseURL, paramNames, paramValues);
    282272
    283     logPluginRequest(m_frame.page(), element.serviceType(), { }, widget);
     273    logPluginRequest(m_frame.page(), element.serviceType(), { });
    284274
    285275    if (!widget) {

  • trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

    r269078 r269124  
    5454}
    5555
    56 String DiagnosticLoggingKeys::pluginLoadedKey()
    57 {
    58     return "pluginLoaded"_s;
    59 }
    60 
    61 String DiagnosticLoggingKeys::pluginLoadingFailedKey()
    62 {
    63     return "pluginFailedLoading"_s;
    64 }
    65 
    6656String DiagnosticLoggingKeys::postPageBackgroundingCPUUsageKey()
    6757{
    … …  
    9484}
    9585
    96 String DiagnosticLoggingKeys::pageContainsPluginKey()
    97 {
    98     return "pageContainsPlugin"_s;
    99 }
    100 
    101 String DiagnosticLoggingKeys::pageContainsAtLeastOnePluginKey()
    102 {
    103     return "pageContainsAtLeastOnePlugin"_s;
    104 }
    105 
    10686String DiagnosticLoggingKeys::pageContainsMediaEngineKey()
    10787{
    … …  
    262242{
    263243    return "loading"_s;
    264 }
    265 
    266 String DiagnosticLoggingKeys::hasPluginsKey()
    267 {
    268     return "hasPlugins"_s;
    269244}
    270245

  • trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

    r269078 r269124  
    7676    WEBCORE_EXPORT static String failedMoreThan20SecondsKey();
    7777    static String fontKey();
    78     static String hasPluginsKey();
    7978    static String httpsNoStoreKey();
    8079    static String imageKey();
    … …  
    121120    static String visuallyEmptyKey();
    122121    static String pageContainsAtLeastOneMediaEngineKey();
    123     static String pageContainsAtLeastOnePluginKey();
    124122    static String pageContainsMediaEngineKey();
    125     static String pageContainsPluginKey();
    126123    static String pageHandlesWebGLContextLossKey();
    127124    static String pageLoadedKey();
    128125    static String playedKey();
    129     static String pluginLoadedKey();
    130     static String pluginLoadingFailedKey();
    131126    static String postPageBackgroundingCPUUsageKey();
    132127    static String postPageBackgroundingMemoryUsageKey();
Note: See TracChangeset for help on using the changeset viewer.