[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 07:39:05 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2f974698abdea3dc92c67d66dd6aa6e7cd100ed4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 29 01:59:04 2003 +0000
WebCore:
API changes from final review meeting.
goBackOrForwardToItem: -> goToBackForwardItem:
drop "Window" from WebUIDelegate method names.
WebElementIsSelectedTextKey -> WebElementIsSelectedKey
Cross-frame searchFor on WebView now public.
Reviewed by Chris.
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
WebKit:
API changes from final review meeting.
goBackOrForwardToItem: -> goToBackForwardItem:
drop "Window" from WebUIDelegate method names.
WebElementIsSelectedTextKey -> WebElementIsSelectedKey
Cross-frame searchFor on WebView now public.
Reviewed by Chris.
* Plugins.subproj/WebBaseNetscapePluginView.m:
* WebCoreSupport.subproj/WebBridge.m:
* WebKit.exp:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
* WebView.subproj/WebDefaultUIDelegate.m:
* WebView.subproj/WebFrame.h:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebHTMLView.m:
* WebView.subproj/WebHTMLViewPrivate.m:
* WebView.subproj/WebImageView.m:
* WebView.subproj/WebPolicyDelegate.h:
* WebView.subproj/WebTextView.m:
* WebView.subproj/WebUIDelegate.h:
* WebView.subproj/WebView.h:
* WebView.subproj/WebView.m:
* WebView.subproj/WebViewPrivate.h:
* WebView.subproj/WebViewPrivate.m:
WebBrowser:
API changes from final review meeting.
goBackOrForwardToItem: -> goToBackForwardItem:
drop "Window" from WebUIDelegate method names.
WebElementIsSelectedTextKey -> WebElementIsSelectedKey
Cross-frame searchFor on WebView now public.
Reviewed by Chris.
* BrowserDocument.m:
* BrowserWebController.m:
* ContextMenuHandler.m:
* FindPanelController.m:
Tests:
Updated examples to match API changes
Added zooming as an example of stringByEvaluatingJavaScriptFromString:
and custom context menus. Currently problematic because of 3242716.
* IBViewer/English.lproj/Document.nib:
* IBViewer/IBViewer.pbproj/project.pbxproj:
* PictureBrowser/Document.m:
* PictureBrowser/English.lproj/Document.nib:
* PictureBrowser/image_template.html:
* PictureBrowser/thumbnail_template.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4202 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 706915b..9ebf795 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-04-28 Richard Williamson <rjw at apple.com>
+
+ API changes from final review meeting.
+
+ goBackOrForwardToItem: -> goToBackForwardItem:
+ drop "Window" from WebUIDelegate method names.
+ WebElementIsSelectedTextKey -> WebElementIsSelectedKey
+ Cross-frame searchFor on WebView now public.
+
+ Reviewed by Chris.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+
2003-04-28 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 706915b..9ebf795 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-04-28 Richard Williamson <rjw at apple.com>
+
+ API changes from final review meeting.
+
+ goBackOrForwardToItem: -> goToBackForwardItem:
+ drop "Window" from WebUIDelegate method names.
+ WebElementIsSelectedTextKey -> WebElementIsSelectedKey
+ Cross-frame searchFor on WebView now public.
+
+ Reviewed by Chris.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+
2003-04-28 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index d110f3c..7906a4e 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -65,7 +65,7 @@ extern NSString *WebCoreElementImageAltStringKey;
extern NSString *WebCoreElementImageKey;
extern NSString *WebCoreElementImageRectKey;
extern NSString *WebCoreElementImageURLKey;
-extern NSString *WebCoreElementIsSelectedTextKey;
+extern NSString *WebCoreElementIsSelectedKey;
extern NSString *WebCoreElementLinkURLKey;
extern NSString *WebCoreElementLinkTargetFrameKey;
extern NSString *WebCoreElementLinkLabelKey;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index fdce5a0..e7fd507 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -84,7 +84,7 @@ NSString *WebCoreElementImageAltStringKey = @"WebElementImageAltString";
NSString *WebCoreElementImageKey = @"WebElementImage";
NSString *WebCoreElementImageRectKey = @"WebElementImageRect";
NSString *WebCoreElementImageURLKey = @"WebElementImageURL";
-NSString *WebCoreElementIsSelectedTextKey = @"WebElementIsSelectedText";
+NSString *WebCoreElementIsSelectedKey = @"WebElementIsSelected";
NSString *WebCoreElementLinkURLKey = @"WebElementLinkURL";
NSString *WebCoreElementLinkTargetFrameKey = @"WebElementTargetFrame";
NSString *WebCoreElementLinkLabelKey = @"WebElementLinkLabel";
@@ -633,7 +633,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(id <WebDOMElement>element)
NSMutableDictionary *element = [NSMutableDictionary dictionary];
[element setObject:[NSNumber numberWithBool:_part->isPointInsideSelection((int)point.x, (int)point.y)]
- forKey:WebCoreElementIsSelectedTextKey];
+ forKey:WebCoreElementIsSelectedKey];
NodeImpl *URLNode = nodeInfo.URLElement();
if (URLNode) {
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cdd0846..a4552be 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,32 @@
+2003-04-28 Richard Williamson <rjw at apple.com>
+
+ API changes from final review meeting.
+
+ goBackOrForwardToItem: -> goToBackForwardItem:
+ drop "Window" from WebUIDelegate method names.
+ WebElementIsSelectedTextKey -> WebElementIsSelectedKey
+ Cross-frame searchFor on WebView now public.
+
+ Reviewed by Chris.
+
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ * WebKit.exp:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebDefaultUIDelegate.m:
+ * WebView.subproj/WebFrame.h:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebHTMLView.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ * WebView.subproj/WebImageView.m:
+ * WebView.subproj/WebPolicyDelegate.h:
+ * WebView.subproj/WebTextView.m:
+ * WebView.subproj/WebUIDelegate.h:
+ * WebView.subproj/WebView.h:
+ * WebView.subproj/WebView.m:
+ * WebView.subproj/WebViewPrivate.h:
+ * WebView.subproj/WebViewPrivate.m:
+
2003-04-28 Ken Kocienda <kocienda at apple.com>
Reviewed by Chris
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 5b950c4..eb8c99b 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1136,13 +1136,13 @@ typedef struct {
WebView *newController = nil;
WebView *currentController = [self controller];
id wd = [currentController UIDelegate];
- if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
- newController = [wd webView:currentController createWindowWithRequest:nil];
+ if ([wd respondsToSelector:@selector(webView:createWebViewWithRequest:)])
+ newController = [wd webView:currentController createWebViewWithRequest:nil];
else
- newController = [[WebDefaultUIDelegate sharedUIDelegate] webView:currentController createWindowWithRequest:nil];
+ newController = [[WebDefaultUIDelegate sharedUIDelegate] webView:currentController createWebViewWithRequest:nil];
[newController _setTopLevelFrameName:frameName];
- [[newController _UIDelegateForwarder] webViewShowWindow:newController];
+ [[newController _UIDelegateForwarder] webViewShow:newController];
frame = [newController mainFrame];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index b8261f9..ed3d347 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -114,10 +114,10 @@
id wd = [currentController UIDelegate];
WebView *newController = nil;
- if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
- newController = [wd webView:currentController createWindowWithRequest:request];
+ if ([wd respondsToSelector:@selector(webView:createWebViewWithRequest:)])
+ newController = [wd webView:currentController createWebViewWithRequest:request];
else
- newController = [[WebDefaultUIDelegate sharedUIDelegate] webView:currentController createWindowWithRequest:request];
+ newController = [[WebDefaultUIDelegate sharedUIDelegate] webView:currentController createWebViewWithRequest:request];
[newController _setTopLevelFrameName:name];
return [[newController mainFrame] _bridge];
}
@@ -125,7 +125,7 @@
- (void)showWindow
{
WebView *c = [frame webView];
- [[c _UIDelegateForwarder] webViewShowWindow: c];
+ [[c _UIDelegateForwarder] webViewShow: c];
}
- (BOOL)areToolbarsVisible
@@ -220,21 +220,21 @@
{
ASSERT(frame != nil);
WebView *webView = [frame webView];
- return [[webView _UIDelegateForwarder] webViewFirstResponderInWindow:webView];
+ return [[webView _UIDelegateForwarder] webViewFirstResponder:webView];
}
- (void)makeFirstResponder:(NSResponder *)view
{
ASSERT(frame != nil);
WebView *webView = [frame webView];
- [[webView _UIDelegateForwarder] webView:webView makeFirstResponderInWindow:view];
+ [[webView _UIDelegateForwarder] webView:webView makeFirstResponder:view];
}
- (void)closeWindow
{
ASSERT(frame != nil);
WebView *webView = [frame webView];
- [[webView _UIDelegateForwarder] webViewCloseWindow:webView];
+ [[webView _UIDelegateForwarder] webViewClose:webView];
}
@@ -402,7 +402,7 @@
- (void)focusWindow
{
- [[[frame webView] _UIDelegateForwarder] webViewFocusWindow:[frame webView]];
+ [[[frame webView] _UIDelegateForwarder] webViewFocus:[frame webView]];
}
- (void)unfocusWindow
@@ -856,7 +856,7 @@ static BOOL loggedObjectCacheSize = NO;
}
}
if (item) {
- [controller goBackOrForwardToItem:item];
+ [controller goToBackForwardItem:item];
}
}
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 02ee2c7..9840fb2 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -35,7 +35,7 @@ _WebElementFrameKey
_WebElementImageKey
_WebElementImageRectKey
_WebElementImageURLKey
-_WebElementIsSelectedTextKey
+_WebElementIsSelectedKey
_WebElementLinkLabelKey
_WebElementLinkTargetFrameKey
_WebElementLinkTitleKey
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 7d0c8f9..ee6d36c 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -104,7 +104,7 @@
}
if (!imageURL && !linkURL) {
- if ([[element objectForKey:WebElementIsSelectedTextKey] boolValue]) {
+ if ([[element objectForKey:WebElementIsSelectedKey] boolValue]) {
[menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopy]];
} else {
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
diff --git a/WebKit/WebView.subproj/WebDefaultUIDelegate.m b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
index be46aba..5119974 100644
--- a/WebKit/WebView.subproj/WebDefaultUIDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultUIDelegate.m
@@ -38,38 +38,38 @@ static WebDefaultUIDelegate *sharedDelegate = nil;
[super dealloc];
}
-- (WebView *)webView: (WebView *)wv createWindowWithRequest:(NSURLRequest *)request
+- (WebView *)webView: (WebView *)wv createWebViewWithRequest:(NSURLRequest *)request
{
return nil;
}
-- (void)webViewShowWindow: (WebView *)wv
+- (void)webViewShow: (WebView *)wv
{
}
-- (void)webViewCloseWindow: (WebView *)wv
+- (void)webViewClose: (WebView *)wv
{
[[wv window] close];
}
-- (void)webViewFocusWindow: (WebView *)wv
+- (void)webViewFocus: (WebView *)wv
{
[[wv window] makeKeyAndOrderFront:wv];
}
-- (void)webViewUnfocusWindow: (WebView *)wv
+- (void)webViewUnfocus: (WebView *)wv
{
if ([[wv window] isKeyWindow] || [[[wv window] attachedSheet] isKeyWindow]) {
[NSApp _cycleWindowsReversed:FALSE];
}
}
-- (NSResponder *)webViewFirstResponderInWindow: (WebView *)wv;
+- (NSResponder *)webViewFirstResponder: (WebView *)wv;
{
return [[wv window] firstResponder];
}
-- (void)webView: (WebView *)wv makeFirstResponderInWindow:(NSResponder *)responder
+- (void)webView: (WebView *)wv makeFirstResponder:(NSResponder *)responder
{
[[wv window] makeFirstResponder:responder];
}
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index fc80299..49bb03a 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -112,8 +112,8 @@
for _self and _current, the parent frame for _parent and the main frame for _top.
findFrameNamed returns self for _parent and _top if the receiver is the mainFrame.
findFrameNamed first searches from the current frame to all descending frames then the
- rest of the frames in the controller. If still not found, findFrameNamed searches the
- frames of the other controllers.
+ rest of the frames in the WebView. If still not found, findFrameNamed searches the
+ frames of the other WebViews.
@param name The name of the frame to find.
@result The frame matching the provided name. nil if the frame is not found.
*/
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 15267ba..61af3c4 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1569,13 +1569,13 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
WebView *controller = nil;
WebView *currentController = [self webView];
id wd = [currentController UIDelegate];
- if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
- controller = [wd webView:currentController createWindowWithRequest:nil];
+ if ([wd respondsToSelector:@selector(webView:createWebViewWithRequest:)])
+ controller = [wd webView:currentController createWebViewWithRequest:nil];
else
- controller = [[WebDefaultUIDelegate sharedUIDelegate] webView:currentController createWindowWithRequest:nil];
+ controller = [[WebDefaultUIDelegate sharedUIDelegate] webView:currentController createWebViewWithRequest:nil];
[controller _setTopLevelFrameName:frameName];
- [[controller _UIDelegateForwarder] webViewShowWindow:controller];
+ [[controller _UIDelegateForwarder] webViewShow:controller];
WebFrame *frame = [controller mainFrame];
[frame _loadRequest:request triggeringAction:nil loadType:WebFrameLoadTypeStandard formState:formState];
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index f1c6e6e..eec245c 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -613,7 +613,7 @@
- (BOOL)_isSelectionEvent:(NSEvent *)event
{
NSPoint point = [self convertPoint:[event locationInWindow] fromView:nil];
- return [[[self _elementAtPoint:point] objectForKey:WebElementIsSelectedTextKey] boolValue];
+ return [[[self _elementAtPoint:point] objectForKey:WebElementIsSelectedKey] boolValue];
}
- (BOOL)acceptsFirstMouse:(NSEvent *)event
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 83698ca..ba85ca0 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -507,7 +507,7 @@ static WebHTMLView *lastHitView = nil;
NSURL *linkURL = [element objectForKey:WebElementLinkURLKey];
NSURL *imageURL = [element objectForKey:WebElementImageURLKey];
- BOOL isSelectedText = [[element objectForKey:WebElementIsSelectedTextKey] boolValue];
+ BOOL isSelectedText = [[element objectForKey:WebElementIsSelectedKey] boolValue];
[_private->draggingImageURL release];
_private->draggingImageURL = nil;
@@ -586,7 +586,7 @@ static WebHTMLView *lastHitView = nil;
if ((imageURL && [[WebPreferences standardPreferences] loadsImagesAutomatically]) ||
(!imageURL && [mouseDownElement objectForKey: WebElementLinkURLKey]) ||
- ([[mouseDownElement objectForKey:WebElementIsSelectedTextKey] boolValue] &&
+ ([[mouseDownElement objectForKey:WebElementIsSelectedKey] boolValue] &&
([mouseDraggedEvent timestamp] - [_private->mouseDownEvent timestamp]) > TextDragDelay)) {
return YES;
}
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 50c4137..b717b0e 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -153,7 +153,7 @@
[representation image], WebElementImageKey,
[NSValue valueWithRect:[self bounds]], WebElementImageRectKey,
[representation URL], WebElementImageURLKey,
- [NSNumber numberWithBool:NO], WebElementIsSelectedTextKey,
+ [NSNumber numberWithBool:NO], WebElementIsSelectedKey,
frame, WebElementFrameKey, nil];
return [controller _menuForElement:element];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 9bb394f..055d0b2 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -96,7 +96,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
/*!
@category WebPolicyDelegate
- @discussion While loading a URL, WebKit asks the WebControllerPolicyDelegate for
+ @discussion While loading a URL, WebKit asks the WebPolicyDelegate for
policies that determine the action of what to do with the URL or the data that
the URL represents. Typically, the policy handler methods are called in this order:
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 45a4d76..a3bbfa3 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -183,7 +183,7 @@
BOOL hasSelection = ([self selectedRange].location != NSNotFound && [self selectedRange].length > 0);
NSDictionary *element = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithBool:hasSelection], WebElementIsSelectedTextKey,
+ [NSNumber numberWithBool:hasSelection], WebElementIsSelectedKey,
frame, WebElementFrameKey, nil];
return [controller _menuForElement:element];
diff --git a/WebKit/WebView.subproj/WebUIDelegate.h b/WebKit/WebView.subproj/WebUIDelegate.h
index 84d2a64..c368e76 100644
--- a/WebKit/WebView.subproj/WebUIDelegate.h
+++ b/WebKit/WebView.subproj/WebUIDelegate.h
@@ -60,64 +60,71 @@ enum {
@interface NSObject (WebUIDelegate)
/*!
- @method createWindowWithRequest:
+ @method webView:createWebViewWithRequest:
@abstract Create a new window and begin to load the specified request.
@discussion The newly created window is hidden, and the window operations delegate on the
new WebViews will get a showWindow call.
+ @param sender The WebView sending the delegate method.
@param request The request to load.
@result The WebView for the new window.
*/
-- (WebView *)webView:(WebView *)webView createWindowWithRequest:(NSURLRequest *)request;
+- (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request;
/*!
- @method showWindow
+ @method webViewShow:
+ @param sender The WebView sending the delegate method.
@abstract Show the window that contains the top level view of the WebView,
ordering it frontmost.
@discussion This will only be called just after createWindowWithRequest:
is used to create a new window.
*/
-- (void)webViewShowWindow:(WebView *)webView;
+- (void)webViewShow:(WebView *)sender;
/*!
- @method closeWindow
+ @method webViewClose:
@abstract Close the current window.
+ @param sender The WebView sending the delegate method.
@discussion Clients showing multiple views in one window may
choose to close only the one corresponding to this
WebView. Other clients may choose to ignore this method
entirely.
*/
-- (void)webViewCloseWindow:(WebView *)webView;
+- (void)webViewClose:(WebView *)sender;
/*!
- @method focusWindow
+ @method webViewFocus:
@abstract Focus the current window (i.e. makeKeyAndOrderFront:).
+ @param The WebView sending the delegate method.
@discussion Clients showing multiple views in one window may want to
also do something to focus the one corresponding to this WebView.
*/
-- (void)webViewFocusWindow:(WebView *)webView;
+- (void)webViewFocus:(WebView *)sender;
/*!
- @method unfocusWindow
+ @method webViewUnfocus:
@abstract Unfocus the current window.
+ @param sender The WebView sending the delegate method.
@discussion Clients showing multiple views in one window may want to
also do something to unfocus the one corresponding to this WebView.
*/
-- (void)webViewUnfocusWindow:(WebView *)webView;
+- (void)webViewUnfocus:(WebView *)sender;
/*!
- @method firstResponderInWindow
+ @method webViewFirstResponder:
@abstract Get the first responder for this window.
+ @param sender The WebView sending the delegate method.
@discussion This method should return the focused control in the
WebView's view, if any. If the view is out of the window
hierarchy, this might return something than calling firstResponder
on the real NSWindow would. It's OK to return either nil or the
real first responder if some control not in the window has focus.
*/
-- (NSResponder *)webViewFirstResponderInWindow:(WebView *)webView;
+- (NSResponder *)webViewFirstResponder:(WebView *)sender;
/*!
- @method makeFirstResponderInWindow:
+ @method webView:makeFirstResponderInWindow:
@abstract Set the first responder for this window.
+ @param sender The WebView sending the delegate method.
@param responder The responder to make first (will always be a view)
@discussion responder will always be a view that is in the view
subhierarchy of the top-level web view for this WebView. If the
@@ -125,26 +132,29 @@ enum {
hierarchy, it may be desirable to save the first responder
elsewhere, or possibly ignore this call.
*/
-- (void)webView: (WebView *)webView makeFirstResponderInWindow:(NSResponder *)responder;
+- (void)webView: (WebView *)sender makeFirstResponder:(NSResponder *)responder;
/*!
- @method setStatusText:
+ @method webView:setStatusText:
@abstract Set the window's status display, if any, to the specified string.
+ @param sender The WebView sending the delegate method.
@param text The status text to set
*/
-- (void)webView: (WebView *)webView setStatusText:(NSString *)text;
+- (void)webView: (WebView *)sender setStatusText:(NSString *)text;
/*!
@method statusText
@abstract Get the currently displayed status text.
+ @param sender The WebView sending the delegate method.
@result The status text
*/
-- (NSString *)webViewStatusText:(WebView *)webView ;
+- (NSString *)webViewStatusText:(WebView *)sender;
/*!
- @method areToolbarsVisible
+ @method webViewAreToolbarsVisible:
@abstract Determine whether the window's toolbars are currently visible
+ @param sender The WebView sending the delegate method.
@discussion This method should return YES if the window has any
toolbars that are currently on, besides the status bar. If the app
has more than one toolbar per window, for example a regular
@@ -152,112 +162,122 @@ enum {
this method if at least one is on.
@result YES if at least one toolbar is visible, otherwise NO.
*/
-- (BOOL)webViewAreToolbarsVisible: (WebView *)webView;
+- (BOOL)webViewAreToolbarsVisible: (WebView *)sender;
/*!
- @method setToolbarsVisible:
+ @method webView:setToolbarsVisible:
+ @param sender The WebView sending the delegate method.
@abstract Set whether the window's toolbars are currently visible.
@param visible New value for toolbar visibility
@discussion Setting this to YES should turn on all toolbars
(except for a possible status bar). Setting it to NO should turn
off all toolbars (with the same exception).
*/
-- (void)webView: (WebView *)webView setToolbarsVisible:(BOOL)visible;
+- (void)webView:(WebView *)sender setToolbarsVisible:(BOOL)visible;
/*!
- @method isStatusBarVisible
+ @method webViewIsStatusBarVisible:
@abstract Determine whether the status bar is visible.
+ @param sender The WebView sending the delegate method.
@result YES if the status bar is visible, otherwise NO.
*/
-- (BOOL)webViewIsStatusBarVisible: (WebView *)webView;
+- (BOOL)webViewIsStatusBarVisible:(WebView *)sender;
/*!
- @method setStatusBarVisible:
+ @method webView:setStatusBarVisible:
@abstract Set whether the status bar is currently visible.
@param visible The new visibility value
@discussion Setting this to YES should show the status bar,
setting it to NO should hide it.
*/
-- (void)webView: (WebView *)webView setStatusBarVisible:(BOOL)visible;
+- (void)webView:(WebView *)sender setStatusBarVisible:(BOOL)visible;
/*!
- @method isResizable
+ @method webViewIsResizable:
@abstract Determine whether the window is resizable or not.
+ @param sender The WebView sending the delegate method.
@result YES if resizable, NO if not.
@discussion If there are multiple views in the same window, they
have have their own separate resize controls and this may need to
be handled specially.
*/
-- (BOOL)webViewIsResizable: (WebView *)webView;
+- (BOOL)webViewIsResizable:(WebView *)sender;
/*!
- @method setResizable:
+ @method webView:setResizable:
@abstract Set the window to resizable or not
+ @param sender The WebView sending the delegate method.
@param resizable YES if the window should be made resizable, NO if not.
@discussion If there are multiple views in the same window, they
have have their own separate resize controls and this may need to
be handled specially.
*/
-- (void)webView: (WebView *)webView setResizable:(BOOL)resizable;
+- (void)webView:(WebView *)sender setResizable:(BOOL)resizable;
/*!
- @method setFrame:
+ @method webView:setFrame:
@abstract Set the window's frame rect
+ @param sender The WebView sending the delegate method.
@param frame The new window frame size
@discussion Even though a caller could set the frame directly using the NSWindow,
this method is provided so implementors of this protocol can do special
things on programmatic move/resize, like avoiding autosaving of the size.
*/
-- (void)webView: (WebView *)webView setFrame:(NSRect)frame;
+- (void)webView:(WebView *)sender setFrame:(NSRect)frame;
/*!
- @method frame
+ @method webViewFrame
+ @param sender The WebView sending the delegate method.
@abstract REturn the window's frame rect
@discussion
*/
-- (NSRect)webViewFrame: (WebView *)webView;
+- (NSRect)webViewFrame:(WebView *)sender;
/*!
@method webView:setContentRect:
@abstract Set the window's content rect
+ @param sender The WebView sending the delegate method.
@param frame The new window content rect
@discussion Even though a caller could set the content rect
directly using the NSWindow, this method is provided so
implementors of this protocol can do special things on
programmatic move/resize, like avoiding autosaving of the size.
*/
-- (void)webView:(WebView *)webView setContentRect:(NSRect)contentRect;
+- (void)webView:(WebView *)sender setContentRect:(NSRect)contentRect;
/*!
@method webViewContentRect:
@abstract Return the window's content rect
@discussion
*/
-- (NSRect)webViewContentRect:(WebView *)webView;
+- (NSRect)webViewContentRect:(WebView *)sender;
/*!
- @method runJavaScriptAlertPanelWithMessage:
+ @method webView:runJavaScriptAlertPanelWithMessage:
@abstract Display a JavaScript alert panel
+ @param sender The WebView sending the delegate method.
@param message The message to display
@discussion Clients should visually indicate that this panel comes
from JavaScript. The panel should have a single OK button.
*/
-- (void)webView: (WebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message;
+- (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message;
/*!
- @method runJavaScriptAlertPanelWithMessage:
+ @method webView:runJavaScriptAlertPanelWithMessage:
@abstract Display a JavaScript confirm panel
+ @param sender The WebView sending the delegate method.
@param message The message to display
@result YES if the user hit OK, no if the user chose Cancel.
@discussion Clients should visually indicate that this panel comes
from JavaScript. The panel should have two buttons, e.g. "OK" and
"Cancel".
*/
-- (BOOL)webView: (WebView *)webView runJavaScriptConfirmPanelWithMessage:(NSString *)message;
+- (BOOL)webView:(WebView *)sender runJavaScriptConfirmPanelWithMessage:(NSString *)message;
/*!
- @method runJavaScriptTextInputPanelWithPrompt:defaultText:
+ @method webView:runJavaScriptTextInputPanelWithPrompt:defaultText:
@abstract Display a JavaScript text input panel
+ @param sender The WebView sending the delegate method.
@param message The message to display
@param defaultText The initial text for the text entry area.
@result The typed text if the user hit OK, otherwise nil.
@@ -265,35 +285,37 @@ enum {
from JavaScript. The panel should have two buttons, e.g. "OK" and
"Cancel", and an area to type text.
*/
-- (NSString *)webView: (WebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
+- (NSString *)webView:(WebView *)sender runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText;
/*!
- @method runOpenPanelForFileButtonWithResultListener:
+ @method webView:runOpenPanelForFileButtonWithResultListener:
@abstract Display a file open panel for a file input control.
+ @param sender The WebView sending the delegate method.
@param resultListener The object to call back with the results.
@discussion This method is passed a callback object instead of giving a return
value so that it can be handled with a sheet.
*/
-- (void)webView: (WebView *)webView runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
+- (void)webView:(WebView *)sender runOpenPanelForFileButtonWithResultListener:(id<WebOpenPanelResultListener>)resultListener;
/*!
- @method mouseDidMoveOverElement:modifierFlags:
+ @method webView:mouseDidMoveOverElement:modifierFlags:
@abstract Update the window's feedback for mousing over links to reflect a new item the mouse is over
or new modifier flags.
+ @param sender The WebView sending the delegate method.
@param elementInformation Dictionary that describes the element that the mouse is over, or nil.
@param modifierFlags The modifier flags as in NSEvent.
*/
-- (void)webView: (WebView *)webView mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
+- (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(unsigned int)modifierFlags;
/*!
- @method contextMenuItemsForElement:defaultMenuItems:
+ @method webView:contextMenuItemsForElement:defaultMenuItems:
@abstract Returns the menu items to display in an element's contextual menu.
- @param WebView The WebWebView requesting the context menus.
+ @param sender The WebView sending the delegate method.
@param element A dictionary representation of the clicked element.
@param defaultMenuItems An array of default NSMenuItems to include in all contextual menus.
@result An array of NSMenuItems to include in the contextual menu.
*/
-- (NSArray *)webView:(WebView *)webView contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems;
+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems;
@end
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 55f7880..a22270c 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -26,7 +26,7 @@ extern NSString *WebElementImageAltStringKey; // NSString of the ALT attribute o
extern NSString *WebElementImageKey; // NSImage of the image element
extern NSString *WebElementImageRectKey; // NSValue of an NSRect, the rect of the image element
extern NSString *WebElementImageURLKey; // NSURL of the image element
-extern NSString *WebElementIsSelectedTextKey; // NSNumber of BOOL indicating whether the element is selected text or not
+extern NSString *WebElementIsSelectedKey; // NSNumber of BOOL indicating whether the element is selected text or not
extern NSString *WebElementLinkURLKey; // NSURL of the link if the element is within an anchor
extern NSString *WebElementLinkTargetFrameKey; // NSString of the target of the anchor
extern NSString *WebElementLinkTitleKey; // NSString of the title of the anchor
@@ -210,11 +210,11 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
- (BOOL)goForward;
/*!
- @method goBackOrForwardToItem:
+ @method goToBackForwardItem:
@abstract Go back or forward to an item in the backforward list.
@result YES if able to go to the item, NO otherwise.
*/
-- (BOOL)goBackOrForwardToItem:(WebHistoryItem *)item;
+- (BOOL)goToBackForwardItem:(WebHistoryItem *)item;
/*!
@method setTextSizeMultiplier:
@@ -333,6 +333,17 @@ extern NSString *WebElementLinkLabelKey; // NSString of the text within the anch
*/
- (NSWindow *)hostWindow;
+/*!
+ @method searchFor:direction:caseSensitive:
+ @abstract Searches a document view for a string and highlights the string if it is found.
+ Starts the search from the current selection. Will search across all frames.
+ @param string The string to search for.
+ @param forward YES to search forward, NO to seach backwards.
+ @param caseFlag YES to for case-sensitive search, NO for case-insensitive search.
+ @result YES if found, NO if not found.
+*/
+- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag;
+
@end
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 6a79fc4..25c5b72 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -46,7 +46,7 @@ NSString *WebElementImageKey = @"WebElementImage";
NSString *WebElementImageAltStringKey = @"WebElementImageAltString";
NSString *WebElementImageRectKey = @"WebElementImageRect";
NSString *WebElementImageURLKey = @"WebElementImageURL";
-NSString *WebElementIsSelectedTextKey = @"WebElementIsSelectedText";
+NSString *WebElementIsSelectedKey = @"WebElementIsSelected";
NSString *WebElementLinkURLKey = @"WebElementLinkURL";
NSString *WebElementLinkTargetFrameKey = @"WebElementTargetFrame";
NSString *WebElementLinkLabelKey = @"WebElementLinkLabel";
@@ -259,7 +259,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
return NO;
}
-- (BOOL)goBackOrForwardToItem:(WebHistoryItem *)item
+- (BOOL)goToBackForwardItem:(WebHistoryItem *)item
{
[self _goToItem: item withLoadType: WebFrameLoadTypeIndexedBackForward];
return YES;
@@ -520,11 +520,9 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
: [curr _previousFrameWithWrap:wrapFlag];
}
-// I think this should become public - see 3228520
-
// Search from the end of the currently selected location, or from the beginning of the
// document if nothing is selected. Deals with subframes.
-- (BOOL)_searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag
+- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag
{
// Get the frame holding the selection, or start with the main frame
WebFrame *startFrame = [self _currentFrame];
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index a96faa5..b7a48b0 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -66,11 +66,6 @@ typedef struct _WebResourceDelegateImplementationCache {
}
@end
- at interface WebView (WebPrivateToBePublic)
-// I think this should become public - see 3228520
-- (BOOL)_searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag;
- at end
-
@interface WebView (WebPrivate)
/*!
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 3ae2cdd..304d92a 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -291,13 +291,13 @@
{
id wd = [self UIDelegate];
WebView *newWindowController = nil;
- if ([wd respondsToSelector:@selector(webView:createWindowWithRequest:)])
- newWindowController = [wd webView:self createWindowWithRequest:request];
+ if ([wd respondsToSelector:@selector(webView:createWebViewWithRequest:)])
+ newWindowController = [wd webView:self createWebViewWithRequest:request];
else {
- newWindowController = [[WebDefaultUIDelegate sharedUIDelegate] webView:self createWindowWithRequest: request];
+ newWindowController = [[WebDefaultUIDelegate sharedUIDelegate] webView:self createWebViewWithRequest: request];
}
- [[newWindowController _UIDelegateForwarder] webViewShowWindow: self];
+ [[newWindowController _UIDelegateForwarder] webViewShow: self];
return newWindowController;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list