[Gnash-commit] /srv/bzr/gnash/trunk r11419: Modified TextField.cpp url case and modified MovieClip_as.hx to pass all tests in the pp

[Sharad Desai]

------------------------------------------------------------
revno: 11419 [merge]
committer: Sharad Desai <address@hidden>
branch nick: trunk
timestamp: Thu 2009-08-13 12:15:52 -0600
message:
  Modified TextField.cpp url case and modified MovieClip_as.hx to pass all 
tests in the pp
modified:
  libcore/TextField.cpp
  testsuite/misc-haxe.all/classes.all/display/MovieClip_as.hx

=== modified file 'libcore/TextField.cpp'
--- a/libcore/TextField.cpp     2009-08-12 17:03:54 +0000
+++ b/libcore/TextField.cpp     2009-08-13 18:14:55 +0000
@@ -606,55 +606,9 @@
                                        }
                        }
                        
-                       std::string target = rec.getTarget();
-                       
-                       for (size_t i=0; i < target.size(); ++i) {
-                               target[i] = toupper(target[i]);
-                       }       
-                       
-                       if ( target[0] == '_' ) {
-                               target.erase(0);
-                       }
-                       
-                       // Resolve compiler warning: system returns an int
-                       int s = 0;
-                       
-                       log_debug("url: %s", rec.getURL());
-                       log_debug("target: %s", target);
-                       
-                       std::string call = "";
-                       
-                       if ( rec.getURL()!="" ) {
-                               if (target == "BLANK") {
-                                       call = "firefox " + rec.getURL() + "&";
-                                       s = system(call.data());
-                               }
-                               
-                               else if (target == "PARENT") {
-                                       call = "firefox " + rec.getURL() + "&";
-                                       s = system(call.data());
-                                       
-                                       LOG_ONCE( log_unimpl("Setting target to 
'parent' --"
-                                                               " will default 
to 'blank'") );
-                               }
-                               
-                               else if (target == "TOP") {
-                                       call = "firefox " + rec.getURL() + "&";
-                                       s = system(call.data());
-                                       
-                                       LOG_ONCE( log_unimpl("Setting target to 
'top' --"
-                                                               " will default 
to 'blank'") );
-                               }
-                               
-                               else if (target == "SELF" || target == "")      
{
-                                       call = "firefox " + rec.getURL() + "&";
-                                       s = system(call.data());
-                                       
-                                       LOG_ONCE( log_debug("If target not 
specified -- "
-                                                               "will default 
to 'self'") );
-                                       LOG_ONCE( log_unimpl("Setting target to 
'self' --"
-                                                               " will default 
to 'blank'") );
-                               }
+                       if (!rec.getURL().empty()) {
+                                  root.getURL(rec.getURL(), rec.getTarget(), 
"",
+                                                               
MovieClip::METHOD_NONE);
                        }
 
                        break;

=== modified file 'testsuite/misc-haxe.all/classes.all/display/MovieClip_as.hx'
--- a/testsuite/misc-haxe.all/classes.all/display/MovieClip_as.hx       
2009-06-15 21:38:58 +0000
+++ b/testsuite/misc-haxe.all/classes.all/display/MovieClip_as.hx       
2009-08-13 18:14:55 +0000
@@ -385,11 +385,28 @@
        } else {
            DejaGnu.fail("MovieClip::attachAudio method doesn't exist");
        }
+#if !(flash6 || flash7)
        if (Type.typeof(x1.attachBitmap) == ValueType.TFunction) {
            DejaGnu.pass("MovieClip::attachBitmap() method exists");
        } else {
            DejaGnu.fail("MovieClip::attachBitmap() method doesn't exist");
        }
+       if (Type.typeof(x1.beginBitmapFill) == ValueType.TFunction) {
+           DejaGnu.pass("MovieClip::beginBitmapFill() method exists");
+       } else {
+           DejaGnu.fail("MovieClip::beginBitmapFill() method doesn't exist");
+       }
+       if (Type.typeof(x1.getRect) == ValueType.TFunction) {
+           DejaGnu.pass("MovieClip::getRect() method exists");
+       } else {
+           DejaGnu.fail("MovieClip::getRect() method doesn't exist");
+       }
+       if (Type.typeof(x1.lineGradientStyle) == ValueType.TFunction) {
+           DejaGnu.pass("MovieClip::lineGradientStyle method exists");
+       } else {
+           DejaGnu.fail("MovieClip::lineGradientStyle method doesn't exist");
+       }
+#end
        if (Type.typeof(x1.attachMovie) == ValueType.TFunction) {
            DejaGnu.pass("MovieClip::attachMovie() method exists");
        } else {
@@ -400,11 +417,7 @@
        } else {
            DejaGnu.fail("MovieClip::attachVideo() method doesn't exist");
        }
-       if (Type.typeof(x1.beginBitmapFill) == ValueType.TFunction) {
-           DejaGnu.pass("MovieClip::beginBitmapFill() method exists");
-       } else {
-           DejaGnu.fail("MovieClip::beginBitmapFill() method doesn't exist");
-       }
+
        if (Type.typeof(x1.beginFill) == ValueType.TFunction) {
            DejaGnu.pass("MovieClip::beginFill() method exists");
        } else {
@@ -477,11 +490,6 @@
            DejaGnu.fail("MovieClip::getNextHighestDepth method doesn't exist");
        }
 #end
-       if (Type.typeof(x1.getRect) == ValueType.TFunction) {
-           DejaGnu.pass("MovieClip::getRect() method exists");
-       } else {
-           DejaGnu.fail("MovieClip::getRect() method doesn't exist");
-       }
        if (Type.typeof(x1.getSWFVersion) == ValueType.TFunction) {
            DejaGnu.pass("MovieClip::getSWFVersion() method exists");
        } else {
@@ -517,11 +525,6 @@
        } else {
            DejaGnu.fail("MovieClip::hitTest() method doesn't exist");
        }
-       if (Type.typeof(x1.lineGradientStyle) == ValueType.TFunction) {
-           DejaGnu.pass("MovieClip::lineGradientStyle method exists");
-       } else {
-           DejaGnu.fail("MovieClip::lineGradientStyle method doesn't exist");
-       }
        if (Type.typeof(x1.lineStyle) == ValueType.TFunction) {
            DejaGnu.pass("MovieClip::lineStyle() method exists");
        } else {