[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:44:55 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 177ba1b5fa79ce456c4391e4ae7e2d2d938291af
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 26 19:07:17 2002 +0000

    WebCore:
    
    	Added WebCoreElementImageLocationKey to the element dictionary.
    
            * kwq/WebCoreBridge.h:
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge elementAtPoint:]):
    
    WebKit:
    
    	- When dragging an image, use the image itself for the drag image
    	- Support promised file and image data drag types for dragged images.
    
            * Misc.subproj/WebNSImageExtras.h: Added.
            * Misc.subproj/WebNSImageExtras.m: Added.
            (-[NSImage _web_scaleToMaxSize:]): new, scales an image is greater than max
            (-[NSImage _web_dissolveToFraction:]): new, dissolves image in place
            * WebKit.pbproj/project.pbxproj:
            * WebView.subproj/WebController.h: Added WebElementImageLocationKey to the element dictionary
            * WebView.subproj/WebController.m: ditto
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]): subclassed for only for image drags
            (-[WebHTMLView mouseDragged:]): use the promised file api again.
            (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): use the retained element dictionary instead of the dragged URL which I deleted.
            * WebView.subproj/WebHTMLViewPrivate.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2176 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f18ab16..a6f26f1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-09-26  Chris Blumenberg  <cblu at apple.com>
+
+	Added WebCoreElementImageLocationKey to the element dictionary.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]):
+
 === Alexander-25 ===
 
 2002-09-25  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f18ab16..a6f26f1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-09-26  Chris Blumenberg  <cblu at apple.com>
+
+	Added WebCoreElementImageLocationKey to the element dictionary.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]):
+
 === Alexander-25 ===
 
 2002-09-25  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f18ab16..a6f26f1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-09-26  Chris Blumenberg  <cblu at apple.com>
+
+	Added WebCoreElementImageLocationKey to the element dictionary.
+
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge elementAtPoint:]):
+
 === Alexander-25 ===
 
 2002-09-25  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index abc2848..2fe1a9d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -58,6 +58,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
 #define WebCoreElementImageURL 		@"WebElementImageURL"
 #define WebCoreElementString   		@"WebElementString"
 #define WebCoreElementImage    		@"WebElementImage"
+#define WebCoreElementImageLocation	@"WebElementImageLocation"
 
 // 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 7da0cb5..09e203f 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -470,6 +470,10 @@ using khtml::RenderPart;
             id <WebCoreImageRenderer> image = r->pixmap().image();
             if (image) {
                 [elementInfo setObject:image forKey:WebCoreElementImage];
+                int x, y;
+                if(r->absolutePosition(x, y)){
+                    [elementInfo setObject:[NSValue valueWithPoint:NSMakePoint(x,y)] forKey:WebCoreElementImageLocation];
+                }
             }
         }
     }
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d6a5143..59c0485 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2002-09-26  Chris Blumenberg  <cblu at apple.com>
+
+	- When dragging an image, use the image itself for the drag image
+	- Support promised file and image data drag types for dragged images.
+
+        * Misc.subproj/WebNSImageExtras.h: Added.
+        * Misc.subproj/WebNSImageExtras.m: Added.
+        (-[NSImage _web_scaleToMaxSize:]): new, scales an image is greater than max
+        (-[NSImage _web_dissolveToFraction:]): new, dissolves image in place
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebController.h: Added WebElementImageLocationKey to the element dictionary
+        * WebView.subproj/WebController.m: ditto
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]): subclassed for only for image drags
+        (-[WebHTMLView mouseDragged:]): use the promised file api again.
+        (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): use the retained element dictionary instead of the dragged URL which I deleted.
+        * WebView.subproj/WebHTMLViewPrivate.h:
+
 === Alexander-25 ===
 
 2002-09-25  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d6a5143..59c0485 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-09-26  Chris Blumenberg  <cblu at apple.com>
+
+	- When dragging an image, use the image itself for the drag image
+	- Support promised file and image data drag types for dragged images.
+
+        * Misc.subproj/WebNSImageExtras.h: Added.
+        * Misc.subproj/WebNSImageExtras.m: Added.
+        (-[NSImage _web_scaleToMaxSize:]): new, scales an image is greater than max
+        (-[NSImage _web_dissolveToFraction:]): new, dissolves image in place
+        * WebKit.pbproj/project.pbxproj:
+        * WebView.subproj/WebController.h: Added WebElementImageLocationKey to the element dictionary
+        * WebView.subproj/WebController.m: ditto
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]): subclassed for only for image drags
+        (-[WebHTMLView mouseDragged:]): use the promised file api again.
+        (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]): use the retained element dictionary instead of the dragged URL which I deleted.
+        * WebView.subproj/WebHTMLViewPrivate.h:
+
 === Alexander-25 ===
 
 2002-09-25  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/Misc.subproj/WebNSImageExtras.h b/WebKit/Misc.subproj/WebNSImageExtras.h
