Commit 2980bb5a authored by andersca@apple.com's avatar andersca@apple.com

2008-05-05 Anders Carlsson <andersca@apple.com>

        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: http://svn.webkit.org/repository/webkit/trunk@32876 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8454f02d
2008-05-05 Anders Carlsson <andersca@apple.com>
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 <darin@apple.com>
Reviewed by Mitz.
......
......@@ -237,13 +237,8 @@ - (BOOL)_initWithPath:(NSString *)pluginPath
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])
......
......@@ -59,7 +59,6 @@ @implementation WebPluginPackage
}
}
#ifdef BUILDING_ON_TIGER
NSFileHandle *executableFile = [NSFileHandle fileHandleForReadingAtPath:[bundle executablePath]];
NSData *data = [executableFile readDataOfLength:512];
[executableFile closeFile];
......@@ -67,12 +66,6 @@ @implementation WebPluginPackage
[self release];
return nil;
}
#else
if (![bundle preflightAndReturnError:nil]) {
[self release];
return nil;
}
#endif
if (![self getPluginInfoFromPLists]) {
[self release];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment