[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2264-g051aa9c

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  051aa9c34b69e1a0a1d2d75e3cf1db07fcea4006 (commit)
       via  fbb3037d4c25c8b0424035a71cc73d6520258cb4 (commit)
       via  65e212abe83824c01cfc47a8fd194f878d55f6ea (commit)
       via  87b25aeebc1cc2ba9037f23db37d41b51965a40a (commit)
      from  b74d6b87e5d276326d20a44456874d548d1fe658 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=051aa9c34b69e1a0a1d2d75e3cf1db07fcea4006


commit 051aa9c34b69e1a0a1d2d75e3cf1db07fcea4006
Author: Nutchanon Wetchasit <address@hidden>
Date:   Mon Feb 15 11:29:07 2016 +0100

    Remove string-based ExternalInterface return value check from player.
    
    See bug #47004 <https://savannah.gnu.org/bugs/?47004>

diff --git a/libcore/asobj/flash/external/ExternalInterface_as.cpp 
b/libcore/asobj/flash/external/ExternalInterface_as.cpp
index 56274bc..9bf2564 100644
--- a/libcore/asobj/flash/external/ExternalInterface_as.cpp
+++ b/libcore/asobj/flash/external/ExternalInterface_as.cpp
@@ -1,7 +1,7 @@
 // ExternalInterface_as.cpp:  ActionScript "ExternalInterface" class, for 
Gnash.
 //
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-//   Free Software Foundation, Inc
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+//   2015, 2016 Free Software Foundation, Inc
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -294,13 +294,7 @@ externalinterface_call(const fn_call& fn)
         std::string result = mr.callExternalJavascript(methodName, args);
         if (!result.empty()) {
             val = ExternalInterface::parseXML(result);
-            // There was an error trying to Invoke the callback
-            if (result == ExternalInterface::makeString("Error")
-                || (result == ExternalInterface::makeString("SecurityError"))) 
{
-                log_trace(_("VAL: %s"), val);
-                val.set_undefined();
-            }
-        } 
+        }
     }
     
     return val;

http://git.savannah.gnu.org/cgit//commit/?id=fbb3037d4c25c8b0424035a71cc73d6520258cb4


commit fbb3037d4c25c8b0424035a71cc73d6520258cb4
Author: Nutchanon Wetchasit <address@hidden>
Date:   Mon Feb 15 11:28:03 2016 +0100

    Send undefined value to player when plugin's JavaScript function invocation 
failed.
    
    See bug #47004 <https://savannah.gnu.org/bugs/?47004>

diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index 3c6f423..c0d5b2b 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -1,6 +1,6 @@
 // 
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-//   Free Software Foundation, Inc
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+//   2016 Free Software Foundation, Inc
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -949,14 +949,9 @@ nsPluginInstance::processPlayerRequest()
         }
         // We got a result from invoking the Javascript method
         std::stringstream ss;
