[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:21:38 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 498461802b93e283e00c5c64c907d187a22555ec
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jun 27 07:29:06 2002 +0000
WebCore:
Fix to support sending PARAM tags to the Java plug-in.
* khtml/rendering/render_applet.cpp:
(RenderApplet::RenderApplet): removed APPLE_CHANGES
(RenderApplet::layout): removed APPLE_CHANGES
* kwq/KWQKJavaAppletWidget.mm:
(KJavaAppletWidget::KJavaAppletWidget): removed setView
(KJavaAppletWidget::showApplet): call setView here
* kwq/WebCoreViewFactory.h:
* kwq/WebCoreViewFactory.m:
(-[WebCoreViewFactory viewForJavaAppletWithFrame:andArguments:]): renamed
* kwq/khtml/java/kjavaappletwidget.h: added KJavaApplet
WebKit:
Support for Java.
* Plugins.subproj/IFPluginView.mm:
(-[IFPluginView initWithFrame:plugin:url:baseURL:mime:arguments:]): set DOCBASE argument
* WebCoreSupport.subproj/IFWebCoreViewFactory.m:
(-[IFWebCoreViewFactory viewForJavaAppletWithFrame:andArguments:]): renamed
WebBrowser:
Removed some logging.
* DownloadMonitor.m:
(-[DownloadMonitor monitorDownload:withProgress:error:dataSource:complete:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a89e231..cdc92a7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-06-27 Chris Blumenberg <cblu at apple.com>
+
+ Fix to support sending PARAM tags to the Java plug-in.
+
+ * khtml/rendering/render_applet.cpp:
+ (RenderApplet::RenderApplet): removed APPLE_CHANGES
+ (RenderApplet::layout): removed APPLE_CHANGES
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::KJavaAppletWidget): removed setView
+ (KJavaAppletWidget::showApplet): call setView here
+ * kwq/WebCoreViewFactory.h:
+ * kwq/WebCoreViewFactory.m:
+ (-[WebCoreViewFactory viewForJavaAppletWithFrame:andArguments:]): renamed
+ * kwq/khtml/java/kjavaappletwidget.h: added KJavaApplet
+
2002-06-26 Richard Williamson <rjw at apple.com>
Many improvements to selection. More Cocoa like,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a89e231..cdc92a7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-06-27 Chris Blumenberg <cblu at apple.com>
+
+ Fix to support sending PARAM tags to the Java plug-in.
+
+ * khtml/rendering/render_applet.cpp:
+ (RenderApplet::RenderApplet): removed APPLE_CHANGES
+ (RenderApplet::layout): removed APPLE_CHANGES
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::KJavaAppletWidget): removed setView
+ (KJavaAppletWidget::showApplet): call setView here
+ * kwq/WebCoreViewFactory.h:
+ * kwq/WebCoreViewFactory.m:
+ (-[WebCoreViewFactory viewForJavaAppletWithFrame:andArguments:]): renamed
+ * kwq/khtml/java/kjavaappletwidget.h: added KJavaApplet
+
2002-06-26 Richard Williamson <rjw at apple.com>
Many improvements to selection. More Cocoa like,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a89e231..cdc92a7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-06-27 Chris Blumenberg <cblu at apple.com>
+
+ Fix to support sending PARAM tags to the Java plug-in.
+
+ * khtml/rendering/render_applet.cpp:
+ (RenderApplet::RenderApplet): removed APPLE_CHANGES
+ (RenderApplet::layout): removed APPLE_CHANGES
+ * kwq/KWQKJavaAppletWidget.mm:
+ (KJavaAppletWidget::KJavaAppletWidget): removed setView
+ (KJavaAppletWidget::showApplet): call setView here
+ * kwq/WebCoreViewFactory.h:
+ * kwq/WebCoreViewFactory.m:
+ (-[WebCoreViewFactory viewForJavaAppletWithFrame:andArguments:]): renamed
+ * kwq/khtml/java/kjavaappletwidget.h: added KJavaApplet
+
2002-06-26 Richard Williamson <rjw at apple.com>
Many improvements to selection. More Cocoa like,
diff --git a/WebCore/khtml/rendering/render_applet.cpp b/WebCore/khtml/rendering/render_applet.cpp
index 924b512..0b0c1aa 100644
--- a/WebCore/khtml/rendering/render_applet.cpp
+++ b/WebCore/khtml/rendering/render_applet.cpp
@@ -37,6 +37,7 @@
#include "java/kjavaappletwidget.h"
#include "misc/htmltags.h"
#include "html/html_objectimpl.h"
+#include <iostream.h>
using namespace khtml;
using namespace DOM;
@@ -47,16 +48,6 @@ RenderApplet::RenderApplet(HTMLElementImpl *applet, const QMap<QString, QString>
// init RenderObject attributes
setInline(true);
-#ifdef APPLE_CHANGES
- // FIXME: Can we find a way to do this in layout below instead of here?
- QMap<QString, QString> argsToPassToWidget(args);
- for (NodeImpl *child = element()->firstChild(); child; child = child->nextSibling()) {
- if (child->id() == ID_PARAM) {
- HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>(child);
- argsToPassToWidget.insert(p->name(), p->value());
- }
- }
-#endif // APPLE_CHANGES
KJavaAppletContext *context = 0;
KHTMLView *_view = applet->getDocument()->view();
if ( _view ) {
@@ -67,7 +58,7 @@ RenderApplet::RenderApplet(HTMLElementImpl *applet, const QMap<QString, QString>
if ( context ) {
//kdDebug(6100) << "RenderApplet::RenderApplet, setting QWidget" << endl;
#ifdef APPLE_CHANGES
- setQWidget( new KJavaAppletWidget(argsToPassToWidget) );
+ setQWidget( new KJavaAppletWidget(args) );
#else
setQWidget( new KJavaAppletWidget(context, _view->viewport()) );
processArguments(args);
@@ -102,7 +93,6 @@ int RenderApplet::intrinsicHeight() const
void RenderApplet::layout()
{
//kdDebug(6100) << "RenderApplet::layout" << endl;
-
KHTMLAssert( !layouted() );
KHTMLAssert( minMaxKnown() );
@@ -111,7 +101,6 @@ void RenderApplet::layout()
KJavaAppletWidget *tmp = static_cast<KJavaAppletWidget*>(m_widget);
if ( tmp ) {
-#ifndef APPLE_CHANGES
NodeImpl *child = element()->firstChild();
while(child) {
@@ -123,7 +112,6 @@ void RenderApplet::layout()
}
child = child->nextSibling();
}
-#endif
//kdDebug(6100) << "setting applet widget to size: " << m_width << ", " << m_height << endl;
m_widget->resize(m_width-marginLeft()-marginRight()-paddingLeft()-paddingRight(),
m_height-marginTop()-marginBottom()-paddingTop()-paddingBottom());
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.h b/WebCore/kwq/KWQKJavaAppletWidget.h
index 2949c20..c3ea588 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.h
+++ b/WebCore/kwq/KWQKJavaAppletWidget.h
@@ -27,9 +27,26 @@
#include <qmap.h>
#include <qstring.h>
+class KJavaApplet;
+
class KJavaAppletWidget : public QWidget
{
+ KJavaApplet *m_applet;
+ QMap<QString, QString> arguments;
+ QRect frame;
+
public:
KJavaAppletWidget(const QMap<QString, QString> &args);
- void showApplet() { }
+ void setParameter(const QString &name, const QString &value){arguments.insert(name, value);}
+ KJavaApplet* applet() { return m_applet; }
+ void showApplet();
+};
+
+class KJavaApplet
+{
+ KJavaAppletWidget *m_widget;
+
+public:
+ KJavaApplet(KJavaAppletWidget *widget){m_widget = widget;}
+ void setParameter(const QString &name, const QString &value) { m_widget->setParameter(name, value); }
};
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 31b9975..7def555 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -25,12 +25,20 @@
#import <java/kjavaappletwidget.h>
#import <WebCoreViewFactory.h>
+#include <iostream.h>
-KJavaAppletWidget::KJavaAppletWidget(const QMap<QString, QString> &args)
+KJavaAppletWidget::KJavaAppletWidget(const QMap<QString, QString> &args) {
+ arguments = args;
+ m_applet = new KJavaApplet(this);
+}
+
+void KJavaAppletWidget::showApplet()
{
- NSMutableDictionary *argsDictionary = [NSMutableDictionary dictionaryWithCapacity:args.count()];
- for (QMap<QString, QString>::ConstIterator it = args.begin(); it != args.end(); ++it) {
+ NSMutableDictionary *argsDictionary = [NSMutableDictionary dictionaryWithCapacity:arguments.count()];
+ for (QMap<QString, QString>::ConstIterator it = arguments.begin(); it != arguments.end(); ++it) {
[argsDictionary setObject:it.data().getNSString() forKey:it.key().getNSString()];
}
- setView([[WebCoreViewFactory sharedFactory] viewForJavaAppletWithArguments:argsDictionary]);
-}
+ setView([[WebCoreViewFactory sharedFactory]
+ viewForJavaAppletWithFrame:NSMakeRect(pos().x(), pos().y(), size().width(), size().height())
+ andArguments:argsDictionary]);
+}
\ No newline at end of file
diff --git a/WebCore/kwq/WebCoreViewFactory.h b/WebCore/kwq/WebCoreViewFactory.h
index fa41c73..cd50854 100644
--- a/WebCore/kwq/WebCoreViewFactory.h
+++ b/WebCore/kwq/WebCoreViewFactory.h
@@ -38,7 +38,7 @@
- (NSView *)viewForPluginWithURL:(NSURL *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSURL *)baseURL;
- (NSArray *)pluginsInfo; // array of id <WebCorePluginInfo>
-- (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments;
+- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame andArguments:(NSDictionary *)arguments;
@end
diff --git a/WebCore/kwq/WebCoreViewFactory.m b/WebCore/kwq/WebCoreViewFactory.m
index d6bc37a..21ada9e 100644
--- a/WebCore/kwq/WebCoreViewFactory.m
+++ b/WebCore/kwq/WebCoreViewFactory.m
@@ -55,7 +55,7 @@ static WebCoreViewFactory *sharedFactory;
return nil;
}
-- (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments
+- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame andArguments:(NSDictionary *)arguments
{
return nil;
}
diff --git a/WebCore/kwq/khtml/java/kjavaappletwidget.h b/WebCore/kwq/khtml/java/kjavaappletwidget.h
index 2949c20..c3ea588 100644
--- a/WebCore/kwq/khtml/java/kjavaappletwidget.h
+++ b/WebCore/kwq/khtml/java/kjavaappletwidget.h
@@ -27,9 +27,26 @@
#include <qmap.h>
#include <qstring.h>
+class KJavaApplet;
+
class KJavaAppletWidget : public QWidget
{
+ KJavaApplet *m_applet;
+ QMap<QString, QString> arguments;
+ QRect frame;
+
public:
KJavaAppletWidget(const QMap<QString, QString> &args);
- void showApplet() { }
+ void setParameter(const QString &name, const QString &value){arguments.insert(name, value);}
+ KJavaApplet* applet() { return m_applet; }
+ void showApplet();
+};
+
+class KJavaApplet
+{
+ KJavaAppletWidget *m_widget;
+
+public:
+ KJavaApplet(KJavaAppletWidget *widget){m_widget = widget;}
+ void setParameter(const QString &name, const QString &value) { m_widget->setParameter(name, value); }
};
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fc73888..4f6fe17 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-27 Chris Blumenberg <cblu at apple.com>
+
+ Support for Java.
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView initWithFrame:plugin:url:baseURL:mime:arguments:]): set DOCBASE argument
+ * WebCoreSupport.subproj/IFWebCoreViewFactory.m:
+ (-[IFWebCoreViewFactory viewForJavaAppletWithFrame:andArguments:]): renamed
+
2002-06-26 Richard Williamson <rjw at apple.com>
* WebCoreSupport.subproj/IFTextRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index fc73888..4f6fe17 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-06-27 Chris Blumenberg <cblu at apple.com>
+
+ Support for Java.
+
+ * Plugins.subproj/IFPluginView.mm:
+ (-[IFPluginView initWithFrame:plugin:url:baseURL:mime:arguments:]): set DOCBASE argument
+ * WebCoreSupport.subproj/IFWebCoreViewFactory.m:
+ (-[IFWebCoreViewFactory viewForJavaAppletWithFrame:andArguments:]): renamed
+
2002-06-26 Richard Williamson <rjw at apple.com>
* WebCoreSupport.subproj/IFTextRenderer.m:
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index a1aaade..545755a 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -302,7 +302,7 @@ static char *newCString(NSString *string)
if([mime isEqualToString:@"application/x-java-applet"]){
cAttributes = new char * [[arguments count]+1];
cValues = new char * [[arguments count]+1];
- cAttributes[0] = newCString(@"CODEBASE");
+ cAttributes[0] = newCString(@"DOCBASE");
cValues[0] = newCString([baseURL absoluteString]);
argsCount++;
}else{
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index a1aaade..545755a 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -302,7 +302,7 @@ static char *newCString(NSString *string)
if([mime isEqualToString:@"application/x-java-applet"]){
cAttributes = new char * [[arguments count]+1];
cValues = new char * [[arguments count]+1];
- cAttributes[0] = newCString(@"CODEBASE");
+ cAttributes[0] = newCString(@"DOCBASE");
cValues[0] = newCString([baseURL absoluteString]);
argsCount++;
}else{
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
index c94bf2d..4e15d1e 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
@@ -66,7 +66,7 @@
return [[IFPluginDatabase installedPlugins] plugins];
}
-- (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments
+- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame andArguments:(NSDictionary *)arguments
{
IFPlugin *plugin;
NSURL *baseURL;
@@ -78,10 +78,7 @@
baseURL = [NSURL _IF_URLWithString:[arguments objectForKey:@"baseURL"]];
- if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:@"application/x-java-applet" arguments:arguments] autorelease];
- }
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:arguments] autorelease];
+ return [[[IFPluginView alloc] initWithFrame:frame plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:arguments] autorelease];
}
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index c94bf2d..4e15d1e 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -66,7 +66,7 @@
return [[IFPluginDatabase installedPlugins] plugins];
}
-- (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments
+- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame andArguments:(NSDictionary *)arguments
{
IFPlugin *plugin;
NSURL *baseURL;
@@ -78,10 +78,7 @@
baseURL = [NSURL _IF_URLWithString:[arguments objectForKey:@"baseURL"]];
- if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:@"application/x-java-applet" arguments:arguments] autorelease];
- }
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:arguments] autorelease];
+ return [[[IFPluginView alloc] initWithFrame:frame plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:arguments] autorelease];
}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list