<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45813] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/45813">45813</a></dd>
<dt>Author</dt> <dd>hausmann@webkit.org</dd>
<dt>Date</dt> <dd>2009-07-13 03:55:07 -0700 (Mon, 13 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>.:

2009-07-13  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;

        Reviewed by Ariya Hidayat.

        Add the test netscape plugin for the Qt DRT to the build.

        * WebKit.pro:

WebKitTools:

2009-07-13  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;

        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  &lt;simon.hausmann@nokia.com&gt;

        Reviewed by Ariya Hidayat.

        Enable a bunch of plugin layout tests for the Qt DRT.

        * platform/qt/Skipped:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformqtSkipped">trunk/LayoutTests/platform/qt/Skipped</a></li>
<li><a href="#trunkWebKitpro">trunk/WebKit.pro</a></li>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreeqtDumpRenderTreecpp">trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp</a></li>
<li><a href="#trunkWebKitToolsScriptsrunwebkittests">trunk/WebKitTools/Scripts/run-webkit-tests</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (45812 => 45813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2009-07-13 10:53:44 UTC (rev 45812)
+++ trunk/ChangeLog        2009-07-13 10:55:07 UTC (rev 45813)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2009-07-13  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;
+
+        Reviewed by Ariya Hidayat.
+
+        Add the test netscape plugin for the Qt DRT to the build.
+
+        * WebKit.pro:
+
</ins><span class="cx"> 2009-07-13  Drew Wilson  &lt;atwilson@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (45812 => 45813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-07-13 10:53:44 UTC (rev 45812)
+++ trunk/LayoutTests/ChangeLog        2009-07-13 10:55:07 UTC (rev 45813)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2009-07-13  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;
+
+        Reviewed by Ariya Hidayat.
+
+        Enable a bunch of plugin layout tests for the Qt DRT.
+
+        * platform/qt/Skipped:
+
</ins><span class="cx"> 2009-07-13  Simon Hausmann  &lt;hausmann@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Ariya Hidayat.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformqtSkipped"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/qt/Skipped (45812 => 45813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/qt/Skipped        2009-07-13 10:53:44 UTC (rev 45812)
+++ trunk/LayoutTests/platform/qt/Skipped        2009-07-13 10:55:07 UTC (rev 45813)
</span><span class="lines">@@ -277,31 +277,22 @@
</span><span class="cx"> fast/xsl/xslt-string-parameters.html
</span><span class="cx"> fast/xsl/xslt-url.xml
</span><span class="cx"> fast/xsl/xslt_unicode.xml
</span><del>-plugins/bindings-test.html
</del><ins>+
</ins><span class="cx"> plugins/call-as-function-test.html
</span><del>-plugins/destroy-stream-twice.html
</del><span class="cx"> plugins/embed-attributes-setting.html
</span><span class="cx"> plugins/embed-inside-object.html
</span><del>-plugins/get-empty-url.html
</del><span class="cx"> plugins/get-url-that-the-resource-load-delegate-will-disallow.html
</span><span class="cx"> plugins/get-url-with-blank-target.html
</span><span class="cx"> plugins/geturl-replace-query.html
</span><del>-plugins/inner-html-display-none.html
-plugins/invoke.html
</del><span class="cx"> plugins/jsobjc-dom-wrappers.html
</span><span class="cx"> plugins/jsobjc-simple.html
</span><span class="cx"> plugins/mouse-events.html
</span><del>-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
</del><span class="cx"> plugins/open-and-close-window-with-plugin.html
</span><span class="cx"> plugins/plugin-javascript-access.html
</span><del>-plugins/plugin-remove-subframe.html
</del><span class="cx"> plugins/root-object-premature-delete-crash.html
</span><span class="cx"> plugins/throw-on-dealloc.html
</span><span class="cx"> plugins/undefined-property-crash.html
</span><ins>+
</ins><span class="cx"> security/block-test.html
</span><span class="cx"> svg/W3C-SVG-1.1/animate-elem-02-t.svg
</span><span class="cx"> svg/W3C-SVG-1.1/animate-elem-03-t.svg
</span></span></pre></div>
<a id="trunkWebKitpro"></a>
<div class="modfile"><h4>Modified: trunk/WebKit.pro (45812 => 45813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit.pro        2009-07-13 10:53:44 UTC (rev 45812)
+++ trunk/WebKit.pro        2009-07-13 10:55:07 UTC (rev 45813)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx">         WebKit/qt/QtLauncher \
</span><span class="cx">         WebKit/qt/tests
</span><span class="cx"> 
</span><del>-!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
</del><ins>+!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro \
+                            WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
</ins><span class="cx"> 
</span><span class="cx"> include(WebKit/qt/docs/docs.pri)
</span></span></pre></div>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (45812 => 45813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2009-07-13 10:53:44 UTC (rev 45812)
+++ trunk/WebKitTools/ChangeLog        2009-07-13 10:55:07 UTC (rev 45813)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2009-07-13  Simon Hausmann  &lt;simon.hausmann@nokia.com&gt;
+
+        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.
+
</ins><span class="cx"> 2009-07-13  Simon Hausmann  &lt;hausmann@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Ariya Hidayat.
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreeqtDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp (45812 => 45813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp        2009-07-13 10:53:44 UTC (rev 45812)
+++ trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp        2009-07-13 10:55:07 UTC (rev 45813)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx">     settings()-&gt;setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
</span><span class="cx">     settings()-&gt;setAttribute(QWebSettings::JavascriptCanAccessClipboard, true);
</span><span class="cx">     settings()-&gt;setAttribute(QWebSettings::LinksIncludedInFocusChain, false);
</span><ins>+    settings()-&gt;setAttribute(QWebSettings::PluginsEnabled, true);
</ins><span class="cx">     connect(this, SIGNAL(geometryChangeRequested(const QRect &amp;)),
</span><span class="cx">             this, SLOT(setViewGeometry(const QRect &amp; )));
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitToolsScriptsrunwebkittests"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/run-webkit-tests (45812 => 45813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/run-webkit-tests        2009-07-13 10:53:44 UTC (rev 45812)
+++ trunk/WebKitTools/Scripts/run-webkit-tests        2009-07-13 10:55:07 UTC (rev 45813)
</span><span class="lines">@@ -1286,6 +1286,9 @@
</span><span class="cx">             $ENV{DBUS_SESSION_BUS_ADDRESS} = $dbusAddress;
</span><span class="cx">         }
</span><span class="cx">     }
</span><ins>+    if (isQt()) {
+        $ENV{QTWEBKIT_PLUGIN_PATH} = productDir() . &quot;/lib/plugins&quot;;
+    }
</ins><span class="cx">     $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
</span><span class="cx">     $ENV{XML_CATALOG_FILES} = &quot;&quot;; # work around missing /etc/catalog &lt;rdar://problem/4292995&gt;
</span><span class="cx">     $ENV{DYLD_INSERT_LIBRARIES} = &quot;/usr/lib/libgmalloc.dylib&quot; if $guardMalloc;
</span></span></pre>
</div>
</div>

</body>
</html>