[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:43:52 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 6a5eec712b7601c83cb531a84fda849f4f22fbfd
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 24 18:37:08 2002 +0000

    WebCore:
    
    	Renamed element info keys to WebElement* instead of WebContextMenuElement*
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge elementAtPoint:]):
    
    WebKit:
    
    	Renamed element info keys to WebElement* instead of WebContextMenuElement*
    	Added WebKit API documentation
    
            * Plugins.subproj/WebPlugin.m:
            (-[WebNetscapePlugin load]): clean-up
            * WebKit.exp:
            * WebKit.pbproj/project.pbxproj:
            * WebView.subproj/WebContextMenuDelegate.h:
            * WebView.subproj/WebController.h:
            * WebView.subproj/WebController.m:
            * WebView.subproj/WebControllerPolicyDelegate.h:
            * WebView.subproj/WebDefaultContextMenuDelegate.h:
            * WebView.subproj/WebDefaultContextMenuDelegate.m:
            (-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
            (-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
            (-[WebDefaultContextMenuDelegate downloadURL:]):
            (-[WebDefaultContextMenuDelegate openLinkInNewWindow:]):
            (-[WebDefaultContextMenuDelegate downloadLinkToDisk:]):
            (-[WebDefaultContextMenuDelegate copyLinkToClipboard:]):
            (-[WebDefaultContextMenuDelegate openImageInNewWindow:]):
            (-[WebDefaultContextMenuDelegate downloadImageToDisk:]):
            (-[WebDefaultContextMenuDelegate copyImageToClipboard:]):
            (-[WebDefaultContextMenuDelegate openFrameInNewWindow:]):
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView mouseDragged:]):
            * WebView.subproj/WebHTMLViewPrivate.m:
            (-[WebHTMLView _elementAtPoint:]):
    
    WebBrowser:
    
    	Renamed element info keys to WebElement* instead of WebContextMenuElement*
    
            * BrowserWebController.m:
            (-[BrowserWebController clickPolicyForElement:button:modifierMask:]):
            * ContextMenuHandler.m:
            (-[ContextMenuHandler contextMenuItemsForElement:defaultMenuItems:]):
            (-[ContextMenuHandler _window]):
            (-[ContextMenuHandler addLinkToBookmarks:]):
            (-[ContextMenuHandler viewSource:]):
            (-[ContextMenuHandler savePageAs:]):
            (-[ContextMenuHandler openWithiTunes:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2143 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4a9f0d4..c034497 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-09-24  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed element info keys to WebElement* instead of WebContextMenuElement*
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]):
+
 2002-09-24  Darin Adler  <darin at apple.com>
 
 	- fixed 3056579 -- various crashes at http://www.auspost.com.au/
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4a9f0d4..c034497 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-09-24  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed element info keys to WebElement* instead of WebContextMenuElement*
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]):
+
 2002-09-24  Darin Adler  <darin at apple.com>
 
 	- fixed 3056579 -- various crashes at http://www.auspost.com.au/
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4a9f0d4..c034497 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-09-24  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed element info keys to WebElement* instead of WebContextMenuElement*
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]):
+
 2002-09-24  Darin Adler  <darin at apple.com>
 
 	- fixed 3056579 -- various crashes at http://www.auspost.com.au/
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 30f7923..abc2848 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -53,11 +53,11 @@ typedef khtml::RenderPart KHTMLRenderPart;
 @protocol WebCoreResourceHandle;
 @protocol WebCoreResourceLoader;
 
-#define WebCoreContextLinkURL  @"WebContextLinkURL"
-#define WebCoreContextLinkLabel  @"WebContextLinkLabel"
-#define WebCoreContextImageURL @"WebContextImageURL"
-#define WebCoreContextString   @"WebContextString"
-#define WebCoreContextImage    @"WebContextImage"
+#define WebCoreElementLinkURL  		@"WebElementLinkURL"
+#define WebCoreElementLinkLabel  	@"WebElementLinkLabel"
+#define WebCoreElementImageURL 		@"WebElementImageURL"
+#define WebCoreElementString   		@"WebElementString"
+#define WebCoreElementImage    		@"WebElementImage"
 
 // WebCoreBridge objects are used by WebCore to abstract away operations that need
 // to be implemented by library clients, for example WebKit. The objects are also
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index c29b62c..7da0cb5 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -450,13 +450,13 @@ using khtml::RenderPart;
                     DOMStringImpl *dv = childNode->nodeValue().implementation();
                     if (dv){
                         NSString *value = [NSString stringWithCharacters: (const unichar *)dv->s length: dv->l];
-                        [elementInfo setObject:value forKey:WebCoreContextLinkLabel];
+                        [elementInfo setObject:value forKey:WebCoreElementLinkLabel];
                         break;
                     }
                 }
                 labelParent = childNode;
             }
-            [elementInfo setObject:URL forKey:WebCoreContextLinkURL];
+            [elementInfo setObject:URL forKey:WebCoreElementLinkURL];
         }
     }
 
