[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 08:28:32 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ba86e7f90f2532c6bede5326eb2b3aba394e3bd7
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 4 00:29:32 2004 +0000
Fixed: <rdar://problem/3576070>: REGRESSION: web view won't accept drag of webloc file
Reviewed by rjw.
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView draggingUpdated:]): if we're not handling the drag, forward this message to the WebView since it may want to handle it
(-[WebHTMLView concludeDragOperation:]): if we're not handling the drag, forward this message to the WebView since it may want to handle it
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0256d6a..997bb25 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-03 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: <rdar://problem/3576070>: REGRESSION: web view won't accept drag of webloc file
+
+ Reviewed by rjw.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView draggingUpdated:]): if we're not handling the drag, forward this message to the WebView since it may want to handle it
+ (-[WebHTMLView concludeDragOperation:]): if we're not handling the drag, forward this message to the WebView since it may want to handle it
+
2004-03-03 Darin Adler <darin at apple.com>
Reviewed by Vicki.
@@ -1548,6 +1558,7 @@
* WebView.subproj/WebTextView.m:
(-[WebTextView setFixedWidthFont]): Use [[WebTextRendererFactory sharedFactory] fontWithFamilies:traits:size:] to get the font since it takes the font family which is what we store in WebPreferences and it does fallback work. Only set the font if
+
non-nil is returned.
2003-11-21 Maciej Stachowiak <mjs at apple.com>
@@ -2104,6 +2115,7 @@ non-nil is returned.
* WebView.subproj/WebTextView.m:
(-[WebTextView menuForEvent:]): Made WebTextView's context menu behavior like WebHTMLView's context menu behavior with regards to selection. If the control-click was on a selection, show menu options for the selection like copy. If it was not on a
+
selection, show menu options such as save and print. Don't select anything when control-clicking.
2003-11-08 Chris Blumenberg <cblu at apple.com>
@@ -2565,6 +2577,7 @@ non-nil is returned.
* WebView.subproj/WebFrame.m:
(-[WebFrame _isLoadComplete]): call _progressCompleted after we deliver the didFailLoadWithError or didFinishLoadForFrame message as we do in other places. This allows to be aware of the error (if there is one), when they get the WebViewProgressFi
+
nishedNotification notification.
2003-10-27 Maciej Stachowiak <mjs at apple.com>
@@ -2685,6 +2698,7 @@ nishedNotification notification.
* WebView.subproj/WebView.m:
(+[WebView _viewClass:andRepresentationClass:forMIMEType:]): use _web_objectForMIMEType when getting an object for a MIME. Removed unnecessary code that checked for the document classes after loading the plug-in DB since it is not an optimization because
+
the plug-in DB calls _viewTypesAllowImageTypeOmission:NO.
2003-10-23 Chris Blumenberg <cblu at apple.com>
@@ -2708,6 +2722,7 @@ nishedNotification notification.
* WebView.subproj/WebView.m:
(+[WebView _viewClass:andRepresentationClass:forMIMEType:]): new, central place for mapping from a MIME to the document classes. We now load the plug-in DB when a non-HTML MIME type is encountered instead of loading the plug-in DB when the class for the
+
MIME type is not found. This is required to fully fix 3364036.
(+[WebView canShowMIMEType:]): call [WebView _viewClass:andRepresentationClass:forMIMEType:]
(+[WebView registerViewClass:representationClass:forMIMEType:]): tweak
@@ -2843,6 +2858,7 @@ MIME type is not found. This is required to fully fix 3364036.
* Plugins.subproj/WebPluginDatabase.m:
(-[WebPluginDatabase pluginForExtension:]): If no plug-in is found from the extension, attempt to map from the extension to a MIME type using our mappings and find a plug-in from the MIME type. This improves our chances of finding a plug-in when n
+
o MIME type is specified.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge viewForPluginWithURL:attributes:baseURL:MIMEType:]): If the passed MIME is empty, nil it out so that clients only need to check for nil. This avoids error sheets complaining about "" MIME types.
@@ -3516,6 +3532,7 @@ o MIME type is specified.
Fixed 3420396. If a frame targets _top and a URL that contains a fragment (very unusual, it's meaningless for a frameset to contain a named anchor point) the frameset won't be reloaded. Our normal path is to just scroll to the anchor point. This is on
+
ly important because our Help folks oddly depend on the behavior.
Reviewed by Chris.
@@ -4050,8 +4067,10 @@ ly important because our Help folks oddly depend on the behavior.
The default encoding that Safari uses is latin1 regardless of the current system encoding. This is how it's always been. The problem is that the UI is displaying shift JIS for the default text encoding instead of latin1. This is happening because WebKit
+
is using "latin1" instead of "ISO-8859-1" for the default text encoding name. "ISO-8859-1" is the IANA character set name for latin1 and this is what the WebKitDefaultTextEncodingNamePreferenceKey preference expects. This ends up confusing Safari, so Saf
+
ari just ends up displaying the first item in the pop-up menu which is shift JIS.
Reviewed by rjw.
@@ -4251,6 +4270,7 @@ ari just ends up displaying the first item in the pop-up menu which is shift JIS
Fixed 3400807. Don't release state associated with the current b/f item. We shouldn't normally have page cache state associated with the current item (3401376). This fix guarantees that we won't prematurely release the page cache state for the current
+
item.
Reviewed byJohn Sullivan.
@@ -4289,6 +4309,7 @@ ari just ends up displaying the first item in the pop-up menu which is shift JIS
Fixed 3398229. When we request a font from NSFont by name we should use a case specific name. We do case insensitve comparsion, but once a match is found we should use the actual font name, not the requested name. Two layout tests are still failing, b
+
ut I don't think the failures are font related.
Reviewed by Hyatt.
@@ -6246,6 +6267,7 @@ ut I don't think the failures are font related.
+
Source::
(-[WebFrame _loadDataSource:withLoadType:formState:]): set the policyLoadType and policyDataSource (the beginning of the regular load case)
@@ -6279,6 +6301,7 @@ Source::
+
:loadType: instead.
2003-06-10 Richard Williamson <rjw at apple.com>
@@ -6548,10 +6571,12 @@ Source::
+
. This is when it draws successfully. It seems to me that the fix is to always pass the correct width and height to NPP_SetWindow. You always position the plug-in far offscreen (1000000, -52) and set the clip region to an empty rect (48576, 52, 48576, 52)
+
so there isn't really any danger of the plug-in drawing anyway. Additionally, you pass the correct width and height in the call to NPP_New before the first call to NPP_SetWindow.
Reviewed by john, darin.
@@ -12498,6 +12523,7 @@ Source::
+
is to retain the incomplete data even though the load ends in error.
Reviewed by darin.
@@ -12564,6 +12590,7 @@ is to retain the incomplete data even though the load ends in error.
+
e machinery in WebKit. The stream is only delivered once. This fix addresses that.
Reviewed by trey.
@@ -13031,6 +13058,7 @@ e machinery in WebKit. The stream is only delivered once. This fix addresses tha
+
t leak when we cancel a download.
(-[WebDownload _setRequest:]): added
(-[WebDownload _setResponse:]): added
@@ -13172,6 +13200,7 @@ t leak when we cancel a download.
+
l.
* Downloads.subproj/WebDownload.m:
(-[WebDownloadPrivate dealloc]): release directory path
@@ -16975,6 +17004,7 @@ l.
+
ts each with 60 timeouts. The event also cause the Finder to do a lot of work.
We should:
@@ -16999,6 +17029,7 @@ ts each with 60 timeouts. The event also cause the Finder to do a lot of work.
+
nds 2 apple events both with a 60 second timeout. This method returns immediately.
* WebKit.pbproj/project.pbxproj:
@@ -17634,6 +17665,7 @@ nds 2 apple events both with a 60 second timeout. This method returns immediatel
+
en't providing the declared data.
* Misc.subproj/WebNSPasteboardExtras.h:
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index f626d23..b65dd2d 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1623,16 +1623,19 @@ static WebHTMLView *lastHitView = nil;
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender
{
- NSPoint point = [self convertPoint:[sender draggingLocation] fromView:nil];
+ NSPoint point = [self convertPoint:[sender draggingLocation] fromView:nil];
NSDictionary *element = [self _elementAtPoint:point];
if ([[element objectForKey:WebElementIsEditableKey] boolValue] && [[self _bridge] moveCaretToPoint:point]) {
if (_private->isDragging) {
- return [[element objectForKey:WebElementIsSelectedKey] boolValue] ? NSDragOperationNone : NSDragOperationMove;
+ if ([[element objectForKey:WebElementIsSelectedKey] boolValue]) {
+ return NSDragOperationMove;
+ }
} else {
return NSDragOperationCopy;
}
}
- return NSDragOperationNone;
+ // Since we're not handling the drag, forward this message to the WebView since it may want to handle it.
+ return [[self _webView] draggingUpdated:sender];
}
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
@@ -1647,8 +1650,14 @@ static WebHTMLView *lastHitView = nil;
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
{
- // FIXME: We should delete the original selection if we're doing a move.
- [self _pasteHTMLFromPasteboard:[sender draggingPasteboard]];
+ NSDictionary *element = [self _elementAtPoint:[self convertPoint:[sender draggingLocation] fromView:nil]];
+ if ([[element objectForKey:WebElementIsEditableKey] boolValue]) {
+ // FIXME: We should delete the original selection if we're doing a move.
+ [self _pasteHTMLFromPasteboard:[sender draggingPasteboard]];
+ } else {
+ // Since we're not handling the drag, forward this message to the WebView since it may want to handle it.
+ [[self _webView] concludeDragOperation:sender];
+ }
}
- (void)mouseUp:(NSEvent *)event
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list