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

Unified Diff: client/dom/src/frog_DOMImplementation.dart

Issue 9539003: Safely wrap window.top in frog dom. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments and merge Created 8 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/dom/scripts/systemfrog.py ('k') | client/dom/templates/dom/frog/frog_dom.darttemplate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/dom/src/frog_DOMImplementation.dart
diff --git a/client/dom/templates/dom/frog/impl_HTMLIFrameElement.darttemplate b/client/dom/src/frog_DOMImplementation.dart
similarity index 51%
copy from client/dom/templates/dom/frog/impl_HTMLIFrameElement.darttemplate
copy to client/dom/src/frog_DOMImplementation.dart
index 8cbdf855618aedea1b41e6d0b3165cba0c8b34f6..f0b006686841f09cd305f6a293914871e81f3eae 100644
--- a/client/dom/templates/dom/frog/impl_HTMLIFrameElement.darttemplate
+++ b/client/dom/src/frog_DOMImplementation.dart
@@ -2,17 +2,6 @@
// 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.
-class $CLASSNAME$EXTENDS$IMPLEMENTS$NATIVESPEC {
-$!MEMBERS
-
- Window get _contentWindow() native "return this.contentWindow;";
-
- // Override contentWindow to return secure wrapper.
- Window get contentWindow() {
- return _DOMWindowCrossFrameImpl._createSafe(_contentWindow);
- }
-}
-
// TODO(vsm): Unify with Dartium version.
class _DOMWindowCrossFrameImpl implements DOMType, DOMWindow {
// Private window.
@@ -23,28 +12,20 @@ class _DOMWindowCrossFrameImpl implements DOMType, DOMWindow {
String get typeName() => "DOMWindow";
// Fields.
- // TODO(vsm): Wrap these two.
- History get history() => _window.history;
- Location get location() => _window.location;
+ // TODO(vsm): Implement history and location getters.
bool get closed() => _window.closed;
int get length() => _window.length;
- DOMWindow get opener() => _createDOMWindowCrossFrame(_window.opener);
- DOMWindow get parent() => _createDOMWindowCrossFrame(_window.parent);
- DOMWindow get top() => _createDOMWindowCrossFrame(_window.top);
+ DOMWindow get opener() => _createSafe(_window.opener);
+ DOMWindow get parent() => _createSafe(_window.parent);
+ DOMWindow get top() => _createSafe(_window.top);
// Methods.
- void focus() {
- _window.focus();
- }
+ void focus() => _window.focus();
- void blur() {
- _window.blur();
- }
+ void blur() => _window.blur();
- void close() {
- _window.close();
- }
+ void close() => _window.close();
void postMessage(Dynamic message,
String targetOrigin,
@@ -60,9 +41,11 @@ class _DOMWindowCrossFrameImpl implements DOMType, DOMWindow {
_DOMWindowCrossFrameImpl(this._window);
static DOMWindow _createSafe(w) {
- // TODO(vsm): Check if it's the top-level window. Return unwrapped.
-
- // TODO(vsm): Cache or implement equality.
- return new _DOMWindowCrossFrameImpl(w);
+ if (w === window) {
+ return w;
+ } else {
+ // TODO(vsm): Cache or implement equality.
+ return new _DOMWindowCrossFrameImpl(w);
+ }
}
}
« no previous file with comments | « client/dom/scripts/systemfrog.py ('k') | client/dom/templates/dom/frog/frog_dom.darttemplate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698