diff options
Diffstat (limited to 'WebKit/mac/WebView/WebResource.mm')
| -rw-r--r-- | WebKit/mac/WebView/WebResource.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/mac/WebView/WebResource.mm b/WebKit/mac/WebView/WebResource.mm index e62ed1e..735e213 100644 --- a/WebKit/mac/WebView/WebResource.mm +++ b/WebKit/mac/WebView/WebResource.mm @@ -38,6 +38,7 @@ #import <JavaScriptCore/PassRefPtr.h> #import <WebCore/ArchiveResource.h> #import <WebCore/LegacyWebArchive.h> +#import <WebCore/RuntimeApplicationChecks.h> #import <WebCore/TextEncoding.h> #import <WebCore/ThreadCheck.h> #import <WebCore/WebCoreObjCExtras.h> @@ -365,7 +366,7 @@ static NSString * const WebResourceResponseKey = @"WebResourceResponse" // Copying it will also cause a performance regression. return [self _initWithData:data URL:URL - MIMEType:[response _webcore_MIMEType] + MIMEType:[response MIMEType] textEncodingName:[response textEncodingName] frameName:nil response:response @@ -441,8 +442,7 @@ static const double newMailBundleVersion = 1050.0; + (BOOL)_needMailThreadWorkaroundIfCalledOffMainThread { - static BOOL isOldMail = [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.mail"] - && [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey] doubleValue] < newMailBundleVersion; + static BOOL isOldMail = applicationIsAppleMail() && [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey] doubleValue] < newMailBundleVersion; return isOldMail; } |