new file mode 100644
index 0000000..30d4143
--- /dev/null
+++ b/WebKit/Misc.subproj/WebNSImageExtras.h
@@ -0,0 +1,18 @@
+//
+//  WebNSImageExtras.h
+//  WebKit
+//
+//  Created by Chris Blumenberg on Wed Sep 25 2002.
+//  Copyright (c) 2002 Apple Computer Inc. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+ at interface NSImage (WebExtras)
+
+- (void)_web_scaleToMaxSize:(NSSize)size;
+
+- (void)_web_dissolveToFraction:(float)delta;
+
+ at end
diff --git a/WebKit/Misc.subproj/WebNSImageExtras.m b/WebKit/Misc.subproj/WebNSImageExtras.m
new file mode 100644
index 0000000..01d82e7
--- /dev/null
+++ b/WebKit/Misc.subproj/WebNSImageExtras.m
@@ -0,0 +1,56 @@
+//
+//  WebNSImageExtras.m
+//  WebKit
+//
+//  Created by Chris Blumenberg on Wed Sep 25 2002.
+//  Copyright (c) 2002 Apple Computer Inc. All rights reserved.
+//
+
+#import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSImageExtras.h>
+
+ at implementation NSImage (WebExtras)
+
+- (void)_web_scaleToMaxSize:(NSSize)size
+{
+    float heightResizeDelta = 0.0, widthResizeDelta = 0.0, resizeDelta = 0.0;
+    NSSize originalSize = [self size];
+
+    if(originalSize.width > size.width){
+        widthResizeDelta = size.width / originalSize.width;
+        resizeDelta = widthResizeDelta;
+    }
+
+    if(originalSize.height > size.height){
+        heightResizeDelta = size.height / originalSize.height;
+        if((resizeDelta == 0.0) || (resizeDelta > heightResizeDelta)){
+            resizeDelta = heightResizeDelta;
+        }
+    }
+    
+    if(resizeDelta > 0.0){
+        NSSize newSize = NSMakeSize((originalSize.width * resizeDelta), (originalSize.height * resizeDelta));
+        [self setScalesWhenResized:YES];
+        [self setSize:newSize];
+    }
+}
+
+- (void)_web_dissolveToFraction:(float)delta
+{
+    NSImage *dissolvedImage = [[[NSImage alloc] initWithSize:[self size]] autorelease];
+    BOOL isFlipped = [self isFlipped];
+    
+    [self setFlipped:NO];
+    
+    [dissolvedImage lockFocus];
+    [self dissolveToPoint:NSZeroPoint fraction: delta];
+    [dissolvedImage unlockFocus];
+
+    [self lockFocus];
+    [dissolvedImage compositeToPoint:NSZeroPoint operation:NSCompositeCopy];
+    [self unlockFocus];
+
+    [self setFlipped:isFlipped];
+}
+
+ at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index bf64b88..ef0527e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -277,6 +277,7 @@
 				5152FAEA033FC53500CA2ACD,
 				511D5554033FD51000CA2ACD,
 				933D659B03413FF2008635CE,
+				8398847C03426FB000BC5F5E,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -366,6 +367,7 @@
 				5152FAE4033FC50400CA2ACD,
 				5152FAE8033FC52200CA2ACD,
 				933D659C03413FF2008635CE,
+				8398847D03426FB000BC5F5E,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -440,6 +442,8 @@
 				2568C72C0174912D0ECA149E,
 				F5927D4E02D26C5E01CA2DBB,
 				F5C283730284676D018635CA,
+				8398847A03426FB000BC5F5E,
+				8398847B03426FB000BC5F5E,
 				ED2B2474033A2DA800C1A526,
 				ED2B2475033A2DA800C1A526,
 				F508946902B71D59018A9CD4,
@@ -1284,6 +1288,40 @@
 //652
 //653
 //654
