Title: [197942] trunk
Revision
197942
Author
[email protected]
Date
2016-03-10 10:23:52 -0800 (Thu, 10 Mar 2016)

Log Message

[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 r192604 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.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (197941 => 197942)


--- trunk/LayoutTests/ChangeLog	2016-03-10 17:55:19 UTC (rev 197941)
+++ trunk/LayoutTests/ChangeLog	2016-03-10 18:23:52 UTC (rev 197942)
@@ -1,3 +1,16 @@
+2016-03-10  David Kilzer  <[email protected]>
+
+        [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.
+
 2016-03-10  Daniel Bates  <[email protected]>
 
         CSP: Implement support for inline script and inline style hashes

Modified: trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations (197941 => 197942)


--- 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)
@@ -876,10 +876,6 @@
 fast/transforms/transformed-focused-text-input.html [ Failure ]
 fast/writing-mode/Kusa-Makura-background-canvas.html [ Failure ]
 
-# Inspector protocol tests that fail:
-inspector/debugger/setBreakpoint-actions.html [ Failure ]
-inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html [ Failure ]
-
 # _javascript_s tests that fail:
 js/dom/deep-recursion-test.html [ Failure ]
 js/large-expressions.html [ Failure ]
@@ -989,10 +985,6 @@
 fast/text/emphasis-height-crash.html
 fast/text/emphasis-vertical.html
 fast/text/emphasis.html
-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
 transitions/cubic-bezier-overflow-transform.html
 
 # Misc tests that time out:
@@ -1072,7 +1064,6 @@
 http/tests/images/png-partial-load-no-alpha.html
 http/tests/incremental/frame-focus-before-load.html
 http/tests/incremental/pause-in-script-element.pl
-http/tests/inspector/page/loading-iframe-document-node.html
 http/tests/navigation/metaredirect-frames.html
 http/tests/security/frameNavigation/context-for-location-assign.html
 http/tests/cache/cached-main-resource.html [ Timeout ]
@@ -1233,10 +1224,6 @@
 fast/writing-mode/broken-ideograph-small-caps.html [ Failure ]
 fast/writing-mode/broken-ideographic-font.html [ Failure ]
 fast/writing-mode/japanese-rl-text-with-broken-font.html [ Failure ]
-inspector/debugger/nested-inspectors.html [ Failure ]
-inspector/debugger/regress-133182.html [ Failure ]
-inspector/dom/getAccessibilityPropertiesForNode.html [ Failure ]
-inspector/page/_javascript_DialogEvents.html [ Failure ]
 platform/ios-simulator/ios/fast/text/underline-scaling.html [ Failure ]
 svg/custom/linking-uri-01-b.svg [ Failure ]
 compositing/masks/compositing-clip-path-mask-change.html [ ImageOnlyFailure ]

Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (197941 => 197942)


--- 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)
@@ -87,7 +87,6 @@
 storage/domstorage/localstorage/set-value-in-storage-after-window-close.html
 storage/domstorage/localstorage/window-open.html
 storage/domstorage/localstorage/access-storage-then-set-value-in-storage-after-window-close.html
-inspector
 fast/loader/ping-error.html
 fast/loader/stateobjects/popstate-fires-with-page-cache.html
 fast/loader/stateobjects/replacestate-in-iframe.html
@@ -451,7 +450,6 @@
 http/tests/appcache/crash-when-navigating-away-then-back.html
 http/tests/cache/display-image-unset-allows-cached-image-load.html
 http/tests/cache/history-only-cached-subresource-loads.html
-http/tests/inspector/page/loading-iframe-document-node.html
 http/tests/misc/iframe-reparenting-id-collision.html
 http/tests/misc/set-window-opener-to-null.html
 http/tests/misc/slow-preload-cancel.html

Modified: trunk/Tools/ChangeLog (197941 => 197942)


--- trunk/Tools/ChangeLog	2016-03-10 17:55:19 UTC (rev 197941)
+++ trunk/Tools/ChangeLog	2016-03-10 18:23:52 UTC (rev 197942)
@@ -1,3 +1,15 @@
+2016-03-10  David Kilzer  <[email protected]>
+
+        [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.
+
 2016-03-10  Frederic Wang  <[email protected]>
 
         [GTK] Add support for WOFF2

Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (197941 => 197942)


--- 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)
@@ -43,7 +43,6 @@
 #import <_javascript_Core/JSStringRef.h>
 #import <_javascript_Core/JSStringRefCF.h>
 #import <WebCore/GeolocationPosition.h>
-#import <WebCore/SoftLinking.h>
 #import <WebKit/DOMDocument.h>
 #import <WebKit/DOMElement.h>
 #import <WebKit/DOMHTMLInputElementPrivate.h>
@@ -79,6 +78,7 @@
 #import <wtf/RetainPtr.h>
 
 #if !PLATFORM(IOS)
+#import <WebCore/SoftLinking.h>
 #import <WebKit/WebIconDatabasePrivate.h>
 #endif
 
@@ -89,9 +89,9 @@
 #import <WebKit/WebDOMOperationsPrivate.h>
 #endif
 
+#if !PLATFORM(IOS)
 SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
 
-#if !PLATFORM(IOS)
 @interface CommandValidationTarget : NSObject <NSValidatedUserInterfaceItem>
 {
     SEL _action;
@@ -785,6 +785,9 @@
 
 JSStringRef TestRunner::inspectorTestStubURL()
 {
+#if PLATFORM(IOS)
+    return nullptr;
+#else
     // Call the soft link framework function to dlopen it, then CFBundleGetBundleWithIdentifier will work.
     WebInspectorUILibrary();
 
@@ -798,6 +801,7 @@
 
     CFStringRef urlString = CFURLGetString(url.get());
     return JSStringCreateWithCFString(urlString);
+#endif
 }
 
 typedef HashMap<unsigned, RetainPtr<WebScriptWorld> > WorldMap;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to