Changeset 76191 in webkit

Timestamp:

Jan 19, 2011 6:18:13 PM (13 years ago)

Author:

Darin Adler

Message:

2011-01-19 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

Would like script debugging protocol method to differentiate between caught and uncaught exceptions
​https://bugs.webkit.org/show_bug.cgi?id=52104
rdar://problem/8704226

• WebView/WebDelegateImplementationCaching.h: Fix type of second integer in CallScriptDebugDelegate function overload to be int to match the actual Objective-C method. Added a new overload that includes a BOOL in the right place. Added a boolean named exceptionWasRaisedExpectsHasHandlerFlag.

• WebView/WebDelegateImplementationCaching.mm: (CallDelegate): Added overloads as above. (CallScriptDebugDelegate): Ditto.

• WebView/WebScriptDebugDelegate.h: Added new method with the additional boolean argument. Marked the old method informally deprecated.

• WebView/WebScriptDebugger.mm: (WebScriptDebugger::exception): Added code to call with or without the boolean depending on exceptionWasRaisedExpectsHasHandlerFlag.

• WebView/WebView.mm: (-[WebView _cacheScriptDebugDelegateImplementations]): Set up the exceptionWasRaisedExpectsHasHandlerFlag. Also fixed old code that was not guaranteed to set didParseSourceExpectsBaseLineNumber to NO.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebDelegateImplementationCaching.h (modified) (2 diffs)
• WebView/WebDelegateImplementationCaching.mm (modified) (3 diffs)
• WebView/WebScriptDebugDelegate.h (modified) (1 diff)
• WebView/WebScriptDebugger.mm (modified) (1 diff)
• WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-01-19  Darin Adler  <darin@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Would like script debugging protocol method to differentiate between caught and uncaught exceptions
+        https://bugs.webkit.org/show_bug.cgi?id=52104
+        rdar://problem/8704226
+
+        * WebView/WebDelegateImplementationCaching.h:
+        Fix type of second integer in CallScriptDebugDelegate function overload
+        to be int to match the actual Objective-C method. Added a new overload
+        that includes a BOOL in the right place. Added a boolean named
+        exceptionWasRaisedExpectsHasHandlerFlag.
+
+        * WebView/WebDelegateImplementationCaching.mm:
+        (CallDelegate): Added overloads as above.
+        (CallScriptDebugDelegate): Ditto.
+
+        * WebView/WebScriptDebugDelegate.h: Added new method with the additional
+        boolean argument. Marked the old method informally deprecated.
+
+        * WebView/WebScriptDebugger.mm:
+        (WebScriptDebugger::exception): Added code to call with or without the
+        boolean depending on exceptionWasRaisedExpectsHasHandlerFlag.
+
+        * WebView/WebView.mm:
+        (-[WebView _cacheScriptDebugDelegateImplementations]): Set up the
+        exceptionWasRaisedExpectsHasHandlerFlag. Also fixed old code that was not
+        guaranteed to set didParseSourceExpectsBaseLineNumber to NO.
+
 2011-01-19  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h

@@ -81 +81 @@
 struct WebScriptDebugDelegateImplementationCache {
     BOOL didParseSourceExpectsBaseLineNumber;
+    BOOL exceptionWasRaisedExpectsHasHandlerFlag;
     IMP didParseSourceFunc;
     IMP failedToParseSourceFunc;
@@ -139 +140 @@
 id CallScriptDebugDelegate(IMP, WebView *, SEL, id, NSInteger, id, NSInteger, id);
 id CallScriptDebugDelegate(IMP, WebView *, SEL, id, NSInteger, id, id, id);
-id CallScriptDebugDelegate(IMP, WebView *, SEL, id, NSInteger, NSInteger, id);
+id CallScriptDebugDelegate(IMP, WebView *, SEL, id, NSInteger, int, id);
+id CallScriptDebugDelegate(IMP, WebView *, SEL, id, BOOL, NSInteger, int, id);
 
 id CallHistoryDelegate(IMP, WebView *, SEL);

trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm

@@ -346 +346 @@
 }
 
-static inline id CallDelegate(IMP implementation, WebView *self, id delegate, SEL selector, id object1, NSInteger integer1, NSInteger integer2, id object2)
+static inline id CallDelegate(IMP implementation, WebView *self, id delegate, SEL selector, id object1, NSInteger integer1, int integer2, id object2)
 {
     if (!delegate)
@@ -360 +360 @@
 }
 
