<!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>[160439] trunk/Tools</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/160439">160439</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2013-12-11 09:49:44 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre><https://webkit.org/b/125563> Remove the DumpRenderTree Perl Support module
Now that old-run-webkit-tests is not used on OS X it's not worth the time and effort
to build and maintain this custom Perl module.
Reviewed by Anders Carlsson.
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove the target.
* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport.c: Removed.
* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm: Removed.
* DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c: Removed.
* DumpRenderTree/mac/PerlSupport/Makefile: Removed.
* Scripts/old-run-webkit-tests: Update a comment that referred to DumpRenderTreeSupport as a reason to
build DumpRenderTree.
(dumpToolDidCrash): Stop importing and using the module.
* Scripts/webkitpy/port/base.py:
(Port._build_driver): Update a comment in the same manner as in old-run-webkit-tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsScriptsoldrunwebkittests">trunk/Tools/Scripts/old-run-webkit-tests</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Tools/DumpRenderTree/mac/PerlSupport/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160438 => 160439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/ChangeLog 2013-12-11 17:49:44 UTC (rev 160439)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-12-11 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/125563> Remove the DumpRenderTree Perl Support module
+
+ Now that old-run-webkit-tests is not used on OS X it's not worth the time and effort
+ to build and maintain this custom Perl module.
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove the target.
+ * DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport.c: Removed.
+ * DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm: Removed.
+ * DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c: Removed.
+ * DumpRenderTree/mac/PerlSupport/Makefile: Removed.
+ * Scripts/old-run-webkit-tests: Update a comment that referred to DumpRenderTreeSupport as a reason to
+ build DumpRenderTree.
+ (dumpToolDidCrash): Stop importing and using the module.
+ * Scripts/webkitpy/port/base.py:
+ (Port._build_driver): Update a comment in the same manner as in old-run-webkit-tests.
+
</ins><span class="cx"> 2013-12-11 Brendan Long <b.long@cablelabs.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add "enable-mediasource" property to WebKitWebSettings
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (160438 => 160439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-12-11 17:49:44 UTC (rev 160439)
</span><span class="lines">@@ -17,7 +17,6 @@
</span><span class="cx"> A84F609108B1370E00E9745F /* PBXTargetDependency */,
</span><span class="cx"> A84F608F08B1370E00E9745F /* PBXTargetDependency */,
</span><span class="cx"> 141BF238096A451E00E0753C /* PBXTargetDependency */,
</span><del>- 5DC82A701023C93D00FD1D3B /* PBXTargetDependency */,
</del><span class="cx"> );
</span><span class="cx"> name = All;
</span><span class="cx"> productName = All;
</span><span class="lines">@@ -191,20 +190,6 @@
</span><span class="cx"> remoteGlobalIDString = 2D403EB2150871F9005358D2;
</span><span class="cx"> remoteInfo = LayoutTestHelper;
</span><span class="cx"> };
</span><del>- 378C802315AB589B00746821 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 9340994A08540CAE007F3BC8;
- remoteInfo = DumpRenderTree;
- };
- 5DC82A6F1023C93D00FD1D3B /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 5DC82A661023C8DE00FD1D3B;
- remoteInfo = "DumpRenderTree Perl Support";
- };
</del><span class="cx"> A84F608E08B1370E00E9745F /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="lines">@@ -788,24 +773,6 @@
</span><span class="cx"> };
</span><span class="cx"> /* End PBXHeadersBuildPhase section */
</span><span class="cx">
</span><del>-/* Begin PBXLegacyTarget section */
- 5DC82A661023C8DE00FD1D3B /* DumpRenderTree Perl Support */ = {
- isa = PBXLegacyTarget;
- buildArgumentsString = "$(ACTION)";
- buildConfigurationList = 5DC82A6E1023C92A00FD1D3B /* Build configuration list for PBXLegacyTarget "DumpRenderTree Perl Support" */;
- buildPhases = (
- );
- buildToolPath = make;
- buildWorkingDirectory = "$(SRCROOT)/mac/PerlSupport";
- dependencies = (
- 378C802415AB589B00746821 /* PBXTargetDependency */,
- );
- name = "DumpRenderTree Perl Support";
- passBuildSettingsInEnvironment = 1;
- productName = "DumpRenderTree Perl Support";
- };
-/* End PBXLegacyTarget section */
-
</del><span class="cx"> /* Begin PBXNativeTarget section */
</span><span class="cx"> 141BF21E096A441D00E0753C /* TestNetscapePlugIn */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="lines">@@ -905,7 +872,6 @@
</span><span class="cx"> 9340994A08540CAE007F3BC8 /* DumpRenderTree */,
</span><span class="cx"> B5A7525A08AF4A4A00138E45 /* ImageDiff */,
</span><span class="cx"> 141BF21E096A441D00E0753C /* TestNetscapePlugIn */,
</span><del>- 5DC82A661023C8DE00FD1D3B /* DumpRenderTree Perl Support */,
</del><span class="cx"> 2D403EB2150871F9005358D2 /* LayoutTestHelper */,
</span><span class="cx"> );
</span><span class="cx"> };
</span><span class="lines">@@ -1043,16 +1009,6 @@
</span><span class="cx"> target = 2D403EB2150871F9005358D2 /* LayoutTestHelper */;
</span><span class="cx"> targetProxy = 2D403F201508736C005358D2 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- 378C802415AB589B00746821 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 9340994A08540CAE007F3BC8 /* DumpRenderTree */;
- targetProxy = 378C802315AB589B00746821 /* PBXContainerItemProxy */;
- };
- 5DC82A701023C93D00FD1D3B /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 5DC82A661023C8DE00FD1D3B /* DumpRenderTree Perl Support */;
- targetProxy = 5DC82A6F1023C93D00FD1D3B /* PBXContainerItemProxy */;
- };
</del><span class="cx"> A84F608F08B1370E00E9745F /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = B5A7525A08AF4A4A00138E45 /* ImageDiff */;
</span><span class="lines">@@ -1138,27 +1094,6 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><del>- 5DC82A671023C8DE00FD1D3B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "DumpRenderTree Perl Support";
- };
- name = Debug;
- };
- 5DC82A681023C8DE00FD1D3B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "DumpRenderTree Perl Support";
- };
- name = Release;
- };
- 5DC82A691023C8DE00FD1D3B /* Production */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "DumpRenderTree Perl Support";
- };
- name = Production;
- };
</del><span class="cx"> 90CBC3500F748B1300A712B7 /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = BCB281EE0CFA713D007E533E /* Base.xcconfig */;
</span><span class="lines">@@ -1296,16 +1231,6 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- 5DC82A6E1023C92A00FD1D3B /* Build configuration list for PBXLegacyTarget "DumpRenderTree Perl Support" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 5DC82A671023C8DE00FD1D3B /* Debug */,
- 5DC82A681023C8DE00FD1D3B /* Release */,
- 5DC82A691023C8DE00FD1D3B /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
</del><span class="cx"> A84F609208B1371400E9745F /* Build configuration list for PBXAggregateTarget "All" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span></span></pre></div>
<a id="trunkToolsScriptsoldrunwebkittests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/old-run-webkit-tests (160438 => 160439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/old-run-webkit-tests 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2013-12-11 17:49:44 UTC (rev 160439)
</span><span class="lines">@@ -421,11 +421,8 @@
</span><span class="cx"> chdirWebKit();
</span><span class="cx">
</span><span class="cx"> if (!defined($root) && !$noBuildDumpTool) {
</span><del>- # FIXME: We build both DumpRenderTree and WebKitTestRunner for
- # WebKitTestRunner runs because DumpRenderTree still includes
- # the DumpRenderTreeSupport module and the TestNetscapePlugin.
- # These two projects should be factored out into their own
- # projects.
</del><ins>+ # FIXME: We build both DumpRenderTree and WebKitTestRunner for WebKitTestRunner runs because
+ # DumpRenderTree includes TestNetscapePlugin. It should be factored out into its own project.
</ins><span class="cx"> buildDumpTool("DumpRenderTree");
</span><span class="cx"> buildDumpTool("WebKitTestRunner") if $useWebKitTestRunner;
</span><span class="cx"> }
</span><span class="lines">@@ -447,11 +444,6 @@
</span><span class="cx">
</span><span class="cx"> checkFrameworks() unless isCygwin();
</span><span class="cx">
</span><del>-if (isAppleMacWebKit()) {
- push @INC, $productDir;
- require DumpRenderTreeSupport;
-}
-
</del><span class="cx"> my $layoutTestsName = "LayoutTests";
</span><span class="cx"> my $testDirectory = File::Spec->rel2abs($layoutTestsName);
</span><span class="cx"> my $expectedDirectory = $testDirectory;
</span><span class="lines">@@ -1543,10 +1535,7 @@
</span><span class="cx"> my $pid = waitpid(-1, WNOHANG);
</span><span class="cx"> return 1 if ($pid == $dumpToolPID);
</span><span class="cx">
</span><del>- # On Mac OS X, crashing may be significantly delayed by crash reporter.
- return 0 unless isAppleMacWebKit();
-
- return DumpRenderTreeSupport::processIsCrashing($dumpToolPID);
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub configureAndOpenHTTPDIfNeeded()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (160438 => 160439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2013-12-11 17:49:44 UTC (rev 160439)
</span><span class="lines">@@ -1392,11 +1392,8 @@
</span><span class="cx"> environment.disable_gcc_smartquotes()
</span><span class="cx"> env = environment.to_dictionary()
</span><span class="cx">
</span><del>- # FIXME: We build both DumpRenderTree and WebKitTestRunner for
- # WebKitTestRunner runs because DumpRenderTree still includes
- # the DumpRenderTreeSupport module and the TestNetscapePlugin.
- # These two projects should be factored out into their own
- # projects.
</del><ins>+ # FIXME: We build both DumpRenderTree and WebKitTestRunner for WebKitTestRunner runs because
+ # DumpRenderTree includes TestNetscapePlugin. It should be factored out into its own project.
</ins><span class="cx"> try:
</span><span class="cx"> self._run_script("build-dumprendertree", args=self._build_driver_flags(), env=env)
</span><span class="cx"> if self.get_option('webkit_test_runner'):
</span></span></pre>
</div>
</div>
</body>
</html>