From de0ad598e5df1b683bdf7d9d256f9372416a6c32 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 8 Sep 2011 16:42:06 -0400
Subject: [PATCH] Fix rehash on FF6.

---
 common/modules/dom.jsm  |  9 +++++++++
 common/modules/main.jsm | 10 +++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 06864b77..f1601511 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -770,6 +770,15 @@ var DOM = Class("DOM", {
                         continue;
 
                     force = Math.round(isect.width - rect.width) || Math.round(isect.height - rect.height);
+                    let vp = parent.viewport;
+                    if (force)
+                        util.dump(vp,
+                                  rect.left - vp.left,
+                                  rect.right - vp.right,
+                                  rect.top - vp.top,
+                                  rect.bottom - vp.bottom,
+                                  isect.width - rect.width, isect.height - rect.height,
+                                  parent[0]);
                     if (force)
                         break;
                 }
diff --git a/common/modules/main.jsm b/common/modules/main.jsm
index 65dcca7c..cbb2d30a 100644
--- a/common/modules/main.jsm
+++ b/common/modules/main.jsm
@@ -12,7 +12,7 @@ defineModule("main", {
     require: ["config", "help", "highlight", "io", "overlay", "services", "util"]
 }, this);
 
-const BASE = "resource://dactyl-content/";
+var BASE = "resource://dactyl-content/";
 
 /**
  * @class ModuleBase
@@ -56,10 +56,10 @@ var Modules = function Modules(window) {
      *     module constructor.
      *     @optional
      * @param {Object} moduleInit The module initialization functions
-     *     for the new module. Each function is called as soon as the named module
-     *     has been initialized, but after the module itself. The constructors are
-     *     guaranteed to be called in the same order that the dependent modules
-     *     were initialized.
+     *     for the new module. Each function is called as soon as the
+     *     named module has been initialized. The constructors are
+     *     guaranteed to be called in the same order that the dependent
+     *     modules were initialized.
      *     @optional
      *
      * @returns {function} The constructor for the resulting module.