Skip to content

Commit 3e09c30

Browse files
committed
Revert "Fix order"
This reverts commit ae72c10.
1 parent 77990a6 commit 3e09c30

19 files changed

+66
-18
lines changed

baselines/dom.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36174,6 +36174,7 @@ interface WebGLRenderingContextBase {
3617436174
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
3617536175
getError(): GLenum;
3617636176
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
36177+
getExtension(name: string): any;
3617736178
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
3617836179
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
3617936180
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -36208,7 +36209,10 @@ interface WebGLRenderingContextBase {
3620836209
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
3620936210
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
3621036211
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
36212+
<<<<<<< HEAD
3621136213
getExtension(name: string): any;
36214+
=======
36215+
>>>>>>> parent of ae72c10f (Fix order)
3621236216
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
3621336217
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
3621436218
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/serviceworker.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9848,6 +9848,7 @@ interface WebGLRenderingContextBase {
98489848
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
98499849
getError(): GLenum;
98509850
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
9851+
getExtension(name: string): any;
98519852
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
98529853
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
98539854
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -9882,7 +9883,10 @@ interface WebGLRenderingContextBase {
98829883
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
98839884
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
98849885
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9886+
<<<<<<< HEAD
98859887
getExtension(name: string): any;
9888+
=======
9889+
>>>>>>> parent of ae72c10f (Fix order)
98869890
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
98879891
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
98889892
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/sharedworker.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9385,6 +9385,7 @@ interface WebGLRenderingContextBase {
93859385
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
93869386
getError(): GLenum;
93879387
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
9388+
getExtension(name: string): any;
93889389
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
93899390
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
93909391
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -9419,7 +9420,10 @@ interface WebGLRenderingContextBase {
94199420
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
94209421
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
94219422
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9423+
<<<<<<< HEAD
94229424
getExtension(name: string): any;
9425+
=======
9426+
>>>>>>> parent of ae72c10f (Fix order)
94239427
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
94249428
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
94259429
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/ts5.5/dom.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36148,6 +36148,7 @@ interface WebGLRenderingContextBase {
3614836148
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
3614936149
getError(): GLenum;
3615036150
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
36151+
getExtension(name: string): any;
3615136152
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
3615236153
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
3615336154
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -36182,7 +36183,10 @@ interface WebGLRenderingContextBase {
3618236183
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
3618336184
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
3618436185
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
36186+
<<<<<<< HEAD
3618536187
getExtension(name: string): any;
36188+
=======
36189+
>>>>>>> parent of ae72c10f (Fix order)
3618636190
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
3618736191
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
3618836192
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/ts5.5/serviceworker.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9845,6 +9845,7 @@ interface WebGLRenderingContextBase {
98459845
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
98469846
getError(): GLenum;
98479847
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
9848+
getExtension(name: string): any;
98489849
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
98499850
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
98509851
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -9879,7 +9880,10 @@ interface WebGLRenderingContextBase {
98799880
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
98809881
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
98819882
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9883+
<<<<<<< HEAD
98829884
getExtension(name: string): any;
9885+
=======
9886+
>>>>>>> parent of ae72c10f (Fix order)
98839887
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
98849888
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
98859889
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/ts5.5/sharedworker.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9382,6 +9382,7 @@ interface WebGLRenderingContextBase {
93829382
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
93839383
getError(): GLenum;
93849384
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
9385+
getExtension(name: string): any;
93859386
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
93869387
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
93879388
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -9416,7 +9417,10 @@ interface WebGLRenderingContextBase {
94169417
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
94179418
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
94189419
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9420+
<<<<<<< HEAD
94199421
getExtension(name: string): any;
9422+
=======
9423+
>>>>>>> parent of ae72c10f (Fix order)
94209424
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
94219425
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
94229426
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/ts5.5/webworker.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11279,6 +11279,7 @@ interface WebGLRenderingContextBase {
1127911279
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
1128011280
getError(): GLenum;
1128111281
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
11282+
getExtension(name: string): any;
1128211283
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
1128311284
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
1128411285
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -11313,7 +11314,10 @@ interface WebGLRenderingContextBase {
1131311314
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
1131411315
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
1131511316
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
11317+
<<<<<<< HEAD
1131611318
getExtension(name: string): any;
11319+
=======
11320+
>>>>>>> parent of ae72c10f (Fix order)
1131711321
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
1131811322
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
1131911323
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/ts5.6/dom.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36171,6 +36171,7 @@ interface WebGLRenderingContextBase {
3617136171
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
3617236172
getError(): GLenum;
3617336173
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
36174+
getExtension(name: string): any;
3617436175
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
3617536176
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
3617636177
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -36205,7 +36206,10 @@ interface WebGLRenderingContextBase {
3620536206
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
3620636207
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
3620736208
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
36209+
<<<<<<< HEAD
3620836210
getExtension(name: string): any;
36211+
=======
36212+
>>>>>>> parent of ae72c10f (Fix order)
3620936213
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
3621036214
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
3621136215
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/ts5.6/serviceworker.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9845,6 +9845,7 @@ interface WebGLRenderingContextBase {
98459845
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
98469846
getError(): GLenum;
98479847
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
9848+
getExtension(name: string): any;
98489849
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
98499850
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
98509851
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -9879,7 +9880,10 @@ interface WebGLRenderingContextBase {
98799880
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
98809881
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
98819882
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9883+
<<<<<<< HEAD
98829884
getExtension(name: string): any;
9885+
=======
9886+
>>>>>>> parent of ae72c10f (Fix order)
98839887
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
98849888
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
98859889
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

baselines/ts5.6/sharedworker.generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9382,6 +9382,7 @@ interface WebGLRenderingContextBase {
93829382
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getError) */
93839383
getError(): GLenum;
93849384
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getExtension) */
9385+
getExtension(name: string): any;
93859386
getExtension(extensionName: "ANGLE_instanced_arrays"): ANGLE_instanced_arrays | null;
93869387
getExtension(extensionName: "EXT_blend_minmax"): EXT_blend_minmax | null;
93879388
getExtension(extensionName: "EXT_color_buffer_float"): EXT_color_buffer_float | null;
@@ -9416,7 +9417,10 @@ interface WebGLRenderingContextBase {
94169417
getExtension(extensionName: "WEBGL_draw_buffers"): WEBGL_draw_buffers | null;
94179418
getExtension(extensionName: "WEBGL_lose_context"): WEBGL_lose_context | null;
94189419
getExtension(extensionName: "WEBGL_multi_draw"): WEBGL_multi_draw | null;
9420+
<<<<<<< HEAD
94199421
getExtension(name: string): any;
9422+
=======
9423+
>>>>>>> parent of ae72c10f (Fix order)
94209424
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getFramebufferAttachmentParameter) */
94219425
getFramebufferAttachmentParameter(target: GLenum, attachment: GLenum, pname: GLenum): any;
94229426
/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebGLRenderingContext/getParameter) */

0 commit comments

Comments
 (0)