<!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>[197942] 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/197942">197942</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-03-10 10:23:52 -0800 (Thu, 10 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] DumpRenderTree crashes when accessing window.testRunner.inspectorTestStubURL
<http://webkit.org/b/155295>
Reviewed by Brent Fulgham.
Tools:
* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::inspectorTestStubURL): Always return nullptr for
PLATFORM(IOS). This matches what we did in <a href="http://trac.webkit.org/projects/webkit/changeset/192604">r192604</a> for
WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm.
LayoutTests:
* platform/ios-simulator-wk1/TestExpectations:
* platform/ios-simulator-wk2/TestExpectations:
- Remove all "inspector/" tests. They are already skipped in
platform/ios-simulator/TestExpectations, so no need to
resurrect them here.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk1TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197941 => 197942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-10 17:55:19 UTC (rev 197941)
+++ trunk/LayoutTests/ChangeLog 2016-03-10 18:23:52 UTC (rev 197942)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-10 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] DumpRenderTree crashes when accessing window.testRunner.inspectorTestStubURL
+ <http://webkit.org/b/155295>
+
+ Reviewed by Brent Fulgham.
+
+ * platform/ios-simulator-wk1/TestExpectations:
+ * platform/ios-simulator-wk2/TestExpectations:
+ - Remove all "inspector/" tests. They are already skipped in
+ platform/ios-simulator/TestExpectations, so no need to
+ resurrect them here.
+
</ins><span class="cx"> 2016-03-10 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Implement support for inline script and inline style hashes
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations (197941 => 197942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-03-10 17:55:19 UTC (rev 197941)
+++ trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations 2016-03-10 18:23:52 UTC (rev 197942)
</span><span class="lines">@@ -876,10 +876,6 @@
</span><span class="cx"> fast/transforms/transformed-focused-text-input.html [ Failure ]
</span><span class="cx"> fast/writing-mode/Kusa-Makura-background-canvas.html [ Failure ]
</span><span class="cx">
</span><del>-# Inspector protocol tests that fail:
-inspector/debugger/setBreakpoint-actions.html [ Failure ]
-inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html [ Failure ]
-
</del><span class="cx"> # JavaScripts tests that fail:
</span><span class="cx"> js/dom/deep-recursion-test.html [ Failure ]
</span><span class="cx"> js/large-expressions.html [ Failure ]
</span><span class="lines">@@ -989,10 +985,6 @@
</span><span class="cx"> fast/text/emphasis-height-crash.html
</span><span class="cx"> fast/text/emphasis-vertical.html
</span><span class="cx"> fast/text/emphasis.html
</span><del>-inspector/debugger/pause-dedicated-worker.html
-inspector/debugger/terminate-dedicated-worker-while-paused.html
-inspector/css/selector-dynamic-specificity.html
-inspector/model/remote-object-get-properties.html
</del><span class="cx"> transitions/cubic-bezier-overflow-transform.html
</span><span class="cx">
</span><span class="cx"> # Misc tests that time out:
</span><span class="lines">@@ -1072,7 +1064,6 @@
</span><span class="cx"> http/tests/images/png-partial-load-no-alpha.html
</span><span class="cx"> http/tests/incremental/frame-focus-before-load.html
</span><span class="cx"> http/tests/incremental/pause-in-script-element.pl
</span><del>-http/tests/inspector/page/loading-iframe-document-node.html
</del><span class="cx"> http/tests/navigation/metaredirect-frames.html
</span><span class="cx"> http/tests/security/frameNavigation/context-for-location-assign.html
</span><span class="cx"> http/tests/cache/cached-main-resource.html [ Timeout ]
</span><span class="lines">@@ -1233,10 +1224,6 @@
</span><span class="cx"> fast/writing-mode/broken-ideograph-small-caps.html [ Failure ]
</span><span class="cx"> fast/writing-mode/broken-ideographic-font.html [ Failure ]
</span><span class="cx"> fast/writing-mode/japanese-rl-text-with-broken-font.html [ Failure ]
</span><del>-inspector/debugger/nested-inspectors.html [ Failure ]
-inspector/debugger/regress-133182.html [ Failure ]
-inspector/dom/getAccessibilityPropertiesForNode.html [ Failure ]
-inspector/page/javascriptDialogEvents.html [ Failure ]
</del><span class="cx"> platform/ios-simulator/ios/fast/text/underline-scaling.html [ Failure ]
</span><span class="cx"> svg/custom/linking-uri-01-b.svg [ Failure ]
</span><span class="cx"> compositing/masks/compositing-clip-path-mask-change.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (197941 => 197942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-03-10 17:55:19 UTC (rev 197941)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-03-10 18:23:52 UTC (rev 197942)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> storage/domstorage/localstorage/set-value-in-storage-after-window-close.html
</span><span class="cx"> storage/domstorage/localstorage/window-open.html
</span><span class="cx"> storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close.html
</span><del>-inspector
</del><span class="cx"> fast/loader/ping-error.html
</span><span class="cx"> fast/loader/stateobjects/popstate-fires-with-page-cache.html
</span><span class="cx"> fast/loader/stateobjects/replacestate-in-iframe.html
</span><span class="lines">@@ -451,7 +450,6 @@
</span><span class="cx"> http/tests/appcache/crash-when-navigating-away-then-back.html
</span><span class="cx"> http/tests/cache/display-image-unset-allows-cached-image-load.html
</span><span class="cx"> http/tests/cache/history-only-cached-subresource-loads.html
</span><del>-http/tests/inspector/page/loading-iframe-document-node.html
</del><span class="cx"> http/tests/misc/iframe-reparenting-id-collision.html
</span><span class="cx"> http/tests/misc/set-window-opener-to-null.html
</span><span class="cx"> http/tests/misc/slow-preload-cancel.html
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (197941 => 197942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-10 17:55:19 UTC (rev 197941)
+++ trunk/Tools/ChangeLog 2016-03-10 18:23:52 UTC (rev 197942)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-10 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] DumpRenderTree crashes when accessing window.testRunner.inspectorTestStubURL
+ <http://webkit.org/b/155295>
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::inspectorTestStubURL): Always return nullptr for
+ PLATFORM(IOS). This matches what we did in r192604 for
+ WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm.
+
</ins><span class="cx"> 2016-03-10 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add support for WOFF2
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (197941 => 197942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-03-10 17:55:19 UTC (rev 197941)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2016-03-10 18:23:52 UTC (rev 197942)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #import <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRefCF.h>
</span><span class="cx"> #import <WebCore/GeolocationPosition.h>
</span><del>-#import <WebCore/SoftLinking.h>
</del><span class="cx"> #import <WebKit/DOMDocument.h>
</span><span class="cx"> #import <WebKit/DOMElement.h>
</span><span class="cx"> #import <WebKit/DOMHTMLInputElementPrivate.h>
</span><span class="lines">@@ -79,6 +78,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+#import <WebCore/SoftLinking.h>
</ins><span class="cx"> #import <WebKit/WebIconDatabasePrivate.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -89,9 +89,9 @@
</span><span class="cx"> #import <WebKit/WebDOMOperationsPrivate.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> @interface CommandValidationTarget : NSObject <NSValidatedUserInterfaceItem>
</span><span class="cx"> {
</span><span class="cx"> SEL _action;
</span><span class="lines">@@ -785,6 +785,9 @@
</span><span class="cx">
</span><span class="cx"> JSStringRef TestRunner::inspectorTestStubURL()
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ return nullptr;
+#else
</ins><span class="cx"> // Call the soft link framework function to dlopen it, then CFBundleGetBundleWithIdentifier will work.
</span><span class="cx"> WebInspectorUILibrary();
</span><span class="cx">
</span><span class="lines">@@ -798,6 +801,7 @@
</span><span class="cx">
</span><span class="cx"> CFStringRef urlString = CFURLGetString(url.get());
</span><span class="cx"> return JSStringCreateWithCFString(urlString);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<unsigned, RetainPtr<WebScriptWorld> > WorldMap;
</span></span></pre>
</div>
</div>
</body>
</html>