-        if (invokeResult) {
-            ss << plugin::ExternalInterface::convertNPVariant(&result);
-            NPN_ReleaseVariantValue(&result);
-        } else {
-            // Send response
-            // FIXME: "securityError" also possible, check domain
-            ss << plugin::ExternalInterface::makeString("Error");
-        }
+
+        ss << plugin::ExternalInterface::convertNPVariant(&result);
+        NPN_ReleaseVariantValue(&result);
         size_t ret = _scriptObject->writePlayer(ss.str());
         if (ret != ss.str().size()) {
             log_error("Couldn't write the response to Gnash, network 
problems.");

http://git.savannah.gnu.org/cgit//commit/?id=65e212abe83824c01cfc47a8fd194f878d55f6ea


commit 65e212abe83824c01cfc47a8fd194f878d55f6ea
Author: Nutchanon Wetchasit <address@hidden>
Date:   Mon Feb 15 11:27:35 2016 +0100

    Marshall undefined value in ExternalInterface communication as "<void/>".
    
    See bug #47004 <https://savannah.gnu.org/bugs/?47004>

diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 3f24c95..8801696 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -1,7 +1,7 @@
 // ExternalInterface.cpp:  ActionScript "ExternalInterface" support
 //
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-//   Free Software Foundation, Inc
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+//   2015, 2016 Free Software Foundation, Inc
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -115,7 +115,7 @@ ExternalInterface::_toXML(const as_value &val)
     } else if (val.is_number()) {
         ss << "<number>" << val.to_string() << "</number>";
     } else if (val.is_undefined()) {
-        ss << "<undefined/>";
+        ss << "<void/>";
     } else if (val.is_null()) {
         ss << "<null/>";
         // Exception isn't listed in any docs, but we'll use it for
diff --git a/testsuite/misc-mtasc.all/extcommtests-runner.sh 
b/testsuite/misc-mtasc.all/extcommtests-runner.sh
index 8cc8fba..80cd550 100644
--- a/testsuite/misc-mtasc.all/extcommtests-runner.sh
+++ b/testsuite/misc-mtasc.all/extcommtests-runner.sh
@@ -232,14 +232,14 @@ echo '<invoke name="script_nothis1" 
returntype="xml"><arguments></arguments></in
 
 # Read for callback return value statement
 read_timeout LINE \$READTIMEOUT <&3
-check_equals "\$LINE" '<undefined/>' "Gnash should return a correct value from 
script_nothis1 ExternalInterface callback"
+check_equals "\$LINE" '<void/>' "Gnash should return a correct value from 
script_nothis1 ExternalInterface callback"
 
 # Call the script_nothis2 callback
 echo '<invoke name="script_nothis2" 
returntype="xml"><arguments></arguments></invoke>' >&4
 
 # Read for callback return value statement
 read_timeout LINE \$READTIMEOUT <&3
-check_equals "\$LINE" '<undefined/>' "Gnash should return a correct value from 
script_nothis2 ExternalInterface callback"
+check_equals "\$LINE" '<void/>' "Gnash should return a correct value from 
script_nothis2 ExternalInterface callback"
 
 # Call the script_longarglist callback
 echo '<invoke name="script_longarglist" 
returntype="xml"><arguments><string>The</string><string>quick</string><string>brown</string><string>fox</string><string>jumps</string><string>over</string><string>the</string><string>lazy</string><string>dog</string></arguments></invoke>'
 >&4

http://git.savannah.gnu.org/cgit//commit/?id=87b25aeebc1cc2ba9037f23db37d41b51965a40a


commit 87b25aeebc1cc2ba9037f23db37d41b51965a40a
Author: Nutchanon Wetchasit <address@hidden>
Date:   Mon Feb 15 11:26:56 2016 +0100

    Remove bogus ExternalInterface return value check from plugin.
    
    See bug #47004 <https://savannah.gnu.org/bugs/?47004>

diff --git a/plugin/npapi/callbacks.cpp b/plugin/npapi/callbacks.cpp
index 081c72d..9865018 100644
--- a/plugin/npapi/callbacks.cpp
+++ b/plugin/npapi/callbacks.cpp
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc
+//   Copyright (C) 2010, 2011, 2012, 2016 Free Software Foundation, Inc
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -699,19 +699,9 @@ remoteCallback (NPObject *npobj, NPIdentifier name, const 
NPVariant *args,
         return false;
     }
 
-    std::string answer;
     GnashNPVariant parsed = plugin::ExternalInterface::parseXML(data);
-    if (!NPVARIANT_IS_NULL(parsed.get())) {
-        answer = NPStringToString(NPVARIANT_TO_STRING(parsed.get()));
-    }
-    if (answer == "Error") {
-        NULL_TO_NPVARIANT(*result);
-    } else if (answer == "SecurityError") {
-        NULL_TO_NPVARIANT(*result);
-    } else {
-        parsed.copy(*result);
-    }
-    
+    parsed.copy(*result);
+
     // printNPVariant(&parsed.get());
 
     // Returning false makes Javascript stop executing the script.

-----------------------------------------------------------------------

Summary of changes:
 libcore/ExternalInterface.cpp                      |    6 +++---
 .../asobj/flash/external/ExternalInterface_as.cpp  |   12 +++---------
 plugin/npapi/callbacks.cpp                         |   16 +++-------------
 plugin/npapi/plugin.cpp                            |   15 +++++----------
 testsuite/misc-mtasc.all/extcommtests-runner.sh    |    4 ++--
 5 files changed, 16 insertions(+), 37 deletions(-)


hooks/post-receive
-- 
Gnash