149321 2015-09-17 17:56:22 -0700 [iOS WK2] When loading viewport tests, use the normal web page viewport configuration 2015-09-17 18:59:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dbates simon.fraser thorton oldest_to_newest 1126975 0 simon.fraser 2015-09-17 17:56:22 -0700 [iOS WK2] When loading viewport tests, use the normal web page viewport configuration 1126979 1 261466 simon.fraser 2015-09-17 17:59:14 -0700 Created attachment 261466 Patch 1127008 2 simon.fraser 2015-09-17 18:59:20 -0700 https://trac.webkit.org/r189958 261466 2015-09-17 17:59:14 -0700 2015-09-17 18:02:00 -0700 Patch bug-149321-20150917175901.patch text/plain 7679 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5OTQ4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTNlZjMyNjY4MmJkZTY2MzE2NWQ1NjNiOTQxZGZlYmQ1 MjFkYWFiZS4uY2Y3YjYyODY3MWU2MDEzNmZiN2Q4MTBhOGVhNGRiOTgzN2YxNDMzYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDE1LTA5LTE3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CisgICAgICAgIFtpT1MgV0syXSBXaGVuIGxvYWRpbmcgdmlld3BvcnQgdGVzdHMsIHVzZSB0aGUg bm9ybWFsIHdlYiBwYWdlIHZpZXdwb3J0IGNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTMyMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgSW5qZWN0ZWRCdW5kbGVQYWdl OjpwbGF0Zm9ybURpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoKSB1bmNvbmRpdGlvbmFs bHkgCisgICAgICAgIGVuYWJsZWQgdGhlICJ0ZXN0aW5nIiB2aWV3cG9ydCBjb25maWd1cmF0aW9u LCB3aGljaCBkaXNhYmxlcyBwYWdlIHNjYWxpbmcuCisgICAgICAgIAorICAgICAgICBJZiB3ZSdy ZSBydW5uaW5nIHZpZXdwb3J0IHRlc3RzLCB3ZSB3YW50IHRoZSBub3JtYWwgd2ViIHBhZ2UgY29u ZmlndXJhdGlvbi4KKyAgICAgICAgRG8gdGhhdCBieSBwYXNzaW5nIGEgZmxhZyBpbiB0aGUgZGlj dGlvbmFyeSBzZW50IHRvIEluamVjdGVkQnVuZGxlOjpiZWdpblRlc3RpbmcoKSwKKyAgICAgICAg YmFzZWQgb24gd2hldGhlciB0aGUgdGVzdCBpcyBpbiBhICJ2aWV3cG9ydCIgZGlyZWN0b3J5Lgor CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRs ZS5jcHA6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlOjpiZWdpblRlc3RpbmcpOgorICAg ICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvY29jb2EvSW5qZWN0ZWRCdW5k bGVQYWdlQ29jb2EubW06CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6cGxhdGZv cm1EaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKiBX ZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdElu dm9jYXRpb246OnNob3VsZExvZ0ZyYW1lTG9hZERlbGVnYXRlcyk6CisgICAgICAgIChXVFI6OlRl c3RJbnZvY2F0aW9uOjpzaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzKToKKyAgICAgICAg KFdUUjo6VGVzdEludm9jYXRpb246OnNob3VsZE1ha2VWaWV3cG9ydEZsZXhpYmxlKToKKyAgICAg ICAgKFdUUjo6VGVzdEludm9jYXRpb246Omludm9rZSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1 bm5lci9UZXN0SW52b2NhdGlvbi5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvaW9zL1Rl c3RDb250cm9sbGVySU9TLm1tOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cGxhdGZv cm1Db25maWd1cmVWaWV3Rm9yVGVzdCk6CisgICAgICAgIChXVFI6OnNob3VsZE1ha2VWaWV3cG9y dEZsZXhpYmxlKTogRGVsZXRlZC4KKworMjAxNS0wOS0xNyAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBHaXZlIGlPUyBXZWJLaXRUZXN0UnVubmVyIGEg bGF1bmNoIHN0b3J5Ym9hcmQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0OTMxNAogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCmluZGV4IDdkZDIyYzUyNjc2OWYzMmYx YzJiY2NhM2ZjZmZjZGZjZjhhMTExMDMuLjY2NjVhMmEzMGJjMDA5MDllZTRjZTUxYzM4Yjc3NTIz MjRmN2FlYjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvSW5qZWN0ZWRCdW5kbGUuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCkBAIC0yODMsNiArMjgzLDEwIEBAIHZvaWQgSW5q ZWN0ZWRCdW5kbGU6OmJlZ2luVGVzdGluZyhXS0RpY3Rpb25hcnlSZWYgc2V0dGluZ3MpCiAKICAg ICBXS0J1bmRsZVBhZ2VSZW1vdmVBbGxVc2VyQ29udGVudChwYWdlKCktPnBhZ2UoKSk7CiAKKyNp ZiBQTEFURk9STShJT1MpCisgICAgV0tCdW5kbGVQYWdlU2V0VXNlVGVzdGluZ1ZpZXdwb3J0Q29u ZmlndXJhdGlvbihwYWdlKCktPnBhZ2UoKSwgIWJvb2xlYW5Gb3JLZXkoc2V0dGluZ3MsICJVc2VG bGV4aWJsZVZpZXdwb3J0IikpOworI2VuZGlmCisKICAgICBtX3Rlc3RSdW5uZXItPnNldFNob3Vs ZER1bXBGcmFtZUxvYWRDYWxsYmFja3MoYm9vbGVhbkZvcktleShzZXR0aW5ncywgIkR1bXBGcmFt ZUxvYWREZWxlZ2F0ZXMiKSk7CiAgICAgbV90ZXN0UnVubmVyLT5zZXRVc2VyU3R5bGVTaGVldEVu YWJsZWQoZmFsc2UpOwogICAgIG1fdGVzdFJ1bm5lci0+c2V0WFNTQXVkaXRvckVuYWJsZWQoZmFs c2UpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9j b2NvYS9JbmplY3RlZEJ1bmRsZVBhZ2VDb2NvYS5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvY29jb2EvSW5qZWN0ZWRCdW5kbGVQYWdlQ29jb2EubW0KaW5kZXggNDYy YWU1YjU2OTllNTQxMmQ2ODJiYmZjZmIyN2U4MjQ5MzEyM2RmYS4uNGVlNDZmYjdkMmM4NWNmMWM2 ZTQ3MzM0MjRkNzFmMTk2ZDI4MDg4OCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9jb2NvYS9JbmplY3RlZEJ1bmRsZVBhZ2VDb2NvYS5tbQorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0luamVjdGVkQnVuZGxl UGFnZUNvY29hLm1tCkBAIC00MywxMCArNDMsNiBAQCB2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6 cGxhdGZvcm1EaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdLQnVuZGxlRnJhbWVSZQog ICAgICAgICByZXR1cm47CiAKICAgICBzZXRDcmFzaFJlcG9ydEFwcGxpY2F0aW9uU3BlY2lmaWNJ bmZvcm1hdGlvblRvVVJMKEluamVjdGVkQnVuZGxlOjpzaW5nbGV0b24oKS50ZXN0UnVubmVyKCkt PnRlc3RVUkwoKSk7Ci0KLSNpZiBQTEFURk9STShJT1MpCi0gICAgV0tCdW5kbGVQYWdlU2V0VXNl VGVzdGluZ1ZpZXdwb3J0Q29uZmlndXJhdGlvbihwYWdlKCksIHRydWUpOwotI2VuZGlmCiB9CiAK IFN0cmluZyBJbmplY3RlZEJ1bmRsZVBhZ2U6OnBsYXRmb3JtUmVzcG9uc2VNaW1lVHlwZShXS1VS TFJlc3BvbnNlUmVmIHJlc3BvbnNlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0SW52b2NhdGlvbi5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0 aW9uLmNwcAppbmRleCA2ZjE4MDY2Nzk1N2YyOTY0ZmU5YjBlYzJmOGMxYTVjNTVlMjJmNjU0Li5l N2YzZTgzMThjMDhlY2RiMzcxZjlkYjA3MTYwYzRjNWI1MzJkYTY2IDEwMDY0NAotLS0gYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcAorKysgYi9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcApAQCAtMTMyLDE2ICsxMzIsMjEgQEAgdm9pZCBU ZXN0SW52b2NhdGlvbjo6c2V0SXNQaXhlbFRlc3QoY29uc3Qgc3RkOjpzdHJpbmcmIGV4cGVjdGVk UGl4ZWxIYXNoKQogICAgIG1fZXhwZWN0ZWRQaXhlbEhhc2ggPSBleHBlY3RlZFBpeGVsSGFzaDsK IH0KIAotYm9vbCBUZXN0SW52b2NhdGlvbjo6c2hvdWxkTG9nRnJhbWVMb2FkRGVsZWdhdGVzKCkK K2Jvb2wgVGVzdEludm9jYXRpb246OnNob3VsZExvZ0ZyYW1lTG9hZERlbGVnYXRlcygpIGNvbnN0 CiB7CiAgICAgcmV0dXJuIHVybENvbnRhaW5zKCJsb2FkaW5nLyIpOwogfQogCi1ib29sIFRlc3RJ bnZvY2F0aW9uOjpzaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzKCkKK2Jvb2wgVGVzdElu dm9jYXRpb246OnNob3VsZExvZ0hpc3RvcnlDbGllbnRDYWxsYmFja3MoKSBjb25zdAogewogICAg IHJldHVybiB1cmxDb250YWlucygiZ2xvYmFsaGlzdG9yeS8iKTsKIH0KIAorYm9vbCBUZXN0SW52 b2NhdGlvbjo6c2hvdWxkTWFrZVZpZXdwb3J0RmxleGlibGUoKSBjb25zdAoreworICAgIHJldHVy biB1cmxDb250YWlucygidmlld3BvcnQvIik7Cit9CisKIHZvaWQgVGVzdEludm9jYXRpb246Omlu dm9rZSgpCiB7CiAgICAgVGVzdENvbnRyb2xsZXI6OnNpbmdsZXRvbigpLmNvbmZpZ3VyZVZpZXdG b3JUZXN0KCp0aGlzKTsKQEAgLTE2Myw2ICsxNjgsMTAgQEAgdm9pZCBUZXN0SW52b2NhdGlvbjo6 aW52b2tlKCkKICAgICBXS1JldGFpblB0cjxXS0Jvb2xlYW5SZWY+IGR1bXBGcmFtZUxvYWREZWxl Z2F0ZXNWYWx1ZSA9IGFkb3B0V0soV0tCb29sZWFuQ3JlYXRlKHNob3VsZExvZ0ZyYW1lTG9hZERl bGVnYXRlcygpKSk7CiAgICAgV0tEaWN0aW9uYXJ5U2V0SXRlbShiZWdpblRlc3RNZXNzYWdlQm9k eS5nZXQoKSwgZHVtcEZyYW1lTG9hZERlbGVnYXRlc0tleS5nZXQoKSwgZHVtcEZyYW1lTG9hZERl bGVnYXRlc1ZhbHVlLmdldCgpKTsKIAorICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB1c2VG bGV4aWJsZVZpZXdwb3J0S2V5ID0gYWRvcHRXSyhXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmlu ZygiVXNlRmxleGlibGVWaWV3cG9ydCIpKTsKKyAgICBXS1JldGFpblB0cjxXS0Jvb2xlYW5SZWY+ IHVzZUZsZXhpYmxlVmlld3BvcnRWYWx1ZSA9IGFkb3B0V0soV0tCb29sZWFuQ3JlYXRlKHNob3Vs ZE1ha2VWaWV3cG9ydEZsZXhpYmxlKCkpKTsKKyAgICBXS0RpY3Rpb25hcnlTZXRJdGVtKGJlZ2lu VGVzdE1lc3NhZ2VCb2R5LmdldCgpLCB1c2VGbGV4aWJsZVZpZXdwb3J0S2V5LmdldCgpLCB1c2VG bGV4aWJsZVZpZXdwb3J0VmFsdWUuZ2V0KCkpOworCiAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdS ZWY+IGR1bXBQaXhlbHNLZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5n KCJEdW1wUGl4ZWxzIikpOwogICAgIFdLUmV0YWluUHRyPFdLQm9vbGVhblJlZj4gZHVtcFBpeGVs c1ZhbHVlID0gYWRvcHRXSyhXS0Jvb2xlYW5DcmVhdGUobV9kdW1wUGl4ZWxzKSk7CiAgICAgV0tE aWN0aW9uYXJ5U2V0SXRlbShiZWdpblRlc3RNZXNzYWdlQm9keS5nZXQoKSwgZHVtcFBpeGVsc0tl eS5nZXQoKSwgZHVtcFBpeGVsc1ZhbHVlLmdldCgpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVz dEludm9jYXRpb24uaAppbmRleCA2MTdiYmEwYTJhZWM4OTc3YjRjZTAzODk1YWU1OTgxZjBlNGU4 NjJiLi4wYmUwMDJlYWQwYWU5ZjNhZDNiOGJkODdjODA2ZTEyZTI2MTcyMzdhIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmgKKysrIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5oCkBAIC02MCw2ICs2MCw4IEBAIHB1YmxpYzoK ICAgICB2b2lkIGRpZEVuZFN3aXBlKCk7CiAgICAgdm9pZCBkaWRSZW1vdmVTd2lwZVNuYXBzaG90 KCk7CiAKKyAgICBib29sIHNob3VsZE1ha2VWaWV3cG9ydEZsZXhpYmxlKCkgY29uc3Q7CisKIHBy aXZhdGU6CiAgICAgdm9pZCBkdW1wUmVzdWx0cygpOwogICAgIHN0YXRpYyB2b2lkIGR1bXAoY29u c3QgY2hhciogdGV4dFRvU3Rkb3V0LCBjb25zdCBjaGFyKiB0ZXh0VG9TdGRlcnIgPSAwLCBib29s IHNlZW5FcnJvciA9IGZhbHNlKTsKQEAgLTcwLDggKzcyLDggQEAgcHJpdmF0ZToKIAogICAgIHN0 YXRpYyB2b2lkIGZvcmNlUmVwYWludERvbmVDYWxsYmFjayhXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KTsKIAotICAgIGJvb2wgc2hvdWxkTG9nRnJhbWVMb2FkRGVsZWdhdGVzKCk7Ci0gICAgYm9v bCBzaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzKCk7CisgICAgYm9vbCBzaG91bGRMb2dG cmFtZUxvYWREZWxlZ2F0ZXMoKSBjb25zdDsKKyAgICBib29sIHNob3VsZExvZ0hpc3RvcnlDbGll bnRDYWxsYmFja3MoKSBjb25zdDsKIAogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBtX3VybDsK ICAgICBXVEY6OlN0cmluZyBtX3VybFN0cmluZzsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvaW9zL1Rlc3RDb250cm9sbGVySU9TLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9pb3MvVGVzdENvbnRyb2xsZXJJT1MubW0KaW5kZXggZjZhMWQzY2M5NDllNmE5YTYyMTRmYjBi YzQxZTk5Mzg1NmMzNDE5NS4uMzFhZGFjMDVmNjQ5MDRiODU1MTI1YjcyMDE0OWM1MGRlOGU4NzRk MyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9pb3MvVGVzdENvbnRyb2xsZXJJ T1MubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9pb3MvVGVzdENvbnRyb2xsZXJJT1Mu bW0KQEAgLTc0LDExICs3NCw2IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemVUZXN0 UGx1Z2luRGlyZWN0b3J5KCkKICAgICBtX3Rlc3RQbHVnaW5EaXJlY3RvcnkuYWRvcHQoV0tTdHJp bmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKENGU3RyaW5nUmVmKVtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0g YnVuZGxlUGF0aF0pKTsKIH0KIAotc3RhdGljIGJvb2wgc2hvdWxkTWFrZVZpZXdwb3J0RmxleGli bGUoY29uc3QgVGVzdEludm9jYXRpb24mIHRlc3QpCi17Ci0gICAgcmV0dXJuIHRlc3QudXJsQ29u dGFpbnMoInZpZXdwb3J0LyIpOwotfQotCiB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybVJl c2V0UHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogewogICAgIFdLUHJlZmVyZW5jZXNS ZWYgcHJlZmVyZW5jZXMgPSBwbGF0Zm9ybVByZWZlcmVuY2VzKCk7CkBAIC05MywxMiArODgsMTMg QEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1SZXNldFN0YXRlVG9Db25zaXN0ZW50VmFs dWVzKCkKIAogdm9pZCBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1Db25maWd1cmVWaWV3Rm9yVGVz dChjb25zdCBUZXN0SW52b2NhdGlvbiYgdGVzdCkKIHsKLSAgICBpZiAoc2hvdWxkTWFrZVZpZXdw b3J0RmxleGlibGUodGVzdCkpIHsKKyAgICBpZiAodGVzdC5zaG91bGRNYWtlVmlld3BvcnRGbGV4 aWJsZSgpKSB7CiAgICAgICAgIGNvbnN0IHVuc2lnbmVkIHBob25lVmlld0hlaWdodCA9IDQ4MDsK ICAgICAgICAgY29uc3QgdW5zaWduZWQgcGhvbmVWaWV3V2lkdGggPSAzMjA7CiAKICAgICAgICAg bWFpbldlYlZpZXcoKS0+cmVzaXplVG8ocGhvbmVWaWV3V2lkdGgsIHBob25lVmlld0hlaWdodCk7 Ci0gICAgICAgIC8vIEZJWE1FOiBtb3JlIHZpZXdwb3J0IGNvbmZpZyB0byBkbyBoZXJlLgorICAg ICAgICAvLyBXZSBhbHNvIHBhc3MgZGF0YSB0byBJbmplY3RlZEJ1bmRsZTo6YmVnaW5UZXN0aW5n KCkgdG8gaGF2ZSBpdCBjYWxsCisgICAgICAgIC8vIFdLQnVuZGxlUGFnZVNldFVzZVRlc3RpbmdW aWV3cG9ydENvbmZpZ3VyYXRpb24oZmFsc2UpLgogICAgIH0KIH0KIAo=