[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:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e2562c68dd7d9362d1f380e339c726b267bfa43f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 24 20:55:01 2002 +0000
More plumbing for contextual menu support.
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
(-[WebController setContextMenuHandler:]): added
(-[WebController contextMenuHandler]): added
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebControllerPrivate init]): alloc WebDefaultContextMenuHandler
(-[WebControllerPrivate dealloc]): dealloc WebDefaultContextMenuHandler
(-[WebController _defaultContextMenuHandler]):
* WebView.subproj/WebDefaultContextMenuHandler.h: Added.
* WebView.subproj/WebDefaultContextMenuHandler.m: Added.
(-[WebDefaultContextMenuHandler contextMenuItemsForElementInfo:defaultMenuItems:]): new
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView menuForEvent:]): call contextMenuHandlers
* WebView.subproj/WebHTMLViewPrivate.h:
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _setController:]): added comment
(-[WebHTMLView _controller]): added
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1656 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7f05447..923962e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,27 @@
+2002-07-24 Chris Blumenberg <cblu at apple.com>
+
+ More plumbing for contextual menu support.
+
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController setContextMenuHandler:]): added
+ (-[WebController contextMenuHandler]): added
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebControllerPrivate init]): alloc WebDefaultContextMenuHandler
+ (-[WebControllerPrivate dealloc]): dealloc WebDefaultContextMenuHandler
+ (-[WebController _defaultContextMenuHandler]):
+ * WebView.subproj/WebDefaultContextMenuHandler.h: Added.
+ * WebView.subproj/WebDefaultContextMenuHandler.m: Added.
+ (-[WebDefaultContextMenuHandler contextMenuItemsForElementInfo:defaultMenuItems:]): new
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView menuForEvent:]): call contextMenuHandlers
+ * WebView.subproj/WebHTMLViewPrivate.h:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _setController:]): added comment
+ (-[WebHTMLView _controller]): added
+
2002-07-24 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/WebTextRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7f05447..923962e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,27 @@
+2002-07-24 Chris Blumenberg <cblu at apple.com>
+
+ More plumbing for contextual menu support.
+
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ (-[WebController setContextMenuHandler:]): added
+ (-[WebController contextMenuHandler]): added
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebControllerPrivate init]): alloc WebDefaultContextMenuHandler
+ (-[WebControllerPrivate dealloc]): dealloc WebDefaultContextMenuHandler
+ (-[WebController _defaultContextMenuHandler]):
+ * WebView.subproj/WebDefaultContextMenuHandler.h: Added.
+ * WebView.subproj/WebDefaultContextMenuHandler.m: Added.
+ (-[WebDefaultContextMenuHandler contextMenuItemsForElementInfo:defaultMenuItems:]): new
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView menuForEvent:]): call contextMenuHandlers
+ * WebView.subproj/WebHTMLViewPrivate.h:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _setController:]): added comment
+ (-[WebHTMLView _controller]): added
+
2002-07-24 Darin Adler <darin at apple.com>
* WebCoreSupport.subproj/WebTextRenderer.m:
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 1e0d802..8c977d4 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -261,6 +261,7 @@
F53444D302E87D4B018635CA,
F5934C8A02E894F50197FBCF,
F649E40602EE0D1901CA2ACD,
+ 354F260002EF441D0ACA2ACA,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -341,6 +342,7 @@
F53444D102E87CBA018635CA,
F5934C8B02E894F50197FBCF,
F649E40702EE0D1901CA2ACD,
+ 354F260102EF441D0ACA2ACA,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -692,6 +694,28 @@
);
};
};
+ 354F25FE02EF441D0ACA2ACA = {
+ isa = PBXFileReference;
+ path = WebDefaultContextMenuHandler.h;
+ refType = 4;
+ };
+ 354F25FF02EF441D0ACA2ACA = {
+ isa = PBXFileReference;
+ path = WebDefaultContextMenuHandler.m;
+ refType = 4;
+ };
+ 354F260002EF441D0ACA2ACA = {
+ fileRef = 354F25FE02EF441D0ACA2ACA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 354F260102EF441D0ACA2ACA = {
+ fileRef = 354F25FF02EF441D0ACA2ACA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
35F3577E0198AAB80ACA1520 = {
children = (
35F3577F0198AAB80ACA1520,
@@ -1059,6 +1083,8 @@
9CF0E24A021361B00ECA16EA,
F649E40402EE0D1901CA2ACD,
F649E40502EE0D1901CA2ACD,
+ 354F25FE02EF441D0ACA2ACA,
+ 354F25FF02EF441D0ACA2ACA,
);
isa = PBXGroup;
name = WebView;
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 0d0fcec..c85a3d9 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -111,17 +111,16 @@
#define WebContextImage @"WebContextImage"
#define WebContextFrame @"WebContextFrame"
-#ifdef READY_FOR_PRIME_TIME
+
/*
=============================================================================
*/
- at protocol WebContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of WebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WebDOMNode *);
+ at protocol WebContextMenuHandler <NSObject>
+// Returns the array of NSMenuItems that will be displayed in the context menu
+// for the dictionary representation of the clicked element.
+- (NSArray *)contextMenuItemsForElementInfo: (NSDictionary *)elementInfo defaultMenuItems: (NSArray *)menuItems;
@end
-#endif
+
/*
@@ -155,6 +154,9 @@
- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
- (id<WebResourceProgressHandler>)downloadProgressHandler;
+- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler;
+- (id<WebContextMenuHandler>)contextMenuHandler;
+
+ (WebURLPolicy)defaultURLPolicyForURL: (NSURL *)url;
- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 31264f1..322ed53 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -124,6 +124,17 @@
return _private->downloadProgressHandler;
}
+- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler
+{
+ [handler retain];
+ [_private->contextMenuHandler release];
+ _private->contextMenuHandler = handler;
+}
+
+- (id<WebContextMenuHandler>)contextMenuHandler
+{
+ return _private->contextMenuHandler;
+}
- (void)setPolicyHandler:(id <WebControllerPolicyHandler>)handler
{
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 165925a..414372f 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -16,6 +16,8 @@
id<WebWindowContext> windowContext;
id<WebResourceProgressHandler> resourceProgressHandler;
id<WebResourceProgressHandler> downloadProgressHandler;
+ id<WebContextMenuHandler> contextMenuHandler;
+ id<WebContextMenuHandler> defaultContextMenuHandler;
id<WebControllerPolicyHandler> policyHandler;
id<WebLocationChangeHandler> locationChangeHandler;
WebBackForwardList *backForwardList;
@@ -24,6 +26,7 @@
@end
@interface WebController (WebPrivate);
+- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 48cfa78..8b9b404 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -6,6 +6,7 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebDefaultContextMenuHandler.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebPreferencesPrivate.h>
@@ -25,6 +26,7 @@
{
mainFrame = nil;
backForwardList = [[WebBackForwardList alloc] init];
+ defaultContextMenuHandler = [[WebDefaultContextMenuHandler alloc] init];
return self;
}
@@ -57,7 +59,8 @@
[resourceProgressHandler release];
[policyHandler release];
[backForwardList release];
-
+ [defaultContextMenuHandler release];
+
[super dealloc];
}
@@ -66,6 +69,11 @@
@implementation WebController (WebPrivate)
+- (id<WebContextMenuHandler>)_defaultContextMenuHandler
+{
+ return _private->defaultContextMenuHandler;
+}
+
- (void)_receivedProgress:(WebLoadProgress *)progress forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
{
WebFrame *frame = [dataSource webFrame];
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
new file mode 100644
index 0000000..1cf7f31
--- /dev/null
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
@@ -0,0 +1,18 @@
+/*
+ WebDefaultContextMenuHandler.h
+
+ Copyright 2002, Apple, Inc. All rights reserved.
+
+ Private header file.
+*/
+
+
+#import <Foundation/Foundation.h>
+
+ at protocol WebContextMenuHandler;
+
+ at interface WebDefaultContextMenuHandler : NSObject <WebContextMenuHandler> {
+
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
new file mode 100644
index 0000000..f43589f
--- /dev/null
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -0,0 +1,18 @@
+/*
+ WebDefaultContextMenuHandler.h
+
+ Copyright 2002, Apple, Inc. All rights reserved.
+
+*/
+
+#import "WebDefaultContextMenuHandler.h"
+
+
+ at implementation WebDefaultContextMenuHandler
+
+- (NSArray *)contextMenuItemsForElementInfo: (NSDictionary *)elementInfo defaultMenuItems: (NSArray *)menuItems
+{
+ return nil;
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h
new file mode 100644
index 0000000..1cf7f31
--- /dev/null
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.h
@@ -0,0 +1,18 @@
+/*
+ WebDefaultContextMenuHandler.h
+
+ Copyright 2002, Apple, Inc. All rights reserved.
+
+ Private header file.
+*/
+
+
+#import <Foundation/Foundation.h>
+
+ at protocol WebContextMenuHandler;
+
+ at interface WebDefaultContextMenuHandler : NSObject <WebContextMenuHandler> {
+
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
new file mode 100644
index 0000000..f43589f
--- /dev/null
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuHandler.m
@@ -0,0 +1,18 @@
+/*
+ WebDefaultContextMenuHandler.h
+
+ Copyright 2002, Apple, Inc. All rights reserved.
+
+*/
+
+#import "WebDefaultContextMenuHandler.h"
+
+
+ at implementation WebDefaultContextMenuHandler
+
+- (NSArray *)contextMenuItemsForElementInfo: (NSDictionary *)elementInfo defaultMenuItems: (NSArray *)menuItems
+{
+ return nil;
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 46fc99f..df90c2c 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -10,6 +10,7 @@
#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebBridge.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebFrame.h>
@@ -208,33 +209,35 @@
return _private->canDragTo;
}
-// Returns an array of built-in context menu items for this node.
-// Generally called by WebContextMenuHandlers from contextMenuItemsForNode:
-#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (WebDOMNode *)
-{
- [NSException raise:WebMethodNotYetImplemented format:@"WebView::defaultContextMenuItemsForNode: is not implemented"];
- return nil;
-}
-#endif
-
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
+ id <WebContextMenuHandler> contextMenuHandler, defaultContextMenuHandler;
+ NSArray *menuItems, *defaultMenuItems;
NSDictionary *elementInfo;
NSPoint point;
-
+ unsigned i;
+
point = [self convertPoint:[theEvent locationInWindow] fromView:nil];
elementInfo = [self _elementInfoAtPoint:point];
+ //NSLog([elementInfo description]);
- /*
- NSLog([elementInfo description]);
- NSMenu *menu = [[NSMenu alloc] init];
- [menu addItemWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@""];
- return menu;
- */
+ defaultContextMenuHandler = [[self _controller] _defaultContextMenuHandler];
+ defaultMenuItems = [defaultContextMenuHandler contextMenuItemsForElementInfo: elementInfo defaultMenuItems: nil];
+ contextMenuHandler = [[self _controller] contextMenuHandler];
- return nil;
+ if(contextMenuHandler){
+ menuItems = [contextMenuHandler contextMenuItemsForElementInfo: elementInfo defaultMenuItems: defaultMenuItems];
+ } else {
+ menuItems = defaultMenuItems;
+ }
+ NSMenu *menu = [[[NSMenu alloc] init] autorelease];
+
+ for(i=0; i<[menuItems count]; i++){
+ [menu addItem:[menuItems objectAtIndex:i]];
+ }
+
+ return nil;
}
- (void)setContextMenusEnabled: (BOOL)flag
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 226cec3..5583135 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -9,6 +9,7 @@
#import <WebKit/WebHTMLView.h>
@class WebBridge;
+ at class WebController;
@interface WebHTMLViewPrivate : NSObject
{
@@ -26,6 +27,7 @@
@interface WebHTMLView (WebPrivate)
- (void)_reset;
+- (WebController *)_controller;
- (void)_setController: (WebController *)controller;
- (WebBridge *)_bridge;
- (void)_adjustFrames;
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index bcf5487..89b9282 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -65,12 +65,18 @@
[WebImageRenderer stopAnimationsInView:self];
}
+//FIXME: WebHTMLView doesn't seem to use _private->controller so is _setController needed?
- (void)_setController:(WebController *)controller
{
// Not retained; the controller owns the view.
_private->controller = controller;
}
+- (WebController *)_controller
+{
+ return [[self _web_parentWebView] _controller];
+}
+
// Required so view can access the part's selection.
- (WebBridge *)_bridge
{
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 0d0fcec..c85a3d9 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -111,17 +111,16 @@
#define WebContextImage @"WebContextImage"
#define WebContextFrame @"WebContextFrame"
-#ifdef READY_FOR_PRIME_TIME
+
/*
=============================================================================
*/
- at protocol WebContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of WebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (WebDOMNode *);
+ at protocol WebContextMenuHandler <NSObject>
+// Returns the array of NSMenuItems that will be displayed in the context menu
+// for the dictionary representation of the clicked element.
+- (NSArray *)contextMenuItemsForElementInfo: (NSDictionary *)elementInfo defaultMenuItems: (NSArray *)menuItems;
@end
-#endif
+
/*
@@ -155,6 +154,9 @@
- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
- (id<WebResourceProgressHandler>)downloadProgressHandler;
+- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler;
+- (id<WebContextMenuHandler>)contextMenuHandler;
+
+ (WebURLPolicy)defaultURLPolicyForURL: (NSURL *)url;
- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 31264f1..322ed53 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -124,6 +124,17 @@
return _private->downloadProgressHandler;
}
+- (void)setContextMenuHandler: (id<WebContextMenuHandler>)handler
+{
+ [handler retain];
+ [_private->contextMenuHandler release];
+ _private->contextMenuHandler = handler;
+}
+
+- (id<WebContextMenuHandler>)contextMenuHandler
+{
+ return _private->contextMenuHandler;
+}
- (void)setPolicyHandler:(id <WebControllerPolicyHandler>)handler
{
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 165925a..414372f 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -16,6 +16,8 @@
id<WebWindowContext> windowContext;
id<WebResourceProgressHandler> resourceProgressHandler;
id<WebResourceProgressHandler> downloadProgressHandler;
+ id<WebContextMenuHandler> contextMenuHandler;
+ id<WebContextMenuHandler> defaultContextMenuHandler;
id<WebControllerPolicyHandler> policyHandler;
id<WebLocationChangeHandler> locationChangeHandler;
WebBackForwardList *backForwardList;
@@ -24,6 +26,7 @@
@end
@interface WebController (WebPrivate);
+- (id<WebContextMenuHandler>)_defaultContextMenuHandler;
- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 48cfa78..8b9b404 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -6,6 +6,7 @@
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebDefaultContextMenuHandler.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebPreferencesPrivate.h>
@@ -25,6 +26,7 @@
{
mainFrame = nil;
backForwardList = [[WebBackForwardList alloc] init];
+ defaultContextMenuHandler = [[WebDefaultContextMenuHandler alloc] init];
return self;
}
@@ -57,7 +59,8 @@
[resourceProgressHandler release];
[policyHandler release];
[backForwardList release];
-
+ [defaultContextMenuHandler release];
+
[super dealloc];
}
@@ -66,6 +69,11 @@
@implementation WebController (WebPrivate)
+- (id<WebContextMenuHandler>)_defaultContextMenuHandler
+{
+ return _private->defaultContextMenuHandler;
+}
+
- (void)_receivedProgress:(WebLoadProgress *)progress forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
{
WebFrame *frame = [dataSource webFrame];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list