Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53

1 files changed, 16 insertions, 29 deletions

diff --git a/Source/WebCore/inspector/InspectorState.cpp b/Source/WebCore/inspector/InspectorState.cpp
index 1b74518..dba9e4d 100644
--- a/Source/WebCore/inspector/InspectorState.cpp
+++ b/Source/WebCore/inspector/InspectorState.cpp
@@ -39,15 +39,13 @@ InspectorState::InspectorState(InspectorClient* client)
     : m_client(client)
 {
     // Pure reload state
-    registerBoolean(userInitiatedProfiling, false, String());
-    registerBoolean(timelineProfilerEnabled, false, String());
-    registerBoolean(searchingForNode, false, String());
-    registerObject(stickyBreakpoints, String());
-
-    // Should go away
-    registerBoolean(consoleMessagesEnabled, false, "consoleMessagesEnabled");
-    registerBoolean(monitoringXHR, false, "monitoringXHREnabled");
-    registerLong(pauseOnExceptionsState, 0, "pauseOnExceptionsState");
+    registerBoolean(userInitiatedProfiling, false);
+    registerBoolean(timelineProfilerEnabled, false);
+    registerBoolean(searchingForNode, false);
+    registerObject(browserBreakpoints);
+    registerBoolean(consoleMessagesEnabled, false);
+    registerBoolean(monitoringXHR, false);
+    registerBoolean(resourceAgentEnabled, false);
 }
 
 void InspectorState::restoreFromInspectorCookie(const String& json)
@@ -70,16 +68,6 @@ void InspectorState::restoreFromInspectorCookie(const String& json)
     }
 }
 
-PassRefPtr<InspectorObject> InspectorState::generateStateObjectForFrontend()
-{
-    RefPtr<InspectorObject> stateObject = InspectorObject::create();
-    for (PropertyMap::iterator i = m_properties.begin(); i != m_properties.end(); ++i) {
-        if (i->second.m_frontendAlias.length())
-            stateObject->setValue(i->second.m_frontendAlias, i->second.m_value);
-    }
-    return stateObject.release();
-}
-
 void InspectorState::updateCookie()
 {
     RefPtr<InspectorObject> cookieObject = InspectorObject::create();
@@ -139,31 +127,30 @@ void InspectorState::setObject(InspectorPropertyId id, PassRefPtr<InspectorObjec
     updateCookie();
 }
 
-void InspectorState::registerBoolean(InspectorPropertyId propertyId, bool value, const String& frontendAlias)
+void InspectorState::registerBoolean(InspectorPropertyId propertyId, bool value)
 {
-    m_properties.set(propertyId, Property::create(InspectorBasicValue::create(value), frontendAlias));
+    m_properties.set(propertyId, Property::create(InspectorBasicValue::create(value)));
 }
 
-void InspectorState::registerString(InspectorPropertyId propertyId, const String& value, const String& frontendAlias)
+void InspectorState::registerString(InspectorPropertyId propertyId, const String& value)
 {
-    m_properties.set(propertyId, Property::create(InspectorString::create(value), frontendAlias));
+    m_properties.set(propertyId, Property::create(InspectorString::create(value)));
 }
 
-void InspectorState::registerLong(InspectorPropertyId propertyId, long value, const String& frontendAlias)
+void InspectorState::registerLong(InspectorPropertyId propertyId, long value)
 {
-    m_properties.set(propertyId, Property::create(InspectorBasicValue::create((double)value), frontendAlias));
+    m_properties.set(propertyId, Property::create(InspectorBasicValue::create((double)value)));
 }
 
-void InspectorState::registerObject(InspectorPropertyId propertyId, const String& frontendAlias)
+void InspectorState::registerObject(InspectorPropertyId propertyId)
 {
-    m_properties.set(propertyId, Property::create(InspectorObject::create(), frontendAlias));
+    m_properties.set(propertyId, Property::create(InspectorObject::create()));
 }
 
-InspectorState::Property InspectorState::Property::create(PassRefPtr<InspectorValue> value, const String& frontendAlias)
+InspectorState::Property InspectorState::Property::create(PassRefPtr<InspectorValue> value)
 {
     Property property;
     property.m_value = value;
-    property.m_frontendAlias = frontendAlias;
     return property;
 }