2009-03-20 Adele Peterson <adele@apple.com>
authoradele@apple.com <adele@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Mar 2009 00:57:55 +0000 (00:57 +0000)
committeradele@apple.com <adele@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Mar 2009 00:57:55 +0000 (00:57 +0000)
        Build fix.

        Reviewed by Darin Adler.

        * WebView/WebFrameView.mm: (-[WebFrameView initWithFrame:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41885 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/mac/ChangeLog
WebKit/mac/WebView/WebFrameView.mm

index 5ce7049..72300fc 100644 (file)
@@ -1,3 +1,11 @@
+2009-03-20  Adele Peterson  <adele@apple.com>
+
+        Build fix.
+
+        Reviewed by Darin Adler.
+
+        * WebView/WebFrameView.mm: (-[WebFrameView initWithFrame:]):
+
 2009-03-20  Timothy Hatcher  <timothy@apple.com>
 
         Change how threading exceptions are checked so they are reported
index 68e243e..bc51bb5 100644 (file)
@@ -317,7 +317,13 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCCl
         if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_MAIN_THREAD_EXCEPTIONS))
             setDefaultThreadViolationBehavior(LogOnFirstThreadViolation, ThreadViolationRoundOne);
 
-        if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_ROUND_TWO_MAIN_THREAD_EXCEPTIONS) || needMailThreadWorkaround())
+        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);
     }