[webkit-changes] cvs commit: WebKit/WebView.subproj WebFrame.m
WebFrameView.m WebFrameViewInternal.h WebView.m WebViewPrivate.h
Maciej
mjs at opensource.apple.com
Thu Dec 15 14:17:59 PST 2005
mjs 05/12/15 14:17:59
Modified: . ChangeLog
Misc.subproj WebNSViewExtras.m
WebView.subproj WebFrame.m WebFrameView.m
WebFrameViewInternal.h WebView.m WebViewPrivate.h
Log:
Reviewed by Darin.
- remove _frameForView: method from WebView and replace with a direct pointer on the WebFrameView in the WebFrame
* Misc.subproj/WebNSViewExtras.m:
* WebView.subproj/WebFrame.m:
(-[WebFrame _detachFromParent]):
(-[WebFrame _loadDataSource:withLoadType:formState:]):
(-[WebFrame initWithName:webFrameView:webView:]):
* WebView.subproj/WebFrameView.m:
(-[WebFrameView _setWebFrame:]):
(-[WebFrameView webFrame]):
* WebView.subproj/WebFrameViewInternal.h:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.h:
Revision Changes Path
1.3404 +18 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3403
retrieving revision 1.3404
diff -u -r1.3403 -r1.3404
--- ChangeLog 14 Dec 2005 06:16:43 -0000 1.3403
+++ ChangeLog 15 Dec 2005 22:17:55 -0000 1.3404
@@ -1,3 +1,21 @@
+2005-12-15 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - remove _frameForView: method from WebView and replace with a direct pointer on the WebFrameView in the WebFrame
+
+ * Misc.subproj/WebNSViewExtras.m:
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame _detachFromParent]):
+ (-[WebFrame _loadDataSource:withLoadType:formState:]):
+ (-[WebFrame initWithName:webFrameView:webView:]):
+ * WebView.subproj/WebFrameView.m:
+ (-[WebFrameView _setWebFrame:]):
+ (-[WebFrameView webFrame]):
+ * WebView.subproj/WebFrameViewInternal.h:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.h:
+
2005-12-13 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin.
1.63 +0 -36 WebKit/Misc.subproj/WebNSViewExtras.m
Index: WebNSViewExtras.m
===================================================================
RCS file: /cvs/root/WebKit/Misc.subproj/WebNSViewExtras.m,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- WebNSViewExtras.m 8 Dec 2005 08:40:32 -0000 1.62
+++ WebNSViewExtras.m 15 Dec 2005 22:17:57 -0000 1.63
@@ -45,13 +45,6 @@
#define WebDragIconRightInset 7.0
#define WebDragIconBottomInset 3.0
-#ifdef DEBUG_VIEWS
- at interface NSObject (Foo)
-- (void*)_renderFramePart;
-- (id)_frameForView: (id)aView;
- at end
-#endif
-
@implementation NSView (WebExtras)
- (NSView *)_web_superviewOfClass:(Class)class stoppingAtClass:(Class)limitClass
@@ -171,35 +164,6 @@
}
}
-#ifdef DEBUG_VIEWS
-- (void)_web_printViewHierarchy: (int)level
-{
- NSArray *subviews;
- int _level = level, i;
- NSRect f;
- NSView *subview;
- void *rfp = 0;
-
- subviews = [self subviews];
- _level = level;
- while (_level-- > 0)
- printf (" ");
- f = [self frame];
-
- if ([self respondsToSelector: @selector(_webView)]){
- id aWebView = [self _webView];
- id aFrame = [aWebView _frameForView: self];
- rfp = [aFrame _renderFramePart];
- }
-
- printf ("%s renderFramePart %p (%f,%f) w %f, h %f\n", [[[self class] className] cString], rfp, f.origin.x, f.origin.y, f.size.width, f.size.height);
- for (i = 0; i < (int)[subviews count]; i++){
- subview = [subviews objectAtIndex: i];
- [subview _web_printViewHierarchy: level + 1];
- }
-}
-#endif
-
- (void)_web_dragImage:(WebImageRenderer *)wir
rect:(NSRect)rect
event:(NSEvent *)event
1.257 +3 -0 WebKit/WebView.subproj/WebFrame.m
Index: WebFrame.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- WebFrame.m 19 Nov 2005 01:27:05 -0000 1.256
+++ WebFrame.m 15 Dec 2005 22:17:57 -0000 1.257
@@ -621,6 +621,7 @@
[_private setWebView:nil];
[_private->webFrameView _setWebView:nil];
+ [_private->webFrameView _setWebFrame:nil]; // needed for now to be compatible w/ old behavior
[_private->dataSource _setWebView:nil];
[_private->provisionalDataSource _setWebView:nil];
@@ -2433,6 +2434,7 @@
[newDataSource _setOverrideEncoding:[[parentFrame dataSource] _overrideEncoding]];
}
[newDataSource _setWebView:[self webView]];
+ // FIXME: shouldn't this set the WebFrame too? who sets it?
[self _invalidatePendingPolicyDecisionCallingDefaultAction:YES];
@@ -2854,6 +2856,7 @@
if (fv) {
[_private setWebFrameView:fv];
[fv _setWebView:v];
+ [fv _setWebFrame:self];
}
++WebFrameCount;
1.190 +8 -1 WebKit/WebView.subproj/WebFrameView.m
Index: WebFrameView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrameView.m,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- WebFrameView.m 29 Nov 2005 22:34:55 -0000 1.189
+++ WebFrameView.m 15 Dec 2005 22:17:58 -0000 1.190
@@ -79,6 +79,7 @@
{
@public
WebView *webView;
+ WebFrame *webFrame;
WebDynamicScrollBarsView *frameScrollView;
// These margin values are used to temporarily hold the margins of a frame until
@@ -228,6 +229,12 @@
_private->webView = webView;
}
+- (void)_setWebFrame:(WebFrame *)webFrame
+{
+ // Not retained because the WebView owns the WebFrame, which owns the WebFrameView.
+ _private->webFrame = webFrame;
+}
+
- (NSScrollView *)_scrollView
{
// this can be called by [super dealloc] when cleaning up the keyview loop,
@@ -365,7 +372,7 @@
- (WebFrame *)webFrame
{
- return [[self _webView] _frameForView: self];
+ return _private->webFrame;
}
- (void)setAllowsScrolling: (BOOL)flag
1.50 +1 -0 WebKit/WebView.subproj/WebFrameViewInternal.h
Index: WebFrameViewInternal.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebFrameViewInternal.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- WebFrameViewInternal.h 5 Jun 2005 17:54:47 -0000 1.49
+++ WebFrameViewInternal.h 15 Dec 2005 22:17:58 -0000 1.50
@@ -36,6 +36,7 @@
- (void)_setDocumentView:(NSView <WebDocumentView> *)view;
- (NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource;
- (void)_setWebView:(WebView *)webView;
+- (void)_setWebFrame:(WebFrame *)webFrame;
- (int)_marginWidth;
- (int)_marginHeight;
- (void)_setMarginWidth:(int)w;
1.318 +0 -30 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- WebView.m 14 Dec 2005 06:16:47 -0000 1.317
+++ WebView.m 15 Dec 2005 22:17:58 -0000 1.318
@@ -885,36 +885,6 @@
return _private->scriptDebugDelegateForwarder;
}
-- (WebFrame *)_frameForView: (WebFrameView *)aView fromFrame: (WebFrame *)frame
-{
- NSArray *frames;
- int i, count;
- WebFrame *result, *aFrame;
-
- if ([frame frameView] == aView)
- return frame;
-
- // It's safe to use the internal version because we know this
- // function will not change the set of frames
- frames = [frame _internalChildFrames];
- count = [frames count];
- for (i = 0; i < count; i++){
- aFrame = [frames objectAtIndex: i];
- result = [self _frameForView: aView fromFrame: aFrame];
- if (result)
- return result;
- }
-
- return nil;
-}
-
-- (WebFrame *)_frameForView: (WebFrameView *)aView
-{
- WebFrame *frame = [self mainFrame];
-
- return [self _frameForView: aView fromFrame: frame];
-}
-
- (void)_closeWindow
{
[[self _UIDelegateForwarder] webViewClose:self];
1.152 +0 -2 WebKit/WebView.subproj/WebViewPrivate.h
Index: WebViewPrivate.h
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebViewPrivate.h,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- WebViewPrivate.h 14 Dec 2005 06:16:48 -0000 1.151
+++ WebViewPrivate.h 15 Dec 2005 22:17:58 -0000 1.152
@@ -140,8 +140,6 @@
*/
+ (NSString *)suggestedFileExtensionForMIMEType: (NSString *)MIMEType;
-- (WebFrame *)_frameForView:(WebFrameView *)view;
-
- (WebFrame *)_createFrameNamed:(NSString *)name inParent:(WebFrame *)parent allowsScrolling:(BOOL)allowsScrolling;
- (void)_finishedLoadingResourceFromDataSource:(WebDataSource *)dataSource;
More information about the webkit-changes
mailing list