[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:27:17 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 4c2e4d87adfefbbac5f75eafc88ad2f558a00d59
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 25 19:38:11 2002 +0000

    WebCore:
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge elementAtPoint:]): renamed
    
    WebKit:
    
    	Renamed elementInfoAtPoint to elementAtPoint
    
            * WebKit.pbproj/project.pbxproj:
            * WebView.subproj/WebDefaultContextMenuHandler.h:
            * WebView.subproj/WebDefaultContextMenuHandler.m:
            (+[WebDefaultContextMenuHandler addMenuItemWithTitle:action:target:toArray:]): renamed
            (-[WebDefaultContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView menuForEvent:]):
            * WebView.subproj/WebHTMLViewPrivate.h:
            * WebView.subproj/WebHTMLViewPrivate.m:
            (-[WebHTMLView _elementAtPoint:]):
    
    WebBrowser:
    
    	Added WebBrowser specific contextual menu items.
    
            * BrowserDocument.h:
            * BrowserDocument.m:
            (-[BrowserDocument init]):
            (-[BrowserDocument setSaveDataSource:]): set the current data source to save
            (-[BrowserDocument dataRepresentationOfType:]): uses the current data source
            * ContextMenuHandler.h: Added.
            * ContextMenuHandler.m: Added.
            (-[ContextMenuHandler dealloc]):
            (-[ContextMenuHandler _addMenuItemWithAction:fromArray:toArray:]):
            (-[ContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
            (-[ContextMenuHandler _window]):
            (-[ContextMenuHandler _document]):
            (-[ContextMenuHandler addLinkToBookmarks:]):
            (-[ContextMenuHandler viewSource:]):
            (-[ContextMenuHandler savePageAs:]):
            * WebBrowser.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1668 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 40ba95e..1916d2b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-25  Chris Blumenberg  <cblu at apple.com>
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]): renamed
+
 2002-07-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for bug 2992158, the calendar on www.blog.org in the upper
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 40ba95e..1916d2b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-07-25  Chris Blumenberg  <cblu at apple.com>
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]): renamed
+
 2002-07-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for bug 2992158, the calendar on www.blog.org in the upper
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 40ba95e..1916d2b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-07-25  Chris Blumenberg  <cblu at apple.com>
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]): renamed
+
 2002-07-25  David Hyatt  <hyatt at apple.com>
 
 	Fix for bug 2992158, the calendar on www.blog.org in the upper
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 7b96264..4dddb7c 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -115,7 +115,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
 - (NSObject *)copyDOMTree:(id <WebCoreDOMTreeCopier>)copier;
 - (NSObject *)copyRenderTree:(id <WebCoreRenderTreeCopier>)copier;
 
-- (NSDictionary *)elementInfoAtPoint:(NSPoint)point;
+- (NSDictionary *)elementAtPoint:(NSPoint)point;
 
 - (BOOL)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
 
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 02f32f6..7d746e8 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -393,7 +393,7 @@ using namespace khtml;
     return [NSURL _web_URLWithString:URLString];
 }
 
-- (NSDictionary *)elementInfoAtPoint:(NSPoint)point
+- (NSDictionary *)elementAtPoint:(NSPoint)point
 {
     NSMutableDictionary *elementInfo = [NSMutableDictionary dictionary];
     RenderObject::NodeInfo nodeInfo(true, true);
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 85f086e..3aa4918 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-07-25  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed elementInfoAtPoint to elementAtPoint
+
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebDefaultContextMenuHandler.h:
+        * WebView.subproj/WebDefaultContextMenuHandler.m:
+        (+[WebDefaultContextMenuHandler addMenuItemWithTitle:action:target:toArray:]): renamed
+        (-[WebDefaultContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView menuForEvent:]):
+        * WebView.subproj/WebHTMLViewPrivate.h:
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _elementAtPoint:]):
+
 2002-07-24  Chris Blumenberg  <cblu at apple.com>
 
 	tiny change
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 85f086e..3aa4918 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-07-25  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed elementInfoAtPoint to elementAtPoint
+
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebDefaultContextMenuHandler.h:
+        * WebView.subproj/WebDefaultContextMenuHandler.m:
+        (+[WebDefaultContextMenuHandler addMenuItemWithTitle:action:target:toArray:]): renamed
+        (-[WebDefaultContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView menuForEvent:]):
+        * WebView.subproj/WebHTMLViewPrivate.h:
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _elementAtPoint:]):
+
 2002-07-24  Chris Blumenberg  <cblu at apple.com>
 
 	tiny change
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 8dffc0c..0dcfc07 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -708,6 +708,9 @@
 			fileRef = 354F25FE02EF441D0ACA2ACA;
 			isa = PBXBuildFile;
 			settings = {
+				ATTRIBUTES = (
+					Public,
+				);
 			};
 		};
 		354F260102EF441D0ACA2ACA = {
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
index 7efbdd4..987bf0a 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
@@ -15,4 +15,6 @@
     NSDictionary *element;
 }
 
