Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / inspector / InspectorState.h

diff --git a/WebCore/inspector/InspectorState.h b/WebCore/inspector/InspectorState.h
index 387f3c7..aa2f1ec 100644 (file)
--- a/WebCore/inspector/InspectorState.h
+++ b/WebCore/inspector/InspectorState.h
@@ -45,8 +45,6 @@ class InspectorState {
 public:
     enum InspectorPropertyId {
         monitoringXHR = 1,
-        resourceTrackingEnabled,
-        resourceTrackingAlwaysEnabled,
         timelineProfilerEnabled,
         searchingForNode,
         profilerAlwaysEnabled,
@@ -56,6 +54,7 @@ public:
         inspectorAttachedHeight,
         pauseOnExceptionsState,
         consoleMessagesEnabled,
+        userInitiatedProfiling,
         lastPropertyId
     };