<!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>[161651] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161651">161651</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 10:49:22 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Fix up simulator build and enable default features
Rubber-stamped by Joseph Pecoraro.
* Scripts/webkitdirs.pm:
(determineArchitecture):
(determinePassedArchitecture):
* Scripts/webkitperl/FeatureList.pm: Also expose command line option to toggle ENABLE_PLUGIN_PROXY_FOR_VIDEO (enabled
by default only in iOS).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161650 => 161651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-10 18:38:41 UTC (rev 161650)
+++ trunk/Tools/ChangeLog 2014-01-10 18:49:22 UTC (rev 161651)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-01-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Fix up simulator build and enable default features
+
+ Rubber-stamped by Joseph Pecoraro.
+
+ * Scripts/webkitdirs.pm:
+ (determineArchitecture):
+ (determinePassedArchitecture):
+ * Scripts/webkitperl/FeatureList.pm: Also expose command line option to toggle ENABLE_PLUGIN_PROXY_FOR_VIDEO (enabled
+ by default only in iOS).
+
+2014-01-10 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> [iOS] Upstream WebCore and Tools miscellaneous changes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126698
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (161650 => 161651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-01-10 18:38:41 UTC (rev 161650)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-01-10 18:49:22 UTC (rev 161651)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> chomp $supports64Bit;
</span><span class="cx"> $architecture = 'x86_64' if $supports64Bit;
</span><span class="cx"> } elsif ($xcodeSDK =~ /^iphonesimulator/) {
</span><del>- $architecture = 'i386';
</del><ins>+ $architecture = 'x86_64';
</ins><span class="cx"> } elsif ($xcodeSDK =~ /^iphoneos/) {
</span><span class="cx"> $architecture = 'armv7';
</span><span class="cx"> }
</span><span class="lines">@@ -657,6 +657,11 @@
</span><span class="cx"> $passedArchitecture = undef;
</span><span class="cx"> if (checkForArgumentAndRemoveFromARGV("--32-bit")) {
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><ins>+ # PLATFORM_IOS: Don't run `arch` command inside Simulator environment
+ local %ENV = %ENV;
+ delete $ENV{DYLD_ROOT_PATH};
+ delete $ENV{DYLD_FRAMEWORK_PATH};
+
</ins><span class="cx"> $passedArchitecture = `arch`;
</span><span class="cx"> chomp $passedArchitecture;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (161650 => 161651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-01-10 18:38:41 UTC (rev 161650)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2014-01-10 18:49:22 UTC (rev 161651)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> $notificationsSupport,
</span><span class="cx"> $orientationEventsSupport,
</span><span class="cx"> $pageVisibilityAPISupport,
</span><ins>+ $pluginProxyForVideo,
</ins><span class="cx"> $performanceTimelineSupport,
</span><span class="cx"> $progressElementSupport,
</span><span class="cx"> $promiseSupport,
</span><span class="lines">@@ -159,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> my @features = (
</span><span class="cx"> { option => "3d-rendering", desc => "Toggle 3D Rendering support",
</span><del>- define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() || isGtk() || isEfl()), value => \$threeDRenderingSupport },
</del><ins>+ define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$threeDRenderingSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
</span><span class="cx"> define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport },
</span><span class="lines">@@ -168,7 +169,7 @@
</span><span class="cx"> define => "ENABLE_BATTERY_STATUS", default => (isEfl() || isBlackBerry()), value => \$batteryStatusSupport },
</span><span class="cx">
</span><span class="cx"> { option => "blob", desc => "Toggle Blob support",
</span><del>- define => "ENABLE_BLOB", default => (isAppleMacWebKit() || isGtk() || isBlackBerry() || isEfl()), value => \$blobSupport },
</del><ins>+ define => "ENABLE_BLOB", default => ((isAppleMacWebKit() && !isIOSWebKit()) || isGtk() || isBlackBerry() || isEfl()), value => \$blobSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "canvas-path", desc => "Toggle Canvas Path support",
</span><span class="cx"> define => "ENABLE_CANVAS_PATH", default => 1, value => \$canvasPathSupport },
</span><span class="lines">@@ -192,7 +193,7 @@
</span><span class="cx"> define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
</span><span class="cx">
</span><span class="cx"> { option => "css-filters", desc => "Toggle CSS Filters support",
</span><del>- define => "ENABLE_CSS_FILTERS", default => isAppleWebKit() || isBlackBerry(), value => \$cssFiltersSupport },
</del><ins>+ define => "ENABLE_CSS_FILTERS", default => (isAppleMacWebKit() || isBlackBerry() || isIOSWebKit()), value => \$cssFiltersSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "css3-conditional-rules", desc => "Toggle CSS3 Conditional Rules support (i.e. \@supports)",
</span><span class="cx"> define => "ENABLE_CSS3_CONDITIONAL_RULES", default => 0, value => \$css3ConditionalRulesSupport },
</span><span class="lines">@@ -246,7 +247,7 @@
</span><span class="cx"> define => "ENABLE_DETAILS_ELEMENT", default => 1, value => \$detailsElementSupport },
</span><span class="cx">
</span><span class="cx"> { option => "device-orientation", desc => "Toggle Device Orientation support",
</span><del>- define => "ENABLE_DEVICE_ORIENTATION", default => isBlackBerry(), value => \$deviceOrientationSupport },
</del><ins>+ define => "ENABLE_DEVICE_ORIENTATION", default => (isIOSWebKit() || isBlackBerry()), value => \$deviceOrientationSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "directory-upload", desc => "Toggle Directory Upload support",
</span><span class="cx"> define => "ENABLE_DIRECTORY_UPLOAD", default => 0, value => \$directoryUploadSupport },
</span><span class="lines">@@ -258,7 +259,7 @@
</span><span class="cx"> define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => (isBlackBerry() || isEfl()), value => \$downloadAttributeSupport },
</span><span class="cx">
</span><span class="cx"> { option => "filters", desc => "Toggle Filters support",
</span><del>- define => "ENABLE_FILTERS", default => (isAppleWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$filtersSupport },
</del><ins>+ define => "ENABLE_FILTERS", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$filtersSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "font-load-events", desc => "Toggle Font Load Events support",
</span><span class="cx"> define => "ENABLE_FONT_LOAD_EVENTS", default => 0, value => \$fontLoadEventsSupport },
</span><span class="lines">@@ -273,13 +274,13 @@
</span><span class="cx"> define => "ENABLE_GAMEPAD", default => (isEfl() || isGtk()), value => \$gamepadSupport },
</span><span class="cx">
</span><span class="cx"> { option => "geolocation", desc => "Toggle Geolocation support",
</span><del>- define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isGtk() || isBlackBerry()), value => \$geolocationSupport },
</del><ins>+ define => "ENABLE_GEOLOCATION", default => (isAppleWebKit() || isIOSWebKit() || isGtk() || isBlackBerry()), value => \$geolocationSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "high-dpi-canvas", desc => "Toggle High DPI Canvas support",
</span><span class="cx"> define => "ENABLE_HIGH_DPI_CANVAS", default => (isAppleWebKit()), value => \$highDPICanvasSupport },
</span><span class="cx">
</span><span class="cx"> { option => "icon-database", desc => "Toggle Icondatabase support",
</span><del>- define => "ENABLE_ICONDATABASE", default => 1, value => \$icondatabaseSupport },
</del><ins>+ define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "iframe-seamless", desc => "Toggle iframe seamless attribute support",
</span><span class="cx"> define => "ENABLE_IFRAME_SEAMLESS", default => 1, value => \$iframeSeamlessSupport },
</span><span class="lines">@@ -357,7 +358,7 @@
</span><span class="cx"> define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => (isBlackBerry() || isEfl()), value => \$registerProtocolHandlerSupport },
</span><span class="cx">
</span><span class="cx"> { option => "netscape-plugin-api", desc => "Toggle Netscape Plugin API support",
</span><del>- define => "ENABLE_NETSCAPE_PLUGIN_API", default => 1, value => \$netscapePluginAPISupport },
</del><ins>+ define => "ENABLE_NETSCAPE_PLUGIN_API", default => !isIOSWebKit(), value => \$netscapePluginAPISupport },
</ins><span class="cx">
</span><span class="cx"> { option => "network-info", desc => "Toggle Network Info support",
</span><span class="cx"> define => "ENABLE_NETWORK_INFO", default => (isEfl() || isBlackBerry()), value => \$networkInfoSupport },
</span><span class="lines">@@ -369,11 +370,14 @@
</span><span class="cx"> define => "ENABLE_NOTIFICATIONS", default => isBlackBerry(), value => \$notificationsSupport },
</span><span class="cx">
</span><span class="cx"> { option => "orientation-events", desc => "Toggle Orientation Events support",
</span><del>- define => "ENABLE_ORIENTATION_EVENTS", default => isBlackBerry(), value => \$orientationEventsSupport },
</del><ins>+ define => "ENABLE_ORIENTATION_EVENTS", default => isIOSWebKit() || isBlackBerry(), value => \$orientationEventsSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "page-visibility-api", desc => "Toggle Page Visibility API support",
</span><span class="cx"> define => "ENABLE_PAGE_VISIBILITY_API", default => (isBlackBerry() || isEfl() || isGtk()), value => \$pageVisibilityAPISupport },
</span><span class="cx">
</span><ins>+ { option => "plugin-proxy-for-video", desc => "Toggle Plugin Proxy for Video support",
+ define => "ENABLE_PLUGIN_PROXY_FOR_VIDEO", default => isIOSWebKit(), value => \$pluginProxyForVideo },
+
</ins><span class="cx"> { option => "performance-timeline", desc => "Toggle Performance Timeline support",
</span><span class="cx"> define => "ENABLE_PERFORMANCE_TIMELINE", default => isGtk(), value => \$performanceTimelineSupport },
</span><span class="cx">
</span><span class="lines">@@ -438,7 +442,7 @@
</span><span class="cx"> define => "ENABLE_THREADED_HTML_PARSER", default => 0, value => \$threadedHTMLParserSupport },
</span><span class="cx">
</span><span class="cx"> { option => "touch-events", desc => "Toggle Touch Events support",
</span><del>- define => "ENABLE_TOUCH_EVENTS", default => (isBlackBerry() || isEfl()), value => \$touchEventsSupport },
</del><ins>+ define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isBlackBerry() || isEfl()), value => \$touchEventsSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "touch-slider", desc => "Toggle Touch Slider support",
</span><span class="cx"> define => "ENABLE_TOUCH_SLIDER", default => isBlackBerry(), value => \$touchSliderSupport },
</span><span class="lines">@@ -459,7 +463,7 @@
</span><span class="cx"> define => "ENABLE_VIDEO_TRACK", default => (isAppleWebKit() || isGtk() || isEfl() || isBlackBerry()), value => \$videoTrackSupport },
</span><span class="cx">
</span><span class="cx"> { option => "webgl", desc => "Toggle WebGL support",
</span><del>- define => "ENABLE_WEBGL", default => (isAppleMacWebKit() || isGtk() || isEfl()), value => \$webglSupport },
</del><ins>+ define => "ENABLE_WEBGL", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$webglSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "web-animations", desc => "Toggle Web Animation support",
</span><span class="cx"> define => "ENABLE_WEB_ANIMATION", default => 0, value => \$webAnimationSupport },
</span></span></pre>
</div>
</div>
</body>
</html>