153360 2016-01-22 10:52:11 -0800 Add support for testing data detection. 2016-01-22 14:32:28 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified REOPENED P2 Normal --- 1 enrica enrica lforschler ryanhaddad oldest_to_newest 1157732 0 enrica 2016-01-22 10:52:11 -0800 We want to be able to test data detection with our testing infrastructure. 1157736 1 269584 enrica 2016-01-22 10:57:08 -0800 Created attachment 269584 Patch 1157792 2 269584 thorton 2016-01-22 13:17:09 -0800 Comment on attachment 269584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=269584&action=review > Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm:111 > + if (m_options.useDataDetection) I think you should just do this in TestControllerCocoa.mm's platformCreateWebView and then you can only do it in one place. We might want to make a thing that takes the globalWebViewConfiguration and modifies it given a set of TestOptions so that we can do the same thing in platformCreateOtherPage too. 1157824 3 enrica 2016-01-22 14:17:56 -0800 Committed revision 195474. 1157835 4 ryanhaddad 2016-01-22 14:32:28 -0800 This change appears to have broken the 32-bit Mac build: <https://build.webkit.org/builders/Apple%20El%20Capitan%20Release%20%2832-bit%20Build%29/builds/2739> /Volumes/Data/slave/elcapitan-32bit-release/build/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:84:30: error: instance method '-setDataDetectorTypes:' not found (return type defaults to 'id') [-Werror,-Wobjc-method-access] /Volumes/Data/slave/elcapitan-32bit-release/build/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm:84:51: error: use of undeclared identifier 'WKDataDetectorTypeAll' 269584 2016-01-22 10:57:08 -0800 2016-01-22 13:17:09 -0800 Patch enabletestdd.txt text/plain 3948 enrica SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5NTQ2MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE2LTAxLTIyICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+ CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHRlc3RpbmcgZGF0YSBkZXRlY3Rpb24uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTMzNjAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRpbmcgYSBuZXcg dGVzdGluZyBvcHRpb24gKHVzZURhdGFEZXRlY3Rpb24pIHRvIHR1cm4gb24KKyAgICAgICAgZGF0 YSBkZXRlY3Rpb24gd2hlbiBydW5uaW5nIHRoZSBhIHRlc3QuCisKKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6dXBkYXRlVGVzdE9w dGlvbnNGcm9tVGVzdEhlYWRlcik6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0T3B0 aW9ucy5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvaW9zL1BsYXRmb3JtV2ViVmlld0lP Uy5tbToKKyAgICAgICAgKFdUUjo6UGxhdGZvcm1XZWJWaWV3OjpQbGF0Zm9ybVdlYlZpZXcpOgor ICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL1BsYXRmb3JtV2ViVmlld01hYy5tbToKKyAg ICAgICAgKFdUUjo6UGxhdGZvcm1XZWJWaWV3OjpQbGF0Zm9ybVdlYlZpZXcpOgorCiAyMDE2LTAx LTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZp eCB0aGUgbGxkYiBXZWJDb3JlTGF5b3V0VW5pdFByb3ZpZGVyIHRvIG5vdCBkeW5hbWljYWxseSBs b29rIHVwIHRoZSBMYXlvdXRVbml0IGRlbm9taW5hdG9yCkluZGV4OiBUb29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMTk1NDYxKQorKysgVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkxNyw2 ICs5MTcsOCBAQCBzdGF0aWMgdm9pZCB1cGRhdGVUZXN0T3B0aW9uc0Zyb21UZXN0SGVhCiAgICAg ICAgICAgICB0ZXN0T3B0aW9ucy51c2VUaHJlYWRlZFNjcm9sbGluZyA9IHBhcnNlQm9vbGVhblRl c3RIZWFkZXJWYWx1ZSh2YWx1ZSk7CiAgICAgICAgIGlmIChrZXkgPT0gInVzZUZsZXhpYmxlVmll d3BvcnQiKQogICAgICAgICAgICAgdGVzdE9wdGlvbnMudXNlRmxleGlibGVWaWV3cG9ydCA9IHBh cnNlQm9vbGVhblRlc3RIZWFkZXJWYWx1ZSh2YWx1ZSk7CisgICAgICAgIGlmIChrZXkgPT0gInVz ZURhdGFEZXRlY3Rpb24iKQorICAgICAgICAgICAgdGVzdE9wdGlvbnMudXNlRGF0YURldGVjdGlv biA9IHBhcnNlQm9vbGVhblRlc3RIZWFkZXJWYWx1ZSh2YWx1ZSk7CiAgICAgICAgIHBhaXJTdGFy dCA9IHBhaXJFbmQgKyAxOwogICAgIH0KIH0KSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIv VGVzdE9wdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RP cHRpb25zLmgJKHJldmlzaW9uIDE5NTQ2MSkKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVz dE9wdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBzdHJ1Y3QgVGVzdE9w dGlvbnMgewogICAgIGJvb2wgdXNlRml4ZWRMYXlvdXQgeyBmYWxzZSB9OwogICAgIGJvb2wgaXNT VkdUZXN0IHsgZmFsc2UgfTsKICAgICBib29sIGlzSGlEUElUZXN0IHsgZmFsc2UgfTsKKyAgICBi b29sIHVzZURhdGFEZXRlY3Rpb24geyBmYWxzZSB9OwogCiAgICAgVmVjdG9yPFN0cmluZz4gb3Zl cnJpZGVMYW5ndWFnZXM7CiAgICAgCkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9Q bGF0Zm9ybVdlYlZpZXdJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9pb3MvUGxhdGZvcm1XZWJWaWV3SU9TLm1tCShyZXZpc2lvbiAxOTU0NjEpCisrKyBUb29scy9X ZWJLaXRUZXN0UnVubmVyL2lvcy9QbGF0Zm9ybVdlYlZpZXdJT1MubW0JKHdvcmtpbmcgY29weSkK QEAgLTEwNyw3ICsxMDcsMTEgQEAgUGxhdGZvcm1XZWJWaWV3OjpQbGF0Zm9ybVdlYlZpZXcoV0tX ZWJWaQogICAgICwgbV9vcHRpb25zKG9wdGlvbnMpCiB7CiAgICAgQ0dSZWN0IHJlY3QgPSBDR1Jl Y3RNYWtlKDAsIDAsIFRlc3RDb250cm9sbGVyOjp2aWV3V2lkdGgsIFRlc3RDb250cm9sbGVyOjp2 aWV3SGVpZ2h0KTsKLSAgICBtX3ZpZXcgPSBbW1Rlc3RSdW5uZXJXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6cmVjdCBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb25dOworICAgIFJldGFp blB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBjb3BpZWRDb25maWd1cmF0aW9uID0gYWRvcHRO UyhbY29uZmlndXJhdGlvbiBjb3B5XSk7CisgICAgaWYgKG1fb3B0aW9ucy51c2VEYXRhRGV0ZWN0 aW9uKQorICAgICAgICBbY29waWVkQ29uZmlndXJhdGlvbiBzZXREYXRhRGV0ZWN0b3JUeXBlczpX S0RhdGFEZXRlY3RvclR5cGVBbGxdOworCisgICAgbV92aWV3ID0gW1tUZXN0UnVubmVyV0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOnJlY3QgY29uZmlndXJhdGlvbjpjb3BpZWRDb25maWd1 cmF0aW9uLmdldCgpXTsKIAogICAgIG1fd2luZG93ID0gW1tXZWJLaXRUZXN0UnVubmVyV2luZG93 IGFsbG9jXSBpbml0V2l0aEZyYW1lOnJlY3RdOwogICAgIG1fd2luZG93LnBsYXRmb3JtV2ViVmll dyA9IHRoaXM7CkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9QbGF0Zm9ybVdlYlZp ZXdNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvUGxhdGZv cm1XZWJWaWV3TWFjLm1tCShyZXZpc2lvbiAxOTU0NjEpCisrKyBUb29scy9XZWJLaXRUZXN0UnVu bmVyL21hYy9QbGF0Zm9ybVdlYlZpZXdNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTExMSw2ICsx MTEsOCBAQCBQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyhXS1dlYlZpCiAKICAgICBS ZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29waWVkQ29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW2NvbmZpZ3VyYXRpb24gY29weV0pOwogICAgIFdLUHJlZmVyZW5jZXNTZXRUaHJlYWRl ZFNjcm9sbGluZ0VuYWJsZWQoKFdLUHJlZmVyZW5jZXNSZWYpW2NvcGllZENvbmZpZ3VyYXRpb24g cHJlZmVyZW5jZXNdLCBtX29wdGlvbnMudXNlVGhyZWFkZWRTY3JvbGxpbmcpOworICAgIGlmICht X29wdGlvbnMudXNlRGF0YURldGVjdGlvbikKKyAgICAgICAgW2NvcGllZENvbmZpZ3VyYXRpb24g c2V0RGF0YURldGVjdG9yVHlwZXM6V0tEYXRhRGV0ZWN0b3JUeXBlQWxsXTsKIAogICAgIE5TUmVj dCByZWN0ID0gTlNNYWtlUmVjdCgwLCAwLCBUZXN0Q29udHJvbGxlcjo6dmlld1dpZHRoLCBUZXN0 Q29udHJvbGxlcjo6dmlld0hlaWdodCk7CiAgICAgbV92aWV3ID0gW1tUZXN0UnVubmVyV0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOnJlY3QgY29uZmlndXJhdGlvbjpjb3BpZWRDb25maWd1 cmF0aW9uLmdldCgpXTsK