Fixed <rdar://problem/3810702> _checkNavigationPolicyForRequest:dataSource...

        Reviewed by Maciej (a long time ago).

        * WebView.subproj/WebFrame.m:
        (-[WebFrame _loadDataSource:withLoadType:formState:]):

        Fixed <rdar://problem/3845307> WebKit needs to export _HIWebViewRegisterClass so HIWebViews can work in Carbon nib files

        As suggested in the bug, the fix is to actually call
        HIWebViewRegisterClass in WebKitInitForCarbon, rather than
        exporting the symbol.

        Reviewed by Chris.

        * Carbon.subproj/CarbonUtils.m:
        (WebInitForCarbon):
        * Carbon.subproj/HIWebView.m:
        * WebKit.pbproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonUtils.m b/WebKit/Carbon.subproj/CarbonUtils.m
index 4ccd2edffda177e84e31ef048a91e892bf82860d..cc1fbf01c2a351868f26969f79c2dd6eaa2bf4d0 100644 (file)
--- a/WebKit/Carbon.subproj/CarbonUtils.m
+++ b/WebKit/Carbon.subproj/CarbonUtils.m
@@ -27,6 +27,8 @@ static unsigned getNumPools()
     return numPools;
 }
 
+void                    HIWebViewRegisterClass( void );
+
 void
 WebInitForCarbon()
 {
@@ -51,6 +53,8 @@ WebInitForCarbon()
         sAppKitLoaded = true;     
 
         [NSBitmapImageRep _setEnableFlippedImageFix:YES];
+        
+        HIWebViewRegisterClass();
     }
 }
 

diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index f85315f3f3b2c804470bf09b69516f545d67ac1e..d13e5df76f26e04b44ff99fbb793e03bd5fc9887 100644 (file)
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -144,7 +144,7 @@ static const EventTypeSpec kEvents[] = {
 
 static HIWebView*              HIWebViewConstructor( HIViewRef inView );
 static void                            HIWebViewDestructor( HIWebView* view );
-static void             HIWebViewRegisterClass( void );
+void                    HIWebViewRegisterClass( void );
 
 static OSStatus                        HIWebViewEventHandler(
                                                                EventHandlerCallRef     inCallRef,
@@ -302,7 +302,6 @@ HIWebViewDestructor( HIWebView* inView )
 // HIWebViewRegisterClass
 //----------------------------------------------------------------------------------
 //
-static
 void
 HIWebViewRegisterClass()
 {

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3b7e90958b2098312e8391592e02a3c32d96c4a3..bc6b2e573e8bfaa0c88cdddd708b10f1fcbc1aa5 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,8 +1,17 @@
-=== Safari-170 ===
-
 2004-11-05  Richard Williamson   <rjw@apple.com>
 
-       Fixed <rdar://problem/3845307> WebKit needs to export _HIWebViewRegisterClass so HIWebViews can work in Carbon nib files
+        Fixed <rdar://problem/3810702> _checkNavigationPolicyForRequest:dataSource:formState:andCall:withSelector: ASSERTS when reentered from Xcode's man page viewer
+
+        Reviewed by Maciej (a long time ago).
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _loadDataSource:withLoadType:formState:]):
+
+        Fixed <rdar://problem/3845307> WebKit needs to export _HIWebViewRegisterClass so HIWebViews can work in Carbon nib files
+
+        As suggested in the bug, the fix is to actually call 
+        HIWebViewRegisterClass in WebKitInitForCarbon, rather than
+        exporting the symbol.
 
         Reviewed by Chris.
 
@@ -11,6 +20,8 @@
         * Carbon.subproj/HIWebView.m:
         * WebKit.pbproj/project.pbxproj:
 
+=== Safari-170 ===
+
 2004-11-05  Darin Adler  <darin@apple.com>
 
         Reviewed by Chris.

diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 0582b18492649199da03e21dbda7b96421c41c14..6a07f58ff43041bcca0d5dde9393d1f4c40737c2 100644 (file)
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -2283,6 +2283,8 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     [newDataSource _setJustOpenedForTargetedLink:_private->justOpenedForTargetedLink];
     _private->justOpenedForTargetedLink = NO;
 
+    [self _invalidatePendingPolicyDecisionCallingDefaultAction:YES];
+
     [self _setPolicyDataSource:newDataSource];
 
     [self _checkNavigationPolicyForRequest:[newDataSource request]