Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Unified Diff: LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation.js

Issue 1157103007: update-w3c-deps import using blink b712b6ce0eb599d90d890aa609f596c7852fb824 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Skip swfsoures Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation.js
diff --git a/LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation/text-orientation.js b/LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation.js
similarity index 89%
rename from LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation/text-orientation.js
rename to LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation.js
index 806a881e97fadaa0fddd2b944cf5519ce0f825db..a2b5ad6d6179578799c71be5118e706ec383bbe5 100644
--- a/LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation/text-orientation.js
+++ b/LayoutTests/imported/csswg-test/css-writing-modes-3/support/text-orientation.js
@@ -11,12 +11,15 @@
this.results = results;
this._measureNode(this.container);
},
- _measureNode: function (node) {
+ _measureNode: function (node, block) {
switch (node.nodeType) {
case Node.ELEMENT_NODE:
+ var blockOverride = node.dataset.block;
+ if (blockOverride)
+ block = blockOverride;
var nodes = node.childNodes;
for (var i = 0; i < nodes.length; i++)
- this._measureNode(nodes[i]);
+ this._measureNode(nodes[i], block);
return;
case Node.TEXT_NODE:
break;
@@ -55,11 +58,11 @@
}
//log("U+" + stringFromUnicode(code) + " " + rect.width + "x" + rect.height);
if (rect.height == advanceFailed) {
- this.results.failed(this, code);
+ this.results.failed(this, code, block);
continue;
}
}
- this.results.inconclusive(this, code, rect);
+ this.results.inconclusive(this, code, block, rect);
}
}});
@@ -76,16 +79,18 @@
this.inconclusiveCount = 0;
}
extend(Results.prototype, {
- failed: function (test, code) {
+ failed: function (test, code, block) {
this.failCount++;
- this.append(this.failList, test, code);
+ this.append(this.failList, test, code, block);
},
- inconclusive: function (test, code, rect) {
+ inconclusive: function (test, code, block, rect) {
this.inconclusiveCount++;
- this.append(this.inconclusiveList, test, code, " but inconclusive (rendered as " + rect.width + "x" + rect.height + ")");
+ this.append(this.inconclusiveList, test, code, block, " but inconclusive (rendered as " + rect.width + "x" + rect.height + ")");
},
- append: function (list, test, code, message) {
+ append: function (list, test, code, block, message) {
var text = stringFromUnicode(code) + " should be " + test.orientation;
+ if (block)
+ text = block + ": " + text;
if (message)
text += message;
appendChildElement(list, "li", text);
@@ -148,7 +153,6 @@
}});
setup({explicit_done:true, explicit_timeout:true});
- var blocks = arrayFromRangesByValue(rangesByBlock);
var runner = new Runner();
window.onload = function () {
if (window.location.search == "?wait") {
@@ -193,7 +197,7 @@
hex = "0000" + hex;
hex = hex.substr(hex.length - 4);
}
- return blocks[code] + ": " + hex + ' "' + String.fromCharCode(code) + '"';
+ return hex + ' "' + String.fromCharCode(code) + '"';
}
function appendChildElement(parent, tag, text) {

Powered by Google App Engine
This is Rietveld 408576698