2008-05-05 Anders Carlsson <andersca@apple.com>
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 May 2008 16:47:21 +0000 (16:47 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 May 2008 16:47:21 +0000 (16:47 +0000)
        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
WebKit/mac/Plugins/WebNetscapePluginPackage.m
WebKit/mac/Plugins/WebPluginPackage.m

index 203b648..3c2e91b 100644 (file)
@@ -1,3 +1,14 @@
+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.
index 74bdd19..978db7b 100644 (file)
@@ -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])
index f5329b9..d7f144e 100644 (file)
@@ -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];