Merge WebKit at r75993: Initial merge by git.

Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3

1 files changed, 9 insertions, 16 deletions

diff --git a/Source/WebCore/inspector/InspectorState.h b/Source/WebCore/inspector/InspectorState.h
index 4f57da7..3142c92 100644
--- a/Source/WebCore/inspector/InspectorState.h
+++ b/Source/WebCore/inspector/InspectorState.h
@@ -47,11 +47,6 @@ public:
         monitoringXHR = 1,
         timelineProfilerEnabled,
         searchingForNode,
-        profilerAlwaysEnabled,
-        debuggerAlwaysEnabled,
-        lastActivePanel,
-        inspectorStartsAttached,
-        inspectorAttachedHeight,
         pauseOnExceptionsState,
         consoleMessagesEnabled,
         userInitiatedProfiling,
@@ -63,7 +58,6 @@ public:
 
     PassRefPtr<InspectorObject> generateStateObjectForFrontend();
     void restoreFromInspectorCookie(const String& jsonString);
-    void loadFromSettings();
     String getFrontendAlias(InspectorPropertyId propertyId);
 
     bool getBoolean(InspectorPropertyId propertyId);
@@ -71,28 +65,27 @@ public:
     long getLong(InspectorPropertyId propertyId);
     PassRefPtr<InspectorObject> getObject(InspectorPropertyId id);
 
-    void setBoolean(InspectorPropertyId propertyId, bool value) { setValue(propertyId, InspectorBasicValue::create(value), value ? "true" : "false"); }
-    void setString(InspectorPropertyId propertyId, const String& value) { setValue(propertyId, InspectorString::create(value), value); }
-    void setLong(InspectorPropertyId propertyId, long value) { setValue(propertyId, InspectorBasicValue::create((double)value), String::number(value)); }
+    void setBoolean(InspectorPropertyId propertyId, bool value) { setValue(propertyId, InspectorBasicValue::create(value)); }
+    void setString(InspectorPropertyId propertyId, const String& value) { setValue(propertyId, InspectorString::create(value)); }
+    void setLong(InspectorPropertyId propertyId, long value) { setValue(propertyId, InspectorBasicValue::create((double)value)); }
     void setObject(InspectorPropertyId propertyId, PassRefPtr<InspectorObject> value);
 
 private:
     void updateCookie();
-    void setValue(InspectorPropertyId propertyId, PassRefPtr<InspectorValue> value, const String& stringValue);
+    void setValue(InspectorPropertyId propertyId, PassRefPtr<InspectorValue> value);
 
     struct Property {
-        static Property create(PassRefPtr<InspectorValue> value, const String& frontendAlias, const String& preferenceName);
+        static Property create(PassRefPtr<InspectorValue> value, const String& frontendAlias);
         String m_frontendAlias;
-        String m_preferenceName;
         RefPtr<InspectorValue> m_value;
     };
     typedef HashMap<long, Property> PropertyMap;
     PropertyMap m_properties;
 
-    void registerBoolean(InspectorPropertyId propertyId, bool value, const String& frontendAlias, const String& preferenceName);
-    void registerString(InspectorPropertyId propertyId, const String& value, const String& frontendAlias, const String& preferenceName);
-    void registerLong(InspectorPropertyId propertyId, long value, const String& frontendAlias, const String& preferenceName);
-    void registerObject(InspectorPropertyId propertyId, const String& frontendAlias, const String& preferenceName);
+    void registerBoolean(InspectorPropertyId propertyId, bool value, const String& frontendAlias);
+    void registerString(InspectorPropertyId propertyId, const String& value, const String& frontendAlias);
+    void registerLong(InspectorPropertyId propertyId, long value, const String& frontendAlias);
+    void registerObject(InspectorPropertyId propertyId, const String& frontendAlias);
 
     InspectorClient* m_client;
 };