[Laszlo-checkins] r13215 - in openlaszlo/trunk/WEB-INF/lps/lfc/kernel: dhtml swf

[bargull@openlaszlo.org]

Author: bargull
Date: 2009-03-08 09:59:35 -0700 (Sun, 08 Mar 2009)
New Revision: 13215

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzMediaLoader.lzs
Log:
Change 20090308-bargull-LE2 by bargull at dell--p4--2-53 on 2009-03-08 13:53:25
    in /home/Admin/src/svn/openlaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: media-loading: fix mem-leak in LzMediaLoader, don't set loadratio/framesloadration to 1

New Features:

Bugs Fixed: LPP-7875 (SWF8 media load which fails should not send onloadratio onframeloadratio events), LPP-7876 (swf8 media load which fails leaves a delegate on the idle queue)

Technical Reviewer: hminsky
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
LPP-7875 (swf8), LPP-7876: override "returnData()" to call "removeLoadChecker()"
LPP-7875 (dhtml): maybe a braino? call "__updateLoadStatus(0)" instead of "__updateLoadStatus(1)"

    

Tests:
testcases at bugreport



Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js	2009-03-08 13:02:18 UTC (rev 13214)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js	2009-03-08 16:59:35 UTC (rev 13215)
@@ -1427,7 +1427,7 @@
     this.owner.resourceloaderror();
     if (this.skiponload != true){
         // for user-loaded media
-        this.__updateLoadStatus(1);
+        this.__updateLoadStatus(0);
     }
     if (this.quirks.ie_alpha_image_loader) {
         this.__clearImageEvents(this.__LZimg);
@@ -1464,7 +1464,7 @@
     this.owner.resourceloadtimeout();
     if (this.skiponload != true){
         // for user-loaded media
-        this.__updateLoadStatus(1);
+        this.__updateLoadStatus(0);
     }
     if (this.quirks.ie_alpha_image_loader) {
         this.__clearImageEvents(this.__LZimg);

Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzMediaLoader.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzMediaLoader.lzs	2009-03-08 13:02:18 UTC (rev 13214)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzMediaLoader.lzs	2009-03-08 16:59:35 UTC (rev 13215)
@@ -1,7 +1,7 @@
 /**
   * LzMediaLoader.as
   *
-  * @copyright Copyright 2001-2008 Laszlo Systems, Inc.  All Rights Reserved.
+  * @copyright Copyright 2001-2009 Laszlo Systems, Inc.  All Rights Reserved.
   *            Use is subject to license terms.
   *
   * @topic Kernel
@@ -288,14 +288,10 @@
                 if (loaded) {
                     //if mc.loaded is set, means returnData has already been called
                     //(probably by error swf.)
-                    var loaddone = false;
-                    if (! this.mc.loaded) {
-                        this.removeLoadChecker();
-                        loaddone = true;
-                    }
+                    var loaddone = (! this.mc.loaded);
 
                     // TODO: [20080909 anba] send always for crossdomain loading?
-                    if (! this.mc.loaded || xdomain) {
+                    if (loaddone || xdomain) {
                         // remove request from LzLoadQueue
                         this.returnData( this.mc );
                     }
@@ -316,6 +312,14 @@
 /**
   * @access private
   */
+override function returnData (loadobj, data) {
+    this.removeLoadChecker();
+    super.returnData(loadobj, data);
+}
+
+/**
+  * @access private
+  */
 override function unload (loadobj) {
     super.unload(loadobj);