[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:37:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit bcc858106594d082a7587c5237b375cf66ed0499
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Apr 21 18:49:47 2003 +0000
WebCore:
Use renamed plug-in view methods.
Reviewed by darin.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::createPart):
* kwq/KWQKJavaAppletWidget.mm:
(KJavaAppletWidget::showApplet):
* kwq/WebCoreBridge.h:
WebKit:
Fixed: 3140990 - Safari: Error attempting to load movie from Rhino records
Renamed plug-in view methods to mention that they take URL strings.
Reviewed by darin.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge viewForPluginWithURLString:attributes:baseURLString:MIMEType:]): renamed, try to find the plug-in using the extension of the SRC URL if the plug-in isn't found using the MIME type.
(-[WebBridge viewForJavaAppletWithFrame:attributes:baseURLString:]): renamed
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4146 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7be3590..4a104f7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-04-21 Chris Blumenberg <cblu at apple.com>
+
+ Use renamed plug-in view methods.
+
+ Reviewed by darin.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::createPart):
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::showApplet):
+ * kwq/WebCoreBridge.h:
+
2003-04-18 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7be3590..4a104f7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-04-21 Chris Blumenberg <cblu at apple.com>
+
+ Use renamed plug-in view methods.
+
+ Reviewed by darin.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::createPart):
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::showApplet):
+ * kwq/WebCoreBridge.h:
+
2003-04-18 Maciej Stachowiak <mjs at apple.com>
Reviewed by Darin.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 42a10d5..0b1b5c0 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -591,9 +591,9 @@ ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url,
}
KWQPluginPart *newPart = new KWQPluginPart;
- newPart->setWidget(new QWidget([_bridge viewForPluginWithURL:url.url().getNSString()
+ newPart->setWidget(new QWidget([_bridge viewForPluginWithURLString:url.url().getNSString()
attributes:attributesArray
- baseURL:d->m_doc->baseURL().getNSString()
+ baseURLString:d->m_doc->baseURL().getNSString()
MIMEType:child.m_args.serviceType.getNSString()]));
return newPart;
} else {
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index def87b2..907fb6d 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -68,7 +68,7 @@ void KJavaAppletWidget::showApplet()
setView([KWQ(_context->part())->bridge()
viewForJavaAppletWithFrame:NSMakeRect(x(), y(), width(), height())
attributes:_parameters
- baseURL:_baseURL.getNSString()]);
+ baseURLString:_baseURL.getNSString()]);
// Add the view to the main view now so the applet starts immediately rather than until the first paint.
_context->part()->view()->addChild(this, x(), y());
}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 7aaea39..938221a 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -290,8 +290,13 @@ enum FrameBorderStyle {
- (NSString *)requestedURL;
- (NSString *)incomingReferrer;
-- (NSView *)viewForPluginWithURL:(NSString *)URL attributes:(NSArray *)attributesArray baseURL:(NSString *)baseURL MIMEType:(NSString *)MIMEType;
-- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame attributes:(NSDictionary *)attributes baseURL:(NSString *)baseURL;
+- (NSView *)viewForPluginWithURLString:(NSString *)URLString
+ attributes:(NSArray *)attributesArray
+ baseURLString:(NSString *)baseURLString
+ MIMEType:(NSString *)MIMEType;
+- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame
+ attributes:(NSDictionary *)attributes
+ baseURLString:(NSString *)baseURLString;
- (BOOL)saveDocumentToPageCache:(id)documentInfo;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 08cd19a..dbfb972 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-21 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3140990 - Safari: Error attempting to load movie from Rhino records
+ Renamed plug-in view methods to mention that they take URL strings.
+
+ Reviewed by darin.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge viewForPluginWithURLString:attributes:baseURLString:MIMEType:]): renamed, try to find the plug-in using the extension of the SRC URL if the plug-in isn't found using the MIME type.
+ (-[WebBridge viewForJavaAppletWithFrame:attributes:baseURLString:]): renamed
+
2003-04-18 Chris Blumenberg <cblu at apple.com>
Fixed: 3139385 - don't accept drags from other frames in the same WebView
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 854adf8..b584703 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -127,6 +127,8 @@
"WebFrameStateLayoutAcceptable"
"WebFrameStateProvisional"
"WebHistoryAllItemsRemovedNotification"
+"WebHistoryDates"
+"WebHistoryFileVersion"
"WebHistoryItems"
"WebHistoryItemsAddedNotification"
"WebHistoryItemsRemovedNotification"
@@ -228,6 +230,7 @@
"mp4"
"mpg4"
"nullplugin"
+"pluginspage"
"text/"
"text/calendar"
"text/directory"
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index ac767a8..7912d2c 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -593,10 +593,10 @@
return [[pluginPackage viewFactory] pluginViewWithArguments:arguments];
}
-- (NSView *)viewForPluginWithURL:(NSString *)URL
- attributes:(NSArray *)attributesArray
- baseURL:(NSString *)baseURL
- MIMEType:(NSString *)MIMEType
+- (NSView *)viewForPluginWithURLString:(NSString *)URLString
+ attributes:(NSArray *)attributesArray
+ baseURLString:(NSString *)baseURLString
+ MIMEType:(NSString *)MIMEType
{
NSRange r1, r2, r3;
uint i;
@@ -622,34 +622,40 @@
}
}
- WebBasePluginPackage *pluginPackage;
+ NSURL *URL = URLString ? [NSURL _web_URLWithString:URLString] : nil;
+ NSURL *baseURL = baseURLString ? [NSURL _web_URLWithString:baseURLString] : nil;
+ WebBasePluginPackage *pluginPackage = nil;
NSView *view = nil;
int errorCode = 0;
- if ([MIMEType length]) {
+ if ([MIMEType length] != 0) {
pluginPackage = [[WebPluginDatabase installedPlugins] pluginForMIMEType:MIMEType];
- } else {
- NSString *extension = [URL pathExtension];
+ }
+
+ NSString *extension = [[URL path] pathExtension];
+ if (!pluginPackage && [extension length] != 0) {
pluginPackage = [[WebPluginDatabase installedPlugins] pluginForExtension:extension];
- MIMEType = [pluginPackage MIMETypeForExtension:extension];
+ if (pluginPackage) {
+ MIMEType = [pluginPackage MIMETypeForExtension:extension];
+ ASSERT(MIMEType);
+ }
}
if (pluginPackage) {
if ([pluginPackage isKindOfClass:[WebPluginPackage class]]) {
view = [self pluginViewWithPackage:(WebPluginPackage *)pluginPackage
attributes:attributes
- baseURL:[NSURL _web_URLWithString:baseURL]];
+ baseURL:baseURL];
} else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
view = [[[WebNetscapePluginEmbeddedView alloc] initWithFrame:NSZeroRect
plugin:(WebNetscapePluginPackage *)pluginPackage
- URL:[NSURL _web_URLWithString:URL]
- baseURL:[NSURL _web_URLWithString:baseURL]
+ URL:URL
+ baseURL:baseURL
MIMEType:MIMEType
attributeKeys:attributeKeys
attributeValues:attributeValues] autorelease];
} else {
- [NSException raise:NSInternalInconsistencyException
- format:@"Plugin package class not recognized"];
+ ASSERT_NOT_REACHED();
}
} else {
errorCode = WebKitErrorCannotFindPlugin;
@@ -661,7 +667,7 @@
if (errorCode) {
WebPlugInError *error = [WebPlugInError pluginErrorWithCode:errorCode
- contentURL:URL
+ contentURL:URLString
pluginPageURL:[attributes objectForKey:@"pluginspage"]
pluginName:[pluginPackage name]
MIMEType:MIMEType];
@@ -678,8 +684,11 @@
return view;
}
-- (NSView *)viewForJavaAppletWithFrame:(NSRect)theFrame attributes:(NSDictionary *)attributes baseURL:(NSString *)baseURL
+- (NSView *)viewForJavaAppletWithFrame:(NSRect)theFrame
+ attributes:(NSDictionary *)attributes
+ baseURLString:(NSString *)baseURLString
{
+ NSURL *baseURL = baseURLString ? [NSURL _web_URLWithString:baseURLString] : nil;
NSString *MIMEType = @"application/x-java-applet";
WebBasePluginPackage *pluginPackage;
NSView *view = nil;
@@ -695,7 +704,7 @@
view = [self pluginViewWithPackage:(WebPluginPackage *)pluginPackage
attributes:theAttributes
- baseURL:[NSURL _web_URLWithString:baseURL]];
+ baseURL:baseURL];
} else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
// Convert the attributes dictionary to 2 string arrays because this is what Netscape plug-ins expect.
NSMutableArray *attributeKeys = [[NSMutableArray alloc] init];
@@ -710,15 +719,14 @@
view = [[[WebNetscapePluginEmbeddedView alloc] initWithFrame:theFrame
plugin:(WebNetscapePluginPackage *)pluginPackage
URL:nil
- baseURL:[NSURL _web_URLWithString:baseURL]
+ baseURL:baseURL
MIMEType:MIMEType
attributeKeys:attributeKeys
attributeValues:attributeValues] autorelease];
[attributeKeys release];
[attributeValues release];
} else {
- [NSException raise:NSInternalInconsistencyException
- format:@"Plugin package class not recognized"];
+ ASSERT_NOT_REACHED();
}
}
@@ -728,7 +736,6 @@
pluginPageURL:nil
pluginName:[pluginPackage name]
MIMEType:MIMEType];
-
view = [[[WebNullPluginView alloc] initWithFrame:theFrame error:error] autorelease];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list