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

Unified Diff: sdk/lib/web_gl/dartium/web_gl_dartium.dart

Issue 1831033002: Fix WebGL tex[Sub]Image2D/buffer[Sub]Data, restored Typed/Untyped aliases (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « sdk/lib/web_gl/dart2js/web_gl_dart2js.dart ('k') | tools/dom/docs/docs.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/web_gl/dartium/web_gl_dartium.dart
diff --git a/sdk/lib/web_gl/dartium/web_gl_dartium.dart b/sdk/lib/web_gl/dartium/web_gl_dartium.dart
index ede152f401851f4f34ea4e277c6616f81ad376e2..c376d941a3c45e02e7264c5916aa8c8b1cc16b93 100644
--- a/sdk/lib/web_gl/dartium/web_gl_dartium.dart
+++ b/sdk/lib/web_gl/dartium/web_gl_dartium.dart
@@ -3664,31 +3664,22 @@ class RenderingContext extends DartHtmlDomObject implements CanvasRenderingConte
* Sets the currently bound texture to [data].
*
* [data] can be either an [ImageElement], a
- * [CanvasElement], a [VideoElement], or an [ImageData] object.
- *
- * To use [texImage2d] with a TypedData object, use [texImage2dTyped].
+ * [CanvasElement], a [VideoElement], [TypedData] or an [ImageData] object.
*
+ * This is deprecated in favor of [texImage2D].
*/
- void texImage2DUntyped(int targetTexture, int levelOfDetail,
+ @Deprecated("Use texImage2D")
+ void texImage2DUntyped(int targetTexture, int levelOfDetail,
int internalFormat, int format, int type, data) {
- if (data is ImageElement) {
- texImage2DImage(targetTexture, levelOfDetail, internalFormat, format,
- type, data);
- } else if (data is ImageData) {
- texImage2DImageData(targetTexture, levelOfDetail, internalFormat, format,
- type, data);
- } else if (data is CanvasElement) {
- texImage2DCanvas(targetTexture, levelOfDetail, internalFormat, format,
- type, data);
- } else {
- texImage2DVideo(targetTexture, levelOfDetail, internalFormat, format,
- type, data);
- }
+ texImage2D(targetText, levelOfDetail, internalFormat, format, type, data);
}
/**
* Sets the currently bound texture to [data].
+ *
+ * This is deprecated in favour of [texImage2D].
*/
+ @Deprecated("Use texImage2D")
void texImage2DTyped(int targetTexture, int levelOfDetail, int internalFormat,
int width, int height, int border, int format, int type, TypedData data) {
texImage2D(targetTexture, levelOfDetail, internalFormat,
@@ -3699,12 +3690,11 @@ class RenderingContext extends DartHtmlDomObject implements CanvasRenderingConte
* Updates a sub-rectangle of the currently bound texture to [data].
*
* [data] can be either an [ImageElement], a
- * [CanvasElement], a [VideoElement], or an [ImageData] object.
- *
- * To use [texSubImage2d] with a TypedData object, use [texSubImage2dTyped].
+ * [CanvasElement], a [VideoElement], [TypedData] or an [ImageData] object.
*
*/
- void texSubImage2DUntyped(int targetTexture, int levelOfDetail,
+ @Deprecated("Use texSubImage2D")
+ void texSubImage2DUntyped(int targetTexture, int levelOfDetail,
int xOffset, int yOffset, int format, int type, data) {
texSubImage2D(targetTexture, levelOfDetail, xOffset, yOffset,
format, type, data);
@@ -3713,12 +3703,31 @@ class RenderingContext extends DartHtmlDomObject implements CanvasRenderingConte
/**
* Updates a sub-rectangle of the currently bound texture to [data].
*/
+ @Deprecated("Use texSubImage2D")
void texSubImage2DTyped(int targetTexture, int levelOfDetail,
- int xOffset, int yOffset, int width, int height, int format,
+ int xOffset, int yOffset, int width, int height, int border, int format,
int type, TypedData data) {
texSubImage2D(targetTexture, levelOfDetail, xOffset, yOffset,
width, height, format, type, data);
}
+
+ /**
+ * Set the bufferData to [data].
+ */
+ @Deprecated("Use bufferData")
+ void bufferDataTyped(int target, TypedData data, int usage) {
+ bufferData2D(targetTexture, levelOfDetail, xOffset, yOffset,
+ format, type, data);
+ }
+
+ /**
+ * Set the bufferSubData to [data].
+ */
+ @Deprecated("Use bufferSubData")
+ void bufferSubDataTyped(int target, TypedData data, int usage) {
+ bufferSubData2D(targetTexture, levelOfDetail, xOffset, yOffset,
+ format, type, data);
+ }
}
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
« no previous file with comments | « sdk/lib/web_gl/dart2js/web_gl_dart2js.dart ('k') | tools/dom/docs/docs.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698