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

apavlov at chromium.org apavlov at chromium.org
Wed Dec 22 15:22:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8c4b3cf2810e9d5268925320482e53a3d3856adc
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 13:35:38 2010 +0000

    2010-11-02  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: [REGRESSION] Rule addition/selector editing result in unusable rules
            https://bugs.webkit.org/show_bug.cgi?id=48826
    
            * inspector/front-end/CSSStyleModel.js:
            (WebInspector.CSSStyleModel.prototype.setRuleSelector):
            (WebInspector.CSSStyleModel.prototype.addRule):
            * inspector/front-end/StylesSidebarPane.js:
            (WebInspector.BlankStylePropertiesSection.prototype.editingSelectorCommitted.successCallback):
            (WebInspector.BlankStylePropertiesSection.prototype.editingSelectorCommitted):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71111 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1fa372d..8a0d298 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-02  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [REGRESSION] Rule addition/selector editing result in unusable rules
+        https://bugs.webkit.org/show_bug.cgi?id=48826
+
+        * inspector/front-end/CSSStyleModel.js:
+        (WebInspector.CSSStyleModel.prototype.setRuleSelector):
+        (WebInspector.CSSStyleModel.prototype.addRule):
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.BlankStylePropertiesSection.prototype.editingSelectorCommitted.successCallback):
+        (WebInspector.BlankStylePropertiesSection.prototype.editingSelectorCommitted):
+
 2010-11-02  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/inspector/front-end/CSSStyleModel.js b/WebCore/inspector/front-end/CSSStyleModel.js
index 702c923..542a3b3 100644
--- a/WebCore/inspector/front-end/CSSStyleModel.js
+++ b/WebCore/inspector/front-end/CSSStyleModel.js
@@ -119,7 +119,7 @@ WebInspector.CSSStyleModel.prototype = {
             if (!newRulePayload)
                 failureCallback();
             else
-                successCallback(WebInspector.CSSStyleDeclaration.parseRule(newRulePayload), doesAffectSelectedNode);
+                successCallback(WebInspector.CSSRule.parsePayload(newRulePayload), doesAffectSelectedNode);
         }
 
         InspectorBackend.setRuleSelector(ruleId, newContent, nodeId, callback);
@@ -133,7 +133,7 @@ WebInspector.CSSStyleModel.prototype = {
                 // Invalid syntax for a selector
                 failureCallback();
             } else {
-                var styleRule = WebInspector.CSSStyleDeclaration.parseRule(rule);
+                var styleRule = WebInspector.CSSRule.parsePayload(rule);
                 styleRule.rule = rule;
                 successCallback(styleRule, doesAffectSelectedNode);
             }
diff --git a/WebCore/inspector/front-end/StylesSidebarPane.js b/WebCore/inspector/front-end/StylesSidebarPane.js
index 05dcee6..6d1b541 100644
--- a/WebCore/inspector/front-end/StylesSidebarPane.js
+++ b/WebCore/inspector/front-end/StylesSidebarPane.js
@@ -1010,8 +1010,9 @@ WebInspector.BlankStylePropertiesSection.prototype = {
     editingSelectorCommitted: function(element, newContent, oldContent, context)
     {
         var self = this;
-        function successCallback(styleRule, doesSelectorAffectSelectedNode)
+        function successCallback(newRule, doesSelectorAffectSelectedNode)
         {
+            var styleRule = { section: self, style: newRule.style, selectorText: newRule.selectorText, sourceURL: newRule.sourceURL, rule: newRule };
             self.makeNormal(styleRule);
 
             if (!doesSelectorAffectSelectedNode) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list