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

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: 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
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 ec9e4c41606952cc9122272346187a92d483c126..69dcdf6ceca5cea2b43f476cdd75cb8ad574705a 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -1365,9 +1365,10 @@ class CanvasRenderingContext2D extends CanvasRenderingContext native "CanvasRend
@DocsEditable()
void fillRect(num x, num y, num width, num height) native;
+ @JSName('fillText')
@DomName('CanvasRenderingContext2D.fillText')
@DocsEditable()
- void fillText(String text, num x, num y, [num maxWidth]) native;
+ void _fillText(String text, num x, num y, [num maxWidth]) native;
@DomName('CanvasRenderingContext2D.getContextAttributes')
@DocsEditable()
@@ -1750,8 +1751,30 @@ 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) {
+ _fillText(text, x, y, maxWidth);
+ } else {
+ _fillText(text, x, y);
+ }
+ }
+}
// 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
// BSD-style license that can be found in the LICENSE file.

Powered by Google App Engine
This is Rietveld 408576698