Title: [178684] trunk/Source/WebCore
- Revision
- 178684
- Author
- cdu...@apple.com
- Date
- 2015-01-19 16:58:42 -0800 (Mon, 19 Jan 2015)
Log Message
Stop using FeatureCounter to log navigation types
https://bugs.webkit.org/show_bug.cgi?id=140642
Reviewed by Andreas Kling.
Stop using FeatureCounter to log navigation types now that
DiagnosticLoggingClient is working on iOS.
* loader/FrameLoader.cpp:
(WebCore::logNavigation):
* platform/FeatureCounterKeys.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (178683 => 178684)
--- trunk/Source/WebCore/ChangeLog 2015-01-20 00:39:36 UTC (rev 178683)
+++ trunk/Source/WebCore/ChangeLog 2015-01-20 00:58:42 UTC (rev 178684)
@@ -1,3 +1,17 @@
+2015-01-19 Chris Dumez <cdu...@apple.com>
+
+ Stop using FeatureCounter to log navigation types
+ https://bugs.webkit.org/show_bug.cgi?id=140642
+
+ Reviewed by Andreas Kling.
+
+ Stop using FeatureCounter to log navigation types now that
+ DiagnosticLoggingClient is working on iOS.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::logNavigation):
+ * platform/FeatureCounterKeys.h:
+
2015-01-19 Andreas Kling <akl...@apple.com>
LayoutState and subtree layout code should use RenderElement.
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (178683 => 178684)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-20 00:39:36 UTC (rev 178683)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-20 00:58:42 UTC (rev 178684)
@@ -58,7 +58,6 @@
#include "Event.h"
#include "EventHandler.h"
#include "EventNames.h"
-#include "FeatureCounter.h"
#include "FloatRect.h"
#include "FormState.h"
#include "FormSubmission.h"
@@ -1373,35 +1372,27 @@
static void logNavigation(MainFrame& frame, FrameLoadType type)
{
- const char* featureCounterKey;
String navigationDescription;
switch (type) {
case FrameLoadType::Standard:
- featureCounterKey = FeatureCounterNavigationStandardKey;
navigationDescription = ASCIILiteral("standard");
break;
case FrameLoadType::Back:
- featureCounterKey = FeatureCounterNavigationBackKey;
navigationDescription = ASCIILiteral("back");
break;
case FrameLoadType::Forward:
- featureCounterKey = FeatureCounterNavigationForwardKey;
navigationDescription = ASCIILiteral("forward");
break;
case FrameLoadType::IndexedBackForward:
- featureCounterKey = FeatureCounterNavigationIndexedBackForwardKey;
navigationDescription = ASCIILiteral("indexedBackForward");
break;
case FrameLoadType::Reload:
- featureCounterKey = FeatureCounterNavigationReloadKey;
navigationDescription = ASCIILiteral("reload");
break;
case FrameLoadType::Same:
- featureCounterKey = FeatureCounterNavigationSameKey;
navigationDescription = ASCIILiteral("same");
break;
case FrameLoadType::ReloadFromOrigin:
- featureCounterKey = FeatureCounterNavigationReloadFromOriginKey;
navigationDescription = ASCIILiteral("reloadFromOrigin");
break;
case FrameLoadType::Replace:
@@ -1413,8 +1404,6 @@
if (auto* client = frame.diagnosticLoggingClient())
client->logDiagnosticMessage(DiagnosticLoggingKeys::navigationKey(), navigationDescription);
}
- // FIXME: Remove once DiagnosticLoggingClient works on iOS.
- FEATURE_COUNTER_INCREMENT_KEY(frame.page(), featureCounterKey);
}
void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType type, PassRefPtr<FormState> prpFormState, AllowNavigationToInvalidURL allowNavigationToInvalidURL)
Modified: trunk/Source/WebCore/platform/FeatureCounterKeys.h (178683 => 178684)
--- trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-20 00:39:36 UTC (rev 178683)
+++ trunk/Source/WebCore/platform/FeatureCounterKeys.h 2015-01-20 00:58:42 UTC (rev 178684)
@@ -74,15 +74,6 @@
static const char FeatureCounterMediaVideoElementPlayedKey[] = "com.apple.WebKit.media.video.played";
static const char FeatureCounterMediaAudioElementPlayedKey[] = "com.apple.WebKit.media.audio.played";
-// Navigation types.
-static const char FeatureCounterNavigationStandardKey[] = "com.apple.WebKit.navigation.standard";
-static const char FeatureCounterNavigationBackKey[] = "com.apple.WebKit.navigation.back";
-static const char FeatureCounterNavigationForwardKey[] = "com.apple.WebKit.navigation.forward";
-static const char FeatureCounterNavigationIndexedBackForwardKey[] = "com.apple.WebKit.navigation.indexedBackForward";
-static const char FeatureCounterNavigationReloadKey[] = "com.apple.WebKit.navigation.reload";
-static const char FeatureCounterNavigationSameKey[] = "com.apple.WebKit.navigation.same";
-static const char FeatureCounterNavigationReloadFromOriginKey[] = "com.apple.WebKit.navigation.reloadFromOrigin";
-
// Resource types.
static const char FeatureCounterResourceLoadedFontKey[] = "com.apple.WebKit.resource.loaded.font";
static const char FeatureCounterResourceLoadedImageKey[] = "com.apple.WebKit.resource.loaded.image";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
