[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
apavlov at chromium.org
apavlov at chromium.org
Wed Dec 22 18:36:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 428061f857df575e329387c06025b0916b8a8934
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 14 18:06:03 2010 +0000
2010-12-14 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Yury Semikhatsky.
Web Inspector: Rule data not updated in Styles pane after stylesheet gets reverted
https://bugs.webkit.org/show_bug.cgi?id=51034
* inspector/front-end/CSSStyleModel.js:
(WebInspector.CSSStyleModel.prototype._onRevert):
* inspector/front-end/ElementsPanel.js:
(WebInspector.ElementsPanel):
(WebInspector.ElementsPanel.prototype._metricsPaneEdited):
(WebInspector.ElementsPanel.prototype._stylesPaneEdited):
(WebInspector.ElementsPanel.prototype._styleSheetChanged):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74038 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1f27fcf..4d79928 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-14 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Yury Semikhatsky.
+
+ Web Inspector: Rule data not updated in Styles pane after stylesheet gets reverted
+ https://bugs.webkit.org/show_bug.cgi?id=51034
+
+ * inspector/front-end/CSSStyleModel.js:
+ (WebInspector.CSSStyleModel.prototype._onRevert):
+ * inspector/front-end/ElementsPanel.js:
+ (WebInspector.ElementsPanel):
+ (WebInspector.ElementsPanel.prototype._metricsPaneEdited):
+ (WebInspector.ElementsPanel.prototype._stylesPaneEdited):
+ (WebInspector.ElementsPanel.prototype._styleSheetChanged):
+
2010-12-14 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/front-end/CSSStyleModel.js b/WebCore/inspector/front-end/CSSStyleModel.js
index 23ed7a8..2d15582 100644
--- a/WebCore/inspector/front-end/CSSStyleModel.js
+++ b/WebCore/inspector/front-end/CSSStyleModel.js
@@ -174,11 +174,14 @@ WebInspector.CSSStyleModel.prototype = {
function callback(success)
{
this._styleSheetChanged(styleSheetId, true);
+ this.dispatchEventToListeners("stylesheet changed");
}
InspectorBackend.setStyleSheetText2(styleSheetId, contentToRevertTo, callback.bind(this));
}
}
+WebInspector.CSSStyleModel.prototype.__proto__ = WebInspector.Object.prototype;
+
WebInspector.CSSStyleDeclaration = function(payload)
{
this.id = payload.styleId;
diff --git a/WebCore/inspector/front-end/ElementsPanel.js b/WebCore/inspector/front-end/ElementsPanel.js
index 61ba33e..a1c181f 100644
--- a/WebCore/inspector/front-end/ElementsPanel.js
+++ b/WebCore/inspector/front-end/ElementsPanel.js
@@ -88,6 +88,7 @@ WebInspector.ElementsPanel = function()
this.sidebarPanes.styles.addEventListener("style edited", this._stylesPaneEdited, this);
this.sidebarPanes.styles.addEventListener("style property toggled", this._stylesPaneEdited, this);
this.sidebarPanes.metrics.addEventListener("metrics edited", this._metricsPaneEdited, this);
+ WebInspector.cssModel.addEventListener("stylesheet changed", this._styleSheetChanged, this);
this.sidebarElement = document.createElement("div");
this.sidebarElement.id = "elements-sidebar";
@@ -445,18 +446,23 @@ WebInspector.ElementsPanel.prototype = {
this.updateBreadcrumb(true);
},
- _stylesPaneEdited: function()
+ _metricsPaneEdited: function()
{
this.sidebarPanes.metrics.needsUpdate = true;
this.updateMetrics();
},
- _metricsPaneEdited: function()
+ _stylesPaneEdited: function()
{
this.sidebarPanes.styles.needsUpdate = true;
this.updateStyles(true);
},
+ _styleSheetChanged: function()
+ {
+ this._stylesPaneEdited();
+ },
+
_mouseMovedInCrumbs: function(event)
{
var nodeUnderMouse = document.elementFromPoint(event.pageX, event.pageY);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list