Changeset 170308 in webkit

Timestamp:

Jun 23, 2014 12:02:23 PM (10 years ago)

Author:

Simon Fraser

Message:

Catch Obj-C exceptions thrown by _linenPatternImage
​https://bugs.webkit.org/show_bug.cgi?id=134202

Reviewed by Geoffrey Garen.

Catch Objective-C exceptions thrown by _linenPatternImage and
-[NSImage CGImageForProposedRect:context:hints:].

• platform/mac/ScrollbarThemeMac.mm:

(WebCore::linenBackgroundColor):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Catch Obj-C exceptions thrown by _linenPatternImage
+        https://bugs.webkit.org/show_bug.cgi?id=134202
+
+        Reviewed by Geoffrey Garen.
+
+        Catch Objective-C exceptions thrown by _linenPatternImage and
+        -[NSImage CGImageForProposedRect:context:hints:].
+
+        * platform/mac/ScrollbarThemeMac.mm:
+        (WebCore::linenBackgroundColor):
+
 2014-06-23  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -521 +521 @@
 static RetainPtr<CGColorRef> linenBackgroundColor()
 {
-    NSImage *image = [NSColor _linenPatternImage];
-    CGImageRef cgImage = [image CGImageForProposedRect:NULL context:NULL hints:nil];
+    NSImage *image = nil;
+    CGImageRef cgImage = nullptr;
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    image = [NSColor _linenPatternImage];
+    cgImage = [image CGImageForProposedRect:NULL context:NULL hints:nil];
+    END_BLOCK_OBJC_EXCEPTIONS;
+    
+    if (!cgImage)
+        return nullptr;
 
     RetainPtr<CGPatternRef> pattern = adoptCF(wkCGPatternCreateWithImageAndTransform(cgImage, CGAffineTransformIdentity, wkPatternTilingNoDistortion));