Skip to content

Commit

Permalink
Auto merge of #22906 - servo-wpt-sync:wpt_update_16-02-2019, r=jdm
Browse files Browse the repository at this point in the history
Sync WPT with upstream (16-02-2019)

Automated downstream sync of changes from upstream as of 16-02-2019.
[no-wpt-sync]

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22906)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Feb 17, 2019
2 parents 0c10702 + 9c112bc commit f6de47c
Show file tree
Hide file tree
Showing 12 changed files with 63 additions and 35 deletions.
2 changes: 1 addition & 1 deletion tests/wpt/metadata/MANIFEST.json
Original file line number Diff line number Diff line change
Expand Up @@ -643231,7 +643231,7 @@
"support"
],
"interfaces/webgl1.idl": [
"bab7d421da02399e8006466a395eee113904e04d",
"7f5130ef707661e6879f09a67efa3a7f74c041cd",
"support"
],
"interfaces/webgl2.idl": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,3 +320,18 @@
[Matching font-weight: '399' should prefer '500 501' over '502 510']
expected: FAIL

[Matching font-stretch: '100%' should prefer '100%' over '110% 120%']
expected: FAIL

[Matching font-style: 'oblique 0deg' should prefer 'oblique 40deg 50deg' over 'italic']
expected: FAIL

[Matching font-style: 'oblique 10deg' should prefer 'italic' over 'oblique 0deg']
expected: FAIL

[Matching font-style: 'oblique 10deg' should prefer 'oblique 5deg' over 'oblique 15deg 20deg']
expected: FAIL

[Matching font-style: 'italic' should prefer 'oblique 20deg' over 'oblique 30deg 60deg']
expected: FAIL

Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,6 @@
[background-position length(px) / events]
expected: FAIL

[font-size length(em) / events]
expected: FAIL

15 changes: 6 additions & 9 deletions tests/wpt/metadata/encoding/single-byte-decoder.html.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@


[single-byte-decoder.html?XMLHttpRequest]
expected: CRASH
expected: TIMEOUT
[ISO-8859-2: iso_8859-2:1987 (XMLHttpRequest)]
expected: FAIL

Expand Down Expand Up @@ -69,9 +69,6 @@
[windows-1254: iso_8859-9 (XMLHttpRequest)]
expected: TIMEOUT

[windows-1254: iso88599 (XMLHttpRequest)]
expected: TIMEOUT

[windows-1258: x-cp1258 (XMLHttpRequest)]
expected: TIMEOUT

Expand All @@ -84,9 +81,6 @@
[windows-1257: cp1257 (XMLHttpRequest)]
expected: TIMEOUT

[windows-1254: iso8859-9 (XMLHttpRequest)]
expected: TIMEOUT

[windows-1254: l5 (XMLHttpRequest)]
expected: TIMEOUT

Expand Down Expand Up @@ -117,10 +111,13 @@
[windows-1256: windows-1256 (XMLHttpRequest)]
expected: TIMEOUT

[windows-1254: iso-ir-148 (XMLHttpRequest)]
[x-mac-cyrillic: x-mac-cyrillic (XMLHttpRequest)]
expected: TIMEOUT

[x-mac-cyrillic: x-mac-cyrillic (XMLHttpRequest)]
[windows-1257: windows-1257 (XMLHttpRequest)]
expected: TIMEOUT

[windows-1254: csisolatin5 (XMLHttpRequest)]
expected: TIMEOUT


Expand Down
8 changes: 7 additions & 1 deletion tests/wpt/metadata/fetch/content-type/response.window.js.ini
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,12 @@
[<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
expected: FAIL

[<iframe>: separate response Content-Type: text/plain;charset=gbk text/html]
[<iframe>: combined response Content-Type: text/html;" text/plain]
expected: FAIL

[<iframe>: combined response Content-Type: text/html */*]
expected: FAIL

[<iframe>: separate response Content-Type: */* text/html]
expected: FAIL

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[traverse_the_history_5.html]
[Multiple history traversals, last would be aborted]
expected: FAIL

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[non-active-document.html]
[DOMParser]
expected: FAIL

[createHTMLDocument]
expected: FAIL

[<template>]
expected: FAIL

This file was deleted.

6 changes: 6 additions & 0 deletions tests/wpt/metadata/webgl/webgl1-idlharness.any.js.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2438,8 +2438,14 @@
[WebGLRenderingContext interface object length]
expected: FAIL

[WebGLRenderingContext interface: attribute canvas]
expected: FAIL


[webgl1-idlharness.any.html]
[WebGLRenderingContext interface: operation isContextLost()]
expected: FAIL

[WebGLRenderingContext interface: member canvas]
expected: FAIL

20 changes: 11 additions & 9 deletions tests/wpt/web-platform-tests/interfaces/webgl1.idl
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ typedef unrestricted float GLclampf;
enum WebGLPowerPreference { "default", "low-power", "high-performance" };

dictionary WebGLContextAttributes {
GLboolean alpha = true;
GLboolean depth = true;
GLboolean stencil = false;
GLboolean antialias = true;
GLboolean premultipliedAlpha = true;
GLboolean preserveDrawingBuffer = false;
boolean alpha = true;
boolean depth = true;
boolean stencil = false;
boolean antialias = true;
boolean premultipliedAlpha = true;
boolean preserveDrawingBuffer = false;
WebGLPowerPreference powerPreference = "default";
GLboolean failIfMajorPerformanceCaveat = false;
boolean failIfMajorPerformanceCaveat = false;
};

[Exposed=(Window,Worker)]
Expand Down Expand Up @@ -84,7 +84,8 @@ typedef (ImageBitmap or
ImageData or
HTMLImageElement or
HTMLCanvasElement or
HTMLVideoElement) TexImageSource;
HTMLVideoElement or
OffscreenCanvas) TexImageSource;

typedef ([AllowShared] Float32Array or sequence<GLfloat>) Float32List;
typedef ([AllowShared] Int32Array or sequence<GLint>) Int32List;
Expand Down Expand Up @@ -510,7 +511,8 @@ interface mixin WebGLRenderingContextBase
const GLenum UNPACK_COLORSPACE_CONVERSION_WEBGL = 0x9243;
const GLenum BROWSER_DEFAULT_WEBGL = 0x9244;

[Exposed=Window] readonly attribute HTMLCanvasElement canvas;
[Exposed=Window] readonly attribute (HTMLCanvasElement or OffscreenCanvas) canvas;
[Exposed=Worker] readonly attribute OffscreenCanvas canvas;
readonly attribute GLsizei drawingBufferWidth;
readonly attribute GLsizei drawingBufferHeight;

Expand Down

0 comments on commit f6de47c

Please sign in to comment.