Changeset 35408 in webkit

Timestamp:

Jul 28, 2008 9:59:20 AM (16 years ago)

Author:

andersca@apple.com

Message:

2008-07-28 Anders Carlsson <​andersca@apple.com>

Reviewed by Adam.

<rdar://problem/6105529>
​https://bugs.webkit.org/show_bug.cgi?id=19659
Turning off plugins causes crash

When an active page has plug-ins, and plug-ins are disabled, they will be stopped and will
end up in a state where they don't have an event handler. Because of this, we need to
check that the plug-in has been started before calling the event handler.

• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView sendActivateEvent:]): (-[WebBaseNetscapePluginView sendDrawRectEvent:]): (-[WebBaseNetscapePluginView setHasFocus:]): (-[WebBaseNetscapePluginView mouseDown:]): (-[WebBaseNetscapePluginView mouseUp:]): (-[WebBaseNetscapePluginView mouseEntered:]): (-[WebBaseNetscapePluginView mouseExited:]): (-[WebBaseNetscapePluginView handleMouseMoved:]): (-[WebBaseNetscapePluginView mouseDragged:]): (-[WebBaseNetscapePluginView scrollWheel:]): (-[WebBaseNetscapePluginView keyUp:]): (-[WebBaseNetscapePluginView keyDown:]): (-[WebBaseNetscapePluginView flagsChanged:]): (-[WebBaseNetscapePluginView cut:]): (-[WebBaseNetscapePluginView copy:]): (-[WebBaseNetscapePluginView paste:]): (-[WebBaseNetscapePluginView selectAll:]): (-[WebBaseNetscapePluginView drawRect:]): (-[WebBaseNetscapePluginView inputContext]):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebBaseNetscapePluginView.mm (modified) (19 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2008-07-28  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam.
+
+        <rdar://problem/6105529> 
+        https://bugs.webkit.org/show_bug.cgi?id=19659
+        Turning off plugins causes crash
+        
+        When an active page has plug-ins, and plug-ins are disabled, they will be stopped and will
+        end up in a state where they don't have an event handler. Because of this, we need to 
+        check that the plug-in has been started before calling the event handler.
+        
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView sendActivateEvent:]):
+        (-[WebBaseNetscapePluginView sendDrawRectEvent:]):
+        (-[WebBaseNetscapePluginView setHasFocus:]):
+        (-[WebBaseNetscapePluginView mouseDown:]):
+        (-[WebBaseNetscapePluginView mouseUp:]):
+        (-[WebBaseNetscapePluginView mouseEntered:]):
+        (-[WebBaseNetscapePluginView mouseExited:]):
+        (-[WebBaseNetscapePluginView handleMouseMoved:]):
+        (-[WebBaseNetscapePluginView mouseDragged:]):
+        (-[WebBaseNetscapePluginView scrollWheel:]):
+        (-[WebBaseNetscapePluginView keyUp:]):
+        (-[WebBaseNetscapePluginView keyDown:]):
+        (-[WebBaseNetscapePluginView flagsChanged:]):
+        (-[WebBaseNetscapePluginView cut:]):
+        (-[WebBaseNetscapePluginView copy:]):
+        (-[WebBaseNetscapePluginView paste:]):
+        (-[WebBaseNetscapePluginView selectAll:]):
+        (-[WebBaseNetscapePluginView drawRect:]):
+        (-[WebBaseNetscapePluginView inputContext]):
+
 2008-07-26  Daniel Jalkut  <jalkut@red-sweater.com>
 

trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -773 +773 @@
 - (void)sendActivateEvent:(BOOL)activate
 {
+    if (!isStarted)
+        return;
+
     eventHandler->windowFocusChanged(activate);
 }
@@ -778 +781 @@
 - (void)sendDrawRectEvent:(NSRect)rect
 {
+    ASSERT(eventHandler);
+    
     eventHandler->drawRect(rect);
 }
@@ -832 +837 @@
 - (void)setHasFocus:(BOOL)flag
 {
+    if (!isStarted)
+        return;
+
     if (hasFocus == flag)
         return;
@@ -870 +878 @@
 - (void)mouseDown:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->mouseDown(theEvent);
 }
@@ -875 +886 @@
 - (void)mouseUp:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->mouseUp(theEvent);
 }
@@ -880 +894 @@
 - (void)mouseEntered:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->mouseEntered(theEvent);
 }
@@ -885 +902 @@
 - (void)mouseExited:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->mouseExited(theEvent);
     
@@ -896 +916 @@
 - (void)handleMouseMoved:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->mouseMoved(theEvent);
 }
@@ -901 +924 @@
 - (void)mouseDragged:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->mouseDragged(theEvent);
 }
@@ -906 +932 @@
 - (void)scrollWheel:(NSEvent *)theEvent
 {
+    if (!isStarted) {
+        [super scrollWheel:theEvent];
+        return;
+    }
+
     if (!eventHandler->scrollWheel(theEvent))
         [super scrollWheel:theEvent];
@@ -912 +943 @@
 - (void)keyUp:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->keyUp(theEvent);
 }
@@ -917 +951 @@
 - (void)keyDown:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->keyDown(theEvent);
 }
@@ -922 +959 @@
 - (void)flagsChanged:(NSEvent *)theEvent
 {
+    if (!isStarted)
+        return;
+
     eventHandler->flagsChanged(theEvent);
 }
@@ -927 +967 @@
 - (void)cut:(id)sender
 {
+    if (!isStarted)
+        return;
+
     eventHandler->keyDown([NSApp currentEvent]);
 }
@@ -932 +975 @@
 - (void)copy:(id)sender
 {
+    if (!isStarted)
+        return;
+
     eventHandler->keyDown([NSApp currentEvent]);
 }
@@ -937 +983 @@
 - (void)paste:(id)sender
 {
+    if (!isStarted)
+        return;
+
     eventHandler->keyDown([NSApp currentEvent]);
 }
@@ -942 +991 @@
 - (void)selectAll:(id)sender
 {
+    if (!isStarted)
+        return;
+
     eventHandler->keyDown([NSApp currentEvent]);
 }
@@ -1564 +1616 @@
 - (void)drawRect:(NSRect)rect
 {
-    if (!isStarted) {
-        return;
-    }
+    if (!isStarted)
+        return;
     
     if ([NSGraphicsContext currentContextDrawingToScreen])
@@ -1888 +1939 @@
 {
 #ifndef NP_NO_CARBON
-    if ([self isStarted] && eventModel == NPEventModelCarbon)
+    if (![self isStarted] || eventModel == NPEventModelCarbon)
         return nil;
 #endif