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

podivilov at chromium.org podivilov at chromium.org
Wed Dec 22 14:18:31 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e518da2e1d514ec1b22c7ccfd5348a1ff2bc7ce9
Author: podivilov at chromium.org <podivilov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 16:48:24 2010 +0000

    2010-10-06  Pavel Podivilov  <podivilov at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: add event listener breakpoints sidebar pane
            https://bugs.webkit.org/show_bug.cgi?id=46738
    
            * inspector/front-end/BreakpointManager.js:
            (WebInspector.BreakpointManager.prototype.createEventListenerBreakpoint):
            (WebInspector.BreakpointManager.prototype.createXHRBreakpoint.breakpoint.compareTo):
            (WebInspector.BreakpointManager.prototype.createXHRBreakpoint):
            (WebInspector.NativeBreakpoint):
            (WebInspector.NativeBreakpoint.prototype._setOnBackend.didSet):
            (WebInspector.NativeBreakpoint.prototype._setOnBackend):
            * inspector/front-end/BreakpointsSidebarPane.js:
            (WebInspector.XHRBreakpointsSidebarPane.prototype._showEditBreakpointDialog):
            (WebInspector.BreakpointItem):
            (WebInspector.EventListenerBreakpointsSidebarPane):
            (WebInspector.EventListenerBreakpointsSidebarPane.prototype._populate):
            (WebInspector.EventListenerBreakpointsSidebarPane.prototype._createCheckbox):
            (WebInspector.EventListenerBreakpointsSidebarPane.prototype._categoryCheckboxClicked):
            (WebInspector.EventListenerBreakpointsSidebarPane.prototype._eventNameCheckboxClicked):
            (WebInspector.EventListenerBreakpointsSidebarPane.prototype._breakpointEnableChanged):
            (WebInspector.EventListenerBreakpointsSidebarPane.prototype._updateCategoryCheckbox):
            (WebInspector.EventListenerBreakpointsSidebarPane.prototype.reset):
            * inspector/front-end/EventListenersSidebarPane.js:
            ():
            * inspector/front-end/PropertiesSection.js:
            (WebInspector.PropertiesSection):
            * inspector/front-end/ScriptsPanel.js:
            (WebInspector.ScriptsPanel):
            (WebInspector.ScriptsPanel.prototype.reset):
            * inspector/front-end/inspector.css:
            (.section .properties, .event-bar .event-properties):
            (.section.expanded .properties, .event-bar.expanded .event-properties):
            (ol.properties-tree):
            (ol.properties-tree li):
            (ol.properties-tree li.parent):
            (ol.properties-tree li.parent::before):
            (ol.properties-tree li.parent.expanded::before):
            (ol.properties-tree li .info):
            (ol.properties-tree ol, .stack-trace ol, ol.stack-trace):
            (ol.properties-tree ol.expanded, .stack-trace ol, ol.stack-trace):
            (ol.stack-trace):
            (.event-listener-breakpoints .event-category):
            (ol.event-listener-breakpoints.properties-tree .children li):
            (.event-listener-breakpoints .checkbox-elem):
            * inspector/front-end/inspector.js:
            (WebInspector.createXHRBreakpointsSidebarPane.breakpointAdded):
            (WebInspector.createXHRBreakpointsSidebarPane):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 73173d6..e3504fd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,54 @@
