Skip to content

Commit e6df484

Browse files
committed
Fix compatibility with Firefox 46.
1 parent 04e1da4 commit e6df484

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

extension/modules/AppIntegration.jsm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,9 @@ WindowWrapper.prototype = {
12071207
const wpl = Ci.nsIWebProgressListener;
12081208
let aMaxTotalProgress = 100;
12091209
let aStopped = aCurTotalProgress == -1 || aCurTotalProgress == 100;
1210-
let aTabListener = this.window.gBrowser.mTabListeners[tab._tPos];
1210+
let aTabListener = this.window.gBrowser.mTabListeners ? this.window.gBrowser.mTabListeners[tab._tPos] :
1211+
this.window.gBrowser._tabListeners ? this.window.gBrowser._tabListeners.get(tab) :
1212+
null;
12111213
let aWebProgress = tab.linkedBrowser.webProgress;
12121214
let aRequest = Services.io.newChannelFromURI(tab.linkedBrowser.currentURI);
12131215
let aStateFlags = (aStopped ? wpl.STATE_STOP : wpl.STATE_START) | wpl.STATE_IS_NETWORK;

extension/modules/LightweightTheme.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ let FileUtils = {
359359
}
360360

361361
// convert the binary hash data to a hex string.
362-
return [toHexString(hash.charCodeAt(i)) for (i in hash)].join("");
362+
return [].map.call(hash, function(ch) { return toHexString(ch.charCodeAt(0)); }).join("");
363363
},
364364

365365
/**

plugin/BrowserHook/WindowMessageHook.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,6 @@ namespace BrowserHook
222222

223223
BOOL WindowMessageHook::ForwardFirefoxMouseMessage(HWND hwndFirefox, MSG* pMsg)
224224
{
225-
// Forward plain move messages to let firefox handle full screen auto-hide or tabbar auto-arrange
226-
bool bShouldForward = pMsg->message == WM_MOUSEMOVE && pMsg->wParam == 0;
227-
228225
const std::vector<GestureHandler*>& handlers = GestureHandler::getHandlers();
229226

230227
// Forward the mouse message if any guesture handler is triggered.
@@ -259,7 +256,6 @@ namespace BrowserHook
259256
if (res == MHR_Triggered)
260257
{
261258
(*iter)->forwardAllTarget(pMsg->hwnd, hwndFirefox);
262-
bShouldForward = false;
263259
break;
264260
}
265261
else if (res == MHR_Canceled)
@@ -285,10 +281,6 @@ namespace BrowserHook
285281
}
286282
}
287283
}
288-
if (bShouldForward)
289-
{
290-
GestureHandler::forwardTarget(pMsg, hwndFirefox);
291-
}
292284
return bShouldSwallow;
293285
}
294286

0 commit comments

Comments
 (0)