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

[apavlov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 5d6beed791bbc16e53d853ed7aad934464e532ce
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 23:18:01 2010 +0000

    2010-12-03  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: Duplicate "!important" for !important properties displayed in the Styles pane
            https://bugs.webkit.org/show_bug.cgi?id=50460
    
            * inspector/front-end/StylesSidebarPane.js:
            * inspector/front-end/inspector.css:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5beec67..e4a9014 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-03  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Duplicate "!important" for !important properties displayed in the Styles pane
+        https://bugs.webkit.org/show_bug.cgi?id=50460
+
+        * inspector/front-end/StylesSidebarPane.js:
+        * inspector/front-end/inspector.css:
+
 2010-12-03  Xan Lopez  <xlopez at igalia.com>
 
         Unreviewed build fix.
diff --git a/WebCore/inspector/front-end/StylesSidebarPane.js b/WebCore/inspector/front-end/StylesSidebarPane.js
index 68ad0dd..db72486 100644
--- a/WebCore/inspector/front-end/StylesSidebarPane.js
+++ b/WebCore/inspector/front-end/StylesSidebarPane.js
@@ -1179,14 +1179,8 @@ WebInspector.StylePropertyTreeElement.prototype = {
 
     updateTitle: function()
     {
-        var priority = this.priority;
         var value = this.value;
 
-        if (priority && !priority.length)
-            delete priority;
-        if (priority)
-            priority = "!" + priority;
-
         this.updateState();
 
         var enabledCheckboxElement;
@@ -1339,12 +1333,6 @@ WebInspector.StylePropertyTreeElement.prototype = {
             valueElement.appendChild(processValue(/url\(([^)]+)\)/g, linkifyURL, colorProcessor, value));
         }
 
-        if (priority) {
-            var priorityElement = document.createElement("span");
-            priorityElement.className = "priority";
-            priorityElement.textContent = priority;
-        }
-
         this.listItemElement.removeChildren();
 
         if (!this.treeOutline)
@@ -1356,12 +1344,6 @@ WebInspector.StylePropertyTreeElement.prototype = {
         this.listItemElement.appendChild(nameElement);
         this.listItemElement.appendChild(document.createTextNode(": "));
         this.listItemElement.appendChild(valueElement);
-
-        if (priorityElement) {
-            this.listItemElement.appendChild(document.createTextNode(" "));
-            this.listItemElement.appendChild(priorityElement);
-        }
-
         this.listItemElement.appendChild(document.createTextNode(";"));
 
         if (!this.parsedOk)
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 0ee5864..965689b 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -1488,10 +1488,6 @@ li.editing .swatch, li.editing .enabled-button,  li.editing-sub-part .delete-but
     color: blue;
 }
 
-.section .properties .priority {
-    color: rgb(128, 0, 0);
-}
-
 .section .properties .keyword, .event-properties .keyword {
     color: rgb(136, 19, 79);
 }

-- 
WebKit Debian packaging