[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 07:07:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9f027be05fa5da1da6c9de279fc1196e8681469c
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 25 03:12:41 2002 +0000
WebCore:
Added element keys for the image ALT and link TITLE attributes. This will eventually be used to fix other bugs. Also made WebKit and WebCore use the same element keys to simplify the conversion of the element dictionary.
* kwq/WebCoreBridge.h:
* kwq/WebCoreBridge.mm:
(-[WebCoreBridge elementAtPoint:]):
WebKit:
Added element keys for the image ALT and link TITLE attributes. This will eventually be used to fix other bugs. Also made WebKit and WebCore use the same element keys to simplify the conversion of the element dictionary.
* WebView.subproj/WebController.h:
* WebView.subproj/WebController.m:
* WebView.subproj/WebHTMLViewPrivate.m:
(-[WebHTMLView _elementAtPoint:]):
WebBrowser:
Fixed: 3053342 - Dragging URL to address field with favicon should clear favicon
* BrowserWindowController.m:
(-[BrowserWindowController locationFieldReceivedDroppedURL:]):
* English.lproj/StringsNotToBeLocalized.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2853 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d8dd93d..aa0d619 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-11-24 Chris Blumenberg <cblu at apple.com>
+
+ Added element keys for the image ALT and link TITLE attributes. This will eventually be used to fix other bugs. Also made WebKit and WebCore use the same element keys to simplify the conversion of the element dictionary.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge elementAtPoint:]):
+
2002-11-24 Darin Adler <darin at apple.com>
* force-js-clean-timestamp: Touch for ScopeChain change.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d8dd93d..aa0d619 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-11-24 Chris Blumenberg <cblu at apple.com>
+
+ Added element keys for the image ALT and link TITLE attributes. This will eventually be used to fix other bugs. Also made WebKit and WebCore use the same element keys to simplify the conversion of the element dictionary.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge elementAtPoint:]):
+
2002-11-24 Darin Adler <darin at apple.com>
* force-js-clean-timestamp: Touch for ScopeChain change.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d8dd93d..aa0d619 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-11-24 Chris Blumenberg <cblu at apple.com>
+
+ Added element keys for the image ALT and link TITLE attributes. This will eventually be used to fix other bugs. Also made WebKit and WebCore use the same element keys to simplify the conversion of the element dictionary.
+
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreBridge.mm:
+ (-[WebCoreBridge elementAtPoint:]):
+
2002-11-24 Darin Adler <darin at apple.com>
* force-js-clean-timestamp: Touch for ScopeChain change.
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index ea5ebad..889b42d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -55,13 +55,16 @@ typedef khtml::RenderPart KHTMLRenderPart;
@protocol WebDOMDocument;
@protocol WebDOMNode;
-#define WebCoreElementLinkURL @"WebCoreElementLinkURL"
-#define WebCoreElementLinkTarget @"WebCoreElementLinkTarget"
-#define WebCoreElementLinkLabel @"WebCoreElementLinkLabel"
-#define WebCoreElementImageURL @"WebCoreElementImageURL"
-#define WebCoreElementString @"WebCoreElementString"
-#define WebCoreElementImage @"WebCoreElementImage"
-#define WebCoreElementImageLocation @"WebCoreElementImageLocation"
+extern NSString *WebCoreElementFrameKey;
+extern NSString *WebCoreElementImageAltStringKey;
+extern NSString *WebCoreElementImageKey;
+extern NSString *WebCoreElementImageLocationKey;
+extern NSString *WebCoreElementImageURLKey;
+extern NSString *WebCoreElementLinkURLKey;
+extern NSString *WebCoreElementLinkTargetFrameKey;
+extern NSString *WebCoreElementLinkLabelKey;
+extern NSString *WebCoreElementLinkTitleKey;
+extern NSString *WebCoreElementStringKey;
// 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 168997e..b04d76e 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -61,6 +61,18 @@ using khtml::RenderImage;
using khtml::RenderObject;
using khtml::RenderPart;
+NSString *WebCoreElementFrameKey = @"WebElementFrame";
+NSString *WebCoreElementImageAltStringKey = @"WebElementImageAltString";
+NSString *WebCoreElementImageKey = @"WebElementImage";
+NSString *WebCoreElementImageLocationKey = @"WebElementImageLocation";
+NSString *WebCoreElementImageURLKey = @"WebElementImageURL";
+NSString *WebCoreElementLinkURLKey = @"WebElementLinkURL";
+NSString *WebCoreElementLinkTargetFrameKey = @"WebElementTargetFrame";
+NSString *WebCoreElementLinkLabelKey = @"WebElementLinkLabel";
+NSString *WebCoreElementLinkTitleKey = @"WebElementLinkTitle";
+NSString *WebCoreElementNameKey = @"WebElementName";
+NSString *WebCoreElementStringKey = @"WebElementString";
+
@implementation WebCoreBridge
- init
@@ -448,11 +460,6 @@ using khtml::RenderPart;
}
}
-- (NSString *)completeURLForDOMString:(const DOMString &)s
-{
- return _part->kwq->document()->completeURL(s.string()).getNSString();
-}
-
- (NSDictionary *)elementAtPoint:(NSPoint)point
{
RenderObject *renderer = _part->kwq->renderer();
@@ -462,14 +469,19 @@ using khtml::RenderPart;
RenderObject::NodeInfo nodeInfo(true, true);
renderer->layer()->nodeAtPoint(nodeInfo, (int)point.x, (int)point.y);
- NSMutableDictionary *elementInfo = [NSMutableDictionary dictionary];
-
+ NSMutableDictionary *element = [NSMutableDictionary dictionary];
+
NodeImpl *URLNode = nodeInfo.URLElement();
if (URLNode) {
ElementImpl* e = static_cast<ElementImpl*>(URLNode);
+ NSString *title = e->getAttribute(ATTR_TITLE).string().getNSString();
+ if(title){
+ [element setObject:title forKey:WebCoreElementLinkTitleKey];
+ }
+
+ NSString *URLString = _part->kwq->document()->completeURL(e->getAttribute(ATTR_HREF).string()).getNSString();
- NSString *URL = [self completeURLForDOMString:parseURL(e->getAttribute(ATTR_HREF))];
- if (URL) {
+ if (URLString) {
// Look for the first #text node to use as a label.
NodeImpl *labelParent = e;
while (labelParent->hasChildNodes()){
@@ -479,13 +491,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:WebCoreElementLinkLabel];
+ [element setObject:value forKey:WebCoreElementLinkLabelKey];
break;
}
}
labelParent = childNode;
}
- [elementInfo setObject:URL forKey:WebCoreElementLinkURL];
+ [element setObject:URLString forKey:WebCoreElementLinkURLKey];
}
DOMString target = e->getAttribute(ATTR_TARGET);
@@ -493,33 +505,39 @@ using khtml::RenderPart;
target = _part->kwq->document()->baseTarget();
}
if (!target.isEmpty()) {
- [elementInfo setObject:target.string().getNSString() forKey:WebCoreElementLinkTarget];
+ [element setObject:target.string().getNSString() forKey:WebCoreElementLinkTargetFrameKey];
}
}
- NodeImpl *node = nodeInfo.innerNonSharedNode();
- if (node && isImage(node)) {
- ElementImpl* i = static_cast<ElementImpl*>(node);
- NSString *URL = [self completeURLForDOMString:parseURL(i->getAttribute(ATTR_SRC))];
- if (URL) {
- [elementInfo setObject:URL forKey:WebCoreElementImageURL];
- RenderImage *r = (RenderImage *)node->renderer();
+ NodeImpl *imageNode = nodeInfo.innerNonSharedNode();
+ if (imageNode && isImage(imageNode)) {
+ ElementImpl* i = static_cast<ElementImpl*>(imageNode);
+ NSString *altString = i->getAttribute(ATTR_ALT).string().getNSString();
+ if(altString){
+ [element setObject:altString forKey:WebCoreElementImageAltStringKey];
+ }
+
+ NSString *URLString = _part->kwq->document()->completeURL(i->getAttribute(ATTR_SRC).string()).getNSString();
+
+ if (URLString) {
+ [element setObject:URLString forKey:WebCoreElementImageURLKey];
+ RenderImage *r = (RenderImage *)imageNode->renderer();
id <WebCoreImageRenderer> image = r->pixmap().image();
if (image) {
- [elementInfo setObject:image forKey:WebCoreElementImage];
+ [element setObject:image forKey:WebCoreElementImageKey];
int x, y;
if(r->absolutePosition(x, y)){
- [elementInfo setObject:[NSValue valueWithPoint:NSMakePoint(x,y)] forKey:WebCoreElementImageLocation];
+ [element setObject:[NSValue valueWithPoint:NSMakePoint(x,y)] forKey:WebCoreElementImageLocationKey];
}
}
}
}
if (_part->hasSelection()) {
- [elementInfo setObject:[self selectedText] forKey:WebCoreElementString];
+ [element setObject:[self selectedText] forKey:WebCoreElementStringKey];
}
- return elementInfo;
+ return element;
}
- (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1f14247..65d1aa0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
2002-11-24 Chris Blumenberg <cblu at apple.com>
+ Added element keys for the image ALT and link TITLE attributes. This will eventually be used to fix other bugs. Also made WebKit and WebCore use the same element keys to simplify the conversion of the element dictionary.
+
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _elementAtPoint:]):
+
+2002-11-24 Chris Blumenberg <cblu at apple.com>
+
Fixed: 3109945 - Assertion failure in -[WebIconDatabase_largestIconFromDictionary:]
Added error strings for download decoding errors.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 1f14247..65d1aa0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
2002-11-24 Chris Blumenberg <cblu at apple.com>
+ Added element keys for the image ALT and link TITLE attributes. This will eventually be used to fix other bugs. Also made WebKit and WebCore use the same element keys to simplify the conversion of the element dictionary.
+
+ * WebView.subproj/WebController.h:
+ * WebView.subproj/WebController.m:
+ * WebView.subproj/WebHTMLViewPrivate.m:
+ (-[WebHTMLView _elementAtPoint:]):
+
+2002-11-24 Chris Blumenberg <cblu at apple.com>
+
Fixed: 3109945 - Assertion failure in -[WebIconDatabase_largestIconFromDictionary:]
Added error strings for download decoding errors.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index b10a467..d1078f7 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -5,14 +5,12 @@
"%@ %@"
"%@"
"%@-%d"
-"%@."
"%@/%@"
"%d"
"%lf"
"(This file must be converted with BinHex 4.0)"
","
"-"
-"."
"/"
"/<!--frame%d-->-->"
"/Library/Internet Plug-Ins"
@@ -97,9 +95,11 @@
"WebCurrentFrameState"
"WebElementFrame"
"WebElementImage"
+"WebElementImageAltString"
"WebElementImageLocation"
"WebElementImageURL"
"WebElementLinkLabel"
+"WebElementLinkTitle"
"WebElementLinkURL"
"WebElementString"
"WebElementTargetFrame"
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 8735950..42e6e28 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -26,14 +26,17 @@
// These strings are keys into the element dictionary provided in
// the WebContextMenuDelegate's contextMenuItemsForElement and the WebControllerPolicyDelegate's clickPolicyForElement.
-extern NSString *WebElementLinkURLKey;
-extern NSString *WebElementLinkTargetFrameKey;
-extern NSString *WebElementLinkLabelKey;
-extern NSString *WebElementImageURLKey;
-extern NSString *WebElementStringKey;
-extern NSString *WebElementImageKey;
-extern NSString *WebElementImageLocationKey;
-extern NSString *WebElementFrameKey;
+
+extern NSString *WebElementFrameKey; // WebFrame of the element
+extern NSString *WebElementImageAltStringKey; // NSString of the ALT attribute of the image element
+extern NSString *WebElementImageKey; // NSImage of the image element
+extern NSString *WebElementImageLocationKey; // NSValue of an NSPoint representing the origin of the image element
+extern NSString *WebElementImageURLKey; // NSURL of the image element
+extern NSString *WebElementLinkURLKey; // NSURL if the element is within an anchor
+extern NSString *WebElementLinkTargetFrameKey; // NSString of the target of the anchor
+extern NSString *WebElementLinkTitleKey; // NSString of the title of the anchor
+extern NSString *WebElementLinkLabelKey; // NSString of the text within the anchor
+extern NSString *WebElementStringKey; // NSString of the selected text
/*!
@class WebController
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 25d3de1..cd73550 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -29,14 +29,17 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResourceHandle.h>
-NSString *WebElementLinkURLKey = @"WebElementLinkURL";
-NSString *WebElementLinkTargetFrameKey = @"WebElementTargetFrame";
-NSString *WebElementLinkLabelKey = @"WebElementLinkLabel";
-NSString *WebElementImageURLKey = @"WebElementImageURL";
-NSString *WebElementStringKey = @"WebElementString";
-NSString *WebElementImageKey = @"WebElementImage";
-NSString *WebElementImageLocationKey = @"WebElementImageLocation";
-NSString *WebElementFrameKey = @"WebElementFrame";
+NSString *WebElementFrameKey = @"WebElementFrame";
+NSString *WebElementImageKey = @"WebElementImage";
+NSString *WebElementImageAltStringKey = @"WebElementImageAltString";
+NSString *WebElementImageLocationKey = @"WebElementImageLocation";
+NSString *WebElementImageURLKey = @"WebElementImageURL";
+NSString *WebElementLinkURLKey = @"WebElementLinkURL";
+NSString *WebElementLinkTargetFrameKey = @"WebElementTargetFrame";
+NSString *WebElementLinkLabelKey = @"WebElementLinkLabel";
+NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
+NSString *WebElementStringKey = @"WebElementString";
+
@implementation WebController
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 9478d53..c07c8ff 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -154,21 +154,18 @@
- (NSDictionary *)_elementAtPoint:(NSPoint)point
{
NSDictionary *elementInfoWC = [[self _bridge] elementAtPoint:point];
- NSMutableDictionary *elementInfo = [NSMutableDictionary dictionary];
-
- [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebCoreElementLinkURL]] forKey:WebElementLinkURLKey];
- [elementInfo _web_setObjectIfNotNil:[elementInfoWC objectForKey:WebCoreElementLinkLabel] forKey:WebElementLinkLabelKey];
- [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebCoreElementImageURL]] forKey:WebElementImageURLKey];
- [elementInfo _web_setObjectIfNotNil:[elementInfoWC objectForKey:WebCoreElementString] forKey:WebElementStringKey];
- [elementInfo _web_setObjectIfNotNil:[elementInfoWC objectForKey:WebCoreElementImage] forKey:WebElementImageKey];
- [elementInfo _web_setObjectIfNotNil:[elementInfoWC objectForKey:WebCoreElementImageLocation] forKey:WebElementImageLocationKey];
+ NSMutableDictionary *elementInfo = [elementInfoWC mutableCopy];
+
+ // Convert URL strings to NSURLs
+ [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebElementLinkURLKey]] forKey:WebElementLinkURLKey];
+ [elementInfo _web_setObjectIfNotNil:[NSURL _web_URLWithString:[elementInfoWC objectForKey:WebElementImageURLKey]] forKey:WebElementImageURLKey];
WebView *webView = [self _web_parentWebView];
ASSERT(webView);
WebFrame *webFrame = [[webView controller] frameForView:webView];
ASSERT(webFrame);
- NSString *frameName = [elementInfoWC objectForKey:WebCoreElementLinkTarget];
+ NSString *frameName = [elementInfoWC objectForKey:WebElementLinkTargetFrameKey];
if ([frameName length] == 0) {
[elementInfo setObject:webFrame forKey:WebElementLinkTargetFrameKey];
} else {
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 8735950..42e6e28 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -26,14 +26,17 @@
// These strings are keys into the element dictionary provided in
// the WebContextMenuDelegate's contextMenuItemsForElement and the WebControllerPolicyDelegate's clickPolicyForElement.
-extern NSString *WebElementLinkURLKey;
-extern NSString *WebElementLinkTargetFrameKey;
-extern NSString *WebElementLinkLabelKey;
-extern NSString *WebElementImageURLKey;
-extern NSString *WebElementStringKey;
-extern NSString *WebElementImageKey;
-extern NSString *WebElementImageLocationKey;
-extern NSString *WebElementFrameKey;
+
+extern NSString *WebElementFrameKey; // WebFrame of the element
+extern NSString *WebElementImageAltStringKey; // NSString of the ALT attribute of the image element
+extern NSString *WebElementImageKey; // NSImage of the image element
+extern NSString *WebElementImageLocationKey; // NSValue of an NSPoint representing the origin of the image element
+extern NSString *WebElementImageURLKey; // NSURL of the image element
+extern NSString *WebElementLinkURLKey; // NSURL if the element is within an anchor
+extern NSString *WebElementLinkTargetFrameKey; // NSString of the target of the anchor
+extern NSString *WebElementLinkTitleKey; // NSString of the title of the anchor
+extern NSString *WebElementLinkLabelKey; // NSString of the text within the anchor
+extern NSString *WebElementStringKey; // NSString of the selected text
/*!
@class WebController
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 25d3de1..cd73550 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -29,14 +29,17 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebResourceHandle.h>
-NSString *WebElementLinkURLKey = @"WebElementLinkURL";
-NSString *WebElementLinkTargetFrameKey = @"WebElementTargetFrame";
-NSString *WebElementLinkLabelKey = @"WebElementLinkLabel";
-NSString *WebElementImageURLKey = @"WebElementImageURL";
-NSString *WebElementStringKey = @"WebElementString";
-NSString *WebElementImageKey = @"WebElementImage";
-NSString *WebElementImageLocationKey = @"WebElementImageLocation";
-NSString *WebElementFrameKey = @"WebElementFrame";
+NSString *WebElementFrameKey = @"WebElementFrame";
+NSString *WebElementImageKey = @"WebElementImage";
+NSString *WebElementImageAltStringKey = @"WebElementImageAltString";
+NSString *WebElementImageLocationKey = @"WebElementImageLocation";
+NSString *WebElementImageURLKey = @"WebElementImageURL";
+NSString *WebElementLinkURLKey = @"WebElementLinkURL";
+NSString *WebElementLinkTargetFrameKey = @"WebElementTargetFrame";
+NSString *WebElementLinkLabelKey = @"WebElementLinkLabel";
+NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
+NSString *WebElementStringKey = @"WebElementString";
+
@implementation WebController
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list