Commit a6a3baee authored by mjs's avatar mjs

Reviewed by Anders.

        
        - fix crash on back/forward - reattach WebDocumentLoadState to data source when needed

        * WebView/WebDataSource.m:
        (-[WebDataSource _setWebFrame:]):
        (-[WebDataSource _initWithDocumentLoadState:]):
        * WebView/WebDataSourceInternal.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16709 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4fb7933e
2006-10-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Anders.
- fix crash on back/forward - reattach WebDocumentLoadState to data source when needed
* WebView/WebDataSource.m:
(-[WebDataSource _setWebFrame:]):
(-[WebDataSource _initWithDocumentLoadState:]):
* WebView/WebDataSourceInternal.h:
2006-10-02 Maciej Stachowiak <mjs@apple.com>
Build fix, not reviewed.
......
......@@ -66,13 +66,13 @@
#import <WebKit/DOMHTML.h>
#import <WebKit/DOMPrivate.h>
#import <WebKitSystemInterface.h>
#import "WebDocumentLoadState.h"
#import "WebDocumentLoadStateMac.h"
@interface WebDataSourcePrivate : NSObject
{
@public
WebDocumentLoadState *loadState;
WebDocumentLoadStateMac *loadState;
id <WebDocumentRepresentation> representation;
......@@ -699,6 +699,8 @@ - (void)_setWebFrame:(WebFrame *)frame
_private->webFrame = frame;
[_private->loadState setFrameLoader:[frame _frameLoader]];
if (frame)
[_private->loadState setDataSource:self];
[self _defersCallbacksChanged];
// no need to do _defersCallbacksChanged for subframes since they too
......@@ -985,7 +987,7 @@ - (WebDocumentLoadState *)_documentLoadState
return _private->loadState;
}
- (id)_initWithDocumentLoadState:(WebDocumentLoadState *)loadState
- (id)_initWithDocumentLoadState:(WebDocumentLoadStateMac *)loadState
{
self = [super init];
if (!self) {
......
......@@ -47,6 +47,7 @@
@class WebUnarchivingState;
@class WebView;
@class WebDocumentLoadState;
@class WebDocumentLoadStateMac;
@protocol WebDocumentRepresentation;
......@@ -116,5 +117,5 @@
- (void)_setLoading:(BOOL)loading;
- (void)_updateLoading;
- (WebDocumentLoadState *)_documentLoadState;
- (id)_initWithDocumentLoadState:(WebDocumentLoadState *)loadState;
- (id)_initWithDocumentLoadState:(WebDocumentLoadStateMac *)loadState;
@end
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