diff options
Diffstat (limited to 'WebKit/mac/WebView/WebFrameView.mm')
| -rw-r--r-- | WebKit/mac/WebView/WebFrameView.mm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/WebKit/mac/WebView/WebFrameView.mm b/WebKit/mac/WebView/WebFrameView.mm index 132fb93..bc51bb5 100644 --- a/WebKit/mac/WebView/WebFrameView.mm +++ b/WebKit/mac/WebView/WebFrameView.mm @@ -49,6 +49,7 @@ #import "WebNSWindowExtras.h" #import "WebPDFView.h" #import "WebPreferenceKeysPrivate.h" +#import "WebResourceInternal.h" #import "WebSystemInterface.h" #import "WebViewFactory.h" #import "WebViewInternal.h" @@ -314,9 +315,18 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCCl WKDisableCGDeferredUpdates(); if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_MAIN_THREAD_EXCEPTIONS)) - setDefaultThreadViolationBehavior(LogOnFirstThreadViolation); + setDefaultThreadViolationBehavior(LogOnFirstThreadViolation, ThreadViolationRoundOne); + + bool throwExceptionsForRoundTwo = WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_ROUND_TWO_MAIN_THREAD_EXCEPTIONS); +#ifdef MAIL_THREAD_WORKAROUND + // Even if old Mail is linked with new WebKit, don't throw exceptions. + if (needMailThreadWorkaround()) + throwExceptionsForRoundTwo = false; +#endif + if (!throwExceptionsForRoundTwo) + setDefaultThreadViolationBehavior(LogOnFirstThreadViolation, ThreadViolationRoundTwo); } - + _private = [[WebFrameViewPrivate alloc] init]; WebDynamicScrollBarsView *scrollView = [[WebDynamicScrollBarsView alloc] initWithFrame:NSMakeRect(0.0f, 0.0f, frame.size.width, frame.size.height)]; |