[Gnash-commit] gnash ChangeLog server/movie_root.cpp server/mo...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/23 17:47:11

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp movie_root.h 
        testsuite/actionscript.all: Stage.as 

Log message:
                * server/movie_root.{cpp,h}: Drop _allowRescale (does more
                  harm then a rebuild); broadcast a Stage.onResize event when
                  scaleMode is set to noScale (from something else).
                * testsuite/actionscript.all/Stage.as: XPASS the totals.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6369&r2=1.6370
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.185&r2=1.186
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Stage.as?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6369
retrieving revision 1.6370
diff -u -b -r1.6369 -r1.6370
--- ChangeLog   23 Apr 2008 17:36:10 -0000      1.6369
+++ ChangeLog   23 Apr 2008 17:47:09 -0000      1.6370
@@ -1,5 +1,12 @@
 2008-04-23 Sandro Santilli <address@hidden>
 
+       * server/movie_root.{cpp,h}: Drop _allowRescale (does more
+         harm then a rebuild); broadcast a Stage.onResize event when
+         scaleMode is set to noScale (from something else).
+       * testsuite/actionscript.all/Stage.as: XPASS the totals.
+
+2008-04-23 Sandro Santilli <address@hidden>
+
        * server/movie_root.cpp (set_display_viewport): use _scaleMode,
          not the deprecated (and unmaintained) _allowRescale.
          The latter should be dropped, just didn't feel like changing

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- server/movie_root.cpp       23 Apr 2008 17:36:11 -0000      1.185
+++ server/movie_root.cpp       23 Apr 2008 17:47:10 -0000      1.186
@@ -1311,13 +1311,12 @@
 
     _scaleMode = sm;
     if (interfaceHandle) (*interfaceHandle)("Stage.align", "");    
-#if 0
-    if ( _scaleMode = noScale ) 
+
+    if ( _scaleMode == noScale ) 
     {
         boost::intrusive_ptr<Stage> stage = getStageObject();
         if ( stage ) stage->onResize();
     }
-#endif
 }
 
 
@@ -1995,12 +1994,14 @@
     os.str("");
     os << m_pixel_scale;
     localIter = tr.append_child(it, StringPair("Pixel scale", os.str()));
-#endif
 
     /// Stage: scaling allowed.
     localIter = tr.append_child(it, StringPair("Scaling allowed",
                 _allowRescale ? yes : no));
 
+    //  TODO: add _scaleMode, _valign and _haling info
+#endif
+
     // Stage: scripts state (enabled/disabled)
     localIter = tr.append_child(it, StringPair("Scripts",
                 _disableScripts ? " disabled" : "enabled"));

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- server/movie_root.h 23 Apr 2008 16:43:35 -0000      1.125
+++ server/movie_root.h 23 Apr 2008 17:47:10 -0000      1.126
@@ -514,16 +514,6 @@
         STAGE_V_ALIGN_B
     };    
 
-    /// Set whether rescaling is allowed or not.
-    //
-    /// When rescaling is not allowed the Stage listeners
-    /// will get notified on any resize attempt.
-    ///
-    bool isRescalingAllowed()
-    {
-        return (_allowRescale != noScale);
-    }
-
     void setStageAlignment(StageHorizontalAlign v, StageVerticalAlign h);
 
     typedef std::pair<StageHorizontalAlign, StageVerticalAlign> StageAlign;
@@ -888,10 +878,6 @@
     ///
     bool fire_mouse_event();
 
-    /// If set to false, no rescale should be performed
-    /// when changing viewport size
-    bool _allowRescale;
-
     /// \brief
     /// Return the topmost entity covering the given point
     /// and enabled to receive mouse events.

Index: testsuite/actionscript.all/Stage.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Stage.as,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- testsuite/actionscript.all/Stage.as 23 Apr 2008 17:04:33 -0000      1.28
+++ testsuite/actionscript.all/Stage.as 23 Apr 2008 17:47:11 -0000      1.29
@@ -21,7 +21,7 @@
 // execute it like this gnash -1 -r 0 -v out.swf
 
 
-rcsid="$Id: Stage.as,v 1.28 2008/04/23 17:04:33 bwy Exp $";
+rcsid="$Id: Stage.as,v 1.29 2008/04/23 17:47:11 strk Exp $";
 #include "check.as"
 
 check_equals (typeof(Stage), 'object');
@@ -155,9 +155,8 @@
 
 
 #if OUTPUT_VERSION > 5
- // gnash is supposed to send an onResize event everytime scaleMode is set to 
"noScale"
- // (w/out user interaction). pp will run 48 tests due to a test in the 
onResize handler.
- xcheck_totals(48);
+ // an onResize event everytime scaleMode is set to "noScale" (from a 
different value)
+ check_totals(48);
 #else
  check_totals(32);
 #endif