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

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

Issue 898993002: Clamp scrollX, scrollY, pageXOffset, and pageYOffset from double to int (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 10 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 | sdk/lib/html/dartium/html_dartium.dart » ('j') | sdk/lib/html/dartium/html_dartium.dart » ('J')
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 1eb8613ce9f6496503366dd5e597a29f9cd4da01..5f588b7e24b0cb9a6cc5650060b703197e7b8d08 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -30603,6 +30603,7 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo
@DocsEditable()
final int outerWidth;
+ @JSName('pageXOffset')
/**
* The distance this window has been scrolled horizontally.
*
@@ -30617,8 +30618,9 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo
*/
@DomName('Window.pageXOffset')
@DocsEditable()
- final int pageXOffset;
+ final int _pageXOffset;
+ @JSName('pageYOffset')
/**
* The distance this window has been scrolled vertically.
*
@@ -30633,7 +30635,7 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo
*/
@DomName('Window.pageYOffset')
@DocsEditable()
- final int pageYOffset;
+ final int _pageYOffset;
@DomName('Window.parent')
@DocsEditable()
@@ -31749,6 +31751,14 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo
_moveTo(p.x, p.y);
}
+ @DomName('Window.pageXOffset')
+ @DocsEditable()
+ int get pageXOffset => JS('num', '#.pageXOffset', this).round();
+
+ @DomName('Window.pageYOffset')
+ @DocsEditable()
+ int get pageYOffset => JS('num', '#.pageYOffset', this).round();
+
/**
* The distance this window has been scrolled horizontally.
*
@@ -31759,8 +31769,11 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo
* * [scrollX]
* (https://developer.mozilla.org/en-US/docs/Web/API/Window.scrollX) from MDN.
*/
- int get scrollX => JS('bool', '("scrollX" in #)', this) ? JS('int',
- '#.scrollX', this) : document.documentElement.scrollLeft;
+ @DomName('Window.scrollX')
+ @DocsEditable()
+ int get scrollX => JS('bool', '("scrollX" in #)', this) ?
+ JS('num', '#.scrollX', this).round() :
+ document.documentElement.scrollLeft;
/**
* The distance this window has been scrolled vertically.
@@ -31772,8 +31785,11 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo
* * [scrollY]
* (https://developer.mozilla.org/en-US/docs/Web/API/Window.scrollY) from MDN.
*/
- int get scrollY => JS('bool', '("scrollY" in #)', this) ? JS('int',
- '#.scrollY', this) : document.documentElement.scrollTop;
+ @DomName('Window.scrollY')
+ @DocsEditable()
+ int get scrollY => JS('bool', '("scrollY" in #)', this) ?
+ JS('num', '#.scrollY', this).round() :
+ document.documentElement.scrollTop;
}
class _BeforeUnloadEvent extends _WrappedEvent implements BeforeUnloadEvent {
« no previous file with comments | « no previous file | sdk/lib/html/dartium/html_dartium.dart » ('j') | sdk/lib/html/dartium/html_dartium.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698