+//830
+//831
+//832
+//833
+//834
+		8398847A03426FB000BC5F5E = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = WebNSImageExtras.h;
+			refType = 4;
+		};
+		8398847B03426FB000BC5F5E = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = WebNSImageExtras.m;
+			refType = 4;
+		};
+		8398847C03426FB000BC5F5E = {
+			fileRef = 8398847A03426FB000BC5F5E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8398847D03426FB000BC5F5E = {
+			fileRef = 8398847B03426FB000BC5F5E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//830
+//831
+//832
+//833
+//834
 //930
 //931
 //932
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index a1f67ec..41588e2 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -31,6 +31,7 @@ extern NSString *WebElementLinkLabelKey;
 extern NSString *WebElementImageURLKey;
 extern NSString *WebElementStringKey;
 extern NSString *WebElementImageKey;
+extern NSString *WebElementImageLocationKey;
 extern NSString *WebElementFrameKey;
 
 /*!
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 34eedd8..cab155a 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -34,6 +34,7 @@ NSString * WebElementLinkLabelKey = @"WebElementLinkLabel";
 NSString * WebElementImageURLKey = @"WebElementImageURL";
 NSString * WebElementStringKey = @"WebElementString";
 NSString * WebElementImageKey = @"WebElementImage";
+NSString * WebElementImageLocationKey = @"WebElementImageLocation";
 NSString * WebElementFrameKey = @"WebElementFrame";
 
 @implementation WebController
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 15d0b18..46f7fa7 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -18,6 +18,7 @@
 #import <WebKit/WebIconDatabase.h>
 #import <WebKit/WebIconLoader.h>
 #import <WebKit/WebKitLogging.h>
+#import <WebKit/WebNSImageExtras.h>
 #import <WebKit/WebNSPasteboardExtras.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebPreferences.h>
@@ -29,6 +30,17 @@
 // Needed for the mouse moved notification.
 #import <AppKit/NSResponder_Private.h>
 
+#define DragStartXHysteresis  		5.0
+#define DragStartYHysteresis  		5.0
+
+#define DRAG_LABEL_BORDER_X		4.0
+#define DRAG_LABEL_BORDER_Y		2.0
+
+#define MIN_DRAG_LABEL_WIDTH_BEFORE_CLIP	120.0
+
+#define DragImageAlpha    		0.75
+#define MaxDragSize 			NSMakeSize(400, 400)
+
 @implementation WebHTMLView
 
 - initWithFrame: (NSRect) frame
@@ -436,13 +448,50 @@
     [[self _bridge] mouseDown:event];
 }
 
-#define DragStartXHysteresis  		5.0
-#define DragStartYHysteresis  		5.0
+- (void)dragImage:(NSImage *)anImage
+               at:(NSPoint)imageLoc
+           offset:(NSSize)mouseOffset
+            event:(NSEvent *)theEvent
+       pasteboard:(NSPasteboard *)pboard
+           source:(id)sourceObject
+        slideBack:(BOOL)slideBack
+{
+    if(_private->draggingImageElement){
+        // Subclassing dragImage for image drags let's us change aspects of the drag that the
+        // promised file API doesn't provide such as a different drag image, other pboard types etc.
+        
+        NSImage *originalImage = [_private->draggingImageElement objectForKey:WebElementImageKey];
+        anImage = [[originalImage copy] autorelease];
+        
+        NSSize originalSize = [anImage size];
+        [anImage _web_scaleToMaxSize:MaxDragSize];
+        NSSize newSize = [anImage size];
 
-#define DRAG_LABEL_BORDER_X		4.0
-#define DRAG_LABEL_BORDER_Y		2.0
+        [anImage _web_dissolveToFraction:DragImageAlpha];
 
-#define MIN_DRAG_LABEL_WIDTH_BEFORE_CLIP	120.0
+        NSPoint mouseDownPoint = [self convertPoint:[theEvent locationInWindow] fromView:nil];
+        NSPoint currentPoint = [self convertPoint:[[_window currentEvent] locationInWindow] fromView:nil];
+
+        // Properly orient the drag image if it's smaller than the original
+        imageLoc = [[_private->draggingImageElement objectForKey:WebElementImageLocationKey] pointValue];
+        imageLoc.x = mouseDownPoint.x - (((mouseDownPoint.x - imageLoc.x) / originalSize.width) * newSize.width);
+        imageLoc.y = imageLoc.y + originalSize.height;
+        imageLoc.y = mouseDownPoint.y - (((mouseDownPoint.y - imageLoc.y) / originalSize.height) * newSize.height);
+        
+        mouseOffset = NSMakeSize(currentPoint.x - mouseDownPoint.x, currentPoint.y - mouseDownPoint.y);
+
+        [pboard addTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:self];
+        [pboard setData:[originalImage TIFFRepresentation] forType:NSTIFFPboardType];
+    }
+
+    [super dragImage:anImage
+                  at:imageLoc
+              offset:mouseOffset
+               event:theEvent
+          pasteboard:pboard
+              source:sourceObject
+           slideBack:slideBack];
+}
 
 - (void)mouseDragged:(NSEvent *)event
 {
@@ -462,38 +511,27 @@
     NSDictionary *element = [self _elementAtPoint: point];
     NSURL *linkURL = [element objectForKey: WebElementLinkURLKey];
     NSURL *imageURL = [element objectForKey: WebElementImageURLKey];
+
+    [_private->draggingImageElement release];
+    _private->draggingImageElement = nil;
     
     if ((deltaX >= DragStartXHysteresis || deltaY >= DragStartYHysteresis) && !didScroll){
-        if((imageURL && [[WebPreferences standardPreferences] willLoadImagesAutomatically]) ||
-            (!imageURL && linkURL)){
-            [_private->draggedURL release];
+        if((imageURL && [[WebPreferences standardPreferences] willLoadImagesAutomatically]) || (!imageURL && linkURL)){
             
             if (imageURL){
-                _private->draggedURL = imageURL;
-
-                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 declareTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:nil];
-                [pasteboard setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
+                _private->draggingImageElement = [element retain];
+
+                // FIXME: This getting the file type this way doesn't always work
+                [self dragPromisedFilesOfTypes:[NSArray arrayWithObject:[[imageURL path] pathExtension]]
+                                      fromRect:NSZeroRect
+                                        source:self
+                                     slideBack:YES
+                                         event:event];
                 
-                [self dragImage:image
-                             at:mousePoint
-                         offset:NSZeroSize
-                          event:event
-                     pasteboard:pasteboard
-                         source:self
-                      slideBack:YES];
-            }
-            else if (linkURL) {
+            }else if (linkURL) {
                 BOOL drawURLString = YES;
                 BOOL clipURLString = NO;
-                
-                _private->draggedURL = linkURL;
-                                
+                                                
                 NSString *label = [element objectForKey: WebElementLinkLabelKey];
                 NSString *urlString = [linkURL absoluteString];
                 
@@ -549,10 +587,6 @@
                          source:self
                       slideBack:NO];
             }
-            else
-                _private->draggedURL = nil;
-            
-            [_private->draggedURL retain];
             
             return;
         }
@@ -560,10 +594,31 @@
 
     // Give khtml a crack at the event only if we haven't started,
     // or potentially starated, a drag
-    if (!linkURL && !imageURL)
+    if (!linkURL && !imageURL){
         [[self _bridge] mouseDragged:event];
+    }
+}
+
+- (unsigned)draggingSourceOperationMaskForLocal:(BOOL)isLocal
+{
+    return NSDragOperationCopy;
 }
 
+- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination
+{
+    NSURL *imageURL = [_private->draggingImageElement objectForKey: WebElementImageURLKey];
+    
+    if(!imageURL){
+        return nil;
+    }
+    
+    NSString *filename = [[imageURL path] lastPathComponent];
+    NSString *path = [[dropDestination path] stringByAppendingPathComponent:filename];
+
+    [[self _controller] _downloadURL:imageURL toPath:path];
+    
+    return [NSArray arrayWithObject:filename];
+}
 
 - (void)mouseUp: (NSEvent *)event
 {
@@ -653,20 +708,6 @@
 
 #endif
 
-- (unsigned)draggingSourceOperationMaskForLocal:(BOOL)isLocal
-{
-    return NSDragOperationCopy;
-}
-
-- (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination
-{
-    NSString *filename = [[_private->draggedURL path] lastPathComponent];
-    NSString *path = [[dropDestination path] stringByAppendingPathComponent:filename];
-
-    [[self _controller] _downloadURL:_private->draggedURL toPath:path];
-    return [NSArray arrayWithObject:filename];
-}
-
 - (BOOL)supportsTextEncoding
 {
     return YES;
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index bd60b55..800b1bd 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -23,10 +23,11 @@
     BOOL liveAllowsScrolling;
     BOOL inWindow;
     BOOL inNextValidKeyView;
-    NSURL *draggedURL;
     
     id savedSubviews;
     BOOL subviewsSetAside;
+
+    NSDictionary *draggingImageElement;
 }
 @end
 
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 761adde..d850ce1 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -52,7 +52,7 @@
 
 - (void)dealloc
 {
-    [draggedURL release];
+    [draggingImageElement release];
     [super dealloc];
 }
 
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index a1f67ec..41588e2 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -31,6 +31,7 @@ extern NSString *WebElementLinkLabelKey;
 extern NSString *WebElementImageURLKey;
 extern NSString *WebElementStringKey;
 extern NSString *WebElementImageKey;
+extern NSString *WebElementImageLocationKey;
 extern NSString *WebElementFrameKey;
 
 /*!
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 34eedd8..cab155a 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -34,6 +34,7 @@ NSString * WebElementLinkLabelKey = @"WebElementLinkLabel";
 NSString * WebElementImageURLKey = @"WebElementImageURL";
 NSString * WebElementStringKey = @"WebElementString";
 NSString * WebElementImageKey = @"WebElementImage";
+NSString * WebElementImageLocationKey = @"WebElementImageLocation";
 NSString * WebElementFrameKey = @"WebElementFrame";
 
 @implementation WebController

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list