<!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>[162817] 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/162817">162817</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-01-26 16:01:15 -0800 (Sun, 26 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Upstream changes in Tools/DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=127412
Reviewed by Simon Fraser.
Source/WebKit/mac:
* Misc/WebCoreStatistics.h: Included CGContext.h.
Tools:
Upstream all iOS changes. Added a new target called DumpRenderTree.app,
which builds the DumpRenderTree static library into an app bundle as
expected by the iOS Simulator.
* DumpRenderTree/AccessibilityTextMarker.h:
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
* DumpRenderTree/DumpRenderTreeFileDraggingSource.h:
* DumpRenderTree/DumpRenderTreePrefix.h:
* DumpRenderTree/PixelDumpSupport.cpp:
* DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
* DumpRenderTree/TestNetscapePlugIn/PluginObject.h:
* DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm:
* DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
* DumpRenderTree/TestNetscapePlugIn/PluginTest.h:
* DumpRenderTree/TestNetscapePlugIn/TestObject.cpp:
* DumpRenderTree/TestNetscapePlugIn/TestObject.h:
* DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeRemoveProperty.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/NullNPPGetValuePointer.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp:
* DumpRenderTree/TestNetscapePlugIn/Tests/PluginScriptableNPObjectInvokeDefault.cpp:
* DumpRenderTree/TestNetscapePlugIn/main.cpp:
* DumpRenderTree/TestRunner.cpp:
* DumpRenderTree/TestRunner.h:
* DumpRenderTree/cg/ImageDiffCG.cpp:
* DumpRenderTree/cg/PixelDumpSupportCG.cpp:
* DumpRenderTree/ios/AccessibilityControllerIOS.mm:
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
* DumpRenderTree/ios/DumpRenderTreeBrowserView.h: Added.
* DumpRenderTree/ios/DumpRenderTreeBrowserView.mm: Added.
* DumpRenderTree/ios/Info.plist: Added.
* DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport.c: Added.
* DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupportPregenerated.pm: Added.
* DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Changes: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/IPhoneSimulatorNotification.xs: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/MANIFEST: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Makefile.PL: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/README: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/ppport.h: Added.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/t/IPhoneSimulatorNotification.t: Added.
* DumpRenderTree/ios/PerlSupport/Makefile: Added.
* DumpRenderTree/ios/PixelDumpSupportIOS.mm: Added.
* DumpRenderTree/mac/AccessibilityNotificationHandler.mm:
* DumpRenderTree/mac/AccessibilityTextMarkerMac.mm:
* DumpRenderTree/mac/AppleScriptController.m:
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig: Added.
* DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig:
* DumpRenderTree/mac/Configurations/ImageDiff.xcconfig:
* DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig: Added.
* DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:
* DumpRenderTree/mac/DumpRenderTree.mm:
* DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h:
* DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
* DumpRenderTree/mac/DumpRenderTreeMac.h:
* DumpRenderTree/mac/DumpRenderTreePasteboard.h:
* DumpRenderTree/mac/DumpRenderTreePasteboard.m:
* DumpRenderTree/mac/DumpRenderTreeWindow.h:
* DumpRenderTree/mac/DumpRenderTreeWindow.mm:
* DumpRenderTree/mac/EditingDelegate.h:
* DumpRenderTree/mac/EventSendingController.h:
* DumpRenderTree/mac/EventSendingController.mm:
* DumpRenderTree/mac/FrameLoadDelegate.mm:
* DumpRenderTree/mac/HistoryDelegate.h:
* DumpRenderTree/mac/LayoutTestHelper.m:
* DumpRenderTree/mac/MockGeolocationProvider.mm:
* DumpRenderTree/mac/NavigationController.h:
* DumpRenderTree/mac/ObjCPlugin.h:
* DumpRenderTree/mac/ObjCPlugin.m:
* DumpRenderTree/mac/ObjCPluginFunction.h:
* DumpRenderTree/mac/PolicyDelegate.h:
* DumpRenderTree/mac/ResourceLoadDelegate.h:
* DumpRenderTree/mac/ResourceLoadDelegate.mm:
* DumpRenderTree/mac/TestRunnerMac.mm:
* DumpRenderTree/mac/TextInputController.h:
* DumpRenderTree/mac/TextInputController.m:
* DumpRenderTree/mac/UIDelegate.h:
* DumpRenderTree/mac/UIDelegate.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCoreStatisticsh">trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityTextMarkerh">trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementh">trunk/Tools/DumpRenderTree/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreeFileDraggingSourceh">trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreePrefixh">trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h</a></li>
<li><a href="#trunkToolsDumpRenderTreePixelDumpSupportcpp">trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInPluginObjecth">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInPluginObjectMacmm">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInTestObjectcpp">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInTestsGetUserAgentWithNullNPPFromNPPNewcpp">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInTestsNPRuntimeObjectFromDestroyedPlugincpp">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnerh">trunk/Tools/DumpRenderTree/TestRunner.h</a></li>
<li><a href="#trunkToolsDumpRenderTreecgImageDiffCGcpp">trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreecgPixelDumpSupportCGcpp">trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityControllerIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityNotificationHandlermm">trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityTextMarkerMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAppleScriptControllerm">trunk/Tools/DumpRenderTree/mac/AppleScriptController.m</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsBasexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsImageDiffxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsTestNetscapePlugInxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeDraggingInfoh">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeDraggingInfomm">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeMach">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreePasteboardh">trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreePasteboardm">trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.m</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeWindowh">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreeWindowmm">trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacEditingDelegateh">trunk/Tools/DumpRenderTree/mac/EditingDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacEventSendingControllerh">trunk/Tools/DumpRenderTree/mac/EventSendingController.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacEventSendingControllermm">trunk/Tools/DumpRenderTree/mac/EventSendingController.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacFrameLoadDelegatemm">trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacHistoryDelegateh">trunk/Tools/DumpRenderTree/mac/HistoryDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacLayoutTestHelperm">trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m</a></li>
<li><a href="#trunkToolsDumpRenderTreemacMockGeolocationProvidermm">trunk/Tools/DumpRenderTree/mac/MockGeolocationProvider.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacNavigationControllerh">trunk/Tools/DumpRenderTree/mac/NavigationController.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacObjCPluginh">trunk/Tools/DumpRenderTree/mac/ObjCPlugin.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacObjCPluginm">trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m</a></li>
<li><a href="#trunkToolsDumpRenderTreemacObjCPluginFunctionh">trunk/Tools/DumpRenderTree/mac/ObjCPluginFunction.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacPolicyDelegateh">trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacResourceLoadDelegateh">trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacResourceLoadDelegatemm">trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTextInputControllerh">trunk/Tools/DumpRenderTree/mac/TextInputController.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTextInputControllerm">trunk/Tools/DumpRenderTree/mac/TextInputController.m</a></li>
<li><a href="#trunkToolsDumpRenderTreemacUIDelegateh">trunk/Tools/DumpRenderTree/mac/UIDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacUIDelegatemm">trunk/Tools/DumpRenderTree/mac/UIDelegate.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewh">trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewmm">trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosInfoplist">trunk/Tools/DumpRenderTree/ios/Info.plist</a></li>
<li>trunk/Tools/DumpRenderTree/ios/PerlSupport/</li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportDumpRenderTreeSupportc">trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport.c</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportDumpRenderTreeSupportPregeneratedpm">trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupportPregenerated.pm</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportDumpRenderTreeSupport_wrapPregeneratedc">trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c</a></li>
<li>trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/</li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationChanges">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Changes</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationIPhoneSimulatorNotificationxs">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/IPhoneSimulatorNotification.xs</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationMANIFEST">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/MANIFEST</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationMakefilePL">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Makefile.PL</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationREADME">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/README</a></li>
<li>trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/</li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationlibIPhoneSimulatorNotificationpm">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationppporth">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/ppport.h</a></li>
<li>trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/t/</li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationtIPhoneSimulatorNotificationt">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/t/IPhoneSimulatorNotification.t</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportMakefile">trunk/Tools/DumpRenderTree/ios/PerlSupport/Makefile</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPixelDumpSupportIOSmm">trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeAppxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsLayoutTestHelperxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-24 Andy Estes <aestes@apple.com>
+
+ [iOS] Upstream changes in Tools/DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=127412
+
+ Reviewed by Simon Fraser.
+
+ * Misc/WebCoreStatistics.h: Included CGContext.h.
+
</ins><span class="cx"> 2014-01-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move history item visit count handling to WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCoreStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import <CoreGraphics/CGContext.h>
</ins><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-
</del><span class="cx"> #import <WebKit/WebFrame.h>
</span><span class="cx">
</span><span class="cx"> @class DOMElement;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/ChangeLog 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -1,3 +1,97 @@
</span><ins>+2014-01-24 Andy Estes <aestes@apple.com>
+
+ [iOS] Upstream changes in Tools/DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=127412
+
+ Reviewed by Simon Fraser.
+
+ Upstream all iOS changes. Added a new target called DumpRenderTree.app,
+ which builds the DumpRenderTree static library into an app bundle as
+ expected by the iOS Simulator.
+
+ * DumpRenderTree/AccessibilityTextMarker.h:
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/DumpRenderTreeFileDraggingSource.h:
+ * DumpRenderTree/DumpRenderTreePrefix.h:
+ * DumpRenderTree/PixelDumpSupport.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/PluginObject.h:
+ * DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm:
+ * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/PluginTest.h:
+ * DumpRenderTree/TestNetscapePlugIn/TestObject.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/TestObject.h:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeRemoveProperty.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/NullNPPGetValuePointer.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/Tests/PluginScriptableNPObjectInvokeDefault.cpp:
+ * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+ * DumpRenderTree/TestRunner.cpp:
+ * DumpRenderTree/TestRunner.h:
+ * DumpRenderTree/cg/ImageDiffCG.cpp:
+ * DumpRenderTree/cg/PixelDumpSupportCG.cpp:
+ * DumpRenderTree/ios/AccessibilityControllerIOS.mm:
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ * DumpRenderTree/ios/DumpRenderTreeBrowserView.h: Added.
+ * DumpRenderTree/ios/DumpRenderTreeBrowserView.mm: Added.
+ * DumpRenderTree/ios/Info.plist: Added.
+ * DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport.c: Added.
+ * DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupportPregenerated.pm: Added.
+ * DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Changes: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/IPhoneSimulatorNotification.xs: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/MANIFEST: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Makefile.PL: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/README: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/ppport.h: Added.
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/t/IPhoneSimulatorNotification.t: Added.
+ * DumpRenderTree/ios/PerlSupport/Makefile: Added.
+ * DumpRenderTree/ios/PixelDumpSupportIOS.mm: Added.
+ * DumpRenderTree/mac/AccessibilityNotificationHandler.mm:
+ * DumpRenderTree/mac/AccessibilityTextMarkerMac.mm:
+ * DumpRenderTree/mac/AppleScriptController.m:
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig: Added.
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig:
+ * DumpRenderTree/mac/Configurations/ImageDiff.xcconfig:
+ * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig: Added.
+ * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h:
+ * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
+ * DumpRenderTree/mac/DumpRenderTreeMac.h:
+ * DumpRenderTree/mac/DumpRenderTreePasteboard.h:
+ * DumpRenderTree/mac/DumpRenderTreePasteboard.m:
+ * DumpRenderTree/mac/DumpRenderTreeWindow.h:
+ * DumpRenderTree/mac/DumpRenderTreeWindow.mm:
+ * DumpRenderTree/mac/EditingDelegate.h:
+ * DumpRenderTree/mac/EventSendingController.h:
+ * DumpRenderTree/mac/EventSendingController.mm:
+ * DumpRenderTree/mac/FrameLoadDelegate.mm:
+ * DumpRenderTree/mac/HistoryDelegate.h:
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ * DumpRenderTree/mac/MockGeolocationProvider.mm:
+ * DumpRenderTree/mac/NavigationController.h:
+ * DumpRenderTree/mac/ObjCPlugin.h:
+ * DumpRenderTree/mac/ObjCPlugin.m:
+ * DumpRenderTree/mac/ObjCPluginFunction.h:
+ * DumpRenderTree/mac/PolicyDelegate.h:
+ * DumpRenderTree/mac/ResourceLoadDelegate.h:
+ * DumpRenderTree/mac/ResourceLoadDelegate.mm:
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ * DumpRenderTree/mac/TextInputController.h:
+ * DumpRenderTree/mac/TextInputController.m:
+ * DumpRenderTree/mac/UIDelegate.h:
+ * DumpRenderTree/mac/UIDelegate.mm:
+
</ins><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Call deprecatedCharacters instead of characters at more call sites
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityTextMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JSObjectRef.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> #define SUPPORTS_AX_TEXTMARKERS 1
</span><span class="cx"> #else
</span><span class="cx"> #define SUPPORTS_AX_TEXTMARKERS 0
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static JSClassRef getJSClass();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if SUPPORTS_AX_TEXTMARKERS
</ins><span class="cx"> RetainPtr<PlatformTextMarker> m_textMarker;
</span><span class="cx"> #else
</span><span class="cx"> PlatformTextMarker m_textMarker;
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static JSClassRef getJSClass();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if SUPPORTS_AX_TEXTMARKERS
</ins><span class="cx"> RetainPtr<PlatformTextMarkerRange> m_textMarkerRange;
</span><span class="cx"> #else
</span><span class="cx"> PlatformTextMarkerRange m_textMarkerRange;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -287,8 +287,10 @@
</span><span class="cx"> static JSClassRef getJSClass();
</span><span class="cx"> PlatformUIElement m_element;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ JSObjectRef m_notificationFunctionCallback;
+#elif PLATFORM(MAC)
</ins><span class="cx"> // A retained, platform specific object used to help manage notifications for this object.
</span><del>-#if PLATFORM(MAC)
</del><span class="cx"> NotificationHandler m_notificationHandler;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> buildPhases = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><ins>+ A1158D6818927B240088C17B /* PBXTargetDependency */,
</ins><span class="cx"> 2D403F211508736C005358D2 /* PBXTargetDependency */,
</span><span class="cx"> A134E52D188FC09200901D06 /* PBXTargetDependency */,
</span><span class="cx"> A84F608F08B1370E00E9745F /* PBXTargetDependency */,
</span><span class="lines">@@ -43,7 +44,6 @@
</span><span class="cx"> 1A4CCD4F171375A300981040 /* ToStringAndValueOfObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4CCD4E171375A300981040 /* ToStringAndValueOfObject.cpp */; };
</span><span class="cx"> 1A5CC1F5137DD2EC00A5D7E7 /* GetURLWithJavaScriptURL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5CC1F3137DD2EC00A5D7E7 /* GetURLWithJavaScriptURL.cpp */; };
</span><span class="cx"> 1A66C35114576A920099A115 /* ContentsScaleFactor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A66C34F14576A920099A115 /* ContentsScaleFactor.cpp */; };
</span><del>- 1A7961071803454C00FE42CD /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A7961061803454C00FE42CD /* IOKit.framework */; };
</del><span class="cx"> 1A8F02E80BB9B4EC008CFA34 /* TestObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8F024C0BB9B056008CFA34 /* TestObject.h */; };
</span><span class="cx"> 1AC6C8490D07638600CD3161 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC6C77F0D07589B00CD3161 /* main.cpp */; };
</span><span class="cx"> 1AC6C84A0D07638600CD3161 /* PluginObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC6C7800D07589B00CD3161 /* PluginObject.cpp */; };
</span><span class="lines">@@ -54,13 +54,9 @@
</span><span class="cx"> 1AD8683F163B2FD000A28583 /* NPRuntimeCallsWithNullNPP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD8683D163B2FD000A28583 /* NPRuntimeCallsWithNullNPP.cpp */; };
</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><del>- 23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BCB88F0EA57623003C6289 /* OpenGL.framework */; };
</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><del>- 2D403F05150871F9005358D2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
- 2D403F06150871F9005358D2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
- 2D403F08150871F9005358D2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23BCB88F0EA57623003C6289 /* OpenGL.framework */; };
</del><span class="cx"> 2D403F1B15087209005358D2 /* LayoutTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D403EA215087142005358D2 /* LayoutTestHelper.m */; };
</span><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><span class="lines">@@ -85,27 +81,21 @@
</span><span class="cx"> 5DB9AC9E0F722C3600684641 /* WebKitWeightWatcher700.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = 375F09770DAC3CB600C8B4E5 /* WebKitWeightWatcher700.ttf */; };
</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><del>- 5DE8AE4413A2C15900D6A37D /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DE8AE4313A2C15800D6A37D /* libWebCoreTestSupport.dylib */; };
</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>- 9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
</del><span class="cx"> 9830F31F15C81181005AB206 /* DumpRenderTreeCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9830F31E15C81181005AB206 /* DumpRenderTreeCommon.cpp */; };
</span><del>- A1321CD4188F9E7A00125434 /* libDumpRenderTree.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A1321C9E188F9A3600125434 /* libDumpRenderTree.a */; };
</del><ins>+ A1158D581892740C0088C17B /* DumpRenderTreeBrowserView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1158D56189273EB0088C17B /* DumpRenderTreeBrowserView.mm */; };
+ A1158D59189274360088C17B /* PixelDumpSupportIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = A1158D57189273EB0088C17B /* PixelDumpSupportIOS.mm */; };
</ins><span class="cx"> A134E531188FC27000901D06 /* DumpRenderTreeMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = A134E52F188FC27000901D06 /* DumpRenderTreeMain.mm */; };
</span><span class="cx"> A134E53618905EFF00901D06 /* AccessibilityCommonMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0E26140E2DA4C6001B6BC3 /* AccessibilityCommonMac.mm */; };
</span><del>- A817090008B163EF00CCB9FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
- A817090408B164D300CCB9FB /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A817090308B164D300CCB9FB /* JavaScriptCore.framework */; };
- A84F608A08B136DA00E9745F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
</del><ins>+ A19318001892886B001C52B1 /* DumpRenderTreeMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = A134E52F188FC27000901D06 /* DumpRenderTreeMain.mm */; };
</ins><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><span class="cx"> A8B91BFD0CF522B4008F91FF /* CheckedMalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8B91BF70CF522B4008F91FF /* CheckedMalloc.cpp */; };
</span><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><del>- AE8259F308D22463000507AB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
- AE8259F408D22463000507AB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
- B5A752A208AF5D1F00138E45 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A752A108AF5D1F00138E45 /* QuartzCore.framework */; };
</del><span class="cx"> BC0131DA0C9772010087317D /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0131D80C9772010087317D /* TestRunner.cpp */; };
</span><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><span class="lines">@@ -155,6 +145,13 @@
</span><span class="cx"> remoteGlobalIDString = 2D403EB2150871F9005358D2;
</span><span class="cx"> remoteInfo = LayoutTestHelper;
</span><span class="cx"> };
</span><ins>+ A1158D6718927B240088C17B /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = A1158D6218927AF00088C17B;
+ remoteInfo = "Perl Support";
+ };
</ins><span class="cx"> A1321CD7188FABE000125434 /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="lines">@@ -169,6 +166,20 @@
</span><span class="cx"> remoteGlobalIDString = 9340994A08540CAE007F3BC8;
</span><span class="cx"> remoteInfo = DumpRenderTree;
</span><span class="cx"> };
</span><ins>+ A19317FE18928835001C52B1 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = A1158D7E18927E7A0088C17B;
+ remoteInfo = DumpRenderTree.app;
+ };
+ A193180118928C10001C52B1 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = A1321C9D188F9A3600125434;
+ remoteInfo = "DumpRenderTree (Library)";
+ };
</ins><span class="cx"> A84F608E08B1370E00E9745F /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="lines">@@ -276,12 +287,31 @@
</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>+ A1103B5B1892498F00738C87 /* LayoutTestHelper.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = LayoutTestHelper.xcconfig; path = mac/Configurations/LayoutTestHelper.xcconfig; sourceTree = "<group>"; };
+ A1158D55189273EB0088C17B /* DumpRenderTreeBrowserView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = DumpRenderTreeBrowserView.h; path = ios/DumpRenderTreeBrowserView.h; sourceTree = "<group>"; };
+ A1158D56189273EB0088C17B /* DumpRenderTreeBrowserView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = DumpRenderTreeBrowserView.mm; path = ios/DumpRenderTreeBrowserView.mm; sourceTree = "<group>"; };
+ A1158D57189273EB0088C17B /* PixelDumpSupportIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = PixelDumpSupportIOS.mm; path = ios/PixelDumpSupportIOS.mm; sourceTree = "<group>"; };
+ A1158D6C18927CF10088C17B /* DumpRenderTreeSupport.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = DumpRenderTreeSupport.c; sourceTree = "<group>"; };
+ A1158D6D18927CF10088C17B /* DumpRenderTreeSupport_wrapPregenerated.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = DumpRenderTreeSupport_wrapPregenerated.c; sourceTree = "<group>"; };
+ A1158D6E18927CF10088C17B /* DumpRenderTreeSupportPregenerated.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = DumpRenderTreeSupportPregenerated.pm; sourceTree = "<group>"; };
+ A1158D7018927CF10088C17B /* Changes */ = {isa = PBXFileReference; lastKnownFileType = text; path = Changes; sourceTree = "<group>"; };
+ A1158D7118927CF10088C17B /* IPhoneSimulatorNotification.xs */ = {isa = PBXFileReference; lastKnownFileType = text; path = IPhoneSimulatorNotification.xs; sourceTree = "<group>"; };
+ A1158D7318927CF20088C17B /* IPhoneSimulatorNotification.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = IPhoneSimulatorNotification.pm; sourceTree = "<group>"; };
+ A1158D7418927CF20088C17B /* Makefile.PL */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = Makefile.PL; sourceTree = "<group>"; };
+ A1158D7518927CF20088C17B /* MANIFEST */ = {isa = PBXFileReference; lastKnownFileType = text; path = MANIFEST; sourceTree = "<group>"; };
+ A1158D7618927CF20088C17B /* ppport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ppport.h; sourceTree = "<group>"; };
+ A1158D7718927CF20088C17B /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
+ A1158D7918927CF20088C17B /* IPhoneSimulatorNotification.t */ = {isa = PBXFileReference; lastKnownFileType = text; path = IPhoneSimulatorNotification.t; sourceTree = "<group>"; };
+ A1158D7A18927CF20088C17B /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+ A1158D7F18927E7A0088C17B /* DumpRenderTree.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DumpRenderTree.app; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> A1321C9E188F9A3600125434 /* libDumpRenderTree.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDumpRenderTree.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> A134E52F188FC27000901D06 /* DumpRenderTreeMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DumpRenderTreeMain.mm; path = mac/DumpRenderTreeMain.mm; sourceTree = "<group>"; };
</span><span class="cx"> A134E53418905E6C00901D06 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
</span><span class="cx"> A134E53718905F4C00901D06 /* AccessibilityCommonMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AccessibilityCommonMac.h; path = mac/AccessibilityCommonMac.h; sourceTree = "<group>"; };
</span><span class="cx"> A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = DumpRenderTreeLibrary.xcconfig; path = mac/Configurations/DumpRenderTreeLibrary.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = BaseTarget.xcconfig; path = mac/Configurations/BaseTarget.xcconfig; sourceTree = "<group>"; };
</span><ins>+ A19317FC1892855F001C52B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ios/Info.plist; sourceTree = "<group>"; };
+ A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = DumpRenderTreeApp.xcconfig; path = mac/Configurations/DumpRenderTreeApp.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">@@ -380,10 +410,6 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 2D403F05150871F9005358D2 /* Carbon.framework in Frameworks */,
- 2D403F06150871F9005358D2 /* Cocoa.framework in Frameworks */,
- 2D403F08150871F9005358D2 /* OpenGL.framework in Frameworks */,
- 1A7961071803454C00FE42CD /* IOKit.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -391,23 +417,20 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- A1321CD4188F9E7A00125434 /* libDumpRenderTree.a in Frameworks */,
- AE8259F308D22463000507AB /* Carbon.framework in Frameworks */,
- A84F608A08B136DA00E9745F /* Cocoa.framework in Frameworks */,
- A817090408B164D300CCB9FB /* JavaScriptCore.framework in Frameworks */,
- 5DE8AE4413A2C15900D6A37D /* libWebCoreTestSupport.dylib in Frameworks */,
- 23BCB8900EA57623003C6289 /* OpenGL.framework in Frameworks */,
- 9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ A1158D7C18927E7A0088C17B /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> B5A7525F08AF4A4A00138E45 /* Frameworks */ = {
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- AE8259F408D22463000507AB /* Carbon.framework in Frameworks */,
- A817090008B163EF00CCB9FB /* Cocoa.framework in Frameworks */,
- B5A752A208AF5D1F00138E45 /* QuartzCore.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -417,6 +440,7 @@
</span><span class="cx"> 08FB7794FE84155DC02AAC07 /* DumpRenderTree */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ A1158D6A18927CE10088C17B /* ios */,
</ins><span class="cx"> A134E53418905E6C00901D06 /* config.h */,
</span><span class="cx"> 1A2FB84C178C80920059FD96 /* DefaultPolicyDelegate.h */,
</span><span class="cx"> 1A2FB84D178C80930059FD96 /* DefaultPolicyDelegate.m */,
</span><span class="lines">@@ -602,6 +626,7 @@
</span><span class="cx"> 2D403F19150871F9005358D2 /* LayoutTestHelper */,
</span><span class="cx"> 141BF233096A44CF00E0753C /* TestNetscapePlugIn.plugin */,
</span><span class="cx"> A1321C9E188F9A3600125434 /* libDumpRenderTree.a */,
</span><ins>+ A1158D7F18927E7A0088C17B /* DumpRenderTree.app */,
</ins><span class="cx"> );
</span><span class="cx"> name = Products;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -624,6 +649,61 @@
</span><span class="cx"> name = Resources;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ A1158D6A18927CE10088C17B /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ A1158D55189273EB0088C17B /* DumpRenderTreeBrowserView.h */,
+ A1158D56189273EB0088C17B /* DumpRenderTreeBrowserView.mm */,
+ A19317FC1892855F001C52B1 /* Info.plist */,
+ A1158D6B18927CF10088C17B /* PerlSupport */,
+ );
+ name = ios;
+ sourceTree = "<group>";
+ };
+ A1158D6B18927CF10088C17B /* PerlSupport */ = {
+ isa = PBXGroup;
+ children = (
+ A1158D6C18927CF10088C17B /* DumpRenderTreeSupport.c */,
+ A1158D6D18927CF10088C17B /* DumpRenderTreeSupport_wrapPregenerated.c */,
+ A1158D6E18927CF10088C17B /* DumpRenderTreeSupportPregenerated.pm */,
+ A1158D6F18927CF10088C17B /* IPhoneSimulatorNotification */,
+ A1158D7A18927CF20088C17B /* Makefile */,
+ );
+ name = PerlSupport;
+ path = ios/PerlSupport;
+ sourceTree = "<group>";
+ };
+ A1158D6F18927CF10088C17B /* IPhoneSimulatorNotification */ = {
+ isa = PBXGroup;
+ children = (
+ A1158D7018927CF10088C17B /* Changes */,
+ A1158D7118927CF10088C17B /* IPhoneSimulatorNotification.xs */,
+ A1158D7218927CF20088C17B /* lib */,
+ A1158D7418927CF20088C17B /* Makefile.PL */,
+ A1158D7518927CF20088C17B /* MANIFEST */,
+ A1158D7618927CF20088C17B /* ppport.h */,
+ A1158D7718927CF20088C17B /* README */,
+ A1158D7818927CF20088C17B /* t */,
+ );
+ path = IPhoneSimulatorNotification;
+ sourceTree = "<group>";
+ };
+ A1158D7218927CF20088C17B /* lib */ = {
+ isa = PBXGroup;
+ children = (
+ A1158D7318927CF20088C17B /* IPhoneSimulatorNotification.pm */,
+ );
+ path = lib;
+ sourceTree = "<group>";
+ };
+ A1158D7818927CF20088C17B /* t */ = {
+ isa = PBXGroup;
+ children = (
+ A1158D7918927CF20088C17B /* IPhoneSimulatorNotification.t */,
+ );
+ path = t;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> A803FF6409CAACC1009B2A37 /* Frameworks */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -670,8 +750,10 @@
</span><span class="cx"> A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */,
</span><span class="cx"> BCB282F40CFA7450007E533E /* DebugRelease.xcconfig */,
</span><span class="cx"> BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */,
</span><ins>+ A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */,
</ins><span class="cx"> A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */,
</span><span class="cx"> BCB283D80CFA7AFD007E533E /* ImageDiff.xcconfig */,
</span><ins>+ A1103B5B1892498F00738C87 /* LayoutTestHelper.xcconfig */,
</ins><span class="cx"> BCB283DE0CFA7C20007E533E /* TestNetscapePlugIn.xcconfig */,
</span><span class="cx"> );
</span><span class="cx"> name = Configurations;
</span><span class="lines">@@ -687,6 +769,7 @@
</span><span class="cx"> BCB2848A0CFA820F007E533E /* PixelDumpSupport.h */,
</span><span class="cx"> BCB284880CFA8202007E533E /* PixelDumpSupportCG.cpp */,
</span><span class="cx"> BCB284890CFA8202007E533E /* PixelDumpSupportCG.h */,
</span><ins>+ A1158D57189273EB0088C17B /* PixelDumpSupportIOS.mm */,
</ins><span class="cx"> BCB2848C0CFA8221007E533E /* PixelDumpSupportMac.mm */,
</span><span class="cx"> );
</span><span class="cx"> name = PixelDump;
</span><span class="lines">@@ -714,6 +797,24 @@
</span><span class="cx"> };
</span><span class="cx"> /* End PBXHeadersBuildPhase section */
</span><span class="cx">
</span><ins>+/* Begin PBXLegacyTarget section */
+ A1158D6218927AF00088C17B /* Perl Support */ = {
+ isa = PBXLegacyTarget;
+ buildArgumentsString = "$(ACTION)";
+ buildConfigurationList = A1158D6318927AF00088C17B /* Build configuration list for PBXLegacyTarget "Perl Support" */;
+ buildPhases = (
+ );
+ buildToolPath = /usr/bin/make;
+ buildWorkingDirectory = "$(SRCROOT)/ios/PerlSupport";
+ dependencies = (
+ A19317FF18928835001C52B1 /* PBXTargetDependency */,
+ );
+ name = "Perl Support";
+ passBuildSettingsInEnvironment = 1;
+ productName = "Perl Support";
+ };
+/* End PBXLegacyTarget section */
+
</ins><span class="cx"> /* Begin PBXNativeTarget section */
</span><span class="cx"> 141BF21E096A441D00E0753C /* TestNetscapePlugIn */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="lines">@@ -769,6 +870,24 @@
</span><span class="cx"> productReference = 9340995408540CAF007F3BC8 /* DumpRenderTree */;
</span><span class="cx"> productType = "com.apple.product-type.tool";
</span><span class="cx"> };
</span><ins>+ A1158D7E18927E7A0088C17B /* DumpRenderTree.app */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = A1158DAB18927E7B0088C17B /* Build configuration list for PBXNativeTarget "DumpRenderTree.app" */;
+ buildPhases = (
+ A1158D7B18927E7A0088C17B /* Sources */,
+ A1158D7C18927E7A0088C17B /* Frameworks */,
+ A1158D7D18927E7A0088C17B /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ A193180218928C10001C52B1 /* PBXTargetDependency */,
+ );
+ name = DumpRenderTree.app;
+ productName = DumpRenderTree;
+ productReference = A1158D7F18927E7A0088C17B /* DumpRenderTree.app */;
+ productType = "com.apple.product-type.application";
+ };
</ins><span class="cx"> A1321C9D188F9A3600125434 /* DumpRenderTree (Library) */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = A1321C9F188F9A3600125434 /* Build configuration list for PBXNativeTarget "DumpRenderTree (Library)" */;
</span><span class="lines">@@ -818,6 +937,8 @@
</span><span class="cx"> Japanese,
</span><span class="cx"> French,
</span><span class="cx"> German,
</span><ins>+ en,
+ Base,
</ins><span class="cx"> );
</span><span class="cx"> mainGroup = 08FB7794FE84155DC02AAC07 /* DumpRenderTree */;
</span><span class="cx"> productRefGroup = 9340995508540CAF007F3BC8 /* Products */;
</span><span class="lines">@@ -827,9 +948,11 @@
</span><span class="cx"> A84F608D08B1370600E9745F /* All */,
</span><span class="cx"> A1321C9D188F9A3600125434 /* DumpRenderTree (Library) */,
</span><span class="cx"> 9340994A08540CAE007F3BC8 /* DumpRenderTree */,
</span><ins>+ A1158D7E18927E7A0088C17B /* DumpRenderTree.app */,
</ins><span class="cx"> B5A7525A08AF4A4A00138E45 /* ImageDiff */,
</span><span class="cx"> 141BF21E096A441D00E0753C /* TestNetscapePlugIn */,
</span><span class="cx"> 2D403EB2150871F9005358D2 /* LayoutTestHelper */,
</span><ins>+ A1158D6218927AF00088C17B /* Perl Support */,
</ins><span class="cx"> );
</span><span class="cx"> };
</span><span class="cx"> /* End PBXProject section */
</span><span class="lines">@@ -842,6 +965,13 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ A1158D7D18927E7A0088C17B /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> /* End PBXResourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXSourcesBuildPhase section */
</span><span class="lines">@@ -920,6 +1050,7 @@
</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><ins>+ A1158D581892740C0088C17B /* DumpRenderTreeBrowserView.mm in Sources */,
</ins><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">@@ -928,6 +1059,7 @@
</span><span class="cx"> BCA18B320C9B01B400114369 /* ObjCController.m in Sources */,
</span><span class="cx"> BCA18B7E0C9B08F100114369 /* ObjCPlugin.m in Sources */,
</span><span class="cx"> BCA18B800C9B08F100114369 /* ObjCPluginFunction.m in Sources */,
</span><ins>+ A1158D59189274360088C17B /* PixelDumpSupportIOS.mm in Sources */,
</ins><span class="cx"> 8465E2C70FFA8DF2003B8342 /* PixelDumpSupport.cpp in Sources */,
</span><span class="cx"> BCB284CD0CFA83C8007E533E /* PixelDumpSupportCG.cpp in Sources */,
</span><span class="cx"> BCB284D60CFA83D1007E533E /* PixelDumpSupportMac.mm in Sources */,
</span><span class="lines">@@ -945,6 +1077,14 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ A1158D7B18927E7A0088C17B /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A19318001892886B001C52B1 /* DumpRenderTreeMain.mm in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> A134E52E188FC0DB00901D06 /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -974,6 +1114,11 @@
</span><span class="cx"> target = 2D403EB2150871F9005358D2 /* LayoutTestHelper */;
</span><span class="cx"> targetProxy = 2D403F201508736C005358D2 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><ins>+ A1158D6818927B240088C17B /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = A1158D6218927AF00088C17B /* Perl Support */;
+ targetProxy = A1158D6718927B240088C17B /* PBXContainerItemProxy */;
+ };
</ins><span class="cx"> A1321CD8188FABE000125434 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = A1321C9D188F9A3600125434 /* DumpRenderTree (Library) */;
</span><span class="lines">@@ -984,6 +1129,16 @@
</span><span class="cx"> target = 9340994A08540CAE007F3BC8 /* DumpRenderTree */;
</span><span class="cx"> targetProxy = A134E52C188FC09200901D06 /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><ins>+ A19317FF18928835001C52B1 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = A1158D7E18927E7A0088C17B /* DumpRenderTree.app */;
+ targetProxy = A19317FE18928835001C52B1 /* PBXContainerItemProxy */;
+ };
+ A193180218928C10001C52B1 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = A1321C9D188F9A3600125434 /* DumpRenderTree (Library) */;
+ targetProxy = A193180118928C10001C52B1 /* PBXContainerItemProxy */;
+ };
</ins><span class="cx"> A84F608F08B1370E00E9745F /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = B5A7525A08AF4A4A00138E45 /* ImageDiff */;
</span><span class="lines">@@ -1040,7 +1195,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2D403F16150871F9005358D2 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */;
</del><ins>+ baseConfigurationReference = A1103B5B1892498F00738C87 /* LayoutTestHelper.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> PRODUCT_NAME = LayoutTestHelper;
</span><span class="cx"> };
</span><span class="lines">@@ -1048,7 +1203,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2D403F17150871F9005358D2 /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */;
</del><ins>+ baseConfigurationReference = A1103B5B1892498F00738C87 /* LayoutTestHelper.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> PRODUCT_NAME = LayoutTestHelper;
</span><span class="cx"> };
</span><span class="lines">@@ -1056,7 +1211,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2D403F18150871F9005358D2 /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */;
</del><ins>+ baseConfigurationReference = A1103B5B1892498F00738C87 /* LayoutTestHelper.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">@@ -1108,6 +1263,48 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><ins>+ A1158D6418927AF00088C17B /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ A1158D6518927AF00088C17B /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ A1158D6618927AF00088C17B /* Production */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ };
+ name = Production;
+ };
+ A1158DAC18927E7B0088C17B /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */;
+ buildSettings = {
+ INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
+ };
+ name = Debug;
+ };
+ A1158DAD18927E7B0088C17B /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */;
+ buildSettings = {
+ INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
+ };
+ name = Release;
+ };
+ A1158DAE18927E7B0088C17B /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */;
+ buildSettings = {
+ INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
+ };
+ name = Production;
+ };
</ins><span class="cx"> A1321CA0188F9A3600125434 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */;
</span><span class="lines">@@ -1222,6 +1419,26 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><ins>+ A1158D6318927AF00088C17B /* Build configuration list for PBXLegacyTarget "Perl Support" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A1158D6418927AF00088C17B /* Debug */,
+ A1158D6518927AF00088C17B /* Release */,
+ A1158D6618927AF00088C17B /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
+ A1158DAB18927E7B0088C17B /* Build configuration list for PBXNativeTarget "DumpRenderTree.app" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A1158DAC18927E7B0088C17B /* Debug */,
+ A1158DAD18927E7B0088C17B /* Release */,
+ A1158DAE18927E7B0088C17B /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
</ins><span class="cx"> A1321C9F188F9A3600125434 /* Build configuration list for PBXNativeTarget "DumpRenderTree (Library)" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreeFileDraggingSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/DumpRenderTreeFileDraggingSource.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx">
</span><span class="cx"> // An implementation of NSDraggingSource for use with DumpRenderTreeDraggingInfo when dragging files
</span><span class="lines">@@ -37,3 +39,5 @@
</span><span class="cx"> - (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)flag;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreePrefixh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include <wtf/Platform.h>
+
</ins><span class="cx"> #ifdef __OBJC__
</span><del>-
</del><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePixelDumpSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "PixelDumpSupportCairo.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<BitmapContext> context;
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> if (dumpImage)
</span><span class="cx"> dumpBitmap(context.get(), actualHash);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static void appendIntToVector(unsigned number, Vector<unsigned char>& vector)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInPluginObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -85,4 +85,4 @@
</span><span class="cx"> extern void* createCoreAnimationLayer();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // PluginObject_h
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInPluginObjectMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObjectMac.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "PluginObject.h"
</span><span class="cx">
</span><del>-
</del><span class="cx"> #include <QuartzCore/QuartzCore.h>
</span><span class="cx">
</span><span class="cx"> @interface TestPluginLayer : CALayer
</span><span class="lines">@@ -96,5 +95,3 @@
</span><span class="cx"> [caLayer addSublayer:sublayer];
</span><span class="cx"> return caLayer;
</span><span class="cx"> }
</span><del>-
-
</del></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInTestObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "TestObject.h"
</span><ins>+
</ins><span class="cx"> #include "PluginObject.h"
</span><span class="cx">
</span><span class="cx"> #include <string.h>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInTestsGetUserAgentWithNullNPPFromNPPNewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "PluginTest.h"
</span><span class="cx">
</span><del>-#include "PluginTest.h"
-
</del><span class="cx"> #include "PluginObject.h"
</span><span class="cx">
</span><span class="cx"> using namespace std;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInTestsNPRuntimeObjectFromDestroyedPlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -85,4 +85,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static PluginTest::Register<NPRuntimeObjectFromDestroyedPlugin> npRuntimeObjectFromDestroyedPlugin("npruntime-object-from-destroyed-plugin");
</span><del>-
</del></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> #include <Carbon/Carbon.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1316,6 +1316,30 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+static JSValueRef setTelephoneNumberParsingEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount < 1)
+ return JSValueMakeUndefined(context);
+
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ controller->setTelephoneNumberParsingEnabled(JSValueToBoolean(context, arguments[0]));
+
+ return JSValueMakeUndefined(context);
+}
+
+static JSValueRef setPagePausedCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount < 1)
+ return JSValueMakeUndefined(context);
+
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ controller->setPagePaused(JSValueToBoolean(context, arguments[0]));
+
+ return JSValueMakeUndefined(context);
+}
+#endif
+
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> static JSValueRef setTextAutosizingEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="cx"> {
</span><span class="lines">@@ -1846,7 +1870,7 @@
</span><span class="cx">
</span><span class="cx"> static JSValueRef getSecureEventInputIsEnabledCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
</span><span class="cx"> {
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> return JSValueMakeBoolean(context, IsSecureEventInputEnabled());
</span><span class="cx"> #else
</span><span class="cx"> return JSValueMakeBoolean(context, false);
</span><span class="lines">@@ -2168,6 +2192,10 @@
</span><span class="cx"> { "setSpatialNavigationEnabled", setSpatialNavigationEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setStopProvisionalFrameLoads", setStopProvisionalFrameLoadsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "setTabKeyCyclesThroughElements", setTabKeyCyclesThroughElementsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+#if PLATFORM(IOS)
+ { "setTelephoneNumberParsingEnabled", setTelephoneNumberParsingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "setPagePaused", setPagePausedCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+#endif
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> { "setTextAutosizingEnabled", setTextAutosizingEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -118,6 +118,11 @@
</span><span class="cx"> void setSpatialNavigationEnabled(bool);
</span><span class="cx"> void setScrollbarPolicy(JSStringRef orientation, JSStringRef policy);
</span><span class="cx"> void startSpeechInput(JSContextRef inputElement);
</span><ins>+#if PLATFORM(IOS)
+ void setTelephoneNumberParsingEnabled(bool enable);
+ void setPagePaused(bool paused);
+#endif
+
</ins><span class="cx"> void setPageVisibility(const char*);
</span><span class="cx"> void resetPageVisibility();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecgImageDiffCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -44,7 +44,9 @@
</span><span class="cx"> #include <CoreGraphics/CGImage.h>
</span><span class="cx"> #include <ImageIO/CGImageDestination.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(IOS)
+#include <MobileCoreServices/UTCoreTypes.h>
+#elif PLATFORM(MAC)
</ins><span class="cx"> #include <LaunchServices/UTCoreTypes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecgPixelDumpSupportCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -43,6 +43,10 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> #include "MD5.h"
</span><ins>+#elif PLATFORM(IOS)
+#include <MobileCoreServices/UTCoreTypes.h>
+#define COMMON_DIGEST_FOR_OPENSSL
+#include <CommonCrypto/CommonDigest.h>
</ins><span class="cx"> #elif PLATFORM(MAC)
</span><span class="cx"> #include <LaunchServices/UTCoreTypes.h>
</span><span class="cx"> #define COMMON_DIGEST_FOR_OPENSSL
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #import "DumpRenderTree.h"
</span><span class="cx"> #import "AccessibilityController.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-
</del><span class="cx"> #import "AccessibilityCommonMac.h"
</span><span class="cx"> #import "AccessibilityUIElement.h"
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="lines">@@ -134,5 +132,3 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("ios"));
</span><span class="cx"> return platformName;
</span><span class="cx"> }
</span><del>-
-#endif // PLATFORM(IOS)
</del></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -35,12 +35,9 @@
</span><span class="cx"> #import <WebCore/TextGranularity.h>
</span><span class="cx"> #import <WebKit/WebFrame.h>
</span><span class="cx"> #import <WebKit/WebHTMLView.h>
</span><del>-#import <WebKit/WebTypesInternal.h>
</del><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-
</del><span class="cx"> #import <UIKit/UIKit.h>
</span><span class="cx">
</span><span class="cx"> typedef void (*AXPostedNotificationCallback)(id element, NSString* notification, void* context);
</span><span class="lines">@@ -653,6 +650,11 @@
</span><span class="cx"> return AccessibilityUIElement([m_element accessibilityElementForRow:row andColumn:col]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccessibilityUIElement::scrollToMakeVisible()
+{
+ // FIXME: implement
+}
+
</ins><span class="cx"> JSStringRef AccessibilityUIElement::selectedTextRange()
</span><span class="cx"> {
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="lines">@@ -820,4 +822,14 @@
</span><span class="cx"> // FIXME: implement
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-#endif // PLATFORM(IOS)
</del><ins>+
+JSStringRef AccessibilityUIElement::classList() const
+{
+ // FIXME: implement
+ return nullptr;
+}
+
+void AccessibilityUIElement::uiElementArrayAttributeValue(JSStringRef, Vector<AccessibilityUIElement>&) const
+{
+ // FIXME: implement
+}
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewhfromrev162816trunkToolsDumpRenderTreemacHistoryDelegateh"></a>
<div class="copfile"><h4>Copied: trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h (from rev 162816, trunk/Tools/DumpRenderTree/mac/HistoryDelegate.h) (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+ * Copyright (C) 2009 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. ``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
+ * 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.
+ */
+
+
+#import <UIKit/UIWebBrowserView.h>
+
+@interface DumpRenderTreeBrowserView : UIWebBrowserView {
+ BOOL _scrollingUsesUIWebScrollView;
+}
+
+@property (nonatomic, assign) BOOL scrollingUsesUIWebScrollView;
+
+@end
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewmm"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+/*
+ * Copyright (C) 2010 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. ``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
+ * 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.
+ */
+
+#import "DumpRenderTreeBrowserView.h"
+
+#if PLATFORM(IOS)
+
+#import <WebKit/WebView.h>
+
+@interface UIWebBrowserView (WebUIKitDelegate)
+- (BOOL)webView:(WebView *)webView shouldScrollToPoint:(CGPoint)point forFrame:(WebFrame *)frame;
+@end
+
+@implementation DumpRenderTreeBrowserView
+
+@synthesize scrollingUsesUIWebScrollView = _scrollingUsesUIWebScrollView;
+
+// We override [UIWebBrowserView addInputString] to avoid UIKit keyboard blocking
+// sending input strings to webkit because we don't have a interaction element in
+// DRT. Interaction element is only set by user tapping a element on the screen.
+//
+// see: <rdar://problem/8040227> DumpRenderTree: make addInputString work in iPhone DRT
+// see: <rdar://problem/10499625> DumpRenderTree: DRT should always use the UIScrollView for scrolling
+- (void)addInputString:(NSString *)str
+{
+ [[self webView] insertText:str];
+}
+
+// This is temporary solution to make window.scroll work in DumpRenderTree. The reason is
+// UIWebDocumentView's shouldScrollToPoint always tells WebKit not to scroll. This makes
+// sense for MobileSafari/UIWebView app that there is top scroller and the scroller is
+// move to the right spot. But DRT doesn't have scroller so the page never scrolls.
+//
+// see: <rdar://problem/8153438> DumpRenderTree: DRT needs to match MobileSafari/UIWebView app more closely.
+- (BOOL)webView:(WebView *)webView shouldScrollToPoint:(CGPoint)point forFrame:(WebFrame *)frame
+{
+ if (_scrollingUsesUIWebScrollView)
+ return [super webView:webView shouldScrollToPoint:point forFrame:frame];
+ if ([webView mainFrame] == frame)
+ [self sendScrollEventIfNecessaryWasUserScroll:NO];
+
+ return YES;
+}
+
+- (void)webView:(WebView *)sender addMessageToConsole:(NSDictionary *)dictionary withSource:(NSString *)source
+{
+ // Forward this to DRT UIDelegate since iOS WebKit by default sends this message to UIKitDelegate.
+ id uiDelegate = [[self webView] UIDelegate];
+ [uiDelegate webView:sender addMessageToConsole:dictionary withSource:source];
+}
+
+@end
+
+#endif // PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosInfoplist"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/Info.plist (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/Info.plist (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/Info.plist 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDisplayName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundleExecutable</key>
+ <string>DumpRenderTree</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.webkit.DumpRenderTree</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+</dict>
+</plist>
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportDumpRenderTreeSupportcfromrev162816trunkToolsDumpRenderTreemacHistoryDelegateh"></a>
<div class="copfile"><h4>Copied: trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport.c (from rev 162816, trunk/Tools/DumpRenderTree/mac/HistoryDelegate.h) (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport.c (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport.c 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2009 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. ``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
+ * 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 <stdio.h>
+#include <sys/sysctl.h>
+
+int processIsCrashing(int pid)
+{
+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid };
+ struct kinfo_proc info;
+ size_t bufferSize = sizeof(info);
+ if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &info, &bufferSize, 0, 0)) {
+ perror("sysctl");
+ return 0;
+ }
+
+ struct extern_proc proc = info.kp_proc;
+
+ // The process is crashing if it is waiting to exit, is not a zombie, and has a non-zero exit code.
+ return proc.p_stat != SZOMB && (proc.p_flag & P_WEXIT) && proc.p_xstat;
+}
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportDumpRenderTreeSupportPregeneratedpm"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupportPregenerated.pm (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupportPregenerated.pm (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupportPregenerated.pm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+# This file was automatically generated by SWIG
+package DumpRenderTreeSupport;
+require Exporter;
+require DynaLoader;
+@ISA = qw(Exporter DynaLoader);
+package DumpRenderTreeSupportc;
+bootstrap DumpRenderTreeSupport;
+package DumpRenderTreeSupport;
+@EXPORT = qw( );
+
+# ---------- BASE METHODS -------------
+
+package DumpRenderTreeSupport;
+
+sub TIEHASH {
+ my ($classname,$obj) = @_;
+ return bless $obj, $classname;
+}
+
+sub CLEAR { }
+
+sub FIRSTKEY { }
+
+sub NEXTKEY { }
+
+sub FETCH {
+ my ($self,$field) = @_;
+ my $member_func = "swig_${field}_get";
+ $self->$member_func();
+}
+
+sub STORE {
+ my ($self,$field,$newval) = @_;
+ my $member_func = "swig_${field}_set";
+ $self->$member_func($newval);
+}
+
+sub this {
+ my $ptr = shift;
+ return tied(%$ptr);
+}
+
+
+# ------- FUNCTION WRAPPERS --------
+
+package DumpRenderTreeSupport;
+
+*processIsCrashing = *DumpRenderTreeSupportc::processIsCrashing;
+
+# ------- VARIABLE STUBS --------
+
+package DumpRenderTreeSupport;
+
+1;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportDumpRenderTreeSupport_wrapPregeneratedc"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,1167 @@
</span><ins>+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.24
+ *
+ * This file is not intended to be easily readable and contains a number of
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+
+#ifndef SWIG_TEMPLATE_DISAMBIGUATOR
+# if defined(__SUNPRO_CC)
+# define SWIG_TEMPLATE_DISAMBIGUATOR template
+# else
+# define SWIG_TEMPLATE_DISAMBIGUATOR
+# endif
+#endif
+
+/***********************************************************************
+ * swigrun.swg
+ *
+ * This file contains generic CAPI SWIG runtime support for pointer
+ * type checking.
+ *
+ ************************************************************************/
+
+/* This should only be incremented when either the layout of swig_type_info changes,
+ or for whatever reason, the runtime changes incompatibly */
+#define SWIG_RUNTIME_VERSION "1"
+
+/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
+#ifdef SWIG_TYPE_TABLE
+#define SWIG_QUOTE_STRING(x) #x
+#define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
+#define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+#else
+#define SWIG_TYPE_TABLE_NAME
+#endif
+
+#include <string.h>
+
+#ifndef SWIGINLINE
+#if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+# define SWIGINLINE inline
+#else
+# define SWIGINLINE
+#endif
+#endif
+
+/*
+ You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
+ creating a static or dynamic library from the swig runtime code.
+ In 99.9% of the cases, swig just needs to declare them as 'static'.
+
+ But only do this if is strictly necessary, ie, if you have problems
+ with your compiler or so.
+*/
+#ifndef SWIGRUNTIME
+#define SWIGRUNTIME static
+#endif
+#ifndef SWIGRUNTIMEINLINE
+#define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void *(*swig_converter_func)(void *);
+typedef struct swig_type_info *(*swig_dycast_func)(void **);
+
+typedef struct swig_type_info {
+ const char *name;
+ swig_converter_func converter;
+ const char *str;
+ void *clientdata;
+ swig_dycast_func dcast;
+ struct swig_type_info *next;
+ struct swig_type_info *prev;
+} swig_type_info;
+
+/*
+ Compare two type names skipping the space characters, therefore
+ "char*" == "char *" and "Class<int>" == "Class<int >", etc.
+
+ Return 0 when the two name types are equivalent, as in
+ strncmp, but skipping ' '.
+*/
+SWIGRUNTIME int
+SWIG_TypeNameComp(const char *f1, const char *l1,
+ const char *f2, const char *l2) {
+ for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
+ while ((*f1 == ' ') && (f1 != l1)) ++f1;
+ while ((*f2 == ' ') && (f2 != l2)) ++f2;
+ if (*f1 != *f2) return *f1 - *f2;
+ }
+ return (l1 - f1) - (l2 - f2);
+}
+
+/*
+ Check type equivalence in a name list like <name1>|<name2>|...
+*/
+SWIGRUNTIME int
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+ int equiv = 0;
+ const char* te = tb + strlen(tb);
+ const char* ne = nb;
+ while (!equiv && *ne) {
+ for (nb = ne; *ne; ++ne) {
+ if (*ne == '|') break;
+ }
+ equiv = SWIG_TypeNameComp(nb, ne, tb, te) == 0;
+ if (*ne) ++ne;
+ }
+ return equiv;
+}
+
+/*
+ Register a type mapping with the type-checking
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeRegisterTL(swig_type_info **tl, swig_type_info *ti) {
+ swig_type_info *tc, *head, *ret, *next;
+ /* Check to see if this type has already been registered */
+ tc = *tl;
+ while (tc) {
+ /* check simple type equivalence */
+ int typeequiv = (strcmp(tc->name, ti->name) == 0);
+ /* check full type equivalence, resolving typedefs */
+ if (!typeequiv) {
+ /* only if tc is not a typedef (no '|' on it) */
+ if (tc->str && ti->str && !strstr(tc->str,"|")) {
+ typeequiv = SWIG_TypeEquiv(ti->str,tc->str);
+ }
+ }
+ if (typeequiv) {
+ /* Already exists in the table. Just add additional types to the list */
+ if (ti->clientdata) tc->clientdata = ti->clientdata;
+ head = tc;
+ next = tc->next;
+ goto l1;
+ }
+ tc = tc->prev;
+ }
+ head = ti;
+ next = 0;
+
+ /* Place in list */
+ ti->prev = *tl;
+ *tl = ti;
+
+ /* Build linked lists */
+ l1:
+ ret = head;
+ tc = ti + 1;
+ /* Patch up the rest of the links */
+ while (tc->name) {
+ head->next = tc;
+ tc->prev = head;
+ head = tc;
+ tc++;
+ }
+ if (next) next->prev = head;
+ head->next = next;
+
+ return ret;
+}
+
+/*
+ Check the typename
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeCheck(const char *c, swig_type_info *ty) {
+ swig_type_info *s;
+ if (!ty) return 0; /* Void pointer */
+ s = ty->next; /* First element always just a name */
+ do {
+ if (strcmp(s->name,c) == 0) {
+ if (s == ty->next) return s;
+ /* Move s to the top of the linked list */
+ s->prev->next = s->next;
+ if (s->next) {
+ s->next->prev = s->prev;
+ }
+ /* Insert s as second element in the list */
+ s->next = ty->next;
+ if (ty->next) ty->next->prev = s;
+ ty->next = s;
+ s->prev = ty;
+ return s;
+ }
+ s = s->next;
+ } while (s && (s != ty->next));
+ return 0;
+}
+
+/*
+ Cast a pointer up an inheritance hierarchy
+*/
+SWIGRUNTIMEINLINE void *
+SWIG_TypeCast(swig_type_info *ty, void *ptr) {
+ return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+}
+
+/*
+ Dynamic pointer casting. Down an inheritance hierarchy
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
+ swig_type_info *lastty = ty;
+ if (!ty || !ty->dcast) return ty;
+ while (ty && (ty->dcast)) {
+ ty = (*ty->dcast)(ptr);
+ if (ty) lastty = ty;
+ }
+ return lastty;
+}
+
+/*
+ Return the name associated with this type
+*/
+SWIGRUNTIMEINLINE const char *
+SWIG_TypeName(const swig_type_info *ty) {
+ return ty->name;
+}
+
+/*
+ Return the pretty name associated with this type,
+ that is an unmangled type name in a form presentable to the user.
+*/
+SWIGRUNTIME const char *
+SWIG_TypePrettyName(const swig_type_info *type) {
+ /* The "str" field contains the equivalent pretty names of the
+ type, separated by vertical-bar characters. We choose
+ to print the last name, as it is often (?) the most
+ specific. */
+ if (type->str != NULL) {
+ const char *last_name = type->str;
+ const char *s;
+ for (s = type->str; *s; s++)
+ if (*s == '|') last_name = s+1;
+ return last_name;
+ }
+ else
+ return type->name;
+}
+
+/*
+ Search for a swig_type_info structure
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeQueryTL(swig_type_info *tl, const char *name) {
+ swig_type_info *ty = tl;
+ while (ty) {
+ if (ty->str && (SWIG_TypeEquiv(ty->str,name))) return ty;
+ if (ty->name && (strcmp(name,ty->name) == 0)) return ty;
+ ty = ty->prev;
+ }
+ return 0;
+}
+
+/*
+ Set the clientdata field for a type
+*/
+SWIGRUNTIME void
+SWIG_TypeClientDataTL(swig_type_info *tl, swig_type_info *ti, void *clientdata) {
+ swig_type_info *tc, *equiv;
+ if (ti->clientdata) return;
+ /* if (ti->clientdata == clientdata) return; */
+ ti->clientdata = clientdata;
+ equiv = ti->next;
+ while (equiv) {
+ if (!equiv->converter) {
+ tc = tl;
+ while (tc) {
+ if ((strcmp(tc->name, equiv->name) == 0))
+ SWIG_TypeClientDataTL(tl,tc,clientdata);
+ tc = tc->prev;
+ }
+ }
+ equiv = equiv->next;
+ }
+}
+
+/*
+ Pack binary data into a string
+*/
+SWIGRUNTIME char *
+SWIG_PackData(char *c, void *ptr, size_t sz) {
+ static char hex[17] = "0123456789abcdef";
+ unsigned char *u = (unsigned char *) ptr;
+ const unsigned char *eu = u + sz;
+ register unsigned char uu;
+ for (; u != eu; ++u) {
+ uu = *u;
+ *(c++) = hex[(uu & 0xf0) >> 4];
+ *(c++) = hex[uu & 0xf];
+ }
+ return c;
+}
+
+/*
+ Unpack binary data from a string
+*/
+SWIGRUNTIME const char *
+SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
+ register unsigned char *u = (unsigned char *) ptr;
+ register const unsigned char *eu = u + sz;
+ for (; u != eu; ++u) {
+ register int d = *(c++);
+ register unsigned char uu = 0;
+ if ((d >= '0') && (d <= '9'))
+ uu = ((d - '0') << 4);
+ else if ((d >= 'a') && (d <= 'f'))
+ uu = ((d - ('a'-10)) << 4);
+ else
+ return (char *) 0;
+ d = *(c++);
+ if ((d >= '0') && (d <= '9'))
+ uu |= (d - '0');
+ else if ((d >= 'a') && (d <= 'f'))
+ uu |= (d - ('a'-10));
+ else
+ return (char *) 0;
+ *u = uu;
+ }
+ return c;
+}
+
+/*
+ This function will propagate the clientdata field of type to any new
+ swig_type_info structures that have been added into the list of
+ equivalent types. It is like calling SWIG_TypeClientData(type,
+ clientdata) a second time.
+*/
+SWIGRUNTIME void
+SWIG_PropagateClientDataTL(swig_type_info *tl, swig_type_info *type) {
+ swig_type_info *equiv = type->next;
+ swig_type_info *tc;
+ if (!type->clientdata) return;
+ while (equiv) {
+ if (!equiv->converter) {
+ tc = tl;
+ while (tc) {
+ if ((strcmp(tc->name, equiv->name) == 0) && !tc->clientdata)
+ SWIG_TypeClientDataTL(tl,tc, type->clientdata);
+ tc = tc->prev;
+ }
+ }
+ equiv = equiv->next;
+ }
+}
+
+/*
+ Pack 'void *' into a string buffer.
+*/
+SWIGRUNTIME char *
+SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
+ char *r = buff;
+ if ((2*sizeof(void *) + 2) > bsz) return 0;
+ *(r++) = '_';
+ r = SWIG_PackData(r,&ptr,sizeof(void *));
+ if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
+ strcpy(r,name);
+ return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
+ if (*c != '_') {
+ if (strcmp(c,"NULL") == 0) {
+ *ptr = (void *) 0;
+ return name;
+ } else {
+ return 0;
+ }
+ }
+ return SWIG_UnpackData(++c,ptr,sizeof(void *));
+}
+
+SWIGRUNTIME char *
+SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
+ char *r = buff;
+ size_t lname = (name ? strlen(name) : 0);
+ if ((2*sz + 2 + lname) > bsz) return 0;
+ *(r++) = '_';
+ r = SWIG_PackData(r,ptr,sz);
+ if (lname) {
+ strncpy(r,name,lname+1);
+ } else {
+ *r = 0;
+ }
+ return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
+ if (*c != '_') {
+ if (strcmp(c,"NULL") == 0) {
+ memset(ptr,0,sz);
+ return name;
+ } else {
+ return 0;
+ }
+ }
+ return SWIG_UnpackData(++c,ptr,sz);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/***********************************************************************
+ * common.swg
+ *
+ * This file contains generic SWIG runtime support for pointer
+ * type checking as well as a few commonly used macros to control
+ * external linkage.
+ *
+ * Author : David Beazley (beazley@cs.uchicago.edu)
+ *
+ * Copyright (c) 1999-2000, The University of Chicago
+ *
+ * This file may be freely redistributed without license or fee provided
+ * this copyright message remains intact.
+ ************************************************************************/
+
+
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+# if !defined(STATIC_LINKED)
+# define SWIGEXPORT(a) __declspec(dllexport) a
+# else
+# define SWIGEXPORT(a) a
+# endif
+#else
+# define SWIGEXPORT(a) a
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*************************************************************************/
+
+
+/* The static type info list */
+
+static swig_type_info *swig_type_list = 0;
+static swig_type_info **swig_type_list_handle = &swig_type_list;
+
+
+/* Register a type mapping with the type-checking */
+static swig_type_info *
+SWIG_TypeRegister(swig_type_info *ti) {
+ return SWIG_TypeRegisterTL(swig_type_list_handle, ti);
+}
+
+/* Search for a swig_type_info structure */
+static swig_type_info *
+SWIG_TypeQuery(const char *name) {
+ return SWIG_TypeQueryTL(*swig_type_list_handle, name);
+}
+
+/* Set the clientdata field for a type */
+static void
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+ SWIG_TypeClientDataTL(*swig_type_list_handle, ti, clientdata);
+}
+
+/* This function will propagate the clientdata field of type to
+* any new swig_type_info structures that have been added into the list
+* of equivalent types. It is like calling
+* SWIG_TypeClientData(type, clientdata) a second time.
+*/
+static void
+SWIG_PropagateClientData(swig_type_info *type) {
+ SWIG_PropagateClientDataTL(*swig_type_list_handle, type);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/* ---------------------------------------------------------------------- -*- c -*-
+ * perl5.swg
+ *
+ * Perl5 runtime library
+ * $Header: /cvsroot/swig/SWIG/Lib/perl5/perlrun.swg,v 1.20 2004/11/29 23:13:57 wuzzeb Exp $
+ * ----------------------------------------------------------------------------- */
+
+#define SWIGPERL
+#define SWIGPERL5
+#ifdef __cplusplus
+/* Needed on some windows machines---since MS plays funny games with the header files under C++ */
+#include <math.h>
+#include <stdlib.h>
+extern "C" {
+#endif
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+/* Get rid of free and malloc defined by perl */
+#undef free
+#undef malloc
+
+#ifndef pTHX_
+#define pTHX_
+#endif
+
+#include <string.h>
+#ifdef __cplusplus
+}
+#endif
+
+/* Macro to call an XS function */
+
+#ifdef PERL_OBJECT
+# define SWIG_CALLXS(_name) _name(cv,pPerl)
+#else
+# ifndef MULTIPLICITY
+# define SWIG_CALLXS(_name) _name(cv)
+# else
+# define SWIG_CALLXS(_name) _name(PERL_GET_THX, cv)
+# endif
+#endif
+
+/* Contract support */
+
+#define SWIG_contract_assert(expr,msg) if (!(expr)) { SWIG_croak(msg); } else
+
+/* Note: SwigMagicFuncHack is a typedef used to get the C++ compiler to just shut up already */
+
+#ifdef PERL_OBJECT
+#define MAGIC_PPERL CPerlObj *pPerl = (CPerlObj *) this;
+typedef int (CPerlObj::*SwigMagicFunc)(SV *, MAGIC *);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef int (CPerlObj::*SwigMagicFuncHack)(SV *, MAGIC *);
+#ifdef __cplusplus
+}
+#endif
+
+#define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
+#define SWIGCLASS_STATIC
+#else
+#define MAGIC_PPERL
+#define SWIGCLASS_STATIC static
+#ifndef MULTIPLICITY
+#define SWIG_MAGIC(a,b) (SV *a, MAGIC *b)
+typedef int (*SwigMagicFunc)(SV *, MAGIC *);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef int (*SwigMagicFuncHack)(SV *, MAGIC *);
+#ifdef __cplusplus
+}
+#endif
+
+
+#else
+#define SWIG_MAGIC(a,b) (struct interpreter *interp, SV *a, MAGIC *b)
+typedef int (*SwigMagicFunc)(struct interpreter *, SV *, MAGIC *);
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef int (*SwigMagicFuncHack)(struct interpreter *, SV *, MAGIC *);
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+#endif
+
+#if defined(WIN32) && defined(PERL_OBJECT) && !defined(PerlIO_exportFILE)
+#define PerlIO_exportFILE(fh,fl) (FILE*)(fh)
+#endif
+
+/* Modifications for newer Perl 5.005 releases */
+
+#if !defined(PERL_REVISION) || ((PERL_REVISION >= 5) && ((PERL_VERSION < 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION < 50))))
+# ifndef PL_sv_yes
+# define PL_sv_yes sv_yes
+# endif
+# ifndef PL_sv_undef
+# define PL_sv_undef sv_undef
+# endif
+# ifndef PL_na
+# define PL_na na
+# endif
+#endif
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SWIG_OWNER 1
+#define SWIG_SHADOW 2
+
+/* Common SWIG API */
+
+#ifdef PERL_OBJECT
+# define SWIG_ConvertPtr(obj, pp, type, flags) \
+ SWIG_Perl_ConvertPtr(pPerl, obj, pp, type, flags)
+# define SWIG_NewPointerObj(p, type, flags) \
+ SWIG_Perl_NewPointerObj(pPerl, p, type, flags)
+# define SWIG_MakePackedObj(sv, p, s, type) \
+ SWIG_Perl_MakePackedObj(pPerl, sv, p, s, type)
+# define SWIG_ConvertPacked(obj, p, s, type, flags) \
+ SWIG_Perl_ConvertPacked(pPerl, obj, p, s, type, flags)
+
+#else
+# define SWIG_ConvertPtr(obj, pp, type, flags) \
+ SWIG_Perl_ConvertPtr(obj, pp, type, flags)
+# define SWIG_NewPointerObj(p, type, flags) \
+ SWIG_Perl_NewPointerObj(p, type, flags)
+# define SWIG_MakePackedObj(sv, p, s, type) \
+ SWIG_Perl_MakePackedObj(sv, p, s, type )
+# define SWIG_ConvertPacked(obj, p, s, type, flags) \
+ SWIG_Perl_ConvertPacked(obj, p, s, type, flags)
+#endif
+
+/* Perl-specific API */
+#ifdef PERL_OBJECT
+# define SWIG_MakePtr(sv, ptr, type, flags) \
+ SWIG_Perl_MakePtr(pPerl, sv, ptr, type, flags)
+# define SWIG_SetError(str) \
+ SWIG_Perl_SetError(pPerl, str)
+#else
+# define SWIG_MakePtr(sv, ptr, type, flags) \
+ SWIG_Perl_MakePtr(sv, ptr, type, flags)
+# define SWIG_SetError(str) \
+ SWIG_Perl_SetError(str)
+# define SWIG_SetErrorSV(str) \
+ SWIG_Perl_SetErrorSV(str)
+#endif
+
+#define SWIG_SetErrorf SWIG_Perl_SetErrorf
+
+
+#ifdef PERL_OBJECT
+# define SWIG_MAYBE_PERL_OBJECT CPerlObj *pPerl,
+#else
+# define SWIG_MAYBE_PERL_OBJECT
+#endif
+
+static swig_type_info **
+SWIG_Perl_GetTypeListHandle() {
+ static void *type_pointer = (void *)0;
+ SV *pointer;
+
+ /* first check if pointer already created */
+ if (!type_pointer) {
+ pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, FALSE);
+ if (pointer && SvOK(pointer)) {
+ type_pointer = INT2PTR(swig_type_info **, SvIV(pointer));
+ }
+ }
+
+ return (swig_type_info **) type_pointer;
+}
+
+/*
+ Search for a swig_type_info structure
+ */
+SWIGRUNTIMEINLINE swig_type_info *
+SWIG_Perl_GetTypeList() {
+ swig_type_info **tlh = SWIG_Perl_GetTypeListHandle();
+ return tlh ? *tlh : (swig_type_info*)0;
+}
+
+#define SWIG_Runtime_GetTypeList SWIG_Perl_GetTypeList
+
+static swig_type_info *
+SWIG_Perl_TypeCheckRV(SWIG_MAYBE_PERL_OBJECT SV *rv, swig_type_info *ty) {
+ swig_type_info *s;
+ if (!ty) return 0; /* Void pointer */
+ s = ty->next; /* First element always just a name */
+ do {
+ if (sv_derived_from(rv, (char *) s->name)) {
+ if (s == ty->next) return s;
+ /* Move s to the top of the linked list */
+ s->prev->next = s->next;
+ if (s->next) {
+ s->next->prev = s->prev;
+ }
+ /* Insert s as second element in the list */
+ s->next = ty->next;
+ if (ty->next) ty->next->prev = s;
+ ty->next = s;
+ s->prev = ty;
+ return s;
+ }
+ s = s->next;
+ } while (s && (s != ty->next));
+ return 0;
+}
+
+/* Function for getting a pointer value */
+
+static int
+SWIG_Perl_ConvertPtr(SWIG_MAYBE_PERL_OBJECT SV *sv, void **ptr, swig_type_info *_t, int flags) {
+ swig_type_info *tc;
+ void *voidptr = (void *)0;
+
+ /* If magical, apply more magic */
+ if (SvGMAGICAL(sv))
+ mg_get(sv);
+
+ /* Check to see if this is an object */
+ if (sv_isobject(sv)) {
+ SV *tsv = (SV*) SvRV(sv);
+ IV tmp = 0;
+ if ((SvTYPE(tsv) == SVt_PVHV)) {
+ MAGIC *mg;
+ if (SvMAGICAL(tsv)) {
+ mg = mg_find(tsv,'P');
+ if (mg) {
+ sv = mg->mg_obj;
+ if (sv_isobject(sv)) {
+ tmp = SvIV((SV*)SvRV(sv));
+ }
+ }
+ } else {
+ return -1;
+ }
+ } else {
+ tmp = SvIV((SV*)SvRV(sv));
+ }
+ voidptr = (void *)tmp;
+ if (!_t) {
+ *(ptr) = voidptr;
+ return 0;
+ }
+ } else if (! SvOK(sv)) { /* Check for undef */
+ *(ptr) = (void *) 0;
+ return 0;
+ } else if (SvTYPE(sv) == SVt_RV) { /* Check for NULL pointer */
+ *(ptr) = (void *) 0;
+ if (!SvROK(sv))
+ return 0;
+ else
+ return -1;
+ } else { /* Don't know what it is */
+ *(ptr) = (void *) 0;
+ return -1;
+ }
+ if (_t) {
+ /* Now see if the types match */
+ char *_c = HvNAME(SvSTASH(SvRV(sv)));
+ tc = SWIG_TypeCheck(_c,_t);
+ if (!tc) {
+ *ptr = voidptr;
+ return -1;
+ }
+ *ptr = SWIG_TypeCast(tc,voidptr);
+ return 0;
+ }
+ *ptr = voidptr;
+ return 0;
+}
+
+static void
+SWIG_Perl_MakePtr(SWIG_MAYBE_PERL_OBJECT SV *sv, void *ptr, swig_type_info *t, int flags) {
+ if (ptr && (flags & SWIG_SHADOW)) {
+ SV *self;
+ SV *obj=newSV(0);
+ HV *hash=newHV();
+ HV *stash;
+ sv_setref_pv(obj, (char *) t->name, ptr);
+ stash=SvSTASH(SvRV(obj));
+ if (flags & SWIG_OWNER) {
+ HV *hv;
+ GV *gv=*(GV**)hv_fetch(stash, "OWNER", 5, TRUE);
+ if (!isGV(gv))
+ gv_init(gv, stash, "OWNER", 5, FALSE);
+ hv=GvHVn(gv);
+ hv_store_ent(hv, obj, newSViv(1), 0);
+ }
+ sv_magic((SV *)hash, (SV *)obj, 'P', Nullch, 0);
+ SvREFCNT_dec(obj);
+ self=newRV_noinc((SV *)hash);
+ sv_setsv(sv, self);
+ SvREFCNT_dec((SV *)self);
+ sv_bless(sv, stash);
+ }
+ else {
+ sv_setref_pv(sv, (char *) t->name, ptr);
+ }
+}
+
+static SWIGINLINE SV *
+SWIG_Perl_NewPointerObj(SWIG_MAYBE_PERL_OBJECT void *ptr, swig_type_info *t, int flags) {
+ SV *result = sv_newmortal();
+ SWIG_MakePtr(result, ptr, t, flags);
+ return result;
+}
+
+static void
+ SWIG_Perl_MakePackedObj(SWIG_MAYBE_PERL_OBJECT SV *sv, void *ptr, int sz, swig_type_info *type) {
+ char result[1024];
+ char *r = result;
+ if ((2*sz + 1 + strlen(type->name)) > 1000) return;
+ *(r++) = '_';
+ r = SWIG_PackData(r,ptr,sz);
+ strcpy(r,type->name);
+ sv_setpv(sv, result);
+}
+
+/* Convert a packed value value */
+static int
+SWIG_Perl_ConvertPacked(SWIG_MAYBE_PERL_OBJECT SV *obj, void *ptr, int sz, swig_type_info *ty, int flags) {
+ swig_type_info *tc;
+ const char *c = 0;
+
+ if ((!obj) || (!SvOK(obj))) return -1;
+ c = SvPV(obj, PL_na);
+ /* Pointer values must start with leading underscore */
+ if (*c != '_') return -1;
+ c++;
+ c = SWIG_UnpackData(c,ptr,sz);
+ if (ty) {
+ tc = SWIG_TypeCheck(c,ty);
+ if (!tc) return -1;
+ }
+ return 0;
+}
+
+static SWIGINLINE void
+SWIG_Perl_SetError(SWIG_MAYBE_PERL_OBJECT const char *error) {
+ if (error) sv_setpv(perl_get_sv("@", TRUE), error);
+}
+
+static SWIGINLINE void
+SWIG_Perl_SetErrorSV(SWIG_MAYBE_PERL_OBJECT SV *error) {
+ if (error) sv_setsv(perl_get_sv("@", TRUE), error);
+}
+
+static void
+SWIG_Perl_SetErrorf(const char *fmt, ...) {
+ va_list args;
+ va_start(args, fmt);
+ sv_vsetpvfn(perl_get_sv("@", TRUE), fmt, strlen(fmt), &args, Null(SV**), 0, Null(bool*));
+ va_end(args);
+}
+
+/* Macros for low-level exception handling */
+#define SWIG_fail goto fail
+#define SWIG_croak(x) { SWIG_SetError(x); goto fail; }
+#define SWIG_croakSV(x) { SWIG_SetErrorSV(x); goto fail; }
+/* most preprocessors do not support vararg macros :-( */
+/* #define SWIG_croakf(x...) { SWIG_SetErrorf(x); goto fail; } */
+
+
+typedef XS(SwigPerlWrapper);
+typedef SwigPerlWrapper *SwigPerlWrapperPtr;
+
+/* Structure for command table */
+typedef struct {
+ const char *name;
+ SwigPerlWrapperPtr wrapper;
+} swig_command_info;
+
+/* Information for constant table */
+
+#define SWIG_INT 1
+#define SWIG_FLOAT 2
+#define SWIG_STRING 3
+#define SWIG_POINTER 4
+#define SWIG_BINARY 5
+
+/* Constant information structure */
+typedef struct swig_constant_info {
+ int type;
+ const char *name;
+ long lvalue;
+ double dvalue;
+ void *pvalue;
+ swig_type_info **ptype;
+} swig_constant_info;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Structure for variable table */
+typedef struct {
+ const char *name;
+ SwigMagicFunc set;
+ SwigMagicFunc get;
+ swig_type_info **type;
+} swig_variable_info;
+
+/* Magic variable code */
+#ifndef PERL_OBJECT
+#define swig_create_magic(s,a,b,c) _swig_create_magic(s,a,b,c)
+ #ifndef MULTIPLICITY
+ static void _swig_create_magic(SV *sv, char *name, int (*set)(SV *, MAGIC *), int (*get)(SV *,MAGIC *)) {
+ #else
+ static void _swig_create_magic(SV *sv, char *name, int (*set)(struct interpreter*, SV *, MAGIC *), int (*get)(struct interpreter*, SV *,MAGIC *)) {
+ #endif
+#else
+# define swig_create_magic(s,a,b,c) _swig_create_magic(pPerl,s,a,b,c)
+static void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, int (CPerlObj::*set)(SV *, MAGIC *), int (CPerlObj::*get)(SV *, MAGIC *)) {
+#endif
+ MAGIC *mg;
+ sv_magic(sv,sv,'U',(char *) name,strlen(name));
+ mg = mg_find(sv,'U');
+ mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
+ mg->mg_virtual->svt_get = (SwigMagicFuncHack) get;
+ mg->mg_virtual->svt_set = (SwigMagicFuncHack) set;
+ mg->mg_virtual->svt_len = 0;
+ mg->mg_virtual->svt_clear = 0;
+ mg->mg_virtual->svt_free = 0;
+}
+
+
+
+
+
+
+#ifdef do_open
+ #undef do_open
+#endif
+#ifdef do_close
+ #undef do_close
+#endif
+#ifdef scalar
+ #undef scalar
+#endif
+#ifdef list
+ #undef list
+#endif
+#ifdef apply
+ #undef apply
+#endif
+#ifdef convert
+ #undef convert
+#endif
+#ifdef Error
+ #undef Error
+#endif
+#ifdef form
+ #undef form
+#endif
+#ifdef vform
+ #undef vform
+#endif
+#ifdef LABEL
+ #undef LABEL
+#endif
+#ifdef METHOD
+ #undef METHOD
+#endif
+#ifdef Move
+ #undef Move
+#endif
+#ifdef yylex
+ #undef yylex
+#endif
+#ifdef yyparse
+ #undef yyparse
+#endif
+#ifdef yyerror
+ #undef yyerror
+#endif
+#ifdef invert
+ #undef invert
+#endif
+#ifdef ref
+ #undef ref
+#endif
+#ifdef ENTER
+ #undef ENTER
+#endif
+
+
+/* -------- TYPES TABLE (BEGIN) -------- */
+
+static swig_type_info *swig_types[1];
+
+/* -------- TYPES TABLE (END) -------- */
+
+#define SWIG_init boot_DumpRenderTreeSupport
+
+#define SWIG_name "DumpRenderTreeSupportc::boot_DumpRenderTreeSupport"
+#define SWIG_prefix "DumpRenderTreeSupportc::"
+
+#ifdef __cplusplus
+extern "C"
+#endif
+#ifndef PERL_OBJECT
+#ifndef MULTIPLICITY
+SWIGEXPORT(void) SWIG_init (CV* cv);
+#else
+SWIGEXPORT(void) SWIG_init (pTHXo_ CV* cv);
+#endif
+#else
+SWIGEXPORT(void) SWIG_init (CV *cv, CPerlObj *);
+#endif
+
+int processIsCrashing(int);
+#ifdef PERL_OBJECT
+#define MAGIC_CLASS _wrap_DumpRenderTreeSupport_var::
+class _wrap_DumpRenderTreeSupport_var : public CPerlObj {
+public:
+#else
+#define MAGIC_CLASS
+#endif
+SWIGCLASS_STATIC int swig_magic_readonly(pTHX_ SV *sv, MAGIC *mg) {
+ MAGIC_PPERL
+ sv = sv; mg = mg;
+ croak("Value is read-only.");
+ return 0;
+}
+
+
+#ifdef PERL_OBJECT
+};
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XS(_wrap_processIsCrashing) {
+ {
+ int arg1 ;
+ int result;
+ int argvi = 0;
+ dXSARGS;
+
+ if ((items < 1) || (items > 1)) {
+ SWIG_croak("Usage: processIsCrashing(pid);");
+ }
+ arg1 = (int) SvIV(ST(0));
+ result = (int)processIsCrashing(arg1);
+
+ ST(argvi) = sv_newmortal();
+ sv_setiv(ST(argvi++), (IV) result);
+ XSRETURN(argvi);
+ fail:
+ ;
+ }
+ croak(Nullch);
+}
+
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+
+
+static swig_type_info *swig_types_initial[] = {
+0
+};
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
+
+static swig_constant_info swig_constants[] = {
+{0,0,0,0,0,0}
+};
+#ifdef __cplusplus
+}
+#endif
+static swig_variable_info swig_variables[] = {
+{0,0,0,0}
+};
+static swig_command_info swig_commands[] = {
+{"DumpRenderTreeSupportc::processIsCrashing", _wrap_processIsCrashing},
+{0,0}
+};
+
+
+static void SWIG_Perl_SetTypeListHandle(swig_type_info **handle) {
+ SV *pointer;
+
+ /* create a new pointer */
+ pointer = get_sv("swig_runtime_data::type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, TRUE);
+ sv_setiv(pointer, PTR2IV(swig_type_list_handle));
+}
+
+static swig_type_info **
+SWIG_Perl_LookupTypePointer(swig_type_info **type_list_handle) {
+ swig_type_info **type_pointer;
+
+ /* first check if module already created */
+ type_pointer = SWIG_Perl_GetTypeListHandle();
+ if (type_pointer) {
+ return type_pointer;
+ } else {
+ /* create a new module and variable */
+ SWIG_Perl_SetTypeListHandle(type_list_handle);
+ return type_list_handle;
+ }
+}
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+
+XS(SWIG_init) {
+ dXSARGS;
+ int i;
+ static int _init = 0;
+ if (!_init) {
+ swig_type_list_handle = SWIG_Perl_LookupTypePointer(swig_type_list_handle);
+ for (i = 0; swig_types_initial[i]; i++) {
+ swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]);
+ }
+ _init = 1;
+ }
+
+ /* Install commands */
+ for (i = 0; swig_commands[i].name; i++) {
+ newXS((char*) swig_commands[i].name,swig_commands[i].wrapper, (char*)__FILE__);
+ }
+
+ /* Install variables */
+ for (i = 0; swig_variables[i].name; i++) {
+ SV *sv;
+ sv = perl_get_sv((char*) swig_variables[i].name, TRUE | 0x2);
+ if (swig_variables[i].type) {
+ SWIG_MakePtr(sv,(void *)1, *swig_variables[i].type,0);
+ } else {
+ sv_setiv(sv,(IV) 0);
+ }
+ swig_create_magic(sv, (char *) swig_variables[i].name, swig_variables[i].set, swig_variables[i].get);
+ }
+
+ /* Install constant */
+ for (i = 0; swig_constants[i].type; i++) {
+ SV *sv;
+ sv = perl_get_sv((char*)swig_constants[i].name, TRUE | 0x2);
+ switch(swig_constants[i].type) {
+ case SWIG_INT:
+ sv_setiv(sv, (IV) swig_constants[i].lvalue);
+ break;
+ case SWIG_FLOAT:
+ sv_setnv(sv, (double) swig_constants[i].dvalue);
+ break;
+ case SWIG_STRING:
+ sv_setpv(sv, (char *) swig_constants[i].pvalue);
+ break;
+ case SWIG_POINTER:
+ SWIG_MakePtr(sv, swig_constants[i].pvalue, *(swig_constants[i].ptype),0);
+ break;
+ case SWIG_BINARY:
+ SWIG_MakePackedObj(sv, swig_constants[i].pvalue, swig_constants[i].lvalue, *(swig_constants[i].ptype));
+ break;
+ default:
+ break;
+ }
+ SvREADONLY_on(sv);
+ }
+
+ ST(0) = &PL_sv_yes;
+ XSRETURN(1);
+}
+
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationChanges"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Changes (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Changes (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Changes 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+Revision history for Perl extension IPhoneSimulatorNotification.
+
+1.00 Fri Sep 18 19:59:28 2009
+ - original version; created by h2xs 1.23 with options
+ -A -b 5.8.0 -n IPhoneSimulatorNotification
+
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationIPhoneSimulatorNotificationxsfromrev162816trunkToolsDumpRenderTreemacHistoryDelegateh"></a>
<div class="copfile"><h4>Copied: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/IPhoneSimulatorNotification.xs (from rev 162816, trunk/Tools/DumpRenderTree/mac/HistoryDelegate.h) (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/IPhoneSimulatorNotification.xs (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/IPhoneSimulatorNotification.xs 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2009 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. ``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
+ * 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 "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+#include "ppport.h"
+
+#import <Foundation/Foundation.h>
+
+@interface IPhoneSimulatorNotification : NSObject
+@end
+
+@implementation IPhoneSimulatorNotification
+- (void)readyNotificationCallback { }
+- (void)applicationLaunchedNotificationCallback:(NSNotification *)notification { }
+- (void)applicationQuitNotificationCallback:(NSNotification *)notification { }
+@end
+
+MODULE = IPhoneSimulatorNotification PACKAGE = IPhoneSimulatorNotification
+
+PROTOTYPES: ENABLE
+
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationMANIFEST"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/MANIFEST (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/MANIFEST (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/MANIFEST 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+Changes
+IPhoneSimulatorNotification.xs
+Makefile.PL
+MANIFEST
+ppport.h
+README
+t/IPhoneSimulatorNotification.t
+lib/IPhoneSimulatorNotification.pm
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationMakefilePL"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Makefile.PL (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Makefile.PL (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/Makefile.PL 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+# Copyright (C) 2009 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.
+# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
+
+use 5.008000;
+use Config;
+use ExtUtils::MakeMaker;
+
+chomp(my $cc = my $ld = `xcrun -sdk $ENV{SDKROOT} -find clang`);
+
+# Remove -arch flags (especially "-arch ppc") from linker flags.
+my $archflags = join(" ", map { ("-arch", $_) } split(" ", $ENV{ARCHS})) . " ";
+my $config_ldflags = $Config{ldflags};
+$config_ldflags =~ s/-arch \S+( |$)//g;
+$config_ldflags = $archflags . $config_ldflags;
+my $config_lddlflags = $Config{lddlflags};
+$config_lddlflags =~ s/-arch \S+( |$)//g;
+$config_lddlflags = $archflags . $config_lddlflags;
+
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+ NAME => 'IPhoneSimulatorNotification',
+ VERSION_FROM => 'lib/IPhoneSimulatorNotification.pm', # finds $VERSION
+ PREREQ_PM => {}, # e.g., Module::Name => 1.1
+ ($] >= 5.005 ? ## Add these new keywords supported since 5.005
+ (ABSTRACT_FROM => 'lib/IPhoneSimulatorNotification.pm', # retrieve abstract from module
+ AUTHOR => 'David Kilzer <ddkilzer@apple.com>') : ()),
+ LIBS => [''], # e.g., '-lm'
+ CC => $cc,
+ CCFLAGS => "-x objective-c $archflags",
+ LD => $ld,
+ LDDLFLAGS => $config_lddlflags,
+ LDFLAGS => $config_ldflags,
+ DEFINE => '', # e.g., '-DHAVE_SOMETHING'
+ INC => '-I.', # e.g., '-I. -I/usr/include/other'
+ # Un-comment this if you add C files to link with later:
+ # OBJECT => '$(O_FILES)', # link all the C files too
+);
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationREADME"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/README (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/README (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/README 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+IPhoneSimulatorNotification version 1.00
+========================================
+
+The IPhoneSimulatorNotification module is used to receive distributed
+notifications from the iPhone Simulator.
+
+INSTALLATION
+
+To install this module type the following:
+
+ perl Makefile.PL
+ make
+ make test
+ make install
+
+DEPENDENCIES
+
+This module requires these other modules and libraries:
+
+ Foundation
+ PerlObjCBridge
+
+COPYRIGHT AND LICENCE
+
+Copyright (C) 2009 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. ``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
+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.
+
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationlibIPhoneSimulatorNotificationpm"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,404 @@
</span><ins>+# Copyright (C) 2009 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.
+# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+# its contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
+
+package IPhoneSimulatorNotification;
+
+use 5.008000;
+use strict;
+use warnings;
+
+require Exporter;
+
+our @ISA = qw(DynaLoader Exporter);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration use IPhoneSimulatorNotification ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+our %EXPORT_TAGS = ( 'all' => [ qw(
+
+) ] );
+
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+our @EXPORT = qw(
+ &applicationLaunchedApplicationPID
+ &applicationLaunchedSessionUUID
+ &hasReceivedApplicationLaunchedNotification
+ &hasReceivedApplicationQuitNotification
+ &hasReceivedReadyNotification
+ &new
+ &postEndSessionNotification
+ &postStartSessionNotification
+ &readyNotificationCallback
+ &setHasReceivedReadyNotification
+ &startObservingApplicationLaunchedNotification
+ &startObservingApplicationQuitNotification
+ &startObservingReadyNotification
+ &stopObservingApplicationLaunchedNotification
+ &stopObservingApplicationQuitNotification
+ &stopObservingReadyNotification
+);
+
+our $VERSION = '1.01';
+
+require XSLoader;
+XSLoader::load('IPhoneSimulatorNotification', $VERSION);
+
+# Preloaded methods go here.
+
+use Foundation;
+
+PerlObjCBridge::preloadSelectors('IPhoneSimulatorNotification');
+
+sub new
+{
+ my $class = shift;
+
+ my $self = {};
+ $self->{hasReceivedApplicationLaunchedNotification} = {};
+ $self->{hasReceivedApplicationQuitNotification} = {};
+ $self->{hasReceivedReadyNotification} = 0;
+ bless($self, $class);
+
+ return $self;
+}
+
+sub DESTROY
+{
+ my $self = shift;
+
+ $self->stopObservingReadyNotification();
+}
+
+sub applicationLaunchedNotificationCallback_
+{
+ my $self = shift;
+ my $nsNotification = shift;
+ my $userInfo = $nsNotification->userInfo();
+
+ my $keyObject;
+ my $enumerator = $userInfo->keyEnumerator();
+ while ($keyObject = $enumerator->nextObject() and $$keyObject) {
+ my $key = $keyObject->UTF8String();
+ my $valueObject = $userInfo->objectForKey_($keyObject);
+ if ($key eq "errorString") {
+ die "iPhone Simulator returned error: " . $valueObject->UTF8String();
+ } elsif ($key eq "applicationPID") {
+ $self->{hasReceivedApplicationLaunchedNotification}->{applicationPID} = $valueObject->intValue();
+ } elsif ($key eq "sessionUUID") {
+ $self->{hasReceivedApplicationLaunchedNotification}->{sessionUUID} = $valueObject->UTF8String();
+ }
+ }
+}
+
+sub applicationQuitNotificationCallback_
+{
+ my $self = shift;
+ my $nsNotification = shift;
+ my $userInfo = $nsNotification->userInfo();
+
+ my $keyObject;
+ my $enumerator = $userInfo->keyEnumerator();
+ while ($keyObject = $enumerator->nextObject() and $$keyObject) {
+ my $key = $keyObject->UTF8String();
+ my $valueObject = $userInfo->objectForKey_($keyObject);
+ if ($key eq "errorString") {
+ my $errorString = $valueObject->UTF8String();
+ warn "iPhone Simulator returned error: " . $errorString
+ unless $errorString eq "The simulated application quit.";
+ } elsif ($key eq "sessionUUID") {
+ $self->{hasReceivedApplicationQuitNotification}->{sessionUUID} = $valueObject->UTF8String();
+ }
+ }
+}
+
+sub readyNotificationCallback
+{
+ my $self = shift;
+ $self->setHasReceivedReadyNotification(1);
+}
+
+sub applicationLaunchedApplicationPID
+{
+ my $self = shift;
+ return $self->{hasReceivedApplicationLaunchedNotification}->{applicationPID};
+}
+
+sub applicationLaunchedSessionUUID
+{
+ my $self = shift;
+ return $self->{hasReceivedApplicationLaunchedNotification}->{sessionUUID};
+}
+
+sub hasReceivedApplicationLaunchedNotification
+{
+ my $self = shift;
+ return scalar(keys(%{$self->{hasReceivedApplicationLaunchedNotification}})) > 0;
+}
+
+sub hasReceivedApplicationQuitNotification
+{
+ my $self = shift;
+ return scalar(keys(%{$self->{hasReceivedApplicationQuitNotification}})) > 0;
+}
+
+sub hasReceivedReadyNotification
+{
+ my $self = shift;
+ return $self->{hasReceivedReadyNotification};
+}
+
+sub postEndSessionNotification
+{
+ my $self = shift;
+ my $dict = shift;
+
+ my $userInfo = NSMutableDictionary->dictionaryWithCapacity_(2);
+ for my $property (qw(dontQuit sessionUUID)) {
+ if (exists $dict->{$property}) {
+ my $key = NSString->stringWithCString_($property);
+ my $value = $dict->{$property};
+ $userInfo->setObject_forKey_($value, $key);
+ }
+ }
+ $userInfo->setObject_forKey_(NSNumber->numberWithInt_(1), NSString->stringWithCString_("version"));
+
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->postNotificationName_object_userInfo_("com.apple.iphonesimulator.endSession", undef, $userInfo);
+}
+
+sub postStartSessionNotification
+{
+ my $self = shift;
+ my $dict = shift;
+
+ my $userInfo = NSMutableDictionary->dictionaryWithCapacity_(4);
+ for my $property (qw(applicationArguments applicationEnvironment applicationIdentifier applicationPath deviceFamily deviceInfo productType sessionOwner sessionUUID sdkRoot version waitForDebugger)) {
+ if (exists $dict->{$property}) {
+ my $key = NSString->stringWithCString_($property);
+ my $value = $dict->{$property};
+ $userInfo->setObject_forKey_($value, $key);
+ }
+ }
+ $userInfo->setObject_forKey_(NSNumber->numberWithInt_(1), NSString->stringWithCString_("version"));
+
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->postNotificationName_object_userInfo_("com.apple.iphonesimulator.startSession", undef, $userInfo);
+}
+
+sub setHasReceivedReadyNotification
+{
+ my $self = shift;
+ $self->{hasReceivedReadyNotification} = shift;
+}
+
+sub startObservingApplicationLaunchedNotification
+{
+ my $self = shift;
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->addObserver_selector_name_object_($self, 'applicationLaunchedNotificationCallback:', "com.apple.iphonesimulator.applicationLaunched", undef);
+}
+
+sub startObservingApplicationQuitNotification
+{
+ my $self = shift;
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->addObserver_selector_name_object_($self, 'applicationQuitNotificationCallback:', "com.apple.iphonesimulator.applicationQuit", undef);
+}
+
+sub startObservingReadyNotification
+{
+ my $self = shift;
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->addObserver_selector_name_object_($self, 'readyNotificationCallback', "com.apple.iphonesimulator.ready", undef);
+}
+
+sub stopObservingApplicationLaunchedNotification
+{
+ my $self = shift;
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->removeObserver_name_object_($self, "com.apple.iphonesimulator.applicationLaunched", undef);
+}
+
+sub stopObservingApplicationQuitNotification
+{
+ my $self = shift;
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->removeObserver_name_object_($self, "com.apple.iphonesimulator.applicationQuit", undef);
+}
+
+sub stopObservingReadyNotification
+{
+ my $self = shift;
+ my $center = NSDistributedNotificationCenter->defaultCenter();
+ $center->removeObserver_name_object_($self, "com.apple.iphonesimulator.ready", undef);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+IPhoneSimulatorNotification - Perl extension for receiving distributed notifications from the iPhone Simulator
+
+=head1 SYNOPSIS
+
+ use IPhoneSimulatorNotification;
+
+ my $iphoneSimulatorNotification = new IPhoneSimulatorNotification;
+ $iphoneSimulatorNotification->startObservingReadyNotification();
+
+ while (!$iphoneSimulatorNotification->hasReceivedReadyNotification()) {
+ my $date = NSDate->dateWithTimeIntervalSinceNow(0.1);
+ NSRunLoop->currentRunLoop->runUntilDate($date);
+ }
+
+ $iphoneSimulatorNotification->stopObservingReadyNotification();
+
+=head1 DESCRIPTION
+
+IPhoneSimulatorNotification is used to receive distributed notifications
+from the iPhone Simulator.
+
+=head2 Export
+
+C<&applicationLaunchedApplicationPID>,
+C<&applicationLaunchedSessionUUID>,
+C<&hasReceivedApplicationLaunchedNotification>,
+C<&hasReceivedApplicationQuitNotification>,
+C<&hasReceivedReadyNotification>,
+C<&new>,
+C<&postEndSessionNotification>,
+C<&postStartSessionNotification>,
+C<&readyNotificationCallback>,
+C<&setHasReceivedReadyNotification>,
+C<&startObservingApplicationLaunchedNotification>,
+C<&startObservingApplicationQuitNotification>,
+C<&startObservingReadyNotification>,
+C<&stopObservingApplicationLaunchedNotification>,
+C<&stopObservingApplicationQuitNotification>,
+and
+C<&stopObservingReadyNotification>
+are exported by default.
+
+=head2 Methods
+
+=over 4
+
+=item applicationLaunchedApplicationPID()
+
+Returns the PID of the launched application after the application launched
+distributed notification has been received.
+
+=item applicationLaunchedSessionUUID()
+
+Returns the session UUID of the launched application after the application
+launched distributed notification has been received.
+
+=item hasReceivedApplicationLaunchedNotification()
+
+Returns true if the "com.apple.iphonesimulator.applicationLaunched"
+distributed notification has been received, else false.
+
+=item hasReceivedApplicationQuitNotification()
+
+Returns true if the "com.apple.iphonesimulator.applicationQuit" distributed
+notification has been received, else false.
+
+=item hasReceivedReadyNotification()
+
+Returns 1 if the "com.apple.iphonesimulator.ready" distributed notification
+has been received from the iPhone Simulator, else returns 0.
+
+Note that if you want to reuse the IPhoneSimulatorNotification object, you
+must reset the internal state using the C<&setHasReceivedReadyNotification>
+method.
+
+=item new()
+
+Creates a new IPhoneSimulatorNotification object.
+
+=item postEndSessionNotification()
+
+Sends "com.apple.iphonesimulator.endSession" distributed notification for
+the iPhone Simulator process.
+
+=item postStartSessionNotification()
+
+Sends "com.apple.iphonesimulator.startSession" distributed notification
+for the iPhone Simulator process.
+
+=item readyNotificationCallback()
+
+Method used to receive the "com.apple.iphonesimulator.ready" distributed
+notification. Calls C<&setHasReceivedReadyNotification> to set the value
+to 1.
+
+=item setHasReceivedReadyNotification($)
+
+Sets the internal state to the value provided. Should be 0 or 1.
+
+=item startObservingApplicationLaunchedNotification()
+
+Starts observing the "com.apple.iphonesimulator.applicationLaunched"
+distributed notification.
+
+=item startObservingApplicationQuitNotification()
+
+Starts observing the "com.apple.iphonesimulator.applicationQuit"
+distributed notification.
+
+=item startObservingReadyNotification()
+
+Starts observing the "com.apple.iphonesimulator.ready" distributed
+notification.
+
+=item stopObservingApplicationLaunchedNotification()
+
+Stops observing the "com.apple.iphonesimulator.applicationLaunched"
+distributed notification.
+
+=item stopObservingApplicationQuitNotification()
+
+Stops observing the "com.apple.iphonesimulator.applicationQuit"
+distributed notification.
+
+=item stopObservingReadyNotification()
+
+Stops observing the "com.apple.iphonesimulator.ready" distributed
+notification.
+
+=back
+
+=head1 SEE ALSO
+
+L<Foundation> and L<PerlObjCBridge>.
+
+=cut
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationppporth"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/ppport.h (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/ppport.h (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/ppport.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,6376 @@
</span><ins>+#if 0
+<<'SKIP';
+#endif
+/*
+----------------------------------------------------------------------
+
+ ppport.h -- Perl/Pollution/Portability Version 3.13
+
+ Automatically created by Devel::PPPort running under perl 5.010000.
+
+ Do NOT edit this file directly! -- Edit PPPort_pm.PL and the
+ includes in parts/inc/ instead.
+
+ Use 'perldoc ppport.h' to view the documentation below.
+
+----------------------------------------------------------------------
+
+SKIP
+
+=pod
+
+=head1 NAME
+
+ppport.h - Perl/Pollution/Portability version 3.13
+
+=head1 SYNOPSIS
+
+ perl ppport.h [options] [source files]
+
+ Searches current directory for files if no [source files] are given
+
+ --help show short help
+
+ --version show version
+
+ --patch=file write one patch file with changes
+ --copy=suffix write changed copies with suffix
+ --diff=program use diff program and options
+
+ --compat-version=version provide compatibility with Perl version
+ --cplusplus accept C++ comments
+
+ --quiet don't output anything except fatal errors
+ --nodiag don't show diagnostics
+ --nohints don't show hints
+ --nochanges don't suggest changes
+ --nofilter don't filter input files
+
+ --strip strip all script and doc functionality from
+ ppport.h
+
+ --list-provided list provided API
+ --list-unsupported list unsupported API
+ --api-info=name show Perl API portability information
+
+=head1 COMPATIBILITY
+
+This version of F<ppport.h> is designed to support operation with Perl
+installations back to 5.003, and has been tested up to 5.10.0.
+
+=head1 OPTIONS
+
+=head2 --help
+
+Display a brief usage summary.
+
+=head2 --version
+
+Display the version of F<ppport.h>.
+
+=head2 --patch=I<file>
+
+If this option is given, a single patch file will be created if
+any changes are suggested. This requires a working diff program
+to be installed on your system.
+
+=head2 --copy=I<suffix>
+
+If this option is given, a copy of each file will be saved with
+the given suffix that contains the suggested changes. This does
+not require any external programs. Note that this does not
+automagially add a dot between the original filename and the
+suffix. If you want the dot, you have to include it in the option
+argument.
+
+If neither C<--patch> or C<--copy> are given, the default is to
+simply print the diffs for each file. This requires either
+C<Text::Diff> or a C<diff> program to be installed.
+
+=head2 --diff=I<program>
+
+Manually set the diff program and options to use. The default
+is to use C<Text::Diff>, when installed, and output unified
+context diffs.
+
+=head2 --compat-version=I<version>
+
+Tell F<ppport.h> to check for compatibility with the given
+Perl version. The default is to check for compatibility with Perl
+version 5.003. You can use this option to reduce the output
+of F<ppport.h> if you intend to be backward compatible only
+down to a certain Perl version.
+
+=head2 --cplusplus
+
+Usually, F<ppport.h> will detect C++ style comments and
+replace them with C style comments for portability reasons.
+Using this option instructs F<ppport.h> to leave C++
+comments untouched.
+
+=head2 --quiet
+
+Be quiet. Don't print anything except fatal errors.
+
+=head2 --nodiag
+
+Don't output any diagnostic messages. Only portability
+alerts will be printed.
+
+=head2 --nohints
+
+Don't output any hints. Hints often contain useful portability
+notes. Warnings will still be displayed.
+
+=head2 --nochanges
+
+Don't suggest any changes. Only give diagnostic output and hints
+unless these are also deactivated.
+
+=head2 --nofilter
+
+Don't filter the list of input files. By default, files not looking
+like source code (i.e. not *.xs, *.c, *.cc, *.cpp or *.h) are skipped.
+
+=head2 --strip
+
+Strip all script and documentation functionality from F<ppport.h>.
+This reduces the size of F<ppport.h> dramatically and may be useful
+if you want to include F<ppport.h> in smaller modules without
+increasing their distribution size too much.
+
+The stripped F<ppport.h> will have a C<--unstrip> option that allows
+you to undo the stripping, but only if an appropriate C<Devel::PPPort>
+module is installed.
+
+=head2 --list-provided
+
+Lists the API elements for which compatibility is provided by
+F<ppport.h>. Also lists if it must be explicitly requested,
+if it has dependencies, and if there are hints or warnings for it.
+
+=head2 --list-unsupported
+
+Lists the API elements that are known not to be supported by
+F<ppport.h> and below which version of Perl they probably
+won't be available or work.
+
+=head2 --api-info=I<name>
+
+Show portability information for API elements matching I<name>.
+If I<name> is surrounded by slashes, it is interpreted as a regular
+expression.
+
+=head1 DESCRIPTION
+
+In order for a Perl extension (XS) module to be as portable as possible
+across differing versions of Perl itself, certain steps need to be taken.
+
+=over 4
+
+=item *
+
+Including this header is the first major one. This alone will give you
+access to a large part of the Perl API that hasn't been available in
+earlier Perl releases. Use
+
+ perl ppport.h --list-provided
+
+to see which API elements are provided by ppport.h.
+
+=item *
+
+You should avoid using deprecated parts of the API. For example, using
+global Perl variables without the C<PL_> prefix is deprecated. Also,
+some API functions used to have a C<perl_> prefix. Using this form is
+also deprecated. You can safely use the supported API, as F<ppport.h>
+will provide wrappers for older Perl versions.
+
+=item *
+
+If you use one of a few functions or variables that were not present in
+earlier versions of Perl, and that can't be provided using a macro, you
+have to explicitly request support for these functions by adding one or
+more C<#define>s in your source code before the inclusion of F<ppport.h>.
+
+These functions or variables will be marked C<explicit> in the list shown
+by C<--list-provided>.
+
+Depending on whether you module has a single or multiple files that
+use such functions or variables, you want either C<static> or global
+variants.
+
+For a C<static> function or variable (used only in a single source
+file), use:
+
+ #define NEED_function
+ #define NEED_variable
+
+For a global function or variable (used in multiple source files),
+use:
+
+ #define NEED_function_GLOBAL
+ #define NEED_variable_GLOBAL
+
+Note that you mustn't have more than one global request for the
+same function or variable in your project.
+
+ Function / Variable Static Request Global Request
+ -----------------------------------------------------------------------------------------
+ PL_signals NEED_PL_signals NEED_PL_signals_GLOBAL
+ eval_pv() NEED_eval_pv NEED_eval_pv_GLOBAL
+ grok_bin() NEED_grok_bin NEED_grok_bin_GLOBAL
+ grok_hex() NEED_grok_hex NEED_grok_hex_GLOBAL
+ grok_number() NEED_grok_number NEED_grok_number_GLOBAL
+ grok_numeric_radix() NEED_grok_numeric_radix NEED_grok_numeric_radix_GLOBAL
+ grok_oct() NEED_grok_oct NEED_grok_oct_GLOBAL
+ load_module() NEED_load_module NEED_load_module_GLOBAL
+ my_snprintf() NEED_my_snprintf NEED_my_snprintf_GLOBAL
+ my_strlcat() NEED_my_strlcat NEED_my_strlcat_GLOBAL
+ my_strlcpy() NEED_my_strlcpy NEED_my_strlcpy_GLOBAL
+ newCONSTSUB() NEED_newCONSTSUB NEED_newCONSTSUB_GLOBAL
+ newRV_noinc() NEED_newRV_noinc NEED_newRV_noinc_GLOBAL
+ newSVpvn_share() NEED_newSVpvn_share NEED_newSVpvn_share_GLOBAL
+ sv_2pv_flags() NEED_sv_2pv_flags NEED_sv_2pv_flags_GLOBAL
+ sv_2pvbyte() NEED_sv_2pvbyte NEED_sv_2pvbyte_GLOBAL
+ sv_catpvf_mg() NEED_sv_catpvf_mg NEED_sv_catpvf_mg_GLOBAL
+ sv_catpvf_mg_nocontext() NEED_sv_catpvf_mg_nocontext NEED_sv_catpvf_mg_nocontext_GLOBAL
+ sv_pvn_force_flags() NEED_sv_pvn_force_flags NEED_sv_pvn_force_flags_GLOBAL
+ sv_setpvf_mg() NEED_sv_setpvf_mg NEED_sv_setpvf_mg_GLOBAL
+ sv_setpvf_mg_nocontext() NEED_sv_setpvf_mg_nocontext NEED_sv_setpvf_mg_nocontext_GLOBAL
+ vload_module() NEED_vload_module NEED_vload_module_GLOBAL
+ vnewSVpvf() NEED_vnewSVpvf NEED_vnewSVpvf_GLOBAL
+ warner() NEED_warner NEED_warner_GLOBAL
+
+To avoid namespace conflicts, you can change the namespace of the
+explicitly exported functions / variables using the C<DPPP_NAMESPACE>
+macro. Just C<#define> the macro before including C<ppport.h>:
+
+ #define DPPP_NAMESPACE MyOwnNamespace_
+ #include "ppport.h"
+
+The default namespace is C<DPPP_>.
+
+=back
+
+The good thing is that most of the above can be checked by running
+F<ppport.h> on your source code. See the next section for
+details.
+
+=head1 EXAMPLES
+
+To verify whether F<ppport.h> is needed for your module, whether you
+should make any changes to your code, and whether any special defines
+should be used, F<ppport.h> can be run as a Perl script to check your
+source code. Simply say:
+
+ perl ppport.h
+
+The result will usually be a list of patches suggesting changes
+that should at least be acceptable, if not necessarily the most
+efficient solution, or a fix for all possible problems.
+
+If you know that your XS module uses features only available in
+newer Perl releases, if you're aware that it uses C++ comments,
+and if you want all suggestions as a single patch file, you could
+use something like this:
+
+ perl ppport.h --compat-version=5.6.0 --cplusplus --patch=test.diff
+
+If you only want your code to be scanned without any suggestions
+for changes, use:
+
+ perl ppport.h --nochanges
+
+You can specify a different C<diff> program or options, using
+the C<--diff> option:
+
+ perl ppport.h --diff='diff -C 10'
+
+This would output context diffs with 10 lines of context.
+
+If you want to create patched copies of your files instead, use:
+
+ perl ppport.h --copy=.new
+
+To display portability information for the C<newSVpvn> function,
+use:
+
+ perl ppport.h --api-info=newSVpvn
+
+Since the argument to C<--api-info> can be a regular expression,
+you can use
+
+ perl ppport.h --api-info=/_nomg$/
+
+to display portability information for all C<_nomg> functions or
+
+ perl ppport.h --api-info=/./
+
+to display information for all known API elements.
+
+=head1 BUGS
+
+If this version of F<ppport.h> is causing failure during
+the compilation of this module, please check if newer versions
+of either this module or C<Devel::PPPort> are available on CPAN
+before sending a bug report.
+
+If F<ppport.h> was generated using the latest version of
+C<Devel::PPPort> and is causing failure of this module, please
+file a bug report using the CPAN Request Tracker at L<http://rt.cpan.org/>.
+
+Please include the following information:
+
+=over 4
+
+=item 1.
+
+The complete output from running "perl -V"
+
+=item 2.
+
+This file.
+
+=item 3.
+
+The name and version of the module you were trying to build.
+
+=item 4.
+
+A full log of the build that failed.
+
+=item 5.
+
+Any other information that you think could be relevant.
+
+=back
+
+For the latest version of this code, please get the C<Devel::PPPort>
+module from CPAN.
+
+=head1 COPYRIGHT
+
+Version 3.x, Copyright (c) 2004-2007, Marcus Holland-Moritz.
+
+Version 2.x, Copyright (C) 2001, Paul Marquess.
+
+Version 1.x, Copyright (C) 1999, Kenneth Albanowski.
+
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+
+=head1 SEE ALSO
+
+See L<Devel::PPPort>.
+
+=cut
+
+use strict;
+
+# Disable broken TRIE-optimization
+BEGIN { eval '${^RE_TRIE_MAXBUF} = -1' if $] >= 5.009004 && $] <= 5.009005 }
+
+my $VERSION = 3.13;
+
+my %opt = (
+ quiet => 0,
+ diag => 1,
+ hints => 1,
+ changes => 1,
+ cplusplus => 0,
+ filter => 1,
+ strip => 0,
+ version => 0,
+);
+
+my($ppport) = $0 =~ /([\w.]+)$/;
+my $LF = '(?:\r\n|[\r\n])'; # line feed
+my $HS = "[ \t]"; # horizontal whitespace
+
+# Never use C comments in this file!
+my $ccs = '/'.'*';
+my $cce = '*'.'/';
+my $rccs = quotemeta $ccs;
+my $rcce = quotemeta $cce;
+
+eval {
+ require Getopt::Long;
+ Getopt::Long::GetOptions(\%opt, qw(
+ help quiet diag! filter! hints! changes! cplusplus strip version
+ patch=s copy=s diff=s compat-version=s
+ list-provided list-unsupported api-info=s
+ )) or usage();
+};
+
+if ($@ and grep /^-/, @ARGV) {
+ usage() if "@ARGV" =~ /^--?h(?:elp)?$/;
+ die "Getopt::Long not found. Please don't use any options.\n";
+}
+
+if ($opt{version}) {
+ print "This is $0 $VERSION.\n";
+ exit 0;
+}
+
+usage() if $opt{help};
+strip() if $opt{strip};
+
+if (exists $opt{'compat-version'}) {
+ my($r,$v,$s) = eval { parse_version($opt{'compat-version'}) };
+ if ($@) {
+ die "Invalid version number format: '$opt{'compat-version'}'\n";
+ }
+ die "Only Perl 5 is supported\n" if $r != 5;
+ die "Invalid version number: $opt{'compat-version'}\n" if $v >= 1000 || $s >= 1000;
+ $opt{'compat-version'} = sprintf "%d.%03d%03d", $r, $v, $s;
+}
+else {
+ $opt{'compat-version'} = 5;
+}
+
+my %API = map { /^(\w+)\|([^|]*)\|([^|]*)\|(\w*)$/
+ ? ( $1 => {
+ ($2 ? ( base => $2 ) : ()),
+ ($3 ? ( todo => $3 ) : ()),
+ (index($4, 'v') >= 0 ? ( varargs => 1 ) : ()),
+ (index($4, 'p') >= 0 ? ( provided => 1 ) : ()),
+ (index($4, 'n') >= 0 ? ( nothxarg => 1 ) : ()),
+ } )
+ : die "invalid spec: $_" } qw(
+AvFILLp|5.004050||p
+AvFILL|||
+CLASS|||n
+CX_CURPAD_SAVE|||
+CX_CURPAD_SV|||
+CopFILEAV|5.006000||p
+CopFILEGV_set|5.006000||p
+CopFILEGV|5.006000||p
+CopFILESV|5.006000||p
+CopFILE_set|5.006000||p
+CopFILE|5.006000||p
+CopSTASHPV_set|5.006000||p
+CopSTASHPV|5.006000||p
+CopSTASH_eq|5.006000||p
+CopSTASH_set|5.006000||p
+CopSTASH|5.006000||p
+CopyD|5.009002||p
+Copy|||
+CvPADLIST|||
+CvSTASH|||
+CvWEAKOUTSIDE|||
+DEFSV|5.004050||p
+END_EXTERN_C|5.005000||p
+ENTER|||
+ERRSV|5.004050||p
+EXTEND|||
+EXTERN_C|5.005000||p
+F0convert|||n
+FREETMPS|||
+GIMME_V||5.004000|n
+GIMME|||n
+GROK_NUMERIC_RADIX|5.007002||p
+G_ARRAY|||
+G_DISCARD|||
+G_EVAL|||
+G_NOARGS|||
+G_SCALAR|||
+G_VOID||5.004000|
+GetVars|||
+GvSV|||
+Gv_AMupdate|||
+HEf_SVKEY||5.004000|
+HeHASH||5.004000|
+HeKEY||5.004000|
+HeKLEN||5.004000|
+HePV||5.004000|
+HeSVKEY_force||5.004000|
+HeSVKEY_set||5.004000|
+HeSVKEY||5.004000|
+HeVAL||5.004000|
+HvNAME|||
+INT2PTR|5.006000||p
+IN_LOCALE_COMPILETIME|5.007002||p
+IN_LOCALE_RUNTIME|5.007002||p
+IN_LOCALE|5.007002||p
+IN_PERL_COMPILETIME|5.008001||p
+IS_NUMBER_GREATER_THAN_UV_MAX|5.007002||p
+IS_NUMBER_INFINITY|5.007002||p
+IS_NUMBER_IN_UV|5.007002||p
+IS_NUMBER_NAN|5.007003||p
+IS_NUMBER_NEG|5.007002||p
+IS_NUMBER_NOT_INT|5.007002||p
+IVSIZE|5.006000||p
+IVTYPE|5.006000||p
+IVdf|5.006000||p
+LEAVE|||
+LVRET|||
+MARK|||
+MULTICALL||5.009005|
+MY_CXT_CLONE|5.009002||p
+MY_CXT_INIT|5.007003||p
+MY_CXT|5.007003||p
+MoveD|5.009002||p
+Move|||
+NOOP|5.005000||p
+NUM2PTR|5.006000||p
+NVTYPE|5.006000||p
+NVef|5.006001||p
+NVff|5.006001||p
+NVgf|5.006001||p
+Newxc|5.009003||p
+Newxz|5.009003||p
+Newx|5.009003||p
+Nullav|||
+Nullch|||
+Nullcv|||
+Nullhv|||
+Nullsv|||
+ORIGMARK|||
+PAD_BASE_SV|||
+PAD_CLONE_VARS|||
+PAD_COMPNAME_FLAGS|||
+PAD_COMPNAME_GEN_set|||
+PAD_COMPNAME_GEN|||
+PAD_COMPNAME_OURSTASH|||
+PAD_COMPNAME_PV|||
+PAD_COMPNAME_TYPE|||
+PAD_RESTORE_LOCAL|||
+PAD_SAVE_LOCAL|||
+PAD_SAVE_SETNULLPAD|||
+PAD_SETSV|||
+PAD_SET_CUR_NOSAVE|||
+PAD_SET_CUR|||
+PAD_SVl|||
+PAD_SV|||
+PERL_ABS|5.008001||p
+PERL_BCDVERSION|5.009005||p
+PERL_GCC_BRACE_GROUPS_FORBIDDEN|5.008001||p
+PERL_HASH|5.004000||p
+PERL_INT_MAX|5.004000||p
+PERL_INT_MIN|5.004000||p
+PERL_LONG_MAX|5.004000||p
+PERL_LONG_MIN|5.004000||p
+PERL_MAGIC_arylen|5.007002||p
+PERL_MAGIC_backref|5.007002||p
+PERL_MAGIC_bm|5.007002||p
+PERL_MAGIC_collxfrm|5.007002||p
+PERL_MAGIC_dbfile|5.007002||p
+PERL_MAGIC_dbline|5.007002||p
+PERL_MAGIC_defelem|5.007002||p
+PERL_MAGIC_envelem|5.007002||p
+PERL_MAGIC_env|5.007002||p
+PERL_MAGIC_ext|5.007002||p
+PERL_MAGIC_fm|5.007002||p
+PERL_MAGIC_glob|5.009005||p
+PERL_MAGIC_isaelem|5.007002||p
+PERL_MAGIC_isa|5.007002||p
+PERL_MAGIC_mutex|5.009005||p
+PERL_MAGIC_nkeys|5.007002||p
+PERL_MAGIC_overload_elem|5.007002||p
+PERL_MAGIC_overload_table|5.007002||p
+PERL_MAGIC_overload|5.007002||p
+PERL_MAGIC_pos|5.007002||p
+PERL_MAGIC_qr|5.007002||p
+PERL_MAGIC_regdata|5.007002||p
+PERL_MAGIC_regdatum|5.007002||p
+PERL_MAGIC_regex_global|5.007002||p
+PERL_MAGIC_shared_scalar|5.007003||p
+PERL_MAGIC_shared|5.007003||p
+PERL_MAGIC_sigelem|5.007002||p
+PERL_MAGIC_sig|5.007002||p
+PERL_MAGIC_substr|5.007002||p
+PERL_MAGIC_sv|5.007002||p
+PERL_MAGIC_taint|5.007002||p
+PERL_MAGIC_tiedelem|5.007002||p
+PERL_MAGIC_tiedscalar|5.007002||p
+PERL_MAGIC_tied|5.007002||p
+PERL_MAGIC_utf8|5.008001||p
+PERL_MAGIC_uvar_elem|5.007003||p
+PERL_MAGIC_uvar|5.007002||p
+PERL_MAGIC_vec|5.007002||p
+PERL_MAGIC_vstring|5.008001||p
+PERL_QUAD_MAX|5.004000||p
+PERL_QUAD_MIN|5.004000||p
+PERL_REVISION|5.006000||p
+PERL_SCAN_ALLOW_UNDERSCORES|5.007003||p
+PERL_SCAN_DISALLOW_PREFIX|5.007003||p
+PERL_SCAN_GREATER_THAN_UV_MAX|5.007003||p
+PERL_SCAN_SILENT_ILLDIGIT|5.008001||p
+PERL_SHORT_MAX|5.004000||p
+PERL_SHORT_MIN|5.004000||p
+PERL_SIGNALS_UNSAFE_FLAG|5.008001||p
+PERL_SUBVERSION|5.006000||p
+PERL_UCHAR_MAX|5.004000||p
+PERL_UCHAR_MIN|5.004000||p
+PERL_UINT_MAX|5.004000||p
+PERL_UINT_MIN|5.004000||p
+PERL_ULONG_MAX|5.004000||p
+PERL_ULONG_MIN|5.004000||p
+PERL_UNUSED_ARG|5.009003||p
+PERL_UNUSED_CONTEXT|5.009004||p
+PERL_UNUSED_DECL|5.007002||p
+PERL_UNUSED_VAR|5.007002||p
+PERL_UQUAD_MAX|5.004000||p
+PERL_UQUAD_MIN|5.004000||p
+PERL_USE_GCC_BRACE_GROUPS|5.009004||p
+PERL_USHORT_MAX|5.004000||p
+PERL_USHORT_MIN|5.004000||p
+PERL_VERSION|5.006000||p
+PL_DBsignal|5.005000||p
+PL_DBsingle|||pn
+PL_DBsub|||pn
+PL_DBtrace|||pn
+PL_Sv|5.005000||p
+PL_compiling|5.004050||p
+PL_copline|5.009005||p
+PL_curcop|5.004050||p
+PL_curstash|5.004050||p
+PL_debstash|5.004050||p
+PL_defgv|5.004050||p
+PL_diehook|5.004050||p
+PL_dirty|5.004050||p
+PL_dowarn|||pn
+PL_errgv|5.004050||p
+PL_expect|5.009005||p
+PL_hexdigit|5.005000||p
+PL_hints|5.005000||p
+PL_last_in_gv|||n
+PL_laststatval|5.005000||p
+PL_modglobal||5.005000|n
+PL_na|5.004050||pn
+PL_no_modify|5.006000||p
+PL_ofs_sv|||n
+PL_perl_destruct_level|5.004050||p
+PL_perldb|5.004050||p
+PL_ppaddr|5.006000||p
+PL_rsfp_filters|5.004050||p
+PL_rsfp|5.004050||p
+PL_rs|||n
+PL_signals|5.008001||p
+PL_stack_base|5.004050||p
+PL_stack_sp|5.004050||p
+PL_statcache|5.005000||p
+PL_stdingv|5.004050||p
+PL_sv_arenaroot|5.004050||p
+PL_sv_no|5.004050||pn
+PL_sv_undef|5.004050||pn
+PL_sv_yes|5.004050||pn
+PL_tainted|5.004050||p
+PL_tainting|5.004050||p
+POP_MULTICALL||5.009005|
+POPi|||n
+POPl|||n
+POPn|||n
+POPpbytex||5.007001|n
+POPpx||5.005030|n
+POPp|||n
+POPs|||n
+PTR2IV|5.006000||p
+PTR2NV|5.006000||p
+PTR2UV|5.006000||p
+PTR2ul|5.007001||p
+PTRV|5.006000||p
+PUSHMARK|||
+PUSH_MULTICALL||5.009005|
+PUSHi|||
+PUSHmortal|5.009002||p
+PUSHn|||
+PUSHp|||
+PUSHs|||
+PUSHu|5.004000||p
+PUTBACK|||
+PerlIO_clearerr||5.007003|
+PerlIO_close||5.007003|
+PerlIO_context_layers||5.009004|
+PerlIO_eof||5.007003|
+PerlIO_error||5.007003|
+PerlIO_fileno||5.007003|
+PerlIO_fill||5.007003|
+PerlIO_flush||5.007003|
+PerlIO_get_base||5.007003|
+PerlIO_get_bufsiz||5.007003|
+PerlIO_get_cnt||5.007003|
+PerlIO_get_ptr||5.007003|
+PerlIO_read||5.007003|
+PerlIO_seek||5.007003|
+PerlIO_set_cnt||5.007003|
+PerlIO_set_ptrcnt||5.007003|
+PerlIO_setlinebuf||5.007003|
+PerlIO_stderr||5.007003|
+PerlIO_stdin||5.007003|
+PerlIO_stdout||5.007003|
+PerlIO_tell||5.007003|
+PerlIO_unread||5.007003|
+PerlIO_write||5.007003|
+Perl_signbit||5.009005|n
+PoisonFree|5.009004||p
+PoisonNew|5.009004||p
+PoisonWith|5.009004||p
+Poison|5.008000||p
+RETVAL|||n
+Renewc|||
+Renew|||
+SAVECLEARSV|||
+SAVECOMPPAD|||
+SAVEPADSV|||
+SAVETMPS|||
+SAVE_DEFSV|5.004050||p
+SPAGAIN|||
+SP|||
+START_EXTERN_C|5.005000||p
+START_MY_CXT|5.007003||p
+STMT_END|||p
+STMT_START|||p
+STR_WITH_LEN|5.009003||p
+ST|||
+SV_CONST_RETURN|5.009003||p
+SV_COW_DROP_PV|5.008001||p
+SV_COW_SHARED_HASH_KEYS|5.009005||p
+SV_GMAGIC|5.007002||p
+SV_HAS_TRAILING_NUL|5.009004||p
+SV_IMMEDIATE_UNREF|5.007001||p
+SV_MUTABLE_RETURN|5.009003||p
+SV_NOSTEAL|5.009002||p
+SV_SMAGIC|5.009003||p
+SV_UTF8_NO_ENCODING|5.008001||p
+SVf|5.006000||p
+SVt_IV|||
+SVt_NV|||
+SVt_PVAV|||
+SVt_PVCV|||
+SVt_PVHV|||
+SVt_PVMG|||
+SVt_PV|||
+Safefree|||
+Slab_Alloc|||
+Slab_Free|||
+Slab_to_rw|||
+StructCopy|||
+SvCUR_set|||
+SvCUR|||
+SvEND|||
+SvGAMAGIC||5.006001|
+SvGETMAGIC|5.004050||p
+SvGROW|||
+SvIOK_UV||5.006000|
+SvIOK_notUV||5.006000|
+SvIOK_off|||
+SvIOK_only_UV||5.006000|
+SvIOK_only|||
+SvIOK_on|||
+SvIOKp|||
+SvIOK|||
+SvIVX|||
+SvIV_nomg|5.009001||p
+SvIV_set|||
+SvIVx|||
+SvIV|||
+SvIsCOW_shared_hash||5.008003|
+SvIsCOW||5.008003|
+SvLEN_set|||
+SvLEN|||
+SvLOCK||5.007003|
+SvMAGIC_set|5.009003||p
+SvNIOK_off|||
+SvNIOKp|||
+SvNIOK|||
+SvNOK_off|||
+SvNOK_only|||
+SvNOK_on|||
+SvNOKp|||
+SvNOK|||
+SvNVX|||
+SvNV_set|||
+SvNVx|||
+SvNV|||
+SvOK|||
+SvOOK|||
+SvPOK_off|||
+SvPOK_only_UTF8||5.006000|
+SvPOK_only|||
+SvPOK_on|||
+SvPOKp|||
+SvPOK|||
+SvPVX_const|5.009003||p
+SvPVX_mutable|5.009003||p
+SvPVX|||
+SvPV_const|5.009003||p
+SvPV_flags_const_nolen|5.009003||p
+SvPV_flags_const|5.009003||p
+SvPV_flags_mutable|5.009003||p
+SvPV_flags|5.007002||p
+SvPV_force_flags_mutable|5.009003||p
+SvPV_force_flags_nolen|5.009003||p
+SvPV_force_flags|5.007002||p
+SvPV_force_mutable|5.009003||p
+SvPV_force_nolen|5.009003||p
+SvPV_force_nomg_nolen|5.009003||p
+SvPV_force_nomg|5.007002||p
+SvPV_force|||p
+SvPV_mutable|5.009003||p
+SvPV_nolen_const|5.009003||p
+SvPV_nolen|5.006000||p
+SvPV_nomg_const_nolen|5.009003||p
+SvPV_nomg_const|5.009003||p
+SvPV_nomg|5.007002||p
+SvPV_set|||
+SvPVbyte_force||5.009002|
+SvPVbyte_nolen||5.006000|
+SvPVbytex_force||5.006000|
+SvPVbytex||5.006000|
+SvPVbyte|5.006000||p
+SvPVutf8_force||5.006000|
+SvPVutf8_nolen||5.006000|
+SvPVutf8x_force||5.006000|
+SvPVutf8x||5.006000|
+SvPVutf8||5.006000|
+SvPVx|||
+SvPV|||
+SvREFCNT_dec|||
+SvREFCNT_inc_NN|5.009004||p
+SvREFCNT_inc_simple_NN|5.009004||p
+SvREFCNT_inc_simple_void_NN|5.009004||p
+SvREFCNT_inc_simple_void|5.009004||p
+SvREFCNT_inc_simple|5.009004||p
+SvREFCNT_inc_void_NN|5.009004||p
+SvREFCNT_inc_void|5.009004||p
+SvREFCNT_inc|||p
+SvREFCNT|||
+SvROK_off|||
+SvROK_on|||
+SvROK|||
+SvRV_set|5.009003||p
+SvRV|||
+SvRXOK||5.009005|
+SvRX||5.009005|
+SvSETMAGIC|||
+SvSHARED_HASH|5.009003||p
+SvSHARE||5.007003|
+SvSTASH_set|5.009003||p
+SvSTASH|||
+SvSetMagicSV_nosteal||5.004000|
+SvSetMagicSV||5.004000|
+SvSetSV_nosteal||5.004000|
+SvSetSV|||
+SvTAINTED_off||5.004000|
+SvTAINTED_on||5.004000|
+SvTAINTED||5.004000|
+SvTAINT|||
+SvTRUE|||
+SvTYPE|||
+SvUNLOCK||5.007003|
+SvUOK|5.007001|5.006000|p
+SvUPGRADE|||
+SvUTF8_off||5.006000|
+SvUTF8_on||5.006000|
+SvUTF8||5.006000|
+SvUVXx|5.004000||p
+SvUVX|5.004000||p
+SvUV_nomg|5.009001||p
+SvUV_set|5.009003||p
+SvUVx|5.004000||p
+SvUV|5.004000||p
+SvVOK||5.008001|
+SvVSTRING_mg|5.009004||p
+THIS|||n
+UNDERBAR|5.009002||p
+UTF8_MAXBYTES|5.009002||p
+UVSIZE|5.006000||p
+UVTYPE|5.006000||p
+UVXf|5.007001||p
+UVof|5.006000||p
+UVuf|5.006000||p
+UVxf|5.006000||p
+WARN_ALL|5.006000||p
+WARN_AMBIGUOUS|5.006000||p
+WARN_ASSERTIONS|5.009005||p
+WARN_BAREWORD|5.006000||p
+WARN_CLOSED|5.006000||p
+WARN_CLOSURE|5.006000||p
+WARN_DEBUGGING|5.006000||p
+WARN_DEPRECATED|5.006000||p
+WARN_DIGIT|5.006000||p
+WARN_EXEC|5.006000||p
+WARN_EXITING|5.006000||p
+WARN_GLOB|5.006000||p
+WARN_INPLACE|5.006000||p
+WARN_INTERNAL|5.006000||p
+WARN_IO|5.006000||p
+WARN_LAYER|5.008000||p
+WARN_MALLOC|5.006000||p
+WARN_MISC|5.006000||p
+WARN_NEWLINE|5.006000||p
+WARN_NUMERIC|5.006000||p
+WARN_ONCE|5.006000||p
+WARN_OVERFLOW|5.006000||p
+WARN_PACK|5.006000||p
+WARN_PARENTHESIS|5.006000||p
+WARN_PIPE|5.006000||p
+WARN_PORTABLE|5.006000||p
+WARN_PRECEDENCE|5.006000||p
+WARN_PRINTF|5.006000||p
+WARN_PROTOTYPE|5.006000||p
+WARN_QW|5.006000||p
+WARN_RECURSION|5.006000||p
+WARN_REDEFINE|5.006000||p
+WARN_REGEXP|5.006000||p
+WARN_RESERVED|5.006000||p
+WARN_SEMICOLON|5.006000||p
+WARN_SEVERE|5.006000||p
+WARN_SIGNAL|5.006000||p
+WARN_SUBSTR|5.006000||p
+WARN_SYNTAX|5.006000||p
+WARN_TAINT|5.006000||p
+WARN_THREADS|5.008000||p
+WARN_UNINITIALIZED|5.006000||p
+WARN_UNOPENED|5.006000||p
+WARN_UNPACK|5.006000||p
+WARN_UNTIE|5.006000||p
+WARN_UTF8|5.006000||p
+WARN_VOID|5.006000||p
+XCPT_CATCH|5.009002||p
+XCPT_RETHROW|5.009002||p
+XCPT_TRY_END|5.009002||p
+XCPT_TRY_START|5.009002||p
+XPUSHi|||
+XPUSHmortal|5.009002||p
+XPUSHn|||
+XPUSHp|||
+XPUSHs|||
+XPUSHu|5.004000||p
+XSRETURN_EMPTY|||
+XSRETURN_IV|||
+XSRETURN_NO|||
+XSRETURN_NV|||
+XSRETURN_PV|||
+XSRETURN_UNDEF|||
+XSRETURN_UV|5.008001||p
+XSRETURN_YES|||
+XSRETURN|||p
+XST_mIV|||
+XST_mNO|||
+XST_mNV|||
+XST_mPV|||
+XST_mUNDEF|||
+XST_mUV|5.008001||p
+XST_mYES|||
+XS_VERSION_BOOTCHECK|||
+XS_VERSION|||
+XSprePUSH|5.006000||p
+XS|||
+ZeroD|5.009002||p
+Zero|||
+_aMY_CXT|5.007003||p
+_pMY_CXT|5.007003||p
+aMY_CXT_|5.007003||p
+aMY_CXT|5.007003||p
+aTHXR_|5.009005||p
+aTHXR|5.009005||p
+aTHX_|5.006000||p
+aTHX|5.006000||p
+add_data|||n
+addmad|||
+allocmy|||
+amagic_call|||
+amagic_cmp_locale|||
+amagic_cmp|||
+amagic_i_ncmp|||
+amagic_ncmp|||
+any_dup|||
+ao|||
+append_elem|||
+append_list|||
+append_madprops|||
+apply_attrs_my|||
+apply_attrs_string||5.006001|
+apply_attrs|||
+apply|||
+atfork_lock||5.007003|n
+atfork_unlock||5.007003|n
+av_arylen_p||5.009003|
+av_clear|||
+av_create_and_push||5.009005|
+av_create_and_unshift_one||5.009005|
+av_delete||5.006000|
+av_exists||5.006000|
+av_extend|||
+av_fake|||
+av_fetch|||
+av_fill|||
+av_len|||
+av_make|||
+av_pop|||
+av_push|||
+av_reify|||
+av_shift|||
+av_store|||
+av_undef|||
+av_unshift|||
+ax|||n
+bad_type|||
+bind_match|||
+block_end|||
+block_gimme||5.004000|
+block_start|||
+boolSV|5.004000||p
+boot_core_PerlIO|||
+boot_core_UNIVERSAL|||
+boot_core_mro|||
+boot_core_xsutils|||
+bytes_from_utf8||5.007001|
+bytes_to_uni|||n
+bytes_to_utf8||5.006001|
+call_argv|5.006000||p
+call_atexit||5.006000|
+call_list||5.004000|
+call_method|5.006000||p
+call_pv|5.006000||p
+call_sv|5.006000||p
+calloc||5.007002|n
+cando|||
+cast_i32||5.006000|
+cast_iv||5.006000|
+cast_ulong||5.006000|
+cast_uv||5.006000|
+check_type_and_open|||
+check_uni|||
+checkcomma|||
+checkposixcc|||
+ckWARN|5.006000||p
+ck_anoncode|||
+ck_bitop|||
+ck_concat|||
+ck_defined|||
+ck_delete|||
+ck_die|||
+ck_eof|||
+ck_eval|||
+ck_exec|||
+ck_exists|||
+ck_exit|||
+ck_ftst|||
+ck_fun|||
+ck_glob|||
+ck_grep|||
+ck_index|||
+ck_join|||
+ck_lengthconst|||
+ck_lfun|||
+ck_listiob|||
+ck_match|||
+ck_method|||
+ck_null|||
+ck_open|||
+ck_readline|||
+ck_repeat|||
+ck_require|||
+ck_retarget|||
+ck_return|||
+ck_rfun|||
+ck_rvconst|||
+ck_sassign|||
+ck_select|||
+ck_shift|||
+ck_sort|||
+ck_spair|||
+ck_split|||
+ck_subr|||
+ck_substr|||
+ck_svconst|||
+ck_trunc|||
+ck_unpack|||
+ckwarn_d||5.009003|
+ckwarn||5.009003|
+cl_and|||n
+cl_anything|||n
+cl_init_zero|||n
+cl_init|||n
+cl_is_anything|||n
+cl_or|||n
+clear_placeholders|||
+closest_cop|||
+convert|||
+cop_free|||
+cr_textfilter|||
+create_eval_scope|||
+croak_nocontext|||vn
+croak|||v
+csighandler||5.009003|n
+curmad|||
+custom_op_desc||5.007003|
+custom_op_name||5.007003|
+cv_ckproto_len|||
+cv_ckproto|||
+cv_clone|||
+cv_const_sv||5.004000|
+cv_dump|||
+cv_undef|||
+cx_dump||5.005000|
+cx_dup|||
+cxinc|||
+dAXMARK|5.009003||p
+dAX|5.007002||p
+dITEMS|5.007002||p
+dMARK|||
+dMULTICALL||5.009003|
+dMY_CXT_SV|5.007003||p
+dMY_CXT|5.007003||p
+dNOOP|5.006000||p
+dORIGMARK|||
+dSP|||
+dTHR|5.004050||p
+dTHXR|5.009005||p
+dTHXa|5.006000||p
+dTHXoa|5.006000||p
+dTHX|5.006000||p
+dUNDERBAR|5.009002||p
+dVAR|5.009003||p
+dXCPT|5.009002||p
+dXSARGS|||
+dXSI32|||
+dXSTARG|5.006000||p
+deb_curcv|||
+deb_nocontext|||vn
+deb_stack_all|||
+deb_stack_n|||
+debop||5.005000|
+debprofdump||5.005000|
+debprof|||
+debstackptrs||5.007003|
+debstack||5.007003|
+debug_start_match|||
+deb||5.007003|v
+del_sv|||
+delete_eval_scope|||
+delimcpy||5.004000|
+deprecate_old|||
+deprecate|||
+despatch_signals||5.007001|
+destroy_matcher|||
+die_nocontext|||vn
+die_where|||
+die|||v
+dirp_dup|||
+div128|||
+djSP|||
+do_aexec5|||
+do_aexec|||
+do_aspawn|||
+do_binmode||5.004050|
+do_chomp|||
+do_chop|||
+do_close|||
+do_dump_pad|||
+do_eof|||
+do_exec3|||
+do_execfree|||
+do_exec|||
+do_gv_dump||5.006000|
+do_gvgv_dump||5.006000|
+do_hv_dump||5.006000|
+do_ipcctl|||
+do_ipcget|||
+do_join|||
+do_kv|||
+do_magic_dump||5.006000|
+do_msgrcv|||
+do_msgsnd|||
+do_oddball|||
+do_op_dump||5.006000|
+do_op_xmldump|||
+do_open9||5.006000|
+do_openn||5.007001|
+do_open||5.004000|
+do_pipe|||
+do_pmop_dump||5.006000|
+do_pmop_xmldump|||
+do_print|||
+do_readline|||
+do_seek|||
+do_semop|||
+do_shmio|||
+do_smartmatch|||
+do_spawn_nowait|||
+do_spawn|||
+do_sprintf|||
+do_sv_dump||5.006000|
+do_sysseek|||
+do_tell|||
+do_trans_complex_utf8|||
+do_trans_complex|||
+do_trans_count_utf8|||
+do_trans_count|||
+do_trans_simple_utf8|||
+do_trans_simple|||
+do_trans|||
+do_vecget|||
+do_vecset|||
+do_vop|||
+docatch_body|||
+docatch|||
+doeval|||
+dofile|||
+dofindlabel|||
+doform|||
+doing_taint||5.008001|n
+dooneliner|||
+doopen_pm|||
+doparseform|||
+dopoptoeval|||
+dopoptogiven|||
+dopoptolabel|||
+dopoptoloop|||
+dopoptosub_at|||
+dopoptosub|||
+dopoptowhen|||
+doref||5.009003|
+dounwind|||
+dowantarray|||
+dump_all||5.006000|
+dump_eval||5.006000|
+dump_exec_pos|||
+dump_fds|||
+dump_form||5.006000|
+dump_indent||5.006000|v
+dump_mstats|||
+dump_packsubs||5.006000|
+dump_sub||5.006000|
+dump_sv_child|||
+dump_trie_interim_list|||
+dump_trie_interim_table|||
+dump_trie|||
+dump_vindent||5.006000|
+dumpuntil|||
+dup_attrlist|||
+emulate_cop_io|||
+emulate_eaccess|||
+eval_pv|5.006000||p
+eval_sv|5.006000||p
+exec_failed|||
+expect_number|||
+fbm_compile||5.005000|
+fbm_instr||5.005000|
+fd_on_nosuid_fs|||
+feature_is_enabled|||
+filter_add|||
+filter_del|||
+filter_gets|||
+filter_read|||
+find_and_forget_pmops|||
+find_array_subscript|||
+find_beginning|||
+find_byclass|||
+find_hash_subscript|||
+find_in_my_stash|||
+find_runcv||5.008001|
+find_rundefsvoffset||5.009002|
+find_script|||
+find_uninit_var|||
+first_symbol|||n
+fold_constants|||
+forbid_setid|||
+force_ident|||
+force_list|||
+force_next|||
+force_version|||
+force_word|||
+forget_pmop|||
+form_nocontext|||vn
+form||5.004000|v
+fp_dup|||
+fprintf_nocontext|||vn
+free_global_struct|||
+free_tied_hv_pool|||
+free_tmps|||
+gen_constant_list|||
+get_arena|||
+get_av|5.006000||p
+get_context||5.006000|n
+get_cvn_flags||5.009005|
+get_cv|5.006000||p
+get_db_sub|||
+get_debug_opts|||
+get_hash_seed|||
+get_hv|5.006000||p
+get_mstats|||
+get_no_modify|||
+get_num|||
+get_op_descs||5.005000|
+get_op_names||5.005000|
+get_opargs|||
+get_ppaddr||5.006000|
+get_re_arg|||
+get_sv|5.006000||p
+get_vtbl||5.005030|
+getcwd_sv||5.007002|
+getenv_len|||
+glob_2number|||
+glob_2pv|||
+glob_assign_glob|||
+glob_assign_ref|||
+gp_dup|||
+gp_free|||
+gp_ref|||
+grok_bin|5.007003||p
+grok_hex|5.007003||p
+grok_number|5.007002||p
+grok_numeric_radix|5.007002||p
+grok_oct|5.007003||p
+group_end|||
+gv_AVadd|||
+gv_HVadd|||
+gv_IOadd|||
+gv_SVadd|||
+gv_autoload4||5.004000|
+gv_check|||
+gv_const_sv||5.009003|
+gv_dump||5.006000|
+gv_efullname3||5.004000|
+gv_efullname4||5.006001|
+gv_efullname|||
+gv_ename|||
+gv_fetchfile_flags||5.009005|
+gv_fetchfile|||
+gv_fetchmeth_autoload||5.007003|
+gv_fetchmethod_autoload||5.004000|
+gv_fetchmethod|||
+gv_fetchmeth|||
+gv_fetchpvn_flags||5.009002|
+gv_fetchpv|||
+gv_fetchsv||5.009002|
+gv_fullname3||5.004000|
+gv_fullname4||5.006001|
+gv_fullname|||
+gv_handler||5.007001|
+gv_init_sv|||
+gv_init|||
+gv_name_set||5.009004|
+gv_stashpvn|5.004000||p
+gv_stashpvs||5.009003|
+gv_stashpv|||
+gv_stashsv|||
+he_dup|||
+hek_dup|||
+hfreeentries|||
+hsplit|||
+hv_assert||5.009005|
+hv_auxinit|||n
+hv_backreferences_p|||
+hv_clear_placeholders||5.009001|
+hv_clear|||
+hv_copy_hints_hv|||
+hv_delayfree_ent||5.004000|
+hv_delete_common|||
+hv_delete_ent||5.004000|
+hv_delete|||
+hv_eiter_p||5.009003|
+hv_eiter_set||5.009003|
+hv_exists_ent||5.004000|
+hv_exists|||
+hv_fetch_common|||
+hv_fetch_ent||5.004000|
+hv_fetchs|5.009003||p
+hv_fetch|||
+hv_free_ent||5.004000|
+hv_iterinit|||
+hv_iterkeysv||5.004000|
+hv_iterkey|||
+hv_iternext_flags||5.008000|
+hv_iternextsv|||
+hv_iternext|||
+hv_iterval|||
+hv_kill_backrefs|||
+hv_ksplit||5.004000|
+hv_magic_check|||n
+hv_magic_uvar_xkey|||
+hv_magic|||
+hv_name_set||5.009003|
+hv_notallowed|||
+hv_placeholders_get||5.009003|
+hv_placeholders_p||5.009003|
+hv_placeholders_set||5.009003|
+hv_riter_p||5.009003|
+hv_riter_set||5.009003|
+hv_scalar||5.009001|
+hv_store_ent||5.004000|
+hv_store_flags||5.008000|
+hv_stores|5.009004||p
+hv_store|||
+hv_undef|||
+ibcmp_locale||5.004000|
+ibcmp_utf8||5.007003|
+ibcmp|||
+incl_perldb|||
+incline|||
+incpush_if_exists|||
+incpush|||
+ingroup|||
+init_argv_symbols|||
+init_debugger|||
+init_global_struct|||
+init_i18nl10n||5.006000|
+init_i18nl14n||5.006000|
+init_ids|||
+init_interp|||
+init_main_stash|||
+init_perllib|||
+init_postdump_symbols|||
+init_predump_symbols|||
+init_stacks||5.005000|
+init_tm||5.007002|
+instr|||
+intro_my|||
+intuit_method|||
+intuit_more|||
+invert|||
+io_close|||
+isALNUM|||
+isALPHA|||
+isDIGIT|||
+isLOWER|||
+isSPACE|||
+isUPPER|||
+is_an_int|||
+is_gv_magical_sv|||
+is_gv_magical|||
+is_handle_constructor|||n
+is_list_assignment|||
+is_lvalue_sub||5.007001|
+is_uni_alnum_lc||5.006000|
+is_uni_alnumc_lc||5.006000|
+is_uni_alnumc||5.006000|
+is_uni_alnum||5.006000|
+is_uni_alpha_lc||5.006000|
+is_uni_alpha||5.006000|
+is_uni_ascii_lc||5.006000|
+is_uni_ascii||5.006000|
+is_uni_cntrl_lc||5.006000|
+is_uni_cntrl||5.006000|
+is_uni_digit_lc||5.006000|
+is_uni_digit||5.006000|
+is_uni_graph_lc||5.006000|
+is_uni_graph||5.006000|
+is_uni_idfirst_lc||5.006000|
+is_uni_idfirst||5.006000|
+is_uni_lower_lc||5.006000|
+is_uni_lower||5.006000|
+is_uni_print_lc||5.006000|
+is_uni_print||5.006000|
+is_uni_punct_lc||5.006000|
+is_uni_punct||5.006000|
+is_uni_space_lc||5.006000|
+is_uni_space||5.006000|
+is_uni_upper_lc||5.006000|
+is_uni_upper||5.006000|
+is_uni_xdigit_lc||5.006000|
+is_uni_xdigit||5.006000|
+is_utf8_alnumc||5.006000|
+is_utf8_alnum||5.006000|
+is_utf8_alpha||5.006000|
+is_utf8_ascii||5.006000|
+is_utf8_char_slow|||n
+is_utf8_char||5.006000|
+is_utf8_cntrl||5.006000|
+is_utf8_common|||
+is_utf8_digit||5.006000|
+is_utf8_graph||5.006000|
+is_utf8_idcont||5.008000|
+is_utf8_idfirst||5.006000|
+is_utf8_lower||5.006000|
+is_utf8_mark||5.006000|
+is_utf8_print||5.006000|
+is_utf8_punct||5.006000|
+is_utf8_space||5.006000|
+is_utf8_string_loclen||5.009003|
+is_utf8_string_loc||5.008001|
+is_utf8_string||5.006001|
+is_utf8_upper||5.006000|
+is_utf8_xdigit||5.006000|
+isa_lookup|||
+items|||n
+ix|||n
+jmaybe|||
+join_exact|||
+keyword|||
+leave_scope|||
+lex_end|||
+lex_start|||
+linklist|||
+listkids|||
+list|||
+load_module_nocontext|||vn
+load_module|5.006000||pv
+localize|||
+looks_like_bool|||
+looks_like_number|||
+lop|||
+mPUSHi|5.009002||p
+mPUSHn|5.009002||p
+mPUSHp|5.009002||p
+mPUSHu|5.009002||p
+mXPUSHi|5.009002||p
+mXPUSHn|5.009002||p
+mXPUSHp|5.009002||p
+mXPUSHu|5.009002||p
+mad_free|||
+madlex|||
+madparse|||
+magic_clear_all_env|||
+magic_clearenv|||
+magic_clearhint|||
+magic_clearpack|||
+magic_clearsig|||
+magic_dump||5.006000|
+magic_existspack|||
+magic_freearylen_p|||
+magic_freeovrld|||
+magic_freeregexp|||
+magic_getarylen|||
+magic_getdefelem|||
+magic_getnkeys|||
+magic_getpack|||
+magic_getpos|||
+magic_getsig|||
+magic_getsubstr|||
+magic_gettaint|||
+magic_getuvar|||
+magic_getvec|||
+magic_get|||
+magic_killbackrefs|||
+magic_len|||
+magic_methcall|||
+magic_methpack|||
+magic_nextpack|||
+magic_regdata_cnt|||
+magic_regdatum_get|||
+magic_regdatum_set|||
+magic_scalarpack|||
+magic_set_all_env|||
+magic_setamagic|||
+magic_setarylen|||
+magic_setbm|||
+magic_setcollxfrm|||
+magic_setdbline|||
+magic_setdefelem|||
+magic_setenv|||
+magic_setfm|||
+magic_setglob|||
+magic_sethint|||
+magic_setisa|||
+magic_setmglob|||
+magic_setnkeys|||
+magic_setpack|||
+magic_setpos|||
+magic_setregexp|||
+magic_setsig|||
+magic_setsubstr|||
+magic_settaint|||
+magic_setutf8|||
+magic_setuvar|||
+magic_setvec|||
+magic_set|||
+magic_sizepack|||
+magic_wipepack|||
+magicname|||
+make_matcher|||
+make_trie_failtable|||
+make_trie|||
+malloced_size|||n
+malloc||5.007002|n
+markstack_grow|||
+matcher_matches_sv|||
+measure_struct|||
+memEQ|5.004000||p
+memNE|5.004000||p
+mem_collxfrm|||
+mess_alloc|||
+mess_nocontext|||vn
+mess||5.006000|v
+method_common|||
+mfree||5.007002|n
+mg_clear|||
+mg_copy|||
+mg_dup|||
+mg_find|||
+mg_free|||
+mg_get|||
+mg_length||5.005000|
+mg_localize|||
+mg_magical|||
+mg_set|||
+mg_size||5.005000|
+mini_mktime||5.007002|
+missingterm|||
+mode_from_discipline|||
+modkids|||
+mod|||
+more_bodies|||
+more_sv|||
+moreswitches|||
+mro_get_linear_isa_c3||5.009005|
+mro_get_linear_isa_dfs||5.009005|
+mro_get_linear_isa||5.009005|
+mro_isa_changed_in|||
+mro_meta_dup|||
+mro_meta_init|||
+mro_method_changed_in||5.009005|
+mul128|||
+mulexp10|||n
+my_atof2||5.007002|
+my_atof||5.006000|
+my_attrs|||
+my_bcopy|||n
+my_betoh16|||n
+my_betoh32|||n
+my_betoh64|||n
+my_betohi|||n
+my_betohl|||n
+my_betohs|||n
+my_bzero|||n
+my_chsize|||
+my_clearenv|||
+my_cxt_index|||
+my_cxt_init|||
+my_dirfd||5.009005|
+my_exit_jump|||
+my_exit|||
+my_failure_exit||5.004000|
+my_fflush_all||5.006000|
+my_fork||5.007003|n
+my_htobe16|||n
+my_htobe32|||n
+my_htobe64|||n
+my_htobei|||n
+my_htobel|||n
+my_htobes|||n
+my_htole16|||n
+my_htole32|||n
+my_htole64|||n
+my_htolei|||n
+my_htolel|||n
+my_htoles|||n
+my_htonl|||
+my_kid|||
+my_letoh16|||n
+my_letoh32|||n
+my_letoh64|||n
+my_letohi|||n
+my_letohl|||n
+my_letohs|||n
+my_lstat|||
+my_memcmp||5.004000|n
+my_memset|||n
+my_ntohl|||
+my_pclose||5.004000|
+my_popen_list||5.007001|
+my_popen||5.004000|
+my_setenv|||
+my_snprintf|5.009004||pvn
+my_socketpair||5.007003|n
+my_sprintf||5.009003|vn
+my_stat|||
+my_strftime||5.007002|
+my_strlcat|5.009004||pn
+my_strlcpy|5.009004||pn
+my_swabn|||n
+my_swap|||
+my_unexec|||
+my_vsnprintf||5.009004|n
+my|||
+need_utf8|||n
+newANONATTRSUB||5.006000|
+newANONHASH|||
+newANONLIST|||
+newANONSUB|||
+newASSIGNOP|||
+newATTRSUB||5.006000|
+newAVREF|||
+newAV|||
+newBINOP|||
+newCONDOP|||
+newCONSTSUB|5.004050||p
+newCVREF|||
+newDEFSVOP|||
+newFORM|||
+newFOROP|||
+newGIVENOP||5.009003|
+newGIVWHENOP|||
+newGP|||
+newGVOP|||
+newGVREF|||
+newGVgen|||
+newHVREF|||
+newHVhv||5.005000|
+newHV|||
+newIO|||
+newLISTOP|||
+newLOGOP|||
+newLOOPEX|||
+newLOOPOP|||
+newMADPROP|||
+newMADsv|||
+newMYSUB|||
+newNULLLIST|||
+newOP|||
+newPADOP|||
+newPMOP|||
+newPROG|||
+newPVOP|||
+newRANGE|||
+newRV_inc|5.004000||p
+newRV_noinc|5.004000||p
+newRV|||
+newSLICEOP|||
+newSTATEOP|||
+newSUB|||
+newSVOP|||
+newSVREF|||
+newSV_type||5.009005|
+newSVhek||5.009003|
+newSViv|||
+newSVnv|||
+newSVpvf_nocontext|||vn
+newSVpvf||5.004000|v
+newSVpvn_share|5.007001||p
+newSVpvn|5.004050||p
+newSVpvs_share||5.009003|
+newSVpvs|5.009003||p
+newSVpv|||
+newSVrv|||
+newSVsv|||
+newSVuv|5.006000||p
+newSV|||
+newTOKEN|||
+newUNOP|||
+newWHENOP||5.009003|
+newWHILEOP||5.009003|
+newXS_flags||5.009004|
+newXSproto||5.006000|
+newXS||5.006000|
+new_collate||5.006000|
+new_constant|||
+new_ctype||5.006000|
+new_he|||
+new_logop|||
+new_numeric||5.006000|
+new_stackinfo||5.005000|
+new_version||5.009000|
+new_warnings_bitfield|||
+next_symbol|||
+nextargv|||
+nextchar|||
+ninstr|||
+no_bareword_allowed|||
+no_fh_allowed|||
+no_op|||
+not_a_number|||
+nothreadhook||5.008000|
+nuke_stacks|||
+num_overflow|||n
+offer_nice_chunk|||
+oopsAV|||
+oopsCV|||
+oopsHV|||
+op_clear|||
+op_const_sv|||
+op_dump||5.006000|
+op_free|||
+op_getmad_weak|||
+op_getmad|||
+op_null||5.007002|
+op_refcnt_dec|||
+op_refcnt_inc|||
+op_refcnt_lock||5.009002|
+op_refcnt_unlock||5.009002|
+op_xmldump|||
+open_script|||
+pMY_CXT_|5.007003||p
+pMY_CXT|5.007003||p
+pTHX_|5.006000||p
+pTHX|5.006000||p
+packWARN|5.007003||p
+pack_cat||5.007003|
+pack_rec|||
+package|||
+packlist||5.008001|
+pad_add_anon|||
+pad_add_name|||
+pad_alloc|||
+pad_block_start|||
+pad_check_dup|||
+pad_compname_type|||
+pad_findlex|||
+pad_findmy|||
+pad_fixup_inner_anons|||
+pad_free|||
+pad_leavemy|||
+pad_new|||
+pad_peg|||n
+pad_push|||
+pad_reset|||
+pad_setsv|||
+pad_sv||5.009005|
+pad_swipe|||
+pad_tidy|||
+pad_undef|||
+parse_body|||
+parse_unicode_opts|||
+parser_dup|||
+parser_free|||
+path_is_absolute|||n
+peep|||
+pending_Slabs_to_ro|||
+perl_alloc_using|||n
+perl_alloc|||n
+perl_clone_using|||n
+perl_clone|||n
+perl_construct|||n
+perl_destruct||5.007003|n
+perl_free|||n
+perl_parse||5.006000|n
+perl_run|||n
+pidgone|||
+pm_description|||
+pmflag|||
+pmop_dump||5.006000|
+pmop_xmldump|||
+pmruntime|||
+pmtrans|||
+pop_scope|||
+pregcomp||5.009005|
+pregexec|||
+pregfree|||
+prepend_elem|||
+prepend_madprops|||
+printbuf|||
+printf_nocontext|||vn
+process_special_blocks|||
+ptr_table_clear||5.009005|
+ptr_table_fetch||5.009005|
+ptr_table_find|||n
+ptr_table_free||5.009005|
+ptr_table_new||5.009005|
+ptr_table_split||5.009005|
+ptr_table_store||5.009005|
+push_scope|||
+put_byte|||
+pv_display||5.006000|
+pv_escape||5.009004|
+pv_pretty||5.009004|
+pv_uni_display||5.007003|
+qerror|||
+qsortsvu|||
+re_compile||5.009005|
+re_croak2|||
+re_dup|||
+re_intuit_start||5.009005|
+re_intuit_string||5.006000|
+readpipe_override|||
+realloc||5.007002|n
+reentrant_free|||
+reentrant_init|||
+reentrant_retry|||vn
+reentrant_size|||
+ref_array_or_hash|||
+refcounted_he_chain_2hv|||
+refcounted_he_fetch|||
+refcounted_he_free|||
+refcounted_he_new|||
+refcounted_he_value|||
+refkids|||
+refto|||
+ref||5.009003|
+reg_check_named_buff_matched|||
+reg_named_buff_all||5.009005|
+reg_named_buff_exists||5.009005|
+reg_named_buff_fetch||5.009005|
+reg_named_buff_firstkey||5.009005|
+reg_named_buff_iter|||
+reg_named_buff_nextkey||5.009005|
+reg_named_buff_scalar||5.009005|
+reg_named_buff|||
+reg_namedseq|||
+reg_node|||
+reg_numbered_buff_fetch|||
+reg_numbered_buff_length|||
+reg_numbered_buff_store|||
+reg_qr_package|||
+reg_recode|||
+reg_scan_name|||
+reg_skipcomment|||
+reg_stringify||5.009005|
+reg_temp_copy|||
+reganode|||
+regatom|||
+regbranch|||
+regclass_swash||5.009004|
+regclass|||
+regcppop|||
+regcppush|||
+regcurly|||n
+regdump_extflags|||
+regdump||5.005000|
+regdupe_internal|||
+regexec_flags||5.005000|
+regfree_internal||5.009005|
+reghop3|||n
+reghop4|||n
+reghopmaybe3|||n
+reginclass|||
+reginitcolors||5.006000|
+reginsert|||
+regmatch|||
+regnext||5.005000|
+regpiece|||
+regpposixcc|||
+regprop|||
+regrepeat|||
+regtail_study|||
+regtail|||
+regtry|||
+reguni|||
+regwhite|||n
+reg|||
+repeatcpy|||
+report_evil_fh|||
+report_uninit|||
+require_pv||5.006000|
+require_tie_mod|||
+restore_magic|||
+rninstr|||
+rsignal_restore|||
+rsignal_save|||
+rsignal_state||5.004000|
+rsignal||5.004000|
+run_body|||
+run_user_filter|||
+runops_debug||5.005000|
+runops_standard||5.005000|
+rvpv_dup|||
+rxres_free|||
+rxres_restore|||
+rxres_save|||
+safesyscalloc||5.006000|n
+safesysfree||5.006000|n
+safesysmalloc||5.006000|n
+safesysrealloc||5.006000|n
+same_dirent|||
+save_I16||5.004000|
+save_I32|||
+save_I8||5.006000|
+save_aelem||5.004050|
+save_alloc||5.006000|
+save_aptr|||
+save_ary|||
+save_bool||5.008001|
+save_clearsv|||
+save_delete|||
+save_destructor_x||5.006000|
+save_destructor||5.006000|
+save_freeop|||
+save_freepv|||
+save_freesv|||
+save_generic_pvref||5.006001|
+save_generic_svref||5.005030|
+save_gp||5.004000|
+save_hash|||
+save_hek_flags|||n
+save_helem||5.004050|
+save_hints||5.005000|
+save_hptr|||
+save_int|||
+save_item|||
+save_iv||5.005000|
+save_lines|||
+save_list|||
+save_long|||
+save_magic|||
+save_mortalizesv||5.007001|
+save_nogv|||
+save_op|||
+save_padsv||5.007001|
+save_pptr|||
+save_re_context||5.006000|
+save_scalar_at|||
+save_scalar|||
+save_set_svflags||5.009000|
+save_shared_pvref||5.007003|
+save_sptr|||
+save_svref|||
+save_vptr||5.006000|
+savepvn|||
+savepvs||5.009003|
+savepv|||
+savesharedpvn||5.009005|
+savesharedpv||5.007003|
+savestack_grow_cnt||5.008001|
+savestack_grow|||
+savesvpv||5.009002|
+sawparens|||
+scalar_mod_type|||n
+scalarboolean|||
+scalarkids|||
+scalarseq|||
+scalarvoid|||
+scalar|||
+scan_bin||5.006000|
+scan_commit|||
+scan_const|||
+scan_formline|||
+scan_heredoc|||
+scan_hex|||
+scan_ident|||
+scan_inputsymbol|||
+scan_num||5.007001|
+scan_oct|||
+scan_pat|||
+scan_str|||
+scan_subst|||
+scan_trans|||
+scan_version||5.009001|
+scan_vstring||5.009005|
+scan_word|||
+scope|||
+screaminstr||5.005000|
+seed||5.008001|
+sequence_num|||
+sequence_tail|||
+sequence|||
+set_context||5.006000|n
+set_csh|||
+set_numeric_local||5.006000|
+set_numeric_radix||5.006000|
+set_numeric_standard||5.006000|
+setdefout|||
+setenv_getix|||
+share_hek_flags|||
+share_hek||5.004000|
+si_dup|||
+sighandler|||n
+simplify_sort|||
+skipspace0|||
+skipspace1|||
+skipspace2|||
+skipspace|||
+softref2xv|||
+sortcv_stacked|||
+sortcv_xsub|||
+sortcv|||
+sortsv_flags||5.009003|
+sortsv||5.007003|
+space_join_names_mortal|||
+ss_dup|||
+stack_grow|||
+start_force|||
+start_glob|||
+start_subparse||5.004000|
+stashpv_hvname_match||5.009005|
+stdize_locale|||
+strEQ|||
+strGE|||
+strGT|||
+strLE|||
+strLT|||
+strNE|||
+str_to_version||5.006000|
+strip_return|||
+strnEQ|||
+strnNE|||
+study_chunk|||
+sub_crush_depth|||
+sublex_done|||
+sublex_push|||
+sublex_start|||
+sv_2bool|||
+sv_2cv|||
+sv_2io|||
+sv_2iuv_common|||
+sv_2iuv_non_preserve|||
+sv_2iv_flags||5.009001|
+sv_2iv|||
+sv_2mortal|||
+sv_2nv|||
+sv_2pv_flags|5.007002||p
+sv_2pv_nolen|5.006000||p
+sv_2pvbyte_nolen|5.006000||p
+sv_2pvbyte|5.006000||p
+sv_2pvutf8_nolen||5.006000|
+sv_2pvutf8||5.006000|
+sv_2pv|||
+sv_2uv_flags||5.009001|
+sv_2uv|5.004000||p
+sv_add_arena|||
+sv_add_backref|||
+sv_backoff|||
+sv_bless|||
+sv_cat_decode||5.008001|
+sv_catpv_mg|5.004050||p
+sv_catpvf_mg_nocontext|||pvn
+sv_catpvf_mg|5.006000|5.004000|pv
+sv_catpvf_nocontext|||vn
+sv_catpvf||5.004000|v
+sv_catpvn_flags||5.007002|
+sv_catpvn_mg|5.004050||p
+sv_catpvn_nomg|5.007002||p
+sv_catpvn|||
+sv_catpvs|5.009003||p
+sv_catpv|||
+sv_catsv_flags||5.007002|
+sv_catsv_mg|5.004050||p
+sv_catsv_nomg|5.007002||p
+sv_catsv|||
+sv_catxmlpvn|||
+sv_catxmlsv|||
+sv_chop|||
+sv_clean_all|||
+sv_clean_objs|||
+sv_clear|||
+sv_cmp_locale||5.004000|
+sv_cmp|||
+sv_collxfrm|||
+sv_compile_2op||5.008001|
+sv_copypv||5.007003|
+sv_dec|||
+sv_del_backref|||
+sv_derived_from||5.004000|
+sv_does||5.009004|
+sv_dump|||
+sv_dup|||
+sv_eq|||
+sv_exp_grow|||
+sv_force_normal_flags||5.007001|
+sv_force_normal||5.006000|
+sv_free2|||
+sv_free_arenas|||
+sv_free|||
+sv_gets||5.004000|
+sv_grow|||
+sv_i_ncmp|||
+sv_inc|||
+sv_insert|||
+sv_isa|||
+sv_isobject|||
+sv_iv||5.005000|
+sv_kill_backrefs|||
+sv_len_utf8||5.006000|
+sv_len|||
+sv_magic_portable|5.009005|5.004000|p
+sv_magicext||5.007003|
+sv_magic|||
+sv_mortalcopy|||
+sv_ncmp|||
+sv_newmortal|||
+sv_newref|||
+sv_nolocking||5.007003|
+sv_nosharing||5.007003|
+sv_nounlocking|||
+sv_nv||5.005000|
+sv_peek||5.005000|
+sv_pos_b2u_midway|||
+sv_pos_b2u||5.006000|
+sv_pos_u2b_cached|||
+sv_pos_u2b_forwards|||n
+sv_pos_u2b_midway|||n
+sv_pos_u2b||5.006000|
+sv_pvbyten_force||5.006000|
+sv_pvbyten||5.006000|
+sv_pvbyte||5.006000|
+sv_pvn_force_flags|5.007002||p
+sv_pvn_force|||
+sv_pvn_nomg|5.007003||p
+sv_pvn|||
+sv_pvutf8n_force||5.006000|
+sv_pvutf8n||5.006000|
+sv_pvutf8||5.006000|
+sv_pv||5.006000|
+sv_recode_to_utf8||5.007003|
+sv_reftype|||
+sv_release_COW|||
+sv_replace|||
+sv_report_used|||
+sv_reset|||
+sv_rvweaken||5.006000|
+sv_setiv_mg|5.004050||p
+sv_setiv|||
+sv_setnv_mg|5.006000||p
+sv_setnv|||
+sv_setpv_mg|5.004050||p
+sv_setpvf_mg_nocontext|||pvn
+sv_setpvf_mg|5.006000|5.004000|pv
+sv_setpvf_nocontext|||vn
+sv_setpvf||5.004000|v
+sv_setpviv_mg||5.008001|
+sv_setpviv||5.008001|
+sv_setpvn_mg|5.004050||p
+sv_setpvn|||
+sv_setpvs|5.009004||p
+sv_setpv|||
+sv_setref_iv|||
+sv_setref_nv|||
+sv_setref_pvn|||
+sv_setref_pv|||
+sv_setref_uv||5.007001|
+sv_setsv_cow|||
+sv_setsv_flags||5.007002|
+sv_setsv_mg|5.004050||p
+sv_setsv_nomg|5.007002||p
+sv_setsv|||
+sv_setuv_mg|5.004050||p
+sv_setuv|5.004000||p
+sv_tainted||5.004000|
+sv_taint||5.004000|
+sv_true||5.005000|
+sv_unglob|||
+sv_uni_display||5.007003|
+sv_unmagic|||
+sv_unref_flags||5.007001|
+sv_unref|||
+sv_untaint||5.004000|
+sv_upgrade|||
+sv_usepvn_flags||5.009004|
+sv_usepvn_mg|5.004050||p
+sv_usepvn|||
+sv_utf8_decode||5.006000|
+sv_utf8_downgrade||5.006000|
+sv_utf8_encode||5.006000|
+sv_utf8_upgrade_flags||5.007002|
+sv_utf8_upgrade||5.007001|
+sv_uv|5.005000||p
+sv_vcatpvf_mg|5.006000|5.004000|p
+sv_vcatpvfn||5.004000|
+sv_vcatpvf|5.006000|5.004000|p
+sv_vsetpvf_mg|5.006000|5.004000|p
+sv_vsetpvfn||5.004000|
+sv_vsetpvf|5.006000|5.004000|p
+sv_xmlpeek|||
+svtype|||
+swallow_bom|||
+swap_match_buff|||
+swash_fetch||5.007002|
+swash_get|||
+swash_init||5.006000|
+sys_intern_clear|||
+sys_intern_dup|||
+sys_intern_init|||
+taint_env|||
+taint_proper|||
+tmps_grow||5.006000|
+toLOWER|||
+toUPPER|||
+to_byte_substr|||
+to_uni_fold||5.007003|
+to_uni_lower_lc||5.006000|
+to_uni_lower||5.007003|
+to_uni_title_lc||5.006000|
+to_uni_title||5.007003|
+to_uni_upper_lc||5.006000|
+to_uni_upper||5.007003|
+to_utf8_case||5.007003|
+to_utf8_fold||5.007003|
+to_utf8_lower||5.007003|
+to_utf8_substr|||
+to_utf8_title||5.007003|
+to_utf8_upper||5.007003|
+token_free|||
+token_getmad|||
+tokenize_use|||
+tokeq|||
+tokereport|||
+too_few_arguments|||
+too_many_arguments|||
+uiv_2buf|||n
+unlnk|||
+unpack_rec|||
+unpack_str||5.007003|
+unpackstring||5.008001|
+unshare_hek_or_pvn|||
+unshare_hek|||
+unsharepvn||5.004000|
+unwind_handler_stack|||
+update_debugger_info|||
+upg_version||5.009005|
+usage|||
+utf16_to_utf8_reversed||5.006001|
+utf16_to_utf8||5.006001|
+utf8_distance||5.006000|
+utf8_hop||5.006000|
+utf8_length||5.007001|
+utf8_mg_pos_cache_update|||
+utf8_to_bytes||5.006001|
+utf8_to_uvchr||5.007001|
+utf8_to_uvuni||5.007001|
+utf8n_to_uvchr|||
+utf8n_to_uvuni||5.007001|
+utilize|||
+uvchr_to_utf8_flags||5.007003|
+uvchr_to_utf8|||
+uvuni_to_utf8_flags||5.007003|
+uvuni_to_utf8||5.007001|
+validate_suid|||
+varname|||
+vcmp||5.009000|
+vcroak||5.006000|
+vdeb||5.007003|
+vdie_common|||
+vdie_croak_common|||
+vdie|||
+vform||5.006000|
+visit|||
+vivify_defelem|||
+vivify_ref|||
+vload_module|5.006000||p
+vmess||5.006000|
+vnewSVpvf|5.006000|5.004000|p
+vnormal||5.009002|
+vnumify||5.009000|
+vstringify||5.009000|
+vverify||5.009003|
+vwarner||5.006000|
+vwarn||5.006000|
+wait4pid|||
+warn_nocontext|||vn
+warner_nocontext|||vn
+warner|5.006000|5.004000|pv
+warn|||v
+watch|||
+whichsig|||
+write_no_mem|||
+write_to_stderr|||
+xmldump_all|||
+xmldump_attr|||
+xmldump_eval|||
+xmldump_form|||
+xmldump_indent|||v
+xmldump_packsubs|||
+xmldump_sub|||
+xmldump_vindent|||
+yyerror|||
+yylex|||
+yyparse|||
+yywarn|||
+);
+
+if (exists $opt{'list-unsupported'}) {
+ my $f;
+ for $f (sort { lc $a cmp lc $b } keys %API) {
+ next unless $API{$f}{todo};
+ print "$f ", '.'x(40-length($f)), " ", format_version($API{$f}{todo}), "\n";
+ }
+ exit 0;
+}
+
+# Scan for possible replacement candidates
+
+my(%replace, %need, %hints, %warnings, %depends);
+my $replace = 0;
+my($hint, $define, $function);
+
+sub find_api
+{
+ my $code = shift;
+ $code =~ s{
+ / (?: \*[^*]*\*+(?:[^$ccs][^*]*\*+)* / | /[^\r\n]*)
+ | "[^"\\]*(?:\\.[^"\\]*)*"
+ | '[^'\\]*(?:\\.[^'\\]*)*' }{}egsx;
+ grep { exists $API{$_} } $code =~ /(\w+)/mg;
+}
+
+while (<DATA>) {
+ if ($hint) {
+ my $h = $hint->[0] eq 'Hint' ? \%hints : \%warnings;
+ if (m{^\s*\*\s(.*?)\s*$}) {
+ for (@{$hint->[1]}) {
+ $h->{$_} ||= ''; # suppress warning with older perls
+ $h->{$_} .= "$1\n";
+ }
+ }
+ else { undef $hint }
+ }
+
+ $hint = [$1, [split /,?\s+/, $2]]
+ if m{^\s*$rccs\s+(Hint|Warning):\s+(\w+(?:,?\s+\w+)*)\s*$};
+
+ if ($define) {
+ if ($define->[1] =~ /\\$/) {
+ $define->[1] .= $_;
+ }
+ else {
+ if (exists $API{$define->[0]} && $define->[1] !~ /^DPPP_\(/) {
+ my @n = find_api($define->[1]);
+ push @{$depends{$define->[0]}}, @n if @n
+ }
+ undef $define;
+ }
+ }
+
+ $define = [$1, $2] if m{^\s*#\s*define\s+(\w+)(?:\([^)]*\))?\s+(.*)};
+
+ if ($function) {
+ if (/^}/) {
+ if (exists $API{$function->[0]}) {
+ my @n = find_api($function->[1]);
+ push @{$depends{$function->[0]}}, @n if @n
+ }
+ undef $define;
+ }
+ else {
+ $function->[1] .= $_;
+ }
+ }
+
+ $function = [$1, ''] if m{^DPPP_\(my_(\w+)\)};
+
+ $replace = $1 if m{^\s*$rccs\s+Replace:\s+(\d+)\s+$rcce\s*$};
+ $replace{$2} = $1 if $replace and m{^\s*#\s*define\s+(\w+)(?:\([^)]*\))?\s+(\w+)};
+ $replace{$2} = $1 if m{^\s*#\s*define\s+(\w+)(?:\([^)]*\))?\s+(\w+).*$rccs\s+Replace\s+$rcce};
+ $replace{$1} = $2 if m{^\s*$rccs\s+Replace (\w+) with (\w+)\s+$rcce\s*$};
+
+ if (m{^\s*$rccs\s+(\w+)\s+depends\s+on\s+(\w+(\s*,\s*\w+)*)\s+$rcce\s*$}) {
+ push @{$depends{$1}}, map { s/\s+//g; $_ } split /,/, $2;
+ }
+
+ $need{$1} = 1 if m{^#if\s+defined\(NEED_(\w+)(?:_GLOBAL)?\)};
+}
+
+for (values %depends) {
+ my %s;
+ $_ = [sort grep !$s{$_}++, @$_];
+}
+
+if (exists $opt{'api-info'}) {
+ my $f;
+ my $count = 0;
+ my $match = $opt{'api-info'} =~ m!^/(.*)/$! ? $1 : "^\Q$opt{'api-info'}\E\$";
+ for $f (sort { lc $a cmp lc $b } keys %API) {
+ next unless $f =~ /$match/;
+ print "\n=== $f ===\n\n";
+ my $info = 0;
+ if ($API{$f}{base} || $API{$f}{todo}) {
+ my $base = format_version($API{$f}{base} || $API{$f}{todo});
+ print "Supported at least starting from perl-$base.\n";
+ $info++;
+ }
+ if ($API{$f}{provided}) {
+ my $todo = $API{$f}{todo} ? format_version($API{$f}{todo}) : "5.003";
+ print "Support by $ppport provided back to perl-$todo.\n";
+ print "Support needs to be explicitly requested by NEED_$f.\n" if exists $need{$f};
+ print "Depends on: ", join(', ', @{$depends{$f}}), ".\n" if exists $depends{$f};
+ print "\n$hints{$f}" if exists $hints{$f};
+ print "\nWARNING:\n$warnings{$f}" if exists $warnings{$f};
+ $info++;
+ }
+ print "No portability information available.\n" unless $info;
+ $count++;
+ }
+ $count or print "Found no API matching '$opt{'api-info'}'.";
+ print "\n";
+ exit 0;
+}
+
+if (exists $opt{'list-provided'}) {
+ my $f;
+ for $f (sort { lc $a cmp lc $b } keys %API) {
+ next unless $API{$f}{provided};
+ my @flags;
+ push @flags, 'explicit' if exists $need{$f};
+ push @flags, 'depend' if exists $depends{$f};
+ push @flags, 'hint' if exists $hints{$f};
+ push @flags, 'warning' if exists $warnings{$f};
+ my $flags = @flags ? ' ['.join(', ', @flags).']' : '';
+ print "$f$flags\n";
+ }
+ exit 0;
+}
+
+my @files;
+my @srcext = qw( .xs .c .h .cc .cpp -c.inc -xs.inc );
+my $srcext = join '|', map { quotemeta $_ } @srcext;
+
+if (@ARGV) {
+ my %seen;
+ for (@ARGV) {
+ if (-e) {
+ if (-f) {
+ push @files, $_ unless $seen{$_}++;
+ }
+ else { warn "'$_' is not a file.\n" }
+ }
+ else {
+ my @new = grep { -f } glob $_
+ or warn "'$_' does not exist.\n";
+ push @files, grep { !$seen{$_}++ } @new;
+ }
+ }
+}
+else {
+ eval {
+ require File::Find;
+ File::Find::find(sub {
+ $File::Find::name =~ /($srcext)$/i
+ and push @files, $File::Find::name;
+ }, '.');
+ };
+ if ($@) {
+ @files = map { glob "*$_" } @srcext;
+ }
+}
+
+if (!@ARGV || $opt{filter}) {
+ my(@in, @out);
+ my %xsc = map { /(.*)\.xs$/ ? ("$1.c" => 1, "$1.cc" => 1) : () } @files;
+ for (@files) {
+ my $out = exists $xsc{$_} || /\b\Q$ppport\E$/i || !/($srcext)$/i;
+ push @{ $out ? \@out : \@in }, $_;
+ }
+ if (@ARGV && @out) {
+ warning("Skipping the following files (use --nofilter to avoid this):\n| ", join "\n| ", @out);
+ }
+ @files = @in;
+}
+
+die "No input files given!\n" unless @files;
+
+my(%files, %global, %revreplace);
+%revreplace = reverse %replace;
+my $filename;
+my $patch_opened = 0;
+
+for $filename (@files) {
+ unless (open IN, "<$filename") {
+ warn "Unable to read from $filename: $!\n";
+ next;
+ }
+
+ info("Scanning $filename ...");
+
+ my $c = do { local $/; <IN> };
+ close IN;
+
+ my %file = (orig => $c, changes => 0);
+
+ # Temporarily remove C/XS comments and strings from the code
+ my @ccom;
+
+ $c =~ s{
+ ( ^$HS*\#$HS*include\b[^\r\n]+\b(?:\Q$ppport\E|XSUB\.h)\b[^\r\n]*
+ | ^$HS*\#$HS*(?:define|elif|if(?:def)?)\b[^\r\n]* )
+ | ( ^$HS*\#[^\r\n]*
+ | "[^"\\]*(?:\\.[^"\\]*)*"
+ | '[^'\\]*(?:\\.[^'\\]*)*'
+ | / (?: \*[^*]*\*+(?:[^$ccs][^*]*\*+)* / | /[^\r\n]* ) )
+ }{ defined $2 and push @ccom, $2;
+ defined $1 ? $1 : "$ccs$#ccom$cce" }mgsex;
+
+ $file{ccom} = \@ccom;
+ $file{code} = $c;
+ $file{has_inc_ppport} = $c =~ /^$HS*#$HS*include[^\r\n]+\b\Q$ppport\E\b/m;
+
+ my $func;
+
+ for $func (keys %API) {
+ my $match = $func;
+ $match .= "|$revreplace{$func}" if exists $revreplace{$func};
+ if ($c =~ /\b(?:Perl_)?($match)\b/) {
+ $file{uses_replace}{$1}++ if exists $revreplace{$func} && $1 eq $revreplace{$func};
+ $file{uses_Perl}{$func}++ if $c =~ /\bPerl_$func\b/;
+ if (exists $API{$func}{provided}) {
+ $file{uses_provided}{$func}++;
+ if (!exists $API{$func}{base} || $API{$func}{base} > $opt{'compat-version'}) {
+ $file{uses}{$func}++;
+ my @deps = rec_depend($func);
+ if (@deps) {
+ $file{uses_deps}{$func} = \@deps;
+ for (@deps) {
+ $file{uses}{$_} = 0 unless exists $file{uses}{$_};
+ }
+ }
+ for ($func, @deps) {
+ $file{needs}{$_} = 'static' if exists $need{$_};
+ }
+ }
+ }
+ if (exists $API{$func}{todo} && $API{$func}{todo} > $opt{'compat-version'}) {
+ if ($c =~ /\b$func\b/) {
+ $file{uses_todo}{$func}++;
+ }
+ }
+ }
+ }
+
+ while ($c =~ /^$HS*#$HS*define$HS+(NEED_(\w+?)(_GLOBAL)?)\b/mg) {
+ if (exists $need{$2}) {
+ $file{defined $3 ? 'needed_global' : 'needed_static'}{$2}++;
+ }
+ else { warning("Possibly wrong #define $1 in $filename") }
+ }
+
+ for (qw(uses needs uses_todo needed_global needed_static)) {
+ for $func (keys %{$file{$_}}) {
+ push @{$global{$_}{$func}}, $filename;
+ }
+ }
+
+ $files{$filename} = \%file;
+}
+
+# Globally resolve NEED_'s
+my $need;
+for $need (keys %{$global{needs}}) {
+ if (@{$global{needs}{$need}} > 1) {
+ my @targets = @{$global{needs}{$need}};
+ my @t = grep $files{$_}{needed_global}{$need}, @targets;
+ @targets = @t if @t;
+ @t = grep /\.xs$/i, @targets;
+ @targets = @t if @t;
+ my $target = shift @targets;
+ $files{$target}{needs}{$need} = 'global';
+ for (@{$global{needs}{$need}}) {
+ $files{$_}{needs}{$need} = 'extern' if $_ ne $target;
+ }
+ }
+}
+
+for $filename (@files) {
+ exists $files{$filename} or next;
+
+ info("=== Analyzing $filename ===");
+
+ my %file = %{$files{$filename}};
+ my $func;
+ my $c = $file{code};
+ my $warnings = 0;
+
+ for $func (sort keys %{$file{uses_Perl}}) {
+ if ($API{$func}{varargs}) {
+ unless ($API{$func}{nothxarg}) {
+ my $changes = ($c =~ s{\b(Perl_$func\s*\(\s*)(?!aTHX_?)(\)|[^\s)]*\))}
+ { $1 . ($2 eq ')' ? 'aTHX' : 'aTHX_ ') . $2 }ge);
+ if ($changes) {
+ warning("Doesn't pass interpreter argument aTHX to Perl_$func");
+ $file{changes} += $changes;
+ }
+ }
+ }
+ else {
+ warning("Uses Perl_$func instead of $func");
+ $file{changes} += ($c =~ s{\bPerl_$func(\s*)\((\s*aTHX_?)?\s*}
+ {$func$1(}g);
+ }
+ }
+
+ for $func (sort keys %{$file{uses_replace}}) {
+ warning("Uses $func instead of $replace{$func}");
+ $file{changes} += ($c =~ s/\b$func\b/$replace{$func}/g);
+ }
+
+ for $func (sort keys %{$file{uses_provided}}) {
+ if ($file{uses}{$func}) {
+ if (exists $file{uses_deps}{$func}) {
+ diag("Uses $func, which depends on ", join(', ', @{$file{uses_deps}{$func}}));
+ }
+ else {
+ diag("Uses $func");
+ }
+ }
+ $warnings += hint($func);
+ }
+
+ unless ($opt{quiet}) {
+ for $func (sort keys %{$file{uses_todo}}) {
+ print "*** WARNING: Uses $func, which may not be portable below perl ",
+ format_version($API{$func}{todo}), ", even with '$ppport'\n";
+ $warnings++;
+ }
+ }
+
+ for $func (sort keys %{$file{needed_static}}) {
+ my $message = '';
+ if (not exists $file{uses}{$func}) {
+ $message = "No need to define NEED_$func if $func is never used";
+ }
+ elsif (exists $file{needs}{$func} && $file{needs}{$func} ne 'static') {
+ $message = "No need to define NEED_$func when already needed globally";
+ }
+ if ($message) {
+ diag($message);
+ $file{changes} += ($c =~ s/^$HS*#$HS*define$HS+NEED_$func\b.*$LF//mg);
+ }
+ }
+
+ for $func (sort keys %{$file{needed_global}}) {
+ my $message = '';
+ if (not exists $global{uses}{$func}) {
+ $message = "No need to define NEED_${func}_GLOBAL if $func is never used";
+ }
+ elsif (exists $file{needs}{$func}) {
+ if ($file{needs}{$func} eq 'extern') {
+ $message = "No need to define NEED_${func}_GLOBAL when already needed globally";
+ }
+ elsif ($file{needs}{$func} eq 'static') {
+ $message = "No need to define NEED_${func}_GLOBAL when only used in this file";
+ }
+ }
+ if ($message) {
+ diag($message);
+ $file{changes} += ($c =~ s/^$HS*#$HS*define$HS+NEED_${func}_GLOBAL\b.*$LF//mg);
+ }
+ }
+
+ $file{needs_inc_ppport} = keys %{$file{uses}};
+
+ if ($file{needs_inc_ppport}) {
+ my $pp = '';
+
+ for $func (sort keys %{$file{needs}}) {
+ my $type = $file{needs}{$func};
+ next if $type eq 'extern';
+ my $suffix = $type eq 'global' ? '_GLOBAL' : '';
+ unless (exists $file{"needed_$type"}{$func}) {
+ if ($type eq 'global') {
+ diag("Files [@{$global{needs}{$func}}] need $func, adding global request");
+ }
+ else {
+ diag("File needs $func, adding static request");
+ }
+ $pp .= "#define NEED_$func$suffix\n";
+ }
+ }
+
+ if ($pp && ($c =~ s/^(?=$HS*#$HS*define$HS+NEED_\w+)/$pp/m)) {
+ $pp = '';
+ $file{changes}++;
+ }
+
+ unless ($file{has_inc_ppport}) {
+ diag("Needs to include '$ppport'");
+ $pp .= qq(#include "$ppport"\n)
+ }
+
+ if ($pp) {
+ $file{changes} += ($c =~ s/^($HS*#$HS*define$HS+NEED_\w+.*?)^/$1$pp/ms)
+ || ($c =~ s/^(?=$HS*#$HS*include.*\Q$ppport\E)/$pp/m)
+ || ($c =~ s/^($HS*#$HS*include.*XSUB.*\s*?)^/$1$pp/m)
+ || ($c =~ s/^/$pp/);
+ }
+ }
+ else {
+ if ($file{has_inc_ppport}) {
+ diag("No need to include '$ppport'");
+ $file{changes} += ($c =~ s/^$HS*?#$HS*include.*\Q$ppport\E.*?$LF//m);
+ }
+ }
+
+ # put back in our C comments
+ my $ix;
+ my $cppc = 0;
+ my @ccom = @{$file{ccom}};
+ for $ix (0 .. $#ccom) {
+ if (!$opt{cplusplus} && $ccom[$ix] =~ s!^//!!) {
+ $cppc++;
+ $file{changes} += $c =~ s/$rccs$ix$rcce/$ccs$ccom[$ix] $cce/;
+ }
+ else {
+ $c =~ s/$rccs$ix$rcce/$ccom[$ix]/;
+ }
+ }
+
+ if ($cppc) {
+ my $s = $cppc != 1 ? 's' : '';
+ warning("Uses $cppc C++ style comment$s, which is not portable");
+ }
+
+ my $s = $warnings != 1 ? 's' : '';
+ my $warn = $warnings ? " ($warnings warning$s)" : '';
+ info("Analysis completed$warn");
+
+ if ($file{changes}) {
+ if (exists $opt{copy}) {
+ my $newfile = "$filename$opt{copy}";
+ if (-e $newfile) {
+ error("'$newfile' already exists, refusing to write copy of '$filename'");
+ }
+ else {
+ local *F;
+ if (open F, ">$newfile") {
+ info("Writing copy of '$filename' with changes to '$newfile'");
+ print F $c;
+ close F;
+ }
+ else {
+ error("Cannot open '$newfile' for writing: $!");
+ }
+ }
+ }
+ elsif (exists $opt{patch} || $opt{changes}) {
+ if (exists $opt{patch}) {
+ unless ($patch_opened) {
+ if (open PATCH, ">$opt{patch}") {
+ $patch_opened = 1;
+ }
+ else {
+ error("Cannot open '$opt{patch}' for writing: $!");
+ delete $opt{patch};
+ $opt{changes} = 1;
+ goto fallback;
+ }
+ }
+ mydiff(\*PATCH, $filename, $c);
+ }
+ else {
+fallback:
+ info("Suggested changes:");
+ mydiff(\*STDOUT, $filename, $c);
+ }
+ }
+ else {
+ my $s = $file{changes} == 1 ? '' : 's';
+ info("$file{changes} potentially required change$s detected");
+ }
+ }
+ else {
+ info("Looks good");
+ }
+}
+
+close PATCH if $patch_opened;
+
+exit 0;
+
+
+sub try_use { eval "use @_;"; return $@ eq '' }
+
+sub mydiff
+{
+ local *F = shift;
+ my($file, $str) = @_;
+ my $diff;
+
+ if (exists $opt{diff}) {
+ $diff = run_diff($opt{diff}, $file, $str);
+ }
+
+ if (!defined $diff and try_use('Text::Diff')) {
+ $diff = Text::Diff::diff($file, \$str, { STYLE => 'Unified' });
+ $diff = <<HEADER . $diff;
+--- $file
++++ $file.patched
+HEADER
+ }
+
+ if (!defined $diff) {
+ $diff = run_diff('diff -u', $file, $str);
+ }
+
+ if (!defined $diff) {
+ $diff = run_diff('diff', $file, $str);
+ }
+
+ if (!defined $diff) {
+ error("Cannot generate a diff. Please install Text::Diff or use --copy.");
+ return;
+ }
+
+ print F $diff;
+}
+
+sub run_diff
+{
+ my($prog, $file, $str) = @_;
+ my $tmp = 'dppptemp';
+ my $suf = 'aaa';
+ my $diff = '';
+ local *F;
+
+ while (-e "$tmp.$suf") { $suf++ }
+ $tmp = "$tmp.$suf";
+
+ if (open F, ">$tmp") {
+ print F $str;
+ close F;
+
+ if (open F, "$prog $file $tmp |") {
+ while (<F>) {
+ s/\Q$tmp\E/$file.patched/;
+ $diff .= $_;
+ }
+ close F;
+ unlink $tmp;
+ return $diff;
+ }
+
+ unlink $tmp;
+ }
+ else {
+ error("Cannot open '$tmp' for writing: $!");
+ }
+
+ return undef;
+}
+
+sub rec_depend
+{
+ my($func, $seen) = @_;
+ return () unless exists $depends{$func};
+ $seen = {%{$seen||{}}};
+ return () if $seen->{$func}++;
+ my %s;
+ grep !$s{$_}++, map { ($_, rec_depend($_, $seen)) } @{$depends{$func}};
+}
+
+sub parse_version
+{
+ my $ver = shift;
+
+ if ($ver =~ /^(\d+)\.(\d+)\.(\d+)$/) {
+ return ($1, $2, $3);
+ }
+ elsif ($ver !~ /^\d+\.[\d_]+$/) {
+ die "cannot parse version '$ver'\n";
+ }
+
+ $ver =~ s/_//g;
+ $ver =~ s/$/000000/;
+
+ my($r,$v,$s) = $ver =~ /(\d+)\.(\d{3})(\d{3})/;
+
+ $v = int $v;
+ $s = int $s;
+
+ if ($r < 5 || ($r == 5 && $v < 6)) {
+ if ($s % 10) {
+ die "cannot parse version '$ver'\n";
+ }
+ }
+
+ return ($r, $v, $s);
+}
+
+sub format_version
+{
+ my $ver = shift;
+
+ $ver =~ s/$/000000/;
+ my($r,$v,$s) = $ver =~ /(\d+)\.(\d{3})(\d{3})/;
+
+ $v = int $v;
+ $s = int $s;
+
+ if ($r < 5 || ($r == 5 && $v < 6)) {
+ if ($s % 10) {
+ die "invalid version '$ver'\n";
+ }
+ $s /= 10;
+
+ $ver = sprintf "%d.%03d", $r, $v;
+ $s > 0 and $ver .= sprintf "_%02d", $s;
+
+ return $ver;
+ }
+
+ return sprintf "%d.%d.%d", $r, $v, $s;
+}
+
+sub info
+{
+ $opt{quiet} and return;
+ print @_, "\n";
+}
+
+sub diag
+{
+ $opt{quiet} and return;
+ $opt{diag} and print @_, "\n";
+}
+
+sub warning
+{
+ $opt{quiet} and return;
+ print "*** ", @_, "\n";
+}
+
+sub error
+{
+ print "*** ERROR: ", @_, "\n";
+}
+
+my %given_hints;
+my %given_warnings;
+sub hint
+{
+ $opt{quiet} and return;
+ my $func = shift;
+ my $rv = 0;
+ if (exists $warnings{$func} && !$given_warnings{$func}++) {
+ my $warn = $warnings{$func};
+ $warn =~ s!^!*** !mg;
+ print "*** WARNING: $func\n", $warn;
+ $rv++;
+ }
+ if ($opt{hints} && exists $hints{$func} && !$given_hints{$func}++) {
+ my $hint = $hints{$func};
+ $hint =~ s/^/ /mg;
+ print " --- hint for $func ---\n", $hint;
+ }
+ $rv;
+}
+
+sub usage
+{
+ my($usage) = do { local(@ARGV,$/)=($0); <> } =~ /^=head\d$HS+SYNOPSIS\s*^(.*?)\s*^=/ms;
+ my %M = ( 'I' => '*' );
+ $usage =~ s/^\s*perl\s+\S+/$^X $0/;
+ $usage =~ s/([A-Z])<([^>]+)>/$M{$1}$2$M{$1}/g;
+
+ print <<ENDUSAGE;
+
+Usage: $usage
+
+See perldoc $0 for details.
+
+ENDUSAGE
+
+ exit 2;
+}
+
+sub strip
+{
+ my $self = do { local(@ARGV,$/)=($0); <> };
+ my($copy) = $self =~ /^=head\d\s+COPYRIGHT\s*^(.*?)^=\w+/ms;
+ $copy =~ s/^(?=\S+)/ /gms;
+ $self =~ s/^$HS+Do NOT edit.*?(?=^-)/$copy/ms;
+ $self =~ s/^SKIP.*(?=^__DATA__)/SKIP
+if (\@ARGV && \$ARGV[0] eq '--unstrip') {
+ eval { require Devel::PPPort };
+ \$@ and die "Cannot require Devel::PPPort, please install.\\n";
+ if (\$Devel::PPPort::VERSION < $VERSION) {
+ die "$0 was originally generated with Devel::PPPort $VERSION.\\n"
+ . "Your Devel::PPPort is only version \$Devel::PPPort::VERSION.\\n"
+ . "Please install a newer version, or --unstrip will not work.\\n";
+ }
+ Devel::PPPort::WriteFile(\$0);
+ exit 0;
+}
+print <<END;
+
+Sorry, but this is a stripped version of \$0.
+
+To be able to use its original script and doc functionality,
+please try to regenerate this file using:
+
+ \$^X \$0 --unstrip
+
+END
+/ms;
+ my($pl, $c) = $self =~ /(.*^__DATA__)(.*)/ms;
+ $c =~ s{
+ / (?: \*[^*]*\*+(?:[^$ccs][^*]*\*+)* / | /[^\r\n]*)
+ | ( "[^"\\]*(?:\\.[^"\\]*)*"
+ | '[^'\\]*(?:\\.[^'\\]*)*' )
+ | ($HS+) }{ defined $2 ? ' ' : ($1 || '') }gsex;
+ $c =~ s!\s+$!!mg;
+ $c =~ s!^$LF!!mg;
+ $c =~ s!^\s*#\s*!#!mg;
+ $c =~ s!^\s+!!mg;
+
+ open OUT, ">$0" or die "cannot strip $0: $!\n";
+ print OUT "$pl$c\n";
+
+ exit 0;
+}
+
+__DATA__
+*/
+
+#ifndef _P_P_PORTABILITY_H_
+#define _P_P_PORTABILITY_H_
+
+#ifndef DPPP_NAMESPACE
+# define DPPP_NAMESPACE DPPP_
+#endif
+
+#define DPPP_CAT2(x,y) CAT2(x,y)
+#define DPPP_(name) DPPP_CAT2(DPPP_NAMESPACE, name)
+
+#ifndef PERL_REVISION
+# if !defined(__PATCHLEVEL_H_INCLUDED__) && !(defined(PATCHLEVEL) && defined(SUBVERSION))
+# define PERL_PATCHLEVEL_H_IMPLICIT
+# include <patchlevel.h>
+# endif
+# if !(defined(PERL_VERSION) || (defined(SUBVERSION) && defined(PATCHLEVEL)))
+# include <could_not_find_Perl_patchlevel.h>
+# endif
+# ifndef PERL_REVISION
+# define PERL_REVISION (5)
+ /* Replace: 1 */
+# define PERL_VERSION PATCHLEVEL
+# define PERL_SUBVERSION SUBVERSION
+ /* Replace PERL_PATCHLEVEL with PERL_VERSION */
+ /* Replace: 0 */
+# endif
+#endif
+
+#define _dpppDEC2BCD(dec) ((((dec)/100)<<8)|((((dec)%100)/10)<<4)|((dec)%10))
+#define PERL_BCDVERSION ((_dpppDEC2BCD(PERL_REVISION)<<24)|(_dpppDEC2BCD(PERL_VERSION)<<12)|_dpppDEC2BCD(PERL_SUBVERSION))
+
+/* It is very unlikely that anyone will try to use this with Perl 6
+ (or greater), but who knows.
+ */
+#if PERL_REVISION != 5
+# error ppport.h only works with Perl version 5
+#endif /* PERL_REVISION != 5 */
+
+#ifdef I_LIMITS
+# include <limits.h>
+#endif
+
+#ifndef PERL_UCHAR_MIN
+# define PERL_UCHAR_MIN ((unsigned char)0)
+#endif
+
+#ifndef PERL_UCHAR_MAX
+# ifdef UCHAR_MAX
+# define PERL_UCHAR_MAX ((unsigned char)UCHAR_MAX)
+# else
+# ifdef MAXUCHAR
+# define PERL_UCHAR_MAX ((unsigned char)MAXUCHAR)
+# else
+# define PERL_UCHAR_MAX ((unsigned char)~(unsigned)0)
+# endif
+# endif
+#endif
+
+#ifndef PERL_USHORT_MIN
+# define PERL_USHORT_MIN ((unsigned short)0)
+#endif
+
+#ifndef PERL_USHORT_MAX
+# ifdef USHORT_MAX
+# define PERL_USHORT_MAX ((unsigned short)USHORT_MAX)
+# else
+# ifdef MAXUSHORT
+# define PERL_USHORT_MAX ((unsigned short)MAXUSHORT)
+# else
+# ifdef USHRT_MAX
+# define PERL_USHORT_MAX ((unsigned short)USHRT_MAX)
+# else
+# define PERL_USHORT_MAX ((unsigned short)~(unsigned)0)
+# endif
+# endif
+# endif
+#endif
+
+#ifndef PERL_SHORT_MAX
+# ifdef SHORT_MAX
+# define PERL_SHORT_MAX ((short)SHORT_MAX)
+# else
+# ifdef MAXSHORT /* Often used in <values.h> */
+# define PERL_SHORT_MAX ((short)MAXSHORT)
+# else
+# ifdef SHRT_MAX
+# define PERL_SHORT_MAX ((short)SHRT_MAX)
+# else
+# define PERL_SHORT_MAX ((short) (PERL_USHORT_MAX >> 1))
+# endif
+# endif
+# endif
+#endif
+
+#ifndef PERL_SHORT_MIN
+# ifdef SHORT_MIN
+# define PERL_SHORT_MIN ((short)SHORT_MIN)
+# else
+# ifdef MINSHORT
+# define PERL_SHORT_MIN ((short)MINSHORT)
+# else
+# ifdef SHRT_MIN
+# define PERL_SHORT_MIN ((short)SHRT_MIN)
+# else
+# define PERL_SHORT_MIN (-PERL_SHORT_MAX - ((3 & -1) == 3))
+# endif
+# endif
+# endif
+#endif
+
+#ifndef PERL_UINT_MAX
+# ifdef UINT_MAX
+# define PERL_UINT_MAX ((unsigned int)UINT_MAX)
+# else
+# ifdef MAXUINT
+# define PERL_UINT_MAX ((unsigned int)MAXUINT)
+# else
+# define PERL_UINT_MAX (~(unsigned int)0)
+# endif
+# endif
+#endif
+
+#ifndef PERL_UINT_MIN
+# define PERL_UINT_MIN ((unsigned int)0)
+#endif
+
+#ifndef PERL_INT_MAX
+# ifdef INT_MAX
+# define PERL_INT_MAX ((int)INT_MAX)
+# else
+# ifdef MAXINT /* Often used in <values.h> */
+# define PERL_INT_MAX ((int)MAXINT)
+# else
+# define PERL_INT_MAX ((int)(PERL_UINT_MAX >> 1))
+# endif
+# endif
+#endif
+
+#ifndef PERL_INT_MIN
+# ifdef INT_MIN
+# define PERL_INT_MIN ((int)INT_MIN)
+# else
+# ifdef MININT
+# define PERL_INT_MIN ((int)MININT)
+# else
+# define PERL_INT_MIN (-PERL_INT_MAX - ((3 & -1) == 3))
+# endif
+# endif
+#endif
+
+#ifndef PERL_ULONG_MAX
+# ifdef ULONG_MAX
+# define PERL_ULONG_MAX ((unsigned long)ULONG_MAX)
+# else
+# ifdef MAXULONG
+# define PERL_ULONG_MAX ((unsigned long)MAXULONG)
+# else
+# define PERL_ULONG_MAX (~(unsigned long)0)
+# endif
+# endif
+#endif
+
+#ifndef PERL_ULONG_MIN
+# define PERL_ULONG_MIN ((unsigned long)0L)
+#endif
+
+#ifndef PERL_LONG_MAX
+# ifdef LONG_MAX
+# define PERL_LONG_MAX ((long)LONG_MAX)
+# else
+# ifdef MAXLONG
+# define PERL_LONG_MAX ((long)MAXLONG)
+# else
+# define PERL_LONG_MAX ((long) (PERL_ULONG_MAX >> 1))
+# endif
+# endif
+#endif
+
+#ifndef PERL_LONG_MIN
+# ifdef LONG_MIN
+# define PERL_LONG_MIN ((long)LONG_MIN)
+# else
+# ifdef MINLONG
+# define PERL_LONG_MIN ((long)MINLONG)
+# else
+# define PERL_LONG_MIN (-PERL_LONG_MAX - ((3 & -1) == 3))
+# endif
+# endif
+#endif
+
+#if defined(HAS_QUAD) && (defined(convex) || defined(uts))
+# ifndef PERL_UQUAD_MAX
+# ifdef ULONGLONG_MAX
+# define PERL_UQUAD_MAX ((unsigned long long)ULONGLONG_MAX)
+# else
+# ifdef MAXULONGLONG
+# define PERL_UQUAD_MAX ((unsigned long long)MAXULONGLONG)
+# else
+# define PERL_UQUAD_MAX (~(unsigned long long)0)
+# endif
+# endif
+# endif
+
+# ifndef PERL_UQUAD_MIN
+# define PERL_UQUAD_MIN ((unsigned long long)0L)
+# endif
+
+# ifndef PERL_QUAD_MAX
+# ifdef LONGLONG_MAX
+# define PERL_QUAD_MAX ((long long)LONGLONG_MAX)
+# else
+# ifdef MAXLONGLONG
+# define PERL_QUAD_MAX ((long long)MAXLONGLONG)
+# else
+# define PERL_QUAD_MAX ((long long) (PERL_UQUAD_MAX >> 1))
+# endif
+# endif
+# endif
+
+# ifndef PERL_QUAD_MIN
+# ifdef LONGLONG_MIN
+# define PERL_QUAD_MIN ((long long)LONGLONG_MIN)
+# else
+# ifdef MINLONGLONG
+# define PERL_QUAD_MIN ((long long)MINLONGLONG)
+# else
+# define PERL_QUAD_MIN (-PERL_QUAD_MAX - ((3 & -1) == 3))
+# endif
+# endif
+# endif
+#endif
+
+/* This is based on code from 5.003 perl.h */
+#ifdef HAS_QUAD
+# ifdef cray
+#ifndef IVTYPE
+# define IVTYPE int
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_INT_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_INT_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_UINT_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_UINT_MAX
+#endif
+
+# ifdef INTSIZE
+#ifndef IVSIZE
+# define IVSIZE INTSIZE
+#endif
+
+# endif
+# else
+# if defined(convex) || defined(uts)
+#ifndef IVTYPE
+# define IVTYPE long long
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_QUAD_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_QUAD_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_UQUAD_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_UQUAD_MAX
+#endif
+
+# ifdef LONGLONGSIZE
+#ifndef IVSIZE
+# define IVSIZE LONGLONGSIZE
+#endif
+
+# endif
+# else
+#ifndef IVTYPE
+# define IVTYPE long
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_LONG_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_LONG_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_ULONG_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_ULONG_MAX
+#endif
+
+# ifdef LONGSIZE
+#ifndef IVSIZE
+# define IVSIZE LONGSIZE
+#endif
+
+# endif
+# endif
+# endif
+#ifndef IVSIZE
+# define IVSIZE 8
+#endif
+
+#ifndef PERL_QUAD_MIN
+# define PERL_QUAD_MIN IV_MIN
+#endif
+
+#ifndef PERL_QUAD_MAX
+# define PERL_QUAD_MAX IV_MAX
+#endif
+
+#ifndef PERL_UQUAD_MIN
+# define PERL_UQUAD_MIN UV_MIN
+#endif
+
+#ifndef PERL_UQUAD_MAX
+# define PERL_UQUAD_MAX UV_MAX
+#endif
+
+#else
+#ifndef IVTYPE
+# define IVTYPE long
+#endif
+
+#ifndef IV_MIN
+# define IV_MIN PERL_LONG_MIN
+#endif
+
+#ifndef IV_MAX
+# define IV_MAX PERL_LONG_MAX
+#endif
+
+#ifndef UV_MIN
+# define UV_MIN PERL_ULONG_MIN
+#endif
+
+#ifndef UV_MAX
+# define UV_MAX PERL_ULONG_MAX
+#endif
+
+#endif
+
+#ifndef IVSIZE
+# ifdef LONGSIZE
+# define IVSIZE LONGSIZE
+# else
+# define IVSIZE 4 /* A bold guess, but the best we can make. */
+# endif
+#endif
+#ifndef UVTYPE
+# define UVTYPE unsigned IVTYPE
+#endif
+
+#ifndef UVSIZE
+# define UVSIZE IVSIZE
+#endif
+#ifndef sv_setuv
+# define sv_setuv(sv, uv) \
+ STMT_START { \
+ UV TeMpUv = uv; \
+ if (TeMpUv <= IV_MAX) \
+ sv_setiv(sv, TeMpUv); \
+ else \
+ sv_setnv(sv, (double)TeMpUv); \
+ } STMT_END
+#endif
+#ifndef newSVuv
+# define newSVuv(uv) ((uv) <= IV_MAX ? newSViv((IV)uv) : newSVnv((NV)uv))
+#endif
+#ifndef sv_2uv
+# define sv_2uv(sv) ((PL_Sv = (sv)), (UV) (SvNOK(PL_Sv) ? SvNV(PL_Sv) : sv_2nv(PL_Sv)))
+#endif
+
+#ifndef SvUVX
+# define SvUVX(sv) ((UV)SvIVX(sv))
+#endif
+
+#ifndef SvUVXx
+# define SvUVXx(sv) SvUVX(sv)
+#endif
+
+#ifndef SvUV
+# define SvUV(sv) (SvIOK(sv) ? SvUVX(sv) : sv_2uv(sv))
+#endif
+
+#ifndef SvUVx
+# define SvUVx(sv) ((PL_Sv = (sv)), SvUV(PL_Sv))
+#endif
+
+/* Hint: sv_uv
+ * Always use the SvUVx() macro instead of sv_uv().
+ */
+#ifndef sv_uv
+# define sv_uv(sv) SvUVx(sv)
+#endif
+
+#if !defined(SvUOK) && defined(SvIOK_UV)
+# define SvUOK(sv) SvIOK_UV(sv)
+#endif
+#ifndef XST_mUV
+# define XST_mUV(i,v) (ST(i) = sv_2mortal(newSVuv(v)) )
+#endif
+
+#ifndef XSRETURN_UV
+# define XSRETURN_UV(v) STMT_START { XST_mUV(0,v); XSRETURN(1); } STMT_END
+#endif
+#ifndef PUSHu
+# define PUSHu(u) STMT_START { sv_setuv(TARG, (UV)(u)); PUSHTARG; } STMT_END
+#endif
+
+#ifndef XPUSHu
+# define XPUSHu(u) STMT_START { sv_setuv(TARG, (UV)(u)); XPUSHTARG; } STMT_END
+#endif
+
+#ifdef HAS_MEMCMP
+#ifndef memNE
+# define memNE(s1,s2,l) (memcmp(s1,s2,l))
+#endif
+
+#ifndef memEQ
+# define memEQ(s1,s2,l) (!memcmp(s1,s2,l))
+#endif
+
+#else
+#ifndef memNE
+# define memNE(s1,s2,l) (bcmp(s1,s2,l))
+#endif
+
+#ifndef memEQ
+# define memEQ(s1,s2,l) (!bcmp(s1,s2,l))
+#endif
+
+#endif
+#ifndef MoveD
+# define MoveD(s,d,n,t) memmove((char*)(d),(char*)(s), (n) * sizeof(t))
+#endif
+
+#ifndef CopyD
+# define CopyD(s,d,n,t) memcpy((char*)(d),(char*)(s), (n) * sizeof(t))
+#endif
+
+#ifdef HAS_MEMSET
+#ifndef ZeroD
+# define ZeroD(d,n,t) memzero((char*)(d), (n) * sizeof(t))
+#endif
+
+#else
+#ifndef ZeroD
+# define ZeroD(d,n,t) ((void)memzero((char*)(d), (n) * sizeof(t)), d)
+#endif
+
+#endif
+#ifndef PoisonWith
+# define PoisonWith(d,n,t,b) (void)memset((char*)(d), (U8)(b), (n) * sizeof(t))
+#endif
+
+#ifndef PoisonNew
+# define PoisonNew(d,n,t) PoisonWith(d,n,t,0xAB)
+#endif
+
+#ifndef PoisonFree
+# define PoisonFree(d,n,t) PoisonWith(d,n,t,0xEF)
+#endif
+
+#ifndef Poison
+# define Poison(d,n,t) PoisonFree(d,n,t)
+#endif
+#ifndef Newx
+# define Newx(v,n,t) New(0,v,n,t)
+#endif
+
+#ifndef Newxc
+# define Newxc(v,n,t,c) Newc(0,v,n,t,c)
+#endif
+
+#ifndef Newxz
+# define Newxz(v,n,t) Newz(0,v,n,t)
+#endif
+
+#ifndef PERL_UNUSED_DECL
+# ifdef HASATTRIBUTE
+# if (defined(__GNUC__) && defined(__cplusplus)) || defined(__INTEL_COMPILER)
+# define PERL_UNUSED_DECL
+# else
+# define PERL_UNUSED_DECL __attribute__((unused))
+# endif
+# else
+# define PERL_UNUSED_DECL
+# endif
+#endif
+
+#ifndef PERL_UNUSED_ARG
+# if defined(lint) && defined(S_SPLINT_S) /* www.splint.org */
+# include <note.h>
+# define PERL_UNUSED_ARG(x) NOTE(ARGUNUSED(x))
+# else
+# define PERL_UNUSED_ARG(x) ((void)x)
+# endif
+#endif
+
+#ifndef PERL_UNUSED_VAR
+# define PERL_UNUSED_VAR(x) ((void)x)
+#endif
+
+#ifndef PERL_UNUSED_CONTEXT
+# ifdef USE_ITHREADS
+# define PERL_UNUSED_CONTEXT PERL_UNUSED_ARG(my_perl)
+# else
+# define PERL_UNUSED_CONTEXT
+# endif
+#endif
+#ifndef NOOP
+# define NOOP /*EMPTY*/(void)0
+#endif
+
+#ifndef dNOOP
+# define dNOOP extern int /*@unused@*/ Perl___notused PERL_UNUSED_DECL
+#endif
+
+#ifndef NVTYPE
+# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE)
+# define NVTYPE long double
+# else
+# define NVTYPE double
+# endif
+typedef NVTYPE NV;
+#endif
+
+#ifndef INT2PTR
+
+# if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE)
+# define PTRV UV
+# define INT2PTR(any,d) (any)(d)
+# else
+# if PTRSIZE == LONGSIZE
+# define PTRV unsigned long
+# else
+# define PTRV unsigned
+# endif
+# define INT2PTR(any,d) (any)(PTRV)(d)
+# endif
+
+# define NUM2PTR(any,d) (any)(PTRV)(d)
+# define PTR2IV(p) INT2PTR(IV,p)
+# define PTR2UV(p) INT2PTR(UV,p)
+# define PTR2NV(p) NUM2PTR(NV,p)
+
+# if PTRSIZE == LONGSIZE
+# define PTR2ul(p) (unsigned long)(p)
+# else
+# define PTR2ul(p) INT2PTR(unsigned long,p)
+# endif
+
+#endif /* !INT2PTR */
+
+#undef START_EXTERN_C
+#undef END_EXTERN_C
+#undef EXTERN_C
+#ifdef __cplusplus
+# define START_EXTERN_C extern "C" {
+# define END_EXTERN_C }
+# define EXTERN_C extern "C"
+#else
+# define START_EXTERN_C
+# define END_EXTERN_C
+# define EXTERN_C extern
+#endif
+
+#if defined(PERL_GCC_PEDANTIC)
+# ifndef PERL_GCC_BRACE_GROUPS_FORBIDDEN
+# define PERL_GCC_BRACE_GROUPS_FORBIDDEN
+# endif
+#endif
+
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__cplusplus)
+# ifndef PERL_USE_GCC_BRACE_GROUPS
+# define PERL_USE_GCC_BRACE_GROUPS
+# endif
+#endif
+
+#undef STMT_START
+#undef STMT_END
+#ifdef PERL_USE_GCC_BRACE_GROUPS
+# define STMT_START (void)( /* gcc supports ``({ STATEMENTS; })'' */
+# define STMT_END )
+#else
+# if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
+# define STMT_START if (1)
+# define STMT_END else (void)0
+# else
+# define STMT_START do
+# define STMT_END while (0)
+# endif
+#endif
+#ifndef boolSV
+# define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no)
+#endif
+
+/* DEFSV appears first in 5.004_56 */
+#ifndef DEFSV
+# define DEFSV GvSV(PL_defgv)
+#endif
+
+#ifndef SAVE_DEFSV
+# define SAVE_DEFSV SAVESPTR(GvSV(PL_defgv))
+#endif
+
+/* Older perls (<=5.003) lack AvFILLp */
+#ifndef AvFILLp
+# define AvFILLp AvFILL
+#endif
+#ifndef ERRSV
+# define ERRSV get_sv("@",FALSE)
+#endif
+#ifndef newSVpvn
+# define newSVpvn(data,len) ((data) \
+ ? ((len) ? newSVpv((data), (len)) : newSVpv("", 0)) \
+ : newSV(0))
+#endif
+
+/* Hint: gv_stashpvn
+ * This function's backport doesn't support the length parameter, but
+ * rather ignores it. Portability can only be ensured if the length
+ * parameter is used for speed reasons, but the length can always be
+ * correctly computed from the string argument.
+ */
+#ifndef gv_stashpvn
+# define gv_stashpvn(str,len,create) gv_stashpv(str,create)
+#endif
+
+/* Replace: 1 */
+#ifndef get_cv
+# define get_cv perl_get_cv
+#endif
+
+#ifndef get_sv
+# define get_sv perl_get_sv
+#endif
+
+#ifndef get_av
+# define get_av perl_get_av
+#endif
+
+#ifndef get_hv
+# define get_hv perl_get_hv
+#endif
+
+/* Replace: 0 */
+#ifndef dUNDERBAR
+# define dUNDERBAR dNOOP
+#endif
+
+#ifndef UNDERBAR
+# define UNDERBAR DEFSV
+#endif
+#ifndef dAX
+# define dAX I32 ax = MARK - PL_stack_base + 1
+#endif
+
+#ifndef dITEMS
+# define dITEMS I32 items = SP - MARK
+#endif
+#ifndef dXSTARG
+# define dXSTARG SV * targ = sv_newmortal()
+#endif
+#ifndef dAXMARK
+# define dAXMARK I32 ax = POPMARK; \
+ register SV ** const mark = PL_stack_base + ax++
+#endif
+#ifndef XSprePUSH
+# define XSprePUSH (sp = PL_stack_base + ax - 1)
+#endif
+
+#if (PERL_BCDVERSION < 0x5005000)
+# undef XSRETURN
+# define XSRETURN(off) \
+ STMT_START { \
+ PL_stack_sp = PL_stack_base + ax + ((off) - 1); \
+ return; \
+ } STMT_END
+#endif
+#ifndef PERL_ABS
+# define PERL_ABS(x) ((x) < 0 ? -(x) : (x))
+#endif
+#ifndef dVAR
+# define dVAR dNOOP
+#endif
+#ifndef SVf
+# define SVf "_"
+#endif
+#ifndef UTF8_MAXBYTES
+# define UTF8_MAXBYTES UTF8_MAXLEN
+#endif
+#ifndef PERL_HASH
+# define PERL_HASH(hash,str,len) \
+ STMT_START { \
+ const char *s_PeRlHaSh = str; \
+ I32 i_PeRlHaSh = len; \
+ U32 hash_PeRlHaSh = 0; \
+ while (i_PeRlHaSh--) \
+ hash_PeRlHaSh = hash_PeRlHaSh * 33 + *s_PeRlHaSh++; \
+ (hash) = hash_PeRlHaSh; \
+ } STMT_END
+#endif
+
+#ifndef PERL_SIGNALS_UNSAFE_FLAG
+
+#define PERL_SIGNALS_UNSAFE_FLAG 0x0001
+
+#if (PERL_BCDVERSION < 0x5008000)
+# define D_PPP_PERL_SIGNALS_INIT PERL_SIGNALS_UNSAFE_FLAG
+#else
+# define D_PPP_PERL_SIGNALS_INIT 0
+#endif
+
+#if defined(NEED_PL_signals)
+static U32 DPPP_(my_PL_signals) = D_PPP_PERL_SIGNALS_INIT;
+#elif defined(NEED_PL_signals_GLOBAL)
+U32 DPPP_(my_PL_signals) = D_PPP_PERL_SIGNALS_INIT;
+#else
+extern U32 DPPP_(my_PL_signals);
+#endif
+#define PL_signals DPPP_(my_PL_signals)
+
+#endif
+
+/* Hint: PL_ppaddr
+ * Calling an op via PL_ppaddr requires passing a context argument
+ * for threaded builds. Since the context argument is different for
+ * 5.005 perls, you can use aTHXR (supplied by ppport.h), which will
+ * automatically be defined as the correct argument.
+ */
+
+#if (PERL_BCDVERSION <= 0x5005005)
+/* Replace: 1 */
+# define PL_ppaddr ppaddr
+# define PL_no_modify no_modify
+/* Replace: 0 */
+#endif
+
+#if (PERL_BCDVERSION <= 0x5004005)
+/* Replace: 1 */
+# define PL_DBsignal DBsignal
+# define PL_DBsingle DBsingle
+# define PL_DBsub DBsub
+# define PL_DBtrace DBtrace
+# define PL_Sv Sv
+# define PL_compiling compiling
+# define PL_copline copline
+# define PL_curcop curcop
+# define PL_curstash curstash
+# define PL_debstash debstash
+# define PL_defgv defgv
+# define PL_diehook diehook
+# define PL_dirty dirty
+# define PL_dowarn dowarn
+# define PL_errgv errgv
+# define PL_expect expect
+# define PL_hexdigit hexdigit
+# define PL_hints hints
+# define PL_laststatval laststatval
+# define PL_na na
+# define PL_perl_destruct_level perl_destruct_level
+# define PL_perldb perldb
+# define PL_rsfp_filters rsfp_filters
+# define PL_rsfp rsfp
+# define PL_stack_base stack_base
+# define PL_stack_sp stack_sp
+# define PL_statcache statcache
+# define PL_stdingv stdingv
+# define PL_sv_arenaroot sv_arenaroot
+# define PL_sv_no sv_no
+# define PL_sv_undef sv_undef
+# define PL_sv_yes sv_yes
+# define PL_tainted tainted
+# define PL_tainting tainting
+/* Replace: 0 */
+#endif
+
+/* Warning: PL_expect, PL_copline, PL_rsfp, PL_rsfp_filters
+ * Do not use this variable. It is internal to the perl parser
+ * and may change or even be removed in the future. Note that
+ * as of perl 5.9.5 you cannot assign to this variable anymore.
+ */
+
+/* TODO: cannot assign to these vars; is it worth fixing? */
+#if (PERL_BCDVERSION >= 0x5009005)
+# define PL_expect (PL_parser ? PL_parser->expect : 0)
+# define PL_copline (PL_parser ? PL_parser->copline : 0)
+# define PL_rsfp (PL_parser ? PL_parser->rsfp : (PerlIO *) 0)
+# define PL_rsfp_filters (PL_parser ? PL_parser->rsfp_filters : (AV *) 0)
+#endif
+#ifndef dTHR
+# define dTHR dNOOP
+#endif
+#ifndef dTHX
+# define dTHX dNOOP
+#endif
+
+#ifndef dTHXa
+# define dTHXa(x) dNOOP
+#endif
+#ifndef pTHX
+# define pTHX void
+#endif
+
+#ifndef pTHX_
+# define pTHX_
+#endif
+
+#ifndef aTHX
+# define aTHX
+#endif
+
+#ifndef aTHX_
+# define aTHX_
+#endif
+
+#if (PERL_BCDVERSION < 0x5006000)
+# ifdef USE_THREADS
+# define aTHXR thr
+# define aTHXR_ thr,
+# else
+# define aTHXR
+# define aTHXR_
+# endif
+# define dTHXR dTHR
+#else
+# define aTHXR aTHX
+# define aTHXR_ aTHX_
+# define dTHXR dTHX
+#endif
+#ifndef dTHXoa
+# define dTHXoa(x) dTHXa(x)
+#endif
+#ifndef PUSHmortal
+# define PUSHmortal PUSHs(sv_newmortal())
+#endif
+
+#ifndef mPUSHp
+# define mPUSHp(p,l) sv_setpvn_mg(PUSHmortal, (p), (l))
+#endif
+
+#ifndef mPUSHn
+# define mPUSHn(n) sv_setnv_mg(PUSHmortal, (NV)(n))
+#endif
+
+#ifndef mPUSHi
+# define mPUSHi(i) sv_setiv_mg(PUSHmortal, (IV)(i))
+#endif
+
+#ifndef mPUSHu
+# define mPUSHu(u) sv_setuv_mg(PUSHmortal, (UV)(u))
+#endif
+#ifndef XPUSHmortal
+# define XPUSHmortal XPUSHs(sv_newmortal())
+#endif
+
+#ifndef mXPUSHp
+# define mXPUSHp(p,l) STMT_START { EXTEND(sp,1); sv_setpvn_mg(PUSHmortal, (p), (l)); } STMT_END
+#endif
+
+#ifndef mXPUSHn
+# define mXPUSHn(n) STMT_START { EXTEND(sp,1); sv_setnv_mg(PUSHmortal, (NV)(n)); } STMT_END
+#endif
+
+#ifndef mXPUSHi
+# define mXPUSHi(i) STMT_START { EXTEND(sp,1); sv_setiv_mg(PUSHmortal, (IV)(i)); } STMT_END
+#endif
+
+#ifndef mXPUSHu
+# define mXPUSHu(u) STMT_START { EXTEND(sp,1); sv_setuv_mg(PUSHmortal, (UV)(u)); } STMT_END
+#endif
+
+/* Replace: 1 */
+#ifndef call_sv
+# define call_sv perl_call_sv
+#endif
+
+#ifndef call_pv
+# define call_pv perl_call_pv
+#endif
+
+#ifndef call_argv
+# define call_argv perl_call_argv
+#endif
+
+#ifndef call_method
+# define call_method perl_call_method
+#endif
+#ifndef eval_sv
+# define eval_sv perl_eval_sv
+#endif
+#ifndef PERL_LOADMOD_DENY
+# define PERL_LOADMOD_DENY 0x1
+#endif
+
+#ifndef PERL_LOADMOD_NOIMPORT
+# define PERL_LOADMOD_NOIMPORT 0x2
+#endif
+
+#ifndef PERL_LOADMOD_IMPORT_OPS
+# define PERL_LOADMOD_IMPORT_OPS 0x4
+#endif
+
+/* Replace: 0 */
+
+/* Replace perl_eval_pv with eval_pv */
+
+#ifndef eval_pv
+#if defined(NEED_eval_pv)
+static SV* DPPP_(my_eval_pv)(char *p, I32 croak_on_error);
+static
+#else
+extern SV* DPPP_(my_eval_pv)(char *p, I32 croak_on_error);
+#endif
+
+#ifdef eval_pv
+# undef eval_pv
+#endif
+#define eval_pv(a,b) DPPP_(my_eval_pv)(aTHX_ a,b)
+#define Perl_eval_pv DPPP_(my_eval_pv)
+
+#if defined(NEED_eval_pv) || defined(NEED_eval_pv_GLOBAL)
+
+SV*
+DPPP_(my_eval_pv)(char *p, I32 croak_on_error)
+{
+ dSP;
+ SV* sv = newSVpv(p, 0);
+
+ PUSHMARK(sp);
+ eval_sv(sv, G_SCALAR);
+ SvREFCNT_dec(sv);
+
+ SPAGAIN;
+ sv = POPs;
+ PUTBACK;
+
+ if (croak_on_error && SvTRUE(GvSV(errgv)))
+ croak(SvPVx(GvSV(errgv), na));
+
+ return sv;
+}
+
+#endif
+#endif
+
+#ifndef vload_module
+#if defined(NEED_vload_module)
+static void DPPP_(my_vload_module)(U32 flags, SV *name, SV *ver, va_list *args);
+static
+#else
+extern void DPPP_(my_vload_module)(U32 flags, SV *name, SV *ver, va_list *args);
+#endif
+
+#ifdef vload_module
+# undef vload_module
+#endif
+#define vload_module(a,b,c,d) DPPP_(my_vload_module)(aTHX_ a,b,c,d)
+#define Perl_vload_module DPPP_(my_vload_module)
+
+#if defined(NEED_vload_module) || defined(NEED_vload_module_GLOBAL)
+
+void
+DPPP_(my_vload_module)(U32 flags, SV *name, SV *ver, va_list *args)
+{
+ dTHR;
+ dVAR;
+ OP *veop, *imop;
+
+ OP * const modname = newSVOP(OP_CONST, 0, name);
+ /* 5.005 has a somewhat hacky force_normal that doesn't croak on
+ SvREADONLY() if PL_compling is true. Current perls take care in
+ ck_require() to correctly turn off SvREADONLY before calling
+ force_normal_flags(). This seems a better fix than fudging PL_compling
+ */
+ SvREADONLY_off(((SVOP*)modname)->op_sv);
+ modname->op_private |= OPpCONST_BARE;
+ if (ver) {
+ veop = newSVOP(OP_CONST, 0, ver);
+ }
+ else
+ veop = NULL;
+ if (flags & PERL_LOADMOD_NOIMPORT) {
+ imop = sawparens(newNULLLIST());
+ }
+ else if (flags & PERL_LOADMOD_IMPORT_OPS) {
+ imop = va_arg(*args, OP*);
+ }
+ else {
+ SV *sv;
+ imop = NULL;
+ sv = va_arg(*args, SV*);
+ while (sv) {
+ imop = append_elem(OP_LIST, imop, newSVOP(OP_CONST, 0, sv));
+ sv = va_arg(*args, SV*);
+ }
+ }
+ {
+ const line_t ocopline = PL_copline;
+ COP * const ocurcop = PL_curcop;
+ const int oexpect = PL_expect;
+
+#if (PERL_BCDVERSION >= 0x5004000)
+ utilize(!(flags & PERL_LOADMOD_DENY), start_subparse(FALSE, 0),
+ veop, modname, imop);
+#else
+ utilize(!(flags & PERL_LOADMOD_DENY), start_subparse(),
+ modname, imop);
+#endif
+ PL_expect = oexpect;
+ PL_copline = ocopline;
+ PL_curcop = ocurcop;
+ }
+}
+
+#endif
+#endif
+
+#ifndef load_module
+#if defined(NEED_load_module)
+static void DPPP_(my_load_module)(U32 flags, SV *name, SV *ver, ...);
+static
+#else
+extern void DPPP_(my_load_module)(U32 flags, SV *name, SV *ver, ...);
+#endif
+
+#ifdef load_module
+# undef load_module
+#endif
+#define load_module DPPP_(my_load_module)
+#define Perl_load_module DPPP_(my_load_module)
+
+#if defined(NEED_load_module) || defined(NEED_load_module_GLOBAL)
+
+void
+DPPP_(my_load_module)(U32 flags, SV *name, SV *ver, ...)
+{
+ va_list args;
+ va_start(args, ver);
+ vload_module(flags, name, ver, &args);
+ va_end(args);
+}
+
+#endif
+#endif
+#ifndef newRV_inc
+# define newRV_inc(sv) newRV(sv) /* Replace */
+#endif
+
+#ifndef newRV_noinc
+#if defined(NEED_newRV_noinc)
+static SV * DPPP_(my_newRV_noinc)(SV *sv);
+static
+#else
+extern SV * DPPP_(my_newRV_noinc)(SV *sv);
+#endif
+
+#ifdef newRV_noinc
+# undef newRV_noinc
+#endif
+#define newRV_noinc(a) DPPP_(my_newRV_noinc)(aTHX_ a)
+#define Perl_newRV_noinc DPPP_(my_newRV_noinc)
+
+#if defined(NEED_newRV_noinc) || defined(NEED_newRV_noinc_GLOBAL)
+SV *
+DPPP_(my_newRV_noinc)(SV *sv)
+{
+ SV *rv = (SV *)newRV(sv);
+ SvREFCNT_dec(sv);
+ return rv;
+}
+#endif
+#endif
+
+/* Hint: newCONSTSUB
+ * Returns a CV* as of perl-5.7.1. This return value is not supported
+ * by Devel::PPPort.
+ */
+
+/* newCONSTSUB from IO.xs is in the core starting with 5.004_63 */
+#if (PERL_BCDVERSION < 0x5004063) && (PERL_BCDVERSION != 0x5004005)
+#if defined(NEED_newCONSTSUB)
+static void DPPP_(my_newCONSTSUB)(HV *stash, const char *name, SV *sv);
+static
+#else
+extern void DPPP_(my_newCONSTSUB)(HV *stash, const char *name, SV *sv);
+#endif
+
+#ifdef newCONSTSUB
+# undef newCONSTSUB
+#endif
+#define newCONSTSUB(a,b,c) DPPP_(my_newCONSTSUB)(aTHX_ a,b,c)
+#define Perl_newCONSTSUB DPPP_(my_newCONSTSUB)
+
+#if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL)
+
+void
+DPPP_(my_newCONSTSUB)(HV *stash, const char *name, SV *sv)
+{
+ U32 oldhints = PL_hints;
+ HV *old_cop_stash = PL_curcop->cop_stash;
+ HV *old_curstash = PL_curstash;
+ line_t oldline = PL_curcop->cop_line;
+ PL_curcop->cop_line = PL_copline;
+
+ PL_hints &= ~HINT_BLOCK_SCOPE;
+ if (stash)
+ PL_curstash = PL_curcop->cop_stash = stash;
+
+ newSUB(
+
+#if (PERL_BCDVERSION < 0x5003022)
+ start_subparse(),
+#elif (PERL_BCDVERSION == 0x5003022)
+ start_subparse(0),
+#else /* 5.003_23 onwards */
+ start_subparse(FALSE, 0),
+#endif
+
+ newSVOP(OP_CONST, 0, newSVpv((char *) name, 0)),
+ newSVOP(OP_CONST, 0, &PL_sv_no), /* SvPV(&PL_sv_no) == "" -- GMB */
+ newSTATEOP(0, Nullch, newSVOP(OP_CONST, 0, sv))
+ );
+
+ PL_hints = oldhints;
+ PL_curcop->cop_stash = old_cop_stash;
+ PL_curstash = old_curstash;
+ PL_curcop->cop_line = oldline;
+}
+#endif
+#endif
+
+/*
+ * Boilerplate macros for initializing and accessing interpreter-local
+ * data from C. All statics in extensions should be reworked to use
+ * this, if you want to make the extension thread-safe. See ext/re/re.xs
+ * for an example of the use of these macros.
+ *
+ * Code that uses these macros is responsible for the following:
+ * 1. #define MY_CXT_KEY to a unique string, e.g. "DynaLoader_guts"
+ * 2. Declare a typedef named my_cxt_t that is a structure that contains
+ * all the data that needs to be interpreter-local.
+ * 3. Use the START_MY_CXT macro after the declaration of my_cxt_t.
+ * 4. Use the MY_CXT_INIT macro such that it is called exactly once
+ * (typically put in the BOOT: section).
+ * 5. Use the members of the my_cxt_t structure everywhere as
+ * MY_CXT.member.
+ * 6. Use the dMY_CXT macro (a declaration) in all the functions that
+ * access MY_CXT.
+ */
+
+#if defined(MULTIPLICITY) || defined(PERL_OBJECT) || \
+ defined(PERL_CAPI) || defined(PERL_IMPLICIT_CONTEXT)
+
+#ifndef START_MY_CXT
+
+/* This must appear in all extensions that define a my_cxt_t structure,
+ * right after the definition (i.e. at file scope). The non-threads
+ * case below uses it to declare the data as static. */
+#define START_MY_CXT
+
+#if (PERL_BCDVERSION < 0x5004068)
+/* Fetches the SV that keeps the per-interpreter data. */
+#define dMY_CXT_SV \
+ SV *my_cxt_sv = get_sv(MY_CXT_KEY, FALSE)
+#else /* >= perl5.004_68 */
+#define dMY_CXT_SV \
+ SV *my_cxt_sv = *hv_fetch(PL_modglobal, MY_CXT_KEY, \
+ sizeof(MY_CXT_KEY)-1, TRUE)
+#endif /* < perl5.004_68 */
+
+/* This declaration should be used within all functions that use the
+ * interpreter-local data. */
+#define dMY_CXT \
+ dMY_CXT_SV; \
+ my_cxt_t *my_cxtp = INT2PTR(my_cxt_t*,SvUV(my_cxt_sv))
+
+/* Creates and zeroes the per-interpreter data.
+ * (We allocate my_cxtp in a Perl SV so that it will be released when
+ * the interpreter goes away.) */
+#define MY_CXT_INIT \
+ dMY_CXT_SV; \
+ /* newSV() allocates one more than needed */ \
+ my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1));\
+ Zero(my_cxtp, 1, my_cxt_t); \
+ sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
+
+/* This macro must be used to access members of the my_cxt_t structure.
+ * e.g. MYCXT.some_data */
+#define MY_CXT (*my_cxtp)
+
+/* Judicious use of these macros can reduce the number of times dMY_CXT
+ * is used. Use is similar to pTHX, aTHX etc. */
+#define pMY_CXT my_cxt_t *my_cxtp
+#define pMY_CXT_ pMY_CXT,
+#define _pMY_CXT ,pMY_CXT
+#define aMY_CXT my_cxtp
+#define aMY_CXT_ aMY_CXT,
+#define _aMY_CXT ,aMY_CXT
+
+#endif /* START_MY_CXT */
+
+#ifndef MY_CXT_CLONE
+/* Clones the per-interpreter data. */
+#define MY_CXT_CLONE \
+ dMY_CXT_SV; \
+ my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1));\
+ Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t);\
+ sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
+#endif
+
+#else /* single interpreter */
+
+#ifndef START_MY_CXT
+
+#define START_MY_CXT static my_cxt_t my_cxt;
+#define dMY_CXT_SV dNOOP
+#define dMY_CXT dNOOP
+#define MY_CXT_INIT NOOP
+#define MY_CXT my_cxt
+
+#define pMY_CXT void
+#define pMY_CXT_
+#define _pMY_CXT
+#define aMY_CXT
+#define aMY_CXT_
+#define _aMY_CXT
+
+#endif /* START_MY_CXT */
+
+#ifndef MY_CXT_CLONE
+#define MY_CXT_CLONE NOOP
+#endif
+
+#endif
+
+#ifndef IVdf
+# if IVSIZE == LONGSIZE
+# define IVdf "ld"
+# define UVuf "lu"
+# define UVof "lo"
+# define UVxf "lx"
+# define UVXf "lX"
+# else
+# if IVSIZE == INTSIZE
+# define IVdf "d"
+# define UVuf "u"
+# define UVof "o"
+# define UVxf "x"
+# define UVXf "X"
+# endif
+# endif
+#endif
+
+#ifndef NVef
+# if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) && \
+ defined(PERL_PRIfldbl) /* Not very likely, but let's try anyway. */
+# define NVef PERL_PRIeldbl
+# define NVff PERL_PRIfldbl
+# define NVgf PERL_PRIgldbl
+# else
+# define NVef "e"
+# define NVff "f"
+# define NVgf "g"
+# endif
+#endif
+
+#ifndef SvREFCNT_inc
+# ifdef PERL_USE_GCC_BRACE_GROUPS
+# define SvREFCNT_inc(sv) \
+ ({ \
+ SV * const _sv = (SV*)(sv); \
+ if (_sv) \
+ (SvREFCNT(_sv))++; \
+ _sv; \
+ })
+# else
+# define SvREFCNT_inc(sv) \
+ ((PL_Sv=(SV*)(sv)) ? (++(SvREFCNT(PL_Sv)),PL_Sv) : NULL)
+# endif
+#endif
+
+#ifndef SvREFCNT_inc_simple
+# ifdef PERL_USE_GCC_BRACE_GROUPS
+# define SvREFCNT_inc_simple(sv) \
+ ({ \
+ if (sv) \
+ (SvREFCNT(sv))++; \
+ (SV *)(sv); \
+ })
+# else
+# define SvREFCNT_inc_simple(sv) \
+ ((sv) ? (SvREFCNT(sv)++,(SV*)(sv)) : NULL)
+# endif
+#endif
+
+#ifndef SvREFCNT_inc_NN
+# ifdef PERL_USE_GCC_BRACE_GROUPS
+# define SvREFCNT_inc_NN(sv) \
+ ({ \
+ SV * const _sv = (SV*)(sv); \
+ SvREFCNT(_sv)++; \
+ _sv; \
+ })
+# else
+# define SvREFCNT_inc_NN(sv) \
+ (PL_Sv=(SV*)(sv),++(SvREFCNT(PL_Sv)),PL_Sv)
+# endif
+#endif
+
+#ifndef SvREFCNT_inc_void
+# ifdef PERL_USE_GCC_BRACE_GROUPS
+# define SvREFCNT_inc_void(sv) \
+ ({ \
+ SV * const _sv = (SV*)(sv); \
+ if (_sv) \
+ (void)(SvREFCNT(_sv)++); \
+ })
+# else
+# define SvREFCNT_inc_void(sv) \
+ (void)((PL_Sv=(SV*)(sv)) ? ++(SvREFCNT(PL_Sv)) : 0)
+# endif
+#endif
+#ifndef SvREFCNT_inc_simple_void
+# define SvREFCNT_inc_simple_void(sv) STMT_START { if (sv) SvREFCNT(sv)++; } STMT_END
+#endif
+
+#ifndef SvREFCNT_inc_simple_NN
+# define SvREFCNT_inc_simple_NN(sv) (++SvREFCNT(sv), (SV*)(sv))
+#endif
+
+#ifndef SvREFCNT_inc_void_NN
+# define SvREFCNT_inc_void_NN(sv) (void)(++SvREFCNT((SV*)(sv)))
+#endif
+
+#ifndef SvREFCNT_inc_simple_void_NN
+# define SvREFCNT_inc_simple_void_NN(sv) (void)(++SvREFCNT((SV*)(sv)))
+#endif
+
+/* Backwards compatibility stuff... :-( */
+#if !defined(NEED_sv_2pv_flags) && defined(NEED_sv_2pv_nolen)
+# define NEED_sv_2pv_flags
+#endif
+#if !defined(NEED_sv_2pv_flags_GLOBAL) && defined(NEED_sv_2pv_nolen_GLOBAL)
+# define NEED_sv_2pv_flags_GLOBAL
+#endif
+
+/* Hint: sv_2pv_nolen
+ * Use the SvPV_nolen() or SvPV_nolen_const() macros instead of sv_2pv_nolen().
+ */
+#ifndef sv_2pv_nolen
+# define sv_2pv_nolen(sv) SvPV_nolen(sv)
+#endif
+
+#ifdef SvPVbyte
+
+/* Hint: SvPVbyte
+ * Does not work in perl-5.6.1, ppport.h implements a version
+ * borrowed from perl-5.7.3.
+ */
+
+#if (PERL_BCDVERSION < 0x5007000)
+
+#if defined(NEED_sv_2pvbyte)
+static char * DPPP_(my_sv_2pvbyte)(pTHX_ SV * sv, STRLEN * lp);
+static
+#else
+extern char * DPPP_(my_sv_2pvbyte)(pTHX_ SV * sv, STRLEN * lp);
+#endif
+
+#ifdef sv_2pvbyte
+# undef sv_2pvbyte
+#endif
+#define sv_2pvbyte(a,b) DPPP_(my_sv_2pvbyte)(aTHX_ a,b)
+#define Perl_sv_2pvbyte DPPP_(my_sv_2pvbyte)
+
+#if defined(NEED_sv_2pvbyte) || defined(NEED_sv_2pvbyte_GLOBAL)
+
+char *
+DPPP_(my_sv_2pvbyte)(pTHX_ SV *sv, STRLEN *lp)
+{
+ sv_utf8_downgrade(sv,0);
+ return SvPV(sv,*lp);
+}
+
+#endif
+
+/* Hint: sv_2pvbyte
+ * Use the SvPVbyte() macro instead of sv_2pvbyte().
+ */
+
+#undef SvPVbyte
+
+#define SvPVbyte(sv, lp) \
+ ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8)) == (SVf_POK) \
+ ? ((lp = SvCUR(sv)), SvPVX(sv)) : sv_2pvbyte(sv, &lp))
+
+#endif
+
+#else
+
+# define SvPVbyte SvPV
+# define sv_2pvbyte sv_2pv
+
+#endif
+#ifndef sv_2pvbyte_nolen
+# define sv_2pvbyte_nolen(sv) sv_2pv_nolen(sv)
+#endif
+
+/* Hint: sv_pvn
+ * Always use the SvPV() macro instead of sv_pvn().
+ */
+
+/* Hint: sv_pvn_force
+ * Always use the SvPV_force() macro instead of sv_pvn_force().
+ */
+
+/* If these are undefined, they're not handled by the core anyway */
+#ifndef SV_IMMEDIATE_UNREF
+# define SV_IMMEDIATE_UNREF 0
+#endif
+
+#ifndef SV_GMAGIC
+# define SV_GMAGIC 0
+#endif
+
+#ifndef SV_COW_DROP_PV
+# define SV_COW_DROP_PV 0
+#endif
+
+#ifndef SV_UTF8_NO_ENCODING
+# define SV_UTF8_NO_ENCODING 0
+#endif
+
+#ifndef SV_NOSTEAL
+# define SV_NOSTEAL 0
+#endif
+
+#ifndef SV_CONST_RETURN
+# define SV_CONST_RETURN 0
+#endif
+
+#ifndef SV_MUTABLE_RETURN
+# define SV_MUTABLE_RETURN 0
+#endif
+
+#ifndef SV_SMAGIC
+# define SV_SMAGIC 0
+#endif
+
+#ifndef SV_HAS_TRAILING_NUL
+# define SV_HAS_TRAILING_NUL 0
+#endif
+
+#ifndef SV_COW_SHARED_HASH_KEYS
+# define SV_COW_SHARED_HASH_KEYS 0
+#endif
+
+#if (PERL_BCDVERSION < 0x5007002)
+
+#if defined(NEED_sv_2pv_flags)
+static char * DPPP_(my_sv_2pv_flags)(pTHX_ SV * sv, STRLEN * lp, I32 flags);
+static
+#else
+extern char * DPPP_(my_sv_2pv_flags)(pTHX_ SV * sv, STRLEN * lp, I32 flags);
+#endif
+
+#ifdef sv_2pv_flags
+# undef sv_2pv_flags
+#endif
+#define sv_2pv_flags(a,b,c) DPPP_(my_sv_2pv_flags)(aTHX_ a,b,c)
+#define Perl_sv_2pv_flags DPPP_(my_sv_2pv_flags)
+
+#if defined(NEED_sv_2pv_flags) || defined(NEED_sv_2pv_flags_GLOBAL)
+
+char *
+DPPP_(my_sv_2pv_flags)(pTHX_ SV *sv, STRLEN *lp, I32 flags)
+{
+ STRLEN n_a = (STRLEN) flags;
+ return sv_2pv(sv, lp ? lp : &n_a);
+}
+
+#endif
+
+#if defined(NEED_sv_pvn_force_flags)
+static char * DPPP_(my_sv_pvn_force_flags)(pTHX_ SV * sv, STRLEN * lp, I32 flags);
+static
+#else
+extern char * DPPP_(my_sv_pvn_force_flags)(pTHX_ SV * sv, STRLEN * lp, I32 flags);
+#endif
+
+#ifdef sv_pvn_force_flags
+# undef sv_pvn_force_flags
+#endif
+#define sv_pvn_force_flags(a,b,c) DPPP_(my_sv_pvn_force_flags)(aTHX_ a,b,c)
+#define Perl_sv_pvn_force_flags DPPP_(my_sv_pvn_force_flags)
+
+#if defined(NEED_sv_pvn_force_flags) || defined(NEED_sv_pvn_force_flags_GLOBAL)
+
+char *
+DPPP_(my_sv_pvn_force_flags)(pTHX_ SV *sv, STRLEN *lp, I32 flags)
+{
+ STRLEN n_a = (STRLEN) flags;
+ return sv_pvn_force(sv, lp ? lp : &n_a);
+}
+
+#endif
+
+#endif
+#ifndef SvPV_const
+# define SvPV_const(sv, lp) SvPV_flags_const(sv, lp, SV_GMAGIC)
+#endif
+
+#ifndef SvPV_mutable
+# define SvPV_mutable(sv, lp) SvPV_flags_mutable(sv, lp, SV_GMAGIC)
+#endif
+#ifndef SvPV_flags
+# define SvPV_flags(sv, lp, flags) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? ((lp = SvCUR(sv)), SvPVX(sv)) : sv_2pv_flags(sv, &lp, flags))
+#endif
+#ifndef SvPV_flags_const
+# define SvPV_flags_const(sv, lp, flags) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? ((lp = SvCUR(sv)), SvPVX_const(sv)) : \
+ (const char*) sv_2pv_flags(sv, &lp, flags|SV_CONST_RETURN))
+#endif
+#ifndef SvPV_flags_const_nolen
+# define SvPV_flags_const_nolen(sv, flags) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? SvPVX_const(sv) : \
+ (const char*) sv_2pv_flags(sv, 0, flags|SV_CONST_RETURN))
+#endif
+#ifndef SvPV_flags_mutable
+# define SvPV_flags_mutable(sv, lp, flags) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? ((lp = SvCUR(sv)), SvPVX_mutable(sv)) : \
+ sv_2pv_flags(sv, &lp, flags|SV_MUTABLE_RETURN))
+#endif
+#ifndef SvPV_force
+# define SvPV_force(sv, lp) SvPV_force_flags(sv, lp, SV_GMAGIC)
+#endif
+
+#ifndef SvPV_force_nolen
+# define SvPV_force_nolen(sv) SvPV_force_flags_nolen(sv, SV_GMAGIC)
+#endif
+
+#ifndef SvPV_force_mutable
+# define SvPV_force_mutable(sv, lp) SvPV_force_flags_mutable(sv, lp, SV_GMAGIC)
+#endif
+
+#ifndef SvPV_force_nomg
+# define SvPV_force_nomg(sv, lp) SvPV_force_flags(sv, lp, 0)
+#endif
+
+#ifndef SvPV_force_nomg_nolen
+# define SvPV_force_nomg_nolen(sv) SvPV_force_flags_nolen(sv, 0)
+#endif
+#ifndef SvPV_force_flags
+# define SvPV_force_flags(sv, lp, flags) \
+ ((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST)) == SVf_POK \
+ ? ((lp = SvCUR(sv)), SvPVX(sv)) : sv_pvn_force_flags(sv, &lp, flags))
+#endif
+#ifndef SvPV_force_flags_nolen
+# define SvPV_force_flags_nolen(sv, flags) \
+ ((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST)) == SVf_POK \
+ ? SvPVX(sv) : sv_pvn_force_flags(sv, 0, flags))
+#endif
+#ifndef SvPV_force_flags_mutable
+# define SvPV_force_flags_mutable(sv, lp, flags) \
+ ((SvFLAGS(sv) & (SVf_POK|SVf_THINKFIRST)) == SVf_POK \
+ ? ((lp = SvCUR(sv)), SvPVX_mutable(sv)) \
+ : sv_pvn_force_flags(sv, &lp, flags|SV_MUTABLE_RETURN))
+#endif
+#ifndef SvPV_nolen
+# define SvPV_nolen(sv) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? SvPVX(sv) : sv_2pv_flags(sv, 0, SV_GMAGIC))
+#endif
+#ifndef SvPV_nolen_const
+# define SvPV_nolen_const(sv) \
+ ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
+ ? SvPVX_const(sv) : sv_2pv_flags(sv, 0, SV_GMAGIC|SV_CONST_RETURN))
+#endif
+#ifndef SvPV_nomg
+# define SvPV_nomg(sv, lp) SvPV_flags(sv, lp, 0)
+#endif
+
+#ifndef SvPV_nomg_const
+# define SvPV_nomg_const(sv, lp) SvPV_flags_const(sv, lp, 0)
+#endif
+
+#ifndef SvPV_nomg_const_nolen
+# define SvPV_nomg_const_nolen(sv) SvPV_flags_const_nolen(sv, 0)
+#endif
+#ifndef SvMAGIC_set
+# define SvMAGIC_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \
+ (((XPVMG*) SvANY(sv))->xmg_magic = (val)); } STMT_END
+#endif
+
+#if (PERL_BCDVERSION < 0x5009003)
+#ifndef SvPVX_const
+# define SvPVX_const(sv) ((const char*) (0 + SvPVX(sv)))
+#endif
+
+#ifndef SvPVX_mutable
+# define SvPVX_mutable(sv) (0 + SvPVX(sv))
+#endif
+#ifndef SvRV_set
+# define SvRV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_RV); \
+ (((XRV*) SvANY(sv))->xrv_rv = (val)); } STMT_END
+#endif
+
+#else
+#ifndef SvPVX_const
+# define SvPVX_const(sv) ((const char*)((sv)->sv_u.svu_pv))
+#endif
+
+#ifndef SvPVX_mutable
+# define SvPVX_mutable(sv) ((sv)->sv_u.svu_pv)
+#endif
+#ifndef SvRV_set
+# define SvRV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_RV); \
+ ((sv)->sv_u.svu_rv = (val)); } STMT_END
+#endif
+
+#endif
+#ifndef SvSTASH_set
+# define SvSTASH_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \
+ (((XPVMG*) SvANY(sv))->xmg_stash = (val)); } STMT_END
+#endif
+
+#if (PERL_BCDVERSION < 0x5004000)
+#ifndef SvUV_set
+# define SvUV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
+ (((XPVIV*) SvANY(sv))->xiv_iv = (IV) (val)); } STMT_END
+#endif
+
+#else
+#ifndef SvUV_set
+# define SvUV_set(sv, val) \
+ STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
+ (((XPVUV*) SvANY(sv))->xuv_uv = (val)); } STMT_END
+#endif
+
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(vnewSVpvf)
+#if defined(NEED_vnewSVpvf)
+static SV * DPPP_(my_vnewSVpvf)(pTHX_ const char * pat, va_list * args);
+static
+#else
+extern SV * DPPP_(my_vnewSVpvf)(pTHX_ const char * pat, va_list * args);
+#endif
+
+#ifdef vnewSVpvf
+# undef vnewSVpvf
+#endif
+#define vnewSVpvf(a,b) DPPP_(my_vnewSVpvf)(aTHX_ a,b)
+#define Perl_vnewSVpvf DPPP_(my_vnewSVpvf)
+
+#if defined(NEED_vnewSVpvf) || defined(NEED_vnewSVpvf_GLOBAL)
+
+SV *
+DPPP_(my_vnewSVpvf)(pTHX_ const char *pat, va_list *args)
+{
+ register SV *sv = newSV(0);
+ sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*));
+ return sv;
+}
+
+#endif
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_vcatpvf)
+# define sv_vcatpvf(sv, pat, args) sv_vcatpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*))
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_vsetpvf)
+# define sv_vsetpvf(sv, pat, args) sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*))
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_catpvf_mg)
+#if defined(NEED_sv_catpvf_mg)
+static void DPPP_(my_sv_catpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_catpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+#endif
+
+#define Perl_sv_catpvf_mg DPPP_(my_sv_catpvf_mg)
+
+#if defined(NEED_sv_catpvf_mg) || defined(NEED_sv_catpvf_mg_GLOBAL)
+
+void
+DPPP_(my_sv_catpvf_mg)(pTHX_ SV *sv, const char *pat, ...)
+{
+ va_list args;
+ va_start(args, pat);
+ sv_vcatpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
+}
+
+#endif
+#endif
+
+#ifdef PERL_IMPLICIT_CONTEXT
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_catpvf_mg_nocontext)
+#if defined(NEED_sv_catpvf_mg_nocontext)
+static void DPPP_(my_sv_catpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_catpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+#endif
+
+#define sv_catpvf_mg_nocontext DPPP_(my_sv_catpvf_mg_nocontext)
+#define Perl_sv_catpvf_mg_nocontext DPPP_(my_sv_catpvf_mg_nocontext)
+
+#if defined(NEED_sv_catpvf_mg_nocontext) || defined(NEED_sv_catpvf_mg_nocontext_GLOBAL)
+
+void
+DPPP_(my_sv_catpvf_mg_nocontext)(SV *sv, const char *pat, ...)
+{
+ dTHX;
+ va_list args;
+ va_start(args, pat);
+ sv_vcatpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
+}
+
+#endif
+#endif
+#endif
+
+/* sv_catpvf_mg depends on sv_catpvf_mg_nocontext */
+#ifndef sv_catpvf_mg
+# ifdef PERL_IMPLICIT_CONTEXT
+# define sv_catpvf_mg Perl_sv_catpvf_mg_nocontext
+# else
+# define sv_catpvf_mg Perl_sv_catpvf_mg
+# endif
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_vcatpvf_mg)
+# define sv_vcatpvf_mg(sv, pat, args) \
+ STMT_START { \
+ sv_vcatpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*)); \
+ SvSETMAGIC(sv); \
+ } STMT_END
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_setpvf_mg)
+#if defined(NEED_sv_setpvf_mg)
+static void DPPP_(my_sv_setpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_setpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
+#endif
+
+#define Perl_sv_setpvf_mg DPPP_(my_sv_setpvf_mg)
+
+#if defined(NEED_sv_setpvf_mg) || defined(NEED_sv_setpvf_mg_GLOBAL)
+
+void
+DPPP_(my_sv_setpvf_mg)(pTHX_ SV *sv, const char *pat, ...)
+{
+ va_list args;
+ va_start(args, pat);
+ sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
+}
+
+#endif
+#endif
+
+#ifdef PERL_IMPLICIT_CONTEXT
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_setpvf_mg_nocontext)
+#if defined(NEED_sv_setpvf_mg_nocontext)
+static void DPPP_(my_sv_setpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+static
+#else
+extern void DPPP_(my_sv_setpvf_mg_nocontext)(SV * sv, const char * pat, ...);
+#endif
+
+#define sv_setpvf_mg_nocontext DPPP_(my_sv_setpvf_mg_nocontext)
+#define Perl_sv_setpvf_mg_nocontext DPPP_(my_sv_setpvf_mg_nocontext)
+
+#if defined(NEED_sv_setpvf_mg_nocontext) || defined(NEED_sv_setpvf_mg_nocontext_GLOBAL)
+
+void
+DPPP_(my_sv_setpvf_mg_nocontext)(SV *sv, const char *pat, ...)
+{
+ dTHX;
+ va_list args;
+ va_start(args, pat);
+ sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
+ SvSETMAGIC(sv);
+ va_end(args);
+}
+
+#endif
+#endif
+#endif
+
+/* sv_setpvf_mg depends on sv_setpvf_mg_nocontext */
+#ifndef sv_setpvf_mg
+# ifdef PERL_IMPLICIT_CONTEXT
+# define sv_setpvf_mg Perl_sv_setpvf_mg_nocontext
+# else
+# define sv_setpvf_mg Perl_sv_setpvf_mg
+# endif
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(sv_vsetpvf_mg)
+# define sv_vsetpvf_mg(sv, pat, args) \
+ STMT_START { \
+ sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*)); \
+ SvSETMAGIC(sv); \
+ } STMT_END
+#endif
+
+#ifndef newSVpvn_share
+
+#if defined(NEED_newSVpvn_share)
+static SV * DPPP_(my_newSVpvn_share)(pTHX_ const char *src, I32 len, U32 hash);
+static
+#else
+extern SV * DPPP_(my_newSVpvn_share)(pTHX_ const char *src, I32 len, U32 hash);
+#endif
+
+#ifdef newSVpvn_share
+# undef newSVpvn_share
+#endif
+#define newSVpvn_share(a,b,c) DPPP_(my_newSVpvn_share)(aTHX_ a,b,c)
+#define Perl_newSVpvn_share DPPP_(my_newSVpvn_share)
+
+#if defined(NEED_newSVpvn_share) || defined(NEED_newSVpvn_share_GLOBAL)
+
+SV *
+DPPP_(my_newSVpvn_share)(pTHX_ const char *src, I32 len, U32 hash)
+{
+ SV *sv;
+ if (len < 0)
+ len = -len;
+ if (!hash)
+ PERL_HASH(hash, (char*) src, len);
+ sv = newSVpvn((char *) src, len);
+ sv_upgrade(sv, SVt_PVIV);
+ SvIVX(sv) = hash;
+ SvREADONLY_on(sv);
+ SvPOK_on(sv);
+ return sv;
+}
+
+#endif
+
+#endif
+#ifndef SvSHARED_HASH
+# define SvSHARED_HASH(sv) (0 + SvUVX(sv))
+#endif
+#ifndef WARN_ALL
+# define WARN_ALL 0
+#endif
+
+#ifndef WARN_CLOSURE
+# define WARN_CLOSURE 1
+#endif
+
+#ifndef WARN_DEPRECATED
+# define WARN_DEPRECATED 2
+#endif
+
+#ifndef WARN_EXITING
+# define WARN_EXITING 3
+#endif
+
+#ifndef WARN_GLOB
+# define WARN_GLOB 4
+#endif
+
+#ifndef WARN_IO
+# define WARN_IO 5
+#endif
+
+#ifndef WARN_CLOSED
+# define WARN_CLOSED 6
+#endif
+
+#ifndef WARN_EXEC
+# define WARN_EXEC 7
+#endif
+
+#ifndef WARN_LAYER
+# define WARN_LAYER 8
+#endif
+
+#ifndef WARN_NEWLINE
+# define WARN_NEWLINE 9
+#endif
+
+#ifndef WARN_PIPE
+# define WARN_PIPE 10
+#endif
+
+#ifndef WARN_UNOPENED
+# define WARN_UNOPENED 11
+#endif
+
+#ifndef WARN_MISC
+# define WARN_MISC 12
+#endif
+
+#ifndef WARN_NUMERIC
+# define WARN_NUMERIC 13
+#endif
+
+#ifndef WARN_ONCE
+# define WARN_ONCE 14
+#endif
+
+#ifndef WARN_OVERFLOW
+# define WARN_OVERFLOW 15
+#endif
+
+#ifndef WARN_PACK
+# define WARN_PACK 16
+#endif
+
+#ifndef WARN_PORTABLE
+# define WARN_PORTABLE 17
+#endif
+
+#ifndef WARN_RECURSION
+# define WARN_RECURSION 18
+#endif
+
+#ifndef WARN_REDEFINE
+# define WARN_REDEFINE 19
+#endif
+
+#ifndef WARN_REGEXP
+# define WARN_REGEXP 20
+#endif
+
+#ifndef WARN_SEVERE
+# define WARN_SEVERE 21
+#endif
+
+#ifndef WARN_DEBUGGING
+# define WARN_DEBUGGING 22
+#endif
+
+#ifndef WARN_INPLACE
+# define WARN_INPLACE 23
+#endif
+
+#ifndef WARN_INTERNAL
+# define WARN_INTERNAL 24
+#endif
+
+#ifndef WARN_MALLOC
+# define WARN_MALLOC 25
+#endif
+
+#ifndef WARN_SIGNAL
+# define WARN_SIGNAL 26
+#endif
+
+#ifndef WARN_SUBSTR
+# define WARN_SUBSTR 27
+#endif
+
+#ifndef WARN_SYNTAX
+# define WARN_SYNTAX 28
+#endif
+
+#ifndef WARN_AMBIGUOUS
+# define WARN_AMBIGUOUS 29
+#endif
+
+#ifndef WARN_BAREWORD
+# define WARN_BAREWORD 30
+#endif
+
+#ifndef WARN_DIGIT
+# define WARN_DIGIT 31
+#endif
+
+#ifndef WARN_PARENTHESIS
+# define WARN_PARENTHESIS 32
+#endif
+
+#ifndef WARN_PRECEDENCE
+# define WARN_PRECEDENCE 33
+#endif
+
+#ifndef WARN_PRINTF
+# define WARN_PRINTF 34
+#endif
+
+#ifndef WARN_PROTOTYPE
+# define WARN_PROTOTYPE 35
+#endif
+
+#ifndef WARN_QW
+# define WARN_QW 36
+#endif
+
+#ifndef WARN_RESERVED
+# define WARN_RESERVED 37
+#endif
+
+#ifndef WARN_SEMICOLON
+# define WARN_SEMICOLON 38
+#endif
+
+#ifndef WARN_TAINT
+# define WARN_TAINT 39
+#endif
+
+#ifndef WARN_THREADS
+# define WARN_THREADS 40
+#endif
+
+#ifndef WARN_UNINITIALIZED
+# define WARN_UNINITIALIZED 41
+#endif
+
+#ifndef WARN_UNPACK
+# define WARN_UNPACK 42
+#endif
+
+#ifndef WARN_UNTIE
+# define WARN_UNTIE 43
+#endif
+
+#ifndef WARN_UTF8
+# define WARN_UTF8 44
+#endif
+
+#ifndef WARN_VOID
+# define WARN_VOID 45
+#endif
+
+#ifndef WARN_ASSERTIONS
+# define WARN_ASSERTIONS 46
+#endif
+#ifndef packWARN
+# define packWARN(a) (a)
+#endif
+
+#ifndef ckWARN
+# ifdef G_WARN_ON
+# define ckWARN(a) (PL_dowarn & G_WARN_ON)
+# else
+# define ckWARN(a) PL_dowarn
+# endif
+#endif
+
+#if (PERL_BCDVERSION >= 0x5004000) && !defined(warner)
+#if defined(NEED_warner)
+static void DPPP_(my_warner)(U32 err, const char *pat, ...);
+static
+#else
+extern void DPPP_(my_warner)(U32 err, const char *pat, ...);
+#endif
+
+#define Perl_warner DPPP_(my_warner)
+
+#if defined(NEED_warner) || defined(NEED_warner_GLOBAL)
+
+void
+DPPP_(my_warner)(U32 err, const char *pat, ...)
+{
+ SV *sv;
+ va_list args;
+
+ PERL_UNUSED_ARG(err);
+
+ va_start(args, pat);
+ sv = vnewSVpvf(pat, &args);
+ va_end(args);
+ sv_2mortal(sv);
+ warn("%s", SvPV_nolen(sv));
+}
+
+#define warner Perl_warner
+
+#define Perl_warner_nocontext Perl_warner
+
+#endif
+#endif
+
+/* concatenating with "" ensures that only literal strings are accepted as argument
+ * note that STR_WITH_LEN() can't be used as argument to macros or functions that
+ * under some configurations might be macros
+ */
+#ifndef STR_WITH_LEN
+# define STR_WITH_LEN(s) (s ""), (sizeof(s)-1)
+#endif
+#ifndef newSVpvs
+# define newSVpvs(str) newSVpvn(str "", sizeof(str) - 1)
+#endif
+
+#ifndef sv_catpvs
+# define sv_catpvs(sv, str) sv_catpvn(sv, str "", sizeof(str) - 1)
+#endif
+
+#ifndef sv_setpvs
+# define sv_setpvs(sv, str) sv_setpvn(sv, str "", sizeof(str) - 1)
+#endif
+
+#ifndef hv_fetchs
+# define hv_fetchs(hv, key, lval) hv_fetch(hv, key "", sizeof(key) - 1, lval)
+#endif
+
+#ifndef hv_stores
+# define hv_stores(hv, key, val) hv_store(hv, key "", sizeof(key) - 1, val, 0)
+#endif
+#ifndef SvGETMAGIC
+# define SvGETMAGIC(x) STMT_START { if (SvGMAGICAL(x)) mg_get(x); } STMT_END
+#endif
+#ifndef PERL_MAGIC_sv
+# define PERL_MAGIC_sv '\0'
+#endif
+
+#ifndef PERL_MAGIC_overload
+# define PERL_MAGIC_overload 'A'
+#endif
+
+#ifndef PERL_MAGIC_overload_elem
+# define PERL_MAGIC_overload_elem 'a'
+#endif
+
+#ifndef PERL_MAGIC_overload_table
+# define PERL_MAGIC_overload_table 'c'
+#endif
+
+#ifndef PERL_MAGIC_bm
+# define PERL_MAGIC_bm 'B'
+#endif
+
+#ifndef PERL_MAGIC_regdata
+# define PERL_MAGIC_regdata 'D'
+#endif
+
+#ifndef PERL_MAGIC_regdatum
+# define PERL_MAGIC_regdatum 'd'
+#endif
+
+#ifndef PERL_MAGIC_env
+# define PERL_MAGIC_env 'E'
+#endif
+
+#ifndef PERL_MAGIC_envelem
+# define PERL_MAGIC_envelem 'e'
+#endif
+
+#ifndef PERL_MAGIC_fm
+# define PERL_MAGIC_fm 'f'
+#endif
+
+#ifndef PERL_MAGIC_regex_global
+# define PERL_MAGIC_regex_global 'g'
+#endif
+
+#ifndef PERL_MAGIC_isa
+# define PERL_MAGIC_isa 'I'
+#endif
+
+#ifndef PERL_MAGIC_isaelem
+# define PERL_MAGIC_isaelem 'i'
+#endif
+
+#ifndef PERL_MAGIC_nkeys
+# define PERL_MAGIC_nkeys 'k'
+#endif
+
+#ifndef PERL_MAGIC_dbfile
+# define PERL_MAGIC_dbfile 'L'
+#endif
+
+#ifndef PERL_MAGIC_dbline
+# define PERL_MAGIC_dbline 'l'
+#endif
+
+#ifndef PERL_MAGIC_mutex
+# define PERL_MAGIC_mutex 'm'
+#endif
+
+#ifndef PERL_MAGIC_shared
+# define PERL_MAGIC_shared 'N'
+#endif
+
+#ifndef PERL_MAGIC_shared_scalar
+# define PERL_MAGIC_shared_scalar 'n'
+#endif
+
+#ifndef PERL_MAGIC_collxfrm
+# define PERL_MAGIC_collxfrm 'o'
+#endif
+
+#ifndef PERL_MAGIC_tied
+# define PERL_MAGIC_tied 'P'
+#endif
+
+#ifndef PERL_MAGIC_tiedelem
+# define PERL_MAGIC_tiedelem 'p'
+#endif
+
+#ifndef PERL_MAGIC_tiedscalar
+# define PERL_MAGIC_tiedscalar 'q'
+#endif
+
+#ifndef PERL_MAGIC_qr
+# define PERL_MAGIC_qr 'r'
+#endif
+
+#ifndef PERL_MAGIC_sig
+# define PERL_MAGIC_sig 'S'
+#endif
+
+#ifndef PERL_MAGIC_sigelem
+# define PERL_MAGIC_sigelem 's'
+#endif
+
+#ifndef PERL_MAGIC_taint
+# define PERL_MAGIC_taint 't'
+#endif
+
+#ifndef PERL_MAGIC_uvar
+# define PERL_MAGIC_uvar 'U'
+#endif
+
+#ifndef PERL_MAGIC_uvar_elem
+# define PERL_MAGIC_uvar_elem 'u'
+#endif
+
+#ifndef PERL_MAGIC_vstring
+# define PERL_MAGIC_vstring 'V'
+#endif
+
+#ifndef PERL_MAGIC_vec
+# define PERL_MAGIC_vec 'v'
+#endif
+
+#ifndef PERL_MAGIC_utf8
+# define PERL_MAGIC_utf8 'w'
+#endif
+
+#ifndef PERL_MAGIC_substr
+# define PERL_MAGIC_substr 'x'
+#endif
+
+#ifndef PERL_MAGIC_defelem
+# define PERL_MAGIC_defelem 'y'
+#endif
+
+#ifndef PERL_MAGIC_glob
+# define PERL_MAGIC_glob '*'
+#endif
+
+#ifndef PERL_MAGIC_arylen
+# define PERL_MAGIC_arylen '#'
+#endif
+
+#ifndef PERL_MAGIC_pos
+# define PERL_MAGIC_pos '.'
+#endif
+
+#ifndef PERL_MAGIC_backref
+# define PERL_MAGIC_backref '<'
+#endif
+
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
+/* That's the best we can do... */
+#ifndef sv_catpvn_nomg
+# define sv_catpvn_nomg sv_catpvn
+#endif
+
+#ifndef sv_catsv_nomg
+# define sv_catsv_nomg sv_catsv
+#endif
+
+#ifndef sv_setsv_nomg
+# define sv_setsv_nomg sv_setsv
+#endif
+
+#ifndef sv_pvn_nomg
+# define sv_pvn_nomg sv_pvn
+#endif
+
+#ifndef SvIV_nomg
+# define SvIV_nomg SvIV
+#endif
+
+#ifndef SvUV_nomg
+# define SvUV_nomg SvUV
+#endif
+
+#ifndef sv_catpv_mg
+# define sv_catpv_mg(sv, ptr) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_catpv(TeMpSv,ptr); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_catpvn_mg
+# define sv_catpvn_mg(sv, ptr, len) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_catpvn(TeMpSv,ptr,len); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_catsv_mg
+# define sv_catsv_mg(dsv, ssv) \
+ STMT_START { \
+ SV *TeMpSv = dsv; \
+ sv_catsv(TeMpSv,ssv); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setiv_mg
+# define sv_setiv_mg(sv, i) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setiv(TeMpSv,i); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setnv_mg
+# define sv_setnv_mg(sv, num) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setnv(TeMpSv,num); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setpv_mg
+# define sv_setpv_mg(sv, ptr) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setpv(TeMpSv,ptr); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setpvn_mg
+# define sv_setpvn_mg(sv, ptr, len) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setpvn(TeMpSv,ptr,len); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setsv_mg
+# define sv_setsv_mg(dsv, ssv) \
+ STMT_START { \
+ SV *TeMpSv = dsv; \
+ sv_setsv(TeMpSv,ssv); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_setuv_mg
+# define sv_setuv_mg(sv, i) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_setuv(TeMpSv,i); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+
+#ifndef sv_usepvn_mg
+# define sv_usepvn_mg(sv, ptr, len) \
+ STMT_START { \
+ SV *TeMpSv = sv; \
+ sv_usepvn(TeMpSv,ptr,len); \
+ SvSETMAGIC(TeMpSv); \
+ } STMT_END
+#endif
+#ifndef SvVSTRING_mg
+# define SvVSTRING_mg(sv) (SvMAGICAL(sv) ? mg_find(sv, PERL_MAGIC_vstring) : NULL)
+#endif
+
+/* Hint: sv_magic_portable
+ * This is a compatibility function that is only available with
+ * Devel::PPPort. It is NOT in the perl core.
+ * Its purpose is to mimic the 5.8.0 behaviour of sv_magic() when
+ * it is being passed a name pointer with namlen == 0. In that
+ * case, perl 5.8.0 and later store the pointer, not a copy of it.
+ * The compatibility can be provided back to perl 5.004. With
+ * earlier versions, the code will not compile.
+ */
+
+#if (PERL_BCDVERSION < 0x5004000)
+
+ /* code that uses sv_magic_portable will not compile */
+
+#elif (PERL_BCDVERSION < 0x5008000)
+
+# define sv_magic_portable(sv, obj, how, name, namlen) \
+ STMT_START { \
+ SV *SvMp_sv = (sv); \
+ char *SvMp_name = (char *) (name); \
+ I32 SvMp_namlen = (namlen); \
+ if (SvMp_name && SvMp_namlen == 0) \
+ { \
+ MAGIC *mg; \
+ sv_magic(SvMp_sv, obj, how, 0, 0); \
+ mg = SvMAGIC(SvMp_sv); \
+ mg->mg_len = -42; /* XXX: this is the tricky part */ \
+ mg->mg_ptr = SvMp_name; \
+ } \
+ else \
+ { \
+ sv_magic(SvMp_sv, obj, how, SvMp_name, SvMp_namlen); \
+ } \
+ } STMT_END
+
+#else
+
+# define sv_magic_portable(a, b, c, d, e) sv_magic(a, b, c, d, e)
+
+#endif
+
+#ifdef USE_ITHREADS
+#ifndef CopFILE
+# define CopFILE(c) ((c)->cop_file)
+#endif
+
+#ifndef CopFILEGV
+# define CopFILEGV(c) (CopFILE(c) ? gv_fetchfile(CopFILE(c)) : Nullgv)
+#endif
+
+#ifndef CopFILE_set
+# define CopFILE_set(c,pv) ((c)->cop_file = savepv(pv))
+#endif
+
+#ifndef CopFILESV
+# define CopFILESV(c) (CopFILE(c) ? GvSV(gv_fetchfile(CopFILE(c))) : Nullsv)
+#endif
+
+#ifndef CopFILEAV
+# define CopFILEAV(c) (CopFILE(c) ? GvAV(gv_fetchfile(CopFILE(c))) : Nullav)
+#endif
+
+#ifndef CopSTASHPV
+# define CopSTASHPV(c) ((c)->cop_stashpv)
+#endif
+
+#ifndef CopSTASHPV_set
+# define CopSTASHPV_set(c,pv) ((c)->cop_stashpv = ((pv) ? savepv(pv) : Nullch))
+#endif
+
+#ifndef CopSTASH
+# define CopSTASH(c) (CopSTASHPV(c) ? gv_stashpv(CopSTASHPV(c),GV_ADD) : Nullhv)
+#endif
+
+#ifndef CopSTASH_set
+# define CopSTASH_set(c,hv) CopSTASHPV_set(c, (hv) ? HvNAME(hv) : Nullch)
+#endif
+
+#ifndef CopSTASH_eq
+# define CopSTASH_eq(c,hv) ((hv) && (CopSTASHPV(c) == HvNAME(hv) \
+ || (CopSTASHPV(c) && HvNAME(hv) \
+ && strEQ(CopSTASHPV(c), HvNAME(hv)))))
+#endif
+
+#else
+#ifndef CopFILEGV
+# define CopFILEGV(c) ((c)->cop_filegv)
+#endif
+
+#ifndef CopFILEGV_set
+# define CopFILEGV_set(c,gv) ((c)->cop_filegv = (GV*)SvREFCNT_inc(gv))
+#endif
+
+#ifndef CopFILE_set
+# define CopFILE_set(c,pv) CopFILEGV_set((c), gv_fetchfile(pv))
+#endif
+
+#ifndef CopFILESV
+# define CopFILESV(c) (CopFILEGV(c) ? GvSV(CopFILEGV(c)) : Nullsv)
+#endif
+
+#ifndef CopFILEAV
+# define CopFILEAV(c) (CopFILEGV(c) ? GvAV(CopFILEGV(c)) : Nullav)
+#endif
+
+#ifndef CopFILE
+# define CopFILE(c) (CopFILESV(c) ? SvPVX(CopFILESV(c)) : Nullch)
+#endif
+
+#ifndef CopSTASH
+# define CopSTASH(c) ((c)->cop_stash)
+#endif
+
+#ifndef CopSTASH_set
+# define CopSTASH_set(c,hv) ((c)->cop_stash = (hv))
+#endif
+
+#ifndef CopSTASHPV
+# define CopSTASHPV(c) (CopSTASH(c) ? HvNAME(CopSTASH(c)) : Nullch)
+#endif
+
+#ifndef CopSTASHPV_set
+# define CopSTASHPV_set(c,pv) CopSTASH_set((c), gv_stashpv(pv,GV_ADD))
+#endif
+
+#ifndef CopSTASH_eq
+# define CopSTASH_eq(c,hv) (CopSTASH(c) == (hv))
+#endif
+
+#endif /* USE_ITHREADS */
+#ifndef IN_PERL_COMPILETIME
+# define IN_PERL_COMPILETIME (PL_curcop == &PL_compiling)
+#endif
+
+#ifndef IN_LOCALE_RUNTIME
+# define IN_LOCALE_RUNTIME (PL_curcop->op_private & HINT_LOCALE)
+#endif
+
+#ifndef IN_LOCALE_COMPILETIME
+# define IN_LOCALE_COMPILETIME (PL_hints & HINT_LOCALE)
+#endif
+
+#ifndef IN_LOCALE
+# define IN_LOCALE (IN_PERL_COMPILETIME ? IN_LOCALE_COMPILETIME : IN_LOCALE_RUNTIME)
+#endif
+#ifndef IS_NUMBER_IN_UV
+# define IS_NUMBER_IN_UV 0x01
+#endif
+
+#ifndef IS_NUMBER_GREATER_THAN_UV_MAX
+# define IS_NUMBER_GREATER_THAN_UV_MAX 0x02
+#endif
+
+#ifndef IS_NUMBER_NOT_INT
+# define IS_NUMBER_NOT_INT 0x04
+#endif
+
+#ifndef IS_NUMBER_NEG
+# define IS_NUMBER_NEG 0x08
+#endif
+
+#ifndef IS_NUMBER_INFINITY
+# define IS_NUMBER_INFINITY 0x10
+#endif
+
+#ifndef IS_NUMBER_NAN
+# define IS_NUMBER_NAN 0x20
+#endif
+#ifndef GROK_NUMERIC_RADIX
+# define GROK_NUMERIC_RADIX(sp, send) grok_numeric_radix(sp, send)
+#endif
+#ifndef PERL_SCAN_GREATER_THAN_UV_MAX
+# define PERL_SCAN_GREATER_THAN_UV_MAX 0x02
+#endif
+
+#ifndef PERL_SCAN_SILENT_ILLDIGIT
+# define PERL_SCAN_SILENT_ILLDIGIT 0x04
+#endif
+
+#ifndef PERL_SCAN_ALLOW_UNDERSCORES
+# define PERL_SCAN_ALLOW_UNDERSCORES 0x01
+#endif
+
+#ifndef PERL_SCAN_DISALLOW_PREFIX
+# define PERL_SCAN_DISALLOW_PREFIX 0x02
+#endif
+
+#ifndef grok_numeric_radix
+#if defined(NEED_grok_numeric_radix)
+static bool DPPP_(my_grok_numeric_radix)(pTHX_ const char ** sp, const char * send);
+static
+#else
+extern bool DPPP_(my_grok_numeric_radix)(pTHX_ const char ** sp, const char * send);
+#endif
+
+#ifdef grok_numeric_radix
+# undef grok_numeric_radix
+#endif
+#define grok_numeric_radix(a,b) DPPP_(my_grok_numeric_radix)(aTHX_ a,b)
+#define Perl_grok_numeric_radix DPPP_(my_grok_numeric_radix)
+
+#if defined(NEED_grok_numeric_radix) || defined(NEED_grok_numeric_radix_GLOBAL)
+bool
+DPPP_(my_grok_numeric_radix)(pTHX_ const char **sp, const char *send)
+{
+#ifdef USE_LOCALE_NUMERIC
+#ifdef PL_numeric_radix_sv
+ if (PL_numeric_radix_sv && IN_LOCALE) {
+ STRLEN len;
+ char* radix = SvPV(PL_numeric_radix_sv, len);
+ if (*sp + len <= send && memEQ(*sp, radix, len)) {
+ *sp += len;
+ return TRUE;
+ }
+ }
+#else
+ /* older perls don't have PL_numeric_radix_sv so the radix
+ * must manually be requested from locale.h
+ */
+#include <locale.h>
+ dTHR; /* needed for older threaded perls */
+ struct lconv *lc = localeconv();
+ char *radix = lc->decimal_point;
+ if (radix && IN_LOCALE) {
+ STRLEN len = strlen(radix);
+ if (*sp + len <= send && memEQ(*sp, radix, len)) {
+ *sp += len;
+ return TRUE;
+ }
+ }
+#endif
+#endif /* USE_LOCALE_NUMERIC */
+ /* always try "." if numeric radix didn't match because
+ * we may have data from different locales mixed */
+ if (*sp < send && **sp == '.') {
+ ++*sp;
+ return TRUE;
+ }
+ return FALSE;
+}
+#endif
+#endif
+
+#ifndef grok_number
+#if defined(NEED_grok_number)
+static int DPPP_(my_grok_number)(pTHX_ const char * pv, STRLEN len, UV * valuep);
+static
+#else
+extern int DPPP_(my_grok_number)(pTHX_ const char * pv, STRLEN len, UV * valuep);
+#endif
+
+#ifdef grok_number
+# undef grok_number
+#endif
+#define grok_number(a,b,c) DPPP_(my_grok_number)(aTHX_ a,b,c)
+#define Perl_grok_number DPPP_(my_grok_number)
+
+#if defined(NEED_grok_number) || defined(NEED_grok_number_GLOBAL)
+int
+DPPP_(my_grok_number)(pTHX_ const char *pv, STRLEN len, UV *valuep)
+{
+ const char *s = pv;
+ const char *send = pv + len;
+ const UV max_div_10 = UV_MAX / 10;
+ const char max_mod_10 = UV_MAX % 10;
+ int numtype = 0;
+ int sawinf = 0;
+ int sawnan = 0;
+
+ while (s < send && isSPACE(*s))
+ s++;
+ if (s == send) {
+ return 0;
+ } else if (*s == '-') {
+ s++;
+ numtype = IS_NUMBER_NEG;
+ }
+ else if (*s == '+')
+ s++;
+
+ if (s == send)
+ return 0;
+
+ /* next must be digit or the radix separator or beginning of infinity */
+ if (isDIGIT(*s)) {
+ /* UVs are at least 32 bits, so the first 9 decimal digits cannot
+ overflow. */
+ UV value = *s - '0';
+ /* This construction seems to be more optimiser friendly.
+ (without it gcc does the isDIGIT test and the *s - '0' separately)
+ With it gcc on arm is managing 6 instructions (6 cycles) per digit.
+ In theory the optimiser could deduce how far to unroll the loop
+ before checking for overflow. */
+ if (++s < send) {
+ int digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ digit = *s - '0';
+ if (digit >= 0 && digit <= 9) {
+ value = value * 10 + digit;
+ if (++s < send) {
+ /* Now got 9 digits, so need to check
+ each time for overflow. */
+ digit = *s - '0';
+ while (digit >= 0 && digit <= 9
+ && (value < max_div_10
+ || (value == max_div_10
+ && digit <= max_mod_10))) {
+ value = value * 10 + digit;
+ if (++s < send)
+ digit = *s - '0';
+ else
+ break;
+ }
+ if (digit >= 0 && digit <= 9
+ && (s < send)) {
+ /* value overflowed.
+ skip the remaining digits, don't
+ worry about setting *valuep. */
+ do {
+ s++;
+ } while (s < send && isDIGIT(*s));
+ numtype |=
+ IS_NUMBER_GREATER_THAN_UV_MAX;
+ goto skip_value;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ numtype |= IS_NUMBER_IN_UV;
+ if (valuep)
+ *valuep = value;
+
+ skip_value:
+ if (GROK_NUMERIC_RADIX(&s, send)) {
+ numtype |= IS_NUMBER_NOT_INT;
+ while (s < send && isDIGIT(*s)) /* optional digits after the radix */
+ s++;
+ }
+ }
+ else if (GROK_NUMERIC_RADIX(&s, send)) {
+ numtype |= IS_NUMBER_NOT_INT | IS_NUMBER_IN_UV; /* valuep assigned below */
+ /* no digits before the radix means we need digits after it */
+ if (s < send && isDIGIT(*s)) {
+ do {
+ s++;
+ } while (s < send && isDIGIT(*s));
+ if (valuep) {
+ /* integer approximation is valid - it's 0. */
+ *valuep = 0;
+ }
+ }
+ else
+ return 0;
+ } else if (*s == 'I' || *s == 'i') {
+ s++; if (s == send || (*s != 'N' && *s != 'n')) return 0;
+ s++; if (s == send || (*s != 'F' && *s != 'f')) return 0;
+ s++; if (s < send && (*s == 'I' || *s == 'i')) {
+ s++; if (s == send || (*s != 'N' && *s != 'n')) return 0;
+ s++; if (s == send || (*s != 'I' && *s != 'i')) return 0;
+ s++; if (s == send || (*s != 'T' && *s != 't')) return 0;
+ s++; if (s == send || (*s != 'Y' && *s != 'y')) return 0;
+ s++;
+ }
+ sawinf = 1;
+ } else if (*s == 'N' || *s == 'n') {
+ /* XXX TODO: There are signaling NaNs and quiet NaNs. */
+ s++; if (s == send || (*s != 'A' && *s != 'a')) return 0;
+ s++; if (s == send || (*s != 'N' && *s != 'n')) return 0;
+ s++;
+ sawnan = 1;
+ } else
+ return 0;
+
+ if (sawinf) {
+ numtype &= IS_NUMBER_NEG; /* Keep track of sign */
+ numtype |= IS_NUMBER_INFINITY | IS_NUMBER_NOT_INT;
+ } else if (sawnan) {
+ numtype &= IS_NUMBER_NEG; /* Keep track of sign */
+ numtype |= IS_NUMBER_NAN | IS_NUMBER_NOT_INT;
+ } else if (s < send) {
+ /* we can have an optional exponent part */
+ if (*s == 'e' || *s == 'E') {
+ /* The only flag we keep is sign. Blow away any "it's UV" */
+ numtype &= IS_NUMBER_NEG;
+ numtype |= IS_NUMBER_NOT_INT;
+ s++;
+ if (s < send && (*s == '-' || *s == '+'))
+ s++;
+ if (s < send && isDIGIT(*s)) {
+ do {
+ s++;
+ } while (s < send && isDIGIT(*s));
+ }
+ else
+ return 0;
+ }
+ }
+ while (s < send && isSPACE(*s))
+ s++;
+ if (s >= send)
+ return numtype;
+ if (len == 10 && memEQ(pv, "0 but true", 10)) {
+ if (valuep)
+ *valuep = 0;
+ return IS_NUMBER_IN_UV;
+ }
+ return 0;
+}
+#endif
+#endif
+
+/*
+ * The grok_* routines have been modified to use warn() instead of
+ * Perl_warner(). Also, 'hexdigit' was the former name of PL_hexdigit,
+ * which is why the stack variable has been renamed to 'xdigit'.
+ */
+
+#ifndef grok_bin
+#if defined(NEED_grok_bin)
+static UV DPPP_(my_grok_bin)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
+static
+#else
+extern UV DPPP_(my_grok_bin)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
+#endif
+
+#ifdef grok_bin
+# undef grok_bin
+#endif
+#define grok_bin(a,b,c,d) DPPP_(my_grok_bin)(aTHX_ a,b,c,d)
+#define Perl_grok_bin DPPP_(my_grok_bin)
+
+#if defined(NEED_grok_bin) || defined(NEED_grok_bin_GLOBAL)
+UV
+DPPP_(my_grok_bin)(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result)
+{
+ const char *s = start;
+ STRLEN len = *len_p;
+ UV value = 0;
+ NV value_nv = 0;
+
+ const UV max_div_2 = UV_MAX / 2;
+ bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
+ bool overflowed = FALSE;
+
+ if (!(*flags & PERL_SCAN_DISALLOW_PREFIX)) {
+ /* strip off leading b or 0b.
+ for compatibility silently suffer "b" and "0b" as valid binary
+ numbers. */
+ if (len >= 1) {
+ if (s[0] == 'b') {
+ s++;
+ len--;
+ }
+ else if (len >= 2 && s[0] == '0' && s[1] == 'b') {
+ s+=2;
+ len-=2;
+ }
+ }
+ }
+
+ for (; len-- && *s; s++) {
+ char bit = *s;
+ if (bit == '0' || bit == '1') {
+ /* Write it in this wonky order with a goto to attempt to get the
+ compiler to make the common case integer-only loop pretty tight.
+ With gcc seems to be much straighter code than old scan_bin. */
+ redo:
+ if (!overflowed) {
+ if (value <= max_div_2) {
+ value = (value << 1) | (bit - '0');
+ continue;
+ }
+ /* Bah. We're just overflowed. */
+ warn("Integer overflow in binary number");
+ overflowed = TRUE;
+ value_nv = (NV) value;
+ }
+ value_nv *= 2.0;
+ /* If an NV has not enough bits in its mantissa to
+ * represent a UV this summing of small low-order numbers
+ * is a waste of time (because the NV cannot preserve
+ * the low-order bits anyway): we could just remember when
+ * did we overflow and in the end just multiply value_nv by the
+ * right amount. */
+ value_nv += (NV)(bit - '0');
+ continue;
+ }
+ if (bit == '_' && len && allow_underscores && (bit = s[1])
+ && (bit == '0' || bit == '1'))
+ {
+ --len;
+ ++s;
+ goto redo;
+ }
+ if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
+ warn("Illegal binary digit '%c' ignored", *s);
+ break;
+ }
+
+ if ( ( overflowed && value_nv > 4294967295.0)
+#if UVSIZE > 4
+ || (!overflowed && value > 0xffffffff )
+#endif
+ ) {
+ warn("Binary number > 0b11111111111111111111111111111111 non-portable");
+ }
+ *len_p = s - start;
+ if (!overflowed) {
+ *flags = 0;
+ return value;
+ }
+ *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
+ if (result)
+ *result = value_nv;
+ return UV_MAX;
+}
+#endif
+#endif
+
+#ifndef grok_hex
+#if defined(NEED_grok_hex)
+static UV DPPP_(my_grok_hex)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
+static
+#else
+extern UV DPPP_(my_grok_hex)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
+#endif
+
+#ifdef grok_hex
+# undef grok_hex
+#endif
+#define grok_hex(a,b,c,d) DPPP_(my_grok_hex)(aTHX_ a,b,c,d)
+#define Perl_grok_hex DPPP_(my_grok_hex)
+
+#if defined(NEED_grok_hex) || defined(NEED_grok_hex_GLOBAL)
+UV
+DPPP_(my_grok_hex)(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result)
+{
+ const char *s = start;
+ STRLEN len = *len_p;
+ UV value = 0;
+ NV value_nv = 0;
+
+ const UV max_div_16 = UV_MAX / 16;
+ bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
+ bool overflowed = FALSE;
+ const char *xdigit;
+
+ if (!(*flags & PERL_SCAN_DISALLOW_PREFIX)) {
+ /* strip off leading x or 0x.
+ for compatibility silently suffer "x" and "0x" as valid hex numbers.
+ */
+ if (len >= 1) {
+ if (s[0] == 'x') {
+ s++;
+ len--;
+ }
+ else if (len >= 2 && s[0] == '0' && s[1] == 'x') {
+ s+=2;
+ len-=2;
+ }
+ }
+ }
+
+ for (; len-- && *s; s++) {
+ xdigit = strchr((char *) PL_hexdigit, *s);
+ if (xdigit) {
+ /* Write it in this wonky order with a goto to attempt to get the
+ compiler to make the common case integer-only loop pretty tight.
+ With gcc seems to be much straighter code than old scan_hex. */
+ redo:
+ if (!overflowed) {
+ if (value <= max_div_16) {
+ value = (value << 4) | ((xdigit - PL_hexdigit) & 15);
+ continue;
+ }
+ warn("Integer overflow in hexadecimal number");
+ overflowed = TRUE;
+ value_nv = (NV) value;
+ }
+ value_nv *= 16.0;
+ /* If an NV has not enough bits in its mantissa to
+ * represent a UV this summing of small low-order numbers
+ * is a waste of time (because the NV cannot preserve
+ * the low-order bits anyway): we could just remember when
+ * did we overflow and in the end just multiply value_nv by the
+ * right amount of 16-tuples. */
+ value_nv += (NV)((xdigit - PL_hexdigit) & 15);
+ continue;
+ }
+ if (*s == '_' && len && allow_underscores && s[1]
+ && (xdigit = strchr((char *) PL_hexdigit, s[1])))
+ {
+ --len;
+ ++s;
+ goto redo;
+ }
+ if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
+ warn("Illegal hexadecimal digit '%c' ignored", *s);
+ break;
+ }
+
+ if ( ( overflowed && value_nv > 4294967295.0)
+#if UVSIZE > 4
+ || (!overflowed && value > 0xffffffff )
+#endif
+ ) {
+ warn("Hexadecimal number > 0xffffffff non-portable");
+ }
+ *len_p = s - start;
+ if (!overflowed) {
+ *flags = 0;
+ return value;
+ }
+ *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
+ if (result)
+ *result = value_nv;
+ return UV_MAX;
+}
+#endif
+#endif
+
+#ifndef grok_oct
+#if defined(NEED_grok_oct)
+static UV DPPP_(my_grok_oct)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
+static
+#else
+extern UV DPPP_(my_grok_oct)(pTHX_ const char * start, STRLEN * len_p, I32 * flags, NV * result);
+#endif
+
+#ifdef grok_oct
+# undef grok_oct
+#endif
+#define grok_oct(a,b,c,d) DPPP_(my_grok_oct)(aTHX_ a,b,c,d)
+#define Perl_grok_oct DPPP_(my_grok_oct)
+
+#if defined(NEED_grok_oct) || defined(NEED_grok_oct_GLOBAL)
+UV
+DPPP_(my_grok_oct)(pTHX_ const char *start, STRLEN *len_p, I32 *flags, NV *result)
+{
+ const char *s = start;
+ STRLEN len = *len_p;
+ UV value = 0;
+ NV value_nv = 0;
+
+ const UV max_div_8 = UV_MAX / 8;
+ bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
+ bool overflowed = FALSE;
+
+ for (; len-- && *s; s++) {
+ /* gcc 2.95 optimiser not smart enough to figure that this subtraction
+ out front allows slicker code. */
+ int digit = *s - '0';
+ if (digit >= 0 && digit <= 7) {
+ /* Write it in this wonky order with a goto to attempt to get the
+ compiler to make the common case integer-only loop pretty tight.
+ */
+ redo:
+ if (!overflowed) {
+ if (value <= max_div_8) {
+ value = (value << 3) | digit;
+ continue;
+ }
+ /* Bah. We're just overflowed. */
+ warn("Integer overflow in octal number");
+ overflowed = TRUE;
+ value_nv = (NV) value;
+ }
+ value_nv *= 8.0;
+ /* If an NV has not enough bits in its mantissa to
+ * represent a UV this summing of small low-order numbers
+ * is a waste of time (because the NV cannot preserve
+ * the low-order bits anyway): we could just remember when
+ * did we overflow and in the end just multiply value_nv by the
+ * right amount of 8-tuples. */
+ value_nv += (NV)digit;
+ continue;
+ }
+ if (digit == ('_' - '0') && len && allow_underscores
+ && (digit = s[1] - '0') && (digit >= 0 && digit <= 7))
+ {
+ --len;
+ ++s;
+ goto redo;
+ }
+ /* Allow \octal to work the DWIM way (that is, stop scanning
+ * as soon as non-octal characters are seen, complain only iff
+ * someone seems to want to use the digits eight and nine). */
+ if (digit == 8 || digit == 9) {
+ if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
+ warn("Illegal octal digit '%c' ignored", *s);
+ }
+ break;
+ }
+
+ if ( ( overflowed && value_nv > 4294967295.0)
+#if UVSIZE > 4
+ || (!overflowed && value > 0xffffffff )
+#endif
+ ) {
+ warn("Octal number > 037777777777 non-portable");
+ }
+ *len_p = s - start;
+ if (!overflowed) {
+ *flags = 0;
+ return value;
+ }
+ *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
+ if (result)
+ *result = value_nv;
+ return UV_MAX;
+}
+#endif
+#endif
+
+#if !defined(my_snprintf)
+#if defined(NEED_my_snprintf)
+static int DPPP_(my_my_snprintf)(char * buffer, const Size_t len, const char * format, ...);
+static
+#else
+extern int DPPP_(my_my_snprintf)(char * buffer, const Size_t len, const char * format, ...);
+#endif
+
+#define my_snprintf DPPP_(my_my_snprintf)
+#define Perl_my_snprintf DPPP_(my_my_snprintf)
+
+#if defined(NEED_my_snprintf) || defined(NEED_my_snprintf_GLOBAL)
+
+int
+DPPP_(my_my_snprintf)(char *buffer, const Size_t len, const char *format, ...)
+{
+ dTHX;
+ int retval;
+ va_list ap;
+ va_start(ap, format);
+#ifdef HAS_VSNPRINTF
+ retval = vsnprintf(buffer, len, format, ap);
+#else
+ retval = vsprintf(buffer, format, ap);
+#endif
+ va_end(ap);
+ if (retval >= (int)len)
+ Perl_croak(aTHX_ "panic: my_snprintf buffer overflow");
+ return retval;
+}
+
+#endif
+#endif
+
+#ifdef NO_XSLOCKS
+# ifdef dJMPENV
+# define dXCPT dJMPENV; int rEtV = 0
+# define XCPT_TRY_START JMPENV_PUSH(rEtV); if (rEtV == 0)
+# define XCPT_TRY_END JMPENV_POP;
+# define XCPT_CATCH if (rEtV != 0)
+# define XCPT_RETHROW JMPENV_JUMP(rEtV)
+# else
+# define dXCPT Sigjmp_buf oldTOP; int rEtV = 0
+# define XCPT_TRY_START Copy(top_env, oldTOP, 1, Sigjmp_buf); rEtV = Sigsetjmp(top_env, 1); if (rEtV == 0)
+# define XCPT_TRY_END Copy(oldTOP, top_env, 1, Sigjmp_buf);
+# define XCPT_CATCH if (rEtV != 0)
+# define XCPT_RETHROW Siglongjmp(top_env, rEtV)
+# endif
+#endif
+
+#if !defined(my_strlcat)
+#if defined(NEED_my_strlcat)
+static Size_t DPPP_(my_my_strlcat)(char * dst, const char * src, Size_t size);
+static
+#else
+extern Size_t DPPP_(my_my_strlcat)(char * dst, const char * src, Size_t size);
+#endif
+
+#define my_strlcat DPPP_(my_my_strlcat)
+#define Perl_my_strlcat DPPP_(my_my_strlcat)
+
+#if defined(NEED_my_strlcat) || defined(NEED_my_strlcat_GLOBAL)
+
+Size_t
+DPPP_(my_my_strlcat)(char *dst, const char *src, Size_t size)
+{
+ Size_t used, length, copy;
+
+ used = strlen(dst);
+ length = strlen(src);
+ if (size > 0 && used < size - 1) {
+ copy = (length >= size - used) ? size - used - 1 : length;
+ memcpy(dst + used, src, copy);
+ dst[used + copy] = '\0';
+ }
+ return used + length;
+}
+#endif
+#endif
+
+#if !defined(my_strlcpy)
+#if defined(NEED_my_strlcpy)
+static Size_t DPPP_(my_my_strlcpy)(char * dst, const char * src, Size_t size);
+static
+#else
+extern Size_t DPPP_(my_my_strlcpy)(char * dst, const char * src, Size_t size);
+#endif
+
+#define my_strlcpy DPPP_(my_my_strlcpy)
+#define Perl_my_strlcpy DPPP_(my_my_strlcpy)
+
+#if defined(NEED_my_strlcpy) || defined(NEED_my_strlcpy_GLOBAL)
+
+Size_t
+DPPP_(my_my_strlcpy)(char *dst, const char *src, Size_t size)
+{
+ Size_t length, copy;
+
+ length = strlen(src);
+ if (size > 0) {
+ copy = (length >= size) ? size - 1 : length;
+ memcpy(dst, src, copy);
+ dst[copy] = '\0';
+ }
+ return length;
+}
+
+#endif
+#endif
+
+#endif /* _P_P_PORTABILITY_H_ */
+
+/* End of File ppport.h */
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationtIPhoneSimulatorNotificationt"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/t/IPhoneSimulatorNotification.t (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/t/IPhoneSimulatorNotification.t (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/t/IPhoneSimulatorNotification.t 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+# Before `make install' is performed this script should be runnable with
+# `make test'. After `make install' it should work as `perl IPhoneSimulatorNotification.t'
+
+#########################
+
+# change 'tests => 1' to 'tests => last_test_to_print';
+
+use Test::More tests => 1;
+BEGIN { use_ok('IPhoneSimulatorNotification') };
+
+#########################
+
+# Insert your test code below, the Test::More module is use()ed here so read
+# its man page ( perldoc Test::More ) for help writing this test script.
+
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportMakefile"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PerlSupport/Makefile (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/Makefile (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/Makefile 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,113 @@
</span><ins>+# Copyright (C) 2009 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. ``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
+# 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.
+
+ifneq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )
+
+CONFIGURATION_BUILD_DIR ?= .
+OUTPUT_DIR=$(CONFIGURATION_BUILD_DIR)
+
+WRAPPER_DIR=$(OUTPUT_DIR)/DerivedSources/DumpRenderTree
+ifneq ($(PLATFORM_NAME),iphoneos)
+WRAPPER=$(WRAPPER_DIR)/DumpRenderTreeSupport_wrap.c
+PERL_MODULE=$(OUTPUT_DIR)/DumpRenderTreeSupport.pm
+DYLIB=$(OUTPUT_DIR)/DumpRenderTreeSupport.dylib
+endif
+DUMPRENDERTREE=$(OUTPUT_DIR)/DumpRenderTree
+PERL=/usr/bin/perl
+
+DUMPRENDERTREE=$(OUTPUT_DIR)/DumpRenderTree.app/DumpRenderTree
+
+# FIXME: We shouldn't hard code these architectures. See <rdar://problem/9047171> for more discussion on why we have to.
+ARCHS=i386 x86_64
+
+OSX_VERSION = $(shell sw_vers -productVersion | cut -d. -f 2)
+ifeq "$(OSX_VERSION)" "5"
+GENERATE_WRAPPER = YES
+endif
+ifeq "$(OSX_VERSION)" "6"
+GENERATE_WRAPPER = NO
+endif
+
+ifeq "$(GENERATE_WRAPPER)" "YES"
+
+SWIG=/usr/bin/swig
+
+all: $(DYLIB) $(PERL_MODULE)
+
+$(WRAPPER) $(PERL_MODULE): DumpRenderTreeSupport.c $(DUMPRENDERTREE)
+ mkdir -p $(WRAPPER_DIR)
+ $(SWIG) -o $(WRAPPER) -outdir $(OUTPUT_DIR) -perl -module DumpRenderTreeSupport $<
+
+
+else
+
+
+all: $(DYLIB) $(PERL_MODULE)
+
+$(WRAPPER): DumpRenderTreeSupport_wrapPregenerated.c $(DUMPRENDERTREE)
+ mkdir -p $(WRAPPER_DIR)
+ cp DumpRenderTreeSupport_wrapPregenerated.c $(WRAPPER)
+
+$(PERL_MODULE): DumpRenderTreeSupportPregenerated.pm $(DUMPRENDERTREE)
+ cp DumpRenderTreeSupportPregenerated.pm $(PERL_MODULE)
+
+
+endif
+
+OS_X_SDK = $(if $(shell xcrun --show-sdk-path -sdk "macosx" 2> /dev/null),macosx, /)
+
+$(DYLIB): DumpRenderTreeSupport.c $(WRAPPER)
+ TOOLCHAINS= xcrun -sdk $(OS_X_SDK) cc -g -dynamiclib -o $(DYLIB) `$(PERL) -MExtUtils::Embed -eperl_inc` `$(PERL) -MExtUtils::Embed -e'my $$opts = ldopts(0); $$opts =~ s/-arch [^ ]*( |$$)//g; print $$opts, " -arch ", join(" -arch ", split(" ",$$ENV{ARCHS}))'` $^
+
+IPHONE_SIMULATOR_NOTIFCATION_BUNDLE=$(OUTPUT_DIR)/lib/perl5/darwin-thread-multi-2level/auto/IPhoneSimulatorNotification/IPhoneSimulatorNotification.bundle
+IPHONE_SIMULATOR_NOTIFCATION_MODULE=$(OUTPUT_DIR)/lib/perl5/darwin-thread-multi-2level/IPhoneSimulatorNotification.pm
+
+all: $(IPHONE_SIMULATOR_NOTIFCATION_BUNDLE) $(IPHONE_SIMULATOR_NOTIFCATION_MODULE)
+
+$(IPHONE_SIMULATOR_NOTIFCATION_BUNDLE) $(IPHONE_SIMULATOR_NOTIFCATION_MODULE): IPhoneSimulatorNotification/IPhoneSimulatorNotification.xs IPhoneSimulatorNotification/Makefile.PL IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm IPhoneSimulatorNotification/ppport.h IPhoneSimulatorNotification/t/IPhoneSimulatorNotification.t
+ (cd IPhoneSimulatorNotification && \
+ SDKROOT=$(OS_X_SDK) TOOLCHAINS= $(PERL) Makefile.PL INSTALL_BASE=$(OUTPUT_DIR) && \
+ make SDKROOT=$(OS_X_SDK) TOOLCHAINS= && \
+ make test && \
+ make install && \
+ make realclean)
+ # Touch the built perl module and its bundle since IPhoneSimulatorNotification.xs and Makefile.PL always have newer dates after building.
+ touch $(IPHONE_SIMULATOR_NOTIFCATION_BUNDLE) $(IPHONE_SIMULATOR_NOTIFCATION_MODULE)
+
+clean:
+ rm -f $(WRAPPER) $(PERL_MODULE) $(DYLIB)
+
+installhdrs installsrc:
+
+INSTALL_LOCATION=$(DSTROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)
+
+install: all
+ mkdir -p $(INSTALL_LOCATION)
+ cp $(DYLIB) $(INSTALL_LOCATION)/DumpRenderTreeSupport.dylib
+ cp $(PERL_MODULE) $(INSTALL_LOCATION)/DumpRenderTreeSupport.pm
+
+else
+
+all clean install installhdrs installsrc:
+
+endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPixelDumpSupportIOSmm"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (rev 0)
+++ trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+/*
+ * Copyright (C) 2005, 2006, 2007, 2009 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.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
+ */
+
+#import "config.h"
+#import "PixelDumpSupport.h"
+
+#import "DumpRenderTree.h"
+#import "PixelDumpSupportCG.h"
+
+#define COMMON_DIGEST_FOR_OPENSSL
+#import <CommonCrypto/CommonDigest.h>
+#import <MobileCoreServices/UTCoreTypes.h>
+#import <QuartzCore/QuartzCore.h>
+#import <UIKit/UIKit.h>
+#import <UIKit/UIView_Private.h>
+#import <UIKit/UIWebBrowserView.h>
+#import <WebKit/WebCoreThread.h>
+
+#import <wtf/RefPtr.h>
+
+extern UIWebBrowserView *gWebBrowserView;
+
+PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally,
+ bool drawSelectionRect)
+{
+ // FIXME: Implement; see PixelDumpSupportMac.mm.
+ return 0;
+}
+
+void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
+{
+ // TODO: <rdar://problem/6558366> DumpRenderTree: Investigate testRepaintSweepHorizontally and dumpSelectionRect
+
+ // Take snapshot
+ WebThreadLock();
+ [gWebBrowserView setNeedsDisplay];
+ [gWebBrowserView layoutTilesNow];
+ CGImageRef snapshot = [gWebBrowserView createSnapshotWithRect:[[mainFrame webView] frame]];
+ NSData *pngData = UIImagePNGRepresentation([UIImage imageWithCGImage:snapshot]);
+
+ // Hash the PNG data
+ char actualHash[33];
+ unsigned char result[CC_MD5_DIGEST_LENGTH];
+ CC_MD5([pngData bytes], [pngData length], result);
+ actualHash[0] = '\0';
+ for (int i = 0; i < 16; i++)
+ snprintf(actualHash, 33, "%s%02x", actualHash, result[i]);
+ printf("\nActualHash: %s\n", actualHash);
+
+ // Print the image
+ printf("Content-Type: image/png\n");
+ printf("Content-Length: %lu\n", (unsigned long)[pngData length]);
+ fwrite([pngData bytes], 1, [pngData length], stdout);
+ CGImageRelease(snapshot);
+}
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityNotificationHandlermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityNotificationHandler.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #import <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRefCF.h>
</span><span class="cx"> #import <WebKit/WebFrame.h>
</span><del>-#import <WebKit/WebTypesInternal.h>
</del><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @interface NSObject (WebAccessibilityObjectWrapperAdditions)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityTextMarkerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx"> #import "AccessibilityTextMarker.h"
</span><span class="cx"> #import "DumpRenderTree.h"
</span><span class="cx">
</span><ins>+#if SUPPORTS_AX_TEXTMARKERS
+
</ins><span class="cx"> // MARK: AccessibilityTextMarker
</span><span class="cx">
</span><span class="cx"> AccessibilityTextMarker::AccessibilityTextMarker(PlatformTextMarker marker)
</span><span class="lines">@@ -79,3 +81,5 @@
</span><span class="cx"> {
</span><span class="cx"> return m_textMarkerRange.get();
</span><span class="cx"> }
</span><ins>+
+#endif // SUPPORTS_AX_TEXTMARKERS
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAppleScriptControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AppleScriptController.m (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/AppleScriptController.m 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/AppleScriptController.m 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "AppleScriptController.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import <WebKit/WebView.h>
</span><span class="cx"> #import <WebKit/WebViewPrivate.h> // for aeDescByEvaluatingJavaScriptFromString, which is pending API review
</span><span class="cx">
</span><span class="lines">@@ -125,3 +127,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif // !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -21,11 +21,21 @@
</span><span class="cx"> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><ins>+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
+
</ins><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span><span class="cx"> CLANG_CXX_LIBRARY = libc++;
</span><span class="cx"> CLANG_WARN_CXX0X_EXTENSIONS = NO;
</span><del>-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include ForwardingHeaders mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/JavaScriptCore/icu;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
</del><ins>+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(HEADER_SEARCH_PATHS_$(PLATFORM_NAME)) $(SRCROOT)/../../Source/JavaScriptCore/icu;
+HEADER_SEARCH_PATHS_iphoneos = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport;
+HEADER_SEARCH_PATHS_iphonesimulator = $(HEADER_SEARCH_PATHS_iphoneos);
+HEADER_SEARCH_PATHS_macosx = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
+FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
+FRAMEWORK_SEARCH_PATHS_macosx = $(interited);
+FRAMEWORK_SEARCH_PATHS_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos);
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME)) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
+GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT;
</ins><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><span class="cx"> PREBINDING = NO
</span><span class="cx"> GCC_C_LANGUAGE_STANDARD = gnu99
</span><span class="lines">@@ -37,6 +47,9 @@
</span><span class="cx"> GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO
</span><span class="cx"> GCC_WARN_UNUSED_FUNCTION = YES
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES
</span><ins>+// FIXME: <http://webkit.org/b/118590> DumpRenderTree should build with -Wshorten-64-to-32
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
</ins><span class="cx"> WARNING_CFLAGS = -Wall -W -Wno-unused-parameter -Wundef
</span><span class="cx"> LINKER_DISPLAYS_MANGLED_NAMES = YES;
</span><span class="cx">
</span><span class="lines">@@ -58,3 +71,5 @@
</span><span class="cx"> TOOLCHAINS_macosx_1080 = default;
</span><span class="cx"> TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
</span><span class="cx"> TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
</span><ins>+
+SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -28,10 +28,13 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><del>-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
-MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</del><ins>+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
+MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.9;
+MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.9;
+MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
+MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</ins><span class="cx">
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -23,6 +23,10 @@
</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) -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a;
</del><ins>+OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework JavaScriptCore -framework OpenGL -framework WebKit;
</ins><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
</span><span class="cx"> PRODUCT_NAME = DumpRenderTree;
</span><ins>+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = DumpRenderTreeMain.mm *.ttf *.TTF *.sfont;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeAppxcconfig"></a>
<div class="addfile"><h4>Added: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig (rev 0)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -0,0 +1,36 @@
</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"
+
+OTHER_LDFLAGS_FONTS = -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA HiraMaruMono-W4 fonts/SampleFont.sfont;
+
+OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
+PRODUCT_NAME = DumpRenderTree;
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_macosx = DumpRenderTreeMain.mm;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -27,3 +27,8 @@
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = DumpRenderTree;
</span><span class="cx"> SKIP_INSTALL = YES;
</span><ins>+
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = AccessibilityControllerMac.mm AccessibilityUIElementMac.mm DumpRenderTreeFileDraggingSource.m PixelDumpSupportMac.mm PixelDumpSupportCG.cpp;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+EXCLUDED_SOURCE_FILE_NAMES_macosx = AccessibilityUIElementIOS.mm AccessibilityControllerIOS.mm PixelDumpSupportIOS.mm DumpRenderTreeBrowserView.mm;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsImageDiffxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -23,4 +23,8 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><del>-PRODUCT_NAME = ImageDiff
</del><ins>+PRODUCT_NAME = ImageDiff;
+OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework QuartzCore;
+OTHER_LDFLAGS_iphoneos = -framework CoreFoundation -framework CoreGraphics -framework MobileCoreServices -framework ImageIO;
+OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsLayoutTestHelperxcconfigfromrev162816trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig"></a>
<div class="copfile"><h4>Copied: trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (from rev 162816, trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig) (0 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (rev 0)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</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"
+
+OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsTestNetscapePlugInxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -29,3 +29,6 @@
</span><span class="cx"> INSTALL_PATH = "$(USER_LIBRARY_DIR)/Plugins"
</span><span class="cx"> WARNING_CFLAGS = -Wmost -Wno-four-char-constants -Wno-unknown-pragmas
</span><span class="cx"> LIBRARY_STYLE = BUNDLE
</span><ins>+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *;
+EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> #import "WebCoreTestSupport.h"
</span><span class="cx"> #import "WorkQueue.h"
</span><span class="cx"> #import "WorkQueueItem.h"
</span><del>-#import <Carbon/Carbon.h>
</del><span class="cx"> #import <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #import <JavaScriptCore/HeapStatistics.h>
</span><span class="cx"> #import <JavaScriptCore/Options.h>
</span><span class="lines">@@ -71,7 +70,6 @@
</span><span class="cx"> #import <WebKit/WebDatabaseManagerPrivate.h>
</span><span class="cx"> #import <WebKit/WebDocumentPrivate.h>
</span><span class="cx"> #import <WebKit/WebDeviceOrientationProviderMock.h>
</span><del>-#import <WebKit/WebDynamicScrollBarsView.h>
</del><span class="cx"> #import <WebKit/WebEditingDelegate.h>
</span><span class="cx"> #import <WebKit/WebFrameView.h>
</span><span class="cx"> #import <WebKit/WebHistory.h>
</span><span class="lines">@@ -84,7 +82,6 @@
</span><span class="cx"> #import <WebKit/WebPreferenceKeysPrivate.h>
</span><span class="cx"> #import <WebKit/WebResourceLoadDelegate.h>
</span><span class="cx"> #import <WebKit/WebStorageManagerPrivate.h>
</span><del>-#import <WebKit/WebTypesInternal.h>
</del><span class="cx"> #import <WebKit/WebViewPrivate.h>
</span><span class="cx"> #import <getopt.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="lines">@@ -94,18 +91,60 @@
</span><span class="cx"> #import <wtf/ObjcRuntimeExtras.h>
</span><span class="cx"> #import <wtf/OwnPtr.h>
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+#import <Carbon/Carbon.h>
+#import <WebKit/WebDynamicScrollBarsView.h>
+#endif
+
+#if PLATFORM(IOS)
+#import <CoreGraphics/CGFontDB.h>
+#import <GraphicsServices/GSFont.h>
+#import <QuartzCore/QuartzCore.h>
+#import <UIKit/UIApplication_Private.h>
+#import <UIKit/UIMath.h>
+#import <UIKit/UIWebBrowserView.h>
+#import <UIKit/UIWebScrollView.h>
+#import <WebKit/WAKViewPrivate.h>
+#import <WebKit/WAKWindow.h>
+#import <WebKit/WebCoreThread.h>
+#import <WebKit/WebCoreThreadRun.h>
+#import <WebKit/WebDOMOperations.h>
+#import <fcntl.h>
+#import "DumpRenderTreeBrowserView.h"
+#endif
+
</ins><span class="cx"> extern "C" {
</span><span class="cx"> #import <mach-o/getsect.h>
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> using namespace std;
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> @interface DumpRenderTreeApplication : NSApplication
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DumpRenderTreeEvent : NSEvent
</span><span class="cx"> @end
</span><ins>+#else
+@interface ScrollViewResizerDelegate : NSObject
+@end
</ins><span class="cx">
</span><ins>+@implementation ScrollViewResizerDelegate
+- (void)view:(UIWebDocumentView *)view didSetFrame:(CGRect)newFrame oldFrame:(CGRect)oldFrame asResultOfZoom:(BOOL)wasResultOfZoom
+{
+ UIView *scrollView = [view superview];
+ while (![scrollView isKindOfClass:[UIWebScrollView class]])
+ scrollView = [scrollView superview];
+
+ ASSERT(scrollView && [scrollView isKindOfClass:[UIWebScrollView class]]);
+ const CGSize scrollViewSize = [scrollView bounds].size;
+ CGSize contentSize = newFrame.size;
+ contentSize.height = _ROUNDF_(MAX(CGRectGetMaxY(newFrame), scrollViewSize.height));
+ [(UIWebScrollView *)scrollView setContentSize:contentSize];
+}
+@end
+#endif
+
</ins><span class="cx"> @interface NSURLRequest (PrivateThingsWeShouldntReallyUse)
</span><span class="cx"> +(void)setAllowsAnyHTTPSCertificate:(BOOL)allow forHost:(NSString *)host;
</span><span class="cx"> @end
</span><span class="lines">@@ -150,6 +189,9 @@
</span><span class="cx"> PolicyDelegate *policyDelegate;
</span><span class="cx"> DefaultPolicyDelegate *defaultPolicyDelegate;
</span><span class="cx"> StorageTrackerDelegate *storageDelegate;
</span><ins>+#if PLATFORM(IOS)
+static ScrollViewResizerDelegate *scrollViewResizerDelegate;
+#endif
</ins><span class="cx">
</span><span class="cx"> static int dumpPixelsForAllTests = NO;
</span><span class="cx"> static bool dumpPixelsForCurrentTest = false;
</span><span class="lines">@@ -164,6 +206,17 @@
</span><span class="cx">
</span><span class="cx"> static WebHistoryItem *prevTestBFItem = nil; // current b/f item at the end of the previous test
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+const unsigned phoneViewHeight = 480;
+const unsigned phoneViewWidth = 320;
+const unsigned phoneBrowserScrollViewHeight = 416;
+const unsigned phoneBrowserAddressBarOffset = 60;
+const CGRect layoutTestViewportRect = { {0, 0}, {static_cast<CGFloat>(TestRunner::viewWidth), static_cast<CGFloat>(TestRunner::viewHeight)} };
+UIWebBrowserView *gWebBrowserView = nil;
+UIWebScrollView *gWebScrollView = nil;
+DumpRenderTreeWindow *gDrtWindow = nil;
+#endif
+
</ins><span class="cx"> #ifdef __OBJC2__
</span><span class="cx"> static void swizzleAllMethods(Class imposter, Class original)
</span><span class="cx"> {
</span><span class="lines">@@ -236,6 +289,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> static NSSet *allowedFontFamilySet()
</span><span class="cx"> {
</span><span class="cx"> static NSSet *fontFamilySet = [[NSSet setWithObjects:
</span><span class="lines">@@ -471,7 +525,100 @@
</span><span class="cx"> swizzleNSFontManagerMethods();
</span><span class="cx"> activateTestingFonts();
</span><span class="cx"> }
</span><ins>+#else
+static void activateFontsIOS()
+{
+ static const char* fontSectionNames[] = {
+ "Ahem",
+ "ltcher100",
+ "WeightWatcher200",
+ "WeightWatcher300",
+ "WeightWatcher400",
+ "WeightWatcher500",
+ "WeightWatcher600",
+ "WeightWatcher700",
+ "WeightWatcher800",
+ "WeightWatcher900",
+ 0
+ };
</ins><span class="cx">
</span><ins>+ for (unsigned i = 0; fontSectionNames[i]; ++i) {
+ unsigned long fontDataLength;
+ char* fontData = getsectdata("__DATA", fontSectionNames[i], &fontDataLength);
+ if (!fontData) {
+ fprintf(stderr, "Failed to locate the %s font.\n", fontSectionNames[i]);
+ exit(1);
+ }
+
+ CGDataProviderRef data = CGDataProviderCreateWithData(NULL, fontData, fontDataLength, NULL);
+ if (!data) {
+ fprintf(stderr, "Failed to create CGDataProviderRef for the %s font.\n", fontSectionNames[i]);
+ exit(1);
+ }
+
+ CGFontRef cgFont = CGFontCreateWithDataProvider(data);
+ CGDataProviderRelease(data);
+ if (!cgFont) {
+ fprintf(stderr, "Failed to create CGFontRef for the %s font.\n", fontSectionNames[i]);
+ exit(1);
+ }
+
+ if (!GSFontAddCGFont(cgFont)) {
+ fprintf(stderr, "Failed to add CGFont to GraphicsServices for the %s font.\n", fontSectionNames[i]);
+ exit(1);
+ }
+ CGFontRelease(cgFont);
+ }
+}
+#endif // !PLATFORM(IOS)
+
+
+#if PLATFORM(IOS)
+void adjustWebDocumentForFlexibleViewport(UIWebBrowserView *webBrowserView, UIWebScrollView *scrollView)
+{
+ // These values match MobileSafari's, see -[TabDocument _createDocumentView].
+ [webBrowserView setMinimumScale:0.25f forDocumentTypes:UIEveryDocumentMask];
+ [webBrowserView setMaximumScale:5.0f forDocumentTypes:UIEveryDocumentMask];
+ [webBrowserView setInitialScale:UIWebViewScalesToFitScale forDocumentTypes:UIEveryDocumentMask];
+ [webBrowserView setViewportSize:CGSizeMake(UIWebViewStandardViewportWidth, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:UIEveryDocumentMask];
+
+ // Adjust the viewport view and viewport to have similar behavior
+ // as the browser.
+ [(DumpRenderTreeBrowserView *)webBrowserView setScrollingUsesUIWebScrollView:YES];
+ [webBrowserView setDelegate:scrollViewResizerDelegate];
+
+ CGRect viewportRect = CGRectMake(0, 0, phoneViewWidth, phoneBrowserScrollViewHeight);
+ [scrollView setBounds:viewportRect];
+ [scrollView setFrame:viewportRect];
+
+ [webBrowserView setMinimumSize:viewportRect.size];
+ [webBrowserView setAutoresizes:YES];
+ CGRect browserViewFrame = [webBrowserView frame];
+ browserViewFrame.origin = CGPointMake(0, phoneBrowserAddressBarOffset);
+ [webBrowserView setFrame:browserViewFrame];
+}
+
+void adjustWebDocumentForStandardViewport(UIWebBrowserView *webBrowserView, UIWebScrollView *scrollView)
+{
+ [webBrowserView setMinimumScale:1.0f forDocumentTypes:UIEveryDocumentMask];
+ [webBrowserView setMaximumScale:5.0f forDocumentTypes:UIEveryDocumentMask];
+ [webBrowserView setInitialScale:1.0f forDocumentTypes:UIEveryDocumentMask];
+
+ [(DumpRenderTreeBrowserView *)webBrowserView setScrollingUsesUIWebScrollView:NO];
+ [webBrowserView setDelegate: nil];
+
+ [scrollView setBounds:layoutTestViewportRect];
+ [scrollView setFrame:layoutTestViewportRect];
+
+ [webBrowserView setMinimumSize:layoutTestViewportRect.size];
+ [webBrowserView setAutoresizes:NO];
+ CGRect browserViewFrame = [webBrowserView frame];
+ browserViewFrame.origin = CGPointZero;
+ [webBrowserView setFrame:browserViewFrame];
+}
+#endif
+
+#if !PLATFORM(IOS)
</ins><span class="cx"> @interface DRTMockScroller : NSScroller
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -530,12 +677,20 @@
</span><span class="cx"> {
</span><span class="cx"> [WebDynamicScrollBarsView setCustomScrollerClass:[DRTMockScroller class]];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> WebView *createWebViewAndOffscreenWindow()
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSRect rect = NSMakeRect(0, 0, TestRunner::viewWidth, TestRunner::viewHeight);
</span><span class="cx"> WebView *webView = [[WebView alloc] initWithFrame:rect frameName:nil groupName:@"org.webkit.DumpRenderTree"];
</span><del>-
</del><ins>+#else
+ UIWebBrowserView *webBrowserView = [[[DumpRenderTreeBrowserView alloc] initWithFrame:layoutTestViewportRect] autorelease];
+
+ WebView *webView = [[webBrowserView webView] retain];
+ [webView setGroupName:@"org.webkit.DumpRenderTree"];
+#endif
+
</ins><span class="cx"> [webView setUIDelegate:uiDelegate];
</span><span class="cx"> [webView setFrameLoadDelegate:frameLoadDelegate];
</span><span class="cx"> [webView setEditingDelegate:editingDelegate];
</span><span class="lines">@@ -549,6 +704,7 @@
</span><span class="cx"> [WebView registerURLSchemeAsLocal:@"feeds"];
</span><span class="cx"> [WebView registerURLSchemeAsLocal:@"feedsearch"];
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [webView setContinuousSpellCheckingEnabled:YES];
</span><span class="cx"> [webView setAutomaticQuoteSubstitutionEnabled:NO];
</span><span class="cx"> [webView setAutomaticLinkDetectionEnabled:NO];
</span><span class="lines">@@ -573,12 +729,49 @@
</span><span class="cx"> [window setAutodisplay:NO];
</span><span class="cx">
</span><span class="cx"> [window startListeningForAcceleratedCompositingChanges];
</span><ins>+#else
+ DumpRenderTreeWindow *drtWindow = [[DumpRenderTreeWindow alloc] initWithLayer:[webBrowserView layer]];
+ [drtWindow setContentView:webView];
+ [webBrowserView setWAKWindow:drtWindow];
+
+ [[webView window] makeFirstResponder:[[[webView mainFrame] frameView] documentView]];
+
+ CGRect uiWindowRect = layoutTestViewportRect;
+ uiWindowRect.origin.y += [UIApp statusBarHeight];
+ UIWindow *uiWindow = [[[UIWindow alloc] initWithFrame:uiWindowRect] autorelease];
+
+ // The UIWindow and UIWebBrowserView are released when the DumpRenderTreeWindow is closed.
+ drtWindow.uiWindow = uiWindow;
+ drtWindow.browserView = webBrowserView;
+
+ UIWebScrollView *scrollView = [[UIWebScrollView alloc] initWithFrame:layoutTestViewportRect];
+ [scrollView addSubview:webBrowserView];
+
+ [uiWindow addSubview:scrollView];
+ [scrollView release];
+
+ adjustWebDocumentForStandardViewport(webBrowserView, scrollView);
+#endif
</ins><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> // For reasons that are not entirely clear, the following pair of calls makes WebView handle its
</span><span class="cx"> // dynamic scrollbars properly. Without it, every frame will always have scrollbars.
</span><span class="cx"> NSBitmapImageRep *imageRep = [webView bitmapImageRepForCachingDisplayInRect:[webView bounds]];
</span><span class="cx"> [webView cacheDisplayInRect:[webView bounds] toBitmapImageRep:imageRep];
</span><del>-
</del><ins>+#else
+ [[webView mainFrame] _setVisibleSize:CGSizeMake(phoneViewWidth, phoneViewHeight)];
+ [[webView preferences] _setTelephoneNumberParsingEnabled:NO];
+
+ // Initialize the global UIViews, and set the key UIWindow to be painted.
+ if (!gWebBrowserView) {
+ gWebBrowserView = [webBrowserView retain];
+ gWebScrollView = [scrollView retain];
+ gDrtWindow = [drtWindow retain];
+ [uiWindow makeKeyAndVisible];
+ [uiWindow retain];
+ }
+#endif
+
</ins><span class="cx"> return webView;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -615,14 +808,20 @@
</span><span class="cx"> [preferences setJavaEnabled:NO];
</span><span class="cx"> [preferences setJavaScriptEnabled:YES];
</span><span class="cx"> [preferences setEditableLinkBehavior:WebKitEditableLinkOnlyLiveWithShiftKey];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [preferences setTabsToLinks:NO];
</span><ins>+#endif
</ins><span class="cx"> [preferences setDOMPasteAllowed:YES];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [preferences setShouldPrintBackgrounds:YES];
</span><ins>+#endif
</ins><span class="cx"> [preferences setCacheModel:WebCacheModelDocumentBrowser];
</span><span class="cx"> [preferences setXSSAuditorEnabled:NO];
</span><span class="cx"> [preferences setExperimentalNotificationsEnabled:NO];
</span><span class="cx"> [preferences setPlugInsEnabled:YES];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [preferences setTextAreasAreResizable:YES];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> [preferences setPrivateBrowsingEnabled:NO];
</span><span class="cx"> [preferences setAuthorAndUserStylesEnabled:YES];
</span><span class="lines">@@ -640,7 +839,15 @@
</span><span class="cx"> [preferences setUserStyleSheetEnabled:YES];
</span><span class="cx"> } else
</span><span class="cx"> [preferences setUserStyleSheetEnabled:NO];
</span><ins>+#if PLATFORM(IOS)
+ [preferences setMediaPlaybackAllowsInline:YES];
+ [preferences setMediaPlaybackRequiresUserGesture:NO];
</ins><span class="cx">
</span><ins>+ // Enable the tracker before creating the first WebView will
+ // cause initialization to use the correct database paths.
+ [preferences setStorageTrackerEnabled:YES];
+#endif
+
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> // Disable text autosizing by default.
</span><span class="cx"> [preferences _setMinimumZoomFontSize:0];
</span><span class="lines">@@ -666,6 +873,11 @@
</span><span class="cx"> [preferences setWebAudioEnabled:YES];
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(IOS_TEXT_AUTOSIZING)
+ // Disable text autosizing by default.
+ [preferences _setMinimumZoomFontSize:0];
+#endif
+
</ins><span class="cx"> [preferences setScreenFontSubstitutionEnabled:YES];
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="lines">@@ -678,6 +890,10 @@
</span><span class="cx"> // Called once on DumpRenderTree startup.
</span><span class="cx"> static void setDefaultsToConsistentValuesForTesting()
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ WebThreadLock();
+#endif
+
</ins><span class="cx"> static const int NoFontSmoothing = 0;
</span><span class="cx"> static const int BlueTintedAppearance = 1;
</span><span class="cx">
</span><span class="lines">@@ -695,6 +911,7 @@
</span><span class="cx"> WebKitEnableFullDocumentTeardownPreferenceKey: @YES,
</span><span class="cx"> WebKitFullScreenEnabledPreferenceKey: @YES,
</span><span class="cx"> @"UseWebKitWebInspector": @YES,
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> @"NSTestCorrectionDictionary": @{
</span><span class="cx"> @"notationl": @"notational",
</span><span class="cx"> @"mesage": @"message",
</span><span class="lines">@@ -702,9 +919,12 @@
</span><span class="cx"> @"wellcome": @"welcome",
</span><span class="cx"> @"hellolfworld": @"hello\nworld"
</span><span class="cx"> },
</span><ins>+#endif
</ins><span class="cx"> @"WebKitKerningAndLigaturesEnabledByDefault": @NO,
</span><span class="cx"> @"AppleScrollBarVariant": @"DoubleMax",
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> @"NSScrollAnimationEnabled": @NO,
</span><ins>+#endif
</ins><span class="cx"> @"NSOverlayScrollersEnabled": @NO,
</span><span class="cx"> @"AppleShowScrollBars": @"Always",
</span><span class="cx"> WebDatabaseDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"Databases"],
</span><span class="lines">@@ -757,6 +977,9 @@
</span><span class="cx"> historyDelegate = [[HistoryDelegate alloc] init];
</span><span class="cx"> storageDelegate = [[StorageTrackerDelegate alloc] init];
</span><span class="cx"> defaultPolicyDelegate = [[DefaultPolicyDelegate alloc] init];
</span><ins>+#if PLATFORM(IOS)
+ scrollViewResizerDelegate = [[ScrollViewResizerDelegate alloc] init];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ObjC++ doens't seem to let me pass NSObject*& sadly.
</span><span class="lines">@@ -775,6 +998,9 @@
</span><span class="cx"> releaseAndZero(&uiDelegate);
</span><span class="cx"> releaseAndZero(&policyDelegate);
</span><span class="cx"> releaseAndZero(&storageDelegate);
</span><ins>+#if PLATFORM(IOS)
+ releaseAndZero(&scrollViewResizerDelegate);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void initializeGlobalsFromCommandLineOptions(int argc, const char *argv[])
</span><span class="lines">@@ -804,9 +1030,11 @@
</span><span class="cx">
</span><span class="cx"> static void addTestPluginsToPluginSearchPath(const char* executablePath)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSString *pwd = [[NSString stringWithUTF8String:executablePath] stringByDeletingLastPathComponent];
</span><span class="cx"> [WebPluginDatabase setAdditionalWebPlugInPaths:[NSArray arrayWithObject:pwd]];
</span><span class="cx"> [[WebPluginDatabase sharedDatabase] refresh];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool useLongRunningServerMode(int argc, const char *argv[])
</span><span class="lines">@@ -834,11 +1062,17 @@
</span><span class="cx">
</span><span class="cx"> static void prepareConsistentTestingEnvironment()
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> poseAsClass("DumpRenderTreePasteboard", "NSPasteboard");
</span><span class="cx"> poseAsClass("DumpRenderTreeEvent", "NSEvent");
</span><ins>+#else
+ poseAsClass("DumpRenderTreeEvent", "GSEvent");
+#endif
</ins><span class="cx">
</span><span class="cx"> [[WebPreferences standardPreferences] setAutosaves:NO];
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> // FIXME: We'd like to start with a clean state for every test, but this function can't be used more than once yet.
</span><span class="cx"> [WebPreferences _switchNetworkLoaderToNewTestingSession];
</span><span class="cx">
</span><span class="lines">@@ -851,12 +1085,15 @@
</span><span class="cx">
</span><span class="cx"> adjustFonts();
</span><span class="cx"> registerMockScrollbars();
</span><ins>+#else
+ activateFontsIOS();
+#endif
</ins><span class="cx">
</span><span class="cx"> allocateGlobalControllers();
</span><span class="cx">
</span><span class="cx"> makeLargeMallocFailSilently();
</span><span class="cx">
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><ins>+#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> NSActivityOptions options = (NSActivityUserInitiatedAllowingIdleSystemSleep | NSActivityLatencyCritical) & ~(NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled);
</span><span class="cx"> static id assertion = [[[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"DumpRenderTree should not be subject to process suppression"] retain];
</span><span class="cx"> ASSERT_UNUSED(assertion, assertion);
</span><span class="lines">@@ -865,6 +1102,15 @@
</span><span class="cx">
</span><span class="cx"> void dumpRenderTree(int argc, const char *argv[])
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ int infd = open("/tmp/DumpRenderTree_IN", O_RDWR);
+ dup2(infd, STDIN_FILENO);
+ int outfd = open("/tmp/DumpRenderTree_OUT", O_RDWR);
+ dup2(outfd, STDOUT_FILENO);
+ int errfd = open("/tmp/DumpRenderTree_ERROR", O_RDWR | O_NONBLOCK);
+ dup2(errfd, STDERR_FILENO);
+#endif
+
</ins><span class="cx"> initializeGlobalsFromCommandLineOptions(argc, argv);
</span><span class="cx"> prepareConsistentTestingEnvironment();
</span><span class="cx"> addTestPluginsToPluginSearchPath(argv[0]);
</span><span class="lines">@@ -903,10 +1149,13 @@
</span><span class="cx"> if (threaded)
</span><span class="cx"> stopJavaScriptThreads();
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSWindow *window = [webView window];
</span><ins>+#endif
</ins><span class="cx"> [webView close];
</span><span class="cx"> mainFrame = nil;
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> // Work around problem where registering drag types leaves an outstanding
</span><span class="cx"> // "perform selector" on the window, which retains the window. It's a bit
</span><span class="cx"> // inelegant and perhaps dangerous to just blow them all away, but in practice
</span><span class="lines">@@ -914,28 +1163,111 @@
</span><span class="cx"> [NSObject cancelPreviousPerformRequestsWithTarget:window];
</span><span class="cx">
</span><span class="cx"> [window close]; // releases when closed
</span><ins>+#else
+ UIWindow *uiWindow = [gWebBrowserView window];
+ [uiWindow removeFromSuperview];
+ [uiWindow release];
+#endif
+
</ins><span class="cx"> [webView release];
</span><span class="cx">
</span><span class="cx"> releaseGlobalControllers();
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [DumpRenderTreePasteboard releaseLocalPasteboards];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // FIXME: This should be moved onto TestRunner and made into a HashSet
</span><span class="cx"> if (disallowedURLs) {
</span><span class="cx"> CFRelease(disallowedURLs);
</span><span class="cx"> disallowedURLs = 0;
</span><span class="cx"> }
</span><ins>+
+#if PLATFORM(IOS)
+ close(infd);
+ close(outfd);
+ close(errfd);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+static int _argc;
+static const char **_argv;
+
+@implementation DumpRenderTree
+
+- (void)_runDumpRenderTree
+{
+ dumpRenderTree(_argc, _argv);
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+ [self performSelectorOnMainThread:@selector(_runDumpRenderTree) withObject:nil waitUntilDone:NO];
+}
+
+- (void)_deferDumpToMainThread
+{
+ ASSERT(WebThreadIsCurrent());
+
+ dispatch_async(dispatch_get_main_queue(), ^{
+ dump();
+ });
+}
+
+- (void)_webThreadEventLoopHasRun
+{
+ ASSERT(!WebThreadIsCurrent());
+ _hasFlushedWebThreadRunQueue = YES;
+}
+
+- (void)_webThreadInvoked
+{
+ ASSERT(WebThreadIsCurrent());
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self _webThreadEventLoopHasRun];
+ });
+}
+
+// The test can end in response to a delegate callback while there are still methods queued on the Web Thread.
+// If we do not ensure the Web Thread has been run, the callback can be done on a WebView that no longer exists.
+// To avoid this, _waitForWebThread dispatches a call to the WebThread event loop, actively processing the delegate
+// callbacks in the main thread while waiting for the call to be invoked on the Web Thread.
+- (void)_waitForWebThread
+{
+ ASSERT(!WebThreadIsCurrent());
+ _hasFlushedWebThreadRunQueue = NO;
+ WebThreadRun(^{
+ [self _webThreadInvoked];
+ });
+ while (!_hasFlushedWebThreadRunQueue) {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
+ [pool release];
+ }
+}
+
+@end
+#endif
+
</ins><span class="cx"> int DumpRenderTreeMain(int argc, const char *argv[])
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ _UIApplicationLoadWebKit();
+#endif
</ins><span class="cx"> NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx">
</span><span class="cx"> setDefaultsToConsistentValuesForTesting(); // Must be called before NSApplication initialization.
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [DumpRenderTreeApplication sharedApplication]; // Force AppKit to init itself
</span><span class="cx">
</span><span class="cx"> dumpRenderTree(argc, argv);
</span><ins>+#else
+ _argc = argc;
+ _argv = argv;
+ UIApplicationMain(argc, (char**)argv, @"DumpRenderTree", nil);
+#endif
</ins><span class="cx"> [WebCoreStatistics garbageCollectJavaScriptObjects];
</span><span class="cx"> [WebCoreStatistics emptyCache]; // Otherwise SVGImages trigger false positives for Frame/Node counts
</span><span class="cx"> if (JSC::Options::logHeapStatisticsAtExit())
</span><span class="lines">@@ -1038,6 +1370,7 @@
</span><span class="cx">
</span><span class="cx"> static NSData *dumpFrameAsPDF(WebFrame *frame)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -1067,6 +1400,9 @@
</span><span class="cx"> [[NSFileManager defaultManager] removeFileAtPath:path handler:nil];
</span><span class="cx">
</span><span class="cx"> return pdfData;
</span><ins>+#else
+ return nil;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void dumpBackForwardListForWebView(WebView *view)
</span><span class="lines">@@ -1133,7 +1469,12 @@
</span><span class="cx"> unsigned count = CFArrayGetCount(openWindows);
</span><span class="cx"> for (unsigned i = 0; i < count; i++) {
</span><span class="cx"> NSWindow *window = (NSWindow *)CFArrayGetValueAtIndex(openWindows, i);
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> WebView *webView = [[[window contentView] subviews] objectAtIndex:0];
</span><ins>+#else
+ ASSERT([[window contentView] isKindOfClass:[WebView class]]);
+ WebView *webView = (WebView *)[window contentView];
+#endif
</ins><span class="cx"> dumpBackForwardListForWebView(webView);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1162,6 +1503,15 @@
</span><span class="cx">
</span><span class="cx"> void dump()
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ // This can get called on the web thread if from a JavaScript notifyDone().
+ if (WebThreadIsCurrent()) {
+ [(DumpRenderTree *)UIApp _deferDumpToMainThread];
+ return;
+ }
+ WebThreadLock();
+#endif
+
</ins><span class="cx"> invalidateAnyPreviousWaitToDumpWatchdog();
</span><span class="cx"> ASSERT(!gTestRunner->hasPendingWebNotificationClick());
</span><span class="cx">
</span><span class="lines">@@ -1264,25 +1614,43 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+static bool shouldMakeViewportFlexible(const char* pathOrURL)
+{
+ return strstr(pathOrURL, "viewport/");
+}
+#endif
+
</ins><span class="cx"> static void resetWebViewToConsistentStateBeforeTesting()
</span><span class="cx"> {
</span><span class="cx"> WebView *webView = [mainFrame webView];
</span><ins>+#if PLATFORM(IOS)
+ adjustWebDocumentForStandardViewport(gWebBrowserView, gWebScrollView);
+ [webView _setAllowsMessaging:YES];
+ [mainFrame setMediaDataLoadsAutomatically:YES];
+#endif
</ins><span class="cx"> [webView setEditable:NO];
</span><span class="cx"> [(EditingDelegate *)[webView editingDelegate] setAcceptsEditing:YES];
</span><span class="cx"> [webView makeTextStandardSize:nil];
</span><span class="cx"> [webView resetPageZoom:nil];
</span><span class="cx"> [webView _scaleWebView:1.0 atOrigin:NSZeroPoint];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [webView _setCustomBackingScaleFactor:0];
</span><ins>+#endif
</ins><span class="cx"> [webView setTabKeyCyclesThroughElements:YES];
</span><span class="cx"> [webView setPolicyDelegate:defaultPolicyDelegate];
</span><span class="cx"> [policyDelegate setPermissive:NO];
</span><span class="cx"> [policyDelegate setControllerToNotifyDone:0];
</span><span class="cx"> [frameLoadDelegate resetToConsistentState];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [webView _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:NO];
</span><ins>+#endif
</ins><span class="cx"> [webView _clearMainFrameName];
</span><span class="cx"> [[webView undoManager] removeAllActions];
</span><span class="cx"> [WebView _removeAllUserContentFromGroup:[webView groupName]];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[webView window] setAutodisplay:NO];
</span><ins>+#endif
</ins><span class="cx"> [webView setTracksRepaints:NO];
</span><span class="cx">
</span><span class="cx"> resetWebPreferencesToConsistentValues();
</span><span class="lines">@@ -1297,6 +1665,7 @@
</span><span class="cx"> gTestRunner->removeChromeInputField();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [webView setContinuousSpellCheckingEnabled:YES];
</span><span class="cx"> [webView setAutomaticQuoteSubstitutionEnabled:NO];
</span><span class="cx"> [webView setAutomaticLinkDetectionEnabled:NO];
</span><span class="lines">@@ -1306,18 +1675,46 @@
</span><span class="cx"> [webView setGrammarCheckingEnabled:YES];
</span><span class="cx">
</span><span class="cx"> [WebView _setUsesTestModeFocusRingColor:YES];
</span><ins>+#endif
</ins><span class="cx"> [WebView _resetOriginAccessWhitelists];
</span><span class="cx"> [WebView _setAllowsRoundingHacks:NO];
</span><span class="cx">
</span><span class="cx"> [[MockGeolocationProvider shared] stopTimer];
</span><span class="cx"> [[MockWebNotificationProvider shared] reset];
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> // Clear the contents of the general pasteboard
</span><span class="cx"> [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> [mainFrame _clearOpener];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+// Work around <rdar://problem/9909073> WebKit's method of calling delegates on
+// the main thread is not thread safe. If the web thread is attempting to call
+// out to a delegate method on the main thread, we want to spin the main thread
+// run loop until the delegate method completes before taking the web thread
+// lock to prevent potentially re-entering WebCore.
+static void WebThreadLockAfterDelegateCallbacksHaveCompleted()
+{
+ dispatch_semaphore_t delegateSemaphore = dispatch_semaphore_create(0);
+ WebThreadRun(^{
+ dispatch_semaphore_signal(delegateSemaphore);
+ });
+
+ while (dispatch_semaphore_wait(delegateSemaphore, DISPATCH_TIME_NOW)) {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
+ [pool release];
+ }
+
+ WebThreadLock();
+
+ dispatch_release(delegateSemaphore);
+}
+#endif
+
</ins><span class="cx"> static void runTest(const string& inputLine)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!inputLine.empty());
</span><span class="lines">@@ -1348,8 +1745,10 @@
</span><span class="cx">
</span><span class="cx"> gTestRunner = TestRunner::create(testURL, command.expectedPixelHash);
</span><span class="cx"> topLoadingFrame = nil;
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> ASSERT(!draggingInfo); // the previous test should have called eventSender.mouseUp to drop!
</span><span class="cx"> releaseAndZero(&draggingInfo);
</span><ins>+#endif
</ins><span class="cx"> done = NO;
</span><span class="cx">
</span><span class="cx"> sizeWebViewForCurrentTest();
</span><span class="lines">@@ -1375,6 +1774,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ if (shouldMakeViewportFlexible(pathOrURL.c_str()))
+ adjustWebDocumentForFlexibleViewport(gWebBrowserView, gWebScrollView);
+#endif
+
</ins><span class="cx"> if ([WebHistory optionalSharedHistory])
</span><span class="cx"> [WebHistory setOptionalSharedHistory:nil];
</span><span class="cx"> lastMousePosition = NSZeroPoint;
</span><span class="lines">@@ -1400,6 +1804,10 @@
</span><span class="cx"> [pool release];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ [(DumpRenderTree *)UIApp _waitForWebThread];
+ WebThreadLockAfterDelegateCallbacksHaveCompleted();
+#endif
</ins><span class="cx"> pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx"> [EventSendingController clearSavedEvents];
</span><span class="cx"> [[mainFrame webView] setSelectedDOMRange:nil affinity:NSSelectionAffinityDownstream];
</span><span class="lines">@@ -1417,7 +1825,12 @@
</span><span class="cx"> if (window == [[mainFrame webView] window])
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> WebView *webView = [[[window contentView] subviews] objectAtIndex:0];
</span><ins>+#else
+ ASSERT([[window contentView] isKindOfClass:[WebView class]]);
+ WebView *webView = (WebView *)[window contentView];
+#endif
</ins><span class="cx">
</span><span class="cx"> [webView close];
</span><span class="cx"> [window close];
</span><span class="lines">@@ -1453,13 +1866,21 @@
</span><span class="cx">
</span><span class="cx"> void displayWebView()
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> WebView *webView = [mainFrame webView];
</span><span class="cx"> [webView display];
</span><span class="cx">
</span><span class="cx"> [webView setTracksRepaints:YES];
</span><span class="cx"> [webView resetTrackedRepaints];
</span><ins>+#else
+ // FIXME: <rdar://problem/5106253> DumpRenderTree: fix DRT and ImageDiff to re-enable pixel tests
+ [gDrtWindow layoutTilesNow];
+ [gDrtWindow setNeedsDisplayInRect:[gDrtWindow frame]];
+ [CATransaction flush];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> @implementation DumpRenderTreeEvent
</span><span class="cx">
</span><span class="cx"> + (NSPoint)mouseLocation
</span><span class="lines">@@ -1478,3 +1899,4 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+#endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeDraggingInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx">
</span><span class="cx"> @interface DumpRenderTreeDraggingInfo : NSObject <NSDraggingInfo> {
</span><span class="lines">@@ -51,3 +53,4 @@
</span><span class="cx"> - (NSArray *)namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeDraggingInfomm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "DumpRenderTreeDraggingInfo.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import "DumpRenderTree.h"
</span><span class="cx"> #import "EventSendingController.h"
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><span class="lines">@@ -142,3 +144,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#endif // !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeMach"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -30,7 +30,11 @@
</span><span class="cx"> #define DumpRenderTreeMac_h
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><ins>+#if PLATFORM(IOS) && defined(__OBJC__)
+#import <UIKit/UIKit.h>
+#endif
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> @class DefaultPolicyDelegate;
</span><span class="cx"> @class DumpRenderTreeDraggingInfo;
</span><span class="lines">@@ -69,6 +73,19 @@
</span><span class="cx">
</span><span class="cx"> unsigned worldIDForWorld(WebScriptWorld *);
</span><span class="cx">
</span><ins>+
+#if PLATFORM(IOS) && defined(__OBJC__)
+@interface DumpRenderTree : UIApplication {
+ BOOL _hasFlushedWebThreadRunQueue;
+}
+
+- (void)_waitForWebThread;
+@end
+
+@class UIWebBrowserView;
+extern UIWebBrowserView *gWebBrowserView;
+#endif
+
</ins><span class="cx"> int DumpRenderTreeMain(int, const char *[]);
</span><span class="cx">
</span><span class="cx"> #endif // DumpRenderTreeMac_h
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreePasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #import <WebKit/WebTypesInternal.h>
</span><span class="cx">
</span><span class="lines">@@ -36,3 +38,4 @@
</span><span class="cx"> + (void)releaseLocalPasteboards;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreePasteboardm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.m (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.m 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreePasteboard.m 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #import "DumpRenderTreeMac.h"
</span><span class="cx"> #import "DumpRenderTreePasteboard.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import <WebKit/WebTypesInternal.h>
</span><span class="cx">
</span><span class="cx"> @interface LocalPasteboard : NSPasteboard
</span><span class="lines">@@ -212,3 +214,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif // !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -28,7 +28,13 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> #import <AppKit/AppKit.h>
</span><ins>+#else
+#import <UIKit/UIKit.h>
+#import <UIKit/UIWebBrowserView.h>
+#import <WebKit/WAKWindow.h>
+#endif
</ins><span class="cx">
</span><span class="cx"> @class WebView;
</span><span class="cx">
</span><span class="lines">@@ -36,6 +42,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+@property (nonatomic, retain) UIWindow *uiWindow;
+@property (nonatomic, retain) UIWebBrowserView *browserView;
+#endif
+
</ins><span class="cx"> // I'm not sure why we can't just use [NSApp windows]
</span><span class="cx"> + (NSArray *)openWindows;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreeWindowmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeWindow.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -36,8 +36,11 @@
</span><span class="cx"> // FIXME: This file is ObjC++ only because of this include. :(
</span><span class="cx"> #import "TestRunner.h"
</span><span class="cx"> #import <WebKit/WebViewPrivate.h>
</span><del>-#import <WebKit/WebTypesInternal.h>
</del><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import <QuartzCore/CALayer.h>
+#endif
+
</ins><span class="cx"> CFMutableArrayRef openWindowsRef = 0;
</span><span class="cx">
</span><span class="cx"> static CFArrayCallBacks NonRetainingArrayCallbacks = {
</span><span class="lines">@@ -50,21 +53,47 @@
</span><span class="cx">
</span><span class="cx"> @implementation DumpRenderTreeWindow
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+@synthesize uiWindow = _uiWindow;
+@synthesize browserView = _browserView;
+#endif
+
</ins><span class="cx"> + (NSArray *)openWindows
</span><span class="cx"> {
</span><span class="cx"> return [[(NSArray *)openWindowsRef copy] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
</del><ins>+- (void)_addToOpenWindows
</ins><span class="cx"> {
</span><span class="cx"> if (!openWindowsRef)
</span><span class="cx"> openWindowsRef = CFArrayCreateMutable(NULL, 0, &NonRetainingArrayCallbacks);
</span><span class="cx">
</span><span class="cx"> CFArrayAppendValue(openWindowsRef, self);
</span><del>-
</del><ins>+}
+
+#if !PLATFORM(IOS)
+- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
+{
+ [self _addToOpenWindows];
</ins><span class="cx"> return [super initWithContentRect:contentRect styleMask:styleMask backing:bufferingType defer:deferCreation];
</span><span class="cx"> }
</span><ins>+#else
+- (id)initWithLayer:(CALayer *)layer
+{
+ if ((self = [super initWithLayer:layer]))
+ [self _addToOpenWindows];
</ins><span class="cx">
</span><ins>+ return self;
+}
+
+- (void)dealloc
+{
+ ASSERT(!_browserView);
+ ASSERT(!_uiWindow);
+ [super dealloc];
+}
+#endif
+
</ins><span class="cx"> - (void)close
</span><span class="cx"> {
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self];
</span><span class="lines">@@ -75,6 +104,18 @@
</span><span class="cx"> CFArrayRemoveValueAtIndex(openWindowsRef, i);
</span><span class="cx">
</span><span class="cx"> [super close];
</span><ins>+
+#if PLATFORM(IOS)
+ // By default, NSWindows are released when closed. On iOS we do
+ // it manually, and release the UIWindow and UIWebBrowserView.
+ if (_uiWindow) {
+ [_uiWindow release];
+ _uiWindow = nil;
+ [_browserView release];
+ _browserView = nil;
+ [self release];
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isKeyWindow
</span><span class="lines">@@ -87,14 +128,17 @@
</span><span class="cx"> return [self isKeyWindow];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> - (void)keyDown:(NSEvent *)event
</span><span class="cx"> {
</span><span class="cx"> // Do nothing, avoiding the beep we'd otherwise get from NSResponder,
</span><span class="cx"> // once we get to the end of the responder chain.
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (WebView *)webView
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSView *firstView = nil;
</span><span class="cx"> if ([[[self contentView] subviews] count] > 0) {
</span><span class="cx"> firstView = [[[self contentView] subviews] objectAtIndex:0];
</span><span class="lines">@@ -102,6 +146,10 @@
</span><span class="cx"> return static_cast<WebView *>(firstView);
</span><span class="cx"> }
</span><span class="cx"> return nil;
</span><ins>+#else
+ ASSERT([[self contentView] isKindOfClass:[WebView class]]);
+ return (WebView *)[self contentView];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)startListeningForAcceleratedCompositingChanges
</span><span class="lines">@@ -113,11 +161,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)webViewStartedAcceleratedCompositing:(NSNotification *)notification
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> // If the WebView has gone into compositing mode, turn on window autodisplay. This is necessary for CA
</span><span class="cx"> // to update layers and start animations.
</span><span class="cx"> // We only ever turn autodisplay on here, because we turn it off before every test.
</span><span class="cx"> if ([[self webView] _isUsingAcceleratedCompositing])
</span><span class="cx"> [self setAutodisplay:YES];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacEditingDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/EditingDelegate.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/EditingDelegate.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/EditingDelegate.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><span class="cx"> @interface EditingDelegate : NSObject
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacEventSendingControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/EventSendingController.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><del>-
-#import <Cocoa/Cocoa.h>
</del><ins>+
+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <WebKit/WebKit.h>
</span><span class="cx">
</span><span class="cx"> @interface EventSendingController : NSObject <DOMEventListener>
</span><span class="lines">@@ -37,6 +37,11 @@
</span><span class="cx"> NSTimeInterval lastClick;
</span><span class="cx"> int eventNumber;
</span><span class="cx"> double timeOffset;
</span><ins>+#if PLATFORM(IOS)
+ NSMutableArray* touches;
+ unsigned currentTouchIdentifier;
+ unsigned nextEventFlags;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)saveEvent:(NSInvocation *)event;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacEventSendingControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -36,16 +36,29 @@
</span><span class="cx"> #import "DumpRenderTreeDraggingInfo.h"
</span><span class="cx"> #import "DumpRenderTreeFileDraggingSource.h"
</span><span class="cx">
</span><del>-#import <Carbon/Carbon.h> // for GetCurrentEventTime()
</del><span class="cx"> #import <WebKit/DOMPrivate.h>
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><span class="cx"> #import <WebKit/WebViewPrivate.h>
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+#import <Carbon/Carbon.h> // for GetCurrentEventTime()
+#endif
+
+#if PLATFORM(IOS)
+#import <GraphicsServices/GraphicsServices.h> // for GSCurrentEventTimestamp()
+#import <WebKit/KeyEventCodesIOS.h>
+#import <WebKit/WAKWindow.h>
+#import <WebKit/WebEvent.h>
+#import <UIKit/UIKit.h>
+#endif
+
+#if !PLATFORM(IOS)
</ins><span class="cx"> extern "C" void _NSNewKillRingSequence();
</span><span class="cx">
</span><span class="cx"> @interface NSApplication (Details)
</span><span class="cx"> - (void)_setCurrentEvent:(NSEvent *)event;
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> enum MouseAction {
</span><span class="cx"> MouseDown,
</span><span class="lines">@@ -75,6 +88,46 @@
</span><span class="cx"> NSMutableArray *savedMouseEvents; // mouse events sent between mouseDown and mouseUp are stored here, and then executed at once.
</span><span class="cx"> BOOL replayingSavedEvents;
</span><span class="cx">
</span><ins>+
+#if PLATFORM(IOS)
+@interface SyntheticTouch : NSObject {
+@public
+ CGPoint _location;
+ UITouchPhase _phase;
+ unsigned _identifier;
+};
+
+@property (nonatomic) CGPoint location;
+@property (nonatomic) UITouchPhase phase;
+@property (nonatomic) unsigned identifier;
+
++ (id)touchWithLocation:(CGPoint)location phase:(UITouchPhase)phase identifier:(unsigned)identifier;
+- (id)initWithLocation:(CGPoint)location phase:(UITouchPhase)phase identifier:(unsigned)identifier;
+@end
+
+@implementation SyntheticTouch
+
+@synthesize location = _location;
+@synthesize phase = _phase;
+@synthesize identifier = _identifier;
+
++ (id)touchWithLocation:(CGPoint)location phase:(UITouchPhase)phase identifier:(unsigned)identifier
+{
+ return [[[SyntheticTouch alloc] initWithLocation:location phase:phase identifier:identifier] autorelease];
+}
+
+- (id)initWithLocation:(CGPoint)location phase:(UITouchPhase)phase identifier:(unsigned)identifier
+{
+ if ((self = [super init])) {
+ _location = location;
+ _phase = phase;
+ _identifier = identifier;
+ }
+ return self;
+}
+@end // SyntheticTouch
+#endif
+
</ins><span class="cx"> @implementation EventSendingController
</span><span class="cx">
</span><span class="cx"> + (void)initialize
</span><span class="lines">@@ -149,7 +202,21 @@
</span><span class="cx"> || aSelector == @selector(zoomPageOut)
</span><span class="cx"> || aSelector == @selector(scalePageBy:atX:andY:)
</span><span class="cx"> || aSelector == @selector(mouseScrollByX:andY:)
</span><del>- || aSelector == @selector(continuousMouseScrollByX:andY:))
</del><ins>+ || aSelector == @selector(continuousMouseScrollByX:andY:)
+#if PLATFORM(IOS)
+ || aSelector == @selector(addTouchAtX:y:)
+ || aSelector == @selector(updateTouchAtIndex:x:y:)
+ || aSelector == @selector(cancelTouchAtIndex:)
+ || aSelector == @selector(clearTouchPoints)
+ || aSelector == @selector(markAllTouchesAsStationary)
+ || aSelector == @selector(releaseTouchAtIndex:)
+ || aSelector == @selector(setTouchModifier:value:)
+ || aSelector == @selector(touchStart)
+ || aSelector == @selector(touchMove)
+ || aSelector == @selector(touchEnd)
+ || aSelector == @selector(touchCancel)
+#endif
+ )
</ins><span class="cx"> return NO;
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="lines">@@ -191,6 +258,30 @@
</span><span class="cx"> return @"continuousMouseScrollBy";
</span><span class="cx"> if (aSelector == @selector(scalePageBy:atX:andY:))
</span><span class="cx"> return @"scalePageBy";
</span><ins>+#if PLATFORM(IOS)
+ if (aSelector == @selector(addTouchAtX:y:))
+ return @"addTouchPoint";
+ if (aSelector == @selector(updateTouchAtIndex:x:y:))
+ return @"updateTouchPoint";
+ if (aSelector == @selector(cancelTouchAtIndex:))
+ return @"cancelTouchPoint";
+ if (aSelector == @selector(clearTouchPoints))
+ return @"clearTouchPoints";
+ if (aSelector == @selector(markAllTouchesAsStationary))
+ return @"markAllTouchesAsStationary";
+ if (aSelector == @selector(releaseTouchAtIndex:))
+ return @"releaseTouchPoint";
+ if (aSelector == @selector(setTouchModifier:value:))
+ return @"setTouchModifier";
+ if (aSelector == @selector(touchStart))
+ return @"touchStart";
+ if (aSelector == @selector(touchMove))
+ return @"touchMove";
+ if (aSelector == @selector(touchEnd))
+ return @"touchEnd";
+ if (aSelector == @selector(touchCancel))
+ return @"touchCancel";
+#endif
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -204,12 +295,19 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ [touches release];
+#endif
</ins><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)currentEventTime
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> return GetCurrentEventTime() + timeOffset;
</span><ins>+#else
+ return GSCurrentEventTimestamp() + timeOffset;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)leapForward:(int)milliseconds
</span><span class="lines">@@ -230,9 +328,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)clearKillRing
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> _NSNewKillRingSequence();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> static NSEventType eventTypeForMouseButtonAndAction(int button, MouseAction action)
</span><span class="cx"> {
</span><span class="cx"> switch (button) {
</span><span class="lines">@@ -298,6 +399,7 @@
</span><span class="cx"> dragMode = NO; // dragMode saves events and then replays them later. We don't need/want that.
</span><span class="cx"> leftMouseButtonDown = YES; // Make the rest of eventSender think a drag is in progress
</span><span class="cx"> }
</span><ins>+#endif // !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> - (void)updateClickCountForButton:(int)buttonNumber
</span><span class="cx"> {
</span><span class="lines">@@ -312,15 +414,27 @@
</span><span class="cx">
</span><span class="cx"> static int modifierFlags(const NSString* modifierName)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
+ const int controlKeyMask = NSControlKeyMask;
+ const int shiftKeyMask = NSShiftKeyMask;
+ const int alternateKeyMask = NSAlternateKeyMask;
+ const int commandKeyMask = NSCommandKeyMask;
+#else
+ const int controlKeyMask = WebEventFlagMaskControl;
+ const int shiftKeyMask = WebEventFlagMaskShift;
+ const int alternateKeyMask = WebEventFlagMaskAlternate;
+ const int commandKeyMask = WebEventFlagMaskCommand;
+#endif
+
</ins><span class="cx"> int flags = 0;
</span><span class="cx"> if ([modifierName isEqual:@"ctrlKey"])
</span><del>- flags |= NSControlKeyMask;
</del><ins>+ flags |= controlKeyMask;
</ins><span class="cx"> else if ([modifierName isEqual:@"shiftKey"] || [modifierName isEqual:@"rangeSelectionKey"])
</span><del>- flags |= NSShiftKeyMask;
</del><ins>+ flags |= shiftKeyMask;
</ins><span class="cx"> else if ([modifierName isEqual:@"altKey"])
</span><del>- flags |= NSAlternateKeyMask;
</del><ins>+ flags |= alternateKeyMask;
</ins><span class="cx"> else if ([modifierName isEqual:@"metaKey"] || [modifierName isEqual:@"addSelectionKey"])
</span><del>- flags |= NSCommandKeyMask;
</del><ins>+ flags |= commandKeyMask;
</ins><span class="cx">
</span><span class="cx"> return flags;
</span><span class="cx"> }
</span><span class="lines">@@ -344,6 +458,7 @@
</span><span class="cx"> [[[mainFrame frameView] documentView] layout];
</span><span class="cx"> [self updateClickCountForButton:buttonNumber];
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSEventType eventType = eventTypeForMouseButtonAndAction(buttonNumber, MouseDown);
</span><span class="cx"> NSEvent *event = [NSEvent mouseEventWithType:eventType
</span><span class="cx"> location:lastMousePosition
</span><span class="lines">@@ -354,15 +469,28 @@
</span><span class="cx"> eventNumber:++eventNumber
</span><span class="cx"> clickCount:clickCount
</span><span class="cx"> pressure:0.0];
</span><ins>+#else
+ WebEvent *event = [[WebEvent alloc] initWithMouseEventType:WebEventMouseDown
+ timeStamp:[self currentEventTime]
+ location:lastMousePosition];
+#endif
</ins><span class="cx">
</span><span class="cx"> NSView *subView = [[mainFrame webView] hitTest:[event locationInWindow]];
</span><span class="cx"> if (subView) {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:event];
</span><ins>+#endif
</ins><span class="cx"> [subView mouseDown:event];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:nil];
</span><ins>+#endif
</ins><span class="cx"> if (buttonNumber == LeftMouseButton)
</span><span class="cx"> leftMouseButtonDown = YES;
</span><span class="cx"> }
</span><ins>+
+#if PLATFORM(IOS)
+ [event release];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)mouseDown:(int)buttonNumber
</span><span class="lines">@@ -392,7 +520,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)scalePageBy:(float)scale atX:(float)x andY:(float)y
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
+ // -[WebView _scaleWebView:] is Mac-specific API, and calls functions that
+ // assert to not be used in iOS.
</ins><span class="cx"> [[mainFrame webView] _scaleWebView:scale atOrigin:NSMakePoint(x, y)];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)mouseUp:(int)buttonNumber withModifiers:(WebScriptObject*)modifiers
</span><span class="lines">@@ -411,6 +543,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [[[mainFrame frameView] documentView] layout];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSEventType eventType = eventTypeForMouseButtonAndAction(buttonNumber, MouseUp);
</span><span class="cx"> NSEvent *event = [NSEvent mouseEventWithType:eventType
</span><span class="cx"> location:lastMousePosition
</span><span class="lines">@@ -421,6 +554,11 @@
</span><span class="cx"> eventNumber:++eventNumber
</span><span class="cx"> clickCount:clickCount
</span><span class="cx"> pressure:0.0];
</span><ins>+#else
+ WebEvent *event = [[WebEvent alloc] initWithMouseEventType:WebEventMouseUp
+ timeStamp:[self currentEventTime]
+ location:lastMousePosition];
+#endif
</ins><span class="cx">
</span><span class="cx"> NSView *targetView = [[mainFrame webView] hitTest:[event locationInWindow]];
</span><span class="cx"> // FIXME: Silly hack to teach DRT to respect capturing mouse events outside the WebView.
</span><span class="lines">@@ -428,13 +566,18 @@
</span><span class="cx"> // instead of rolling our own algorithm for selecting an event target.
</span><span class="cx"> targetView = targetView ? targetView : [[mainFrame frameView] documentView];
</span><span class="cx"> assert(targetView);
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:event];
</span><ins>+#endif
</ins><span class="cx"> [targetView mouseUp:event];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:nil];
</span><ins>+#endif
</ins><span class="cx"> if (buttonNumber == LeftMouseButton)
</span><span class="cx"> leftMouseButtonDown = NO;
</span><span class="cx"> lastClick = [event timestamp];
</span><span class="cx"> lastClickPosition = lastMousePosition;
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> if (draggingInfo) {
</span><span class="cx"> WebView *webView = [mainFrame webView];
</span><span class="cx">
</span><span class="lines">@@ -450,6 +593,11 @@
</span><span class="cx"> [draggingInfo release];
</span><span class="cx"> draggingInfo = nil;
</span><span class="cx"> }
</span><ins>+#endif
+
+#if PLATFORM(IOS)
+ [event release];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)mouseUp:(int)buttonNumber
</span><span class="lines">@@ -471,6 +619,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSView *view = [mainFrame webView];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> lastMousePosition = [view convertPoint:NSMakePoint(x, [view frame].size.height - y) toView:nil];
</span><span class="cx"> NSEvent *event = [NSEvent mouseEventWithType:(leftMouseButtonDown ? NSLeftMouseDragged : NSMouseMoved)
</span><span class="cx"> location:lastMousePosition
</span><span class="lines">@@ -481,11 +630,20 @@
</span><span class="cx"> eventNumber:++eventNumber
</span><span class="cx"> clickCount:(leftMouseButtonDown ? clickCount : 0)
</span><span class="cx"> pressure:0.0];
</span><ins>+#else
+ lastMousePosition = [view convertPoint:NSMakePoint(x, y) toView:nil];
+ WebEvent *event = [[WebEvent alloc] initWithMouseEventType:WebEventMouseMoved
+ timeStamp:[self currentEventTime]
+ location:lastMousePosition];
+#endif // !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> NSView *subView = [[mainFrame webView] hitTest:[event locationInWindow]];
</span><span class="cx"> if (subView) {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:event];
</span><ins>+#endif
</ins><span class="cx"> if (leftMouseButtonDown) {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> if (draggingInfo) {
</span><span class="cx"> // Per NSDragging.h: draggingSources may not implement draggedImage:movedTo:
</span><span class="cx"> if ([[draggingInfo draggingSource] respondsToSelector:@selector(draggedImage:movedTo:)])
</span><span class="lines">@@ -493,14 +651,22 @@
</span><span class="cx"> [[mainFrame webView] draggingUpdated:draggingInfo];
</span><span class="cx"> } else
</span><span class="cx"> [subView mouseDragged:event];
</span><ins>+#endif
</ins><span class="cx"> } else
</span><span class="cx"> [subView mouseMoved:event];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:nil];
</span><ins>+#endif
</ins><span class="cx"> }
</span><ins>+
+#if PLATFORM(IOS)
+ [event release];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)mouseScrollByX:(int)x andY:(int)y continuously:(BOOL)c
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> CGScrollEventUnit unit = c?kCGScrollEventUnitPixel:kCGScrollEventUnitLine;
</span><span class="cx"> CGEventRef cgScrollEvent = CGEventCreateScrollWheelEvent(NULL, unit, 2, y, x);
</span><span class="cx">
</span><span class="lines">@@ -520,6 +686,7 @@
</span><span class="cx"> [subView scrollWheel:scrollEvent];
</span><span class="cx"> [NSApp _setCurrentEvent:nil];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)continuousMouseScrollByX:(int)x andY:(int)y
</span><span class="lines">@@ -534,6 +701,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)contextClick
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[[mainFrame frameView] documentView] layout];
</span><span class="cx"> [self updateClickCountForButton:RightMouseButton];
</span><span class="cx">
</span><span class="lines">@@ -568,6 +736,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return menuItemStrings;
</span><ins>+#else
+ return nil;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scheduleAsynchronousClick
</span><span class="lines">@@ -767,7 +938,11 @@
</span><span class="cx"> int modifierFlags = 0;
</span><span class="cx">
</span><span class="cx"> if ([character length] == 1 && [character characterAtIndex:0] >= 'A' && [character characterAtIndex:0] <= 'Z') {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> modifierFlags |= NSShiftKeyMask;
</span><ins>+#else
+ modifierFlags |= WebEventFlagMaskAlphaShift;
+#endif
</ins><span class="cx"> charactersIgnoringModifiers = [character lowercaseString];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -778,6 +953,7 @@
</span><span class="cx">
</span><span class="cx"> [[[mainFrame frameView] documentView] layout];
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSEvent *event = [NSEvent keyEventWithType:NSKeyDown
</span><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:modifierFlags
</span><span class="lines">@@ -788,11 +964,28 @@
</span><span class="cx"> charactersIgnoringModifiers:charactersIgnoringModifiers
</span><span class="cx"> isARepeat:NO
</span><span class="cx"> keyCode:keyCode];
</span><ins>+#else
+ WebEvent *event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyDown
+ timeStamp:[self currentEventTime]
+ characters:eventCharacter
+ charactersIgnoringModifiers:charactersIgnoringModifiers
+ modifiers:(WebEventFlags)modifierFlags
+ isRepeating:NO
+ isPopupVariant:NO
+ keyCode:[character characterAtIndex:0]
+ isTabKey:([character characterAtIndex:0] == '\t')
+ characterSet:WebEventCharacterSetASCII];
+#endif
</ins><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:event];
</span><ins>+#endif
</ins><span class="cx"> [[[[mainFrame webView] window] firstResponder] keyDown:event];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:nil];
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> event = [NSEvent keyEventWithType:NSKeyUp
</span><span class="cx"> location:NSMakePoint(5, 5)
</span><span class="cx"> modifierFlags:modifierFlags
</span><span class="lines">@@ -803,10 +996,31 @@
</span><span class="cx"> charactersIgnoringModifiers:charactersIgnoringModifiers
</span><span class="cx"> isARepeat:NO
</span><span class="cx"> keyCode:keyCode];
</span><ins>+#else
+ [event release];
+ event = [[WebEvent alloc] initWithKeyEventType:WebEventKeyUp
+ timeStamp:[self currentEventTime]
+ characters:eventCharacter
+ charactersIgnoringModifiers:charactersIgnoringModifiers
+ modifiers:(WebEventFlags)modifierFlags
+ isRepeating:NO
+ isPopupVariant:NO
+ keyCode:[character characterAtIndex:0]
+ isTabKey:([character characterAtIndex:0] == '\t')
+ characterSet:WebEventCharacterSetASCII];
+#endif
</ins><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:event];
</span><ins>+#endif
</ins><span class="cx"> [[[[mainFrame webView] window] firstResponder] keyUp:event];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp _setCurrentEvent:nil];
</span><ins>+#endif
+
+#if PLATFORM(IOS)
+ [event release];
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)keyDownWrapper:(NSString *)character withModifiers:(WebScriptObject *)modifiers withLocation:(unsigned long)location
</span><span class="lines">@@ -978,4 +1192,159 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+- (void)addTouchAtX:(int)x y:(int)y
+{
+ if (!touches)
+ touches = [[NSMutableArray alloc] init];
+
+ [touches addObject:[SyntheticTouch touchWithLocation:CGPointMake(x, y) phase:UITouchPhaseBegan identifier:currentTouchIdentifier++]];
+}
+
+- (void)cancelTouchAtIndex:(unsigned)index
+{
+ if (index < [touches count])
+ [[touches objectAtIndex:index] setPhase:UITouchPhaseCancelled];
+}
+
+- (void)clearTouchPoints
+{
+ [touches removeAllObjects];
+}
+
+- (void)releaseTouchAtIndex:(unsigned)index
+{
+ if (index < [touches count]) {
+ SyntheticTouch *touch = [touches objectAtIndex:index];
+ [touch setPhase:UITouchPhaseEnded];
+ }
+}
+
+- (void)markAllTouchesAsStationary
+{
+ for (SyntheticTouch *touch in touches)
+ [touch setPhase:UITouchPhaseStationary];
+}
+
+- (void)updateTouchAtIndex:(unsigned)index x:(int)x y:(int)y
+{
+ if (index < [touches count]) {
+ SyntheticTouch *touch = [touches objectAtIndex:index];
+ [touch setPhase:UITouchPhaseMoved];
+ [touch setLocation:CGPointMake(x, y)];
+ }
+}
+
+- (void)setTouchModifier:(NSString*)modifierName value:(BOOL)flag
+{
+ unsigned modifier = 0;
+
+ if ([modifierName isEqualToString:@"alt"])
+ modifier = WebEventFlagMaskAlternate;
+ else if ([modifierName isEqualToString:@"shift"])
+ modifier = WebEventFlagMaskShift;
+ else if ([modifierName isEqualToString:@"meta"])
+ modifier = WebEventFlagMaskCommand;
+ else if ([modifierName isEqualToString:@"ctrl"])
+ modifier = WebEventFlagMaskControl;
+
+ if (!modifier)
+ return;
+
+ if (flag)
+ nextEventFlags |= modifier;
+ else
+ nextEventFlags &= ~modifier;
+}
+
+- (void)sentTouchEventOfType:(WebEventType)type
+{
+ NSMutableArray *touchLocations = [[NSMutableArray alloc] initWithCapacity:[touches count]];
+ NSMutableArray *touchIdentifiers = [[NSMutableArray alloc] initWithCapacity:[touches count]];
+ NSMutableArray *touchPhases = [[NSMutableArray alloc] initWithCapacity:[touches count]];
+
+ CGPoint centroid = CGPointZero;
+ NSUInteger touchesDownCount = 0;
+
+ for (SyntheticTouch *currTouch in touches) {
+ [touchLocations addObject:[NSValue valueWithCGPoint:currTouch.location]];
+ [touchIdentifiers addObject:[NSNumber numberWithUnsignedInt:currTouch.identifier]];
+ [touchPhases addObject:[NSNumber numberWithUnsignedInt:currTouch.phase]];
+
+ if ((currTouch.phase == UITouchPhaseEnded) || (currTouch.phase == UITouchPhaseCancelled))
+ continue;
+
+ centroid.x += currTouch.location.x;
+ centroid.y += currTouch.location.y;
+
+ touchesDownCount++;
+ }
+
+ if (touchesDownCount > 0)
+ centroid = CGPointMake(centroid.x / touchesDownCount, centroid.y / touchesDownCount);
+ else
+ centroid = CGPointZero;
+
+ WebEvent *event = [[WebEvent alloc] initWithTouchEventType:type
+ timeStamp:[self currentEventTime]
+ location:centroid
+ modifiers:(WebEventFlags)nextEventFlags
+ touchCount:[touches count]
+ touchLocations:touchLocations
+ touchIdentifiers:touchIdentifiers
+ touchPhases:touchPhases
+ isGesture:(touchesDownCount > 1)
+ gestureScale:1
+ gestureRotation:0];
+ // Ensure that layout is up-to-date so that hit-testing through WAKViews works correctly.
+ [mainFrame updateLayout];
+ [[[mainFrame webView] window] sendEventSynchronously:event];
+ [event release];
+
+ [touchLocations release];
+ [touchIdentifiers release];
+ [touchPhases release];
+
+ nextEventFlags = 0;
+}
+
+- (void)touchStart
+{
+ [self sentTouchEventOfType:WebEventTouchBegin];
+}
+
+- (void)touchMove
+{
+ [self sentTouchEventOfType:WebEventTouchChange];
+}
+
+- (void)touchEnd
+{
+ [self sentTouchEventOfType:WebEventTouchEnd];
+
+ NSMutableArray *touchesToRemove = [[NSMutableArray alloc] init];
+ for (SyntheticTouch *currTouch in touches) {
+ if (currTouch.phase == UITouchPhaseEnded)
+ [touchesToRemove addObject:currTouch];
+ }
+
+ [touches removeObjectsInArray:touchesToRemove];
+ [touchesToRemove release];
+}
+
+- (void)touchCancel
+{
+ [self sentTouchEventOfType:WebEventTouchCancel];
+
+ NSMutableArray *touchesToRemove = [[NSMutableArray alloc] init];
+ for (SyntheticTouch *currTouch in touches) {
+ if (currTouch.phase == UITouchPhaseCancelled)
+ [touchesToRemove addObject:currTouch];
+ }
+
+ [touches removeObjectsInArray:touchesToRemove];
+ [touchesToRemove release];
+}
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacFrameLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -31,19 +31,18 @@
</span><span class="cx"> #import "FrameLoadDelegate.h"
</span><span class="cx">
</span><span class="cx"> #import "AccessibilityController.h"
</span><del>-#import "AppleScriptController.h"
</del><span class="cx"> #import "EventSendingController.h"
</span><del>-#import "Foundation/NSNotification.h"
</del><span class="cx"> #import "GCController.h"
</span><del>-#import "TestRunner.h"
</del><span class="cx"> #import "NavigationController.h"
</span><span class="cx"> #import "ObjCController.h"
</span><span class="cx"> #import "ObjCPlugin.h"
</span><span class="cx"> #import "ObjCPluginFunction.h"
</span><ins>+#import "TestRunner.h"
</ins><span class="cx"> #import "TextInputController.h"
</span><span class="cx"> #import "WebCoreTestSupport.h"
</span><span class="cx"> #import "WorkQueue.h"
</span><span class="cx"> #import "WorkQueueItem.h"
</span><ins>+#import <Foundation/NSNotification.h>
</ins><span class="cx"> #import <JavaScriptCore/JavaScriptCore.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <WebKit/WebFramePrivate.h>
</span><span class="lines">@@ -55,6 +54,14 @@
</span><span class="cx"> #import <WebKit/WebViewPrivate.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+#import "AppleScriptController.h"
+#endif
+
+#if PLATFORM(IOS)
+#import <WebKit/WebCoreThreadMessage.h>
+#endif
+
</ins><span class="cx"> #ifndef NSEC_PER_MSEC
</span><span class="cx"> #define NSEC_PER_MSEC 1000000ull
</span><span class="cx"> #endif
</span><span class="lines">@@ -111,14 +118,18 @@
</span><span class="cx"> if ((self = [super init])) {
</span><span class="cx"> gcController = new GCController;
</span><span class="cx"> accessibilityController = new AccessibilityController;
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(webViewProgressFinishedNotification:) name:WebViewProgressFinishedNotification object:nil];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self];
</span><ins>+#endif
</ins><span class="cx"> delete gcController;
</span><span class="cx"> delete accessibilityController;
</span><span class="cx"> [super dealloc];
</span><span class="lines">@@ -131,6 +142,10 @@
</span><span class="cx"> if (topLoadingFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ WebThreadLock();
+#endif
+
</ins><span class="cx"> // if we finish all the commands, we're ready to dump state
</span><span class="cx"> if (WorkQueue::shared()->processWork() && !gTestRunner->waitToDump())
</span><span class="cx"> dump();
</span><span class="lines">@@ -212,6 +227,9 @@
</span><span class="cx"> int64_t deferredWaitTime = 5 * NSEC_PER_MSEC;
</span><span class="cx"> dispatch_time_t when = dispatch_time(DISPATCH_TIME_NOW, deferredWaitTime);
</span><span class="cx"> dispatch_after(when, dispatch_get_main_queue(), ^{
</span><ins>+#if PLATFORM(IOS)
+ WebThreadLock();
+#endif
</ins><span class="cx"> [sender setDefersCallbacks:NO];
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -226,10 +244,11 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(![frame provisionalDataSource]);
</span><span class="cx"> ASSERT([frame dataSource]);
</span><del>-
</del><span class="cx"> gTestRunner->setWindowIsKey(true);
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSView *documentView = [[mainFrame frameView] documentView];
</span><span class="cx"> [[[mainFrame webView] window] makeFirstResponder:documentView];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
</span><span class="lines">@@ -315,11 +334,15 @@
</span><span class="cx">
</span><span class="cx"> // Make Old-Style controllers
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> WebView *webView = [frame webView];
</span><ins>+#endif
</ins><span class="cx"> WebScriptObject *obj = [frame windowObject];
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> AppleScriptController *asc = [[AppleScriptController alloc] initWithWebView:webView];
</span><span class="cx"> [obj setValue:asc forKey:@"appleScriptController"];
</span><span class="cx"> [asc release];
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> EventSendingController *esc = [[EventSendingController alloc] init];
</span><span class="cx"> [obj setValue:esc forKey:@"eventSender"];
</span><span class="lines">@@ -339,9 +362,12 @@
</span><span class="cx"> [obj setValue:pluginFunction forKey:@"objCPluginFunction"];
</span><span class="cx"> [pluginFunction release];
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+// FIXME: <rdar://problem/5106287> DumpRenderTree: fix TextInputController to work with iOS and re-enable tests
</ins><span class="cx"> TextInputController *tic = [[TextInputController alloc] initWithWebView:webView];
</span><span class="cx"> [obj setValue:tic forKey:@"textInputController"];
</span><span class="cx"> [tic release];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didClearWindowObjectForFrame:(WebFrame *)frame inIsolatedWorld:(WebScriptWorld *)world
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacHistoryDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/HistoryDelegate.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/HistoryDelegate.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/HistoryDelegate.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -22,9 +22,9 @@
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><del>-
-#import <Cocoa/Cocoa.h>
</del><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
+
</ins><span class="cx"> @interface HistoryDelegate : NSObject
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacLayoutTestHelperm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #import <ApplicationServices/ApplicationServices.h>
</span><span class="cx"> #import <getopt.h>
</span><span class="lines">@@ -204,3 +206,12 @@
</span><span class="cx"> [pool release];
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+
+#endif // !PLATFORM(IOS)
+
+#if PLATFORM(IOS)
+int main(int argc, char* argv[])
+{
+ return 0;
+}
+#endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacMockGeolocationProvidermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/MockGeolocationProvider.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/MockGeolocationProvider.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/MockGeolocationProvider.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "MockGeolocationProvider.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import <WebCore/WebCoreThreadRun.h>
+#endif
+
</ins><span class="cx"> @implementation MockGeolocationProvider
</span><span class="cx">
</span><span class="cx"> + (MockGeolocationProvider *)shared
</span><span class="lines">@@ -88,6 +92,28 @@
</span><span class="cx"> return _lastPosition.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+- (void)setEnableHighAccuracy:(BOOL)enableHighAccuracy
+{
+ UNUSED_PARAM(enableHighAccuracy);
+}
+
+- (void)initializeGeolocationForWebView:(WebView *)webView listener:(id<WebGeolocationProviderInitializationListener>)listener
+{
+ [listener initializationAllowedWebView:webView provider:self];
+}
+
+- (void)cancelWarmUpForWebView:(WebView *)webView
+{
+ UNUSED_PARAM(webView);
+}
+
+- (void)stopTrackingWebView:(WebView *)webView
+{
+ UNUSED_PARAM(webView);
+}
+#endif
+
</ins><span class="cx"> - (void)stopTimer
</span><span class="cx"> {
</span><span class="cx"> [_timer invalidate];
</span><span class="lines">@@ -101,10 +127,25 @@
</span><span class="cx"> // Expect that views won't be (un)registered while iterating.
</span><span class="cx"> HashSet<WebView*> views = _registeredViews;
</span><span class="cx"> for (HashSet<WebView*>::iterator iter = views.begin(); iter != views.end(); ++iter) {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> if (_hasError)
</span><span class="cx"> [*iter _geolocationDidFailWithMessage:_errorMessage.get()];
</span><span class="cx"> else
</span><span class="cx"> [*iter _geolocationDidChangePosition:_lastPosition.get()];
</span><ins>+#else
+ WebView* webView = *iter;
+ WebGeolocationPosition *lastPosition = _lastPosition.get();
+ NSString *errorMessage = _errorMessage.get();
+ if (_hasError) {
+ WebThreadRun(^{
+ [webView _geolocationDidFailWithMessage:errorMessage];
+ });
+ } else {
+ WebThreadRun(^{
+ [webView _geolocationDidChangePosition:lastPosition];
+ });
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacNavigationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/NavigationController.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/NavigationController.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/NavigationController.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx"> #import <WebKit/WebView.h>
</span><span class="cx">
</span><span class="cx"> @interface NavigationController : NSObject
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacObjCPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ObjCPlugin.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/ObjCPlugin.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/ObjCPlugin.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -23,9 +23,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><del>-
</del><span class="cx"> @interface ObjCPlugin : NSObject
</span><span class="cx"> {
</span><span class="cx"> BOOL throwOnDealloc;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacObjCPluginm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSString *)classNameOfObject:(id)obj
</span><span class="cx"> {
</span><del>- return [obj className];
</del><ins>+ return NSStringFromClass([obj class]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacObjCPluginFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ObjCPluginFunction.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/ObjCPluginFunction.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/ObjCPluginFunction.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -23,10 +23,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
-
-
</del><span class="cx"> @interface ObjCPluginFunction : NSObject
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/PolicyDelegate.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><span class="cx"> class TestRunner;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacResourceLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,9 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Cocoa/Cocoa.h>
</del><ins>+#import <Foundation/Foundation.h>
</ins><span class="cx">
</span><del>-
</del><span class="cx"> @interface ResourceLoadDelegate : NSObject {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacResourceLoadDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #import "DumpRenderTree.h"
</span><span class="cx"> #import "TestRunner.h"
</span><span class="cx"> #import <WebKit/WebKit.h>
</span><del>-#import <WebKit/WebTypesInternal.h>
</del><span class="cx"> #import <WebKit/WebDataSourcePrivate.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><span class="lines">@@ -248,9 +247,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)webView: (WebView *)wv plugInFailedWithError:(NSError *)error dataSource:(WebDataSource *)dataSource
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> // The call to -display here simulates the "Plug-in not found" sheet that Safari shows.
</span><span class="cx"> // It is used for platform/mac/plugins/update-widget-from-style-recalc.html
</span><span class="cx"> [wv display];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -(NSCachedURLResponse *) webView: (WebView *)wv resource:(id)identifier willCacheResponse:(NSCachedURLResponse *)response fromDataSource:(WebDataSource *)dataSource
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> #import <WebKit/WebHTMLViewPrivate.h>
</span><span class="cx"> #import <WebKit/WebHistory.h>
</span><span class="cx"> #import <WebKit/WebHistoryPrivate.h>
</span><del>-#import <WebKit/WebIconDatabasePrivate.h>
</del><span class="cx"> #import <WebKit/WebInspectorPrivate.h>
</span><span class="cx"> #import <WebKit/WebNSURLExtras.h>
</span><span class="cx"> #import <WebKit/WebKitErrors.h>
</span><span class="lines">@@ -72,13 +71,24 @@
</span><span class="cx"> #import <WebKit/WebScriptWorld.h>
</span><span class="cx"> #import <WebKit/WebSecurityOriginPrivate.h>
</span><span class="cx"> #import <WebKit/WebStorageManagerPrivate.h>
</span><del>-#import <WebKit/WebTypesInternal.h>
</del><span class="cx"> #import <WebKit/WebView.h>
</span><span class="cx"> #import <WebKit/WebViewPrivate.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+#import <WebKit/WebIconDatabasePrivate.h>
+#endif
+
+#if PLATFORM(IOS)
+#import <UIKit/UIWebBrowserView.h>
+#import <WebKit/WebCoreThread.h>
+#import <WebKit/WebCoreThreadMessage.h>
+#import <WebKit/WebDOMOperationsPrivate.h>
+#endif
+
+#if !PLATFORM(IOS)
</ins><span class="cx"> @interface CommandValidationTarget : NSObject <NSValidatedUserInterfaceItem>
</span><span class="cx"> {
</span><span class="cx"> SEL _action;
</span><span class="lines">@@ -109,6 +119,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @interface WebGeolocationPosition (Internal)
</span><span class="cx"> - (id)initWithGeolocationPosition:(PassRefPtr<WebCore::GeolocationPosition>)coreGeolocationPosition;
</span><span class="lines">@@ -484,6 +495,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setIconDatabaseEnabled(bool iconDatabaseEnabled)
</span><span class="cx"> {
</span><ins>+#if ENABLE(ICON_DATABASE)
</ins><span class="cx"> // FIXME: Workaround <rdar://problem/6480108>
</span><span class="cx"> static WebIconDatabase *sharedWebIconDatabase = NULL;
</span><span class="cx"> if (!sharedWebIconDatabase) {
</span><span class="lines">@@ -494,14 +506,17 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> [sharedWebIconDatabase setEnabled:iconDatabaseEnabled];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setMainFrameIsFirstResponder(bool flag)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSView *documentView = [[mainFrame frameView] documentView];
</span><span class="cx">
</span><span class="cx"> NSResponder *firstResponder = flag ? documentView : nil;
</span><span class="cx"> [[[mainFrame webView] window] makeFirstResponder:firstResponder];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
</span><span class="lines">@@ -546,7 +561,9 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setAutomaticLinkDetectionEnabled(bool enabled)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[mainFrame webView] setAutomaticLinkDetectionEnabled:enabled];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setTabKeyCyclesThroughElements(bool cycles)
</span><span class="lines">@@ -554,6 +571,18 @@
</span><span class="cx"> [[mainFrame webView] setTabKeyCyclesThroughElements:cycles];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+void TestRunner::setTelephoneNumberParsingEnabled(bool enabled)
+{
+ [[[mainFrame webView] preferences] _setTelephoneNumberParsingEnabled:enabled];
+}
+
+void TestRunner::setPagePaused(bool paused)
+{
+ [gWebBrowserView setPaused:paused];
+}
+#endif
+
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> void TestRunner::setTextAutosizingEnabled(bool enabled)
</span><span class="cx"> {
</span><span class="lines">@@ -564,7 +593,9 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setUseDashboardCompatibilityMode(bool flag)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[mainFrame webView] _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:flag];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setUserStyleSheetEnabled(bool flag)
</span><span class="lines">@@ -705,6 +736,7 @@
</span><span class="cx">
</span><span class="cx"> bool TestRunner::isCommandEnabled(JSStringRef name)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> RetainPtr<CFStringRef> nameCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, name));
</span><span class="cx"> NSString *nameNS = (NSString *)nameCF.get();
</span><span class="cx">
</span><span class="lines">@@ -725,6 +757,9 @@
</span><span class="cx"> if (![validator respondsToSelector:@selector(validateUserInterfaceItem:)])
</span><span class="cx"> return true;
</span><span class="cx"> return [validator validateUserInterfaceItem:target.get()];
</span><ins>+#else
+ return false;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::waitForPolicyDelegate()
</span><span class="lines">@@ -782,19 +817,25 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::showWebInspector()
</span><span class="cx"> {
</span><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> [[[mainFrame webView] inspector] show:nil];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::closeWebInspector()
</span><span class="cx"> {
</span><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> [[[mainFrame webView] inspector] close:nil];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::evaluateInWebInspector(long callId, JSStringRef script)
</span><span class="cx"> {
</span><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> RetainPtr<CFStringRef> scriptCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, script));
</span><span class="cx"> NSString *scriptNS = (NSString *)scriptCF.get();
</span><span class="cx"> [[[mainFrame webView] inspector] evaluateInFrontend:nil callId:callId script:scriptNS];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<unsigned, RetainPtr<WebScriptWorld> > WorldMap;
</span><span class="lines">@@ -879,8 +920,94 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+@interface APITestDelegateIPhone : NSObject
+{
+ TestRunner* m_layoutTestRunner;
+ JSStringRef m_utf8Data;
+ JSStringRef m_baseURL;
+ WebView *m_webView;
+}
+
+- (id)initWithTestRunner:(TestRunner*)layoutTestRunner utf8Data:(JSStringRef)utf8Data baseURL:(JSStringRef)baseURL;
+- (void)run;
+@end
+
+@implementation APITestDelegateIPhone
+
+- (id)initWithTestRunner:(TestRunner*)layoutTestRunner utf8Data:(JSStringRef)utf8Data baseURL:(JSStringRef)baseURL
+{
+ self = [super init];
+ if (!self)
+ return nil;
+
+ m_layoutTestRunner = layoutTestRunner;
+ m_utf8Data = utf8Data;
+ m_baseURL = baseURL;
+ return self;
+}
+
+- (void)run
+{
+ m_layoutTestRunner->setWaitToDump(true);
+
+ RetainPtr<CFStringRef> utf8DataCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, m_utf8Data));
+ RetainPtr<CFStringRef> baseURLCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, m_baseURL));
+ m_utf8Data = NULL;
+ m_baseURL = NULL;
+
+ WebThreadLock();
+ m_webView = [[WebView alloc] initWithFrame:NSZeroRect frameName:@"" groupName:@""];
+ [m_webView setFrameLoadDelegate:self];
+
+ [[m_webView mainFrame] loadData:[(NSString *)utf8DataCF.get() dataUsingEncoding:NSUTF8StringEncoding] MIMEType:@"text/html" textEncodingName:@"utf-8" baseURL:[NSURL URLWithString:(NSString *)baseURLCF.get()]];
+}
+
+- (void)_cleanup
+{
+ WebThreadLock();
+ [m_webView _clearDelegates];
+ [m_webView close];
+ [m_webView release];
+
+ m_layoutTestRunner->notifyDone();
+}
+
+- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
+{
+ printf("API Test load failed\n");
+ [self _cleanup];
+}
+
+- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
+{
+ printf("API Test load failed provisional\n");
+ [self _cleanup];
+}
+
+- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
+{
+ printf("API Test load succeeded\n");
+ [self _cleanup];
+}
+
+@end
+#endif
+
</ins><span class="cx"> void TestRunner::apiTestNewWindowDataLoadBaseURL(JSStringRef utf8Data, JSStringRef baseURL)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ // On iOS this gets called via JavaScript on the WebThread. But since it creates
+ // and closes a WebView, it should be run on the main thread. Make the switch
+ // from the web thread to the main thread and make the test asynchronous.
+ if (WebThreadIsCurrent()) {
+ APITestDelegateIPhone *dispatcher = [[APITestDelegateIPhone alloc] initWithTestRunner:this utf8Data:utf8Data baseURL:baseURL];
+ NSInvocation *invocation = WebThreadMakeNSInvocation(dispatcher, @selector(run));
+ WebThreadCallDelegate(invocation);
+ return;
+ }
+#endif
+
</ins><span class="cx"> NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFStringRef> utf8DataCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, utf8Data));
</span><span class="lines">@@ -899,7 +1026,11 @@
</span><span class="cx"> [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
</span><span class="cx"> [pool release];
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if PLATFORM(IOS)
+ [(DumpRenderTree *)[UIApplication sharedApplication] _waitForWebThread];
+#endif
+
</ins><span class="cx"> [webView close];
</span><span class="cx"> [webView release];
</span><span class="cx"> [delegate release];
</span><span class="lines">@@ -1002,7 +1133,9 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::abortModal()
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [NSApp abortModal];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setSerializeHTTPLoads(bool serialize)
</span><span class="lines">@@ -1012,16 +1145,19 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setTextDirection(JSStringRef directionName)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> if (JSStringIsEqualToUTF8CString(directionName, "ltr"))
</span><span class="cx"> [[mainFrame webView] makeBaseWritingDirectionLeftToRight:0];
</span><span class="cx"> else if (JSStringIsEqualToUTF8CString(directionName, "rtl"))
</span><span class="cx"> [[mainFrame webView] makeBaseWritingDirectionRightToLeft:0];
</span><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::addChromeInputField()
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSTextField *textField = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 100, 20)];
</span><span class="cx"> textField.tag = 1;
</span><span class="cx"> [[[[mainFrame webView] window] contentView] addSubview:textField];
</span><span class="lines">@@ -1029,25 +1165,32 @@
</span><span class="cx">
</span><span class="cx"> [textField setNextKeyView:[mainFrame webView]];
</span><span class="cx"> [[mainFrame webView] setNextKeyView:textField];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::removeChromeInputField()
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> NSView* textField = [[[[mainFrame webView] window] contentView] viewWithTag:1];
</span><span class="cx"> if (textField) {
</span><span class="cx"> [textField removeFromSuperview];
</span><span class="cx"> focusWebView();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::focusWebView()
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[[mainFrame webView] window] makeFirstResponder:[mainFrame webView]];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::setBackingScaleFactor(double backingScaleFactor)
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[mainFrame webView] _setCustomBackingScaleFactor:backingScaleFactor];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::resetPageVisibility()
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTextInputControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TextInputController.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TextInputController.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/TextInputController.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+// FIXME: <rdar://problem/5106287> DumpRenderTree: fix TextInputController to work with iOS and re-enable tests
+
</ins><span class="cx"> @class WebView;
</span><span class="cx"> @class WebHTMLView;
</span><span class="cx"> @class WebScriptObject;
</span><span class="lines">@@ -40,3 +43,5 @@
</span><span class="cx"> }
</span><span class="cx"> - (id)initWithWebView:(WebView *)view;
</span><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTextInputControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TextInputController.m (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TextInputController.m 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/TextInputController.m 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -29,6 +29,9 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "TextInputController.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+// FIXME: <rdar://problem/5106287> DumpRenderTree: fix TextInputController to work with iOS and re-enable tests
+
</ins><span class="cx"> #import "DumpRenderTreeMac.h"
</span><span class="cx"> #import <AppKit/NSInputManager.h>
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span class="lines">@@ -524,3 +527,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif // !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/UIDelegate.h (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/UIDelegate.h 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/UIDelegate.h 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -26,7 +26,11 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> #import <Cocoa/Cocoa.h>
</span><ins>+#else
+#import <WebKit/WAKView.h>
+#endif
</ins><span class="cx">
</span><span class="cx"> @interface UIDelegate : NSObject {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/UIDelegate.mm (162816 => 162817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/UIDelegate.mm 2014-01-26 23:40:41 UTC (rev 162816)
+++ trunk/Tools/DumpRenderTree/mac/UIDelegate.mm 2014-01-27 00:01:15 UTC (rev 162817)
</span><span class="lines">@@ -46,7 +46,9 @@
</span><span class="cx"> #import <WebKit/WebViewPrivate.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> DumpRenderTreeDraggingInfo *draggingInfo = nil;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @implementation UIDelegate
</span><span class="cx">
</span><span class="lines">@@ -80,16 +82,20 @@
</span><span class="cx">
</span><span class="cx"> - (void)modalWindowWillClose:(NSNotification *)notification
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowWillCloseNotification object:nil];
</span><span class="cx"> [NSApp abortModal];
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webViewRunModal:(WebView *)sender
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> gTestRunner->setWindowIsKey(false);
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modalWindowWillClose:) name:NSWindowWillCloseNotification object:nil];
</span><span class="cx"> [NSApp runModalForWindow:[sender window]];
</span><span class="cx"> gTestRunner->setWindowIsKey(true);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame
</span><span class="lines">@@ -123,6 +129,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> - (void)webView:(WebView *)sender dragImage:(NSImage *)anImage at:(NSPoint)viewLocation offset:(NSSize)initialOffset event:(NSEvent *)event pasteboard:(NSPasteboard *)pboard source:(id)sourceObj slideBack:(BOOL)slideFlag forView:(NSView *)view
</span><span class="cx"> {
</span><span class="cx"> assert(!draggingInfo);
</span><span class="lines">@@ -130,6 +137,7 @@
</span><span class="cx"> [sender draggingUpdated:draggingInfo];
</span><span class="cx"> [EventSendingController replaySavedEvents];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (void)webViewFocus:(WebView *)webView
</span><span class="cx"> {
</span><span class="lines">@@ -272,9 +280,14 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)webView:(WebView *)webView supportsFullScreenForElement:(DOMElement*)element withKeyboard:(BOOL)withKeyboard
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ return NO;
+#else
</ins><span class="cx"> return YES;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(FULLSCREEN_API)
</ins><span class="cx"> - (void)enterFullScreenWithListener:(NSObject<WebKitFullScreenListener>*)listener
</span><span class="cx"> {
</span><span class="cx"> [listener webkitWillEnterFullScreen];
</span><span class="lines">@@ -304,6 +317,7 @@
</span><span class="cx"> [listener webkitWillExitFullScreen];
</span><span class="cx"> [listener webkitDidExitFullScreen];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> - (BOOL)webView:(WebView *)webView didPressMissingPluginButton:(DOMElement *)element
</span><span class="cx"> {
</span><span class="lines">@@ -337,8 +351,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> [draggingInfo release];
</span><span class="cx"> draggingInfo = nil;
</span><ins>+#endif
</ins><span class="cx"> [m_pendingGeolocationPermissionListeners release];
</span><span class="cx"> m_pendingGeolocationPermissionListeners = nil;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>