Fixes CFInstance to use a longer Deferred standard timeout. Short timeouts ca...

chrome_frame/CFInstance.js

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Parts Copyright 2005-2009, the Dojo Foundation. Used under the terms of the
 // "New" BSD License:
 //
 //  http://download.dojotoolkit.org/release-1.3.2/dojo-release-1.3.2/dojo/LICENSE
 //
 
@@ skipping 583 matching lines @@
     this.results = [ null, null ];
     this.canceller = canceller;
     // FIXME(slightlyoff): is it really smart to be creating this many timers?
     if (typeof timeout == 'number') {
       if (timeout <= 0) {
         timeout = 216000;  // give it an hour
       }
     }
     this._timer = setTimeout(
                     hitch(this, 'errback', new Error('timeout')), 
-                    (timeout || 1000)
+                    (timeout || 10000)
                   );
     this.silentlyCancelled = false;
   };
 
   /**
    * Cancels a Deferred that has not yet received a value, or is waiting on
    * another Deferred as its value. If a canceller is defined, the canceller
    * is called. If the canceller did not return an error, or there was no
    * canceller, then the errback chain is started.
    * @public
@@ skipping 159 matching lines @@
   /** 
    * Used internally to exhaust the callback sequence when a result is
    * available.
    * @private
    */
   Deferred.prototype._fire = function() {
     var chain = this.chain;
     var fired = this.fired;
     var res = this.results[fired];
     var cb = null;
-    while ((chain.length > 0) && (this.paused == 0)) {
+    while ((chain.length) && (!this.paused)) {
       var f = chain.shift()[fired];
       if (!f) {
         continue;
       }
       var func = hitch(this, function() {
         var ret = f(res);
         //If no response, then use previous response.
         if (typeof ret != undefStr) {
           res = ret;
         }
@@ skipping 394 matching lines @@
 
     if (instance['tagName']) {
       instance.listen('load', sendLoadMsg);
     } else {
       sendLoadMsg();
     }
   };
 
   RPC.prototype._postMessageBacklog = function() {
     if (this._open) {
-      forEach(this._msgBacklog, this._postMessage, this);
-      this._msgBacklog = [];
+      // forEach(this._msgBacklog, this._postMessage, this);
+      // this._msgBacklog = [];

[ananta, 2009/12/09 01:08:28]

Please delete these lines

+      while (this._msgBacklog.length) {
+        var msg = this._msgBacklog.shift();
+        this._postMessage(msg);
+      }
     }
   };
 
   RPC.prototype._postMessage = function(msg, force) {
     if (!force && !this._open) {
       this._msgBacklog.push(msg);
     } else {
       // FIXME(slightlyoff): need to check domains list here!
       this.instance.postMessage(msgPrefix + msg, '*');
     }
   };
 
-  // currently no-ops. We may need them in the future
-  // RPC.prototype._doWithAck_load = function() { };

[ananta, 2009/12/09 01:08:28]

Remove?

-  // RPC.prototype._doWithAck_init = function() { };
-
   RPC.prototype._doWithAck = function(what) {
-    var f = this['_doWithAck_' + what];
-    if (f) {
-      f.call(this);
-    }

[ananta, 2009/12/09 01:08:28]

Ditto

-
     this._postMessage('doWithAckCallback:' + what, what == 'load');
   };
 
   RPC.prototype.doWithAck = function(what) {
     var d = new Deferred();
     this._doWithAckCallbacks[what] = d;
     this._postMessage('doWithAck:' + what, what == 'load');
     return d;
   };
 
@@ skipping 414 matching lines @@
   CFInstance.fromJson = fromJson;
   CFInstance.log = log;
 
   // expose CFInstance to the external scope. We've already checked to make
   // sure we're not going to blow existing objects away.
   scope.CFInstance = CFInstance;
 
 })( this['ChromeFrameScope'] || this );
 
 // vim: shiftwidth=2:et:ai:tabstop=2