[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:54:39 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5a6043940ab1ef8612c44a71d4685c228d2a94ff
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 26 00:55:06 2002 +0000
Made frameNamed private in WebController and renamed it to _findFrameNamed. Got rid of _frameInThisWindowNamed in WebController because it isn't needed anymore.
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(-[WebController _goToItem:withFrameLoadType:]): call _findFrameNamed
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebController _findFrameNamed:]): renamed, made private, got rid of call to _frameInThisWindowNamed as it is not needed
* WebView.subproj/WebFrame.m:
(-[WebFrame findFrameNamed:]): call [WebController _findFrameNamed:]
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2472 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 995321f..69c941d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
2002-10-25 Chris Blumenberg <cblu at apple.com>
+ Made frameNamed private in WebController and renamed it to _findFrameNamed. Got rid of _frameInThisWindowNamed in WebController because it isn't needed anymore.
+
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController _goToItem:withFrameLoadType:]): call _findFrameNamed
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _findFrameNamed:]): renamed, made private, got rid of call to _frameInThisWindowNamed as it is not needed
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame findFrameNamed:]): call [WebController _findFrameNamed:]
+
+2002-10-25 Chris Blumenberg <cblu at apple.com>
+
- Fix case where we would name a new window _blank
- If a data source can't be created for a plug-in request, don't create the frame or open a window.
- cleaned up plug-in stream notifications
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 995321f..69c941d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
2002-10-25 Chris Blumenberg <cblu at apple.com>
+ Made frameNamed private in WebController and renamed it to _findFrameNamed. Got rid of _frameInThisWindowNamed in WebController because it isn't needed anymore.
+
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController _goToItem:withFrameLoadType:]): call _findFrameNamed
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _findFrameNamed:]): renamed, made private, got rid of call to _frameInThisWindowNamed as it is not needed
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame findFrameNamed:]): call [WebController _findFrameNamed:]
+
+2002-10-25 Chris Blumenberg <cblu at apple.com>
+
- Fix case where we would name a new window _blank
- If a data source can't be created for a plug-in request, don't create the frame or open a window.
- cleaned up plug-in stream notifications
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 6ebab17..a8c09d3 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -192,14 +192,6 @@ extern NSString *WebElementFrameKey;
- (id<WebControllerPolicyDelegate>)policyDelegate;
/*!
- @method frameNamed:
- @abstract Look for a frame named name, recursively from the main frame.
- @param name The name of the frame to find.
- @result Returns the frame with the supplied name, or nil if not found.
-*/
-- (WebFrame *)frameNamed: (NSString *)name;
-
-/*!
@method mainFrame
@abstract Return the top level frame.
@discussion Note that even document that are not framesets will have a
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 599d807..215e200 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -196,7 +196,6 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return nil;
}
-
- (WebFrame *)frameForView: (WebView *)aView
{
WebFrame *frame = [self mainFrame];
@@ -204,34 +203,11 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return [self _frameForView: aView fromFrame: frame];
}
-
-- (WebFrame *)frameNamed: (NSString *)name
-{
- // Try this controller first
- WebFrame *frame = [self _frameInThisWindowNamed:name];
-
- if (frame != nil) {
- return frame;
- }
-
- // Try other controllers in the same set
- if (_private->controllerSetName != nil) {
- NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
- WebController *controller;
- while ((controller = [enumerator nextObject]) != nil && frame == nil) {
- frame = [controller _frameInThisWindowNamed:name];
- }
- }
-
- return frame;
-}
-
- (WebFrame *)mainFrame
{
return _private->mainFrame;
}
-
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
@@ -272,7 +248,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
{
WebFrame *targetFrame;
- targetFrame = [self frameNamed: [item target]];
+ targetFrame = [self _findFrameNamed: [item target]];
if (targetFrame == nil){
NSLog (@"Target frame not found, using main frame instead, will be fixed soon");
#if 0
@@ -280,7 +256,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
WebHistoryItem *next = item;
while (next){
NSLog (@"frame name %@, parent %@", [next target], [next parent]);
- nextFrame = [self frameNamed: [next parent]];
+ nextFrame = [self _findFrameNamed: [next parent]];
next = [[self backForwardList] backEntryAtIndex: pos++];
if ([[next target] isEqual: @"_top"]){
[[self mainFrame] _goToItem: next withFrameLoadType: WebFrameLoadTypeIntermediateBack];
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index b832078..433a84c 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -55,7 +55,7 @@
- (void)_setDefersCallbacks:(BOOL)defers;
- (void)_setTopLevelFrameName:(NSString *)name;
-- (WebFrame *)_frameInThisWindowNamed:(NSString *)name;
+- (WebFrame *)_findFrameNamed: (NSString *)name;
- (WebController *)_openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index e858eb9..8bb61bf 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -7,6 +7,7 @@
#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebControllerPolicyDelegatePrivate.h>
+#import <WebKit/WebControllerSets.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
@@ -222,13 +223,25 @@
}
}
-- (WebFrame *)_frameInThisWindowNamed:(NSString *)name
+- (WebFrame *)_findFrameNamed: (NSString *)name
{
- if ([_private->topLevelFrameName isEqualToString:name]) {
- return [self mainFrame];
- } else {
- return [[self mainFrame] _descendantFrameNamed:name];
+ // Try this controller first
+ WebFrame *frame = [[self mainFrame] _descendantFrameNamed:name];
+
+ if (frame != nil) {
+ return frame;
}
+
+ // Try other controllers in the same set
+ if (_private->controllerSetName != nil) {
+ NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
+ WebController *controller;
+ while ((controller = [enumerator nextObject]) != nil && frame == nil) {
+ frame = [[controller mainFrame] _descendantFrameNamed:name];
+ }
+ }
+
+ return frame;
}
- (WebController *)_openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 64a181c..5e3273e 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -223,8 +223,8 @@
WebFrame *frame = [self _descendantFrameNamed:name];
if(!frame){
- // Search in this controller and other controllers.
- frame = [[self controller] frameNamed:name];
+ // Search in this controller then in other controllers.
+ frame = [[self controller] _findFrameNamed:name];
}
return frame;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 6ebab17..a8c09d3 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -192,14 +192,6 @@ extern NSString *WebElementFrameKey;
- (id<WebControllerPolicyDelegate>)policyDelegate;
/*!
- @method frameNamed:
- @abstract Look for a frame named name, recursively from the main frame.
- @param name The name of the frame to find.
- @result Returns the frame with the supplied name, or nil if not found.
-*/
-- (WebFrame *)frameNamed: (NSString *)name;
-
-/*!
@method mainFrame
@abstract Return the top level frame.
@discussion Note that even document that are not framesets will have a
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 599d807..215e200 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -196,7 +196,6 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return nil;
}
-
- (WebFrame *)frameForView: (WebView *)aView
{
WebFrame *frame = [self mainFrame];
@@ -204,34 +203,11 @@ NSString *WebElementFrameKey = @"WebElementFrame";
return [self _frameForView: aView fromFrame: frame];
}
-
-- (WebFrame *)frameNamed: (NSString *)name
-{
- // Try this controller first
- WebFrame *frame = [self _frameInThisWindowNamed:name];
-
- if (frame != nil) {
- return frame;
- }
-
- // Try other controllers in the same set
- if (_private->controllerSetName != nil) {
- NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
- WebController *controller;
- while ((controller = [enumerator nextObject]) != nil && frame == nil) {
- frame = [controller _frameInThisWindowNamed:name];
- }
- }
-
- return frame;
-}
-
- (WebFrame *)mainFrame
{
return _private->mainFrame;
}
-
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
@@ -272,7 +248,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
{
WebFrame *targetFrame;
- targetFrame = [self frameNamed: [item target]];
+ targetFrame = [self _findFrameNamed: [item target]];
if (targetFrame == nil){
NSLog (@"Target frame not found, using main frame instead, will be fixed soon");
#if 0
@@ -280,7 +256,7 @@ NSString *WebElementFrameKey = @"WebElementFrame";
WebHistoryItem *next = item;
while (next){
NSLog (@"frame name %@, parent %@", [next target], [next parent]);
- nextFrame = [self frameNamed: [next parent]];
+ nextFrame = [self _findFrameNamed: [next parent]];
next = [[self backForwardList] backEntryAtIndex: pos++];
if ([[next target] isEqual: @"_top"]){
[[self mainFrame] _goToItem: next withFrameLoadType: WebFrameLoadTypeIntermediateBack];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index b832078..433a84c 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -55,7 +55,7 @@
- (void)_setDefersCallbacks:(BOOL)defers;
- (void)_setTopLevelFrameName:(NSString *)name;
-- (WebFrame *)_frameInThisWindowNamed:(NSString *)name;
+- (WebFrame *)_findFrameNamed: (NSString *)name;
- (WebController *)_openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index e858eb9..8bb61bf 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -7,6 +7,7 @@
#import <WebKit/WebContextMenuDelegate.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebControllerPolicyDelegatePrivate.h>
+#import <WebKit/WebControllerSets.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultContextMenuDelegate.h>
#import <WebKit/WebFramePrivate.h>
@@ -222,13 +223,25 @@
}
}
-- (WebFrame *)_frameInThisWindowNamed:(NSString *)name
+- (WebFrame *)_findFrameNamed: (NSString *)name
{
- if ([_private->topLevelFrameName isEqualToString:name]) {
- return [self mainFrame];
- } else {
- return [[self mainFrame] _descendantFrameNamed:name];
+ // Try this controller first
+ WebFrame *frame = [[self mainFrame] _descendantFrameNamed:name];
+
+ if (frame != nil) {
+ return frame;
}
+
+ // Try other controllers in the same set
+ if (_private->controllerSetName != nil) {
+ NSEnumerator *enumerator = [WebControllerSets controllersInSetNamed:_private->controllerSetName];
+ WebController *controller;
+ while ((controller = [enumerator nextObject]) != nil && frame == nil) {
+ frame = [[controller mainFrame] _descendantFrameNamed:name];
+ }
+ }
+
+ return frame;
}
- (WebController *)_openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer behind:(BOOL)behind
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list