Changeset 29126 in webkit

Timestamp:

Jan 3, 2008 9:15:14 AM (16 years ago)

Author:

kdecker@apple.com

Message:

Reviewed by Darin.

Fixed: <rdar://problem/5660603> QuickDraw plug-ins can cause a 100% reproducible assertion failure in AppKit (breaks Safari UI)

• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView updateAndSetWindow]): Simplified an early return for non-QuickDraw plug-ins and switched to using the more NSView friendly version of lockFocus, lockFocusIfCanDraw.

Location:

trunk/WebKit/mac

Files:

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

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2008-01-02  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Darin.
+        
+        Fixed: <rdar://problem/5660603> QuickDraw plug-ins can cause a 100% reproducible assertion failure in AppKit (breaks Safari UI)
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView updateAndSetWindow]): Simplified an early return for non-QuickDraw plug-ins and switched
+        to using the more NSView friendly version of lockFocus, lockFocusIfCanDraw.
+
 2008-01-01  David D. Kilzer  <ddkilzer@webkit.org>
 

trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -1201 +1201 @@
     if (!isStarted)
         return;
-    if ((drawingModel == NPDrawingModelCoreGraphics || drawingModel == NPDrawingModelOpenGL)  && ![self canDraw])
+    if (drawingModel != NPDrawingModelQuickDraw && ![self canDraw])
         return;
     
-    BOOL needsFocus = [self window] && ([NSView focusView] != self);
-    if (needsFocus)
-        [self lockFocus];
-
+    BOOL didLockFocus = [NSView focusView] != self && [self lockFocusIfCanDraw];
     PortState portState = [self saveAndSetNewPortState];
     if (portState) {
@@ -1214 +1211 @@
         free(portState);
     }   
-    if (needsFocus)
+    if (didLockFocus)
         [self unlockFocus];
 }