[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:15:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8bba54f6032d1b2efb2b9c79c24d7156896e91ed
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 29 15:34:14 2010 +0000
2010-10-29 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: [REGRESSION] Addition of a new (blank) style property does not work
https://bugs.webkit.org/show_bug.cgi?id=48631
Test: inspector/styles-add-blank-property.html
WebCore:
* inspector/front-end/StylesSidebarPane.js:
(WebInspector.StylePropertiesSection.prototype.addNewBlankProperty):
(WebInspector.ComputedStylePropertiesSection.prototype.onpopulate):
LayoutTests:
* inspector/styles-add-blank-property-expected.txt: Added.
* inspector/styles-add-blank-property.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70880 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 54e8b72..0b77163 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-29 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: [REGRESSION] Addition of a new (blank) style property does not work
+ https://bugs.webkit.org/show_bug.cgi?id=48631
+
+ * inspector/styles-add-blank-property-expected.txt: Added.
+ * inspector/styles-add-blank-property.html: Added.
+
2010-10-29 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/LayoutTests/inspector/styles-add-blank-property-expected.txt b/LayoutTests/inspector/styles-add-blank-property-expected.txt
new file mode 100644
index 0000000..68a0ec1
--- /dev/null
+++ b/LayoutTests/inspector/styles-add-blank-property-expected.txt
@@ -0,0 +1,23 @@
+Tests that adding a new blank property works.
+
+Text
+Before append:
+[expanded] element.style { ()
+font-size: 12px;
+
+======== Matched CSS Rules ========
+[expanded] div { (user agent stylesheet)
+display: block;
+
+
+After append:
+[expanded] element.style { ()
+font-size: 12px;
+text-decoration: none;
+
+======== Matched CSS Rules ========
+[expanded] div { (user agent stylesheet)
+display: block;
+
+
+
diff --git a/LayoutTests/inspector/styles-add-blank-property.html b/LayoutTests/inspector/styles-add-blank-property.html
new file mode 100644
index 0000000..013c311
--- /dev/null
+++ b/LayoutTests/inspector/styles-add-blank-property.html
@@ -0,0 +1,70 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test.js"></script>
+<script src="elements-tests.js"></script>
+<script>
+
+function doit()
+{
+ function callback(result)
+ {
+ dumpArray(result);
+ notifyDone();
+ }
+ evaluateInWebInspector("frontend_runTest", callback);
+}
+
+// Frontend functions.
+
+function frontend_runTest(testController)
+{
+ testController.waitUntilDone();
+ frontend_expandDOMSubtreeAndRun(testController, null, frontend_selectInspectedElement);
+}
+
+function frontend_selectInspectedElement(testController)
+{
+ frontend_selectElementAndRun(testController, "inspected", frontend_dumpInspectedStyle);
+}
+
+function frontend_dumpInspectedStyle(testController)
+{
+ testController.results.push("Before append:");
+ testController.results = testController.results.concat(frontend_getSelectedElementStyles(true));
+
+ var section = WebInspector.panels.elements.sidebarPanes.styles.sections[0][1];
+ section.expand();
+ var treeElement = section.addNewBlankProperty();
+ treeElement.startEditing();
+
+ var evt = document.createEvent("KeyboardEvent");
+ evt.initKeyboardEvent("keydown", true /* can bubble */, true /* can cancel */, null /* view */, "Enter", "");
+ treeElement.listItemElement.textContent = "text-decoration: none";
+ treeElement.listItemElement.dispatchEvent(evt);
+
+ testController.runAfterPendingDispatches(frontend_dumpResults.bind(this, testController));
+}
+
+function frontend_dumpResults(testController)
+{
+ function reportResults()
+ {
+ testController.results.push("After append:");
+ testController.results = testController.results.concat(frontend_getSelectedElementStyles(true));
+ testController.notifyDone(testController.results);
+ }
+ frontend_selectElementAndRun(testController, "inspected", reportResults);
+}
+
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+Tests that adding a new blank property works.
+</p>
+
+<div id="inspected" style="font-size: 12px">Text</div>
+
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dfab932..dc9833e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-29 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: [REGRESSION] Addition of a new (blank) style property does not work
+ https://bugs.webkit.org/show_bug.cgi?id=48631
+
+ Test: inspector/styles-add-blank-property.html
+
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylePropertiesSection.prototype.addNewBlankProperty):
+ (WebInspector.ComputedStylePropertiesSection.prototype.onpopulate):
+
2010-10-29 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/inspector/front-end/StylesSidebarPane.js b/WebCore/inspector/front-end/StylesSidebarPane.js
index 75c6688..cc97520 100644
--- a/WebCore/inspector/front-end/StylesSidebarPane.js
+++ b/WebCore/inspector/front-end/StylesSidebarPane.js
@@ -787,7 +787,7 @@ WebInspector.StylePropertiesSection.prototype = {
{
var style = this.styleRule.style;
var property = new WebInspector.CSSProperty(style, style.allProperties.length, "", "", "", "style", true, false, false, undefined);
- var item = new WebInspector.StylePropertyTreeElement(this.styleRule, style, "", false, false, false, false);
+ var item = new WebInspector.StylePropertyTreeElement(this.styleRule, style, property, false, false, false);
this.propertiesTreeOutline.appendChild(item);
item.listItemElement.textContent = "";
item._newProperty = true;
@@ -951,7 +951,7 @@ WebInspector.ComputedStylePropertiesSection.prototype = {
for (var i = 0; i < uniqueProperties.length; ++i) {
var property = uniqueProperties[i];
var inherited = this._isPropertyInherited(property.name);
- var item = new WebInspector.StylePropertyTreeElement(this.styleRule, style, property, false, inherited, false, false);
+ var item = new WebInspector.StylePropertyTreeElement(this.styleRule, style, property, false, inherited, false);
this.propertiesTreeOutline.appendChild(item);
this._propertyTreeElements[property.name] = item;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list