[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit ad9927f8a3af09098c1c7b71d2cfe53a2bc9f0cc
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 16:43:36 2009 +0000

    2009-12-03  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Chromium: Add support for settings containing ":"
    
            https://bugs.webkit.org/show_bug.cgi?id=32118
    
            * src/InspectorClientImpl.cpp:
            (WebKit::InspectorClientImpl::loadSettings):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51637 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 875c6e4..e687c13 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-03  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Chromium: Add support for settings containing ":"
+
+        https://bugs.webkit.org/show_bug.cgi?id=32118
+
+        * inspector/front-end/WatchExpressionsSidebarPane.js:
+        (WebInspector.WatchExpressionsSection):
+
 2009-12-03  Rafael Antognolli  <antognolli at profusion.mobi>, Kenneth Christiansen <kenneth at webkit.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js b/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js
index ae2410d..4804897 100644
--- a/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js
+++ b/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js
@@ -67,6 +67,8 @@ WebInspector.WatchExpressionsSidebarPane.prototype.__proto__ = WebInspector.Side
 
 WebInspector.WatchExpressionsSection = function()
 {
+    this._watchObjectGroupId = "watch-group";
+
     WebInspector.ObjectPropertiesSection.call(this);
 
     this.watchExpressions = this.loadSavedExpressions();
@@ -75,8 +77,6 @@ WebInspector.WatchExpressionsSection = function()
     this.editable = true;
     this.expanded = true;
     this.propertiesElement.addStyleClass("watch-expressions");
-
-    this._watchObjectGroupId = "watch-group";
 }
 
 WebInspector.WatchExpressionsSection.NewWatchExpression = "\xA0";
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 4876159..88e7d97 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-03  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Chromium: Add support for settings containing ":"
+
+        https://bugs.webkit.org/show_bug.cgi?id=32118
+
+        * src/InspectorClientImpl.cpp:
+        (WebKit::InspectorClientImpl::loadSettings):
+
 2009-12-03  Pavel Feldman  <pfeldman at dhcp-172-28-174-220.spb.corp.google.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebKit/chromium/src/InspectorClientImpl.cpp b/WebKit/chromium/src/InspectorClientImpl.cpp
index 2a69daa..54550d1 100644
--- a/WebKit/chromium/src/InspectorClientImpl.cpp
+++ b/WebKit/chromium/src/InspectorClientImpl.cpp
@@ -181,20 +181,19 @@ void InspectorClientImpl::loadSettings()
     for (Vector<String>::iterator it = entries.begin(); it != entries.end(); ++it) {
         Vector<String> tokens;
         it->split(":", tokens);
-        if (tokens.size() != 3)
+        if (tokens.size() < 3)
             continue;
 
         String name = decodeURLEscapeSequences(tokens[0]);
         String type = tokens[1];
-        String setting;
+        String value = tokens[2];
+        for (size_t i = 3; i < tokens.size(); ++i)
+            value += ":" + tokens[i];
+
         if (type == "string")
-            setting = decodeURLEscapeSequences(tokens[2]);
-        else if (type == "boolean")
-            setting = tokens[2];
-        else
-            continue;
+            value = decodeURLEscapeSequences(value);
 
-        m_settings->set(name, setting);
+        m_settings->set(name, value);
     }
 }
 

-- 
WebKit Debian packaging