+static inline id CallDelegate(IMP implementation, WebView *self, id delegate, SEL selector, id object1, BOOL boolean, NSInteger integer1, int integer2, id object2)
+{
+    if (!delegate)
+        return nil;
+    if (!self->_private->catchesDelegateExceptions)
+        return implementation(delegate, selector, self, object1, boolean, integer1, integer2, object2);
+    @try {
+        return implementation(delegate, selector, self, object1, boolean, integer1, integer2, object2);
+    } @catch(id exception) {
+        ReportDiscardedDelegateException(selector, exception);
+    }
+    return nil;
+}
+
 static inline id CallDelegate(IMP implementation, WebView *self, id delegate, SEL selector, id object1, id object2, NSInteger integer, id object3)
 {
@@ -575 +589 @@
 }
 
-id CallScriptDebugDelegate(IMP implementation, WebView *self, SEL selector, id object1, NSInteger integer1, NSInteger integer2, id object2)
+id CallScriptDebugDelegate(IMP implementation, WebView *self, SEL selector, id object1, NSInteger integer1, int integer2, id object2)
 {
     return CallDelegate(implementation, self, self->_private->scriptDebugDelegate, selector, object1, integer1, integer2, object2);
 }
 
+id CallScriptDebugDelegate(IMP implementation, WebView *self, SEL selector, id object1, BOOL boolean, NSInteger integer1, int integer2, id object2)
+{
+    return CallDelegate(implementation, self, self->_private->scriptDebugDelegate, selector, object1, boolean, integer1, integer2, object2);
+}
+
 id CallHistoryDelegate(IMP implementation, WebView *self, SEL selector)
 {

trunk/Source/WebKit/mac/WebView/WebScriptDebugDelegate.h

@@ -100 +100 @@
 // exception is being thrown
 - (void)webView:(WebView *)webView   exceptionWasRaised:(WebScriptCallFrame *)frame
+                                             hasHandler:(BOOL)hasHandler
                                                sourceId:(WebSourceId)sid
                                                    line:(int)lineno
                                             forWebFrame:(WebFrame *)webFrame;
+
+// exception is being thrown (deprecated old version; called only if new version is not implemented)
+- (void)webView:(WebView *)webView   exceptionWasRaised:(WebScriptCallFrame *)frame
+                                               sourceId:(WebSourceId)sid
+                                                   line:(int)lineno
+                                            forWebFrame:(WebFrame *)webFrame;
+
 @end
 

trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm

@@ -213 +213 @@
     [m_topCallFrame.get() _setDebuggerCallFrame:debuggerCallFrame];
 
-    WebScriptDebugDelegateImplementationCache* implementations = WebViewGetScriptDebugDelegateImplementations(webView);
-    if (implementations->exceptionWasRaisedFunc)
-        CallScriptDebugDelegate(implementations->exceptionWasRaisedFunc, webView, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:), m_topCallFrame.get(), sourceID, lineNumber, webFrame);
+    WebScriptDebugDelegateImplementationCache* cache = WebViewGetScriptDebugDelegateImplementations(webView);
+    if (cache->exceptionWasRaisedFunc) {
+        if (cache->exceptionWasRaisedExpectsHasHandlerFlag)
+            CallScriptDebugDelegate(cache->exceptionWasRaisedFunc, webView, @selector(webView:exceptionWasRaised:hasHandler:sourceId:line:forWebFrame:), m_topCallFrame.get(), hasHandler, sourceID, lineNumber, webFrame);
+        else
+            CallScriptDebugDelegate(cache->exceptionWasRaisedFunc, webView, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:), m_topCallFrame.get(), sourceID, lineNumber, webFrame);
+    }
 
     m_callingDelegate = false;

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1605 +1605 @@
     if (cache->didParseSourceFunc)
         cache->didParseSourceExpectsBaseLineNumber = YES;
-    else
+    else {
+        cache->didParseSourceExpectsBaseLineNumber = NO;
         cache->didParseSourceFunc = getMethod(delegate, @selector(webView:didParseSource:fromURL:sourceId:forWebFrame:));
+    }
 
     cache->failedToParseSourceFunc = getMethod(delegate, @selector(webView:failedToParseSource:baseLineNumber:fromURL:withError:forWebFrame:));
@@ -1612 +1614 @@
     cache->willExecuteStatementFunc = getMethod(delegate, @selector(webView:willExecuteStatement:sourceId:line:forWebFrame:));
     cache->willLeaveCallFrameFunc = getMethod(delegate, @selector(webView:willLeaveCallFrame:sourceId:line:forWebFrame:));
-    cache->exceptionWasRaisedFunc = getMethod(delegate, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:));
+
+    cache->exceptionWasRaisedFunc = getMethod(delegate, @selector(webView:exceptionWasRaised:hasHandler:sourceId:line:forWebFrame:));
+    if (cache->exceptionWasRaisedFunc)
+        cache->exceptionWasRaisedExpectsHasHandlerFlag = YES;
+    else {
+        cache->exceptionWasRaisedExpectsHasHandlerFlag = NO;
+        cache->exceptionWasRaisedFunc = getMethod(delegate, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:));
+    }
 }