Changeset 151879 in webkit

Timestamp:

Jun 22, 2013 1:29:30 PM (11 years ago)

Author:

Simon Fraser

Message:

Followup from r151877 .
Fix crash in fast/frames/iframe-access-screen-of-deleted.html by null-checking the widget.

• platform/mac/PlatformScreenMac.mm:

(WebCore::screenForWidget):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/PlatformScreenMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Followup from r151877 .
+        Fix crash in fast/frames/iframe-access-screen-of-deleted.html by null-checking the widget.
+
+        * platform/mac/PlatformScreenMac.mm:
+        (WebCore::screenForWidget):
+
 2013-06-22  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm

@@ -76 +76 @@
     
     // Didn't get an NSWindow; probably WebKit2. Try using the Widget's display ID.
-    if (NSScreen *screen = [NSScreen screenForDislayID:widget->windowDisplayID()])
+    if (NSScreen *screen = widget ? [NSScreen screenForDislayID:widget->windowDisplayID()] : nil)
         return screen;