Changeset 178298 in webkit

Timestamp:

Jan 12, 2015, 2:30:59 PM (12 years ago)

Author:

Chris Dumez

Message:

Log navigation types using DiagnosticLoggingClient
​https://bugs.webkit.org/show_bug.cgi?id=140323

Reviewed by Darin Adler.

Log navigation types using DiagnosticLoggingClient to help us understand
what types of navigations are common and give us an estimate on the
total number of navigations.

• loader/FrameLoader.cpp:

(WebCore::logNavigation):
(WebCore::FrameLoader::loadWithDocumentLoader):
(WebCore::logNavigationWithFeatureCounter): Deleted.

• page/DiagnosticLoggingKeys.cpp:

(WebCore::DiagnosticLoggingKeys::navigationKey):

• page/DiagnosticLoggingKeys.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (3 diffs)
• page/DiagnosticLoggingKeys.cpp (modified) (1 diff)
• page/DiagnosticLoggingKeys.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-12  Chris Dumez  <cdumez@apple.com>
+
+        Log navigation types using DiagnosticLoggingClient
+        https://bugs.webkit.org/show_bug.cgi?id=140323
+
+        Reviewed by Darin Adler.
+
+        Log navigation types using DiagnosticLoggingClient to help us understand
+        what types of navigations are common and give us an estimate on the
+        total number of navigations.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::logNavigation):
+        (WebCore::FrameLoader::loadWithDocumentLoader):
+        (WebCore::logNavigationWithFeatureCounter): Deleted.
+        * page/DiagnosticLoggingKeys.cpp:
+        (WebCore::DiagnosticLoggingKeys::navigationKey):
+        * page/DiagnosticLoggingKeys.h:
+
 2015-01-12  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1378 +1378 @@
 }
 
-static void logNavigationWithFeatureCounter(Page* page, FrameLoadType type)
-{
-    const char* key;
+static void logNavigation(MainFrame& frame, FrameLoadType type)
+{
+    const char* featureCounterKey;
+    String navigationDescription;
     switch (type) {
     case FrameLoadType::Standard:
-        key = FeatureCounterNavigationStandardKey;
+        featureCounterKey = FeatureCounterNavigationStandardKey;
+        navigationDescription = ASCIILiteral("standard");
         break;
     case FrameLoadType::Back:
-        key = FeatureCounterNavigationBackKey;
+        featureCounterKey = FeatureCounterNavigationBackKey;
+        navigationDescription = ASCIILiteral("back");
         break;
     case FrameLoadType::Forward:
-        key = FeatureCounterNavigationForwardKey;
+        featureCounterKey = FeatureCounterNavigationForwardKey;
+        navigationDescription = ASCIILiteral("forward");
         break;
     case FrameLoadType::IndexedBackForward:
-        key = FeatureCounterNavigationIndexedBackForwardKey;
+        featureCounterKey = FeatureCounterNavigationIndexedBackForwardKey;
+        navigationDescription = ASCIILiteral("indexedBackForward");
         break;
     case FrameLoadType::Reload:
-        key = FeatureCounterNavigationReloadKey;
+        featureCounterKey = FeatureCounterNavigationReloadKey;
+        navigationDescription = ASCIILiteral("reload");
         break;
     case FrameLoadType::Same:
-        key = FeatureCounterNavigationSameKey;
+        featureCounterKey = FeatureCounterNavigationSameKey;
+        navigationDescription = ASCIILiteral("same");
         break;
     case FrameLoadType::ReloadFromOrigin:
-        key = FeatureCounterNavigationReloadFromOriginKey;
+        featureCounterKey = FeatureCounterNavigationReloadFromOriginKey;
+        navigationDescription = ASCIILiteral("reloadFromOrigin");
         break;
     case FrameLoadType::Replace:
@@ -1408 +1416 @@
         return;
     }
-    FEATURE_COUNTER_INCREMENT_KEY(page, key);
+    if (frame.settings().diagnosticLoggingEnabled()) {
+        if (auto* client = frame.diagnosticLoggingClient())
+            client->logDiagnosticMessage(DiagnosticLoggingKeys::navigationKey(), navigationDescription);
+    }
+    // FIXME: Remove once DiagnosticLoggingClient works on iOS.
+    FEATURE_COUNTER_INCREMENT_KEY(frame.page(), featureCounterKey);
 }
 
@@ -1431 +1444 @@
     // Log main frame navigation types.
     if (m_frame.isMainFrame())
-        logNavigationWithFeatureCounter(m_frame.page(), type);
+        logNavigation(static_cast<MainFrame&>(m_frame), type);
 
     policyChecker().setLoadType(type);

trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp

@@ -94 +94 @@
 }
 
+WTF::String DiagnosticLoggingKeys::navigationKey()
+{
+    return WTF::ASCIILiteral("navigation");
 }
 
+}
+

trunk/Source/WebCore/page/DiagnosticLoggingKeys.h

@@ -44 +44 @@
     static String pageLoadedKey();
     static String engineFailedToLoadKey();
+    static String navigationKey();
 
     // Success keys.