Changeset 179897 in webkit

Timestamp:

Feb 10, 2015, 4:05:05 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r178298. rdar://problem/19526083

Location:

branches/safari-600.5-branch/Source/WebCore

Files:

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

branches/safari-600.5-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-10  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r177504 & r178298
+
+    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-02-10  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp

@@ -1425 +1425 @@
 }
 
+static void logNavigation(MainFrame& frame, FrameLoadType type)
+{
+    String navigationDescription;
+    switch (type) {
+    case FrameLoadType::Standard:
+        navigationDescription = ASCIILiteral("standard");
+        break;
+    case FrameLoadType::Back:
+        navigationDescription = ASCIILiteral("back");
+        break;
+    case FrameLoadType::Forward:
+        navigationDescription = ASCIILiteral("forward");
+        break;
+    case FrameLoadType::IndexedBackForward:
+        navigationDescription = ASCIILiteral("indexedBackForward");
+        break;
+    case FrameLoadType::Reload:
+        navigationDescription = ASCIILiteral("reload");
+        break;
+    case FrameLoadType::Same:
+        navigationDescription = ASCIILiteral("same");
+        break;
+    case FrameLoadType::ReloadFromOrigin:
+        navigationDescription = ASCIILiteral("reloadFromOrigin");
+        break;
+    case FrameLoadType::Replace:
+    case FrameLoadType::RedirectWithLockedBackForwardList:
+        // Not logging those for now.
+        return;
+    }
+
+    if (frame.settings().diagnosticLoggingEnabled()) {
+        if (auto* client = frame.diagnosticLoggingClient())
+            client->logDiagnosticMessage(DiagnosticLoggingKeys::navigationKey(), navigationDescription);
+    }
+}
+
+
 void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType type, PassRefPtr<FormState> prpFormState, AllowNavigationToInvalidURL allowNavigationToInvalidURL)
 {
@@ -1442 +1480 @@
     if (m_frame.document())
         m_previousURL = m_frame.document()->url();
+
+    // Log main frame navigation types.
+    if (m_frame.isMainFrame())
+        logNavigation(static_cast<MainFrame&>(m_frame), type);
 
     policyChecker().setLoadType(type);

branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp

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

branches/safari-600.5-branch/Source/WebCore/page/DiagnosticLoggingKeys.h

@@ -43 +43 @@
     static String pageContainsAtLeastOneMediaEngineKey();
     static String pageLoadedKey();
+    static String navigationKey();
 
     // Success keys.