Changeset 28902 in webkit

Timestamp:

Dec 20, 2007 1:06:54 PM (16 years ago)

Author:

kdecker@apple.com

Message:

Reviewed by Anders.

Fixed: <rdar://problem/5638288> REGRESSION: Flash movies show up in other tabs above the page (16373)

• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView updateAndSetWindow]): QuickDraw plug-ins must manually be told when to stop writing to the window backing store. The problem was that change-set 28400 introduced an early return which prevented this necessary operation. The fix is to limit the scope of the early return to CG and GL plug-ins and to tweak the needsFocus check to prevent an exception from occurring in QuickDraw-based plug-ins.

Location:

trunk/WebKit/mac

Files:

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

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2007-12-20  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Anders.
+        
+        Fixed: <rdar://problem/5638288> REGRESSION: Flash movies show up in other tabs above the page (16373)
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView updateAndSetWindow]): QuickDraw plug-ins must manually be told when to stop
+         writing to the window backing store. The problem was that change-set 28400 introduced an early return 
+         which prevented this necessary operation. The fix is to limit the scope of the early return to CG and GL
+         plug-ins and to tweak the needsFocus check to prevent an exception from occurring in QuickDraw-based plug-ins.
+
 2007-12-19  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -1195 +1195 @@
     // A plug-in can only update if it's (1) already been started (2) isn't stopped
     // and (3) is able to draw on-screen. To meet condition (3) the plug-in must not
-    // be hidden and be attached to a window.
-    if (!isStarted || ![self canDraw])
+    // be hidden and be attached to a window. QuickDraw plug-ins are an important
+    // excpetion to rule (3) because they manually must be told when to stop writing
+    // bits to the window backing store, thus to do so requires a new call to
+    // NPP_SetWindow() with an empty NPWindow struct.
+    if (!isStarted)
         return;
-
-    BOOL needsFocus = [NSView focusView] != self;
+    if ((drawingModel == NPDrawingModelCoreGraphics || drawingModel == NPDrawingModelOpenGL)  && ![self canDraw])
+        return;
+    
+    BOOL needsFocus = [self window] && ([NSView focusView] != self);
     if (needsFocus)
-        [self lockFocus];    
+        [self lockFocus];
+
     PortState portState = [self saveAndSetNewPortState];
     if (portState) {
@@ -1207 +1213 @@
         [self restorePortState:portState];
         free(portState);
-    }
+    }   
     if (needsFocus)
         [self unlockFocus];