++ (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector target:(id)target toArray:(NSMutableArray *)menuItems;
+
 @end
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 4efa97f..48d44b6 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -18,10 +18,10 @@
     [super dealloc];
 }
 
-- (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector toArray:(NSMutableArray *)menuItems
++ (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector target:(id)target toArray:(NSMutableArray *)menuItems
 {
     NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:title action:selector keyEquivalent:@""];
-    [menuItem setTarget:self];
+    [menuItem setTarget:target];
     [menuItems addObject:menuItem];
     [menuItem release];
 }
@@ -31,71 +31,67 @@
     NSMutableArray *menuItems = [NSMutableArray array];
     NSURL *linkURL, *imageURL;
     
+    [element release];
     element = [theElement retain];
 
     linkURL = [element objectForKey:WebContextLinkURL];
 
     if(linkURL){
     
-        [self addMenuItemWithTitle:NSLocalizedString(@"Open Link in New Window", @"Open in New Window context menu item") 				            action:@selector(openLinkInNewWindow:)
-                           toArray:menuItems];
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Link in New Window", @"Open in New Window context menu item") 				                    action:@selector(openLinkInNewWindow:)
+                                    target:self
+                                   toArray:menuItems];
         
-        [self addMenuItemWithTitle:NSLocalizedString(@"Download Link to Disk", @"Download Link to Disk context menu item") 				    action:@selector(downloadLinkToDisk:)
-                           toArray:menuItems];
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Link to Disk", @"Download Link to Disk context menu item") 				                    action:@selector(downloadLinkToDisk:)
+                                    target:self
+                                   toArray:menuItems];
 
-        [self addMenuItemWithTitle:NSLocalizedString(@"Copy Link to Clipboard", @"Copy Link to Clipboard context menu item") 				    action:@selector(copyLinkToClipboard:)
-                           toArray:menuItems];
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Link to Clipboard", @"Copy Link to Clipboard context menu item") 				                    action:@selector(copyLinkToClipboard:)
+                                    target:self
+                                   toArray:menuItems];
     }
 
     imageURL = [element objectForKey:WebContextImageURL];
 
     if(imageURL){
-    
+        
         if(linkURL){
             [menuItems addObject:[NSMenuItem separatorItem]];
         }
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Open Image in New Window", @"Open Image in New Window context menu item") 		             
-                            action:@selector(openImageInNewWindow:)
-                           toArray:menuItems];
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Download Image To Disk", @"Download Image To Disk context menu item") 				    action:@selector(downloadImageToDisk:)
-                           toArray:menuItems];
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Copy Image to Clipboard", @"Copy Image to Clipboard context menu item") 				    action:@selector(copyImageToClipboard:)
-                           toArray:menuItems];
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Reload Image", @"Reload Image context menu item") 				                    
-                            action:@selector(reloadImage:)
-                           toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Image in New Window", @"Open Image in New Window context menu item")
+                                    action:@selector(openImageInNewWindow:)
+                                    target:self
+                                   toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Image To Disk", @"Download Image To Disk context menu item") 				                    action:@selector(downloadImageToDisk:)
+                                    target:self
+                                   toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Image to Clipboard", @"Copy Image to Clipboard context menu item") 				                    action:@selector(copyImageToClipboard:)
+                                    target:self
+                                   toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Reload Image", @"Reload Image context menu item")
+                                    action:@selector(reloadImage:)
+                                    target:self
+                                   toArray:menuItems];
     }
 
     if(!imageURL && !linkURL){
     
         WebFrame *webFrame = [element objectForKey:WebContextFrame];
 
-        if([[webFrame dataSource] isMainDocument]){
-            [self addMenuItemWithTitle:NSLocalizedString(@"View Source", @"View Source context menu item") 				                        
-                                action:@selector(viewSource:)
-                               toArray:menuItems];
-        }else{
-            [self addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") 				action:@selector(openFrameInNewWindow:)
-                               toArray:menuItems];
-            
-            [self addMenuItemWithTitle:NSLocalizedString(@"View Frame Source", @"View Frame Source context menu item") 				                
-                                action:@selector(viewSource:)
-                               toArray:menuItems];
+        if(![[webFrame dataSource] isMainDocument]){
+            [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") 				                action:@selector(openFrameInNewWindow:)
+                                        target:self
+                                       toArray:menuItems];
         }
     }
 
     return menuItems;
 }
 
-- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem
-{
-    return YES;
-}
-
 - (void)openNewWindowWithURL:(NSURL *)URL
 {
     WebFrame *webFrame = [element objectForKey:WebContextFrame];
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h
index 7efbdd4..987bf0a 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h
@@ -15,4 +15,6 @@
     NSDictionary *element;
 }
 
++ (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector target:(id)target toArray:(NSMutableArray *)menuItems;
+
 @end
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
index 4efa97f..48d44b6 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
@@ -18,10 +18,10 @@
     [super dealloc];
 }
 
-- (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector toArray:(NSMutableArray *)menuItems
++ (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector target:(id)target toArray:(NSMutableArray *)menuItems
 {
     NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:title action:selector keyEquivalent:@""];
-    [menuItem setTarget:self];
+    [menuItem setTarget:target];
     [menuItems addObject:menuItem];
     [menuItem release];
 }
@@ -31,71 +31,67 @@
     NSMutableArray *menuItems = [NSMutableArray array];
     NSURL *linkURL, *imageURL;
     
+    [element release];
     element = [theElement retain];
 
     linkURL = [element objectForKey:WebContextLinkURL];
 
     if(linkURL){
     
-        [self addMenuItemWithTitle:NSLocalizedString(@"Open Link in New Window", @"Open in New Window context menu item") 				            action:@selector(openLinkInNewWindow:)
-                           toArray:menuItems];
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Link in New Window", @"Open in New Window context menu item") 				                    action:@selector(openLinkInNewWindow:)
+                                    target:self
+                                   toArray:menuItems];
         
-        [self addMenuItemWithTitle:NSLocalizedString(@"Download Link to Disk", @"Download Link to Disk context menu item") 				    action:@selector(downloadLinkToDisk:)
-                           toArray:menuItems];
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Link to Disk", @"Download Link to Disk context menu item") 				                    action:@selector(downloadLinkToDisk:)
+                                    target:self
+                                   toArray:menuItems];
 
-        [self addMenuItemWithTitle:NSLocalizedString(@"Copy Link to Clipboard", @"Copy Link to Clipboard context menu item") 				    action:@selector(copyLinkToClipboard:)
-                           toArray:menuItems];
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Link to Clipboard", @"Copy Link to Clipboard context menu item") 				                    action:@selector(copyLinkToClipboard:)
+                                    target:self
+                                   toArray:menuItems];
     }
 
     imageURL = [element objectForKey:WebContextImageURL];
 
     if(imageURL){
-    
+        
         if(linkURL){
             [menuItems addObject:[NSMenuItem separatorItem]];
         }
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Open Image in New Window", @"Open Image in New Window context menu item") 		             
-                            action:@selector(openImageInNewWindow:)
-                           toArray:menuItems];
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Download Image To Disk", @"Download Image To Disk context menu item") 				    action:@selector(downloadImageToDisk:)
-                           toArray:menuItems];
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Copy Image to Clipboard", @"Copy Image to Clipboard context menu item") 				    action:@selector(copyImageToClipboard:)
-                           toArray:menuItems];
-        
-        [self addMenuItemWithTitle:NSLocalizedString(@"Reload Image", @"Reload Image context menu item") 				                    
-                            action:@selector(reloadImage:)
-                           toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Image in New Window", @"Open Image in New Window context menu item")
+                                    action:@selector(openImageInNewWindow:)
+                                    target:self
+                                   toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Image To Disk", @"Download Image To Disk context menu item") 				                    action:@selector(downloadImageToDisk:)
+                                    target:self
+                                   toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Image to Clipboard", @"Copy Image to Clipboard context menu item") 				                    action:@selector(copyImageToClipboard:)
+                                    target:self
+                                   toArray:menuItems];
+
+        [[self class] addMenuItemWithTitle:NSLocalizedString(@"Reload Image", @"Reload Image context menu item")
+                                    action:@selector(reloadImage:)
+                                    target:self
+                                   toArray:menuItems];
     }
 
     if(!imageURL && !linkURL){
     
         WebFrame *webFrame = [element objectForKey:WebContextFrame];
 
-        if([[webFrame dataSource] isMainDocument]){
-            [self addMenuItemWithTitle:NSLocalizedString(@"View Source", @"View Source context menu item") 				                        
-                                action:@selector(viewSource:)
-                               toArray:menuItems];
-        }else{
-            [self addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") 				action:@selector(openFrameInNewWindow:)
-                               toArray:menuItems];
-            
-            [self addMenuItemWithTitle:NSLocalizedString(@"View Frame Source", @"View Frame Source context menu item") 				                
-                                action:@selector(viewSource:)
-                               toArray:menuItems];
+        if(![[webFrame dataSource] isMainDocument]){
+            [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") 				                action:@selector(openFrameInNewWindow:)
+                                        target:self
+                                       toArray:menuItems];
         }
     }
 
     return menuItems;
 }
 
-- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem
-{
-    return YES;
-}
-
 - (void)openNewWindowWithURL:(NSURL *)URL
 {
     WebFrame *webFrame = [element objectForKey:WebContextFrame];
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 6feff21..fce404a 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -214,11 +214,12 @@
     id <WebContextMenuHandler> contextMenuHandler, defaultContextMenuHandler;
     NSArray *menuItems, *defaultMenuItems;
     NSDictionary *elementInfo;
+    NSMenu *menu = nil;
     NSPoint point;
     unsigned i;
     
     point = [self convertPoint:[theEvent locationInWindow] fromView:nil];
-    elementInfo = [self _elementInfoAtPoint:point];
+    elementInfo = [self _elementAtPoint:point];
 
     defaultContextMenuHandler = [[self _controller] _defaultContextMenuHandler];
     defaultMenuItems = [defaultContextMenuHandler contextMenuItemsForElement: elementInfo  defaultMenuItems: nil];
@@ -230,12 +231,14 @@
         menuItems = defaultMenuItems;
     }
     
-    NSMenu *menu = [[[NSMenu alloc] init] autorelease];
-
-    for(i=0; i<[menuItems count]; i++){
-        [menu addItem:[menuItems objectAtIndex:i]];
+    if([menuItems count] > 0){
+        menu = [[[NSMenu alloc] init] autorelease];
+    
+        for(i=0; i<[menuItems count]; i++){
+            [menu addItem:[menuItems objectAtIndex:i]];
+        }
     }
-        
+    
     return menu;
 }
 
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 5583135..3a19b33 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -36,5 +36,5 @@
 + (void)_setModifierTrackingEnabled:(BOOL)enabled;
 + (BOOL)_modifierTrackingEnabled;
 + (void)_postFlagsChangedEvent:(NSEvent *)flagsChangedEvent;
-- (NSDictionary *)_elementInfoAtPoint:(NSPoint)point;
+- (NSDictionary *)_elementAtPoint:(NSPoint)point;
 @end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 89b9282..89b72df 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -105,9 +105,9 @@ BOOL _modifierTrackingEnabled = FALSE;
     [[NSNotificationCenter defaultCenter] postNotificationName:NSMouseMovedNotification object:self userInfo:[NSDictionary dictionaryWithObject:fakeEvent forKey:@"NSEvent"]];
 }
 
-- (NSDictionary *)_elementInfoAtPoint:(NSPoint)point
+- (NSDictionary *)_elementAtPoint:(NSPoint)point
 {
-    NSDictionary *elementInfoWC = [[self _bridge] elementInfoAtPoint:point];
+    NSDictionary *elementInfoWC = [[self _bridge] elementAtPoint:point];
     NSMutableDictionary *elementInfo = [NSMutableDictionary dictionary];
 
     NSURL *linkURL =   [elementInfoWC objectForKey:WebCoreContextLinkURL];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list