CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/04 19:33:09
Modified files:
. : ChangeLog
server : edit_text_character.cpp
testsuite/actionscript.all: TextField.as
Log message:
* server/edit_text_character.cpp: support case-insensitive
htmlText property (for SWF6).
* testsuite/actionscript.all/TextField.as: fix expected results
(more successes, one failure which only worked by luck
before).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4216&r2=1.4217
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.21&r2=1.22
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4216
retrieving revision 1.4217
diff -u -b -r1.4216 -r1.4217
--- ChangeLog 4 Sep 2007 19:06:55 -0000 1.4216
+++ ChangeLog 4 Sep 2007 19:33:08 -0000 1.4217
@@ -1,5 +1,9 @@
2007-09-04 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/edit_text_character.cpp: support case-insensitive
+ htmlText property (for SWF6).
+ * testsuite/actionscript.all/TextField.as: fix expected results
+ (more successes, one failure which only worked by luck before).
* testsuite/anaylse-results.sh: print also unexpected successes.
2007-09-04 Asger Ottar Alstrup <[EMAIL PROTECTED]>
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- server/edit_text_character.cpp 4 Sep 2007 16:00:38 -0000 1.108
+++ server/edit_text_character.cpp 4 Sep 2007 19:33:08 -0000 1.109
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: edit_text_character.cpp,v 1.108 2007/09/04 16:00:38 meteoryte Exp $ */
+/* $Id: edit_text_character.cpp,v 1.109 2007/09/04 19:33:08 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -740,7 +740,7 @@
break;
case M_INVALID_MEMBER:
{
- if (name == "htmlText")
+ if (name == PROPNAME("htmlText"))
{ // Minimal parsing of HTML: Strip all tags
int version =
get_parent()->get_movie_definition()->get_version();
std::string html = val.to_string_versioned(version);
@@ -907,7 +907,7 @@
default:
break;
case M_INVALID_MEMBER:
- if (name == "htmlText") {
+ if (name == PROPNAME("htmlText")) {
val->set_string(get_text_value());
return true;
}
Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- testsuite/actionscript.all/TextField.as 31 Aug 2007 21:53:33 -0000
1.21
+++ testsuite/actionscript.all/TextField.as 4 Sep 2007 19:33:09 -0000
1.22
@@ -19,7 +19,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: TextField.as,v 1.21 2007/08/31 21:53:33 strk Exp $";
+rcsid="$Id: TextField.as,v 1.22 2007/09/04 19:33:09 strk Exp $";
#include "check.as"
@@ -284,20 +284,20 @@
// Check TextField.htmlText (the displayed text in explicit HTML)
-xcheck_equals(typeof(tf.htmlText), 'string');
+check_equals(typeof(tf.htmlText), 'string');
check(!tf.hasOwnProperty('htmlText'));
-xcheck_equals(tf.htmlText, '');
+check_equals(tf.htmlText, '');
tf.htmlText = new Array;
-xcheck_equals(typeof(tf.htmlText), 'string'); // forced cast to string
+check_equals(typeof(tf.htmlText), 'string'); // forced cast to string
xcheck_equals(tf.htmlText, '');
check_equals(tf.html, false);
tf.htmlText = "Hello <b>html</b> world";
check_equals(tf.html, false); // assigning to htmlText doesn't change the
'html' flag
-check_equals(tf.htmlText, 'Hello <b>html</b> world');
+xcheck_equals(tf.htmlText, 'Hello <b>html</b> world'); // gnash fails by
stripping the html tags
// Changing htmlText also changes text
-xcheck_equals(tf.text, 'Hello <b>html</b> world');
+xcheck_equals(tf.text, 'Hello <b>html</b> world'); // gnash likely succeeds
here, but strips html tags...
tf.text = "Hello world";
-xcheck_equals(tf.htmlText, 'Hello world');
+check_equals(tf.htmlText, 'Hello world');
// Check TextField.length (number of characters in text)
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
