133779 2014-06-11 17:41:24 -0700 [iOS WK2] Give WebKitTestRunner a viewport configuration with initial scale=1 for testing 2014-06-11 22:24:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 133785 1 simon.fraser simon.fraser andersca benjamin ddkilzer dfarler simon.fraser oldest_to_newest 1014995 0 simon.fraser 2014-06-11 17:41:24 -0700 [iOS WK2] Give WebKitTestRunner a viewport configuration with initial scale=1 for testing 1014998 1 232925 simon.fraser 2014-06-11 17:45:28 -0700 Created attachment 232925 Patch 1015001 2 232925 benjamin 2014-06-11 17:49:56 -0700 Comment on attachment 232925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232925&action=review > Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm:247 > + WebPageProxy *webPageProxy = [_contentView page]; * on the wrong side. > Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm:248 > + webPageProxy->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(bounds.size)); You should also send setMaximumUnobscuredSize() so that we can use viewport units. You could set setViewportConfigurationMinimumLayoutSizeForMinimalUI() but there is no test for it. They should all take the same size in this case. > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:2200 > + if (m_useTestingViewportConfiguration) { > + m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::testingParameters()); > + return; > + } Shouldn't this be above the case with !frame? 1015007 3 simon.fraser 2014-06-11 19:04:36 -0700 https://trac.webkit.org/r169869 232925 2014-06-11 17:45:28 -0700 2014-06-11 17:49:56 -0700 Patch bug-133779-20140611174505.patch text/plain 13537 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5ODQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAwODRkODYzNjU2YTdi NGQ4NTlkMGFhNzA4MmUzMjBmNDY5NjkzMS4uNWQxZTQ3NjMzNTE1NzFmNTU4NjljOWE2OGYwM2Mw Nzg2NmVkYTk4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA2LTExICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBH aXZlIFdlYktpdFRlc3RSdW5uZXIgYSB2aWV3cG9ydCBjb25maWd1cmF0aW9uIHdpdGggaW5pdGlh bCBzY2FsZT0xIGZvciB0ZXN0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzM3NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgYSAidGVzdGluZyIgdmlld3BvcnQgY29uZmlndXJhdGlvbiB3aXRo IGluaXRpYWwgc2NhbGUgb2YgMS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAg ICAqIHBhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZp ZXdwb3J0Q29uZmlndXJhdGlvbjo6dGVzdGluZ1BhcmFtZXRlcnMpOgorICAgICAgICAqIHBhZ2Uv Vmlld3BvcnRDb25maWd1cmF0aW9uLmg6CisKIDIwMTQtMDYtMTEgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBtb3JlIHVubmVlZGVk IG1lbWJlciBmdW5jdGlvbnMgZnJvbSBIVFRQSGVhZGVyTWFwCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGM4MTdl ZGVmNDViZjBlMzIzZTVlYWI1ZDUxYTE5ZWEyYzI5YjQxNC4uMTk2ODQwZjdiOGEyOTg0YWMyMTI0 YWIwMmM3YTllZDMzNTE0NDU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA2 LTExICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtp T1MgV0syXSBHaXZlIFdlYktpdFRlc3RSdW5uZXIgYSB2aWV3cG9ydCBjb25maWd1cmF0aW9uIHdp dGggaW5pdGlhbCBzY2FsZT0xIGZvciB0ZXN0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM3NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFN1cHBvcnQgYSBjdXN0b20gdmlld3BvcnQg Y29uZmlndXJhdGlvbiBmb3IgdGVzdGluZywgb24gaU9TLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9pb3MvV0tWaWV3SU9TLm1tOgorICAgICAgICAoLVtXS1ZpZXcgX2ZyYW1lT3JCb3VuZHND aGFuZ2VkXSk6IENhbGwgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9uTWluaW11bUxheW91dFNpemUo KQorICAgICAgICBqdXN0IGFzIFdLV2ViVmlldyBkb2VzLgorICAgICAgICAqIFdlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdLQnVuZGxl UGFnZVNldFVzZVRlc3RpbmdWaWV3cG9ydENvbmZpZ3VyYXRpb24pOiBOZXcgU1BJIHRvIHNldCBh IHZpZXdwb3J0IGNvbmZpZyBmb3IgdGVzdGluZy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVj dGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZVByaXZhdGUuaDogRGl0dG8uCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl OjpXZWJQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZXRVc2VUZXN0aW5nVmlld3BvcnRDb25maWd1cmF0aW9u KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6aXNVc2luZ1Rlc3RpbmdWaWV3cG9ydENvbmZp Z3VyYXRpb24pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVzZXRWaWV3cG9ydERlZmF1bHRDb25maWd1 cmF0aW9uKToKKwogMjAxNC0wNi0xMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CiAKICAgICAgICAgW3drMl0gRG9uJ3QgZGlzcGF0Y2ggdmlldyBzdGF0ZSBjaGFu Z2VzIGltbWVkaWF0ZWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p biBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGZhODAyYjNmMDZhNDk5YjVm ZGMyMWJkZmZmZGI2NTYyN2MyOTc3MDkuLmQ0NjU1OGNjOTJhZGI5NzZmNmY5ZmE3MGI0OTZiYzFi YjMzODRiZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC05MjMsNiArOTIzLDcgQEAgX19aTjdX ZWJDb3JlMjFVc2VyQ29udGVudENvbnRyb2xsZXJEMUV2CiBfX1pON1dlYkNvcmUyMVVzZXJDb250 ZW50VVJMUGF0dGVybjVwYXJzZUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTIxVmlld3Bv cnRDb25maWd1cmF0aW9uMTRyZXNldE1pbmltYWxVSUV2CiBfX1pON1dlYkNvcmUyMVZpZXdwb3J0 Q29uZmlndXJhdGlvbjE1c2V0Q29udGVudHNTaXplRVJLTlNfN0ludFNpemVFCitfX1pON1dlYkNv cmUyMVZpZXdwb3J0Q29uZmlndXJhdGlvbjE3dGVzdGluZ1BhcmFtZXRlcnNFdgogX19aTjdXZWJD b3JlMjFWaWV3cG9ydENvbmZpZ3VyYXRpb24xN3dlYnBhZ2VQYXJhbWV0ZXJzRXYKIF9fWk43V2Vi Q29yZTIxVmlld3BvcnRDb25maWd1cmF0aW9uMjBzZXRNaW5pbXVtTGF5b3V0U2l6ZUVSS05TXzlG bG9hdFNpemVFCiBfX1pON1dlYkNvcmUyMVZpZXdwb3J0Q29uZmlndXJhdGlvbjIwc2V0Vmlld3Bv cnRBcmd1bWVudHNFUktOU18xN1ZpZXdwb3J0QXJndW1lbnRzRQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwCmluZGV4IDcyN2RiY2I3NzkwNzcyMzlmZjJh MDljZDJkODk4ZmVlM2Q5Y2I3MjIuLmE5MzQwMDYwNzlhNTg2MDhjOTkwZWYxYzAzZmVlYTUyYTJh MzZkMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0 aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5j cHAKQEAgLTIxOCw2ICsyMTgsMTYgQEAgVmlld3BvcnRDb25maWd1cmF0aW9uOjpQYXJhbWV0ZXJz IFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6eGh0bWxNb2JpbGVQYXJhbWV0ZXJzKCkKICAgICByZXR1 cm4gcGFyYW1ldGVyczsKIH0KIAorVmlld3BvcnRDb25maWd1cmF0aW9uOjpQYXJhbWV0ZXJzIFZp ZXdwb3J0Q29uZmlndXJhdGlvbjo6dGVzdGluZ1BhcmFtZXRlcnMoKQoreworICAgIFBhcmFtZXRl cnMgcGFyYW1ldGVyczsKKyAgICBwYXJhbWV0ZXJzLmluaXRpYWxTY2FsZSA9IDE7CisgICAgcGFy YW1ldGVycy5pbml0aWFsU2NhbGVJc1NldCA9IHRydWU7CisgICAgcGFyYW1ldGVycy5taW5pbXVt U2NhbGUgPSAxOworICAgIHBhcmFtZXRlcnMubWF4aW11bVNjYWxlID0gNTsKKyAgICByZXR1cm4g cGFyYW1ldGVyczsKK30KKwogc3RhdGljIGlubGluZSBib29sIHZpZXdwb3J0QXJndW1lbnRWYWx1 ZUlzVmFsaWQoZmxvYXQgdmFsdWUpCiB7CiAgICAgcmV0dXJuIHZhbHVlID4gMDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oCmluZGV4IGMyMjZiMDNlMWZjMzM0 ZWViMTFmZGU3NTE5Y2QwYjFkMzE2MmVjOWYuLmJhNDVjYTJhYjk5Mzg2M2MwMTM0NDY2MTQ3YTIy ZTFhNmM3YTBmYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25m aWd1cmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRp b24uaApAQCAtOTYsNiArOTYsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBhcmFtZXRlcnMgdGV4 dERvY3VtZW50UGFyYW1ldGVycygpOwogICAgIHN0YXRpYyBQYXJhbWV0ZXJzIGltYWdlRG9jdW1l bnRQYXJhbWV0ZXJzKCk7CiAgICAgc3RhdGljIFBhcmFtZXRlcnMgeGh0bWxNb2JpbGVQYXJhbWV0 ZXJzKCk7CisgICAgc3RhdGljIFBhcmFtZXRlcnMgdGVzdGluZ1BhcmFtZXRlcnMoKTsKICAgICAK ICNpZm5kZWYgTkRFQlVHCiAgICAgV1RGOjpDU3RyaW5nIGRlc2NyaXB0aW9uKCkgY29uc3Q7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0KaW5kZXggMTk4 NjY3MTQ4MzRlOGMxMDEwY2I4MzNkYjk5NTdkZDE0Yjc5YjI1OS4uM2U0NGNkNzNhZTUyZTM2NDQ4 MDZlNTEyZTQ1YWExZjZkOWI1MDIxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9pb3MvV0tWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvaW9zL1dLVmlld0lPUy5tbQpAQCAtMjQzLDYgKzI0MywxMCBAQCAtICh2b2lkKV9jb21tb25J bml0aWFsaXphdGlvbldpdGhDb250ZXh0UmVmOihXS0NvbnRleHRSZWYpY29udGV4dFJlZiBwYWdl R3JvdXBSZQogLSAodm9pZClfZnJhbWVPckJvdW5kc0NoYW5nZWQKIHsKICAgICBDR1JlY3QgYm91 bmRzID0gW3NlbGYgYm91bmRzXTsKKworICAgIFdlYlBhZ2VQcm94eSAqd2ViUGFnZVByb3h5ID0g W19jb250ZW50VmlldyBwYWdlXTsKKyAgICB3ZWJQYWdlUHJveHktPnNldFZpZXdwb3J0Q29uZmln dXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKFdlYkNvcmU6OkZsb2F0U2l6ZShib3VuZHMuc2l6ZSkp OworCiAgICAgW19zY3JvbGxWaWV3IHNldEZyYW1lOmJvdW5kc107CiAgICAgW19jb250ZW50Vmll dyBzZXRNaW5pbXVtU2l6ZTpib3VuZHMuc2l6ZV07CiAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVD b250ZW50UmVjdHNdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuY3BwCmluZGV4IDRjOGRlOTUx NDBkYTRkMGE1ZDZiNjI2NGU3ZmFkYTVlOTZkNGMzNTcuLjM4YTJhYjNkNzZiN2MyZTI3NzczOTgz YzEyNGY2MmU4MDcwODUwOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZS5jcHAKQEAgLTU2 NSwzICs1NjUsMTAgQEAgYm9vbCBXS0J1bmRsZVBhZ2VJc1VzaW5nRXBoZW1lcmFsU2Vzc2lvbihX S0J1bmRsZVBhZ2VSZWYgcGFnZVJlZikKIHsKICAgICByZXR1cm4gdG9JbXBsKHBhZ2VSZWYpLT51 c2VzRXBoZW1lcmFsU2Vzc2lvbigpOwogfQorCisjaWYgVEFSR0VUX09TX0lQSE9ORQordm9pZCBX S0J1bmRsZVBhZ2VTZXRVc2VUZXN0aW5nVmlld3BvcnRDb25maWd1cmF0aW9uKFdLQnVuZGxlUGFn ZVJlZiBwYWdlUmVmLCBib29sIHVzZVRlc3RpbmdWaWV3cG9ydENvbmZpZ3VyYXRpb24pCit7Cisg ICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRVc2VUZXN0aW5nVmlld3BvcnRDb25maWd1cmF0aW9uKHVz ZVRlc3RpbmdWaWV3cG9ydENvbmZpZ3VyYXRpb24pOworfQorI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFn ZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2MvV0tCdW5kbGVQYWdlUHJpdmF0ZS5oCmluZGV4IGUyZWVlZGRjMTI4Mjg2NWU0ZmY4OGY0NDQz ZDUxYzY1NjJjNjQzNTEuLmM2NmU3NGMwN2YwYmU3YWVjMGJhMTc0ZjEwMTQwMzAzNzFkZTA2NDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2MvV0tCdW5kbGVQYWdlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlUHJpdmF0ZS5oCkBAIC05Myw2ICs5Mywx MCBAQCB0eXBlZGVmIHVuc2lnbmVkIFdLUmVuZGVyaW5nU3VwcHJlc3Npb25Ub2tlbjsKIFdLX0VY UE9SVCBXS1JlbmRlcmluZ1N1cHByZXNzaW9uVG9rZW4gV0tCdW5kbGVQYWdlRXh0ZW5kSW5jcmVt ZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvbihXS0J1bmRsZVBhZ2VSZWYpOwogV0tfRVhQT1JUIHZv aWQgV0tCdW5kbGVQYWdlU3RvcEV4dGVuZGluZ0luY3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Np b24oV0tCdW5kbGVQYWdlUmVmLCBXS1JlbmRlcmluZ1N1cHByZXNzaW9uVG9rZW4pOwogCisjaWYg VEFSR0VUX09TX0lQSE9ORQorV0tfRVhQT1JUIHZvaWQgV0tCdW5kbGVQYWdlU2V0VXNlVGVzdGlu Z1ZpZXdwb3J0Q29uZmlndXJhdGlvbihXS0J1bmRsZVBhZ2VSZWYsIGJvb2wpOworI2VuZGlmCisK ICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggYjA0MTMzMWE2OTg3YjA0YTY4MDBhOTkwOGNk N2QwMDdlNzZhOWY4OS4uMWJkZWJjOTc1Yzc3MzlmMjU3ODQyMDllZjkxMzUyOTBhZDMxYTc1NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt Mjk5LDYgKzI5OSw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCBX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogICAgICwgbV91c2VySGFzQ2hh bmdlZFBhZ2VTY2FsZUZhY3RvcihmYWxzZSkKICAgICAsIG1fdXNlcklzSW50ZXJhY3RpbmcoZmFs c2UpCiAgICAgLCBtX2hhc1BlbmRpbmdCbHVyTm90aWZpY2F0aW9uKGZhbHNlKQorICAgICwgbV91 c2VUZXN0aW5nVmlld3BvcnRDb25maWd1cmF0aW9uKGZhbHNlKQogICAgICwgbV9zY3JlZW5TaXpl KHBhcmFtZXRlcnMuc2NyZWVuU2l6ZSkKICAgICAsIG1fYXZhaWxhYmxlU2NyZWVuU2l6ZShwYXJh bWV0ZXJzLmF2YWlsYWJsZVNjcmVlblNpemUpCiAgICAgLCBtX2RldmljZU9yaWVudGF0aW9uKDAp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCBmYWQ3 NTJkNGIzZTk2MTM3MDUxYjJiYWQ5MDNlM2U4NDlhNGFmNmVjLi44NmMwMGYwYzRjMjQ1NDY5ZWU4 NWY5NGVhZWI3ZDljMzY3MzFlM2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgKQEAgLTQ1OSw2ICs0NTksOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWRS ZWNlaXZlTW9iaWxlRG9jVHlwZShib29sKTsKICAgICB2b2lkIHJlc3RvcmVQYWdlU3RhdGUoZG91 YmxlIHNjYWxlLCBib29sIHVzZXJIYXNDaGFuZ2VkUGFnZVNjYWxlRmFjdG9yLCBjb25zdCBXZWJD b3JlOjpJbnRQb2ludCYgZXhwb3NlZE9yaWdpbik7CiAKKyAgICB2b2lkIHNldFVzZVRlc3RpbmdW aWV3cG9ydENvbmZpZ3VyYXRpb24oYm9vbCB1c2VUZXN0aW5nVmlld3BvcnQpIHsgbV91c2VUZXN0 aW5nVmlld3BvcnRDb25maWd1cmF0aW9uID0gdXNlVGVzdGluZ1ZpZXdwb3J0OyB9CisgICAgYm9v bCBpc1VzaW5nVGVzdGluZ1ZpZXdwb3J0Q29uZmlndXJhdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1f dXNlVGVzdGluZ1ZpZXdwb3J0Q29uZmlndXJhdGlvbjsgfQorCiAgICAgZG91YmxlIG1pbmltdW1Q YWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKICAgICBkb3VibGUgbWF4aW11bVBhZ2VTY2FsZUZhY3Rv cigpIGNvbnN0OwogICAgIGJvb2wgYWxsb3dzVXNlclNjYWxpbmcoKSBjb25zdDsKQEAgLTEyMjEs NiArMTIyNCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3VzZXJIYXNDaGFuZ2VkUGFnZVNjYWxl RmFjdG9yOwogICAgIGJvb2wgbV91c2VySXNJbnRlcmFjdGluZzsKICAgICBib29sIG1faGFzUGVu ZGluZ0JsdXJOb3RpZmljYXRpb247CisgICAgYm9vbCBtX3VzZVRlc3RpbmdWaWV3cG9ydENvbmZp Z3VyYXRpb247CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIG1fc2NyZWVuU2l6ZTsKICAgICBXZWJD b3JlOjpGbG9hdFNpemUgbV9hdmFpbGFibGVTY3JlZW5TaXplOwogICAgIFJlZlB0cjxXZWJDb3Jl OjpSYW5nZT4gbV9jdXJyZW50QmxvY2tTZWxlY3Rpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggNzA4NmU3NDc4NmYz ZDZhN2YxZWMyZTUyYmVlZDJjYTQ2NTczZmQ0OC4uM2ZlODM4NGI3MzdiYTk2ZDk4YWVkMzgzMWI5 ZTA4OTllMjkzY2ZiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjE5Myw2ICsyMTkzLDExIEBAIHZvaWQgV2ViUGFn ZTo6cmVzZXRWaWV3cG9ydERlZmF1bHRDb25maWd1cmF0aW9uKFdlYkZyYW1lKiBmcmFtZSkKICAg ICAgICAgbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uc2V0RGVmYXVsdENvbmZpZ3VyYXRpb24oVmll d3BvcnRDb25maWd1cmF0aW9uOjp3ZWJwYWdlUGFyYW1ldGVycygpKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KKyAgICAKKyAgICBpZiAobV91c2VUZXN0aW5nVmlld3BvcnRDb25maWd1cmF0aW9u KSB7CisgICAgICAgIG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldERlZmF1bHRDb25maWd1cmF0 aW9uKFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6dGVzdGluZ1BhcmFtZXRlcnMoKSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CiAKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBmcmFtZS0+Y29yZUZy YW1lKCktPmRvY3VtZW50KCk7CiAgICAgaWYgKGRvY3VtZW50LT5pc0ltYWdlRG9jdW1lbnQoKSkK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMGY4 NjgzYTBlODgwMjE4ODdmYWQ3ZjliYmU5MDZhZmY5MzllYTg0Li4wNjBlNjk5ZDg4MTM4MzBmNmU0 NjU3NDVlOWQ4MmZkYWFkZWI1OGMyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTQtMDYtMTEgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAgICAgICAgW2lPUyBXSzJdIEdpdmUgV2Vi S2l0VGVzdFJ1bm5lciBhIHZpZXdwb3J0IGNvbmZpZ3VyYXRpb24gd2l0aCBpbml0aWFsIHNjYWxl PTEgZm9yIHRlc3RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzMzc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAg ICAgICAKKyAgICAgICAgVGVsbCB0aGUgV2ViUGFnZSB0byB1c2UgdGhlIHRlc3Rpbmcgdmlld3Bv cnQgY29uZmlndXJhdGlvbiBmcm9tIHRoZSBpbmplY3RlZCBidW5kbGUuCisKKyAgICAgICAgKiBX ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcDoKKyAgICAg ICAgKFdUUjo6SW5qZWN0ZWRCdW5kbGU6OmRpZFJlY2VpdmVNZXNzYWdlKTogQ29kZSBjbGVhbnVw LgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvY29jb2EvSW5qZWN0 ZWRCdW5kbGVQYWdlQ29jb2EubW06CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6 cGxhdGZvcm1EaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKTogQ2FsbCBXS0J1bmRsZVBh Z2VTZXRVc2VUZXN0aW5nVmlld3BvcnRDb25maWd1cmF0aW9uKCkKKyAgICAgICAgb24gaU9TLgor CisyMDE0LTA2LTExICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAg ICAgICAgIFdUUiBjbGVhbnVwOiBwdXNoIHBlci10ZXN0IHZpZXdwb3J0IGNvbmZpZ3VyYXRpb24g aW50byBUZXN0Q29udHJvbGxlciwgd2hlcmUgcGxhdGZvcm1zIGNhbiBjdXN0b21pemUgaXQKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzc3MAogCmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVk QnVuZGxlLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0 ZWRCdW5kbGUuY3BwCmluZGV4IDE2M2Y5NmMzOWY0ZGM1Y2JiMjkxODU2ZWI0MzFjYWYwNjQ3NGM0 ODUuLjdiMWRlNzAyYTgxNDJmODFiNTNlOWFmOTE5Nzk0ZjViM2M0ZTg1MjcgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3Bw CisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGUuY3BwCkBAIC0xNTcsNyArMTU3LDkgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6ZGlkUmVjZWl2 ZU1lc3NhZ2UoV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWcKIAogICAg ICAgICBiZWdpblRlc3RpbmcobWVzc2FnZUJvZHlEaWN0aW9uYXJ5KTsKICAgICAgICAgcmV0dXJu OwotICAgIH0gZWxzZSBpZiAoV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhtZXNzYWdlTmFt ZSwgIlJlc2V0IikpIHsKKyAgICB9CisgICAgCisgICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRG OENTdHJpbmcobWVzc2FnZU5hbWUsICJSZXNldCIpKSB7CiAgICAgICAgIEFTU0VSVChtZXNzYWdl Qm9keSk7CiAgICAgICAgIEFTU0VSVChXS0dldFR5cGVJRChtZXNzYWdlQm9keSkgPT0gV0tEaWN0 aW9uYXJ5R2V0VHlwZUlEKCkpOwogICAgICAgICBXS0RpY3Rpb25hcnlSZWYgbWVzc2FnZUJvZHlE aWN0aW9uYXJ5ID0gc3RhdGljX2Nhc3Q8V0tEaWN0aW9uYXJ5UmVmPihtZXNzYWdlQm9keSk7CkBA IC0xNzgsMjIgKzE4MCwyNyBAQCB2b2lkIEluamVjdGVkQnVuZGxlOjpkaWRSZWNlaXZlTWVzc2Fn ZShXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBlUmVmIG1lc3NhZwogCiAgICAgICAgIHJl dHVybjsKICAgICB9CisKICAgICBpZiAoV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhtZXNz YWdlTmFtZSwgIkNhbGxBZGRDaHJvbWVJbnB1dEZpZWxkQ2FsbGJhY2siKSkgewogICAgICAgICBt X3Rlc3RSdW5uZXItPmNhbGxBZGRDaHJvbWVJbnB1dEZpZWxkQ2FsbGJhY2soKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KKwogICAgIGlmIChXS1N0cmluZ0lzRXF1YWxUb1VURjhDU3RyaW5nKG1l c3NhZ2VOYW1lLCAiQ2FsbFJlbW92ZUNocm9tZUlucHV0RmllbGRDYWxsYmFjayIpKSB7CiAgICAg ICAgIG1fdGVzdFJ1bm5lci0+Y2FsbFJlbW92ZUNocm9tZUlucHV0RmllbGRDYWxsYmFjaygpOwog ICAgICAgICByZXR1cm47CiAgICAgfQorCiAgICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENT dHJpbmcobWVzc2FnZU5hbWUsICJDYWxsRm9jdXNXZWJWaWV3Q2FsbGJhY2siKSkgewogICAgICAg ICBtX3Rlc3RSdW5uZXItPmNhbGxGb2N1c1dlYlZpZXdDYWxsYmFjaygpOwogICAgICAgICByZXR1 cm47CiAgICAgfQorCiAgICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcobWVzc2Fn ZU5hbWUsICJDYWxsU2V0QmFja2luZ1NjYWxlRmFjdG9yQ2FsbGJhY2siKSkgewogICAgICAgICBt X3Rlc3RSdW5uZXItPmNhbGxTZXRCYWNraW5nU2NhbGVGYWN0b3JDYWxsYmFjaygpOwogICAgICAg ICByZXR1cm47CiAgICAgfSAgIAorCiAgICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJp bmcobWVzc2FnZU5hbWUsICJXb3JrUXVldWVQcm9jZXNzZWRDYWxsYmFjayIpKSB7CiAgICAgICAg IGlmICghdG9wTG9hZGluZ0ZyYW1lKCkgJiYgIW1fdGVzdFJ1bm5lci0+d2FpdFRvRHVtcCgpKQog ICAgICAgICAgICAgcGFnZSgpLT5kdW1wKCk7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0luamVjdGVkQnVuZGxlUGFnZUNvY29hLm1tIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9jb2NvYS9JbmplY3RlZEJ1bmRs ZVBhZ2VDb2NvYS5tbQppbmRleCBhYzY2MTQ4ZjAxZjFjNzY0NTM5ZTUwODZkZDMyNDU0ZmZjZGY1 OTJjLi4xZjk4Mjk5OWU4YWVmNGE5YzM1ZGZlYTI4NWI3ZDI0MTJmYmM4M2NjIDEwMDY0NAotLS0g YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2NvY29hL0luamVjdGVkQnVu ZGxlUGFnZUNvY29hLm1tCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvY29jb2EvSW5qZWN0ZWRCdW5kbGVQYWdlQ29jb2EubW0KQEAgLTI4LDYgKzI4LDcgQEAKIAog I2ltcG9ydCAiQ3Jhc2hSZXBvcnRlckluZm8uaCIKICNpbXBvcnQgPFdlYktpdC9XS0J1bmRsZUZy YW1lLmg+CisjaW1wb3J0IDxXZWJLaXQvV0tCdW5kbGVQYWdlUHJpdmF0ZS5oPgogI2ltcG9ydCA8 V2ViS2l0L1dLVVJMQ0YuaD4KIAogbmFtZXNwYWNlIFdUUiB7CkBAIC00MSw2ICs0MiwxMCBAQCB2 b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6cGxhdGZvcm1EaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lKFdLQnVuZGxlRnJhbWVSZQogCiAgICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IG1haW5G cmFtZVVSTCA9IGFkb3B0V0soV0tCdW5kbGVGcmFtZUNvcHlQcm92aXNpb25hbFVSTChmcmFtZSkp OwogICAgIHNldENyYXNoUmVwb3J0QXBwbGljYXRpb25TcGVjaWZpY0luZm9ybWF0aW9uVG9VUkwo bWFpbkZyYW1lVVJMLmdldCgpKTsKKworI2lmIFBMQVRGT1JNKElPUykKKyAgICBXS0J1bmRsZVBh Z2VTZXRVc2VUZXN0aW5nVmlld3BvcnRDb25maWd1cmF0aW9uKHBhZ2UoKSwgdHJ1ZSk7CisjZW5k aWYKIH0KIAogfSAvLyBuYW1lc3BhY2UgV1RSCg==