[Gnash-commit] /srv/bzr/gnash/trunk r11700: Minor cleanups.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11700 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2009-12-16 07:54:57 +0100
message:
  Minor cleanups.
modified:
  libcore/TextField.cpp
  libcore/as_value.cpp
  libcore/vm/Machine.cpp

=== modified file 'libcore/TextField.cpp'
--- a/libcore/TextField.cpp     2009-12-08 08:47:03 +0000
+++ b/libcore/TextField.cpp     2009-12-15 16:05:28 +0000
@@ -268,19 +268,6 @@
 void
 TextField::init()
 {
-#if 0
-    as_environment env(getVM(*getObject(this)));
-    as_object* proto = env.find_object("_global.TextField.prototype");
-    if (proto) {
-        attachPrototypeProperties(*proto);
-    }
-     
-    getObject(this)->set_prototype(proto);
-
-    as_object* ar = getGlobal(*getObject(this)).createArray();
-    callMethod(ar, NSV::PROP_PUSH, getObject(this));
-    getObject(this)->set_member(NSV::PROP_uLISTENERS, ar);
-#endif
     registerTextVariable();
 
     reset_bounding_box(0, 0);
@@ -3539,6 +3526,8 @@
 as_value
 textfield_htmlText(const fn_call& fn)
 {
+    GNASH_REPORT_FUNCTION;
+
     TextField* ptr = ensure<IsDisplayObject<TextField> >(fn);
     if (!fn.nargs)
     {
@@ -3600,7 +3589,7 @@
         return as_value(1 + text->getScroll());
     }
     // Setter
-    text->setScroll(int(fn.arg(0).to_number()) - 1); //zero is the first 
number, everybody knows that.
+    text->setScroll(int(fn.arg(0).to_number()) - 1); 
 
     return as_value();
 }
@@ -3609,7 +3598,6 @@
 textfield_hscroll(const fn_call& fn)
 {
     TextField* text = ensure<IsDisplayObject<TextField> >(fn);
-    UNUSED(text);
 
     LOG_ONCE(log_unimpl("TextField._hscroll is not complete"));
 
@@ -3628,17 +3616,13 @@
 textfield_maxscroll(const fn_call& fn)
 {
     TextField* text = ensure<IsDisplayObject<TextField> >(fn);
-    UNUSED(text);
 
     LOG_ONCE(log_unimpl("TextField.maxscroll is not complete"));
 
-    if (!fn.nargs)
-    {
+    if (!fn.nargs) {
         // Getter
         return as_value(text->getMaxScroll());
     }
-    // Setter
-    //text->setMaxScroll(int(fn.arg(0).to_number())); READ-ONLY
 
     return as_value();
 }

=== modified file 'libcore/as_value.cpp'
--- a/libcore/as_value.cpp      2009-12-08 09:47:55 +0000
+++ b/libcore/as_value.cpp      2009-12-15 13:30:37 +0000
@@ -1495,7 +1495,7 @@
         case OBJECT:
         {
             if (is_function()) return false;
-            as_object* obj = to_object(*vm.getGlobal());
+            as_object* obj = getObj();
             assert(obj);
             OffsetTable::iterator it = offsetTable.find(obj);
             if (it == offsetTable.end()) {

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2009-12-07 12:16:50 +0000
+++ b/libcore/vm/Machine.cpp    2009-12-15 13:46:13 +0000
@@ -445,7 +445,6 @@
                     // Get the target object.
                     ENSURE_OBJECT(_stack.top(0));
                     
-                    // Use get_super?
                     as_object *super = _stack.top(0).to_object(*_global)->
                         get_prototype();
                     
@@ -478,7 +477,6 @@
 
                     ENSURE_OBJECT(_stack.top(0));
                     
-                    // Use get_super?
                     as_object* super = _stack.pop().to_object(*_global)->
                         get_prototype();
                     if (!super) throw ASReferenceError();
@@ -1366,7 +1364,7 @@
                     ENSURE_OBJECT(_stack.top(argc + dropsize));
                     _stack.drop(dropsize);
 
-                    // Why get_super() here and get_prototype everywhere else?
+                    // get_super is wrong!
                     as_object* super =
                         _stack.top(argc).to_object(*_global)->get_super();