2009-04-13 Brady Eidson <beidson@apple.com>

        Reviewed by Kevin Decker

        <rdar://problem/6712063> Garmin WebUpdater crashes

        * WebView/WebFrame.mm:
        (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):  If not called on the main thread,
          add a ThreadViolationCheckRoundTwo() call to either log or raise an exception.  In the case where it's
          only a log, reschedule the _loadData call to occur on the main thread.



git-svn-id: svn://svn.chromium.org/blink/trunk@42448 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit/mac/ChangeLog

+2009-04-13  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Kevin Decker
+
+        <rdar://problem/6712063> Garmin WebUpdater crashes
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]):  If not called on the main thread,
+          add a ThreadViolationCheckRoundTwo() call to either log or raise an exception.  In the case where it's
+          only a log, reschedule the _loadData call to occur on the main thread.
+
 2009-04-10  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Jon Honeycutt.

third_party/WebKit/WebKit/mac/WebView/WebFrame.mm

@@ -46,6 +46,7 @@
 #import "WebIconFetcherInternal.h"
 #import "WebKitStatisticsPrivate.h"
 #import "WebKitVersionChecks.h"
+#import "WebNSObjectExtras.h"
 #import "WebNSURLExtras.h"
 #import "WebScriptDebugger.h"
 #import "WebViewInternal.h"
@@ -74,6 +75,7 @@
 #import <WebCore/ReplaceSelectionCommand.h>
 #import <WebCore/SmartReplace.h>
 #import <WebCore/TextIterator.h>
+#import <WebCore/ThreadCheck.h>
 #import <WebCore/TypingCommand.h>
 #import <WebCore/htmlediting.h>
 #import <WebCore/ScriptController.h>
@@ -1314,6 +1316,11 @@ static NSURL *createUniqueWebDataURL()
 
 - (void)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL unreachableURL:(NSURL *)unreachableURL
 {
+    if (!pthread_main_np()) { 
+        WebCoreThreadViolationCheckRoundTwo();
+        return [[self _webkit_invokeOnMainThread] _loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:baseURL unreachableURL:unreachableURL];
+    }
+    
     KURL responseURL;
     if (!baseURL) {
         baseURL = blankURL();