From f75ef8f0550ddf9b2d9f22ca19cc920c48a56837 Mon Sep 17 00:00:00 2001 From: "andersca@apple.com" Date: Mon, 5 May 2008 16:47:21 +0000 Subject: [PATCH] 2008-05-05 Anders Carlsson Reviewed by Jess. Apparently preflighting can cause hangs for some reason. Revert this for now. * Plugins/WebNetscapePluginPackage.m: (-[WebNetscapePluginPackage _initWithPath:]): * Plugins/WebPluginPackage.m: (-[WebPluginPackage initWithPath:]): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@32876 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/mac/ChangeLog | 11 +++++++++++ WebKit/mac/Plugins/WebNetscapePluginPackage.m | 5 ----- WebKit/mac/Plugins/WebPluginPackage.m | 7 ------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog index 203b648..3c2e91b 100644 --- a/WebKit/mac/ChangeLog +++ b/WebKit/mac/ChangeLog @@ -1,3 +1,14 @@ +2008-05-05 Anders Carlsson + + Reviewed by Jess. + + Apparently preflighting can cause hangs for some reason. Revert this for now. + + * Plugins/WebNetscapePluginPackage.m: + (-[WebNetscapePluginPackage _initWithPath:]): + * Plugins/WebPluginPackage.m: + (-[WebPluginPackage initWithPath:]): + 2008-05-05 Darin Adler Reviewed by Mitz. diff --git a/WebKit/mac/Plugins/WebNetscapePluginPackage.m b/WebKit/mac/Plugins/WebNetscapePluginPackage.m index 74bdd19..978db7b 100644 --- a/WebKit/mac/Plugins/WebNetscapePluginPackage.m +++ b/WebKit/mac/Plugins/WebNetscapePluginPackage.m @@ -237,13 +237,8 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer); return NO; #endif -#ifdef BUILDING_ON_TIGER if (![self isNativeLibraryData:data]) return NO; -#else - if (![bundle preflightAndReturnError:nil]) - return NO; -#endif } if (![self getPluginInfoFromPLists] && ![self getPluginInfoFromResources]) diff --git a/WebKit/mac/Plugins/WebPluginPackage.m b/WebKit/mac/Plugins/WebPluginPackage.m index f5329b9..d7f144e 100644 --- a/WebKit/mac/Plugins/WebPluginPackage.m +++ b/WebKit/mac/Plugins/WebPluginPackage.m @@ -59,7 +59,6 @@ NSString *WebPlugInContainingElementKey = @"WebPlugInContainingElementKey" } } -#ifdef BUILDING_ON_TIGER NSFileHandle *executableFile = [NSFileHandle fileHandleForReadingAtPath:[bundle executablePath]]; NSData *data = [executableFile readDataOfLength:512]; [executableFile closeFile]; @@ -67,12 +66,6 @@ NSString *WebPlugInContainingElementKey = @"WebPlugInContainingElementKey" [self release]; return nil; } -#else - if (![bundle preflightAndReturnError:nil]) { - [self release]; - return nil; - } -#endif if (![self getPluginInfoFromPLists]) { [self release]; -- 1.8.3.1