<!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>[162573] 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/162573">162573</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 17:11:06 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Prepare for upstreaming DumpRenderTree changes
https://bugs.webkit.org/show_bug.cgi?id=127412
Reviewed by Simon Fraser.
Unlike on Mac where DumpRenderTree is a command-line tool, on iOS it is
an application bundle. Instead of upstreaming a separate target for the
app that duplicates the 'Compile Sources' phase of the tool, separate
out the compilation into a static library target that both the
command-line tool and the app can link against. Also, perform some
unrelated cleanup.
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Updated the
project file format from 2.4- to 3.2-compatible. Removed the
'Copy Headers' build phase and removed all files from the
'Compile Sources' build phase of DumpRenderTree. Added some files that
were missing from the project. Created a 'DumpRenderTree (Library)'
target for building the static library and made the 'DumpRenderTree'
target depend on it. Added a 'Compile Sources' build phase to this
target that builds the same files the DumpRenderTree target used to.
Created DumpRenderTreeMain.mm as the only source file of the
DumpRenderTree target, since targets won't link a binary without at
least one source file. Made DumpRenderTree (Library) use
DumpRenderTreeLibrary.xcconfig and made LayoutTestHelper use
BaseTarget.xcconfig (so that it doesn't try to link libDumpRenderTree.a).
* DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: Moved
definitions of GCC_ENABLE_OBJC_EXCEPTIONS and GCC_PREFIX_HEADER from
DumpRenderTree.xcconfig to here so that LayoutTestHelper can use them.
* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: Passed
-force_load $(BUILT_PRODUCTS_DIR)libDumpRenderTree.a to OTHER_LDFLAGS.
This is needed to correctly link a static library containing an Objective-C
category (see <https://developer.apple.com/library/mac/qa/qa1490/_index.html>).
* DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig: Added.
* DumpRenderTree/mac/DumpRenderTree.mm:
(DumpRenderTreeMain): Renamed from main.
* DumpRenderTree/mac/DumpRenderTreeMac.h: Added declaration of DumpRenderTreeMain.
* DumpRenderTree/mac/DumpRenderTreeMain.mm: Added.
(main): Called DumpRenderTreeMain from main.</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="#trunkToolsDumpRenderTreemacConfigurationsBaseTargetxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeMach">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeMainmm">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162572 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-23 00:38:29 UTC (rev 162572)
+++ trunk/Tools/ChangeLog 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-01-22 Andy Estes <aestes@apple.com>
+
+ [iOS] Prepare for upstreaming DumpRenderTree changes
+ https://bugs.webkit.org/show_bug.cgi?id=127412
+
+ Reviewed by Simon Fraser.
+
+ Unlike on Mac where DumpRenderTree is a command-line tool, on iOS it is
+ an application bundle. Instead of upstreaming a separate target for the
+ app that duplicates the 'Compile Sources' phase of the tool, separate
+ out the compilation into a static library target that both the
+ command-line tool and the app can link against. Also, perform some
+ unrelated cleanup.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Updated the
+ project file format from 2.4- to 3.2-compatible. Removed the
+ 'Copy Headers' build phase and removed all files from the
+ 'Compile Sources' build phase of DumpRenderTree. Added some files that
+ were missing from the project. Created a 'DumpRenderTree (Library)'
+ target for building the static library and made the 'DumpRenderTree'
+ target depend on it. Added a 'Compile Sources' build phase to this
+ target that builds the same files the DumpRenderTree target used to.
+ Created DumpRenderTreeMain.mm as the only source file of the
+ DumpRenderTree target, since targets won't link a binary without at
+ least one source file. Made DumpRenderTree (Library) use
+ DumpRenderTreeLibrary.xcconfig and made LayoutTestHelper use
+ BaseTarget.xcconfig (so that it doesn't try to link libDumpRenderTree.a).
+ * DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: Moved
+ definitions of GCC_ENABLE_OBJC_EXCEPTIONS and GCC_PREFIX_HEADER from
+ DumpRenderTree.xcconfig to here so that LayoutTestHelper can use them.
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: Passed
+ -force_load $(BUILT_PRODUCTS_DIR)libDumpRenderTree.a to OTHER_LDFLAGS.
+ This is needed to correctly link a static library containing an Objective-C
+ category (see <https://developer.apple.com/library/mac/qa/qa1490/_index.html>).
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig: Added.
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (DumpRenderTreeMain): Renamed from main.
+ * DumpRenderTree/mac/DumpRenderTreeMac.h: Added declaration of DumpRenderTreeMain.
+ * DumpRenderTree/mac/DumpRenderTreeMain.mm: Added.
+ (main): Called DumpRenderTreeMain from main.
+
</ins><span class="cx"> 2014-01-15 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][CMake] build-webkit should try harder to avoid re-running cmake
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (162572 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2014-01-23 00:38:29 UTC (rev 162572)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> archiveVersion = 1;
</span><span class="cx"> classes = {
</span><span class="cx"> };
</span><del>- objectVersion = 42;
</del><ins>+ objectVersion = 46;
</ins><span class="cx"> objects = {
</span><span class="cx">
</span><span class="cx"> /* Begin PBXAggregateTarget section */
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><span class="cx"> 2D403F211508736C005358D2 /* PBXTargetDependency */,
</span><del>- A84F609108B1370E00E9745F /* PBXTargetDependency */,
</del><ins>+ A134E52D188FC09200901D06 /* PBXTargetDependency */,
</ins><span class="cx"> A84F608F08B1370E00E9745F /* PBXTargetDependency */,
</span><span class="cx"> 141BF238096A451E00E0753C /* PBXTargetDependency */,
</span><span class="cx"> );
</span><span class="lines">@@ -31,14 +31,12 @@
</span><span class="cx"> 141BF438096A455900E0753C /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A817090308B164D300CCB9FB /* JavaScriptCore.framework */; };
</span><span class="cx"> 141BF439096A455900E0753C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
</span><span class="cx"> 141BF453096A45EB00E0753C /* PluginObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 141BF447096A45C800E0753C /* PluginObject.h */; };
</span><del>- 14770FE20A22ADF7009342EE /* GCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14770FE00A22ADF7009342EE /* GCController.h */; };
</del><span class="cx"> 1A14C8A51406DE0400B254F7 /* SupportsCarbonEventModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A14C8A31406DE0400B254F7 /* SupportsCarbonEventModel.cpp */; };
</span><span class="cx"> 1A1E4298141141C400388758 /* PrivateBrowsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1E4296141141C400388758 /* PrivateBrowsing.cpp */; };
</span><span class="cx"> 1A215A8111F2609C008AD0F5 /* PluginTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A215A7F11F2609C008AD0F5 /* PluginTest.cpp */; };
</span><span class="cx"> 1A215A8211F2609C008AD0F5 /* PluginTest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A215A8011F2609C008AD0F5 /* PluginTest.h */; };
</span><span class="cx"> 1A215BE711F27658008AD0F5 /* DocumentOpenInDestroyStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A215A7511F26072008AD0F5 /* DocumentOpenInDestroyStream.cpp */; };
</span><span class="cx"> 1A24BAA9120734EE00FBB059 /* NPRuntimeObjectFromDestroyedPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A24BAA8120734EE00FBB059 /* NPRuntimeObjectFromDestroyedPlugin.cpp */; };
</span><del>- 1A2FB84E178C80930059FD96 /* DefaultPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A2FB84C178C80920059FD96 /* DefaultPolicyDelegate.h */; };
</del><span class="cx"> 1A2FB84F178C80930059FD96 /* DefaultPolicyDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A2FB84D178C80930059FD96 /* DefaultPolicyDelegate.m */; };
</span><span class="cx"> 1A31EB3813466AC100017372 /* ConvertPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A31EB3713466AC100017372 /* ConvertPoint.cpp */; };
</span><span class="cx"> 1A3E28AA1311D73B00501349 /* GetURLWithJavaScriptURLDestroyingPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3E28A91311D73B00501349 /* GetURLWithJavaScriptURLDestroyingPlugin.cpp */; };
</span><span class="lines">@@ -57,7 +55,6 @@
</span><span class="cx"> 1AD9D2FE12028409001A70D1 /* PluginScriptableNPObjectInvokeDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD9D2FD12028409001A70D1 /* PluginScriptableNPObjectInvokeDefault.cpp */; };
</span><span class="cx"> 1AFF66BC137DEFD200791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFF66BB137DEA8300791696 /* GetURLNotifyWithURLThatFailsToLoad.cpp */; };
</span><span class="cx"> 23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BCB88F0EA57623003C6289 /* OpenGL.framework */; };
</span><del>- 29CFBA10122736E600BC30C0 /* AccessibilityTextMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CFBA0E122736E600BC30C0 /* AccessibilityTextMarker.h */; };
</del><span class="cx"> 29CFBA11122736E600BC30C0 /* AccessibilityTextMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CFBA0F122736E600BC30C0 /* AccessibilityTextMarker.cpp */; };
</span><span class="cx"> 29CFBA2E12273A1000BC30C0 /* AccessibilityTextMarkerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CFBA2D12273A1000BC30C0 /* AccessibilityTextMarkerMac.mm */; };
</span><span class="cx"> 2CE88FA217124D8C00734FC0 /* JavaScriptThreading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE88FA117124CEE00734FC0 /* JavaScriptThreading.cpp */; };
</span><span class="lines">@@ -65,14 +62,10 @@
</span><span class="cx"> 2D403F06150871F9005358D2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
</span><span class="cx"> 2D403F08150871F9005358D2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BCB88F0EA57623003C6289 /* OpenGL.framework */; };
</span><span class="cx"> 2D403F1B15087209005358D2 /* LayoutTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D403EA215087142005358D2 /* LayoutTestHelper.m */; };
</span><del>- 31117B3C15D9A56A00163BC8 /* MockWebNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 31117B3A15D9A56A00163BC8 /* MockWebNotificationProvider.h */; };
</del><span class="cx"> 31117B3D15D9A56A00163BC8 /* MockWebNotificationProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31117B3B15D9A56A00163BC8 /* MockWebNotificationProvider.mm */; };
</span><span class="cx"> 3A5626CB131CA02A002BE6D9 /* StorageTrackerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3A5626C1131C8B17002BE6D9 /* StorageTrackerDelegate.mm */; };
</span><del>- 3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3A5626C0131C8B17002BE6D9 /* StorageTrackerDelegate.h */; };
- 417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 417DAA1C137B3E24007C57FB /* WebCoreTestSupport.h */; };
</del><span class="cx"> 440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 440590701268453800CFD48D /* WebArchiveDumpSupportMac.mm */; };
</span><span class="cx"> 4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44A997830FCDE86400580F10 /* WebArchiveDumpSupport.cpp */; };
</span><del>- 4437730F125CBC4D00AAE02C /* WebArchiveDumpSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A997820FCDE86400580F10 /* WebArchiveDumpSupport.h */; };
</del><span class="cx"> 4AD6A11413C8124000EA9737 /* FormValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD6A11313C8124000EA9737 /* FormValue.cpp */; };
</span><span class="cx"> 5106803E15CC7B10001A8A23 /* SlowNPPNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5106803D15CC7B10001A8A23 /* SlowNPPNew.cpp */; };
</span><span class="cx"> 51134C9916014FDC001AA513 /* InvokeDestroysPluginWithinNPP_New.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51134C9816014FDB001AA513 /* InvokeDestroysPluginWithinNPP_New.cpp */; };
</span><span class="lines">@@ -80,10 +73,8 @@
</span><span class="cx"> 515C0CD015EE785700F5A613 /* LogNPPSetWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515C0CCF15EE785700F5A613 /* LogNPPSetWindow.cpp */; };
</span><span class="cx"> 515F429C15C07872007C8F90 /* PluginScriptableObjectOverridesAllProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515F429B15C07872007C8F90 /* PluginScriptableObjectOverridesAllProperties.cpp */; };
</span><span class="cx"> 5185F6B210714E07007AA393 /* HistoryDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5185F69F10714A57007AA393 /* HistoryDelegate.mm */; };
</span><del>- 5185F6B310714E12007AA393 /* HistoryDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5185F69E10714A57007AA393 /* HistoryDelegate.h */; };
</del><span class="cx"> 51CACBD815D96FD000EB53A2 /* EvaluateJSWithinNPP_New.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51CACBD715D96FD000EB53A2 /* EvaluateJSWithinNPP_New.cpp */; };
</span><span class="cx"> 53CBB832134E42F3001CE6A4 /* CyclicRedundancyCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53CBB830134E42F3001CE6A4 /* CyclicRedundancyCheck.cpp */; };
</span><del>- 53CBB833134E42F3001CE6A4 /* CyclicRedundancyCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 53CBB831134E42F3001CE6A4 /* CyclicRedundancyCheck.h */; };
</del><span class="cx"> 5DB9AC970F722C3600684641 /* AHEM____.TTF in Copy Font Files */ = {isa = PBXBuildFile; fileRef = AA7F10C20CB3C1030003BDC9 /* AHEM____.TTF */; };
</span><span class="cx"> 5DB9AC980F722C3600684641 /* WebKitWeightWatcher100.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09710DAC3CB600C8B4E5 /* WebKitWeightWatcher100.ttf */; };
</span><span class="cx"> 5DB9AC990F722C3600684641 /* WebKitWeightWatcher200.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09720DAC3CB600C8B4E5 /* WebKitWeightWatcher200.ttf */; };
</span><span class="lines">@@ -95,23 +86,20 @@
</span><span class="cx"> 5DB9AC9F0F722C3600684641 /* WebKitWeightWatcher800.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09780DAC3CB600C8B4E5 /* WebKitWeightWatcher800.ttf */; };
</span><span class="cx"> 5DB9ACA00F722C3600684641 /* WebKitWeightWatcher900.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09790DAC3CB600C8B4E5 /* WebKitWeightWatcher900.ttf */; };
</span><span class="cx"> 5DE8AE4413A2C15900D6A37D /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DE8AE4313A2C15800D6A37D /* libWebCoreTestSupport.dylib */; };
</span><del>- 80045AED147718E7008290A8 /* AccessibilityNotificationHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 80045AEB147718E7008290A8 /* AccessibilityNotificationHandler.h */; };
</del><span class="cx"> 80045AEE147718E7008290A8 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 80045AEC147718E7008290A8 /* AccessibilityNotificationHandler.mm */; };
</span><span class="cx"> 8465E2C70FFA8DF2003B8342 /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */; };
</span><span class="cx"> 8CCDA82A151A72D10003F937 /* SampleFont.sfont in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 8CCDA81F151A56550003F937 /* SampleFont.sfont */; };
</span><del>- 9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */; };
</del><span class="cx"> 9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
</span><span class="cx"> 9830F31F15C81181005AB206 /* DumpRenderTreeCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9830F31E15C81181005AB206 /* DumpRenderTreeCommon.cpp */; };
</span><ins>+ A1321CD4188F9E7A00125434 /* libDumpRenderTree.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A1321C9E188F9A3600125434 /* libDumpRenderTree.a */; };
+ A134E531188FC27000901D06 /* DumpRenderTreeMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = A134E52F188FC27000901D06 /* DumpRenderTreeMain.mm */; };
+ A134E53618905EFF00901D06 /* AccessibilityCommonMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0E26140E2DA4C6001B6BC3 /* AccessibilityCommonMac.mm */; };
</ins><span class="cx"> A817090008B163EF00CCB9FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
</span><span class="cx"> A817090408B164D300CCB9FB /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A817090308B164D300CCB9FB /* JavaScriptCore.framework */; };
</span><span class="cx"> A84F608A08B136DA00E9745F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
</span><span class="cx"> A8B91ADA0CF3B32F008F91FF /* DumpRenderTreePasteboard.m in Sources */ = {isa = PBXBuildFile; fileRef = A8B91AD70CF3B32F008F91FF /* DumpRenderTreePasteboard.m */; };
</span><span class="cx"> A8B91ADC0CF3B32F008F91FF /* DumpRenderTreeWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8B91AD90CF3B32F008F91FF /* DumpRenderTreeWindow.mm */; };
</span><del>- A8B91AE00CF3B372008F91FF /* DumpRenderTreeWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A8B91ADD0CF3B372008F91FF /* DumpRenderTreeWindow.h */; };
- A8B91AE20CF3B372008F91FF /* DumpRenderTreePasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = A8B91ADF0CF3B372008F91FF /* DumpRenderTreePasteboard.h */; };
</del><span class="cx"> A8B91BFD0CF522B4008F91FF /* CheckedMalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8B91BF70CF522B4008F91FF /* CheckedMalloc.cpp */; };
</span><del>- A8B91BFF0CF522B4008F91FF /* CheckedMalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = A8B91BF90CF522B4008F91FF /* CheckedMalloc.h */; };
- A8D79CEA0FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A8D79CE80FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.h */; };
</del><span class="cx"> A8D79CEB0FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.m in Sources */ = {isa = PBXBuildFile; fileRef = A8D79CE90FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.m */; };
</span><span class="cx"> AA5A15EF16E15CD000F7C561 /* AccessibilityControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = AA5A15ED16E15CD000F7C561 /* AccessibilityControllerIOS.mm */; };
</span><span class="cx"> AA5A15F016E15CD000F7C561 /* AccessibilityUIElementIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = AA5A15EE16E15CD000F7C561 /* AccessibilityUIElementIOS.mm */; };
</span><span class="lines">@@ -119,49 +107,27 @@
</span><span class="cx"> AE8259F408D22463000507AB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
</span><span class="cx"> B5A752A208AF5D1F00138E45 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A752A108AF5D1F00138E45 /* QuartzCore.framework */; };
</span><span class="cx"> BC0131DA0C9772010087317D /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0131D80C9772010087317D /* TestRunner.cpp */; };
</span><del>- BC0131DB0C9772010087317D /* TestRunner.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0131D90C9772010087317D /* TestRunner.h */; };
- BC0E24E00E2D9451001B6BC2 /* AccessibilityUIElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0E24DE0E2D9451001B6BC2 /* AccessibilityUIElement.h */; };
</del><span class="cx"> BC0E24E10E2D9451001B6BC2 /* AccessibilityUIElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0E24DF0E2D9451001B6BC2 /* AccessibilityUIElement.cpp */; };
</span><span class="cx"> BC0E26150E2DA4C6001B6BC2 /* AccessibilityUIElementMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0E26140E2DA4C6001B6BC2 /* AccessibilityUIElementMac.mm */; };
</span><del>- BC0E26150E2DA4C6001B6BC3 /* AccessibilityCommonMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0E26140E2DA4C6001B6BC3 /* AccessibilityCommonMac.mm */; };
- BC47412A0D038A4C0072B006 /* JavaScriptThreading.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4741290D038A4C0072B006 /* JavaScriptThreading.h */; };
</del><span class="cx"> BC9D90240C97472E0099A4A3 /* WorkQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9D90210C97472D0099A4A3 /* WorkQueue.cpp */; };
</span><del>- BC9D90250C97472E0099A4A3 /* WorkQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9D90220C97472E0099A4A3 /* WorkQueue.h */; };
- BC9D90260C97472E0099A4A3 /* WorkQueueItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9D90230C97472E0099A4A3 /* WorkQueueItem.h */; };
</del><span class="cx"> BCA18B230C9B014B00114369 /* GCControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B210C9B014B00114369 /* GCControllerMac.mm */; };
</span><span class="cx"> BCA18B240C9B014B00114369 /* TestRunnerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B220C9B014B00114369 /* TestRunnerMac.mm */; };
</span><span class="cx"> BCA18B260C9B015C00114369 /* WorkQueueItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B250C9B015C00114369 /* WorkQueueItemMac.mm */; };
</span><del>- BCA18B310C9B01B400114369 /* ObjCController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B2F0C9B01B400114369 /* ObjCController.h */; };
</del><span class="cx"> BCA18B320C9B01B400114369 /* ObjCController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B300C9B01B400114369 /* ObjCController.m */; };
</span><del>- BCA18B380C9B021900114369 /* AppleScriptController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B360C9B021900114369 /* AppleScriptController.h */; };
</del><span class="cx"> BCA18B390C9B021900114369 /* AppleScriptController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B370C9B021900114369 /* AppleScriptController.m */; };
</span><del>- BCA18B3C0C9B024900114369 /* TextInputController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B3A0C9B024900114369 /* TextInputController.h */; };
</del><span class="cx"> BCA18B490C9B02C400114369 /* TextInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B480C9B02C400114369 /* TextInputController.m */; };
</span><del>- BCA18B610C9B08C200114369 /* EditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B570C9B08C200114369 /* EditingDelegate.h */; };
</del><span class="cx"> BCA18B620C9B08C200114369 /* EditingDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B580C9B08C200114369 /* EditingDelegate.mm */; };
</span><del>- BCA18B630C9B08C200114369 /* FrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B590C9B08C200114369 /* FrameLoadDelegate.h */; };
</del><span class="cx"> BCA18B640C9B08C200114369 /* FrameLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B5A0C9B08C200114369 /* FrameLoadDelegate.mm */; };
</span><del>- BCA18B650C9B08C200114369 /* PolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B5B0C9B08C200114369 /* PolicyDelegate.h */; };
</del><span class="cx"> BCA18B660C9B08C200114369 /* PolicyDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B5C0C9B08C200114369 /* PolicyDelegate.mm */; };
</span><del>- BCA18B670C9B08C200114369 /* ResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B5D0C9B08C200114369 /* ResourceLoadDelegate.h */; };
</del><span class="cx"> BCA18B680C9B08C200114369 /* ResourceLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B5E0C9B08C200114369 /* ResourceLoadDelegate.mm */; };
</span><del>- BCA18B690C9B08C200114369 /* UIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B5F0C9B08C200114369 /* UIDelegate.h */; };
</del><span class="cx"> BCA18B6A0C9B08C200114369 /* UIDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B600C9B08C200114369 /* UIDelegate.mm */; };
</span><del>- BCA18B6F0C9B08DB00114369 /* EventSendingController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B6B0C9B08DB00114369 /* EventSendingController.h */; };
</del><span class="cx"> BCA18B700C9B08DB00114369 /* EventSendingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B6C0C9B08DB00114369 /* EventSendingController.mm */; };
</span><del>- BCA18B710C9B08DB00114369 /* NavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B6D0C9B08DB00114369 /* NavigationController.h */; };
</del><span class="cx"> BCA18B720C9B08DB00114369 /* NavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B6E0C9B08DB00114369 /* NavigationController.m */; };
</span><del>- BCA18B7A0C9B08F100114369 /* DumpRenderTreeDraggingInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B730C9B08F100114369 /* DumpRenderTreeDraggingInfo.h */; };
</del><span class="cx"> BCA18B7B0C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B740C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm */; };
</span><del>- BCA18B7D0C9B08F100114369 /* ObjCPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B760C9B08F100114369 /* ObjCPlugin.h */; };
</del><span class="cx"> BCA18B7E0C9B08F100114369 /* ObjCPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B770C9B08F100114369 /* ObjCPlugin.m */; };
</span><del>- BCA18B7F0C9B08F100114369 /* ObjCPluginFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B780C9B08F100114369 /* ObjCPluginFunction.h */; };
</del><span class="cx"> BCA18B800C9B08F100114369 /* ObjCPluginFunction.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B790C9B08F100114369 /* ObjCPluginFunction.m */; };
</span><del>- BCA18C0B0C9B59EF00114369 /* DumpRenderTreeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18C0A0C9B59EF00114369 /* DumpRenderTreeMac.h */; };
</del><span class="cx"> BCA18C470C9B5B9400114369 /* DumpRenderTree.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18C460C9B5B9400114369 /* DumpRenderTree.mm */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
</span><del>- BCB284C70CFA83C4007E533E /* PixelDumpSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB2848A0CFA820F007E533E /* PixelDumpSupport.h */; };
</del><span class="cx"> BCB284CD0CFA83C8007E533E /* PixelDumpSupportCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB284880CFA8202007E533E /* PixelDumpSupportCG.cpp */; };
</span><del>- BCB284D00CFA83CC007E533E /* PixelDumpSupportCG.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB284890CFA8202007E533E /* PixelDumpSupportCG.h */; };
</del><span class="cx"> BCB284D60CFA83D1007E533E /* PixelDumpSupportMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCB2848C0CFA8221007E533E /* PixelDumpSupportMac.mm */; };
</span><span class="cx"> BCB284F60CFA84F8007E533E /* ImageDiffCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB284F30CFA84F2007E533E /* ImageDiffCG.cpp */; };
</span><span class="cx"> BCD08B3A0E1057EF00A7D0C1 /* AccessibilityController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD08B390E1057EF00A7D0C1 /* AccessibilityController.cpp */; };
</span><span class="lines">@@ -172,7 +138,6 @@
</span><span class="cx"> C0E720751281C828004EF533 /* EvaluateJSAfterRemovingPluginElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E720741281C828004EF533 /* EvaluateJSAfterRemovingPluginElement.cpp */; };
</span><span class="cx"> C0EC3C9C12787F0500939164 /* NullNPPGetValuePointer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0EC3C9B12787F0500939164 /* NullNPPGetValuePointer.cpp */; };
</span><span class="cx"> E1B7816511AF31B7007E1BC2 /* MockGeolocationProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B7808711AF1669007E1BC2 /* MockGeolocationProvider.mm */; };
</span><del>- E1B7816711AF31C3007E1BC2 /* MockGeolocationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B7808511AF1643007E1BC2 /* MockGeolocationProvider.h */; };
</del><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXContainerItemProxy section */
</span><span class="lines">@@ -190,20 +155,27 @@
</span><span class="cx"> remoteGlobalIDString = 2D403EB2150871F9005358D2;
</span><span class="cx"> remoteInfo = LayoutTestHelper;
</span><span class="cx"> };
</span><del>- A84F608E08B1370E00E9745F /* PBXContainerItemProxy */ = {
</del><ins>+ A1321CD7188FABE000125434 /* PBXContainerItemProxy */ = {
</ins><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="cx"> proxyType = 1;
</span><del>- remoteGlobalIDString = B5A7525A08AF4A4A00138E45;
- remoteInfo = ImageDiff;
</del><ins>+ remoteGlobalIDString = A1321C9D188F9A3600125434;
+ remoteInfo = "DumpRenderTree (Library)";
</ins><span class="cx"> };
</span><del>- A84F609008B1370E00E9745F /* PBXContainerItemProxy */ = {
</del><ins>+ A134E52C188FC09200901D06 /* PBXContainerItemProxy */ = {
</ins><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="cx"> proxyType = 1;
</span><span class="cx"> remoteGlobalIDString = 9340994A08540CAE007F3BC8;
</span><span class="cx"> remoteInfo = DumpRenderTree;
</span><span class="cx"> };
</span><ins>+ A84F608E08B1370E00E9745F /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = B5A7525A08AF4A4A00138E45;
+ remoteInfo = ImageDiff;
+ };
</ins><span class="cx"> /* End PBXContainerItemProxy section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXCopyFilesBuildPhase section */
</span><span class="lines">@@ -304,6 +276,12 @@
</span><span class="cx"> 9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 9830F31E15C81181005AB206 /* DumpRenderTreeCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DumpRenderTreeCommon.cpp; sourceTree = "<group>"; };
</span><ins>+ A1321C9E188F9A3600125434 /* libDumpRenderTree.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDumpRenderTree.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ A134E52F188FC27000901D06 /* DumpRenderTreeMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DumpRenderTreeMain.mm; path = mac/DumpRenderTreeMain.mm; sourceTree = "<group>"; };
+ A134E53418905E6C00901D06 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+ A134E53718905F4C00901D06 /* AccessibilityCommonMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AccessibilityCommonMac.h; path = mac/AccessibilityCommonMac.h; sourceTree = "<group>"; };
+ A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = DumpRenderTreeLibrary.xcconfig; path = mac/Configurations/DumpRenderTreeLibrary.xcconfig; sourceTree = "<group>"; };
+ A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = BaseTarget.xcconfig; path = mac/Configurations/BaseTarget.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> A803FF7409CAAD08009B2A37 /* DumpRenderTree.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DumpRenderTree.h; sourceTree = "<group>"; };
</span><span class="cx"> A817090308B164D300CCB9FB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> A84F608908B136DA00E9745F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
</span><span class="lines">@@ -413,6 +391,7 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ A1321CD4188F9E7A00125434 /* libDumpRenderTree.a in Frameworks */,
</ins><span class="cx"> AE8259F308D22463000507AB /* Carbon.framework in Frameworks */,
</span><span class="cx"> A84F608A08B136DA00E9745F /* Cocoa.framework in Frameworks */,
</span><span class="cx"> A817090408B164D300CCB9FB /* JavaScriptCore.framework in Frameworks */,
</span><span class="lines">@@ -438,6 +417,7 @@
</span><span class="cx"> 08FB7794FE84155DC02AAC07 /* DumpRenderTree */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ A134E53418905E6C00901D06 /* config.h */,
</ins><span class="cx"> 1A2FB84C178C80920059FD96 /* DefaultPolicyDelegate.h */,
</span><span class="cx"> 1A2FB84D178C80930059FD96 /* DefaultPolicyDelegate.m */,
</span><span class="cx"> 9830F31E15C81181005AB206 /* DumpRenderTreeCommon.cpp */,
</span><span class="lines">@@ -447,6 +427,7 @@
</span><span class="cx"> BCB284870CFA81ED007E533E /* PixelDump */,
</span><span class="cx"> A803FF7409CAAD08009B2A37 /* DumpRenderTree.h */,
</span><span class="cx"> BCA18C460C9B5B9400114369 /* DumpRenderTree.mm */,
</span><ins>+ A134E52F188FC27000901D06 /* DumpRenderTreeMain.mm */,
</ins><span class="cx"> A8B91BF70CF522B4008F91FF /* CheckedMalloc.cpp */,
</span><span class="cx"> A8B91BF90CF522B4008F91FF /* CheckedMalloc.h */,
</span><span class="cx"> BC4741290D038A4C0072B006 /* JavaScriptThreading.h */,
</span><span class="lines">@@ -495,6 +476,7 @@
</span><span class="cx"> 1422A2690AF6F45200E1A883 /* Controllers */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ A134E53718905F4C00901D06 /* AccessibilityCommonMac.h */,
</ins><span class="cx"> BC0E26140E2DA4C6001B6BC3 /* AccessibilityCommonMac.mm */,
</span><span class="cx"> BCD08B390E1057EF00A7D0C1 /* AccessibilityController.cpp */,
</span><span class="cx"> BCD08A580E10496B00A7D0C1 /* AccessibilityController.h */,
</span><span class="lines">@@ -619,6 +601,7 @@
</span><span class="cx"> B5A7526708AF4A4A00138E45 /* ImageDiff */,
</span><span class="cx"> 2D403F19150871F9005358D2 /* LayoutTestHelper */,
</span><span class="cx"> 141BF233096A44CF00E0753C /* TestNetscapePlugIn.plugin */,
</span><ins>+ A1321C9E188F9A3600125434 /* libDumpRenderTree.a */,
</ins><span class="cx"> );
</span><span class="cx"> name = Products;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -684,8 +667,10 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> BCB281EE0CFA713D007E533E /* Base.xcconfig */,
</span><ins>+ A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */,
</ins><span class="cx"> BCB282F40CFA7450007E533E /* DebugRelease.xcconfig */,
</span><span class="cx"> BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */,
</span><ins>+ A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */,
</ins><span class="cx"> BCB283D80CFA7AFD007E533E /* ImageDiff.xcconfig */,
</span><span class="cx"> BCB283DE0CFA7C20007E533E /* TestNetscapePlugIn.xcconfig */,
</span><span class="cx"> );
</span><span class="lines">@@ -720,50 +705,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- 9340994B08540CAE007F3BC8 /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 80045AED147718E7008290A8 /* AccessibilityNotificationHandler.h in Headers */,
- 29CFBA10122736E600BC30C0 /* AccessibilityTextMarker.h in Headers */,
- BC0E24E00E2D9451001B6BC2 /* AccessibilityUIElement.h in Headers */,
- BCA18B380C9B021900114369 /* AppleScriptController.h in Headers */,
- A8B91BFF0CF522B4008F91FF /* CheckedMalloc.h in Headers */,
- 53CBB833134E42F3001CE6A4 /* CyclicRedundancyCheck.h in Headers */,
- BCA18B7A0C9B08F100114369 /* DumpRenderTreeDraggingInfo.h in Headers */,
- A8D79CEA0FC28B2C004AC8FE /* DumpRenderTreeFileDraggingSource.h in Headers */,
- BCA18C0B0C9B59EF00114369 /* DumpRenderTreeMac.h in Headers */,
- A8B91AE20CF3B372008F91FF /* DumpRenderTreePasteboard.h in Headers */,
- 9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */,
- A8B91AE00CF3B372008F91FF /* DumpRenderTreeWindow.h in Headers */,
- BCA18B610C9B08C200114369 /* EditingDelegate.h in Headers */,
- BCA18B6F0C9B08DB00114369 /* EventSendingController.h in Headers */,
- BCA18B630C9B08C200114369 /* FrameLoadDelegate.h in Headers */,
- 14770FE20A22ADF7009342EE /* GCController.h in Headers */,
- 5185F6B310714E12007AA393 /* HistoryDelegate.h in Headers */,
- BC47412A0D038A4C0072B006 /* JavaScriptThreading.h in Headers */,
- E1B7816711AF31C3007E1BC2 /* MockGeolocationProvider.h in Headers */,
- 31117B3C15D9A56A00163BC8 /* MockWebNotificationProvider.h in Headers */,
- BCA18B710C9B08DB00114369 /* NavigationController.h in Headers */,
- BCA18B310C9B01B400114369 /* ObjCController.h in Headers */,
- BCA18B7D0C9B08F100114369 /* ObjCPlugin.h in Headers */,
- BCA18B7F0C9B08F100114369 /* ObjCPluginFunction.h in Headers */,
- BCB284C70CFA83C4007E533E /* PixelDumpSupport.h in Headers */,
- BCB284D00CFA83CC007E533E /* PixelDumpSupportCG.h in Headers */,
- BCA18B650C9B08C200114369 /* PolicyDelegate.h in Headers */,
- 1A2FB84E178C80930059FD96 /* DefaultPolicyDelegate.h in Headers */,
- BCA18B670C9B08C200114369 /* ResourceLoadDelegate.h in Headers */,
- 3A5626CC131CA036002BE6D9 /* StorageTrackerDelegate.h in Headers */,
- BC0131DB0C9772010087317D /* TestRunner.h in Headers */,
- BCA18B3C0C9B024900114369 /* TextInputController.h in Headers */,
- BCA18B690C9B08C200114369 /* UIDelegate.h in Headers */,
- 4437730F125CBC4D00AAE02C /* WebArchiveDumpSupport.h in Headers */,
- 417DAA1D137B3E24007C57FB /* WebCoreTestSupport.h in Headers */,
- BC9D90250C97472E0099A4A3 /* WorkQueue.h in Headers */,
- BC9D90260C97472E0099A4A3 /* WorkQueueItem.h in Headers */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> B5A7525B08AF4A4A00138E45 /* Headers */ = {
</span><span class="cx"> isa = PBXHeadersBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -813,14 +754,14 @@
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = 149C29BF08902C6D008A9EFC /* Build configuration list for PBXNativeTarget "DumpRenderTree" */;
</span><span class="cx"> buildPhases = (
</span><del>- 9340994B08540CAE007F3BC8 /* Headers */,
- 9340994D08540CAE007F3BC8 /* Sources */,
</del><ins>+ A134E52E188FC0DB00901D06 /* Sources */,
</ins><span class="cx"> 9340994F08540CAE007F3BC8 /* Frameworks */,
</span><span class="cx"> 5DB9ACAA0F722C4400684641 /* Copy Font Files */,
</span><span class="cx"> );
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><ins>+ A1321CD8188FABE000125434 /* PBXTargetDependency */,
</ins><span class="cx"> );
</span><span class="cx"> name = DumpRenderTree;
</span><span class="cx"> productInstallPath = "$(HOME)/bin";
</span><span class="lines">@@ -828,6 +769,21 @@
</span><span class="cx"> productReference = 9340995408540CAF007F3BC8 /* DumpRenderTree */;
</span><span class="cx"> productType = "com.apple.product-type.tool";
</span><span class="cx"> };
</span><ins>+ A1321C9D188F9A3600125434 /* DumpRenderTree (Library) */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = A1321C9F188F9A3600125434 /* Build configuration list for PBXNativeTarget "DumpRenderTree (Library)" */;
+ buildPhases = (
+ 9340994D08540CAE007F3BC8 /* Sources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "DumpRenderTree (Library)";
+ productName = DumpRenderTree;
+ productReference = A1321C9E188F9A3600125434 /* libDumpRenderTree.a */;
+ productType = "com.apple.product-type.library.static";
+ };
</ins><span class="cx"> B5A7525A08AF4A4A00138E45 /* ImageDiff */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = B5A7526408AF4A4A00138E45 /* Build configuration list for PBXNativeTarget "ImageDiff" */;
</span><span class="lines">@@ -854,7 +810,7 @@
</span><span class="cx"> attributes = {
</span><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 149C29C308902C6D008A9EFC /* Build configuration list for PBXProject "DumpRenderTree" */;
</span><del>- compatibilityVersion = "Xcode 2.4";
</del><ins>+ compatibilityVersion = "Xcode 3.2";
</ins><span class="cx"> developmentRegion = English;
</span><span class="cx"> hasScannedForEncodings = 1;
</span><span class="cx"> knownRegions = (
</span><span class="lines">@@ -869,6 +825,7 @@
</span><span class="cx"> projectRoot = "";
</span><span class="cx"> targets = (
</span><span class="cx"> A84F608D08B1370600E9745F /* All */,
</span><ins>+ A1321C9D188F9A3600125434 /* DumpRenderTree (Library) */,
</ins><span class="cx"> 9340994A08540CAE007F3BC8 /* DumpRenderTree */,
</span><span class="cx"> B5A7525A08AF4A4A00138E45 /* ImageDiff */,
</span><span class="cx"> 141BF21E096A441D00E0753C /* TestNetscapePlugIn */,
</span><span class="lines">@@ -938,17 +895,20 @@
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- BC0E26150E2DA4C6001B6BC3 /* AccessibilityCommonMac.mm in Sources */,
</del><span class="cx"> BCD08B3A0E1057EF00A7D0C1 /* AccessibilityController.cpp in Sources */,
</span><ins>+ AA5A15EF16E15CD000F7C561 /* AccessibilityControllerIOS.mm in Sources */,
</ins><span class="cx"> BCD08B710E1059D200A7D0C1 /* AccessibilityControllerMac.mm in Sources */,
</span><span class="cx"> 80045AEE147718E7008290A8 /* AccessibilityNotificationHandler.mm in Sources */,
</span><span class="cx"> 29CFBA11122736E600BC30C0 /* AccessibilityTextMarker.cpp in Sources */,
</span><span class="cx"> 29CFBA2E12273A1000BC30C0 /* AccessibilityTextMarkerMac.mm in Sources */,
</span><span class="cx"> BC0E24E10E2D9451001B6BC2 /* AccessibilityUIElement.cpp in Sources */,
</span><ins>+ AA5A15F016E15CD000F7C561 /* AccessibilityUIElementIOS.mm in Sources */,
+ A134E53618905EFF00901D06 /* AccessibilityCommonMac.mm in Sources */,
</ins><span class="cx"> BC0E26150E2DA4C6001B6BC2 /* AccessibilityUIElementMac.mm in Sources */,
</span><span class="cx"> BCA18B390C9B021900114369 /* AppleScriptController.m in Sources */,
</span><span class="cx"> A8B91BFD0CF522B4008F91FF /* CheckedMalloc.cpp in Sources */,
</span><span class="cx"> 53CBB832134E42F3001CE6A4 /* CyclicRedundancyCheck.cpp in Sources */,
</span><ins>+ 1A2FB84F178C80930059FD96 /* DefaultPolicyDelegate.m in Sources */,
</ins><span class="cx"> BCA18C470C9B5B9400114369 /* DumpRenderTree.mm in Sources */,
</span><span class="cx"> 9830F31F15C81181005AB206 /* DumpRenderTreeCommon.cpp in Sources */,
</span><span class="cx"> BCA18B7B0C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm in Sources */,
</span><span class="lines">@@ -960,7 +920,6 @@
</span><span class="cx"> BCA18B640C9B08C200114369 /* FrameLoadDelegate.mm in Sources */,
</span><span class="cx"> BCF6C6500C98E9C000AC063E /* GCController.cpp in Sources */,
</span><span class="cx"> BCA18B230C9B014B00114369 /* GCControllerMac.mm in Sources */,
</span><del>- AA5A15EF16E15CD000F7C561 /* AccessibilityControllerIOS.mm in Sources */,
</del><span class="cx"> 5185F6B210714E07007AA393 /* HistoryDelegate.mm in Sources */,
</span><span class="cx"> 2CE88FA217124D8C00734FC0 /* JavaScriptThreading.cpp in Sources */,
</span><span class="cx"> E1B7816511AF31B7007E1BC2 /* MockGeolocationProvider.mm in Sources */,
</span><span class="lines">@@ -973,13 +932,11 @@
</span><span class="cx"> BCB284CD0CFA83C8007E533E /* PixelDumpSupportCG.cpp in Sources */,
</span><span class="cx"> BCB284D60CFA83D1007E533E /* PixelDumpSupportMac.mm in Sources */,
</span><span class="cx"> BCA18B660C9B08C200114369 /* PolicyDelegate.mm in Sources */,
</span><del>- AA5A15F016E15CD000F7C561 /* AccessibilityUIElementIOS.mm in Sources */,
</del><span class="cx"> BCA18B680C9B08C200114369 /* ResourceLoadDelegate.mm in Sources */,
</span><span class="cx"> 3A5626CB131CA02A002BE6D9 /* StorageTrackerDelegate.mm in Sources */,
</span><span class="cx"> BC0131DA0C9772010087317D /* TestRunner.cpp in Sources */,
</span><span class="cx"> BCA18B240C9B014B00114369 /* TestRunnerMac.mm in Sources */,
</span><span class="cx"> BCA18B490C9B02C400114369 /* TextInputController.m in Sources */,
</span><del>- 1A2FB84F178C80930059FD96 /* DefaultPolicyDelegate.m in Sources */,
</del><span class="cx"> BCA18B6A0C9B08C200114369 /* UIDelegate.mm in Sources */,
</span><span class="cx"> 4437730E125CBC3600AAE02C /* WebArchiveDumpSupport.cpp in Sources */,
</span><span class="cx"> 440590711268453800CFD48D /* WebArchiveDumpSupportMac.mm in Sources */,
</span><span class="lines">@@ -988,6 +945,14 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ A134E52E188FC0DB00901D06 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A134E531188FC27000901D06 /* DumpRenderTreeMain.mm in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> B5A7525D08AF4A4A00138E45 /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -1009,16 +974,21 @@
</span><span class="cx"> target = 2D403EB2150871F9005358D2 /* LayoutTestHelper */;
</span><span class="cx"> targetProxy = 2D403F201508736C005358D2 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><ins>+ A1321CD8188FABE000125434 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = A1321C9D188F9A3600125434 /* DumpRenderTree (Library) */;
+ targetProxy = A1321CD7188FABE000125434 /* PBXContainerItemProxy */;
+ };
+ A134E52D188FC09200901D06 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 9340994A08540CAE007F3BC8 /* DumpRenderTree */;
+ targetProxy = A134E52C188FC09200901D06 /* PBXContainerItemProxy */;
+ };
</ins><span class="cx"> A84F608F08B1370E00E9745F /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = B5A7525A08AF4A4A00138E45 /* ImageDiff */;
</span><span class="cx"> targetProxy = A84F608E08B1370E00E9745F /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><del>- A84F609108B1370E00E9745F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 9340994A08540CAE007F3BC8 /* DumpRenderTree */;
- targetProxy = A84F609008B1370E00E9745F /* PBXContainerItemProxy */;
- };
</del><span class="cx"> /* End PBXTargetDependency section */
</span><span class="cx">
</span><span class="cx"> /* Begin XCBuildConfiguration section */
</span><span class="lines">@@ -1070,7 +1040,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2D403F16150871F9005358D2 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
</del><ins>+ baseConfigurationReference = A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> PRODUCT_NAME = LayoutTestHelper;
</span><span class="cx"> };
</span><span class="lines">@@ -1078,7 +1048,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2D403F17150871F9005358D2 /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
</del><ins>+ baseConfigurationReference = A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> PRODUCT_NAME = LayoutTestHelper;
</span><span class="cx"> };
</span><span class="lines">@@ -1086,7 +1056,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2D403F18150871F9005358D2 /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
</del><ins>+ baseConfigurationReference = A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
</span><span class="cx"> PRODUCT_NAME = LayoutTestHelper;
</span><span class="lines">@@ -1138,6 +1108,27 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><ins>+ A1321CA0188F9A3600125434 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ A1321CA1188F9A3600125434 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ A1321CA2188F9A3600125434 /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */;
+ buildSettings = {
+ };
+ name = Production;
+ };
</ins><span class="cx"> A84F609308B1371400E9745F /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><span class="lines">@@ -1231,6 +1222,16 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><ins>+ A1321C9F188F9A3600125434 /* Build configuration list for PBXNativeTarget "DumpRenderTree (Library)" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A1321CA0188F9A3600125434 /* Debug */,
+ A1321CA1188F9A3600125434 /* Release */,
+ A1321CA2188F9A3600125434 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
</ins><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="trunkToolsDumpRenderTreemacConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig (162572 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig 2014-01-23 00:38:29 UTC (rev 162572)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -23,3 +23,5 @@
</span><span class="cx">
</span><span class="cx"> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><ins>+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+GCC_PREFIX_HEADER = DumpRenderTreePrefix.h;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (162572 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-01-23 00:38:29 UTC (rev 162572)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)
</del><ins>+OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a;
</ins><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
</span><del>-PRODUCT_NAME = DumpRenderTree
-GCC_ENABLE_OBJC_EXCEPTIONS = YES
-GCC_PREFIX_HEADER = DumpRenderTreePrefix.h
</del><ins>+PRODUCT_NAME = DumpRenderTree;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig (0 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig (rev 0)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+//
+// Copyright (C) 2014 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+//
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = DumpRenderTree;
+SKIP_INSTALL = YES;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (162572 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-01-23 00:38:29 UTC (rev 162572)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -927,7 +927,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int main(int argc, const char *argv[])
</del><ins>+int DumpRenderTreeMain(int argc, const char *argv[])
</ins><span class="cx"> {
</span><span class="cx"> NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeMach"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h (162572 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2014-01-23 00:38:29 UTC (rev 162572)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -69,4 +69,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned worldIDForWorld(WebScriptWorld *);
</span><span class="cx">
</span><ins>+int DumpRenderTreeMain(int, const char *[]);
+
</ins><span class="cx"> #endif // DumpRenderTreeMac_h
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeMainmm"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm (0 => 162573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm (rev 0)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm 2014-01-23 01:11:06 UTC (rev 162573)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "DumpRenderTreeMac.h"
+
+int main(int argc, const char *argv[])
+{
+ return DumpRenderTreeMain(argc, argv);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>