diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/third_party/WebKit/Source/core/inspector/InspectorState.cpp | |
parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/inspector/InspectorState.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/inspector/InspectorState.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chromium/third_party/WebKit/Source/core/inspector/InspectorState.cpp b/chromium/third_party/WebKit/Source/core/inspector/InspectorState.cpp index 8e25c288f78..2ed6d20664c 100644 --- a/chromium/third_party/WebKit/Source/core/inspector/InspectorState.cpp +++ b/chromium/third_party/WebKit/Source/core/inspector/InspectorState.cpp @@ -84,14 +84,8 @@ String InspectorState::getString(const String& propertyName) long InspectorState::getLong(const String& propertyName) { - return getLong(propertyName, 0); -} - - -long InspectorState::getLong(const String& propertyName, long defaultValue) -{ JSONObject::iterator it = m_properties->find(propertyName); - long value = defaultValue; + long value = 0; if (it != m_properties->end()) it->value->asNumber(&value); return value; @@ -99,13 +93,8 @@ long InspectorState::getLong(const String& propertyName, long defaultValue) double InspectorState::getDouble(const String& propertyName) { - return getDouble(propertyName, 0); -} - -double InspectorState::getDouble(const String& propertyName, double defaultValue) -{ JSONObject::iterator it = m_properties->find(propertyName); - double value = defaultValue; + double value = 0; if (it != m_properties->end()) it->value->asNumber(&value); return value; |