Changeset 44115 in webkit

Timestamp:

May 24, 2009 9:34:52 AM (15 years ago)

Author:

Darin Adler

Message:

2009-05-24 Darin Adler <Darin Adler>

Reviewed by Dan Bernstein and Tim Hatcher.

<rdar://problem/6913045> New console message spewed by automator CLI after installing JetstreamLeo40B21a

• Misc/WebNSObjectExtras.mm: (-[WebMainThreadInvoker initWithTarget:]): Tweaked argument name. (-[WebMainThreadInvoker forwardInvocation:]): Removed call to retainArguments. This was unneeded and in the case of a newly created but not yet fully initialized NSView object it caused the abovementioned bug. (-[WebMainThreadInvoker handleException:]): Tweaked argument name. Added assertion. (-[NSInvocation _webkit_invokeAndHandleException:]): Tweaked name of local variable that holds the exception.

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebNSObjectExtras.mm (modified) (6 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-05-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein and Tim Hatcher.
+
+        <rdar://problem/6913045> New console message spewed by automator CLI after installing JetstreamLeo40B21a
+
+        * Misc/WebNSObjectExtras.mm:
+        (-[WebMainThreadInvoker initWithTarget:]): Tweaked argument name.
+        (-[WebMainThreadInvoker forwardInvocation:]): Removed call to retainArguments.
+        This was unneeded and in the case of a newly created but not yet fully initialized
+        NSView object it caused the abovementioned bug.
+        (-[WebMainThreadInvoker handleException:]): Tweaked argument name. Added assertion.
+        (-[NSInvocation _webkit_invokeAndHandleException:]): Tweaked name of local variable
+        that holds the exception.
+
 2009-05-23  David Kilzer  <ddkilzer@apple.com>
 

trunk/WebKit/mac/Misc/WebNSObjectExtras.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
 #import "WebNSObjectExtras.h"
 
+#import <wtf/Assertions.h>
 
 @interface WebMainThreadInvoker : NSProxy
@@ -39 +40 @@
 @implementation WebMainThreadInvoker
 
-- (id)initWithTarget:(id)theTarget
+- (id)initWithTarget:(id)passedTarget
 {
-    target = theTarget;
+    target = passedTarget;
     return self;
 }
@@ -48 +49 @@
 {
     [invocation setTarget:target];
-    [invocation retainArguments];
     [invocation performSelectorOnMainThread:@selector(_webkit_invokeAndHandleException:) withObject:self waitUntilDone:YES];
     if (exception) {
@@ -62 +62 @@
 }
 
-- (void)handleException:(id)e
+- (void)handleException:(id)passedException
 {
-    exception = [e retain];
+    ASSERT(!exception);
+    exception = [passedException retain];
 }
 
 @end
-
 
 @implementation NSInvocation (WebMainThreadInvoker)
@@ -76 +76 @@
     @try {
         [self invoke];
-    } @catch (id e) {
-        [exceptionHandler handleException:e];
+    } @catch (id exception) {
+        [exceptionHandler handleException:exception];
     }
 }
 
 @end
-
 
 @implementation NSObject (WebNSObjectExtras)