127194 2014-01-17 15:25:41 -0800 Need a way to test the tile cache with margins enabled 2014-01-17 16:03:45 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin bdakin commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser thorton oldest_to_newest 969278 0 bdakin 2014-01-17 15:25:41 -0800 There should be a way to test the tile cache with a margin from the layout tests. <rdar://problem/15571327> 969284 1 221500 bdakin 2014-01-17 15:34:47 -0800 Created attachment 221500 Patch 969301 2 bdakin 2014-01-17 16:03:45 -0800 Thanks, Tim! http://trac.webkit.org/changeset/162230 221500 2014-01-17 15:34:47 -0800 2014-01-17 15:50:43 -0800 Patch for-review.txt text/plain 14249 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjIyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUzIEBACisyMDE0LTAxLTE3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBOZWVkIGEgd2F5IHRvIHRlc3QgdGhl IHRpbGUgY2FjaGUgd2l0aCBtYXJnaW5zIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzE5NAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRp bmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNTU3MTMyNz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYSBuZXcgZnVu Y3Rpb24gdG8gSW50ZXJuYWxTZXR0aW5ncyB0aGF0IHdpbGwgYWxsb3cgbGF5b3V0IHRlc3RzIHRv IAorICAgICAgICBmbGlwIHRoZSBzZXR0aW5nIFNldHRpbmdzOjpzZXRCYWNrZ3JvdW5kU2hvdWxk RXh0ZW5kQmV5b25kUGFnZSgpLiBUaGlzIHBhdGNoIGFsc28gICAgICAgICAKKyAgICAgICAgbWFr ZXMgY2hhbmdpbmcgdGhhdCBzZXR0aW5nIHRha2UgZWZmZWN0IGltbWVkaWF0ZWx5LiAKKworICAg ICAgICBUbyBtYWtlIHRoaXMgc2V0dGluZyBkeW5hbWljLCB3ZSBjYW4gbm8gbG9uZ2VyIGdlbmVy YXRlIHRoZSBTZXR0aW5nIGZ1bmN0aW9uLCBzbyAKKyAgICAgICAgd2UgaGF2ZSB0byBleHBvcnQg dGhlIHN5bWJvbCBtYW51YWxseS4KKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKworICAgICAg ICBUaGlzIG5ldyBmdW5jdGlvbiBvbiBGcmFtZVZpZXcgd2lsbCBjYWxsIGludG8gUmVuZGVyTGF5 ZXJCYWNraW5nIHRvIGFkZCBvciByZW1vdmUgCisgICAgICAgIG1hcmdpbnMuCisgICAgICAgICog cGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRCYWNr Z3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2UpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisK KyAgICAgICAgQWdhaW4sIHdl4oCZcmUgbm8gbG9uZ2VyIHVzaW5nIHRoZSBib2lsZXItcGxhdGUg Z2VuZXJhdGVkIFNldHRpbmcgZnVuY3Rpb25zLCBzbyBub3cgCisgICAgICAgIHdlIGNhbiBjYWxs IGludG8gRnJhbWVWaWV3IHRvIG1ha2UgdGhlIGJhY2tncm91bmQgZXh0ZW5kLgorICAgICAgICAq IHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdz KToKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5k QmV5b25kUGFnZSk6CisgICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6OmJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKToKKyAgICAgICAg KiBwYWdlL1NldHRpbmdzLmluOgorCisgICAgICAgIFdoZW5ldmVyIHRpbGUgbWFyZ2lucyBhcmUg c2V0LCBjYWxsIHNldE5lZWRzUmV2YWxpZGF0ZVRpbGVzKCkgdG8gbWFrZSB0aGUgY2hhbmdlIAor ICAgICAgICBkeW5hbWljLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxl Q29udHJvbGxlci5tbToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVDb250cm9sbGVyOjpzZXRUaWxl TWFyZ2lucyk6CisKKyAgICAgICAgTW92ZSB0aGUgY2FsbCB0byBUaWxlZEJhY2tpbmc6OnNldFRp bGVNYXJnaW5zKCkgaW50byBhIGhlbHBlciBmdW5jdGlvbiBzbyB0aGF0IHRoZSAKKyAgICAgICAg c2FtZSBjb2RlIGNhbiBiZSB1c2VkIGZvciBGcmFtZVZpZXcuCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJh Y2tpbmc6OlJlbmRlckxheWVyQmFja2luZyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckJhY2tpbmc6OnNldFRpbGVkQmFja2luZ0hhc01hcmdpbnMpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKworICAgICAgICBOZXcgSW50ZXJuYWxTZXR0aW5nLgor ICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnRlcm5hbFNldHRpbmdzOjpzZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZSk6 CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmg6CisgICAgICAgICogdGVzdGlu Zy9JbnRlcm5hbFNldHRpbmdzLmlkbDoKKwogMjAxNC0wMS0xNyAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBhbm90aGVyIHVudXNlZCBGcmFt ZUxvYWRlckNsaWVudCBjYWxsYmFjawpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9u IDE2MjEzNSkKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkp CkBAIC0xMjI5LDYgKzEyMjksNyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldE5lZWRzQWRv YmVGcmFtCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldFNjcmVlbkZvbnRTdWJzdGl0dXRpb25F bmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczMzc2V0QWdncmVzc2l2ZVRpbGVSZXRlbnRp b25FbmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczMzc2V0Rm9udEZhbGxiYWNrUHJlZmVy c1BpY3RvZ3JhcGhzRWIKK19fWk43V2ViQ29yZThTZXR0aW5nczM1c2V0QmFja2dyb3VuZFNob3Vs ZEV4dGVuZEJleW9uZFBhZ2VFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzdzZXRTY3JvbGxpbmdQ ZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczM4c2V0TG93 UG93ZXJWaWRlb0F1ZGlvQnVmZmVyU2l6ZUVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdz MzhzZXRTaW1wbGVMaW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxlZEViCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAxNjIxMzgpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2NzgsNiArMjY3OCwyMSBAQCBJ bnRSZWN0IEZyYW1lVmlldzo6ZXh0ZW5kZWRCYWNrZ3JvdW5kUmVjCiAjZW5kaWYKIH0KIAorI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKK3ZvaWQgRnJhbWVWaWV3OjpzZXRCYWNrZ3Jv dW5kRXh0ZW5kc0JleW9uZFBhZ2UoYm9vbCBleHRlbmRCYWNrZ3JvdW5kKQoreworICAgIFJlbmRl clZpZXcqIHJlbmRlclZpZXcgPSB0aGlzLT5yZW5kZXJWaWV3KCk7CisgICAgaWYgKCFyZW5kZXJW aWV3KQorICAgICAgICByZXR1cm47CisKKyAgICBSZW5kZXJMYXllckJhY2tpbmcqIGJhY2tpbmcg PSByZW5kZXJWaWV3LT5sYXllcigpLT5iYWNraW5nKCk7CisgICAgaWYgKCFiYWNraW5nKQorICAg ICAgICByZXR1cm47CisKKyAgICBiYWNraW5nLT5zZXRUaWxlZEJhY2tpbmdIYXNNYXJnaW5zKGV4 dGVuZEJhY2tncm91bmQpOworfQorI2VuZGlmCisKIGJvb2wgRnJhbWVWaWV3OjpzaG91bGRVcGRh dGVXaGlsZU9mZnNjcmVlbigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fc2hvdWxkVXBkYXRlV2hp bGVPZmZzY3JlZW47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHJldmlzaW9uIDE2MjEz NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAg LTE5Niw2ICsxOTYsMTAgQEAgcHVibGljOgogICAgIC8vIGV4dGVuZGVkQmFja2dyb3VuZFJlY3Qo KSBpcyBpbiB0aGUgdmlld3BvcnQncyBjb29yZGluYXRlIHNwYWNlLiAKICAgICBib29sIGhhc0V4 dGVuZGVkQmFja2dyb3VuZCgpIGNvbnN0OwogICAgIEludFJlY3QgZXh0ZW5kZWRCYWNrZ3JvdW5k UmVjdCgpIGNvbnN0OworICAgIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAg ICB2b2lkIHNldEJhY2tncm91bmRFeHRlbmRzQmV5b25kUGFnZShib29sKTsKKyNlbmRpZgogCiAg ICAgYm9vbCBzaG91bGRVcGRhdGVXaGlsZU9mZnNjcmVlbigpIGNvbnN0OwogICAgIHZvaWQgc2V0 U2hvdWxkVXBkYXRlV2hpbGVPZmZzY3JlZW4oYm9vbCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w YWdlL1NldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRp bmdzLmNwcAkocmV2aXNpb24gMTYyMTM1KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5Miw2ICsxOTIsNyBAQCBTZXR0aW5nczo6U2V0dGlu Z3MoUGFnZSogcGFnZSkKICNlbmRpZgogICAgICwgbV9zaG93VGlsZWRTY3JvbGxpbmdJbmRpY2F0 b3IoZmFsc2UpCiAgICAgLCBtX3RpbGVkQmFja2luZ1N0b3JlRW5hYmxlZChmYWxzZSkKKyAgICAs IG1fYmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UoZmFsc2UpCiAgICAgLCBtX2Ruc1By ZWZldGNoaW5nRW5hYmxlZChmYWxzZSkKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQogICAgICwg bV90b3VjaEV2ZW50RW11bGF0aW9uRW5hYmxlZChmYWxzZSkKQEAgLTU5Niw2ICs1OTcsMTggQEAg dm9pZCBTZXR0aW5nczo6c2V0VGlsZWRCYWNraW5nU3RvcmVFbmFibAogI2VuZGlmCiB9CiAKK3Zv aWQgU2V0dGluZ3M6OnNldEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKGJvb2wgc2hv dWxkRXh0ZW5kKQoreworICAgIGlmIChtX2JhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdl ID09IHNob3VsZEV4dGVuZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9iYWNrZ3JvdW5kU2hv dWxkRXh0ZW5kQmV5b25kUGFnZSA9IHNob3VsZEV4dGVuZDsKKworI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKKyAgICBtX3BhZ2UtPm1haW5GcmFtZSgpLnZpZXcoKS0+c2V0QmFja2dy b3VuZEV4dGVuZHNCZXlvbmRQYWdlKHNob3VsZEV4dGVuZCk7CisjZW5kaWYKK30KKwogI2lmIFVT RShBVkZPVU5EQVRJT04pCiB2b2lkIFNldHRpbmdzOjpzZXRBVkZvdW5kYXRpb25FbmFibGVkKGJv b2wgZW5hYmxlZCkKIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHJldmlzaW9uIDE2MjEz NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAt MjM1LDYgKzIzNSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFRpbGVkQmFja2luZ1N0b3JlRW5h YmxlZChib29sKTsKICAgICBib29sIHRpbGVkQmFja2luZ1N0b3JlRW5hYmxlZCgpIGNvbnN0IHsg cmV0dXJuIG1fdGlsZWRCYWNraW5nU3RvcmVFbmFibGVkOyB9CiAKKyAgICB2b2lkIHNldEJhY2tn cm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKGJvb2wpOworICAgIGJvb2wgYmFja2dyb3VuZFNo b3VsZEV4dGVuZEJleW9uZFBhZ2UoKSBjb25zdCB7IHJldHVybiBtX2JhY2tncm91bmRTaG91bGRF eHRlbmRCZXlvbmRQYWdlOyB9CisKICNpZiBVU0UoQVZGT1VOREFUSU9OKQogICAgIHN0YXRpYyB2 b2lkIHNldEFWRm91bmRhdGlvbkVuYWJsZWQoYm9vbCBmbGFnKTsKICAgICBzdGF0aWMgYm9vbCBp c0FWRm91bmRhdGlvbkVuYWJsZWQoKSB7IHJldHVybiBnQVZGb3VuZGF0aW9uRW5hYmxlZDsgfQpA QCAtMzU3LDYgKzM2MCw3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICBib29sIG1fc2hvd1RpbGVk U2Nyb2xsaW5nSW5kaWNhdG9yIDogMTsKICAgICBib29sIG1fdGlsZWRCYWNraW5nU3RvcmVFbmFi bGVkIDogMTsKKyAgICBib29sIG1fYmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UgOiAx OwogICAgIGJvb2wgbV9kbnNQcmVmZXRjaGluZ0VuYWJsZWQgOiAxOwogCiAjaWYgRU5BQkxFKFRP VUNIX0VWRU5UUykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgkocmV2aXNpb24gMTYyMTM1 KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgkod29ya2luZyBjb3B5KQpAQCAt MjExLDcgKzIxMSw2IEBAIG1pbmltdW1ab29tRm9udFNpemUgdHlwZT1mbG9hdCwgaW5pdGlhbD0K IHNpbXBsZUxpbmVMYXlvdXRFbmFibGVkIGluaXRpYWw9dHJ1ZSwgc2V0TmVlZHNTdHlsZVJlY2Fs Y0luQWxsRnJhbWVzPTEKIHNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkIGluaXRp YWw9ZmFsc2UsIHNldE5lZWRzU3R5bGVSZWNhbGNJbkFsbEZyYW1lcz0xCiAKLWJhY2tncm91bmRT aG91bGRFeHRlbmRCZXlvbmRQYWdlIGluaXRpYWw9ZmFsc2UKIG1lZGlhU291cmNlRW5hYmxlZCBp bml0aWFsPWZhbHNlCiAKICMgRklYTUU6IFJlbmFtZSB0byBhbGxvd011bHRpRWxlbWVudEltcGxp Y2l0Rm9ybVN1Ym1pc3Npb24gb25jZSB3ZSB1cHN0cmVhbSB0aGUgaU9TIGNoYW5nZXMgdG8gV2Vi Vmlldy5tbS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9U aWxlQ29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIubW0JKHJldmlzaW9uIDE2MjEzNSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5tbQko d29ya2luZyBjb3B5KQpAQCAtMTA1OSw2ICsxMDU5LDggQEAgdm9pZCBUaWxlQ29udHJvbGxlcjo6 c2V0VGlsZU1hcmdpbnMoaW50IAogICAgIG1fbWFyZ2luQm90dG9tID0gbWFyZ2luQm90dG9tOwog ICAgIG1fbWFyZ2luTGVmdCA9IG1hcmdpbkxlZnQ7CiAgICAgbV9tYXJnaW5SaWdodCA9IG1hcmdp blJpZ2h0OworCisgICAgc2V0TmVlZHNSZXZhbGlkYXRlVGlsZXMoKTsKIH0KIAogYm9vbCBUaWxl Q29udHJvbGxlcjo6aGFzTWFyZ2lucygpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkocmV2aXNpb24gMTYyMTM1KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE0NCw4ICsxNDQsNyBAQCBSZW5kZXJMYXllckJhY2tpbmc6OlJlbmRlckxheWVy QmFja2luZyhSCiAgICAgICAgIGlmIChtX2lzTWFpbkZyYW1lUmVuZGVyVmlld0xheWVyKSB7CiAg ICAgICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9zZWRSZWN0KHJlbmRlcmVyKCkuZnJhbWUo KS52aWV3KCktPmV4cG9zZWRSZWN0KCkpOwogICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRV bnBhcmVudHNPZmZzY3JlZW5UaWxlcyh0cnVlKTsKLSAgICAgICAgICAgIGlmIChwYWdlLT5zZXR0 aW5ncygpLmJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKCkpCi0gICAgICAgICAgICAg ICAgdGlsZWRCYWNraW5nLT5zZXRUaWxlTWFyZ2lucyg1MTIsIDUxMiwgNTEyLCA1MTIpOworICAg ICAgICAgICAgc2V0VGlsZWRCYWNraW5nSGFzTWFyZ2lucyhwYWdlLT5zZXR0aW5ncygpLmJhY2tn cm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKCkpOwogICAgICAgICB9CiAKICAgICAgICAgdGls ZWRCYWNraW5nLT5zZXRTY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkKHBhZ2UtPnNl dHRpbmdzKCkuc2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZCgpKTsKQEAgLTI1NCw2 ICsyNTMsMTUgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmFkanVzdFRpbGVkQmFjawogICAg IHRpbGVkQmFja2luZygpLT5zZXRUaWxlQ292ZXJhZ2UodGlsZUNvdmVyYWdlKTsKIH0KIAordm9p ZCBSZW5kZXJMYXllckJhY2tpbmc6OnNldFRpbGVkQmFja2luZ0hhc01hcmdpbnMoYm9vbCBleHRl bmRCYWNrZ3JvdW5kKQoreworICAgIGlmICghbV91c2luZ1RpbGVkQ2FjaGVMYXllcikKKyAgICAg ICAgcmV0dXJuOworCisgICAgaW50IG1hcmdpblNpemUgPSBleHRlbmRCYWNrZ3JvdW5kID8gNTEy IDogMDsKKyAgICB0aWxlZEJhY2tpbmcoKS0+c2V0VGlsZU1hcmdpbnMobWFyZ2luU2l6ZSwgbWFy Z2luU2l6ZSwgbWFyZ2luU2l6ZSwgbWFyZ2luU2l6ZSk7Cit9CisKIHZvaWQgUmVuZGVyTGF5ZXJC YWNraW5nOjp1cGRhdGVEZWJ1Z0luZGljYXRvcnMoYm9vbCBzaG93Qm9yZGVyLCBib29sIHNob3dS ZXBhaW50Q291bnRlcikKIHsKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFNob3dEZWJ1Z0JvcmRl cihzaG93Qm9yZGVyKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckJhY2tpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmgJKHJldmlzaW9uIDE2MjEzNSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtMTU3LDYgKzE1Nyw3 IEBAIHB1YmxpYzoKICAgICBib29sIHRpbGVkQmFja2luZ0hhc01hcmdpbigpIGNvbnN0OwogICAg IFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nKCkgY29uc3Q7CiAgICAgdm9pZCBhZGp1c3RUaWxl ZEJhY2tpbmdDb3ZlcmFnZSgpOworICAgIHZvaWQgc2V0VGlsZWRCYWNraW5nSGFzTWFyZ2lucyhi b29sKTsKICAgICAKICAgICB2b2lkIHVwZGF0ZURlYnVnSW5kaWNhdG9ycyhib29sIHNob3dCb3Jk ZXIsIGJvb2wgc2hvd1JlcGFpbnRDb3VudGVyKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvdGVz dGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS90 ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwCShyZXZpc2lvbiAxNjIxMzUpCisrKyBTb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 MjEsNCArNTIxLDEwIEBAIHZvaWQgSW50ZXJuYWxTZXR0aW5nczo6c2V0UGx1Z2luUmVwbGFjZW0K ICAgICBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnNldFBsdWdpblJl cGxhY2VtZW50RW5hYmxlZChlbmFibGVkKTsKIH0KIAordm9pZCBJbnRlcm5hbFNldHRpbmdzOjpz ZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZShib29sIGhhc0V4dGVuZGVkQmFja2dy b3VuZCwgRXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAgSW50ZXJuYWxTZXR0aW5nc0d1YXJkRm9y U2V0dGluZ3MoKTsKKyAgICBzZXR0aW5ncygpLT5zZXRCYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5 b25kUGFnZShoYXNFeHRlbmRlZEJhY2tncm91bmQpOworfQorCiB9CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuaAkocmV2aXNpb24gMTYyMTM1KQorKysgU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAg LTEzNSw2ICsxMzUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRBdXRvc2Nyb2xsRm9yRHJhZ0Fu ZERyb3BFbmFibGVkKGJvb2wgZW5hYmxlZCwgRXhjZXB0aW9uQ29kZSYpOwogICAgIHZvaWQgc2V0 Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzKGJvb2wgcHJlZmVyUGljdG9ncmFwaHMsIEV4 Y2VwdGlvbkNvZGUmKTsKICAgICB2b2lkIHNldFBsdWdpblJlcGxhY2VtZW50RW5hYmxlZChib29s KTsKKyAgICB2b2lkIHNldEJhY2tncm91bmRTaG91bGRFeHRlbmRCZXlvbmRQYWdlKGJvb2wgaGFz RXh0ZW5kZWRCYWNrZ3JvdW5kLCBFeGNlcHRpb25Db2RlJik7CisKIAogcHJpdmF0ZToKICAgICBl eHBsaWNpdCBJbnRlcm5hbFNldHRpbmdzKFBhZ2UqKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv dGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmlkbAkocmV2aXNpb24gMTYyMTM1KQorKysgU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmlkbAkod29ya2luZyBjb3B5KQpAQCAt NTksNCArNTksNSBAQAogICAgIFtSYWlzZXNFeGNlcHRpb25dIHZvaWQgc2V0QXV0b3Njcm9sbEZv ckRyYWdBbmREcm9wRW5hYmxlZChib29sZWFuIGVuYWJsZWQpOwogICAgIFtSYWlzZXNFeGNlcHRp b25dIHZvaWQgc2V0Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzKGJvb2xlYW4gcHJlZmVy UGljdG9ncmFwaHMpOwogICAgIHZvaWQgc2V0UGx1Z2luUmVwbGFjZW1lbnRFbmFibGVkKGJvb2xl YW4gZW5hYmxlZCk7CisgICAgW1JhaXNlc0V4Y2VwdGlvbl0gdm9pZCBzZXRCYWNrZ3JvdW5kU2hv dWxkRXh0ZW5kQmV5b25kUGFnZShib29sZWFuIGhhc0V4dGVuZGVkQmFja2dyb3VuZCk7CiB9OwpJ bmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0No YW5nZUxvZwkocmV2aXNpb24gMTYyMjI3KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDEtMTcgIEJldGggRGFraW4gIDxiZGFr aW5AYXBwbGUuY29tPgorCisgICAgICAgIE5lZWQgYSB3YXkgdG8gdGVzdCB0aGUgdGlsZSBjYWNo ZSB3aXRoIG1hcmdpbnMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI3MTk0CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzE1NTcxMzI3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMi90aWxlZC1kcmF3aW5nL3Np bXBsZS1kb2N1bWVudC13aXRoLW1hcmdpbi10aWxlcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIHBsYXRmb3JtL21hYy13azIvdGlsZWQtZHJhd2luZy9zaW1wbGUtZG9jdW1lbnQtd2l0 aC1tYXJnaW4tdGlsZXMuaHRtbDogQWRkZWQuCisKIDIwMTQtMDEtMTcgIEJlbSBKb25lcy1CZXkg IDxiam9uZXNiZUBhZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBTaGFwZXNdIFN0YWNrZWQgZmxv YXRzIHdpdGggc2hhcGUtb3V0c2lkZSBzaG91bGQgYWxsb3cgaW5saW5lIGNvbnRlbnQgdG8gaW50 ZXJhY3Qgd2l0aCB0aGUgbm9uLW91dGVybW9zdCBmbG9hdApJbmRleDogTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjLXdrMi90aWxlZC1kcmF3aW5nL3NpbXBsZS1kb2N1bWVudC13aXRoLW1hcmdpbi10 aWxlcy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj LXdrMi90aWxlZC1kcmF3aW5nL3NpbXBsZS1kb2N1bWVudC13aXRoLW1hcmdpbi10aWxlcy1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL3Rp bGVkLWRyYXdpbmcvc2ltcGxlLWRvY3VtZW50LXdpdGgtbWFyZ2luLXRpbGVzLWV4cGVjdGVkLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDE3IEBACisoR3JhcGhpY3NMYXllcgorICAoYm91 bmRzIDEyMDguMDAgMjAyMS4wMCkKKyAgKHZpc2libGUgcmVjdCAwLjAwLCAwLjAwIDc4NS4wMCB4 IDU4NS4wMCkKKyAgKGNvbnRlbnRzU2NhbGUgMS4wMCkKKyAgKGNoaWxkcmVuIDEKKyAgICAoR3Jh cGhpY3NMYXllcgorICAgICAgKGJvdW5kcyAxMjA4LjAwIDIwMjEuMDApCisgICAgICAoY29udGVu dHNPcGFxdWUgMSkKKyAgICAgICh2aXNpYmxlIHJlY3QgMC4wMCwgMC4wMCA3ODUuMDAgeCA1ODUu MDApCisgICAgICAoY29udGVudHNTY2FsZSAxLjAwKQorICAgICAgKHRpbGUgY2FjaGUgY292ZXJh Z2UgLTUxMiwgLTUxMiAyMDQ4IHggMjA0OCkKKyAgICAgICh0aWxlIHNpemUgNTEyIHggNTEyKQor ICAgICAgKHRvcCBsZWZ0IHRpbGUgLTEsIC0xIHRpbGVzIGdyaWQgNCB4IDQpCisgICAgKQorICAp CispCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvdGlsZWQtZHJhd2luZy9z aW1wbGUtZG9jdW1lbnQtd2l0aC1tYXJnaW4tdGlsZXMuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL3RpbGVkLWRyYXdpbmcvc2ltcGxlLWRvY3VtZW50LXdp dGgtbWFyZ2luLXRpbGVzLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMtd2syL3RpbGVkLWRyYXdpbmcvc2ltcGxlLWRvY3VtZW50LXdpdGgtbWFyZ2luLXRpbGVz Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzMSBAQAorPCFET0NUWVBFIGh0bWw+CisK KzxodG1sPgorPGhlYWQ+CisgICAgPHN0eWxlPgorICAgICAgICBib2R5IHsKKyAgICAgICAgICAg IHdpZHRoOiAxMjAwcHg7CisgICAgICAgICAgICBoZWlnaHQ6IDIwMDBweDsKKyAgICAgICAgfQor ICAgIDwvc3R5bGU+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVy KQorICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgIAorICAgICAg ICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0 dGluZ3Muc2V0QmFja2dyb3VuZFNob3VsZEV4dGVuZEJleW9uZFBhZ2UodHJ1ZSk7CisKKyAgICAg ICAgZnVuY3Rpb24gZG9UZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHdpbmRvdy5p bnRlcm5hbHMpIHsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbGF5 ZXJzJykuaW5uZXJUZXh0ID0gaW50ZXJuYWxzLmxheWVyVHJlZUFzVGV4dChkb2N1bWVudCwKKyAg ICAgICAgICAgICAgICAgICAgaW50ZXJuYWxzLkxBWUVSX1RSRUVfSU5DTFVERVNfVklTSUJMRV9S RUNUUyB8IGludGVybmFscy5MQVlFUl9UUkVFX0lOQ0xVREVTX1RJTEVfQ0FDSEVTKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9h ZCcsIGRvVGVzdCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cHJl IGlkPSJsYXllcnMiPkxheWVyIHRyZWUgZ29lcyBoZXJlPC9wPgorPC9ib2R5PgorPC9odG1sPgo=