Title: [204981] tags/Safari-603.1.3/Source/WebKit/mac
- Revision
- 204981
- Author
- [email protected]
- Date
- 2016-08-25 11:45:16 -0700 (Thu, 25 Aug 2016)
Log Message
Merge r204974. rdar://problem/27959937
Modified Paths
Diff
Modified: tags/Safari-603.1.3/Source/WebKit/mac/ChangeLog (204980 => 204981)
--- tags/Safari-603.1.3/Source/WebKit/mac/ChangeLog 2016-08-25 18:41:22 UTC (rev 204980)
+++ tags/Safari-603.1.3/Source/WebKit/mac/ChangeLog 2016-08-25 18:45:16 UTC (rev 204981)
@@ -1,3 +1,19 @@
+2016-08-25 Babak Shafiei <[email protected]>
+
+ Merge r204974.
+
+ 2016-08-25 Anders Carlsson <[email protected]>
+
+ Re-export DOMException NSStrings after r204717
+ https://bugs.webkit.org/show_bug.cgi?id=161200
+ <rdar://problem/27959937>
+
+ Reviewed by Alex Christensen.
+
+ * DOM/ExceptionHandlers.mm:
+ (raiseDOMException):
+ * WebKit.exp:
+
2016-08-22 Darin Adler <[email protected]>
Move Objective-C DOM bindings from WebCore to legacy WebKit
Modified: tags/Safari-603.1.3/Source/WebKit/mac/DOM/ExceptionHandlers.mm (204980 => 204981)
--- tags/Safari-603.1.3/Source/WebKit/mac/DOM/ExceptionHandlers.mm 2016-08-25 18:41:22 UTC (rev 204980)
+++ tags/Safari-603.1.3/Source/WebKit/mac/DOM/ExceptionHandlers.mm 2016-08-25 18:45:16 UTC (rev 204981)
@@ -25,9 +25,18 @@
#import "ExceptionHandlers.h"
+#import "DOMEventException.h"
+#import "DOMException.h"
+#import "DOMRangeException.h"
+#import "DOMXPathException.h"
#import <WebCore/ExceptionCode.h>
#import <WebCore/ExceptionCodeDescription.h>
+NSString * const DOMException = @"DOMException";
+NSString * const DOMRangeException = @"DOMRangeException";
+NSString * const DOMEventException = @"DOMEventException";
+NSString * const DOMXPathException = @"DOMXPathException";
+
void raiseDOMException(WebCore::ExceptionCode ec)
{
ASSERT(ec);
@@ -37,13 +46,13 @@
// FIXME: This should use type and code exclusively and not try to use typeName.
NSString *exceptionName;
if (strcmp(description.typeName, "DOM Range") == 0)
- exceptionName = @"DOMRangeException";
+ exceptionName = DOMRangeException;
else if (strcmp(description.typeName, "DOM Events") == 0)
- exceptionName = @"DOMEventException";
+ exceptionName = DOMEventException;
else if (strcmp(description.typeName, "DOM XPath") == 0)
- exceptionName = @"DOMXPathException";
+ exceptionName = DOMXPathException;
else
- exceptionName = @"DOMException";
+ exceptionName = DOMException;
NSString *reason;
if (description.name)
Modified: tags/Safari-603.1.3/Source/WebKit/mac/WebKit.exp (204980 => 204981)
--- tags/Safari-603.1.3/Source/WebKit/mac/WebKit.exp 2016-08-25 18:41:22 UTC (rev 204980)
+++ tags/Safari-603.1.3/Source/WebKit/mac/WebKit.exp 2016-08-25 18:45:16 UTC (rev 204981)
@@ -148,6 +148,10 @@
.objc_class_name_WebTextIterator
.objc_class_name_WebUserContentURLPattern
.objc_class_name_WebView
+_DOMException
+_DOMRangeException
+_DOMEventException
+_DOMXPathException
_WebActionButtonKey
_WebActionElementKey
_WebActionFormKey
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