@@ -465,17 +465,17 @@ using khtml::RenderPart;
         ElementImpl* i =  static_cast<ElementImpl*>(node);
         NSURL *URL = [self completeURLForDOMString:parseURL(i->getAttribute(ATTR_SRC))];
         if (URL) {
-            [elementInfo setObject:URL forKey:WebCoreContextImageURL];
+            [elementInfo setObject:URL forKey:WebCoreElementImageURL];
             RenderImage *r = (RenderImage *)node->renderer();
             id <WebCoreImageRenderer> image = r->pixmap().image();
             if (image) {
-                [elementInfo setObject:image forKey:WebCoreContextImage];
+                [elementInfo setObject:image forKey:WebCoreElementImage];
             }
         }
     }
 
     if (part->hasSelection()) {
-        [elementInfo setObject:[self selectedText] forKey:WebCoreContextString];
+        [elementInfo setObject:[self selectedText] forKey:WebCoreElementString];
     }
     
     return elementInfo;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 35444b4..85fe9d3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,33 @@
+2002-09-24  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed element info keys to WebElement* instead of WebContextMenuElement*
+	Added WebKit API documentation
+
+        * Plugins.subproj/WebPlugin.m:	
+        (-[WebNetscapePlugin load]): clean-up
+        * WebKit.exp:
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebContextMenuDelegate.h:
+        * WebView.subproj/WebController.h:
+        * WebView.subproj/WebController.m:
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultContextMenuDelegate.h:
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
+        (-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
+        (-[WebDefaultContextMenuDelegate downloadURL:]):
+        (-[WebDefaultContextMenuDelegate openLinkInNewWindow:]):
+        (-[WebDefaultContextMenuDelegate downloadLinkToDisk:]):
+        (-[WebDefaultContextMenuDelegate copyLinkToClipboard:]):
+        (-[WebDefaultContextMenuDelegate openImageInNewWindow:]):
+        (-[WebDefaultContextMenuDelegate downloadImageToDisk:]):
+        (-[WebDefaultContextMenuDelegate copyImageToClipboard:]):
+        (-[WebDefaultContextMenuDelegate openFrameInNewWindow:]):
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _elementAtPoint:]):
+
 2002-09-24  Darin Adler  <darin at apple.com>
 
 	Cleaned up some loose ends from adding setNeedsLayout to the WebDocumentView
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 35444b4..85fe9d3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,33 @@
+2002-09-24  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed element info keys to WebElement* instead of WebContextMenuElement*
+	Added WebKit API documentation
+
+        * Plugins.subproj/WebPlugin.m:	
+        (-[WebNetscapePlugin load]): clean-up
+        * WebKit.exp:
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebContextMenuDelegate.h:
+        * WebView.subproj/WebController.h:
+        * WebView.subproj/WebController.m:
+        * WebView.subproj/WebControllerPolicyDelegate.h:
+        * WebView.subproj/WebDefaultContextMenuDelegate.h:
+        * WebView.subproj/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultContextMenuDelegate contextMenuItemsForElement:defaultMenuItems:]):
+        (-[WebDefaultContextMenuDelegate openNewWindowWithURL:referrer:]):
+        (-[WebDefaultContextMenuDelegate downloadURL:]):
+        (-[WebDefaultContextMenuDelegate openLinkInNewWindow:]):
+        (-[WebDefaultContextMenuDelegate downloadLinkToDisk:]):
+        (-[WebDefaultContextMenuDelegate copyLinkToClipboard:]):
+        (-[WebDefaultContextMenuDelegate openImageInNewWindow:]):
+        (-[WebDefaultContextMenuDelegate downloadImageToDisk:]):
+        (-[WebDefaultContextMenuDelegate copyImageToClipboard:]):
+        (-[WebDefaultContextMenuDelegate openFrameInNewWindow:]):
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView mouseDragged:]):
+        * WebView.subproj/WebHTMLViewPrivate.m:
+        (-[WebHTMLView _elementAtPoint:]):
+
 2002-09-24  Darin Adler  <darin at apple.com>
 
 	Cleaned up some loose ends from adding setNeedsLayout to the WebDocumentView
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index 89a1304..e8304e8 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -163,34 +163,32 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
 
 - (BOOL)load
 {    
-    OSErr err;
-    FSSpec spec;
-    FSRef fref; 
-    mainFuncPtr pluginMainFunc;
-    initializeFuncPtr NP_Initialize = NULL;
     getEntryPointsFuncPtr NP_GetEntryPoints = NULL;
+    initializeFuncPtr NP_Initialize = NULL;
+    mainFuncPtr pluginMainFunc;
     NPError npErr;
-    Boolean didLoad;
-    NSBundle *tempBundle;
-    NSFileHandle *executableFile;
-    NSData *data;
-    
-    if(isLoaded)
-        return YES;
+    OSErr err;
+
 
-    if(isBundle){ //CFM or Mach-o bundle
-        tempBundle = [NSBundle bundleWithPath:path];
-        executableFile = [NSFileHandle fileHandleForReadingAtPath:[tempBundle executablePath]];
-        data = [executableFile readDataOfLength:8];
+    if(isLoaded){
+        return YES;
+    }
+    
+    if(isBundle){
+        // Check if the executable is mach-o or CFM
+        NSBundle *tempBundle = [NSBundle bundleWithPath:path];
+        NSFileHandle *executableFile = [NSFileHandle fileHandleForReadingAtPath:[tempBundle executablePath]];
+        NSData *data = [executableFile readDataOfLength:8];
         if(!memcmp([data bytes], "Joy!peff", 8)){
             isCFM = TRUE;
         }else{
             isCFM = FALSE;
         }
         [executableFile closeFile];
-        didLoad = CFBundleLoadExecutable(bundle);
-        if (!didLoad)
+        
+        if (!CFBundleLoadExecutable(bundle)){
             return NO;
+        }
 
         if(isCFM){
             pluginMainFunc = (mainFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("main") );
@@ -200,10 +198,14 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
             NP_Initialize = (initializeFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Initialize") );
             NP_GetEntryPoints = (getEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_GetEntryPoints") );
             NPP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Shutdown") );
-            if(!NP_Initialize || !NP_GetEntryPoints || !NPP_Shutdown)
+            if(!NP_Initialize || !NP_GetEntryPoints || !NPP_Shutdown){
                 return NO;
+            }
         }
     }else{ // single CFM file
+        FSSpec spec;
+        FSRef fref;
+        
         err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
         if(err != noErr){
             ERROR("FSPathMakeRef failed. Error=%d", err);
@@ -220,8 +222,9 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
             return NO;
         }
         pluginMainFunc = (mainFuncPtr)functionPointerForTVector((TransitionVector)pluginMainFunc);
-        if(!pluginMainFunc)
+        if(!pluginMainFunc){
             return NO;
+        }
             
         isCFM = TRUE;
     }
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 795376b..84bd7ee 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -25,12 +25,12 @@
 .objc_class_name_WebURLsWithTitles
 .objc_class_name_WebView
 .objc_class_name_WebTextView
-_WebContextMenuElementLinkLabelKey
-_WebContextMenuElementLinkURLKey
-_WebContextMenuElementImageURLKey
-_WebContextMenuElementStringKey
-_WebContextMenuElementImageKey
-_WebContextMenuElementFrameKey
+_WebElementLinkLabelKey
+_WebElementLinkURLKey
+_WebElementImageURLKey
+_WebElementStringKey
+_WebElementImageKey
+_WebElementFrameKey
 _WebHistoryEntriesChangedNotification
 _WebIconDidChangeNotification
 _WebIconSmallSize
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 522bbff..59915de 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1337,7 +1337,6 @@
 //9C4
 		9C7CABBB0190A37C0ECA16EA = {
 			children = (
-				5152FAD5033FC43400CA2ACD,
 				F52CA6BD02DF9D0F018635CA,
 				F52CA6BE02DF9D49018635CA,
 				F52CA6BF02DF9D4D018635CA,
@@ -1367,6 +1366,7 @@
 				F5143A370221DCCE01A80181,
 				9CF0E249021361B00ECA16EA,
 				9CF0E24A021361B00ECA16EA,
+				5152FAD5033FC43400CA2ACD,
 				6523FACF032DA06B005EFCFF,
 				6523FAD0032DA06B005EFCFF,
 				5152FAD7033FC44A00CA2ACD,
diff --git a/WebKit/WebView.subproj/WebContextMenuDelegate.h b/WebKit/WebView.subproj/WebContextMenuDelegate.h
index ffe4874..e222fd4 100644
--- a/WebKit/WebView.subproj/WebContextMenuDelegate.h
+++ b/WebKit/WebView.subproj/WebContextMenuDelegate.h
@@ -5,15 +5,6 @@
         Public header file.
 */
 
-// These strings are keys into the element dictionary provided in 
-// contextMenuItemsForElement.
-extern NSString *WebContextMenuElementLinkURLKey;
-extern NSString *WebContextMenuElementLinkLabelKey;
-extern NSString *WebContextMenuElementImageURLKey;
-extern NSString *WebContextMenuElementStringKey;
-extern NSString *WebContextMenuElementImageKey;
-extern NSString *WebContextMenuElementFrameKey;
-
 /*!
     @protocol WebContextMenuHandler
     @discussion WebContextMenuHandler determine what context menu items are visible over
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index aa303b1..cd89a0a 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -26,6 +26,14 @@
 @protocol WebResourceProgressDelegate;
 @protocol WebContextMenuDelegate;
 
+// These strings are keys into the element dictionary provided in
+// the WebContextMenuDelegate's contextMenuItemsForElement and the WebControllerPolicyDelegate's clickPolicyForElement.
+extern NSString *WebElementLinkURLKey;
+extern NSString *WebElementLinkLabelKey;
+extern NSString *WebElementImageURLKey;
+extern NSString *WebElementStringKey;
+extern NSString *WebElementImageKey;
+extern NSString *WebElementFrameKey;
 
 /*!
     @class WebController
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 747370c..038ba15 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -29,12 +29,12 @@
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebResourceHandle.h>
 
-NSString * WebContextMenuElementLinkURLKey = @"WebContextLinkURL";
-NSString * WebContextMenuElementLinkLabelKey = @"WebContextLinkLabel";
-NSString * WebContextMenuElementImageURLKey = @"WebContextImageURL";
-NSString * WebContextMenuElementStringKey = @"WebContextString";
-NSString * WebContextMenuElementImageKey = @"WebContextImage";
-NSString * WebContextMenuElementFrameKey = @"WebContextFrame";
+NSString * WebElementLinkURLKey = @"WebElementLinkURL";
+NSString * WebElementLinkLabelKey = @"WebElementLinkLabel";
+NSString * WebElementImageURLKey = @"WebElementImageURL";
+NSString * WebElementStringKey = @"WebElementString";
+NSString * WebElementImageKey = @"WebElementImage";
+NSString * WebElementFrameKey = @"WebElementFrame";
 
 @implementation WebController
 
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 800273f..92acead 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -13,14 +13,14 @@
 
 /*!
     @enum WebPolicyAction
-    @constant WebPolicyNone
-    @constant WebPolicyUse
-    @constant WebPolicyRevealInFinder
-    @constant WebPolicySave
-    @constant WebPolicyOpenURL
-    @constant WebPolicySaveAndOpen
-    @constant WebPolicyOpenNewWindow
-    @constant WebPolicyIgnore
+    @constant WebPolicyNone Unitialized state.
+    @constant WebPolicyUse Have WebKit use the resource.
+    @constant WebPolicyRevealInFinder Reveal the file in the Finder.
+    @constant WebPolicySave Save the resource to disk.
+    @constant WebPolicyOpenURL Open the URL in another application.
+    @constant WebPolicySaveAndOpen Save and open the resource in another application.
+    @constant WebPolicyOpenNewWindow Open the resource in another window.
+    @constant WebPolicyIgnore Do nothing with the resource.
 */
 typedef enum {
     WebPolicyNone,
@@ -35,9 +35,9 @@ typedef enum {
 
 /*!
     @enum WebURLAction
-    @constant WebURLPolicyUseContentPolicy,
-    @constant WebURLPolicyOpenExternally,
-    @constant WebURLPolicyIgnore
+    @constant WebURLPolicyUseContentPolicy Continue processing URL, ask for content policy.
+    @constant WebURLPolicyOpenExternally Open the URL in another application. 
+    @constant WebURLPolicyIgnore Do nothing with the URL.
 */
 typedef enum {
     WebURLPolicyUseContentPolicy = WebPolicyUse,
@@ -47,10 +47,10 @@ typedef enum {
 
 /*!
     @enum WebFileAction
-    @constant WebFileURLPolicyUseContentPolicy,
-    @constant WebFileURLPolicyOpenExternally,
-    @constant WebFileURLPolicyRevealInFinder,
-    @constant WebFileURLPolicyIgnore
+    @constant WebFileURLPolicyUseContentPolicy Continue processing the file, ask for content policy.
+    @constant WebFileURLPolicyOpenExternally Open the file in another application.
+    @constant WebFileURLPolicyRevealInFinder Reveal the file in the Finder.
+    @constant WebFileURLPolicyIgnore Do nothing with the file.
 */
 typedef enum {
     WebFileURLPolicyUseContentPolicy = WebPolicyUse,
@@ -61,11 +61,11 @@ typedef enum {
 
 /*!
     @enum WebContentAction
-    @constant WebContentPolicyNone,
-    @constant WebContentPolicyShow,
-    @constant WebContentPolicySave,
-    @constant WebContentPolicySaveAndOpenExternally,
-    @constant WebContentPolicyIgnore
+    @constant WebContentPolicyNone Unitialized state.
+    @constant WebContentPolicyShow Show the resource in WebKit.
+    @constant WebContentPolicySave Save the resource to disk.
+    @constant WebContentPolicySaveAndOpenExternally, Save the resource to disk and open it in another application.
+    @constant WebContentPolicyIgnore Do nothing with the resource.
 */
 typedef enum {
     WebContentPolicyNone = WebPolicyNone,
@@ -77,11 +77,11 @@ typedef enum {
 
 /*!
     @enum WebClickAction
-    @constant WebClickPolicyShow,
-    @constant WebClickPolicyOpenNewWindow,
-    @constant WebClickPolicySave,
-    @constant WebClickPolicySaveAndOpenExternally,
-    @constant WebClickPolicyIgnore
+    @constant WebClickPolicyShow Have WebKit show the clicked URL.
+    @constant WebClickPolicyOpenNewWindow Open the clicked URL in another window.
+    @constant WebClickPolicySave Save the clicked URL to disk.
+    @constant WebClickPolicySaveAndOpenExternally Save the clicked URL to disk and open the file in another application.
+    @constant WebClickPolicyIgnore Do nothing with the clicked URL.
 */
 typedef enum {
     WebClickPolicyShow = WebPolicyUse,
@@ -94,6 +94,8 @@ typedef enum {
 
 /*!
     @class WebPolicy
+    Base class that describes the action that should take place when the WebControllerPolicyDelegate
+    is asked for the policy for a URL, file, clicked URL or loaded content.
 */
 @interface WebPolicy : NSObject
 {
@@ -120,10 +122,12 @@ typedef enum {
 
 /*!
     @class WebURLPolicy
+    Describes the action for a URL that WebKit has been asked to load.
 */
 @interface WebURLPolicy : WebPolicy
 /*!
     @method webPolicyWithURLAction:
+    @abstract WebURLPolicy constructor
     @param action
 */
 + webPolicyWithURLAction: (WebURLAction)action;
@@ -132,10 +136,12 @@ typedef enum {
 
 /*!
     @class WebFileURLPolicy
+    Describes the action for a file that WebKit has been asked to load.
 */
 @interface WebFileURLPolicy : WebPolicy
 /*!
     @method webPolicyWithFileAction:
+    @abstract WebFileURLPolicy constructor
     @param action
 */
 + webPolicyWithFileAction: (WebFileAction)action;
@@ -144,12 +150,15 @@ typedef enum {
 
 /*!
     @class WebContentPolicy
+    Describes the action for content which has been partially loaded.
 */
 @interface WebContentPolicy : WebPolicy
 /*!
     @method webPolicyWithContentAction:andPath:
+    @abstract WebContentPolicy constructor
     @param action
-    @param thePath
+    @param thePath Path to where the file should be saved. Only applicable for
+    WebContentPolicySave and WebContentPolicySaveAndOpenExternally WebContentActions.
 */
 + webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath;
 @end
@@ -157,12 +166,15 @@ typedef enum {
 
 /*!
     @class WebClickPolicy
+    Describes the action for content which has been partially loaded.
 */
 @interface WebClickPolicy : WebPolicy
 /*!
     @method webPolicyWithClickAction:andPath:
+    @abstract WebClickPolicy constructor
     @param action
-    @param thePath
+    @param thePath Path to where the file should be saved. Only applicable for
+    WebClickPolicySave and WebClickPolicySaveAndOpenExternally WebClickActions.
 */
 + webPolicyWithClickAction: (WebClickAction)action URL:(NSURL *)URL andPath: (NSString *)thePath;
 @end
@@ -170,6 +182,8 @@ typedef enum {
 
 /*!
     @protocol WebControllerPolicyHandler
+    @discussion A controller's WebControllerPolicyHandler is asked for policies for files,
+    URL's, clicked URL's and partially loaded content that WebKit has been asked to load.
 */
 @protocol WebControllerPolicyDelegate <NSObject>
 
@@ -179,19 +193,19 @@ typedef enum {
     before it is clicked or loaded via a URL bar.  Clients can choose to handle the
     URL normally, hand the URL off to launch services, or
     ignore the URL.  The default implementation could return +defaultURLPolicyForURL:.
-    @param URL
-    @param frame
+    @param URL The URL that WebKit has been asked to load.
+    @param frame The frame which will load the URL.
 */
 - (WebURLPolicy *)URLPolicyForURL:(NSURL *)URL inFrame:(WebFrame *)frame;
 
 /*!
     @method contentPolicyForMIMEType:URL:inFrame:
-    @discussion Sent after locationChangeStarted.
+    @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted. 
     Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
     after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-    @param type
-    @param URL
-    @param frame
+    @param type MIME type of the partially loaded content.
+    @param URL URL of the partially loaded content.
+    @param frame The frame which is loading the URL.
 */
 - (WebContentPolicy *)contentPolicyForMIMEType: (NSString *)type URL:(NSURL *)URL inFrame:(WebFrame *)frame;
 
@@ -199,15 +213,16 @@ typedef enum {
     @method fileURLPolicyForMIMEType:inFrame:isDirectory:
     @discussion Called when the response to URLPolicyForURL is WebURLPolicyUseContentPolicy and the URL is
     a file URL. This allows clients to special-case WebKit's behavior for file URLs.
-    @param type
-    @param frame
-    @param isDirectory
+    @param type MIME type for the file.
+    @param frame The frame which will load the file.
+    @param isDirectory YES if the file is a directory.
 */
 - (WebFileURLPolicy *)fileURLPolicyForMIMEType: (NSString *)type inFrame:(WebFrame *)frame isDirectory: (BOOL)isDirectory;
 
 /*!
     @method clickPolicyForElement:button:modifierMask:
-    @param elementInformation
+    @discussion Returns the policy for a clicked URL.
+    @param elementInformation Dictionary that describes the clicked element.
     @param eventType
     @param eventMask
 */
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
index e2686f3..2325fc5 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.h
@@ -20,10 +20,13 @@
 
 /*!
     @method addMenuItemWithTitle:action:target:toArray:
-    @param title
-    @param selector
-    @param target
-    @param menuItems
+    @abstract Convenience method that creates and adds a menu item an array. Usually used by the
+    WebContextMenuDelegate when constructing the array of menu items returned in
+    contextMenuItemsForElement:defaultMenuItems:
+    @param title Title of the menu item.
+    @param selector The menu item's selector.
+    @param target The target of the selector.
+    @param menuItems The array of menu items that should eventually be returned in contextMenuItemsForElement:defaultMenuItems:
 */
 + (void)addMenuItemWithTitle:(NSString *)title action:(SEL)selector target:(id)target toArray:(NSMutableArray *)menuItems;
 
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 439371b..2e9d040 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -38,7 +38,7 @@
     [element release];
     element = [theElement retain];
 
-    linkURL = [element objectForKey:WebContextMenuElementLinkURLKey];
+    linkURL = [element objectForKey:WebElementLinkURLKey];
 
     if(linkURL){
     
@@ -55,7 +55,7 @@
                                    toArray:menuItems];
     }
 
-    imageURL = [element objectForKey:WebContextMenuElementImageURLKey];
+    imageURL = [element objectForKey:WebElementImageURLKey];
 
     if(imageURL){
         
@@ -79,7 +79,7 @@
 
     if(!imageURL && !linkURL){
     
-        WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
+        WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
 
         if(![[webFrame dataSource] isMainDocument]){
             [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") 				                action:@selector(openFrameInNewWindow:)
@@ -93,14 +93,14 @@
 
 - (void)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer
 {
-    WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
+    WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
     WebController *controller = [webFrame controller];
     [[controller windowOperationsDelegate] openNewWindowWithURL:URL referrer:referrer];
 }
 
 - (void)downloadURL:(NSURL *)URL
 {
-    WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
+    WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
     WebController *controller = [webFrame controller];
     WebContentPolicy *contentPolicy = [[controller policyDelegate] contentPolicyForMIMEType:@"application/octet-stream" URL:URL inFrame:webFrame];
     [controller _downloadURL:URL toPath:[contentPolicy path]];
@@ -108,36 +108,36 @@
 
 - (void)openLinkInNewWindow:(id)sender
 {
-    [self openNewWindowWithURL:[element objectForKey:WebContextMenuElementLinkURLKey] referrer:nil];
+    [self openNewWindowWithURL:[element objectForKey:WebElementLinkURLKey] referrer:nil];
 }
 
 - (void)downloadLinkToDisk:(id)sender
 {
-    [self downloadURL:[element objectForKey:WebContextMenuElementLinkURLKey]];
+    [self downloadURL:[element objectForKey:WebElementLinkURLKey]];
 }
 
 - (void)copyLinkToClipboard:(id)sender
 {
     NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-    [pasteboard _web_writeURL:[element objectForKey:WebContextMenuElementLinkURLKey]
-                     andTitle:[element objectForKey:WebContextMenuElementLinkLabelKey]
+    [pasteboard _web_writeURL:[element objectForKey:WebElementLinkURLKey]
+                     andTitle:[element objectForKey:WebElementLinkLabelKey]
                     withOwner:self];
 }
 
 - (void)openImageInNewWindow:(id)sender
 {
-    [self openNewWindowWithURL:[element objectForKey:WebContextMenuElementImageURLKey] referrer:nil];
+    [self openNewWindowWithURL:[element objectForKey:WebElementImageURLKey] referrer:nil];
 }
 
 - (void)downloadImageToDisk:(id)sender
 {
-    [self downloadURL:[element objectForKey:WebContextMenuElementImageURLKey]];
+    [self downloadURL:[element objectForKey:WebElementImageURLKey]];
 }
 
 - (void)copyImageToClipboard:(id)sender
 {
     NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-    NSData *tiff = [[element objectForKey:WebContextMenuElementImageKey] TIFFRepresentation];
+    NSData *tiff = [[element objectForKey:WebElementImageKey] TIFFRepresentation];
     
     [pasteboard declareTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:nil];
     [pasteboard setData:tiff forType:NSTIFFPboardType];
@@ -145,7 +145,7 @@
 
 - (void)openFrameInNewWindow:(id)sender
 {
-    WebFrame *webFrame = [element objectForKey:WebContextMenuElementFrameKey];
+    WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
     WebDataSource *dataSource = [webFrame dataSource];
     NSURL *URL = [dataSource URL];
     [self openNewWindowWithURL:URL referrer:nil];
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 6bbb0e9..82ed399 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -465,8 +465,8 @@
 
     NSPoint point = [self convertPoint:_private->mouseDownPoint fromView:nil];
     NSDictionary *element = [self _elementAtPoint: point];
-    NSURL *linkURL = [element objectForKey: WebContextMenuElementLinkURLKey];
-    NSURL *imageURL = [element objectForKey: WebContextMenuElementImageURLKey];
+    NSURL *linkURL = [element objectForKey: WebElementLinkURLKey];
+    NSURL *imageURL = [element objectForKey: WebElementImageURLKey];
     
     if ((deltaX >= DragStartXHysteresis || deltaY >= DragStartYHysteresis) && !didScroll){
         if((imageURL && [[WebPreferences standardPreferences] willLoadImagesAutomatically]) ||
@@ -476,9 +476,21 @@
             if (imageURL){
                 _private->draggedURL = imageURL;
 
-                NSArray *fileType = [NSArray arrayWithObject:[[_private->draggedURL path] pathExtension]];
-                NSRect rect = NSMakeRect(point.x + -16, point.y - 16, 32, 32);
-                [self dragPromisedFilesOfTypes: fileType fromRect: rect source: self slideBack: YES event: event];
+                NSPoint mousePoint = [self convertPoint:[event locationInWindow] fromView:nil];
+                NSImage *image = [element objectForKey: WebElementImageKey];
+                //NSSize centerOffset = NSMakeSize(imageSize.width / 2, -DRAG_LABEL_BORDER_Y);
+                //NSPoint imagePoint = NSMakePoint(mousePoint.x - centerOffset.width, mousePoint.y - centerOffset.height);
+
+                NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+                [pasteboard setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
+                
+                [self dragImage:image
+                             at:mousePoint
+                         offset:NSZeroSize
+                          event:event
+                     pasteboard:pasteboard
+                         source:self
+                      slideBack:YES];
             }
             else if (linkURL) {
                 BOOL drawURLString = YES;
@@ -486,7 +498,7 @@
                 
                 _private->draggedURL = linkURL;
                                 
-                NSString *label = [element objectForKey: WebContextMenuElementLinkLabelKey];
+                NSString *label = [element objectForKey: WebElementLinkLabelKey];
                 NSString *urlString = [linkURL absoluteString];
                 
                 if (!label){
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 82041c3..0a2f5f4 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -129,7 +129,7 @@ BOOL _modifierTrackingEnabled = FALSE;
 
     WebView *webView = [self _web_parentWebView];
     WebFrame *webFrame = [[webView controller] frameForView:webView];
-    [elementInfo setObject:webFrame forKey:WebContextMenuElementFrameKey];
+    [elementInfo setObject:webFrame forKey:WebElementFrameKey];
        
     return elementInfo;
 }
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 800273f..92acead 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -13,14 +13,14 @@
 
 /*!
     @enum WebPolicyAction
-    @constant WebPolicyNone
-    @constant WebPolicyUse
-    @constant WebPolicyRevealInFinder
-    @constant WebPolicySave
-    @constant WebPolicyOpenURL
-    @constant WebPolicySaveAndOpen
-    @constant WebPolicyOpenNewWindow
-    @constant WebPolicyIgnore
+    @constant WebPolicyNone Unitialized state.
+    @constant WebPolicyUse Have WebKit use the resource.
+    @constant WebPolicyRevealInFinder Reveal the file in the Finder.
+    @constant WebPolicySave Save the resource to disk.
+    @constant WebPolicyOpenURL Open the URL in another application.
+    @constant WebPolicySaveAndOpen Save and open the resource in another application.
+    @constant WebPolicyOpenNewWindow Open the resource in another window.
+    @constant WebPolicyIgnore Do nothing with the resource.
 */
 typedef enum {
     WebPolicyNone,
@@ -35,9 +35,9 @@ typedef enum {
 
 /*!
     @enum WebURLAction
-    @constant WebURLPolicyUseContentPolicy,
-    @constant WebURLPolicyOpenExternally,
-    @constant WebURLPolicyIgnore
+    @constant WebURLPolicyUseContentPolicy Continue processing URL, ask for content policy.
+    @constant WebURLPolicyOpenExternally Open the URL in another application. 
+    @constant WebURLPolicyIgnore Do nothing with the URL.
 */
 typedef enum {
     WebURLPolicyUseContentPolicy = WebPolicyUse,
@@ -47,10 +47,10 @@ typedef enum {
 
 /*!
     @enum WebFileAction
-    @constant WebFileURLPolicyUseContentPolicy,
-    @constant WebFileURLPolicyOpenExternally,
-    @constant WebFileURLPolicyRevealInFinder,
-    @constant WebFileURLPolicyIgnore
+    @constant WebFileURLPolicyUseContentPolicy Continue processing the file, ask for content policy.
+    @constant WebFileURLPolicyOpenExternally Open the file in another application.
+    @constant WebFileURLPolicyRevealInFinder Reveal the file in the Finder.
+    @constant WebFileURLPolicyIgnore Do nothing with the file.
 */
 typedef enum {
     WebFileURLPolicyUseContentPolicy = WebPolicyUse,
@@ -61,11 +61,11 @@ typedef enum {
 
 /*!
     @enum WebContentAction
-    @constant WebContentPolicyNone,
-    @constant WebContentPolicyShow,
-    @constant WebContentPolicySave,
-    @constant WebContentPolicySaveAndOpenExternally,
-    @constant WebContentPolicyIgnore
+    @constant WebContentPolicyNone Unitialized state.
+    @constant WebContentPolicyShow Show the resource in WebKit.
+    @constant WebContentPolicySave Save the resource to disk.
+    @constant WebContentPolicySaveAndOpenExternally, Save the resource to disk and open it in another application.
+    @constant WebContentPolicyIgnore Do nothing with the resource.
 */
 typedef enum {
     WebContentPolicyNone = WebPolicyNone,
@@ -77,11 +77,11 @@ typedef enum {
 
 /*!
     @enum WebClickAction
-    @constant WebClickPolicyShow,
-    @constant WebClickPolicyOpenNewWindow,
-    @constant WebClickPolicySave,
-    @constant WebClickPolicySaveAndOpenExternally,
-    @constant WebClickPolicyIgnore
+    @constant WebClickPolicyShow Have WebKit show the clicked URL.
+    @constant WebClickPolicyOpenNewWindow Open the clicked URL in another window.
+    @constant WebClickPolicySave Save the clicked URL to disk.
+    @constant WebClickPolicySaveAndOpenExternally Save the clicked URL to disk and open the file in another application.
+    @constant WebClickPolicyIgnore Do nothing with the clicked URL.
 */
 typedef enum {
     WebClickPolicyShow = WebPolicyUse,
@@ -94,6 +94,8 @@ typedef enum {
 
 /*!
     @class WebPolicy
+    Base class that describes the action that should take place when the WebControllerPolicyDelegate
+    is asked for the policy for a URL, file, clicked URL or loaded content.
 */
 @interface WebPolicy : NSObject
 {
@@ -120,10 +122,12 @@ typedef enum {
 
 /*!
     @class WebURLPolicy
+    Describes the action for a URL that WebKit has been asked to load.
 */
 @interface WebURLPolicy : WebPolicy
 /*!
     @method webPolicyWithURLAction:
+    @abstract WebURLPolicy constructor
     @param action
 */
 + webPolicyWithURLAction: (WebURLAction)action;
@@ -132,10 +136,12 @@ typedef enum {
 
 /*!
     @class WebFileURLPolicy
+    Describes the action for a file that WebKit has been asked to load.
 */
 @interface WebFileURLPolicy : WebPolicy
 /*!
     @method webPolicyWithFileAction:
+    @abstract WebFileURLPolicy constructor
     @param action
 */
 + webPolicyWithFileAction: (WebFileAction)action;
@@ -144,12 +150,15 @@ typedef enum {
 
 /*!
     @class WebContentPolicy
+    Describes the action for content which has been partially loaded.
 */
 @interface WebContentPolicy : WebPolicy
 /*!
     @method webPolicyWithContentAction:andPath:
+    @abstract WebContentPolicy constructor
     @param action
-    @param thePath
+    @param thePath Path to where the file should be saved. Only applicable for
+    WebContentPolicySave and WebContentPolicySaveAndOpenExternally WebContentActions.
 */
 + webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath;
 @end
@@ -157,12 +166,15 @@ typedef enum {
 
 /*!
     @class WebClickPolicy
+    Describes the action for content which has been partially loaded.
 */
 @interface WebClickPolicy : WebPolicy
 /*!
     @method webPolicyWithClickAction:andPath:
+    @abstract WebClickPolicy constructor
     @param action
-    @param thePath
+    @param thePath Path to where the file should be saved. Only applicable for
+    WebClickPolicySave and WebClickPolicySaveAndOpenExternally WebClickActions.
 */
 + webPolicyWithClickAction: (WebClickAction)action URL:(NSURL *)URL andPath: (NSString *)thePath;
 @end
@@ -170,6 +182,8 @@ typedef enum {
 
 /*!
     @protocol WebControllerPolicyHandler
+    @discussion A controller's WebControllerPolicyHandler is asked for policies for files,
+    URL's, clicked URL's and partially loaded content that WebKit has been asked to load.
 */
 @protocol WebControllerPolicyDelegate <NSObject>
 
@@ -179,19 +193,19 @@ typedef enum {
     before it is clicked or loaded via a URL bar.  Clients can choose to handle the
     URL normally, hand the URL off to launch services, or
     ignore the URL.  The default implementation could return +defaultURLPolicyForURL:.
-    @param URL
-    @param frame
+    @param URL The URL that WebKit has been asked to load.
+    @param frame The frame which will load the URL.
 */
 - (WebURLPolicy *)URLPolicyForURL:(NSURL *)URL inFrame:(WebFrame *)frame;
 
 /*!
     @method contentPolicyForMIMEType:URL:inFrame:
-    @discussion Sent after locationChangeStarted.
+    @discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted. 
     Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
     after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-    @param type
-    @param URL
-    @param frame
+    @param type MIME type of the partially loaded content.
+    @param URL URL of the partially loaded content.
+    @param frame The frame which is loading the URL.
 */
 - (WebContentPolicy *)contentPolicyForMIMEType: (NSString *)type URL:(NSURL *)URL inFrame:(WebFrame *)frame;
 
@@ -199,15 +213,16 @@ typedef enum {
     @method fileURLPolicyForMIMEType:inFrame:isDirectory:
     @discussion Called when the response to URLPolicyForURL is WebURLPolicyUseContentPolicy and the URL is
     a file URL. This allows clients to special-case WebKit's behavior for file URLs.
-    @param type
-    @param frame
-    @param isDirectory
+    @param type MIME type for the file.
+    @param frame The frame which will load the file.
+    @param isDirectory YES if the file is a directory.
 */
 - (WebFileURLPolicy *)fileURLPolicyForMIMEType: (NSString *)type inFrame:(WebFrame *)frame isDirectory: (BOOL)isDirectory;
 
 /*!
     @method clickPolicyForElement:button:modifierMask:
-    @param elementInformation
+    @discussion Returns the policy for a clicked URL.
+    @param elementInformation Dictionary that describes the clicked element.
     @param eventType
     @param eventMask
 */
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index aa303b1..cd89a0a 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -26,6 +26,14 @@
 @protocol WebResourceProgressDelegate;
 @protocol WebContextMenuDelegate;
 
+// These strings are keys into the element dictionary provided in
+// the WebContextMenuDelegate's contextMenuItemsForElement and the WebControllerPolicyDelegate's clickPolicyForElement.
+extern NSString *WebElementLinkURLKey;
+extern NSString *WebElementLinkLabelKey;
+extern NSString *WebElementImageURLKey;
+extern NSString *WebElementStringKey;
+extern NSString *WebElementImageKey;
+extern NSString *WebElementFrameKey;
 
 /*!
     @class WebController
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 747370c..038ba15 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -29,12 +29,12 @@
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebResourceHandle.h>
 
-NSString * WebContextMenuElementLinkURLKey = @"WebContextLinkURL";
-NSString * WebContextMenuElementLinkLabelKey = @"WebContextLinkLabel";
-NSString * WebContextMenuElementImageURLKey = @"WebContextImageURL";
-NSString * WebContextMenuElementStringKey = @"WebContextString";
-NSString * WebContextMenuElementImageKey = @"WebContextImage";
-NSString * WebContextMenuElementFrameKey = @"WebContextFrame";
+NSString * WebElementLinkURLKey = @"WebElementLinkURL";
+NSString * WebElementLinkLabelKey = @"WebElementLinkLabel";
+NSString * WebElementImageURLKey = @"WebElementImageURL";
+NSString * WebElementStringKey = @"WebElementString";
+NSString * WebElementImageKey = @"WebElementImage";
+NSString * WebElementFrameKey = @"WebElementFrame";
 
 @implementation WebController
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list