+2010-10-06  Pavel Podivilov  <podivilov at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add event listener breakpoints sidebar pane
+        https://bugs.webkit.org/show_bug.cgi?id=46738
+
+        * inspector/front-end/BreakpointManager.js:
+        (WebInspector.BreakpointManager.prototype.createEventListenerBreakpoint):
+        (WebInspector.BreakpointManager.prototype.createXHRBreakpoint.breakpoint.compareTo):
+        (WebInspector.BreakpointManager.prototype.createXHRBreakpoint):
+        (WebInspector.NativeBreakpoint):
+        (WebInspector.NativeBreakpoint.prototype._setOnBackend.didSet):
+        (WebInspector.NativeBreakpoint.prototype._setOnBackend):
+        * inspector/front-end/BreakpointsSidebarPane.js:
+        (WebInspector.XHRBreakpointsSidebarPane.prototype._showEditBreakpointDialog):
+        (WebInspector.BreakpointItem):
+        (WebInspector.EventListenerBreakpointsSidebarPane):
+        (WebInspector.EventListenerBreakpointsSidebarPane.prototype._populate):
+        (WebInspector.EventListenerBreakpointsSidebarPane.prototype._createCheckbox):
+        (WebInspector.EventListenerBreakpointsSidebarPane.prototype._categoryCheckboxClicked):
+        (WebInspector.EventListenerBreakpointsSidebarPane.prototype._eventNameCheckboxClicked):
+        (WebInspector.EventListenerBreakpointsSidebarPane.prototype._breakpointEnableChanged):
+        (WebInspector.EventListenerBreakpointsSidebarPane.prototype._updateCategoryCheckbox):
+        (WebInspector.EventListenerBreakpointsSidebarPane.prototype.reset):
+        * inspector/front-end/EventListenersSidebarPane.js:
+        ():
+        * inspector/front-end/PropertiesSection.js:
+        (WebInspector.PropertiesSection):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel):
+        (WebInspector.ScriptsPanel.prototype.reset):
+        * inspector/front-end/inspector.css:
+        (.section .properties, .event-bar .event-properties):
+        (.section.expanded .properties, .event-bar.expanded .event-properties):
+        (ol.properties-tree):
+        (ol.properties-tree li):
+        (ol.properties-tree li.parent):
+        (ol.properties-tree li.parent::before):
+        (ol.properties-tree li.parent.expanded::before):
+        (ol.properties-tree li .info):
+        (ol.properties-tree ol, .stack-trace ol, ol.stack-trace):
+        (ol.properties-tree ol.expanded, .stack-trace ol, ol.stack-trace):
+        (ol.stack-trace):
+        (.event-listener-breakpoints .event-category):
+        (ol.event-listener-breakpoints.properties-tree .children li):
+        (.event-listener-breakpoints .checkbox-elem):
+        * inspector/front-end/inspector.js:
+        (WebInspector.createXHRBreakpointsSidebarPane.breakpointAdded):
+        (WebInspector.createXHRBreakpointsSidebarPane):
+
 2010-10-06  Carlos Garcia Campos  <cgarcia at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index 85af1b9..e1e76ea 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/BreakpointManager.js b/WebCore/inspector/front-end/BreakpointManager.js
index ec4e7cf..bdc508a 100644
--- a/WebCore/inspector/front-end/BreakpointManager.js
+++ b/WebCore/inspector/front-end/BreakpointManager.js
@@ -87,6 +87,7 @@ WebInspector.BreakpointManager.prototype = {
     {
         this._breakpoints = {};
         delete this._oneTimeBreakpoint;
+        this._xhrBreakpoints = {};
     },
 
     _setBreakpoint: function(sourceID, url, line, enabled, condition)
@@ -127,20 +128,41 @@ WebInspector.BreakpointManager.prototype = {
         InspectorBackend.setBreakpoint(breakpoint.sourceID, breakpoint.line, breakpoint.enabled, breakpoint.condition, didSetBreakpoint.bind(this));
     },
 
+    createEventListenerBreakpoint: function(eventName)
+    {
+        var data = { type: "EventListener", condition: { eventName: eventName } };
+        var breakpoint = new WebInspector.NativeBreakpoint(data, false);
+        breakpoint.label = eventName;
+        return breakpoint;
+    },
+
     createXHRBreakpoint: function(url)
     {
         if (url in this._xhrBreakpoints)
             return;
         this._xhrBreakpoints[url] = true;
 
-        var breakpoint = new WebInspector.XHRBreakpoint(url);
-        breakpoint.addEventListener("removed", this._xhrBreakpointRemoved.bind(this));
+        var data = { type: "XHR", condition: { url: url } };
+        var breakpoint = new WebInspector.NativeBreakpoint(data, true);
+        if (!url.length)
+            breakpoint.label = WebInspector.UIString("Any XHR");
+        else
+            breakpoint.label = WebInspector.UIString("URL contains \"%s\"", url);
+        breakpoint.compareTo = function(other)
+        {
+            var urlOther = other._data.condition.url;
+            if (url !== urlOther)
+                return url < urlOther ? -1 : 1;
+            return 0;
+        };
+
+        breakpoint.addEventListener("removed", this._xhrBreakpointRemoved.bind(this, url));
         this.dispatchEventToListeners("xhr-breakpoint-added", breakpoint);
     },
 
-    _xhrBreakpointRemoved: function(event)
+    _xhrBreakpointRemoved: function(url)
     {
-        delete this._xhrBreakpoints[event.target.url];
+        delete this._xhrBreakpoints[url];
     }
 }
 
