36902 2010-03-31 14:20:08 -0700 [Qt] Patch to allow java applet support through QWebPluginFactory... 2010-04-07 07:19:22 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED DUPLICATE 33044 Qt P2 Enhancement --- 0 adawit webkit-unassigned hausmann laszlo.gombos oldest_to_newest 206715 0 52210 adawit 2010-03-31 14:20:08 -0700 Created attachment 52210 Java applet support through QWebPluginFactory::create I Currently java applet support is not implemented in QtWebKit. Additionally the request to create a JavaApplet widget simply calls notImplemented() and returns a NULL. See the "createJavaAppletWidget" function under WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp. Unfortunately, this makes it impossible for client level applications to provide their own Java applet support by re-implementing QWebPluginFactory like they can for other plugins such as flash. The attached patch attempts to address this issue by simply making it possible for client applications to handle java applets through QWebPluginFactory::create(...) function. 208308 1 adawit 2010-04-03 14:47:05 -0700 Though this bug report is about for letting client applications handle java applet support if they so choose, bug #33044 is its cousin report ; so it is linked to here for reference... 209624 2 52210 hausmann 2010-04-07 07:06:56 -0700 Comment on attachment 52210 Java applet support through QWebPluginFactory::create I > diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog > index 3a4b096..f811546 100644 > --- a/WebKit/qt/ChangeLog > +++ b/WebKit/qt/ChangeLog > @@ -1,3 +1,14 @@ > +2010-03-31 Dawit Alemayehu <adawit@kde.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Allow java applet support to be implemented through > + QWebPluginFactory. Please include a link to the bugzilla entry in the ChangeLog entry :) > + * WebCoreSupport/FrameLoaderClientQt.cpp: > + (WebCore::FrameLoaderClientQt::createPlugin): > + (WebCore::FrameLoaderClientQt::createJavaAppletWidget): > + > 2010-03-26 Kenneth Rohde Christiansen <kenneth@webkit.org> > > Reviewed by Antti Koivisto. > diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp > index c5c5739..b0ff002 100644 > --- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp > +++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp > @@ -1340,9 +1340,11 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize, > } > } > > - RefPtr<PluginView> pluginView = PluginView::create(m_frame, pluginSize, element, url, > - params, values, mimeType, loadManually); > - return pluginView; > + if (mimeType != "application/x-java-applet") { > + RefPtr<PluginView> pluginView = PluginView::create(m_frame, pluginSize, element, url, params, values, mimeType, loadManually); > + if (pluginView->status() == PluginStatusLoadedSuccessfully) > + return pluginView; > + } This part looks incorrect to me. Why are you avoiding the calls to PluginView::create? I thought especially on platforms where the Java support comes through an NPAPI plugin - see Bug #33044 - AFAICS that call is needed. > return 0; > @@ -1355,11 +1357,10 @@ void FrameLoaderClientQt::redirectDataToPlugin(Widget* pluginWidget) > m_hasSentResponseToPlugin = false; > } > > -PassRefPtr<Widget> FrameLoaderClientQt::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, > - const Vector<String>&, const Vector<String>&) > +PassRefPtr<Widget> FrameLoaderClientQt::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const KURL& baseURL, > + const Vector<String>& paramNames, const Vector<String>& paramValues) > { > - notImplemented(); > - return 0; > + return FrameLoaderClientQt::createPlugin(pluginSize, element, baseURL, paramNames, paramValues, "application/x-java-applet", false); > } I'm fine with this part of the patch :) 209629 3 adawit 2010-04-07 07:19:22 -0700 (In reply to comment #2) > (From update of attachment 52210 [details]) > > diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog > > index 3a4b096..f811546 100644 > > --- a/WebKit/qt/ChangeLog > > +++ b/WebKit/qt/ChangeLog > > @@ -1,3 +1,14 @@ > > +2010-03-31 Dawit Alemayehu <adawit@kde.org> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + Allow java applet support to be implemented through > > + QWebPluginFactory. > > Please include a link to the bugzilla entry in the ChangeLog entry :) Oops, forgot that! > > + * WebCoreSupport/FrameLoaderClientQt.cpp: > > + (WebCore::FrameLoaderClientQt::createPlugin): > > + (WebCore::FrameLoaderClientQt::createJavaAppletWidget): > > + > > 2010-03-26 Kenneth Rohde Christiansen <kenneth@webkit.org> > > > > Reviewed by Antti Koivisto. > > diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp > > index c5c5739..b0ff002 100644 > > --- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp > > +++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp > > @@ -1340,9 +1340,11 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize, > > } > > } > > > > - RefPtr<PluginView> pluginView = PluginView::create(m_frame, pluginSize, element, url, > > - params, values, mimeType, loadManually); > > - return pluginView; > > + if (mimeType != "application/x-java-applet") { > > + RefPtr<PluginView> pluginView = PluginView::create(m_frame, pluginSize, element, url, params, values, mimeType, loadManually); > > + if (pluginView->status() == PluginStatusLoadedSuccessfully) > > + return pluginView; > > + } > > This part looks incorrect to me. Why are you avoiding the calls to > PluginView::create? > > I thought especially on platforms where the Java support comes through an > NPAPI plugin - see Bug #33044 - AFAICS that call is needed. That was because without applying the patch specified in #33044, actually the patch it depends on #3, that call will result in a SEGFAULT. To be honest there is really no need for this bug report as 33044 already exists and can be used to track Java applet support better... > > return 0; > > @@ -1355,11 +1357,10 @@ void FrameLoaderClientQt::redirectDataToPlugin(Widget* pluginWidget) > > m_hasSentResponseToPlugin = false; > > } > > > > -PassRefPtr<Widget> FrameLoaderClientQt::createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, > > - const Vector<String>&, const Vector<String>&) > > +PassRefPtr<Widget> FrameLoaderClientQt::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* element, const KURL& baseURL, > > + const Vector<String>& paramNames, const Vector<String>& paramValues) > > { > > - notImplemented(); > > - return 0; > > + return FrameLoaderClientQt::createPlugin(pluginSize, element, baseURL, paramNames, paramValues, "application/x-java-applet", false); > > } > > I'm fine with this part of the patch :) *** This bug has been marked as a duplicate of bug 33044 *** 52210 2010-03-31 14:20:08 -0700 2010-04-07 07:06:56 -0700 Java applet support through QWebPluginFactory::create I qtwebkit_defer_java_applet_support_to_qwebpluginfactory_1.patch text/plain 2367 adawit ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IDNhNGIwOTYuLmY4MTE1NDYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEwLTAzLTMxICBEYXdp dCBBbGVtYXllaHUgIDxhZGF3aXRAa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBqYXZhIGFwcGxldCBzdXBwb3J0IHRvIGJlIGlt cGxlbWVudGVkIHRocm91Z2gKKyAgICAgICAgUVdlYlBsdWdpbkZhY3RvcnkuCisKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNyZWF0ZVBsdWdpbik6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KToKKwogMjAxMC0w My0yNiAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCmRpZmYgLS1naXQgYS9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKaW5kZXggYzVjNTczOS4uYjBmZjAw MiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0 LmNwcApAQCAtMTM0MCw5ICsxMzQwLDExIEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBGcmFtZUxvYWRl ckNsaWVudFF0OjpjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6ZSYgcGx1Z2luU2l6ZSwKICAgICAg ICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIFJlZlB0cjxQbHVnaW5WaWV3PiBwbHVnaW5W aWV3ID0gUGx1Z2luVmlldzo6Y3JlYXRlKG1fZnJhbWUsIHBsdWdpblNpemUsIGVsZW1lbnQsIHVy bCwKLSAgICAgICAgICAgIHBhcmFtcywgdmFsdWVzLCBtaW1lVHlwZSwgbG9hZE1hbnVhbGx5KTsK LSAgICAgICAgcmV0dXJuIHBsdWdpblZpZXc7CisgICAgICAgIGlmIChtaW1lVHlwZSAhPSAiYXBw bGljYXRpb24veC1qYXZhLWFwcGxldCIpIHsKKyAgICAgICAgICAgIFJlZlB0cjxQbHVnaW5WaWV3 PiBwbHVnaW5WaWV3ID0gUGx1Z2luVmlldzo6Y3JlYXRlKG1fZnJhbWUsIHBsdWdpblNpemUsIGVs ZW1lbnQsIHVybCwgcGFyYW1zLCB2YWx1ZXMsIG1pbWVUeXBlLCBsb2FkTWFudWFsbHkpOyAgICAg ICAgCisgICAgICAgICAgICBpZiAocGx1Z2luVmlldy0+c3RhdHVzKCkgPT0gUGx1Z2luU3RhdHVz TG9hZGVkU3VjY2Vzc2Z1bGx5KQorICAgICAgICAgICAgICAgIHJldHVybiBwbHVnaW5WaWV3Owor ICAgICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIDA7CkBAIC0xMzU1LDExICsxMzU3LDEwIEBA IHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6cmVkaXJlY3REYXRhVG9QbHVnaW4oV2lkZ2V0KiBw bHVnaW5XaWRnZXQpCiAgICAgbV9oYXNTZW50UmVzcG9uc2VUb1BsdWdpbiA9IGZhbHNlOwogfQog Ci1QYXNzUmVmUHRyPFdpZGdldD4gRnJhbWVMb2FkZXJDbGllbnRRdDo6Y3JlYXRlSmF2YUFwcGxl dFdpZGdldChjb25zdCBJbnRTaXplJiwgSFRNTEFwcGxldEVsZW1lbnQqLCBjb25zdCBLVVJMJiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBWZWN0b3I8U3RyaW5nPiYsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JikKK1Bhc3NSZWZQdHI8V2lk Z2V0PiBGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IElu dFNpemUmIHBsdWdpblNpemUsIEhUTUxBcHBsZXRFbGVtZW50KiBlbGVtZW50LCBjb25zdCBLVVJM JiBiYXNlVVJMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjb25zdCBWZWN0b3I8U3Ry aW5nPiYgcGFyYW1WYWx1ZXMpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4g MDsKKyAgICByZXR1cm4gRnJhbWVMb2FkZXJDbGllbnRRdDo6Y3JlYXRlUGx1Z2luKHBsdWdpblNp emUsIGVsZW1lbnQsIGJhc2VVUkwsIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCAiYXBwbGljYXRp b24veC1qYXZhLWFwcGxldCIsIGZhbHNlKTsKIH0KIAogU3RyaW5nIEZyYW1lTG9hZGVyQ2xpZW50 UXQ6Om92ZXJyaWRlTWVkaWFUeXBlKCkgY29uc3QK