Commit 1a6d06be authored by andersca@apple.com's avatar andersca@apple.com

2008-05-01 Anders Carlsson <andersca@apple.com>

        Reviewed by John.
        
        Add null checks for the event handler.
        
        * Plugins/WebBaseNetscapePluginView.mm:
        (-[WebBaseNetscapePluginView stopTimers]):
        (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:sendNotification:]):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32782 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e5a7a74a
2008-05-01 Anders Carlsson <andersca@apple.com>
Reviewed by John.
Add null checks for the event handler.
* Plugins/WebBaseNetscapePluginView.mm:
(-[WebBaseNetscapePluginView stopTimers]):
(-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:sendNotification:]):
2008-05-01 Anders Carlsson <andersca@apple.com>
Fix 64-bit build.
......
......@@ -760,7 +760,9 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
- (void)stopTimers
{
eventHandler->stopTimers();
if (eventHandler)
eventHandler->stopTimers();
shouldFireTimers = NO;
if (!timers)
......@@ -2038,11 +2040,15 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
return NPERR_INVALID_PARAM;
}
bool currentEventIsUserGesture = false;
if (eventHandler)
currentEventIsUserGesture = eventHandler->currentEventIsUserGesture();
WebPluginRequest *pluginRequest = [[WebPluginRequest alloc] initWithRequest:request
frameName:target
notifyData:notifyData
sendNotification:sendNotification
didStartFromUserGesture:eventHandler->currentEventIsUserGesture()];
didStartFromUserGesture:currentEventIsUserGesture];
[self performSelector:@selector(loadPluginRequest:) withObject:pluginRequest afterDelay:0];
[pluginRequest release];
if (target)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment