Make PostMessageToJavaScript use new WebKit API instead of script.

I added some JavaScript code to test_case.html that previously would have made PostMessage not function (which I verified). This depends on the following WebKit issue: https://bugs.webkit.org/show_bug.cgi?id=71478 BUG=82604 TEST=N/A Review URL: http://codereview.chromium.org/8437093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110513 0039d316-1c4b-4281-b951-d872f2087c98

Make PostMessageToJavaScript use new WebKit API instead of script.
I added some JavaScript code to test_case.html that previously would have made PostMessage not function (which I verified). This depends on the following WebKit issue: https://bugs.webkit.org/show_bug.cgi?id=71478 BUG=82604 TEST=N/A Review URL: http://codereview.chromium.org/8437093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110513 0039d316-1c4b-4281-b951-d872f2087c98
c4cc74ce · dmichael@chromium.org · b9c3e559 · c4cc74ce · c4cc74ce · c4cc74ce
Commit c4cc74ce authored Nov 17, 2011 by dmichael@chromium.org
3 changed files
--- a/ppapi/tests/test_case.html
+++ b/ppapi/tests/test_case.html
@@ -159,9 +159,31 @@ onload = function() {
    obj.setAttribute("protocol", window.location.protocol);
    var container = document.getElementById("container");
    container.addEventListener("message", handleTestingMessage, true);
+    // Register a bad dispatchEvent to make sure it isn't used. See 'EVIL' note
+    // below.
+    obj.dispatchEvent = function() {
+      LogHTML("<p>Bad dispatchEvent called!");
+    }
    container.appendChild(obj);
  }
 }
+
+// EVIL Note:
+// This part of the script does some nefarious things to make sure that it
+// doesn't affect the behavior of PostMessage (on which all the tests rely). In
+// particular, we replace document.createEvent, MessageEvent.initMessageEvent,
+// and the MessageEvent constructor. Previous versions of the PostMessage
+// implementation made use of these and would fail (http://crbug.com/82604).
+document.createEvent = function() {
+  LogHTML("<p>Bad document.createEvent called!");
+}
+function MessageEvent() {
+  LogHTML("<p>Bad MessageEvent constructor called!");
+}
+MessageEvent.prototype.initMessageEvent = function() {
+  LogHTML("<p>Bad MessageEvent.initMessageEvent called!");
+}
+
 </script>
 </head><body>
 <div>

--- a/webkit/plugins/ppapi/message_channel.cc
+++ b/webkit/plugins/ppapi/message_channel.cc
--- a/webkit/plugins/ppapi/message_channel.h
+++ b/webkit/plugins/ppapi/message_channel.h
@@ -10,6 +10,9 @@
 #include "third_party/npapi/bindings/npruntime.h"

 struct PP_Var;
+namespace WebKit {
+class WebSerializedScriptValue;
+}

 namespace webkit {
 namespace ppapi {
@@ -80,18 +83,10 @@ class MessageChannel {
  // The NPObject we use to expose postMessage to JavaScript.
  MessageChannelNPObject* np_object_;

-  // An NPVariant referring to the JavaScript function we use to send a message
-  // to a JavaScript target.
-  NPVariant onmessage_invoker_;
-
-  // Evaluates the JavaScript code for onmessage_invoker_ and makes
-  // it a callable NPVariant for that function.  Returns true on success, false
-  // otherwise.
-  bool EvaluateOnMessageInvoker();
-
  // Post a message to the onmessage handler for this channel's instance
  // synchronously.  This is used by PostMessageToJavaScript.
-  void PostMessageToJavaScriptImpl(PP_Var message_data);
+  void PostMessageToJavaScriptImpl(
+      const WebKit::WebSerializedScriptValue& message_data);
  // Post a message to the PPP_Instance HandleMessage function for this
  // channel's instance.  This is used by PostMessageToNative.
  void PostMessageToNativeImpl(PP_Var message_data);