[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 5eb0b6f6c83229cfec42b3bf4b78e545ba5c9230
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 18 12:46:12 2010 +0000

    2010-10-18  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [REGRESSION] Inspector window visible during run-webkit-tests.
            The initial state of an inspector setting should stay untouched
            if the profile has no value for it.
    
            https://bugs.webkit.org/show_bug.cgi?id=47785
    
            * inspector/InspectorState.cpp:
            (WebCore::InspectorState::loadFromSettings):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b2600c3..34bd385 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-18  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [REGRESSION] Inspector window visible during run-webkit-tests.
+        The initial state of an inspector setting should stay untouched
+        if the profile has no value for it.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47785
+
+        * inspector/InspectorState.cpp:
+        (WebCore::InspectorState::loadFromSettings):
+
 2010-10-18  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/inspector/InspectorState.cpp b/WebCore/inspector/InspectorState.cpp
index c33743d..44065c0 100644
--- a/WebCore/inspector/InspectorState.cpp
+++ b/WebCore/inspector/InspectorState.cpp
@@ -92,13 +92,15 @@ void InspectorState::loadFromSettings()
             m_client->populateSetting(i->second.m_preferenceName, &value);
             switch (i->second.m_value->type()) {
             case InspectorValue::TypeBoolean:
-                i->second.m_value = InspectorBasicValue::create(value == "true");
+                if (value.length())
+                    i->second.m_value = InspectorBasicValue::create(value == "true");
                 break;
             case InspectorValue::TypeString:
                 i->second.m_value = InspectorString::create(value);
                 break;
             case InspectorValue::TypeNumber:
-                i->second.m_value = InspectorBasicValue::create((double)value.toInt());
+                if (value.length())
+                    i->second.m_value = InspectorBasicValue::create((double)value.toInt());
                 break;
             default:
                 ASSERT(false);

-- 
WebKit Debian packaging