diff --git a/dom/canvas/OffscreenCanvasRenderingContext2D.cpp b/dom/canvas/OffscreenCanvasRenderingContext2D.cpp index 400a9f8ba311..e5bf911ef892 100644 --- a/dom/canvas/OffscreenCanvasRenderingContext2D.cpp +++ b/dom/canvas/OffscreenCanvasRenderingContext2D.cpp @@ -6,6 +6,8 @@ #include "OffscreenCanvasRenderingContext2D.h" #include "mozilla/CycleCollectedJSRuntime.h" +#include "mozilla/dom/FontFaceSetImpl.h" +#include "mozilla/dom/FontFaceSet.h" #include "mozilla/dom/OffscreenCanvasRenderingContext2DBinding.h" #include "mozilla/dom/OffscreenCanvas.h" #include "mozilla/dom/WorkerCommon.h" @@ -125,6 +127,17 @@ static void SerializeFontForCanvas(const StyleFontFamilyList& aList, bool OffscreenCanvasRenderingContext2D::SetFontInternal(const nsACString& aFont, ErrorResult& aError) { + nsIGlobalObject* global = GetParentObject(); + FontFaceSet* fontFaceSet = global ? global->Fonts() : nullptr; + FontFaceSetImpl* fontFaceSetImpl = + fontFaceSet ? fontFaceSet->GetImpl() : nullptr; + RefPtr urlExtraData = + fontFaceSetImpl ? fontFaceSetImpl->GetURLExtraData() : nullptr; + + if (fontFaceSetImpl) { + fontFaceSetImpl->FlushUserFontSet(); + } + // In the OffscreenCanvas case we don't have the context necessary to call // GetFontStyleForServo(), as we do in the main-thread canvas context, so // instead we borrow ParseFontShorthandForMatching to parse the attribute. @@ -134,7 +147,7 @@ bool OffscreenCanvasRenderingContext2D::SetFontInternal(const nsACString& aFont, gfxFontStyle fontStyle; float size = 0.0f; if (!ServoCSSParser::ParseFontShorthandForMatching( - aFont, nullptr, list, fontStyle.style, fontStyle.stretch, + aFont, urlExtraData, list, fontStyle.style, fontStyle.stretch, fontStyle.weight, &size)) { return false; } @@ -144,15 +157,15 @@ bool OffscreenCanvasRenderingContext2D::SetFontInternal(const nsACString& aFont, // TODO: Get a userFontSet from the Worker and pass to the fontGroup // TODO: Should we be passing a language? Where from? // TODO: Cache fontGroups in the Worker (use an nsFontCache?) - gfxFontGroup* fontGroup = - gfxPlatform::GetPlatform()->CreateFontGroup(nullptr, // aPresContext - list, // aFontFamilyList - &fontStyle, // aStyle - nullptr, // aLanguage - false, // aExplicitLanguage - nullptr, // aTextPerf - nullptr, // aUserFontSet - 1.0); // aDevToCssSize + gfxFontGroup* fontGroup = gfxPlatform::GetPlatform()->CreateFontGroup( + nullptr, // aPresContext + list, // aFontFamilyList + &fontStyle, // aStyle + nullptr, // aLanguage + false, // aExplicitLanguage + nullptr, // aTextPerf + fontFaceSetImpl, // aUserFontSet + 1.0); // aDevToCssSize CurrentState().fontGroup = fontGroup; SerializeFontForCanvas(list, fontStyle, CurrentState().font); CurrentState().fontFont = nsFont(StyleFontFamily{list, false, false}, diff --git a/dom/serviceworkers/test/test_serviceworker_interfaces.js b/dom/serviceworkers/test/test_serviceworker_interfaces.js index 646313992fd6..3777902eeb58 100644 --- a/dom/serviceworkers/test/test_serviceworker_interfaces.js +++ b/dom/serviceworkers/test/test_serviceworker_interfaces.js @@ -305,6 +305,8 @@ var interfaceNamesInGlobalScope = [ // IMPORTANT: Do not change this list without review from a DOM peer! "TextEncoder", // IMPORTANT: Do not change this list without review from a DOM peer! + "TextMetrics", + // IMPORTANT: Do not change this list without review from a DOM peer! "TransformStream", // IMPORTANT: Do not change this list without review from a DOM peer! "TransformStreamDefaultController", diff --git a/dom/webidl/CanvasRenderingContext2D.webidl b/dom/webidl/CanvasRenderingContext2D.webidl index 249cf56b3593..c18183f23b5f 100644 --- a/dom/webidl/CanvasRenderingContext2D.webidl +++ b/dom/webidl/CanvasRenderingContext2D.webidl @@ -362,7 +362,7 @@ interface CanvasPattern { void setTransform(optional DOMMatrix2DInit matrix = {}); }; -[Exposed=Window] +[Exposed=(Window,Worker)] interface TextMetrics { // x-direction diff --git a/dom/webidl/OffscreenCanvasRenderingContext2D.webidl b/dom/webidl/OffscreenCanvasRenderingContext2D.webidl index 05df8e3d6d09..9629d8e77c2d 100644 --- a/dom/webidl/OffscreenCanvasRenderingContext2D.webidl +++ b/dom/webidl/OffscreenCanvasRenderingContext2D.webidl @@ -24,7 +24,9 @@ OffscreenCanvasRenderingContext2D includes CanvasFillStrokeStyles; OffscreenCanvasRenderingContext2D includes CanvasShadowStyles; OffscreenCanvasRenderingContext2D includes CanvasRect; OffscreenCanvasRenderingContext2D includes CanvasDrawPath; +OffscreenCanvasRenderingContext2D includes CanvasText; OffscreenCanvasRenderingContext2D includes CanvasDrawImage; OffscreenCanvasRenderingContext2D includes CanvasImageData; OffscreenCanvasRenderingContext2D includes CanvasPathDrawingStyles; +OffscreenCanvasRenderingContext2D includes CanvasTextDrawingStyles; OffscreenCanvasRenderingContext2D includes CanvasPathMethods; diff --git a/dom/workers/test/test_worker_interfaces.js b/dom/workers/test/test_worker_interfaces.js index c86d008474b8..ccc1ce6d71da 100644 --- a/dom/workers/test/test_worker_interfaces.js +++ b/dom/workers/test/test_worker_interfaces.js @@ -289,6 +289,8 @@ var interfaceNamesInGlobalScope = [ // IMPORTANT: Do not change this list without review from a DOM peer! { name: "TextEncoder", insecureContext: true }, // IMPORTANT: Do not change this list without review from a DOM peer! + { name: "TextMetrics", insecureContext: true }, + // IMPORTANT: Do not change this list without review from a DOM peer! { name: "TransformStream", insecureContext: true }, // IMPORTANT: Do not change this list without review from a DOM peer! { diff --git a/testing/web-platform/meta/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.html.ini b/testing/web-platform/meta/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.html.ini deleted file mode 100644 index bd16fcf0fc7b..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.html.ini +++ /dev/null @@ -1,16 +0,0 @@ -[2d.text.draw.generic.family.html] - [Test that drawing sans-serif produces the same result between canvas and OffscreenCanvas] - expected: FAIL - - [Test that drawing serif produces the same result between canvas and OffscreenCanvas] - expected: FAIL - - [Test that drawing cursive produces the same result between canvas and OffscreenCanvas] - expected: FAIL - - [Test that drawing fantasy produces the same result between canvas and OffscreenCanvas] - expected: FAIL - - [Test that drawing monospace produces the same result between canvas and OffscreenCanvas] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.w.html.ini b/testing/web-platform/meta/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.w.html.ini deleted file mode 100644 index ef8356c67276..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/manual/draw-generic-family/2d.text.draw.generic.family.w.html.ini +++ /dev/null @@ -1,17 +0,0 @@ -[2d.text.draw.generic.family.w.html] - expected: ERROR - [Test that drawing sans-serif produces the same result between canvas and OffscreenCanvas in a Worker] - expected: TIMEOUT - - [Test that drawing serif produces the same result between canvas and OffscreenCanvas in a Worker] - expected: TIMEOUT - - [Test that drawing cursive produces the same result between canvas and OffscreenCanvas in a Worker] - expected: TIMEOUT - - [Test that drawing fantasy produces the same result between canvas and OffscreenCanvas in a Worker] - expected: TIMEOUT - - [Test that drawing monospace produces the same result between canvas and OffscreenCanvas in a Worker] - expected: TIMEOUT - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.default.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.default.html.ini deleted file mode 100644 index cfc8b5f9e747..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.default.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.align.default.html] - [OffscreenCanvas test: 2d.text.align.default] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.default.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.default.worker.js.ini deleted file mode 100644 index 38fffadbee9f..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.default.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.align.default.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.invalid.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.invalid.html.ini deleted file mode 100644 index 1e8afd14191a..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.align.invalid.html] - [OffscreenCanvas test: 2d.text.align.invalid] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.invalid.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.invalid.worker.js.ini deleted file mode 100644 index fd2751fa4fe6..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.align.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.align.invalid.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.default.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.default.html.ini deleted file mode 100644 index 660b1093d74b..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.default.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.baseline.default.html] - [OffscreenCanvas test: 2d.text.baseline.default] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.default.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.default.worker.js.ini deleted file mode 100644 index 15f63c7a2f4b..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.default.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.baseline.default.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.invalid.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.invalid.html.ini deleted file mode 100644 index fc890c7ba66d..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.baseline.invalid.html] - [OffscreenCanvas test: 2d.text.baseline.invalid] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js.ini deleted file mode 100644 index 15d3ef67d1e9..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.baseline.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.baseline.invalid.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.center.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.center.html.ini deleted file mode 100644 index 755f5930c5d3..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.center.html.ini +++ /dev/null @@ -1,7 +0,0 @@ -[2d.text.draw.align.center.html] - expected: - if (os == "android") and not debug: [OK, TIMEOUT] - [textAlign center is the center of the em squares (not the bounding box)] - expected: - if (os == "android") and not debug: [FAIL, TIMEOUT] - FAIL diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js.ini deleted file mode 100644 index 6026785e070d..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.center.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.center.worker.html] - [textAlign center is the center of the em squares (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html.ini deleted file mode 100644 index e87fa1ae5422..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.end.ltr.html] - [textAlign end with ltr is the right edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js.ini deleted file mode 100644 index 52631c3760ec..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.end.ltr.worker.html] - [textAlign end with ltr is the right edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html.ini deleted file mode 100644 index 4546e4efe3d0..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.end.rtl.html] - [textAlign end with rtl is the left edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js.ini deleted file mode 100644 index a7b0a6331122..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.end.rtl.worker.html] - [textAlign end with rtl is the left edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.left.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.left.html.ini deleted file mode 100644 index 44e7bfc33492..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.left.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.left.html] - [textAlign left is the left of the first em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js.ini deleted file mode 100644 index 3dd79127c2de..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.left.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.left.worker.html] - [textAlign left is the left of the first em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.right.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.right.html.ini deleted file mode 100644 index ab6ee4d84cf2..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.right.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.right.html] - [textAlign right is the right of the last em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js.ini deleted file mode 100644 index 5ad453db21b0..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.right.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.right.worker.html] - [textAlign right is the right of the last em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html.ini deleted file mode 100644 index 9403b25f6f18..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.start.ltr.html] - [textAlign start with ltr is the left edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js.ini deleted file mode 100644 index bfefcfc44e03..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.start.ltr.worker.html] - [textAlign start with ltr is the left edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html.ini deleted file mode 100644 index 297adfc68273..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.start.rtl.html] - [textAlign start with rtl is the right edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js.ini deleted file mode 100644 index bf27dcf3e329..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.align.start.rtl.worker.html] - [textAlign start with rtl is the right edge] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html.ini deleted file mode 100644 index 4748acffa82d..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.alphabetic.html] - [OffscreenCanvas test: 2d.text.draw.baseline.alphabetic] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js.ini deleted file mode 100644 index 6b37d3e0e0d4..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.alphabetic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.alphabetic.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html.ini deleted file mode 100644 index a7c97c18e6e7..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.bottom.html] - [textBaseline bottom is the bottom of the em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js.ini deleted file mode 100644 index 9e5116ded9f6..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.bottom.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.bottom.worker.html] - [textBaseline bottom is the bottom of the em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html.ini index eb853cdbacd5..0eb628dcda4b 100644 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html.ini +++ b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.html.ini @@ -1,4 +1,5 @@ [2d.text.draw.baseline.hanging.html] [OffscreenCanvas test: 2d.text.draw.baseline.hanging] - expected: FAIL + expected: + if (os == 'android'): FAIL diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js.ini index 9faf66f5c5c1..93e4e9ecf5f2 100644 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js.ini +++ b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.hanging.worker.js.ini @@ -1,4 +1,5 @@ [2d.text.draw.baseline.hanging.worker.html] [2d] - expected: FAIL + expected: + if (os == 'android'): FAIL diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html.ini deleted file mode 100644 index 4969502107fa..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.middle.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.middle.html] - [textBaseline middle is the middle of the em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js.ini deleted file mode 100644 index 974b2268d42c..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.middle.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.middle.worker.html] - [textBaseline middle is the middle of the em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.top.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.top.html.ini deleted file mode 100644 index fde10ed8b71c..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.top.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.top.html] - [textBaseline top is the top of the em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js.ini deleted file mode 100644 index c2767f7d4fd1..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.baseline.top.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.baseline.top.worker.html] - [textBaseline top is the top of the em square (not the bounding box)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini deleted file mode 100644 index 129f379a8aa6..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.NaN.html] - [fillText handles maxWidth correctly] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini deleted file mode 100644 index b74d15ded60e..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.NaN.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.NaN.worker.html] - [fillText handles maxWidth correctly] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html.ini deleted file mode 100644 index 1a92a6395871..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.bound.html] - [fillText handles maxWidth based on line size, not bounding box size] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js.ini deleted file mode 100644 index d9887186aa8f..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.bound.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.bound.worker.html] - [fillText handles maxWidth based on line size, not bounding box size] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html.ini deleted file mode 100644 index 3e7da9f9a615..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.fontface.html] - [fillText works on @font-face fonts] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js.ini deleted file mode 100644 index b857906dd866..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.fontface.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.fontface.worker.html] - [fillText works on @font-face fonts] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini deleted file mode 100644 index f21a4d447ca5..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.negative.html] - [fillText handles maxWidth correctly] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini deleted file mode 100644 index 0081be79b324..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.negative.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.negative.worker.html] - [fillText handles maxWidth correctly] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini deleted file mode 100644 index 8bbd6ce95f4d..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[2d.text.draw.fill.maxWidth.small.html] - expected: - if (os == "linux") and not fission and not debug and (processor == "x86_64"): [OK, CRASH] - [fillText handles maxWidth correctly] - expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini deleted file mode 100644 index 8bfdb470a8b7..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.small.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.small.worker.html] - [fillText handles maxWidth correctly] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini deleted file mode 100644 index ab0f01f54950..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.zero.html] - [fillText handles maxWidth correctly] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini deleted file mode 100644 index 9bb2c2f7adac..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.maxWidth.zero.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.maxWidth.zero.worker.html] - [fillText handles maxWidth correctly] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini index b52d4b7629a8..76724ab2beed 100644 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini +++ b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.html.ini @@ -1,5 +1,3 @@ [2d.text.draw.fill.unaffected.html] expected: if fission and (os == "linux") and not debug: [OK, TIMEOUT] - [fillText does not start a new path or subpath] - expected: FAIL diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini deleted file mode 100644 index 4e4d06f908d0..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fill.unaffected.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fill.unaffected.worker.html] - [fillText does not start a new path or subpath] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.html.ini deleted file mode 100644 index 9b27eb4714be..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.html] - [OffscreenCanvas test: 2d.text.draw.fontface] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html.ini deleted file mode 100644 index 21a787eebd0a..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.notinpage.html] - [@font-face fonts should work even if they are not used in the page] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js.ini deleted file mode 100644 index 7edd64d74ac2..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.notinpage.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.notinpage.worker.html] - [@font-face fonts should work even if they are not used in the page] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html.ini deleted file mode 100644 index b28e435ff8b8..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.repeat.html] - [Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js.ini deleted file mode 100644 index 7dec0caa9d7c..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.repeat.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.repeat.worker.html] - [Draw with the font immediately, then wait a bit until and draw again. (This crashes some version of WebKit.)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js.ini deleted file mode 100644 index dfee74c01a18..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.fontface.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.fontface.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.basic.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.basic.html.ini deleted file mode 100644 index b24ad7daaf55..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.basic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.space.basic.html] - [U+0020 is rendered the correct size (1em wide)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js.ini deleted file mode 100644 index 685610a0956c..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.basic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.space.basic.worker.html] - [U+0020 is rendered the correct size (1em wide)] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html.ini deleted file mode 100644 index 403c4063ea3f..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.space.collapse.nonspace.html] - [Non-space characters are not converted to U+0020 and collapsed] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js.ini deleted file mode 100644 index 6730cfd78110..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.space.collapse.nonspace.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.space.collapse.nonspace.worker.html] - [Non-space characters are not converted to U+0020 and collapsed] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html.ini deleted file mode 100644 index 837a7012c75a..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.stroke.unaffected.html] - [strokeText does not start a new path or subpath] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js.ini deleted file mode 100644 index 790904fd605b..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.draw.stroke.unaffected.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.draw.stroke.unaffected.worker.html] - [strokeText does not start a new path or subpath] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html.ini deleted file mode 100644 index 0bef5595674b..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.drawing.style.measure.direction.html] - [Measurement should follow text direction] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js.ini deleted file mode 100644 index 5a97cc8b8169..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.direction.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.drawing.style.measure.direction.worker.html] - [Measurement should follow text direction] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html.ini deleted file mode 100644 index 9c5b125dcd0b..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.drawing.style.measure.rtl.text.html] - [Measurement should follow canvas direction instead text direction] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js.ini deleted file mode 100644 index d58e5fdf1989..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.rtl.text.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.drawing.style.measure.rtl.text.worker.html] - [Measurement should follow canvas direction instead text direction] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html.ini deleted file mode 100644 index 5fbd782e3759..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.drawing.style.measure.textAlign.html] - [Measurement should be related to textAlignment] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js.ini deleted file mode 100644 index cc64fb48a062..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.drawing.style.measure.textAlign.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.drawing.style.measure.textAlign.worker.html] - [Measurement should be related to textAlignment] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.default.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.default.html.ini deleted file mode 100644 index cbef4aaf0604..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.default.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.default.html] - [OffscreenCanvas test: 2d.text.font.default] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.default.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.default.worker.js.ini deleted file mode 100644 index 181525db7506..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.default.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.default.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.basic.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.basic.html.ini deleted file mode 100644 index 4c038485bba2..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.basic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.parse.basic.html] - [OffscreenCanvas test: 2d.text.font.parse.basic] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js.ini deleted file mode 100644 index e8fd7fbfe190..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.basic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.parse.basic.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.invalid.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.invalid.html.ini deleted file mode 100644 index b2f9ec172daf..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.invalid.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.parse.invalid.html] - [OffscreenCanvas test: 2d.text.font.parse.invalid] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js.ini deleted file mode 100644 index e1d4adca2dd7..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.invalid.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.parse.invalid.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.system.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.system.html.ini deleted file mode 100644 index 4011e6441bfa..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.system.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.parse.system.html] - [System fonts must be computed to explicit values] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js.ini deleted file mode 100644 index 38ba0ec527b4..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.parse.system.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.parse.system.worker.html] - [System fonts must be computed to explicit values] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.relative_size.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.relative_size.html.ini deleted file mode 100644 index 3b0a22523af0..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.relative_size.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.relative_size.html] - [OffscreenCanvas test: 2d.text.font.relative_size] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js.ini deleted file mode 100644 index d8ba1ee88174..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.font.relative_size.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.font.relative_size.worker.html] - [2d] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html.ini index 63e0d7211b4a..a85ff7033980 100644 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html.ini +++ b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.html.ini @@ -1,4 +1,4 @@ [2d.text.measure.actualBoundingBox.html] [Testing actualBoundingBox for OffscreenCanvas] - expected: FAIL - + expected: + if (os == "mac"): FAIL diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js.ini index 12a20d879160..a4add79144ad 100644 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js.ini +++ b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.actualBoundingBox.worker.js.ini @@ -1,4 +1,5 @@ [2d.text.measure.actualBoundingBox.worker.html] [Testing actualBoundingBox for OffscreenCanvas] - expected: FAIL + expected: + if (os == 'mac'): FAIL diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.basic.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.basic.html.ini deleted file mode 100644 index 9146392b6466..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.basic.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.measure.width.basic.html] - [The width of character is same as font used for OffscreenCanvas] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js.ini deleted file mode 100644 index b2e48b2d5b95..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.basic.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.measure.width.basic.worker.html] - [The width of character is same as font used for OffscreenCanvas] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.empty.html.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.empty.html.ini deleted file mode 100644 index 3f0138579518..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.empty.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.measure.width.empty.html] - [The empty string has zero width for OffscreenCanvas] - expected: FAIL - diff --git a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js.ini b/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js.ini deleted file mode 100644 index f78fd87f7e7a..000000000000 --- a/testing/web-platform/meta/html/canvas/offscreen/text/2d.text.measure.width.empty.worker.js.ini +++ /dev/null @@ -1,4 +0,0 @@ -[2d.text.measure.width.empty.worker.html] - [The empty string has zero width for OffscreenCanvas] - expected: FAIL - diff --git a/testing/web-platform/meta/html/dom/idlharness.https.html.ini b/testing/web-platform/meta/html/dom/idlharness.https.html.ini index c15f091f4f66..dd592b0193e2 100644 --- a/testing/web-platform/meta/html/dom/idlharness.https.html.ini +++ b/testing/web-platform/meta/html/dom/idlharness.https.html.ini @@ -12,9 +12,6 @@ prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featu [OffscreenCanvasRenderingContext2D interface: attribute filter] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation measureText(DOMString)] - expected: FAIL - [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "imageSmoothingQuality" with the proper type] expected: FAIL @@ -135,9 +132,6 @@ prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featu [SVGSVGElement interface: attribute onmessageerror] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute direction] - expected: FAIL - [VideoTrack interface: attribute language] expected: FAIL @@ -171,9 +165,6 @@ prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featu [SVGSVGElement interface: attribute onlanguagechange] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute textAlign] - expected: FAIL - [SVGSVGElement interface: attribute onunhandledrejection] expected: FAIL @@ -195,9 +186,6 @@ prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featu [AudioTrackList interface: attribute onchange] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute font] - expected: FAIL - [AudioTrack interface object name] expected: FAIL @@ -261,9 +249,6 @@ prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featu [TextMetrics interface: attribute fontBoundingBoxDescent] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute textBaseline] - expected: FAIL - [SVGSVGElement interface: attribute onafterprint] expected: FAIL @@ -330,12 +315,6 @@ prefs: [dom.security.featurePolicy.experimental.enabled:true, dom.security.featu [FormDataEvent interface object length] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation fillText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)] - expected: FAIL - - [OffscreenCanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)] - expected: FAIL - [Navigator interface: operation registerProtocolHandler(DOMString, USVString)] expected: if (os == "mac") and not debug: [PASS, FAIL] diff --git a/testing/web-platform/meta/html/dom/idlharness.worker.js.ini b/testing/web-platform/meta/html/dom/idlharness.worker.js.ini index 974df774a5ea..a66d3e0aef09 100644 --- a/testing/web-platform/meta/html/dom/idlharness.worker.js.ini +++ b/testing/web-platform/meta/html/dom/idlharness.worker.js.ini @@ -2,84 +2,30 @@ [OffscreenCanvasRenderingContext2D interface: attribute filter] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: operation measureText(DOMString)] - expected: FAIL - - [TextMetrics interface object length] - expected: FAIL - [TextMetrics interface: attribute emHeightAscent] expected: FAIL [TextMetrics interface: attribute ideographicBaseline] expected: FAIL - [TextMetrics interface: attribute actualBoundingBoxAscent] - expected: FAIL - - [TextMetrics interface: existence and properties of interface prototype object's @@unscopables property] - expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute imageSmoothingQuality] expected: FAIL [TextMetrics interface: attribute emHeightDescent] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute direction] - expected: FAIL - - [TextMetrics interface: attribute actualBoundingBoxDescent] - expected: FAIL - - [TextMetrics interface: attribute actualBoundingBoxLeft] - expected: FAIL - - [TextMetrics interface: existence and properties of interface object] - expected: FAIL - - [OffscreenCanvasRenderingContext2D interface: attribute font] - expected: FAIL - [TextMetrics interface: attribute hangingBaseline] expected: FAIL - [TextMetrics interface: attribute width] - expected: FAIL - - [TextMetrics interface: attribute actualBoundingBoxRight] - expected: FAIL - [TextMetrics interface: attribute fontBoundingBoxAscent] expected: FAIL [TextMetrics interface: attribute alphabeticBaseline] expected: FAIL - [TextMetrics interface: existence and properties of interface prototype object] - expected: FAIL - [TextMetrics interface: attribute fontBoundingBoxDescent] expected: FAIL - [OffscreenCanvasRenderingContext2D interface: attribute textBaseline] - expected: FAIL - - [OffscreenCanvasRenderingContext2D interface: attribute textAlign] - expected: FAIL - - [TextMetrics interface: existence and properties of interface prototype object's "constructor" property] - expected: FAIL - - [TextMetrics interface object name] - expected: FAIL - - [OffscreenCanvasRenderingContext2D interface: operation fillText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)] - expected: FAIL - - [OffscreenCanvasRenderingContext2D interface: operation strokeText(DOMString, unrestricted double, unrestricted double, optional unrestricted double)] - expected: FAIL - [ImageData interface: attribute colorSpace] expected: FAIL diff --git a/testing/web-platform/meta/workers/semantics/interface-objects/001.worker.js.ini b/testing/web-platform/meta/workers/semantics/interface-objects/001.worker.js.ini index 971203d2b02f..670974a1f566 100644 --- a/testing/web-platform/meta/workers/semantics/interface-objects/001.worker.js.ini +++ b/testing/web-platform/meta/workers/semantics/interface-objects/001.worker.js.ini @@ -14,9 +14,6 @@ [The Path interface object should be exposed.] expected: FAIL - [The TextMetrics interface object should be exposed.] - expected: FAIL - [The CanvasPath interface object should be exposed.] expected: FAIL @@ -28,6 +25,3 @@ [The CanvasPath interface object should be exposed.] expected: FAIL - [The TextMetrics interface object should be exposed.] - expected: FAIL -