projects / platform / framework / web / crosswalk-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 606fb06)
Make window.opener a BrowserWindowProxy
authorKevin Sawicki <kevinsawicki@gmail.com>
Mon, 14 Dec 2015 22:55:48 +0000 (14:55 -0800)
committerKevin Sawicki <kevinsawicki@gmail.com>
Mon, 14 Dec 2015 22:55:48 +0000 (14:55 -0800)
atom/renderer/lib/override.coffee patch | blob | history
spec/chromium-spec.coffee patch | blob | history
spec/fixtures/pages/window-open-postMessage.html patch | blob | history

diff --git a/atom/renderer/lib/override.coffee b/atom/renderer/lib/override.coffee
index 333acc8..3b741e0 100644 (file)
--- a/atom/renderer/lib/override.coffee
+++ b/atom/renderer/lib/override.coffee
@@ -94,9 +94,10 @@ window.prompt = ->
 # Implement window.postMessage if current window is a guest window.
 guestId = ipcRenderer.sendSync 'ATOM_SHELL_GUEST_WINDOW_MANAGER_GET_GUEST_ID'
 if guestId?
-  window.opener =
-    postMessage: (message, targetOrigin='*') ->
-      ipcRenderer.send 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPENER_POSTMESSAGE', guestId, message, targetOrigin, location.origin
+  window.opener = BrowserWindowProxy.getOrCreate(guestId)
+  Object.setPrototypeOf(window.opener, null)
+  window.opener.postMessage = (message, targetOrigin='*') ->
+    ipcRenderer.send 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPENER_POSTMESSAGE', guestId, message, targetOrigin, location.origin
 
 ipcRenderer.on 'ATOM_SHELL_GUEST_WINDOW_POSTMESSAGE', (event, guestId, message, sourceOrigin) ->
   # Manually dispatch event instead of using postMessage because we also need to
diff --git a/spec/chromium-spec.coffee b/spec/chromium-spec.coffee
index 2cc2237..e6ae8a7 100644 (file)
--- a/spec/chromium-spec.coffee
+++ b/spec/chromium-spec.coffee
@@ -120,7 +120,10 @@ describe 'chromium feature', ->
       listener = (event) ->
         window.removeEventListener 'message', listener
         b.close()
-        assert.equal event.data, 'file://testing'
+        message = JSON.parse(event.data)
+        assert.equal message.data, 'testing'
+        assert.equal message.origin, 'file://'
+        assert.equal message.sourceEqualsOpener, true
         assert.equal event.origin, 'file://'
         done()
       window.addEventListener 'message', listener
diff --git a/spec/fixtures/pages/window-open-postMessage.html b/spec/fixtures/pages/window-open-postMessage.html
index e547fa2..550b61b 100644 (file)
--- a/spec/fixtures/pages/window-open-postMessage.html
+++ b/spec/fixtures/pages/window-open-postMessage.html
@@ -2,7 +2,12 @@
 <body>
 <script type="text/javascript" charset="utf-8">
   window.addEventListener('message', function (e) {
-    window.opener.postMessage(e.origin + e.data, '*');
+    var reply = JSON.stringify({
+      origin: e.origin,
+      data: e.data,
+      sourceEqualsOpener: e.source === window.opener
+    })
+    window.opener.postMessage(reply, '*');
   });
 </script>
 </body>
Domain: Web Framework / Web Runtime;