From 2f883126dd0ed220c314e2e5e6a7f1d2bde04ddb Mon Sep 17 00:00:00 2001 From: "hausmann@webkit.org" Date: Mon, 13 Jul 2009 10:55:07 +0000 Subject: [PATCH 1/1] .: 2009-07-13 Simon Hausmann Reviewed by Ariya Hidayat. Add the test netscape plugin for the Qt DRT to the build. * WebKit.pro: WebKitTools: 2009-07-13 Simon Hausmann Reviewed by Ariya Hidayat. Fix test netscape plugin usage with the Qt DRT. * DumpRenderTree/qt/DumpRenderTree.cpp: (WebCore::WebPage::WebPage): Enable plugins in the settings. * Scripts/run-webkit-tests: Set the QT_WEBKIT_PLUGIN path to the correct build directory to make Qt DRT find the test netscape plugin. LayoutTests: 2009-07-13 Simon Hausmann Reviewed by Ariya Hidayat. Enable a bunch of plugin layout tests for the Qt DRT. * platform/qt/Skipped: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@45813 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 8 ++++++++ LayoutTests/ChangeLog | 8 ++++++++ LayoutTests/platform/qt/Skipped | 13 ++----------- WebKit.pro | 3 ++- WebKitTools/ChangeLog | 11 +++++++++++ WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp | 1 + WebKitTools/Scripts/run-webkit-tests | 3 +++ 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0c0b7a..3f3e2ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-07-13 Simon Hausmann + + Reviewed by Ariya Hidayat. + + Add the test netscape plugin for the Qt DRT to the build. + + * WebKit.pro: + 2009-07-13 Drew Wilson Reviewed by David Levin. diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 22080e9..980ddf1 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,11 @@ +2009-07-13 Simon Hausmann + + Reviewed by Ariya Hidayat. + + Enable a bunch of plugin layout tests for the Qt DRT. + + * platform/qt/Skipped: + 2009-07-13 Simon Hausmann Reviewed by Ariya Hidayat. diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped index 4c7f101..900b76b 100644 --- a/LayoutTests/platform/qt/Skipped +++ b/LayoutTests/platform/qt/Skipped @@ -277,31 +277,22 @@ fast/xsl/xslt-second-level-import.xml fast/xsl/xslt-string-parameters.html fast/xsl/xslt-url.xml fast/xsl/xslt_unicode.xml -plugins/bindings-test.html + plugins/call-as-function-test.html -plugins/destroy-stream-twice.html plugins/embed-attributes-setting.html plugins/embed-inside-object.html -plugins/get-empty-url.html plugins/get-url-that-the-resource-load-delegate-will-disallow.html plugins/get-url-with-blank-target.html plugins/geturl-replace-query.html -plugins/inner-html-display-none.html -plugins/invoke.html plugins/jsobjc-dom-wrappers.html plugins/jsobjc-simple.html plugins/mouse-events.html -plugins/netscape-destroy-plugin-script-objects.html -plugins/netscape-dom-access.html -plugins/netscape-enumerate.html -plugins/netscape-invoke-default.html -plugins/netscape-plugin-setwindow-size.html plugins/open-and-close-window-with-plugin.html plugins/plugin-javascript-access.html -plugins/plugin-remove-subframe.html plugins/root-object-premature-delete-crash.html plugins/throw-on-dealloc.html plugins/undefined-property-crash.html + security/block-test.html svg/W3C-SVG-1.1/animate-elem-02-t.svg svg/W3C-SVG-1.1/animate-elem-03-t.svg diff --git a/WebKit.pro b/WebKit.pro index b69617a..bb2ae97 100644 --- a/WebKit.pro +++ b/WebKit.pro @@ -7,6 +7,7 @@ SUBDIRS += \ WebKit/qt/QtLauncher \ WebKit/qt/tests -!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro \ + WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro include(WebKit/qt/docs/docs.pri) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index eb2e207..8998849 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,14 @@ +2009-07-13 Simon Hausmann + + Reviewed by Ariya Hidayat. + + Fix test netscape plugin usage with the Qt DRT. + + * DumpRenderTree/qt/DumpRenderTree.cpp: + (WebCore::WebPage::WebPage): Enable plugins in the settings. + * Scripts/run-webkit-tests: Set the QT_WEBKIT_PLUGIN path to the correct build + directory to make Qt DRT find the test netscape plugin. + 2009-07-13 Simon Hausmann Reviewed by Ariya Hidayat. diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp index 30f2c05..964f6de 100644 --- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp +++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp @@ -101,6 +101,7 @@ WebPage::WebPage(QWidget *parent, DumpRenderTree *drt) settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true); settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true); settings()->setAttribute(QWebSettings::LinksIncludedInFocusChain, false); + settings()->setAttribute(QWebSettings::PluginsEnabled, true); connect(this, SIGNAL(geometryChangeRequested(const QRect &)), this, SLOT(setViewGeometry(const QRect & ))); diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests index a2c9829..a385d04 100755 --- a/WebKitTools/Scripts/run-webkit-tests +++ b/WebKitTools/Scripts/run-webkit-tests @@ -1286,6 +1286,9 @@ sub openDumpTool() $ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress; } } + if (isQt()) { + $ENV{QTWEBKIT_PLUGIN_PATH} = productDir() . "/lib/plugins"; + } $ENV{DYLD_FRAMEWORK_PATH} = $productDir; $ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog $ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc; -- 1.8.3.1