File tree Expand file tree Collapse file tree 3 files changed +4
-10
lines changed
Expand file tree Collapse file tree 3 files changed +4
-10
lines changed Original file line number Diff line number Diff 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 ;
Original file line number Diff line number Diff 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 /**
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments