[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
pfeldman at chromium.org
pfeldman at chromium.org
Thu Apr 8 02:23:38 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 0f54eea0a8efc4b456b0a36e6b214c22e73da534
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 16 13:58:05 2010 +0000
2010-03-16 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Errors when inspecting styles of non-renderable elements in XHTML.
https://bugs.webkit.org/show_bug.cgi?id=35025
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::getStyles):
* inspector/front-end/DOMAgent.js:
(WebInspector.DOMNode.prototype._addAttribute):
(WebInspector.DOMWindow.prototype.Object):
* inspector/front-end/MetricsSidebarPane.js:
* inspector/front-end/StylesSidebarPane.js:
(WebInspector.StylesSidebarPane.prototype.update.callback):
(WebInspector.StylesSidebarPane.prototype.update):
(WebInspector.StylesSidebarPane.prototype._update):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f537ce..4976ee1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-03-16 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Errors when inspecting styles of non-renderable elements in XHTML.
+
+ https://bugs.webkit.org/show_bug.cgi?id=35025
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::getStyles):
+ * inspector/front-end/DOMAgent.js:
+ (WebInspector.DOMNode.prototype._addAttribute):
+ (WebInspector.DOMWindow.prototype.Object):
+ * inspector/front-end/MetricsSidebarPane.js:
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylesSidebarPane.prototype.update.callback):
+ (WebInspector.StylesSidebarPane.prototype.update):
+ (WebInspector.StylesSidebarPane.prototype._update):
+
2010-03-12 Antonio Gomes <tonikitoo at webkit.org>
Reviewed by Simon Fraser.
diff --git a/WebCore/inspector/InspectorDOMAgent.cpp b/WebCore/inspector/InspectorDOMAgent.cpp
index fc1a063..f366f66 100644
--- a/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/WebCore/inspector/InspectorDOMAgent.cpp
@@ -696,7 +696,8 @@ void InspectorDOMAgent::getStyles(long callId, long nodeId, bool authorOnly)
RefPtr<CSSStyleDeclaration> computedStyle = defaultView->getComputedStyle(element, "");
ScriptObject result = m_frontend->newScriptObject();
- result.set("inlineStyle", buildObjectForStyle(element->style(), true));
+ if (element->style())
+ result.set("inlineStyle", buildObjectForStyle(element->style(), true));
result.set("computedStyle", buildObjectForStyle(computedStyle.get(), false));
result.set("matchedCSSRules", getMatchedCSSRules(element, authorOnly));
result.set("styleAttributes", getAttributeStyles(element));
diff --git a/WebCore/inspector/front-end/DOMAgent.js b/WebCore/inspector/front-end/DOMAgent.js
index 62fed77..c8bb71f 100644
--- a/WebCore/inspector/front-end/DOMAgent.js
+++ b/WebCore/inspector/front-end/DOMAgent.js
@@ -211,30 +211,6 @@ WebInspector.DOMNode.prototype = {
};
this._attributesMap[name] = attr;
this.attributes.push(attr);
- },
-
- _setStyles: function(computedStyle, inlineStyle, styleAttributes, matchedCSSRules)
- {
- this._computedStyle = new WebInspector.CSSStyleDeclaration(computedStyle);
- this.style = new WebInspector.CSSStyleDeclaration(inlineStyle);
-
- for (var name in styleAttributes) {
- if (this._attributesMap[name])
- this._attributesMap[name].style = new WebInspector.CSSStyleDeclaration(styleAttributes[name]);
- }
-
- this._matchedCSSRules = [];
- for (var i = 0; i < matchedCSSRules.length; i++)
- this._matchedCSSRules.push(WebInspector.CSSStyleDeclaration.parseRule(matchedCSSRules[i]));
- },
-
- _clearStyles: function()
- {
- this.computedStyle = null;
- this.style = null;
- for (var name in this._attributesMap)
- this._attributesMap[name].style = null;
- this._matchedCSSRules = null;
}
}
@@ -308,16 +284,6 @@ WebInspector.DOMWindow.prototype = {
Object: function()
{
- },
-
- getComputedStyle: function(node)
- {
- return node._computedStyle;
- },
-
- getMatchedCSSRules: function(node, pseudoElement, authorOnly)
- {
- return node._matchedCSSRules;
}
}
diff --git a/WebCore/inspector/front-end/MetricsSidebarPane.js b/WebCore/inspector/front-end/MetricsSidebarPane.js
index 735ce94..ed5a7ec 100644
--- a/WebCore/inspector/front-end/MetricsSidebarPane.js
+++ b/WebCore/inspector/front-end/MetricsSidebarPane.js
@@ -185,6 +185,11 @@ WebInspector.MetricsSidebarPane.prototype = {
editingCommitted: function(element, userInput, previousContent, context)
{
+ if (!this._inlineStyleId) {
+ // Element has no renderer.
+ return this.editingCancelled(element, context); // nothing changed, so cancel
+ }
+
if (userInput === previousContent)
return this.editingCancelled(element, context); // nothing changed, so cancel
diff --git a/WebCore/inspector/front-end/StylesSidebarPane.js b/WebCore/inspector/front-end/StylesSidebarPane.js
index 88a4de7..8943a9e 100644
--- a/WebCore/inspector/front-end/StylesSidebarPane.js
+++ b/WebCore/inspector/front-end/StylesSidebarPane.js
@@ -111,17 +111,18 @@ WebInspector.StylesSidebarPane.prototype = {
{
if (!styles)
return;
- node._setStyles(styles.computedStyle, styles.inlineStyle, styles.styleAttributes, styles.matchedCSSRules);
- self._update(refresh, body, node, editedSection, forceUpdate);
+ self._update(refresh, node, styles, editedSection, forceUpdate);
}
InspectorBackend.getStyles(WebInspector.Callback.wrap(callback), node.id, !WebInspector.settings.showUserAgentStyles);
},
- _update: function(refresh, body, node, editedSection, forceUpdate)
+ _update: function(refresh, node, styles, editedSection, forceUpdate)
{
+ var nodeComputedStyle = new WebInspector.CSSStyleDeclaration(styles.computedStyle);
+
if (!refresh) {
- body.removeChildren();
+ this.bodyElement.removeChildren();
this.sections = [];
}
@@ -133,42 +134,35 @@ WebInspector.StylesSidebarPane.prototype = {
if (section instanceof WebInspector.BlankStylePropertiesSection)
continue;
if (section.computedStyle)
- section.styleRule.style = node.ownerDocument.defaultView.getComputedStyle(node);
+ section.styleRule.style = nodeComputedStyle;
var styleRule = { section: section, style: section.styleRule.style, computedStyle: section.computedStyle, rule: section.rule };
styleRules.push(styleRule);
}
} else {
- var computedStyle = node.ownerDocument.defaultView.getComputedStyle(node);
- styleRules.push({ computedStyle: true, selectorText: WebInspector.UIString("Computed Style"), style: computedStyle, editable: false });
-
- var nodeName = node.nodeName.toLowerCase();
- for (var i = 0; i < node.attributes.length; ++i) {
- var attr = node.attributes[i];
- if (attr.style) {
- var attrStyle = { style: attr.style, editable: false };
- attrStyle.subtitle = WebInspector.UIString("element’s “%s” attribute", attr.name);
- attrStyle.selectorText = nodeName + "[" + attr.name;
- if (attr.value.length)
- attrStyle.selectorText += "=" + attr.value;
- attrStyle.selectorText += "]";
- styleRules.push(attrStyle);
- }
+ styleRules.push({ computedStyle: true, selectorText: WebInspector.UIString("Computed Style"), style: nodeComputedStyle, editable: false });
+
+ var styleAttributes = {};
+ for (var name in styles.styleAttributes) {
+ var attrStyle = { style: new WebInspector.CSSStyleDeclaration(styles.styleAttributes[name]), editable: false };
+ attrStyle.subtitle = WebInspector.UIString("element’s “%s” attribute", name);
+ attrStyle.selectorText = node.nodeName + "[" + name;
+ if (node.getAttribute(name))
+ attrStyle.selectorText += "=" + node.getAttribute(name);
+ attrStyle.selectorText += "]";
+ styleRules.push(attrStyle);
}
// Always Show element's Style Attributes
- if (node.nodeType === Node.ELEMENT_NODE) {
- var inlineStyle = { selectorText: WebInspector.UIString("Style Attribute"), style: node.style, isAttribute: true };
+ if (styles.inlineStyle && node.nodeType === Node.ELEMENT_NODE) {
+ var inlineStyle = { selectorText: WebInspector.UIString("Style Attribute"), style: new WebInspector.CSSStyleDeclaration(styles.inlineStyle), isAttribute: true };
inlineStyle.subtitle = WebInspector.UIString("element’s “%s” attribute", "style");
styleRules.push(inlineStyle);
}
- var matchedStyleRules = node.ownerDocument.defaultView.getMatchedCSSRules(node, "", !WebInspector.settings.showUserAgentStyles);
- if (matchedStyleRules) {
- // Add rules in reverse order to match the cascade order.
- for (var i = (matchedStyleRules.length - 1); i >= 0; --i) {
- var rule = matchedStyleRules[i];
- styleRules.push({ style: rule.style, selectorText: rule.selectorText, parentStyleSheet: rule.parentStyleSheet, rule: rule });
- }
+ // Add rules in reverse order to match the cascade order.
+ for (var i = styles.matchedCSSRules.length - 1; i >= 0; --i) {
+ var rule = WebInspector.CSSStyleDeclaration.parseRule(styles.matchedCSSRules[i]);
+ styleRules.push({ style: rule.style, selectorText: rule.selectorText, parentStyleSheet: rule.parentStyleSheet, rule: rule });
}
}
@@ -311,7 +305,7 @@ WebInspector.StylesSidebarPane.prototype = {
else
section.expand(true);
- body.appendChild(section.element);
+ this.bodyElement.appendChild(section.element);
this.sections.push(section);
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list