[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 06:18:47 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0a2a9a72524e3f3fae073582fe197868e874aa0e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jun 14 22:26:45 2002 +0000
Lots of frame related cleanup. Added attempt to get
nested scrollbars to work correctly with window's resize
corner. Still not quite right.
Name change [IFWebFrame view] -> [IFWebFrame webView].
* WebView.subproj/IFDynamicScrollBarsView.m:
(-[IFDynamicScrollBarsView updateScrollers]):
* WebView.subproj/IFHTMLView.mm:
(-[IFHTMLView provisionalDataSourceChanged:]):
(-[IFHTMLView viewDidEndLiveResize]):
* WebView.subproj/IFMainURLHandleClient.mm:
(-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
* WebView.subproj/IFWebController.h:
* WebView.subproj/IFWebController.mm:
(-[IFWebController initWithView:provisionalDataSource:]):
(-[IFWebController createFrameNamed:for:inParent:inScrollView:]):
(-[IFWebController _frameForView:fromFrame:]):
(-[IFWebController frameForView:]):
(-[IFWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
* WebView.subproj/IFWebControllerPrivate.mm:
(-[IFWebControllerPrivate _clearControllerReferences:]):
* WebView.subproj/IFWebFrame.h:
* WebView.subproj/IFWebFrame.mm:
(-[IFWebFrame init]):
(-[IFWebFrame initWithName:webView:provisionalDataSource:controller:]):
(-[IFWebFrame setWebView:]):
(-[IFWebFrame webView]):
(-[IFWebFrame setProvisionalDataSource:]):
(-[IFWebFrame reset]):
* WebView.subproj/IFWebFramePrivate.h:
* WebView.subproj/IFWebFramePrivate.mm:
(-[IFWebFramePrivate dealloc]):
(-[IFWebFramePrivate setWebView:]):
(-[IFWebFrame _timedLayout:]):
(-[IFWebFrame _transitionProvisionalToCommitted]):
(-[IFWebFrame _setState:]):
(-[IFWebFrame _isLoadComplete]):
Name change [IFWebFrame view] -> [IFWebFrame webView].
* BrowserDocument.m:
(-[BrowserDocument mainWebView]):
(-[BrowserDocument setMainWebView:]):
* BrowserWindow.m:
(-[BrowserWindow frameLoadStarted:]):
(-[BrowserWindow frameLoadCommitted:]):
(-[BrowserWindow frameLoadRedirected:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler _saveScrollPosition]):
(-[LocationChangeHandler _scrollToTop]):
(-[LocationChangeHandler _restoreScrollPosition]):
Name change view -> webView.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPartImpl::requestFrame):
* kwq/external.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1356 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9ac1e9a..a410d30 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-06-14 Richard Williamson <rjw at apple.com>
+
+ Name change view -> webView.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::requestFrame):
+ * kwq/external.h:
+
2002-06-14 Chris Blumenberg <cblu at apple.com>
Put #ifndef APPLE_CHANGES around one line that
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9ac1e9a..a410d30 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-06-14 Richard Williamson <rjw at apple.com>
+
+ Name change view -> webView.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::requestFrame):
+ * kwq/external.h:
+
2002-06-14 Chris Blumenberg <cblu at apple.com>
Put #ifndef APPLE_CHANGES around one line that
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9ac1e9a..a410d30 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-06-14 Richard Williamson <rjw at apple.com>
+
+ Name change view -> webView.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPartImpl::requestFrame):
+ * kwq/external.h:
+
2002-06-14 Chris Blumenberg <cblu at apple.com>
Put #ifndef APPLE_CHANGES around one line that
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 9678606..fb3beee 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -465,11 +465,11 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
aFrame =[dataSource frameNamed: nsframeName];
if (aFrame){
KWQDEBUGLEVEL (KWQ_LOG_FRAMES, "found %s\n", [nsframeName cString]);
- QWidget *khtmlview = [[[aFrame view] documentView] _provisionalWidget];
+ QWidget *khtmlview = [[[aFrame webView] documentView] _provisionalWidget];
if (khtmlview)
frame->setWidget (khtmlview);
else
- frame->setWidget ([[[aFrame view] documentView] _widget]);
+ frame->setWidget ([[[aFrame webView] documentView] _widget]);
}
else {
KWQDEBUGLEVEL (KWQ_LOG_FRAMES, "creating %s\n", [nsframeName cString]);
@@ -499,8 +499,8 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
[newFrame setProvisionalDataSource: newDataSource];
- [[newFrame view] _setMarginWidth: o->getMarginWidth()];
- [[newFrame view] _setMarginHeight: o->getMarginHeight()];
+ [[newFrame webView] _setMarginWidth: o->getMarginWidth()];
+ [[newFrame webView] _setMarginHeight: o->getMarginHeight()];
[newFrame startLoading];
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 9678606..fb3beee 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -465,11 +465,11 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
aFrame =[dataSource frameNamed: nsframeName];
if (aFrame){
KWQDEBUGLEVEL (KWQ_LOG_FRAMES, "found %s\n", [nsframeName cString]);
- QWidget *khtmlview = [[[aFrame view] documentView] _provisionalWidget];
+ QWidget *khtmlview = [[[aFrame webView] documentView] _provisionalWidget];
if (khtmlview)
frame->setWidget (khtmlview);
else
- frame->setWidget ([[[aFrame view] documentView] _widget]);
+ frame->setWidget ([[[aFrame webView] documentView] _widget]);
}
else {
KWQDEBUGLEVEL (KWQ_LOG_FRAMES, "creating %s\n", [nsframeName cString]);
@@ -499,8 +499,8 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
[newFrame setProvisionalDataSource: newDataSource];
- [[newFrame view] _setMarginWidth: o->getMarginWidth()];
- [[newFrame view] _setMarginHeight: o->getMarginHeight()];
+ [[newFrame webView] _setMarginWidth: o->getMarginWidth()];
+ [[newFrame webView] _setMarginHeight: o->getMarginHeight()];
[newFrame startLoading];
}
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index 618ade0..1868eda 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -97,11 +97,11 @@ namespace khtml {
- (int)_marginWidth;
- (void)_setMarginHeight: (int)h;
- (int)_marginHeight;
+- (id)documentView;
@end
@interface IFWebFrame: NSObject
-- initWithName: (NSString *)n view: v dataSource: (IFWebDataSource *)d;
-- view;
+- (IFWebView *)webView;
- (IFWebDataSource *)dataSource;
- (IFWebDataSource *)provisionalDataSource;
- (void)setProvisionalDataSource: (IFWebDataSource *)ds;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9de8306..12adf17 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,46 @@
2002-06-14 Richard Williamson <rjw at apple.com>
+ Lots of frame related cleanup. Added attempt to get
+ nested scrollbars to work correctly with window's resize
+ corner. Still not quite right.
+
+ Name change [IFWebFrame view] -> [IFWebFrame webView].
+
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ (-[IFDynamicScrollBarsView updateScrollers]):
+ * WebView.subproj/IFHTMLView.mm:
+ (-[IFHTMLView provisionalDataSourceChanged:]):
+ (-[IFHTMLView viewDidEndLiveResize]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebController.mm:
+ (-[IFWebController initWithView:provisionalDataSource:]):
+ (-[IFWebController createFrameNamed:for:inParent:inScrollView:]):
+ (-[IFWebController _frameForView:fromFrame:]):
+ (-[IFWebController frameForView:]):
+ (-[IFWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebControllerPrivate _clearControllerReferences:]):
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.mm:
+ (-[IFWebFrame init]):
+ (-[IFWebFrame initWithName:webView:provisionalDataSource:controller:]):
+ (-[IFWebFrame setWebView:]):
+ (-[IFWebFrame webView]):
+ (-[IFWebFrame setProvisionalDataSource:]):
+ (-[IFWebFrame reset]):
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFramePrivate dealloc]):
+ (-[IFWebFramePrivate setWebView:]):
+ (-[IFWebFrame _timedLayout:]):
+ (-[IFWebFrame _transitionProvisionalToCommitted]):
+ (-[IFWebFrame _setState:]):
+ (-[IFWebFrame _isLoadComplete]):
+
+2002-06-14 Richard Williamson <rjw at apple.com>
+
* WebView.subproj/IFHTMLView.mm:
(-[IFHTMLView initWithFrame:]):
Added notification so we can intelligently add/remove
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9de8306..12adf17 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,46 @@
2002-06-14 Richard Williamson <rjw at apple.com>
+ Lots of frame related cleanup. Added attempt to get
+ nested scrollbars to work correctly with window's resize
+ corner. Still not quite right.
+
+ Name change [IFWebFrame view] -> [IFWebFrame webView].
+
+ * WebView.subproj/IFDynamicScrollBarsView.m:
+ (-[IFDynamicScrollBarsView updateScrollers]):
+ * WebView.subproj/IFHTMLView.mm:
+ (-[IFHTMLView provisionalDataSourceChanged:]):
+ (-[IFHTMLView viewDidEndLiveResize]):
+ * WebView.subproj/IFMainURLHandleClient.mm:
+ (-[IFMainURLHandleClient IFURLHandle:resourceDataDidBecomeAvailable:]):
+ * WebView.subproj/IFWebController.h:
+ * WebView.subproj/IFWebController.mm:
+ (-[IFWebController initWithView:provisionalDataSource:]):
+ (-[IFWebController createFrameNamed:for:inParent:inScrollView:]):
+ (-[IFWebController _frameForView:fromFrame:]):
+ (-[IFWebController frameForView:]):
+ (-[IFWebController haveContentPolicy:andPath:forLocationChangeHandler:]):
+ * WebView.subproj/IFWebControllerPrivate.mm:
+ (-[IFWebControllerPrivate _clearControllerReferences:]):
+ * WebView.subproj/IFWebFrame.h:
+ * WebView.subproj/IFWebFrame.mm:
+ (-[IFWebFrame init]):
+ (-[IFWebFrame initWithName:webView:provisionalDataSource:controller:]):
+ (-[IFWebFrame setWebView:]):
+ (-[IFWebFrame webView]):
+ (-[IFWebFrame setProvisionalDataSource:]):
+ (-[IFWebFrame reset]):
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFramePrivate dealloc]):
+ (-[IFWebFramePrivate setWebView:]):
+ (-[IFWebFrame _timedLayout:]):
+ (-[IFWebFrame _transitionProvisionalToCommitted]):
+ (-[IFWebFrame _setState:]):
+ (-[IFWebFrame _isLoadComplete]):
+
+2002-06-14 Richard Williamson <rjw at apple.com>
+
* WebView.subproj/IFHTMLView.mm:
(-[IFHTMLView initWithFrame:]):
Added notification so we can intelligently add/remove
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
index 18ea174..51891df 100644
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
@@ -54,6 +54,8 @@
[self setHasVerticalScroller: scrollsVertically];
[self setHasHorizontalScroller: scrollsHorizontally];
}
+ [self tile];
+ [self setNeedsDisplay: YES];
}
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index dfce461..5f148ac 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -28,6 +28,10 @@
#import <KWQKHTMLPartImpl.h>
+ at interface NSScrollView (NSPrivate)
+- (void)_adjustForGrowBox;
+ at end
+
@implementation IFHTMLView
- initWithFrame: (NSRect) frame
@@ -111,10 +115,10 @@
[provisionalView release];
- int mw = [[[dataSource webFrame] view] _marginWidth];
+ int mw = [[[dataSource webFrame] webView] _marginWidth];
if (mw >= 0)
_private->provisionalWidget->setMarginWidth (mw);
- int mh = [[[dataSource webFrame] view] _marginHeight];
+ int mh = [[[dataSource webFrame] webView] _marginHeight];
if (mh >= 0)
_private->provisionalWidget->setMarginHeight (mh);
@@ -415,10 +419,15 @@
- (void)viewDidEndLiveResize
{
id scrollView = [[self superview] superview];
+
//[scrollView setAllowsScrolling: _private->liveAllowsScrolling];
+
+ [scrollView updateScrollers];
+ [scrollView tile];
+
[self setNeedsLayout: YES];
[self setNeedsDisplay: YES];
- [scrollView updateScrollers];
+ [scrollView setNeedsDisplay: YES];
}
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index a74f0b1..f8fb25c 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -118,7 +118,7 @@
int contentLengthReceived = [sender contentLengthReceived];
NSString *contentType = [sender contentType];
IFWebFrame *frame = [dataSource webFrame];
- IFWebView *view = [frame view];
+ IFWebView *view = [frame webView];
IFContentPolicy contentPolicy;
NSData *data = nil;
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 61a4270..e280fbc 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -135,7 +135,7 @@ typedef enum {
// Return the frame associated with the view. Traverses the
// frame tree to find the data source. Typically aView is
// an IFWebView.
-- (IFWebFrame *)frameForView: (NSView *)aView;
+- (IFWebFrame *)frameForView: (IFWebView *)aView;
// DEPRECATED
- (id <IFLocationChangeHandler>)provideLocationChangeHandlerForFrame: (IFWebFrame *)frame;
diff --git a/WebKit/WebView.subproj/IFWebController.mm b/WebKit/WebView.subproj/IFWebController.mm
index 06fc5a6..e268503 100644
--- a/WebKit/WebView.subproj/IFWebController.mm
+++ b/WebKit/WebView.subproj/IFWebController.mm
@@ -31,7 +31,7 @@
[super init];
_private = [[IFWebControllerPrivate alloc] init];
- _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" view: view provisionalDataSource: dataSource controller: self];
+ _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
return self;
}
@@ -60,7 +60,7 @@
childView = [[[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
- newFrame = [[[IFWebFrame alloc] initWithName: fname view: childView provisionalDataSource: childDataSource controller: self] autorelease];
+ newFrame = [[[IFWebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
[parentDataSource addFrame: newFrame];
@@ -171,13 +171,13 @@
}
-- (IFWebFrame *)_frameForView: (NSView *)aView fromFrame: (IFWebFrame *)frame
+- (IFWebFrame *)_frameForView: (IFWebView *)aView fromFrame: (IFWebFrame *)frame
{
NSArray *frames;
int i, count;
IFWebFrame *result, *aFrame;
- if ([frame view] == aView)
+ if ([frame webView] == aView)
return frame;
frames = [[frame dataSource] children];
@@ -202,7 +202,7 @@
}
-- (IFWebFrame *)frameForView: (NSView *)aView
+- (IFWebFrame *)frameForView: (IFWebView *)aView
{
IFWebFrame *frame = [self mainFrame];
@@ -275,7 +275,7 @@
dataRepresentation = [IFWebDataSource createRepresentationForMIMEType:MIMEType];
[dataSource _setRepresentation:dataRepresentation];
- webView = [[dataSource webFrame] view];
+ webView = [[dataSource webFrame] webView];
documentView = [IFWebView createViewForMIMEType:MIMEType];
[webView _setDocumentView: documentView];
[documentView provisionalDataSourceChanged: dataSource];
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index 9e630cf..68b4c27 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -33,7 +33,7 @@
int i, count;
[[aFrame dataSource] _setController: nil];
- [[aFrame view] _setController: nil];
+ [[aFrame webView] _setController: nil];
[aFrame _setController: nil];
// Walk the frame tree, niling the controller.
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
index 5f920f7..957c2d0 100644
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ b/WebKit/WebView.subproj/IFWebFrame.h
@@ -9,8 +9,9 @@
#import <Foundation/Foundation.h>
@class IFError;
- at class IFWebDataSource;
@class IFWebController;
+ at class IFWebDataSource;
+ at class IFWebView;
@class IFWebFramePrivate;
@@ -20,14 +21,14 @@
IFWebFramePrivate *_private;
}
-- initWithName: (NSString *)name view: view provisionalDataSource: (IFWebDataSource *)dataSource controller: (IFWebController *)controller;
+- initWithName: (NSString *)name webView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource controller: (IFWebController *)controller;
- (NSString *)name;
- (void)setController: (IFWebController *)controller;
- (IFWebController *)controller;
-- (void)setView: (id)view;
-- (id)view;
+- (void)setWebView: (IFWebView *)view;
+- (IFWebView *)webView;
/*
Sets the frame's data source. Note that the data source will be
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 9986904..6e81489 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -26,10 +26,10 @@
- init
{
- return [self initWithName: nil view: nil provisionalDataSource: nil controller: nil];
+ return [self initWithName: nil webView: nil provisionalDataSource: nil controller: nil];
}
-- initWithName: (NSString *)n view: v provisionalDataSource: (IFWebDataSource *)d controller: (IFWebController *)c
+- initWithName: (NSString *)n webView: (IFWebView *)v provisionalDataSource: (IFWebDataSource *)d controller: (IFWebController *)c
{
[super init];
@@ -61,7 +61,7 @@
[_private setName: n];
if (v)
- [self setView: v];
+ [self setWebView: v];
return self;
}
@@ -78,15 +78,15 @@
}
-- (void)setView: v
+- (void)setWebView: (IFWebView *)v
{
- [_private setView: v];
+ [_private setWebView: v];
[v _setController: [self controller]];
}
-- view
+- (IFWebView *)webView
{
- return [_private view];
+ return [_private webView];
}
- (IFWebController *)controller
@@ -126,7 +126,7 @@
// Unfortunately the view must be non-nil, this is ultimately due
// to KDE parser requiring a KHTMLView. Once we settle on a final
// KDE drop we should fix this dependency.
- WEBKIT_ASSERT ([self view] != nil);
+ WEBKIT_ASSERT ([self webView] != nil);
urlPolicy = [[self controller] URLPolicyForURL:[newDataSource inputURL]];
@@ -154,9 +154,9 @@
[_private setProvisionalDataSource: newDataSource];
- //[[self view] provisionalDataSourceChanged: newDataSource];
- //[[[self view] documentView] provisionalDataSourceChanged: newDataSource];
-
+ // We tell the documentView provisionalDataSourceChanged:
+ // once it has been created by the controller.
+
[self _setState: IFWEBFRAMESTATE_PROVISIONAL];
}
else if(urlPolicy == IFURLPolicyOpenExternally){
@@ -199,9 +199,9 @@
- (void)reset
{
[_private setDataSource: nil];
- if([[[self view] documentView] isKindOfClass: NSClassFromString(@"IFHTMLView")])
- [[[self view] documentView] _resetWidget];
- [_private setView: nil];
+ if([[[self webView] documentView] isKindOfClass: NSClassFromString(@"IFHTMLView")])
+ [[[self webView] documentView] _resetWidget];
+ [_private setWebView: nil];
}
+ _frameNamed:(NSString *)name fromFrame: (IFWebFrame *)aFrame
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
index f8fb956..69b4422 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.h
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.h
@@ -39,7 +39,7 @@ typedef enum {
@interface IFWebFramePrivate : NSObject
{
NSString *name;
- IFWebView *view;
+ IFWebView *webView;
IFWebDataSource *dataSource;
IFWebDataSource *provisionalDataSource;
khtml::RenderPart *renderFramePart;
@@ -52,8 +52,8 @@ typedef enum {
- (NSString *)name;
- (void)setController: (IFWebController *)c;
- (IFWebController *)controller;
-- (void)setView: v;
-- view;
+- (void)setWebView: (IFWebView *)v;
+- (IFWebView *)webView;
- (void)setDataSource: (IFWebDataSource *)d;
- (IFWebDataSource *)dataSource;
- (void)setProvisionalDataSource: (IFWebDataSource *)d;
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index a9b38b8..019c9c5 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -37,12 +37,12 @@ static const char * const stateNames[6] = {
- (void)dealloc
{
- [view _setController: nil];
+ [webView _setController: nil];
[dataSource _setController: nil];
[provisionalDataSource _setController: nil];
[name autorelease];
- [view autorelease];
+ [webView autorelease];
[dataSource autorelease];
[provisionalDataSource autorelease];
if (renderFramePart)
@@ -57,11 +57,11 @@ static const char * const stateNames[6] = {
name = [n retain];
}
-- view { return view; }
-- (void)setView: v
+- (IFWebView *)webView { return webView; }
+- (void)setWebView: (IFWebView *)v
{
- [view autorelease];
- view = [v retain];
+ [webView autorelease];
+ webView = [v retain];
}
- (IFWebDataSource *)dataSource { return dataSource; }
@@ -138,12 +138,12 @@ static const char * const stateNames[6] = {
_private->scheduledLayoutPending = NO;
if (_private->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
- id documentView = [[self view] documentView];
+ id documentView = [[self webView] documentView];
if ([self controller])
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- if([[self view] isDocumentHTML])
+ if([[self webView] isDocumentHTML])
[documentView setNeedsLayout: YES];
[documentView setNeedsDisplay: YES];
@@ -207,8 +207,8 @@ static const char * const stateNames[6] = {
- (void)_transitionProvisionalToCommitted
{
WEBKIT_ASSERT ([self controller] != nil);
- id documentView = [[self view] documentView];
- BOOL isDocumentHTML = [[self view] isDocumentHTML];
+ id documentView = [[self webView] documentView];
+ BOOL isDocumentHTML = [[self webView] isDocumentHTML];
switch ([self _state]) {
case IFWEBFRAMESTATE_PROVISIONAL:
@@ -289,11 +289,11 @@ static const char * const stateNames[6] = {
_private->state = newState;
if (_private->state == IFWEBFRAMESTATE_PROVISIONAL){
- [[[self view] frameScrollView] setDrawsBackground: NO];
+ [[[self webView] frameScrollView] setDrawsBackground: NO];
}
if (_private->state == IFWEBFRAMESTATE_COMPLETE){
- [[[self view] frameScrollView] setDrawsBackground: YES];
+ [[[self webView] frameScrollView] setDrawsBackground: YES];
}
}
@@ -341,43 +341,43 @@ static const char * const stateNames[6] = {
//WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMMITTED\n", [[self name] cString]);
if (![ds isLoading]) {
- id mainView = [[[self controller] mainFrame] view];
- id thisView = [self view];
+ id mainView = [[[self controller] mainFrame] webView];
id mainDocumentView = [mainView documentView];
+ id thisView = [self webView];
+ id thisDocumentView = [thisView documentView];
[self _setState: IFWEBFRAMESTATE_COMPLETE];
if([ds _isDocumentHTML])
[[ds representation] part]->end();
+ // We have to layout the main document as
+ // it may change the size of frames.
if ([mainView isDocumentHTML]){
- // May need to relayout each time a frame is completely
- // loaded.
[mainDocumentView setNeedsLayout: YES];
}
-
+ [mainDocumentView layout];
+
+ // Tell the just loaded document to layout. This may be necessary
+ // for non-html content that needs a layout message.
if ([thisView isDocumentHTML]){
- // Layout this view (eventually).
- [[thisView documentView] setNeedsLayout: YES];
+ [thisDocumentView setNeedsLayout: YES];
}
+ [[thisView documentView] layout];
// Jump to anchor point, if necessary.
if ([ds _isDocumentHTML])
[[ds representation] part]->impl->gotoBaseAnchor();
- // Draw this view (eventually), and it's scroll view
- // (eventually).
- //[[thisView documentView] setNeedsDisplay: YES];
- //[[thisView frameScrollView] setNeedsDisplay: YES];
- [[thisView frameScrollView] display];
- [[thisView documentView] display];
-
- // Force a relayout and draw NOW if we are complete are the top level.
- if ([[self controller] mainFrame] == self) {
- [mainDocumentView layout];
- [mainDocumentView display];
- }
+ // FIXME: We have to draw the whole document hierarchy. We should be
+ // able to just draw the document associated with this
+ // frame, but that doesn't work. Not sure why.
+ [mainDocumentView setNeedsDisplay: YES];
+ // This should be redundant, given the setNeedsDisplay: on the
+ // main view above.
+ [thisDocumentView setNeedsDisplay: YES];
+
[[ds _locationChangeHandler] locationChangeDone: [ds mainDocumentError]];
//if ([ds _isDocumentHTML])
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 61a4270..e280fbc 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -135,7 +135,7 @@ typedef enum {
// Return the frame associated with the view. Traverses the
// frame tree to find the data source. Typically aView is
// an IFWebView.
-- (IFWebFrame *)frameForView: (NSView *)aView;
+- (IFWebFrame *)frameForView: (IFWebView *)aView;
// DEPRECATED
- (id <IFLocationChangeHandler>)provideLocationChangeHandlerForFrame: (IFWebFrame *)frame;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 06fc5a6..e268503 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -31,7 +31,7 @@
[super init];
_private = [[IFWebControllerPrivate alloc] init];
- _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" view: view provisionalDataSource: dataSource controller: self];
+ _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
return self;
}
@@ -60,7 +60,7 @@
childView = [[[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
- newFrame = [[[IFWebFrame alloc] initWithName: fname view: childView provisionalDataSource: childDataSource controller: self] autorelease];
+ newFrame = [[[IFWebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
[parentDataSource addFrame: newFrame];
@@ -171,13 +171,13 @@
}
-- (IFWebFrame *)_frameForView: (NSView *)aView fromFrame: (IFWebFrame *)frame
+- (IFWebFrame *)_frameForView: (IFWebView *)aView fromFrame: (IFWebFrame *)frame
{
NSArray *frames;
int i, count;
IFWebFrame *result, *aFrame;
- if ([frame view] == aView)
+ if ([frame webView] == aView)
return frame;
frames = [[frame dataSource] children];
@@ -202,7 +202,7 @@
}
-- (IFWebFrame *)frameForView: (NSView *)aView
+- (IFWebFrame *)frameForView: (IFWebView *)aView
{
IFWebFrame *frame = [self mainFrame];
@@ -275,7 +275,7 @@
dataRepresentation = [IFWebDataSource createRepresentationForMIMEType:MIMEType];
[dataSource _setRepresentation:dataRepresentation];
- webView = [[dataSource webFrame] view];
+ webView = [[dataSource webFrame] webView];
documentView = [IFWebView createViewForMIMEType:MIMEType];
[webView _setDocumentView: documentView];
[documentView provisionalDataSourceChanged: dataSource];
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 9e630cf..68b4c27 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -33,7 +33,7 @@
int i, count;
[[aFrame dataSource] _setController: nil];
- [[aFrame view] _setController: nil];
+ [[aFrame webView] _setController: nil];
[aFrame _setController: nil];
// Walk the frame tree, niling the controller.
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index 18ea174..51891df 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -54,6 +54,8 @@
[self setHasVerticalScroller: scrollsVertically];
[self setHasHorizontalScroller: scrollsHorizontally];
}
+ [self tile];
+ [self setNeedsDisplay: YES];
}
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 5f920f7..957c2d0 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -9,8 +9,9 @@
#import <Foundation/Foundation.h>
@class IFError;
- at class IFWebDataSource;
@class IFWebController;
+ at class IFWebDataSource;
+ at class IFWebView;
@class IFWebFramePrivate;
@@ -20,14 +21,14 @@
IFWebFramePrivate *_private;
}
-- initWithName: (NSString *)name view: view provisionalDataSource: (IFWebDataSource *)dataSource controller: (IFWebController *)controller;
+- initWithName: (NSString *)name webView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource controller: (IFWebController *)controller;
- (NSString *)name;
- (void)setController: (IFWebController *)controller;
- (IFWebController *)controller;
-- (void)setView: (id)view;
-- (id)view;
+- (void)setWebView: (IFWebView *)view;
+- (IFWebView *)webView;
/*
Sets the frame's data source. Note that the data source will be
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 9986904..6e81489 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -26,10 +26,10 @@
- init
{
- return [self initWithName: nil view: nil provisionalDataSource: nil controller: nil];
+ return [self initWithName: nil webView: nil provisionalDataSource: nil controller: nil];
}
-- initWithName: (NSString *)n view: v provisionalDataSource: (IFWebDataSource *)d controller: (IFWebController *)c
+- initWithName: (NSString *)n webView: (IFWebView *)v provisionalDataSource: (IFWebDataSource *)d controller: (IFWebController *)c
{
[super init];
@@ -61,7 +61,7 @@
[_private setName: n];
if (v)
- [self setView: v];
+ [self setWebView: v];
return self;
}
@@ -78,15 +78,15 @@
}
-- (void)setView: v
+- (void)setWebView: (IFWebView *)v
{
- [_private setView: v];
+ [_private setWebView: v];
[v _setController: [self controller]];
}
-- view
+- (IFWebView *)webView
{
- return [_private view];
+ return [_private webView];
}
- (IFWebController *)controller
@@ -126,7 +126,7 @@
// Unfortunately the view must be non-nil, this is ultimately due
// to KDE parser requiring a KHTMLView. Once we settle on a final
// KDE drop we should fix this dependency.
- WEBKIT_ASSERT ([self view] != nil);
+ WEBKIT_ASSERT ([self webView] != nil);
urlPolicy = [[self controller] URLPolicyForURL:[newDataSource inputURL]];
@@ -154,9 +154,9 @@
[_private setProvisionalDataSource: newDataSource];
- //[[self view] provisionalDataSourceChanged: newDataSource];
- //[[[self view] documentView] provisionalDataSourceChanged: newDataSource];
-
+ // We tell the documentView provisionalDataSourceChanged:
+ // once it has been created by the controller.
+
[self _setState: IFWEBFRAMESTATE_PROVISIONAL];
}
else if(urlPolicy == IFURLPolicyOpenExternally){
@@ -199,9 +199,9 @@
- (void)reset
{
[_private setDataSource: nil];
- if([[[self view] documentView] isKindOfClass: NSClassFromString(@"IFHTMLView")])
- [[[self view] documentView] _resetWidget];
- [_private setView: nil];
+ if([[[self webView] documentView] isKindOfClass: NSClassFromString(@"IFHTMLView")])
+ [[[self webView] documentView] _resetWidget];
+ [_private setWebView: nil];
}
+ _frameNamed:(NSString *)name fromFrame: (IFWebFrame *)aFrame
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index f8fb956..69b4422 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -39,7 +39,7 @@ typedef enum {
@interface IFWebFramePrivate : NSObject
{
NSString *name;
- IFWebView *view;
+ IFWebView *webView;
IFWebDataSource *dataSource;
IFWebDataSource *provisionalDataSource;
khtml::RenderPart *renderFramePart;
@@ -52,8 +52,8 @@ typedef enum {
- (NSString *)name;
- (void)setController: (IFWebController *)c;
- (IFWebController *)controller;
-- (void)setView: v;
-- view;
+- (void)setWebView: (IFWebView *)v;
+- (IFWebView *)webView;
- (void)setDataSource: (IFWebDataSource *)d;
- (IFWebDataSource *)dataSource;
- (void)setProvisionalDataSource: (IFWebDataSource *)d;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index a9b38b8..019c9c5 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -37,12 +37,12 @@ static const char * const stateNames[6] = {
- (void)dealloc
{
- [view _setController: nil];
+ [webView _setController: nil];
[dataSource _setController: nil];
[provisionalDataSource _setController: nil];
[name autorelease];
- [view autorelease];
+ [webView autorelease];
[dataSource autorelease];
[provisionalDataSource autorelease];
if (renderFramePart)
@@ -57,11 +57,11 @@ static const char * const stateNames[6] = {
name = [n retain];
}
-- view { return view; }
-- (void)setView: v
+- (IFWebView *)webView { return webView; }
+- (void)setWebView: (IFWebView *)v
{
- [view autorelease];
- view = [v retain];
+ [webView autorelease];
+ webView = [v retain];
}
- (IFWebDataSource *)dataSource { return dataSource; }
@@ -138,12 +138,12 @@ static const char * const stateNames[6] = {
_private->scheduledLayoutPending = NO;
if (_private->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
- id documentView = [[self view] documentView];
+ id documentView = [[self webView] documentView];
if ([self controller])
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- if([[self view] isDocumentHTML])
+ if([[self webView] isDocumentHTML])
[documentView setNeedsLayout: YES];
[documentView setNeedsDisplay: YES];
@@ -207,8 +207,8 @@ static const char * const stateNames[6] = {
- (void)_transitionProvisionalToCommitted
{
WEBKIT_ASSERT ([self controller] != nil);
- id documentView = [[self view] documentView];
- BOOL isDocumentHTML = [[self view] isDocumentHTML];
+ id documentView = [[self webView] documentView];
+ BOOL isDocumentHTML = [[self webView] isDocumentHTML];
switch ([self _state]) {
case IFWEBFRAMESTATE_PROVISIONAL:
@@ -289,11 +289,11 @@ static const char * const stateNames[6] = {
_private->state = newState;
if (_private->state == IFWEBFRAMESTATE_PROVISIONAL){
- [[[self view] frameScrollView] setDrawsBackground: NO];
+ [[[self webView] frameScrollView] setDrawsBackground: NO];
}
if (_private->state == IFWEBFRAMESTATE_COMPLETE){
- [[[self view] frameScrollView] setDrawsBackground: YES];
+ [[[self webView] frameScrollView] setDrawsBackground: YES];
}
}
@@ -341,43 +341,43 @@ static const char * const stateNames[6] = {
//WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMMITTED\n", [[self name] cString]);
if (![ds isLoading]) {
- id mainView = [[[self controller] mainFrame] view];
- id thisView = [self view];
+ id mainView = [[[self controller] mainFrame] webView];
id mainDocumentView = [mainView documentView];
+ id thisView = [self webView];
+ id thisDocumentView = [thisView documentView];
[self _setState: IFWEBFRAMESTATE_COMPLETE];
if([ds _isDocumentHTML])
[[ds representation] part]->end();
+ // We have to layout the main document as
+ // it may change the size of frames.
if ([mainView isDocumentHTML]){
- // May need to relayout each time a frame is completely
- // loaded.
[mainDocumentView setNeedsLayout: YES];
}
-
+ [mainDocumentView layout];
+
+ // Tell the just loaded document to layout. This may be necessary
+ // for non-html content that needs a layout message.
if ([thisView isDocumentHTML]){
- // Layout this view (eventually).
- [[thisView documentView] setNeedsLayout: YES];
+ [thisDocumentView setNeedsLayout: YES];
}
+ [[thisView documentView] layout];
// Jump to anchor point, if necessary.
if ([ds _isDocumentHTML])
[[ds representation] part]->impl->gotoBaseAnchor();
- // Draw this view (eventually), and it's scroll view
- // (eventually).
- //[[thisView documentView] setNeedsDisplay: YES];
- //[[thisView frameScrollView] setNeedsDisplay: YES];
- [[thisView frameScrollView] display];
- [[thisView documentView] display];
-
- // Force a relayout and draw NOW if we are complete are the top level.
- if ([[self controller] mainFrame] == self) {
- [mainDocumentView layout];
- [mainDocumentView display];
- }
+ // FIXME: We have to draw the whole document hierarchy. We should be
+ // able to just draw the document associated with this
+ // frame, but that doesn't work. Not sure why.
+ [mainDocumentView setNeedsDisplay: YES];
+ // This should be redundant, given the setNeedsDisplay: on the
+ // main view above.
+ [thisDocumentView setNeedsDisplay: YES];
+
[[ds _locationChangeHandler] locationChangeDone: [ds mainDocumentError]];
//if ([ds _isDocumentHTML])
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index dfce461..5f148ac 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -28,6 +28,10 @@
#import <KWQKHTMLPartImpl.h>
+ at interface NSScrollView (NSPrivate)
+- (void)_adjustForGrowBox;
+ at end
+
@implementation IFHTMLView
- initWithFrame: (NSRect) frame
@@ -111,10 +115,10 @@
[provisionalView release];
- int mw = [[[dataSource webFrame] view] _marginWidth];
+ int mw = [[[dataSource webFrame] webView] _marginWidth];
if (mw >= 0)
_private->provisionalWidget->setMarginWidth (mw);
- int mh = [[[dataSource webFrame] view] _marginHeight];
+ int mh = [[[dataSource webFrame] webView] _marginHeight];
if (mh >= 0)
_private->provisionalWidget->setMarginHeight (mh);
@@ -415,10 +419,15 @@
- (void)viewDidEndLiveResize
{
id scrollView = [[self superview] superview];
+
//[scrollView setAllowsScrolling: _private->liveAllowsScrolling];
+
+ [scrollView updateScrollers];
+ [scrollView tile];
+
[self setNeedsLayout: YES];
[self setNeedsDisplay: YES];
- [scrollView updateScrollers];
+ [scrollView setNeedsDisplay: YES];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index a74f0b1..f8fb25c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -118,7 +118,7 @@
int contentLengthReceived = [sender contentLengthReceived];
NSString *contentType = [sender contentType];
IFWebFrame *frame = [dataSource webFrame];
- IFWebView *view = [frame view];
+ IFWebView *view = [frame webView];
IFContentPolicy contentPolicy;
NSData *data = nil;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index a74f0b1..f8fb25c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -118,7 +118,7 @@
int contentLengthReceived = [sender contentLengthReceived];
NSString *contentType = [sender contentType];
IFWebFrame *frame = [dataSource webFrame];
- IFWebView *view = [frame view];
+ IFWebView *view = [frame webView];
IFContentPolicy contentPolicy;
NSData *data = nil;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 61a4270..e280fbc 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -135,7 +135,7 @@ typedef enum {
// Return the frame associated with the view. Traverses the
// frame tree to find the data source. Typically aView is
// an IFWebView.
-- (IFWebFrame *)frameForView: (NSView *)aView;
+- (IFWebFrame *)frameForView: (IFWebView *)aView;
// DEPRECATED
- (id <IFLocationChangeHandler>)provideLocationChangeHandlerForFrame: (IFWebFrame *)frame;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 06fc5a6..e268503 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -31,7 +31,7 @@
[super init];
_private = [[IFWebControllerPrivate alloc] init];
- _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" view: view provisionalDataSource: dataSource controller: self];
+ _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
return self;
}
@@ -60,7 +60,7 @@
childView = [[[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
- newFrame = [[[IFWebFrame alloc] initWithName: fname view: childView provisionalDataSource: childDataSource controller: self] autorelease];
+ newFrame = [[[IFWebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
[parentDataSource addFrame: newFrame];
@@ -171,13 +171,13 @@
}
-- (IFWebFrame *)_frameForView: (NSView *)aView fromFrame: (IFWebFrame *)frame
+- (IFWebFrame *)_frameForView: (IFWebView *)aView fromFrame: (IFWebFrame *)frame
{
NSArray *frames;
int i, count;
IFWebFrame *result, *aFrame;
- if ([frame view] == aView)
+ if ([frame webView] == aView)
return frame;
frames = [[frame dataSource] children];
@@ -202,7 +202,7 @@
}
-- (IFWebFrame *)frameForView: (NSView *)aView
+- (IFWebFrame *)frameForView: (IFWebView *)aView
{
IFWebFrame *frame = [self mainFrame];
@@ -275,7 +275,7 @@
dataRepresentation = [IFWebDataSource createRepresentationForMIMEType:MIMEType];
[dataSource _setRepresentation:dataRepresentation];
- webView = [[dataSource webFrame] view];
+ webView = [[dataSource webFrame] webView];
documentView = [IFWebView createViewForMIMEType:MIMEType];
[webView _setDocumentView: documentView];
[documentView provisionalDataSourceChanged: dataSource];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 9e630cf..68b4c27 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -33,7 +33,7 @@
int i, count;
[[aFrame dataSource] _setController: nil];
- [[aFrame view] _setController: nil];
+ [[aFrame webView] _setController: nil];
[aFrame _setController: nil];
// Walk the frame tree, niling the controller.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list