[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

rjw rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:37:40 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit ac73ee9c1a9e658eba6656c3428ba61606e5d443
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 17 18:51:06 2003 +0000

            Drop down yet one more level to avoid intialization horkage.
            Call objc_getClass() instead of NSClassFromString().
    
            Reviewed by darin.
    
            * WebView.subproj/WebHTMLViewPrivate.m:
            (+[WebHTMLView load]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4130 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6fd72ac..7babf4a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-17  Richard Williamson   <rjw at apple.com>
+
+        Drop down yet one more level to avoid intialization horkage.
+        Call objc_getClass() instead of NSClassFromString().
+        
+        Reviewed by darin.
+
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (+[WebHTMLView load]):
+
 2003-04-17  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 2a13ce6..df08ff7 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -34,6 +34,7 @@
 // Imported for direct call to class_poseAs.  Should be removed
 // if we ever drop posing hacks.
 #import <objc/objc-class.h>
+#import <objc/objc-runtime.h>
 
 // These are a little larger than typical because dragging links is a fairly
 // advanced feature that can confuse non-power-users
@@ -114,9 +115,9 @@ static BOOL forceRealHitTest = NO;
     // Avoid indirect invocation of any class initializers.  This is a work-around to prevent
     // the +initializers being called before the REQUIRED AppKit initialization
     // that's done in +[NSApplication load].
-    class_poseAs(NSClassFromString(@"WebNSView"), NSClassFromString(@"NSView"));
-    class_poseAs(NSClassFromString(@"WebNSTextView"), NSClassFromString(@"NSTextView"));
-    class_poseAs(NSClassFromString(@"WebNSWindow"), NSClassFromString(@"NSWindow"));
+    class_poseAs(objc_getClass("WebNSView"), objc_getClass("NSView"));
+    class_poseAs(objc_getClass("WebNSTextView"), objc_getClass("NSTextView"));
+    class_poseAs(objc_getClass("WebNSWindow"), objc_getClass("NSWindow"));
 
     [pool release];
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list