@@ -226,14 +248,14 @@ WebInspector.Breakpoint.prototype = {
 
 WebInspector.Breakpoint.prototype.__proto__ = WebInspector.Object.prototype;
 
-WebInspector.XHRBreakpoint = function(url)
+WebInspector.NativeBreakpoint = function(data, enabled)
 {
-    this._url = url;
+    this._data = data;
     this._locked = false;
-    this.enabled = true;
+    this.enabled = enabled;
 }
 
-WebInspector.XHRBreakpoint.prototype = {
+WebInspector.NativeBreakpoint.prototype = {
     get enabled()
     {
         return "_id" in this;
@@ -251,28 +273,6 @@ WebInspector.XHRBreakpoint.prototype = {
             this._removeFromBackend();
     },
 
-    get url()
-    {
-        return this._url;
-    },
-
-    formatLabel: function()
-    {
-        var label = "";
-        if (!this.url.length)
-            label = WebInspector.UIString("Any XHR");
-        else
-            label = WebInspector.UIString("URL contains \"%s\"", this.url);
-        return label;
-    },
-
-    compareTo: function(other)
-    {
-        if (this.url != other.url)
-            return this.url < other.url ? -1 : 1;
-        return 0;
-    },
-
     remove: function()
     {
         if (this._locked)
@@ -285,13 +285,13 @@ WebInspector.XHRBreakpoint.prototype = {
     _setOnBackend: function()
     {
         this._locked = true;
-        var data = { type: "XHR", condition: { url: this.url } };
-        InspectorBackend.setNativeBreakpoint(data, didSet.bind(this));
+        InspectorBackend.setNativeBreakpoint(this._data, didSet.bind(this));
 
         function didSet(breakpointId)
         {
             this._locked = false;
-            this._id = breakpointId;
+            if (breakpointId)
+                this._id = breakpointId;
             this.dispatchEventToListeners("enable-changed");
         }
     },
@@ -304,4 +304,4 @@ WebInspector.XHRBreakpoint.prototype = {
     }
 }
 
-WebInspector.XHRBreakpoint.prototype.__proto__ = WebInspector.Object.prototype;
+WebInspector.NativeBreakpoint.prototype.__proto__ = WebInspector.Object.prototype;
diff --git a/WebCore/inspector/front-end/BreakpointsSidebarPane.js b/WebCore/inspector/front-end/BreakpointsSidebarPane.js
index 16ab041..34d403f 100644
--- a/WebCore/inspector/front-end/BreakpointsSidebarPane.js
+++ b/WebCore/inspector/front-end/BreakpointsSidebarPane.js
@@ -113,6 +113,9 @@ WebInspector.XHRBreakpointsSidebarPane.prototype = {
         if (this.urlInputElement.parentElement)
             return;
 
+        if (!this.expanded)
+            this.expanded = true;
+
         this.urlInputElement.textContent = "";
         this.bodyElement.insertBefore(this.urlInputElement, this.bodyElement.firstChild);
         WebInspector.startEditing(this.urlInputElement, this._hideEditBreakpointDialog.bind(this, false), this._hideEditBreakpointDialog.bind(this, true));
@@ -142,6 +145,9 @@ WebInspector.BreakpointItem = function(breakpoint)
     checkboxElement.addEventListener("click", this._checkboxClicked.bind(this), false);
     this._element.appendChild(checkboxElement);
 
+    if ("label" in this._breakpoint)
+        this._element.appendChild(document.createTextNode(this._breakpoint.label));
+
     this._breakpoint.addEventListener("enable-changed", this._enableChanged, this);
     this._breakpoint.addEventListener("removed", this.dispatchEventToListeners.bind(this, "removed"));
 }
@@ -235,12 +241,112 @@ WebInspector.DOMBreakpointItem.prototype = {
 
 WebInspector.DOMBreakpointItem.prototype.__proto__ = WebInspector.BreakpointItem.prototype;
 
-WebInspector.XHRBreakpointItem = function(breakpoint)
+WebInspector.EventListenerBreakpointsSidebarPane = function()
 {
-    WebInspector.BreakpointItem.call(this, breakpoint);
+    WebInspector.SidebarPane.call(this, WebInspector.UIString("Event Listener Breakpoints"));
+
+    this.categoriesElement = document.createElement("ol");
+    this.categoriesElement.tabIndex = 0;
+    this.categoriesElement.addStyleClass("properties-tree event-listener-breakpoints");
+    this.categoriesTreeOutline = new TreeOutline(this.categoriesElement);
+    this.bodyElement.appendChild(this.categoriesElement);
+}
+
+WebInspector.EventListenerBreakpointsSidebarPane.prototype = {
+    _populate: function()
+    {
+        var categories = {
+            "Mouse": ["click", "dblclick", "mousedown", "mouseup", "mouseover", "mousemove", "mouseout", "mousewheel"],
+            "Keyboard": ["keydown", "keypress", "keyup"]
+        };
+
+        for (var category in categories) {
+            var categoryTreeElement = new TreeElement(WebInspector.UIString(category));
+            this.categoriesTreeOutline.appendChild(categoryTreeElement);
+            categoryTreeElement.listItemElement.addStyleClass("event-category");
+            categoryTreeElement.selectable = true;
+
+            var categoryItem = {};
+            categoryItem.checkbox = this._createCheckbox(categoryTreeElement, this._categoryCheckboxClicked.bind(this, categoryItem));
+            categoryItem.children = {};
+
+            var eventNames = categories[category];
+            for (var i = 0; i < eventNames.length; ++i) {
+                var eventName = eventNames[i];
+
+                var breakpoint = WebInspector.breakpointManager.createEventListenerBreakpoint(eventName);
+
+                var eventNameTreeElement = new TreeElement(breakpoint.label);
+                categoryTreeElement.appendChild(eventNameTreeElement);
+                eventNameTreeElement.listItemElement.addStyleClass("source-code");
+                eventNameTreeElement.selectable = true;
+
+                var eventNameItem = {};
+                eventNameItem.checkbox = this._createCheckbox(eventNameTreeElement, this._eventNameCheckboxClicked.bind(this, categoryItem, eventNameItem));
+                eventNameItem.breakpoint = breakpoint;
+
+                breakpoint.addEventListener("enable-changed", this._breakpointEnableChanged.bind(this, categoryItem, eventNameItem), true);
+
+                categoryItem.children[eventName] = eventNameItem;
+            }
+        }
+    },
+
+    _createCheckbox: function(treeElement, checkboxClickedDelegate)
+    {
+        var checkbox = document.createElement("input");
+        checkbox.className = "checkbox-elem";
+        checkbox.type = "checkbox";
+        checkbox.addEventListener("click", checkboxClickedDelegate, true);
+        treeElement.listItemElement.insertBefore(checkbox, treeElement.listItemElement.firstChild);
+        return checkbox;
+    },
+
+    _categoryCheckboxClicked: function(categoryItem)
+    {
+        var checkbox = categoryItem.checkbox;
+        checkbox.indeterminate = false;
+        for (var eventName in categoryItem.children) {
+            var eventNameItem = categoryItem.children[eventName];
+            eventNameItem.checkbox.checked = checkbox.checked;
+            eventNameItem.breakpoint.enabled = checkbox.checked;
+        }
+    },
+
+    _eventNameCheckboxClicked: function(categoryItem, eventNameItem)
+    {
+        this._updateCategoryCheckbox(categoryItem);
+        eventNameItem.breakpoint.enabled = eventNameItem.checkbox.checked;
+    },
+
+    _breakpointEnableChanged: function(categoryItem, eventNameItem)
+    {
+        if (eventNameItem.checkbox.checked === eventNameItem.breakpoint.enabled)
+            return;
+
+        eventNameItem.checkbox.checked = eventNameItem.breakpoint.enabled;
+        this._updateCategoryCheckbox(categoryItem);
+    },
+
+    _updateCategoryCheckbox: function(categoryItem)
+    {
+        var hasEnabled = false, hasDisabled = false;
+        for (var eventName in categoryItem.children) {
+            var eventNameItem = categoryItem.children[eventName];
+            if (eventNameItem.checkbox.checked)
+                hasEnabled = true;
+            else
+                hasDisabled = true;
+        }
+        categoryItem.checkbox.checked = hasEnabled;
+        categoryItem.checkbox.indeterminate = hasEnabled && hasDisabled;
+    },
 
-    var label = document.createTextNode(this._breakpoint.formatLabel());
-    this._element.appendChild(label);
+    reset: function()
+    {
+        this.categoriesTreeOutline.removeChildren();
+        this._populate();
+    }
 }
 
-WebInspector.XHRBreakpointItem.prototype.__proto__ = WebInspector.BreakpointItem.prototype;
+WebInspector.EventListenerBreakpointsSidebarPane.prototype.__proto__ = WebInspector.SidebarPane.prototype;
diff --git a/WebCore/inspector/front-end/EventListenersSidebarPane.js b/WebCore/inspector/front-end/EventListenersSidebarPane.js
index 34dea00..e2ad259 100644
--- a/WebCore/inspector/front-end/EventListenersSidebarPane.js
+++ b/WebCore/inspector/front-end/EventListenersSidebarPane.js
@@ -183,7 +183,7 @@ WebInspector.EventListenerBar = function(eventListener, nodeId)
     this._setFunctionSubtitle();
     this.editable = false;
     this.element.className = "event-bar"; /* Changed from "section" */
-    this.propertiesElement.className = "event-properties source-code"; /* Changed from "properties" */
+    this.propertiesElement.className = "event-properties properties-tree source-code"; /* Changed from "properties" */
 }
 
 WebInspector.EventListenerBar.prototype = {
diff --git a/WebCore/inspector/front-end/PropertiesSection.js b/WebCore/inspector/front-end/PropertiesSection.js
index 5ced9ef..1ca52ce 100644
--- a/WebCore/inspector/front-end/PropertiesSection.js
+++ b/WebCore/inspector/front-end/PropertiesSection.js
@@ -32,7 +32,7 @@ WebInspector.PropertiesSection = function(title, subtitle)
     WebInspector.Section.call(this, title, subtitle);
 
     this.propertiesElement = document.createElement("ol");
-    this.propertiesElement.className = "properties source-code";
+    this.propertiesElement.className = "properties properties-tree source-code";
     this.propertiesElement.tabIndex = 0;
     this.propertiesTreeOutline = new TreeOutline(this.propertiesElement);
     this.propertiesTreeOutline.section = this;
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index b38b069..8ff82c9 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -1268,7 +1268,7 @@ WebInspector.ResourcesPanel.prototype = {
         if (resource && resource.category === WebInspector.resourceCategories.xhr) {
             if (needSeparator)
                 contextMenu.appendSeparator();
-            contextMenu.appendItem(WebInspector.UIString("Set Breakpoint"), WebInspector.breakpointManager.createXHRBreakpoint.bind(WebInspector.breakpointManager, resource.url));
+            contextMenu.appendItem(WebInspector.UIString("Set XHR Breakpoint"), WebInspector.breakpointManager.createXHRBreakpoint.bind(WebInspector.breakpointManager, resource.url));
         }
 
         contextMenu.show(event);
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 8283528..a7aac78 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -134,10 +134,9 @@ WebInspector.ScriptsPanel = function()
     this.sidebarPanes.jsBreakpoints = WebInspector.createJSBreakpointsSidebarPane();
     if (Preferences.nativeInstrumentationEnabled) {
         this.sidebarPanes.domBreakpoints = WebInspector.createDOMBreakpointsSidebarPane();
-        this.sidebarPanes.domBreakpoints.expanded = true;
         this.sidebarPanes.xhrBreakpoints = WebInspector.createXHRBreakpointsSidebarPane();
-        this.sidebarPanes.xhrBreakpoints.expanded = true;
     }
+    this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
 
     this.sidebarPanes.workers = new WebInspector.WorkersSidebarPane();
 
@@ -473,6 +472,7 @@ WebInspector.ScriptsPanel.prototype = {
                 this.sidebarPanes.domBreakpoints.reset();
                 this.sidebarPanes.xhrBreakpoints.reset();
             }
+            this.sidebarPanes.eventListenerBreakpoints.reset();
             this.sidebarPanes.workers.reset();
         }
     },
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 0b4e0bf..e734691 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -1373,10 +1373,10 @@ body.inactive .placard.selected {
 
 .section .properties, .event-bar .event-properties {
     display: none;
-    margin: 0;
-    padding: 2px 6px 3px;
-    list-style: none;
-    min-height: 18px;
+}
+
+.section.expanded .properties, .event-bar.expanded .event-properties {
+    display: block;
 }
 
 .section.no-affect .properties li {
@@ -1387,11 +1387,14 @@ body.inactive .placard.selected {
     opacity: 1.0;
 }
 
-.section.expanded .properties, .event-bar.expanded .event-properties {
-    display: block;
+ol.properties-tree {
+    margin: 0;
+    padding: 2px 6px 3px;
+    list-style: none;
+    min-height: 18px;
 }
 
-.section .properties li, .event-properties li {
+ol.properties-tree li {
     margin-left: 12px;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -1400,26 +1403,11 @@ body.inactive .placard.selected {
     cursor: auto;
 }
 
-.section .properties li.parent, .event-properties li.parent {
+ol.properties-tree li.parent {
     margin-left: 1px;
 }
 
-.section .properties ol, .event-properties ol, .stack-trace ol, ol.stack-trace {
-    display: none;
-    margin: 0;
-    -webkit-padding-start: 12px;
-    list-style: none;
-}
-
-ol.stack-trace {
-    -webkit-padding-start: 0px;
-}
-
-.section .properties ol.expanded, .event-properties ol.expanded, .stack-trace ol, ol.stack-trace {
-    display: block;
-}
-
-.section .properties li.parent::before, .event-properties li.parent::before {
+ol.properties-tree li.parent::before {
     content: url(Images/treeRightTriangleBlack.png);
     opacity: 0.75;
     float: left;
@@ -1431,16 +1419,47 @@ ol.stack-trace {
     cursor: default;
 }
 
-.section .properties li.parent.expanded::before, .event-properties li.parent.expanded::before {
+ol.properties-tree li.parent.expanded::before {
     content: url(Images/treeDownTriangleBlack.png);
     margin-top: 1px;
 }
 
-.section .properties li .info, .event-properties li .info {
+ol.properties-tree li .info {
     padding-top: 4px;
     padding-bottom: 3px;
 }
 
+ol.properties-tree ol, .stack-trace ol, ol.stack-trace {
+    display: none;
+    margin: 0;
+    -webkit-padding-start: 12px;
+    list-style: none;
+}
+
+ol.properties-tree ol.expanded, .stack-trace ol, ol.stack-trace {
+    display: block;
+}
+
+ol.stack-trace {
+    -webkit-padding-start: 0px;
+}
+
+.event-listener-breakpoints .event-category {
+    font-size: 12px;
+    font-weight: bold;
+    color: rgb(110, 110, 110);
+}
+
+ol.event-listener-breakpoints.properties-tree .children li {
+    margin-left: 17px;
+}
+
+.event-listener-breakpoints .checkbox-elem {
+    float: left;
+    margin-top: 1px;
+    margin-left: 0px;
+}
+
 .section .event-bars {
     display: none;
 }
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 3edae8f..b9d09cd 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -224,7 +224,7 @@ var WebInspector = {
         var pane = new WebInspector.XHRBreakpointsSidebarPane();
         function breakpointAdded(event)
         {
-            pane.addBreakpoint(new WebInspector.XHRBreakpointItem(event.data));
+            pane.addBreakpoint(new WebInspector.BreakpointItem(event.data));
         }
         WebInspector.breakpointManager.addEventListener("xhr-breakpoint-added", breakpointAdded);
         return pane;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list