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

Unified Diff: sdk/lib/html/dart2js/html_dart2js.dart

Issue 29273005: CanvasRenderingContext2D.fillText now works correctly with null maxWidth. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 0 diff for dartium. Created 7 years, 2 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:
Download patch
« no previous file with comments | « no previous file | tests/html/canvasrenderingcontext2d_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/html/dart2js/html_dart2js.dart
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 3ff4de478d50a34b5b81de3802c730fb7732a4fc..76547d17c4404a272ab755ea5f4ecdc53a1c53d3 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -1365,10 +1365,6 @@ class CanvasRenderingContext2D extends CanvasRenderingContext native "CanvasRend
@DocsEditable()
void fillRect(num x, num y, num width, num height) native;
- @DomName('CanvasRenderingContext2D.fillText')
- @DocsEditable()
- void fillText(String text, num x, num y, [num maxWidth]) native;
-
@DomName('CanvasRenderingContext2D.getContextAttributes')
@DocsEditable()
// http://wiki.whatwg.org/wiki/CanvasOpaque#Suggested_IDL
@@ -1750,6 +1746,29 @@ class CanvasRenderingContext2D extends CanvasRenderingContext native "CanvasRend
void set lineDashOffset(num value) => JS('void',
'typeof #.lineDashOffset != "undefined" ? #.lineDashOffset = # : '
'#.webkitLineDashOffset = #', this, this, value, this, value);
+
+ /**
+ * Draws text to the canvas.
+ *
+ * The text is drawn starting at coordinates ([x], [y]).
+ * If [maxWidth] is provided and the [text] is computed to be wider than
+ * [maxWidth], then the drawn text is scaled down horizontally to fit.
+ *
+ * The text uses the current [CanvasRenderingContext2D.font] property for font
+ * options, such as typeface and size, and the current
+ * [CanvasRenderingContext2D.fillStyle] for style options such as color.
+ * The current [CanvasRenderingContext2D.textAlign] and
+ * [CanvasRenderingContext2D.textBaseLine] properties are also applied to the
+ * drawn text.
+ */
+ @DomName('CanvasRenderingContext2D.fillText')
+ void fillText(String text, num x, num y, [num maxWidth]) {
+ if (maxWidth != null) {
+ JS('void', '#.fillText(#, #, #, #)', this, text, x, y, maxWidth);
+ } else {
+ JS('void', '#.fillText(#, #, #)', this, text, x, y);
+ }
+ }
}
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
« no previous file with comments | « no previous file | tests/html/canvasrenderingcontext2d_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698