175916 2017-08-23 17:49:50 -0700 Layout size override changes during in-flight animated resize are dropped on the floor forever 2017-08-24 11:58:05 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton agold bdakin commit-queue simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1341911 0 thorton 2017-08-23 17:49:50 -0700 Layout size override changes during in-flight animated resize are dropped on the floor forever 1341912 1 318950 thorton 2017-08-23 17:51:46 -0700 Created attachment 318950 Patch 1342110 2 318950 commit-queue 2017-08-24 11:57:39 -0700 Comment on attachment 318950 Patch Clearing flags on attachment: 318950 Committed r221153: <http://trac.webkit.org/changeset/221153> 1342111 3 commit-queue 2017-08-24 11:57:41 -0700 All reviewed patches have been landed. Closing bug. 1342113 4 webkit-bug-importer 2017-08-24 11:58:05 -0700 <rdar://problem/34063689> 318950 2017-08-23 17:51:46 -0700 2017-08-24 11:57:39 -0700 Patch bug-175916-20170823175145.patch text/plain 14391 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxMDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU4NzI0NTI1OGNiMTg5OGZk OGExNjI0NTI2OTI0OTAwYzcxMmY0YzYuLmMxZTc1NTE3MmIyYmRhZDFjNjNjMGExNzUwOTZlN2Ex YmRkM2Y3YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTctMDgtMjMgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTGF5b3V0IHNpemUgb3Zl cnJpZGUgY2hhbmdlcyBkdXJpbmcgaW4tZmxpZ2h0IGFuaW1hdGVkIHJlc2l6ZSBhcmUgZHJvcHBl ZCBvbiB0aGUgZmxvb3IgZm9yZXZlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc1OTE2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzg4NzI5NT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMYXlvdXQg c2l6ZSBvdmVycmlkZSBjaGFuZ2VzIHRoYXQgY29tZSBpbiBkdXJpbmcgYW4gYW5pbWF0ZWQgcmVz aXplCisgICAgICAgIGFyZSBjdXJyZW50bHkgc3RvcmVkLCBidXQgbm90IHNlbnQgaW4gYSBzZXBh cmF0ZSBtZXNzYWdlLCBiZWNhdXNlCisgICAgICAgIHRoZXkncmUgc2VudCBhcyBwYXJ0IG9mIHRo ZSByZXNpemUuIEhvd2V2ZXIsIGlmIGEgbGF5b3V0IHNpemUgb3ZlcnJpZGUKKyAgICAgICAgY2hh bmdlIGhhcHBlbnMgYWZ0ZXIgdGhlIGFuaW1hdGVkIHJlc2l6ZSBtZXNzYWdlIHdhcyBhbHJlYWR5 IHNlbnQsIGJ1dAorICAgICAgICBiZWZvcmUgdGhlIGFuaW1hdGVkIHJlc2l6ZSBpcyBlbmRlZCwg dGhhdCBjaGFuZ2Ugd2lsbCBiZSBzdG9yZWQsIGJ1dAorICAgICAgICBub3Qgc2VudCBpbiB0aGUg YW5pbWF0ZWQgcmVzaXplIG1lc3NhZ2UgKGJlY2F1c2UgaXQncyB0b28gbGF0ZSksIGFuZAorICAg ICAgICB0aGVuIHN1YnNlcXVlbnQgY2FsbHMgd2l0aCB0aGUgc2FtZSBzaXplIHdpbGwgZWFybHkt cmV0dXJuLCBiZWNhdXNlCisgICAgICAgIHdlJ3JlIHRlc3RpbmcgYWdhaW5zdCB0aGUgc3RvcmVk IHNpemUsIG5vdCB0aGUgc2l6ZSB3ZSBsYXN0IGFjdHVhbGx5CisgICAgICAgIHNlbnQgdG8gdGhl IFdlYiBDb250ZW50IHByb2Nlc3MuCisKKyAgICAgICAgSW5zdGVhZCwgc3RvcmUgdGhlIGxhc3Qt c2VudCBzaXplLCBzbyB0aGF0IHN1YnNlcXVlbnQgbGF5b3V0IHNpemUgb3ZlcnJpZGUKKyAgICAg ICAgY2hhbmdlcyB3aXRoIHRoZSBzYW1lIHNpemUgd29uJ3QgYmFpbCwgYW5kIGlmIGl0IGRpZmZl cnMgZnJvbSB0aGUgYWN0aXZlCisgICAgICAgIHN0YXRlIGFmdGVyIHRoZSBhbmltYXRlZCByZXNp emUgY29tcGxldGVzLCBzZW5kIGFuIG91dC1vZi1iYW5kIHVwZGF0ZS4KKworICAgICAgICBBbGwg b2YgdGhlIGFib3ZlIGFsc28gYXBwbGllcyB0byBkZXZpY2Ugb3JpZW50YXRpb24sIHdoaWNoIGZv bGxvd3MKKyAgICAgICAgZXhhY3RseSB0aGUgc2FtZSBwYXR0ZXJuLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfaW5p dGlhbGl6ZVdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2Rpc3Bh dGNoU2V0TWluaW11bUxheW91dFNpemU6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlzcGF0 Y2hTZXRNYXhpbXVtVW5vYnNjdXJlZFNpemU6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlz cGF0Y2hTZXREZXZpY2VPcmllbnRhdGlvbjpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9mcmFt ZU9yQm91bmRzQ2hhbmdlZF0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3dpbmRvd0RpZFJvdGF0 ZTpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRSZWxhdW5jaFByb2Nlc3NdKToKKyAgICAg ICAgKC1bV0tXZWJWaWV3IF9zZXRNaW5pbXVtTGF5b3V0U2l6ZU92ZXJyaWRlOl0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX3NldEludGVyZmFjZU9yaWVudGF0aW9uT3ZlcnJpZGU6XSk6CisgICAg ICAgICgtW1dLV2ViVmlldyBfc2V0TWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGU6XSk6Cisg ICAgICAgICgtW1dLV2ViVmlldyBfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOl0pOgor CiAyMDE3LTA4LTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAg ICBbQ2FjaGUgQVBJXSBFbmFibGUgcGVyc2lzdGVudCBjb2RlciB0byBlbmNvZGUgRmV0Y2hPcHRp b25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpp bmRleCA3ZDRmYmRlOGZhMDQ2NWYzZjk5OGNiNDU4ZDk5NDc2Nzg0MjcyM2I5Li41ZTU5OWMwODU1 YjUyOTIyZDU4OTk3ZjAzY2RlZjkyMTk4MWMxNTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTIyOSw4ICsyMjksMTAgQEAgQGltcGxl bWVudGF0aW9uIFdLV2ViVmlldyB7CiAKICAgICBCT09MIF9vdmVycmlkZXNNaW5pbXVtTGF5b3V0 U2l6ZTsKICAgICBDR1NpemUgX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGU7CisgICAgc3RkOjpv cHRpb25hbDxXZWJDb3JlOjpGbG9hdFNpemU+IF9sYXN0U2VudE1pbmltdW1MYXlvdXRTaXplOwog ICAgIEJPT0wgX292ZXJyaWRlc01heGltdW1Vbm9ic2N1cmVkU2l6ZTsKICAgICBDR1NpemUgX21h eGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlOworICAgIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6 RmxvYXRTaXplPiBfbGFzdFNlbnRNYXhpbXVtVW5vYnNjdXJlZFNpemU7CiAgICAgQ0dSZWN0IF9p bnB1dFZpZXdCb3VuZHM7CiAgICAgQ0dGbG9hdCBfdmlld3BvcnRNZXRhVGFnV2lkdGg7CiAgICAg Qk9PTCBfdmlld3BvcnRNZXRhVGFnV2lkdGhXYXNFeHBsaWNpdDsKQEAgLTI1MSw2ICsyNTMsNyBA QCBAaW1wbGVtZW50YXRpb24gV0tXZWJWaWV3IHsKIAogICAgIFVJSW50ZXJmYWNlT3JpZW50YXRp b24gX2ludGVyZmFjZU9yaWVudGF0aW9uT3ZlcnJpZGU7CiAgICAgQk9PTCBfb3ZlcnJpZGVzSW50 ZXJmYWNlT3JpZW50YXRpb247CisgICAgc3RkOjpvcHRpb25hbDxpbnQzMl90PiBfbGFzdFNlbnRE ZXZpY2VPcmllbnRhdGlvbjsKIAogICAgIEJPT0wgX2FsbG93c1ZpZXdwb3J0U2hyaW5rVG9GaXQ7 CiAKQEAgLTUzNSw3ICs1MzgsNyBAQCAtICh2b2lkKV9pbml0aWFsaXplV2l0aENvbmZpZ3VyYXRp b246KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCiAgICAgX2NvbnRlbnRW aWV3ID0gYWRvcHROUyhbW1dLQ29udGVudFZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Ym91bmRz IHByb2Nlc3NQb29sOnByb2Nlc3NQb29sIGNvbmZpZ3VyYXRpb246V1RGTW92ZShwYWdlQ29uZmln dXJhdGlvbikgd2ViVmlldzpzZWxmXSk7CiAKICAgICBfcGFnZSA9IFtfY29udGVudFZpZXcgcGFn ZV07Ci0gICAgX3BhZ2UtPnNldERldmljZU9yaWVudGF0aW9uKGRldmljZU9yaWVudGF0aW9uKCkp OworICAgIFtzZWxmIF9kaXNwYXRjaFNldERldmljZU9yaWVudGF0aW9uOmRldmljZU9yaWVudGF0 aW9uKCldOwogICAgIF9wYWdlLT5zZXREcmF3c0JhY2tncm91bmQoc2VsZi5vcGFxdWUpOwogCiAg ICAgW19jb250ZW50VmlldyBsYXllcl0uYW5jaG9yUG9pbnQgPSBDR1BvaW50WmVybzsKQEAgLTIz NDQsNiArMjM0NywzMyBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRTaXplIGFjdGl2ZU1pbmltdW1M YXlvdXRTaXplKFdLV2ViVmlldyAqd2ViVmlldywgY29uc3QgQ0dSZQogI2VuZGlmCiB9CiAKKy0g KHZvaWQpX2Rpc3BhdGNoU2V0TWluaW11bUxheW91dFNpemU6KFdlYkNvcmU6OkZsb2F0U2l6ZSlt aW5pbXVtTGF5b3V0U2l6ZQoreworICAgIGlmIChfbGFzdFNlbnRNaW5pbXVtTGF5b3V0U2l6ZSAm JiBDR1NpemVFcXVhbFRvU2l6ZShfbGFzdFNlbnRNaW5pbXVtTGF5b3V0U2l6ZS52YWx1ZSgpLCBt aW5pbXVtTGF5b3V0U2l6ZSkpCisgICAgICAgIHJldHVybjsKKworICAgIF9wYWdlLT5zZXRWaWV3 cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShtaW5pbXVtTGF5b3V0U2l6ZSk7Cisg ICAgX2xhc3RTZW50TWluaW11bUxheW91dFNpemUgPSBtaW5pbXVtTGF5b3V0U2l6ZTsKK30KKwor LSAodm9pZClfZGlzcGF0Y2hTZXRNYXhpbXVtVW5vYnNjdXJlZFNpemU6KFdlYkNvcmU6OkZsb2F0 U2l6ZSltYXhpbXVtVW5vYnNjdXJlZFNpemUKK3sKKyAgICBpZiAoX2xhc3RTZW50TWF4aW11bVVu b2JzY3VyZWRTaXplICYmIENHU2l6ZUVxdWFsVG9TaXplKF9sYXN0U2VudE1heGltdW1Vbm9ic2N1 cmVkU2l6ZS52YWx1ZSgpLCBtYXhpbXVtVW5vYnNjdXJlZFNpemUpKQorICAgICAgICByZXR1cm47 CisKKyAgICBfcGFnZS0+c2V0TWF4aW11bVVub2JzY3VyZWRTaXplKG1heGltdW1Vbm9ic2N1cmVk U2l6ZSk7CisgICAgX2xhc3RTZW50TWF4aW11bVVub2JzY3VyZWRTaXplID0gbWF4aW11bVVub2Jz Y3VyZWRTaXplOworfQorCistICh2b2lkKV9kaXNwYXRjaFNldERldmljZU9yaWVudGF0aW9uOihp bnQzMl90KWRldmljZU9yaWVudGF0aW9uCit7CisgICAgaWYgKF9sYXN0U2VudERldmljZU9yaWVu dGF0aW9uICYmIF9sYXN0U2VudERldmljZU9yaWVudGF0aW9uLnZhbHVlKCkgPT0gZGV2aWNlT3Jp ZW50YXRpb24pCisgICAgICAgIHJldHVybjsKKworICAgIF9wYWdlLT5zZXREZXZpY2VPcmllbnRh dGlvbihkZXZpY2VPcmllbnRhdGlvbik7CisgICAgX2xhc3RTZW50RGV2aWNlT3JpZW50YXRpb24g PSBkZXZpY2VPcmllbnRhdGlvbjsKK30KKwogLSAodm9pZClfZnJhbWVPckJvdW5kc0NoYW5nZWQK IHsKICAgICBDR1JlY3QgYm91bmRzID0gc2VsZi5ib3VuZHM7CkBAIC0yMzUxLDkgKzIzODEsOSBA QCAtICh2b2lkKV9mcmFtZU9yQm91bmRzQ2hhbmdlZAogCiAgICAgaWYgKF9keW5hbWljVmlld3Bv cnRVcGRhdGVNb2RlID09IER5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6aW5nKSB7 CiAgICAgICAgIGlmICghX292ZXJyaWRlc01pbmltdW1MYXlvdXRTaXplKQotICAgICAgICAgICAg X3BhZ2UtPnNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKGFjdGl2ZU1p bmltdW1MYXlvdXRTaXplKHNlbGYsIHNlbGYuYm91bmRzKSk7CisgICAgICAgICAgICBbc2VsZiBf ZGlzcGF0Y2hTZXRNaW5pbXVtTGF5b3V0U2l6ZTphY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZShzZWxm LCBzZWxmLmJvdW5kcyldOwogICAgICAgICBpZiAoIV9vdmVycmlkZXNNYXhpbXVtVW5vYnNjdXJl ZFNpemUpCi0gICAgICAgICAgICBfcGFnZS0+c2V0TWF4aW11bVVub2JzY3VyZWRTaXplKFdlYkNv cmU6OkZsb2F0U2l6ZShib3VuZHMuc2l6ZSkpOworICAgICAgICAgICAgW3NlbGYgX2Rpc3BhdGNo U2V0TWF4aW11bVVub2JzY3VyZWRTaXplOldlYkNvcmU6OkZsb2F0U2l6ZShib3VuZHMuc2l6ZSld OwogCiAgICAgICAgIEJPT0wgc2l6ZUNoYW5nZWQgPSBOTzsKICAgICAgICAgaWYgKGF1dG8gZHJh d2luZ0FyZWEgPSBfcGFnZS0+ZHJhd2luZ0FyZWEoKSkKQEAgLTI2NTksNyArMjY4OSw3IEBAIC0g KHZvaWQpX2tleWJvYXJkV2lsbEhpZGU6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCiAt ICh2b2lkKV93aW5kb3dEaWRSb3RhdGU6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCiB7 CiAgICAgaWYgKCFfb3ZlcnJpZGVzSW50ZXJmYWNlT3JpZW50YXRpb24pCi0gICAgICAgIF9wYWdl LT5zZXREZXZpY2VPcmllbnRhdGlvbihkZXZpY2VPcmllbnRhdGlvbigpKTsKKyAgICAgICAgW3Nl bGYgX2Rpc3BhdGNoU2V0RGV2aWNlT3JpZW50YXRpb246ZGV2aWNlT3JpZW50YXRpb24oKV07CiB9 CiAKIC0gKHZvaWQpX2NvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2U6KE5TTm90aWZpY2F0aW9u ICopbm90aWZpY2F0aW9uCkBAIC0zOTkyLDkgKzQwMjIsOCBAQCAtICh2b2lkKV9kaWRSZWxhdW5j aFByb2Nlc3MKIHsKICNpZiBQTEFURk9STShJT1MpCiAgICAgQ0dSZWN0IGJvdW5kcyA9IHNlbGYu Ym91bmRzOwotICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtaW5pbWFsTGF5b3V0U2l6ZSA9IGFjdGl2 ZU1pbmltdW1MYXlvdXRTaXplKHNlbGYsIGJvdW5kcyk7Ci0gICAgX3BhZ2UtPnNldFZpZXdwb3J0 Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKG1pbmltYWxMYXlvdXRTaXplKTsKLSAgICBf cGFnZS0+c2V0TWF4aW11bVVub2JzY3VyZWRTaXplKGFjdGl2ZU1heGltdW1Vbm9ic2N1cmVkU2l6 ZShzZWxmLCBib3VuZHMpKTsKKyAgICBbc2VsZiBfZGlzcGF0Y2hTZXRNaW5pbXVtTGF5b3V0U2l6 ZTphY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZShzZWxmLCBib3VuZHMpXTsKKyAgICBbc2VsZiBfZGlz cGF0Y2hTZXRNYXhpbXVtVW5vYnNjdXJlZFNpemU6YWN0aXZlTWF4aW11bVVub2JzY3VyZWRTaXpl KHNlbGYsIGJvdW5kcyldOwogI2VuZGlmCiB9CiAKQEAgLTQ2NTUsMTIgKzQ2ODQsMTEgQEAgLSAo Q0dTaXplKV9taW5pbXVtTGF5b3V0U2l6ZU92ZXJyaWRlCiAtICh2b2lkKV9zZXRNaW5pbXVtTGF5 b3V0U2l6ZU92ZXJyaWRlOihDR1NpemUpbWluaW11bUxheW91dFNpemVPdmVycmlkZQogewogICAg IF9vdmVycmlkZXNNaW5pbXVtTGF5b3V0U2l6ZSA9IFlFUzsKLSAgICBpZiAoQ0dTaXplRXF1YWxU b1NpemUoX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGUsIG1pbmltdW1MYXlvdXRTaXplT3ZlcnJp ZGUpKQotICAgICAgICByZXR1cm47Ci0KICAgICBfbWluaW11bUxheW91dFNpemVPdmVycmlkZSA9 IG1pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGU7CisKICAgICBpZiAoX2R5bmFtaWNWaWV3cG9ydFVw ZGF0ZU1vZGUgPT0gRHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90UmVzaXppbmcpCi0gICAg ICAgIF9wYWdlLT5zZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShXZWJD b3JlOjpGbG9hdFNpemUobWluaW11bUxheW91dFNpemVPdmVycmlkZSkpOworICAgICAgICBbc2Vs ZiBfZGlzcGF0Y2hTZXRNaW5pbXVtTGF5b3V0U2l6ZTpXZWJDb3JlOjpGbG9hdFNpemUobWluaW11 bUxheW91dFNpemVPdmVycmlkZSldOworCiB9CiAKIC0gKFVJRWRnZUluc2V0cylfb2JzY3VyZWRJ bnNldHMKQEAgLTQ3MzIsMTQgKzQ3NjAsMTAgQEAgLSAoQk9PTClfc2FmZUFyZWFTaG91bGRBZmZl Y3RPYnNjdXJlZEluc2V0cwogLSAodm9pZClfc2V0SW50ZXJmYWNlT3JpZW50YXRpb25PdmVycmlk ZTooVUlJbnRlcmZhY2VPcmllbnRhdGlvbilpbnRlcmZhY2VPcmllbnRhdGlvbgogewogICAgIF9v dmVycmlkZXNJbnRlcmZhY2VPcmllbnRhdGlvbiA9IFlFUzsKLQotICAgIGlmIChpbnRlcmZhY2VP cmllbnRhdGlvbiA9PSBfaW50ZXJmYWNlT3JpZW50YXRpb25PdmVycmlkZSkKLSAgICAgICAgcmV0 dXJuOwotCiAgICAgX2ludGVyZmFjZU9yaWVudGF0aW9uT3ZlcnJpZGUgPSBpbnRlcmZhY2VPcmll bnRhdGlvbjsKIAogICAgIGlmIChfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9PSBEeW5hbWlj Vmlld3BvcnRVcGRhdGVNb2RlOjpOb3RSZXNpemluZykKLSAgICAgICAgX3BhZ2UtPnNldERldmlj ZU9yaWVudGF0aW9uKGRldmljZU9yaWVudGF0aW9uRm9yVUlJbnRlcmZhY2VPcmllbnRhdGlvbihf aW50ZXJmYWNlT3JpZW50YXRpb25PdmVycmlkZSkpOworICAgICAgICBbc2VsZiBfZGlzcGF0Y2hT ZXREZXZpY2VPcmllbnRhdGlvbjpkZXZpY2VPcmllbnRhdGlvbkZvclVJSW50ZXJmYWNlT3JpZW50 YXRpb24oX2ludGVyZmFjZU9yaWVudGF0aW9uT3ZlcnJpZGUpXTsKIH0KIAogLSAoVUlJbnRlcmZh Y2VPcmllbnRhdGlvbilfaW50ZXJmYWNlT3JpZW50YXRpb25PdmVycmlkZQpAQCAtNDc2NCwxMiAr NDc4OCwxMCBAQCAtICh2b2lkKV9zZXRNYXhpbXVtVW5vYnNjdXJlZFNpemVPdmVycmlkZTooQ0dT aXplKXNpemUKIHsKICAgICBBU1NFUlQoc2l6ZS53aWR0aCA8PSBzZWxmLmJvdW5kcy5zaXplLndp ZHRoICYmIHNpemUuaGVpZ2h0IDw9IHNlbGYuYm91bmRzLnNpemUuaGVpZ2h0KTsKICAgICBfb3Zl cnJpZGVzTWF4aW11bVVub2JzY3VyZWRTaXplID0gWUVTOwotICAgIGlmIChDR1NpemVFcXVhbFRv U2l6ZShfbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUsIHNpemUpKQotICAgICAgICByZXR1 cm47Ci0KICAgICBfbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUgPSBzaXplOworCiAgICAg aWYgKF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlID09IER5bmFtaWNWaWV3cG9ydFVwZGF0ZU1v ZGU6Ok5vdFJlc2l6aW5nKQotICAgICAgICBfcGFnZS0+c2V0TWF4aW11bVVub2JzY3VyZWRTaXpl KFdlYkNvcmU6OkZsb2F0U2l6ZShzaXplKSk7CisgICAgICAgIFtzZWxmIF9kaXNwYXRjaFNldE1h eGltdW1Vbm9ic2N1cmVkU2l6ZTpXZWJDb3JlOjpGbG9hdFNpemUoc2l6ZSldOwogfQogCiAtICh2 b2lkKV9zZXRCYWNrZ3JvdW5kRXh0ZW5kc0JleW9uZFBhZ2U6KEJPT0wpYmFja2dyb3VuZEV4dGVu ZHMKQEAgLTQ4NDMsMTEgKzQ4NjUsMTEgQEAgLSAodm9pZClfYmVnaW5BbmltYXRlZFJlc2l6ZVdp dGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogICAgICAgICBfZHluYW1pY1Zp ZXdwb3J0VXBkYXRlTW9kZSA9IER5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6aW5n OwogICAgICAgICBbc2VsZiBfZnJhbWVPckJvdW5kc0NoYW5nZWRdOwogICAgICAgICBpZiAoX292 ZXJyaWRlc01pbmltdW1MYXlvdXRTaXplKQotICAgICAgICAgICAgX3BhZ2UtPnNldFZpZXdwb3J0 Q29uZmlndXJhdGlvbk1pbmltdW1MYXlvdXRTaXplKFdlYkNvcmU6OkZsb2F0U2l6ZShuZXdNaW5p bXVtTGF5b3V0U2l6ZSkpOworICAgICAgICAgICAgW3NlbGYgX2Rpc3BhdGNoU2V0TWluaW11bUxh eW91dFNpemU6V2ViQ29yZTo6RmxvYXRTaXplKG5ld01pbmltdW1MYXlvdXRTaXplKV07CiAgICAg ICAgIGlmIChfb3ZlcnJpZGVzTWF4aW11bVVub2JzY3VyZWRTaXplKQotICAgICAgICAgICAgX3Bh Z2UtPnNldE1heGltdW1Vbm9ic2N1cmVkU2l6ZShXZWJDb3JlOjpGbG9hdFNpemUobmV3TWF4aW11 bVVub2JzY3VyZWRTaXplKSk7CisgICAgICAgICAgICBbc2VsZiBfZGlzcGF0Y2hTZXRNYXhpbXVt VW5vYnNjdXJlZFNpemU6V2ViQ29yZTo6RmxvYXRTaXplKG5ld01heGltdW1Vbm9ic2N1cmVkU2l6 ZSldOwogICAgICAgICBpZiAoX292ZXJyaWRlc0ludGVyZmFjZU9yaWVudGF0aW9uKQotICAgICAg ICAgICAgX3BhZ2UtPnNldERldmljZU9yaWVudGF0aW9uKG5ld09yaWVudGF0aW9uKTsKKyAgICAg ICAgICAgIFtzZWxmIF9kaXNwYXRjaFNldERldmljZU9yaWVudGF0aW9uOm5ld09yaWVudGF0aW9u XTsKIAogICAgICAgICBbc2VsZiBfc2NoZWR1bGVWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdOwog ICAgICAgICByZXR1cm47CkBAIC00OTIwLDYgKzQ5NDIsMTAgQEAgLSAodm9pZClfYmVnaW5Bbmlt YXRlZFJlc2l6ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogICAgIFVJ RWRnZUluc2V0cyB1bm9ic2N1cmVkU2FmZUFyZWFJbnNldHMgPSBbc2VsZiBfY29tcHV0ZWRVbm9i c2N1cmVkU2FmZUFyZWFJbnNldF07CiAgICAgV2ViQ29yZTo6RmxvYXRCb3hFeHRlbnQgdW5vYnNj dXJlZFNhZmVBcmVhSW5zZXRzRXh0ZW50KHVub2JzY3VyZWRTYWZlQXJlYUluc2V0cy50b3AsIHVu b2JzY3VyZWRTYWZlQXJlYUluc2V0cy5yaWdodCwgdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzLmJv dHRvbSwgdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzLmxlZnQpOwogCisgICAgX2xhc3RTZW50TWlu aW11bUxheW91dFNpemUgPSBuZXdNaW5pbXVtTGF5b3V0U2l6ZTsKKyAgICBfbGFzdFNlbnRNYXhp bXVtVW5vYnNjdXJlZFNpemUgPSBuZXdNYXhpbXVtVW5vYnNjdXJlZFNpemU7CisgICAgX2xhc3RT ZW50RGV2aWNlT3JpZW50YXRpb24gPSBuZXdPcmllbnRhdGlvbjsKKwogICAgIF9wYWdlLT5keW5h bWljVmlld3BvcnRTaXplVXBkYXRlKG5ld01pbmltdW1MYXlvdXRTaXplLCBuZXdNYXhpbXVtVW5v YnNjdXJlZFNpemUsIHZpc2libGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMsIHVub2JzY3VyZWRS ZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMsIGZ1dHVyZVVub2JzY3VyZWRSZWN0SW5TZWxmQ29vcmRp bmF0ZXMsIHVub2JzY3VyZWRTYWZlQXJlYUluc2V0c0V4dGVudCwgdGFyZ2V0U2NhbGUsIG5ld09y aWVudGF0aW9uKTsKICAgICBpZiAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJl YSA9IF9wYWdlLT5kcmF3aW5nQXJlYSgpKQogICAgICAgICBkcmF3aW5nQXJlYS0+c2V0U2l6ZShX ZWJDb3JlOjpJbnRTaXplKG5ld0JvdW5kcy5zaXplKSwgV2ViQ29yZTo6SW50U2l6ZSgpLCBXZWJD b3JlOjpJbnRTaXplKCkpOwpAQCAtNDk4Miw2ICs1MDA4LDE4IEBAIC0gKHZvaWQpX2VuZEFuaW1h dGVkUmVzaXplCiAgICAgW19jb250ZW50VmlldyBzZXRIaWRkZW46Tk9dOwogICAgIFtzZWxmIF9z Y2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVwZGF0ZV07CiAKKyAgICBDR1JlY3QgbmV3Qm91bmRz ID0gc2VsZi5ib3VuZHM7CisgICAgV2ViQ29yZTo6RmxvYXRTaXplIG5ld01pbmltdW1MYXlvdXRT aXplID0gYWN0aXZlTWluaW11bUxheW91dFNpemUoc2VsZiwgbmV3Qm91bmRzKTsKKyAgICBXZWJD b3JlOjpGbG9hdFNpemUgbmV3TWF4aW11bVVub2JzY3VyZWRTaXplID0gYWN0aXZlTWF4aW11bVVu b2JzY3VyZWRTaXplKHNlbGYsIG5ld0JvdW5kcyk7CisgICAgaW50MzJfdCBuZXdPcmllbnRhdGlv biA9IGFjdGl2ZU9yaWVudGF0aW9uKHNlbGYpOworCisgICAgaWYgKCFfbGFzdFNlbnRNaW5pbXVt TGF5b3V0U2l6ZSB8fCBuZXdNaW5pbXVtTGF5b3V0U2l6ZSAhPSBfbGFzdFNlbnRNaW5pbXVtTGF5 b3V0U2l6ZS52YWx1ZSgpKQorICAgICAgICBbc2VsZiBfZGlzcGF0Y2hTZXRNaW5pbXVtTGF5b3V0 U2l6ZTpXZWJDb3JlOjpGbG9hdFNpemUobmV3TWluaW11bUxheW91dFNpemUpXTsKKyAgICBpZiAo IV9sYXN0U2VudE1heGltdW1Vbm9ic2N1cmVkU2l6ZSB8fCBuZXdNYXhpbXVtVW5vYnNjdXJlZFNp emUgIT0gX2xhc3RTZW50TWF4aW11bVVub2JzY3VyZWRTaXplLnZhbHVlKCkpCisgICAgICAgIFtz ZWxmIF9kaXNwYXRjaFNldE1heGltdW1Vbm9ic2N1cmVkU2l6ZTpXZWJDb3JlOjpGbG9hdFNpemUo bmV3TWF4aW11bVVub2JzY3VyZWRTaXplKV07CisgICAgaWYgKCFfbGFzdFNlbnREZXZpY2VPcmll bnRhdGlvbiB8fCBuZXdPcmllbnRhdGlvbiAhPSBfbGFzdFNlbnREZXZpY2VPcmllbnRhdGlvbi52 YWx1ZSgpKQorICAgICAgICBbc2VsZiBfZGlzcGF0Y2hTZXREZXZpY2VPcmllbnRhdGlvbjpuZXdP cmllbnRhdGlvbl07CisKICAgICB3aGlsZSAoIV9zbmFwc2hvdHNEZWZlcnJlZER1cmluZ1Jlc2l6 ZS5pc0VtcHR5KCkpCiAgICAgICAgIF9zbmFwc2hvdHNEZWZlcnJlZER1cmluZ1Jlc2l6ZS50YWtl TGFzdCgpKCk7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggOGQ5ODlkN2U1N2JkMGU1Y2ZiNTBhZGVjYjAzNDM3NWY4Mzc3MGRhNy4uOTYxNjEx NGI2YTUwNjM3MmI5OTM4ZTM1NTJiZmUyMzdkMWNmZmNiMSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA4LTIz ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIExheW91 dCBzaXplIG92ZXJyaWRlIGNoYW5nZXMgZHVyaW5nIGluLWZsaWdodCBhbmltYXRlZCByZXNpemUg YXJlIGRyb3BwZWQgb24gdGhlIGZsb29yIGZvcmV2ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTkxNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MzM4ODcyOTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9BbmltYXRlZFJlc2l6ZS5tbToK KyAgICAgICAgKFRFU1QpOgorICAgICAgICBBZGQgYSB0ZXN0IGVuc3VyaW5nIHRoYXQgb3ZlcnJp ZGUgbGF5b3V0IHNpemUgY2hhbmdlcworICAgICAgICBkdXJpbmcgYW4gYW5pbWF0ZWQgcmVzaXpl IGFjdHVhbGx5IHRha2UgZWZmZWN0LgorCiAyMDE3LTA4LTIzICBKb25hdGhhbiBCZWRhcmQgIDxq YmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBBY2Nlc3MgZXhwZWN0YXRpb25zIHBhdGggdGhy b3VnaCBhcHBsZV9hZGRpdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0MkNvY29hL0FuaW1hdGVkUmVzaXplLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyQ29jb2EvQW5pbWF0ZWRSZXNpemUubW0KaW5kZXggMTgwMzliYzhkZDYzZWM1 NzFmNTU4ZDlkYWYyZDhhNTNlY2EwYjAxZC4uYzk0OWNhNzI5MzdlZmRlNzRhZmQ1MWM3MjA2Y2Ey MTQxYzZjZDgwMSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy Q29jb2EvQW5pbWF0ZWRSZXNpemUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXQyQ29jb2EvQW5pbWF0ZWRSZXNpemUubW0KQEAgLTE4NCw0ICsxODQsMzggQEAgVEVTVChX ZWJLaXQyLCBBbmltYXRlZFJlc2l6ZUJsb2Nrc1ZpZXdwb3J0Rml0Q2hhbmdlcykKICAgICBFWFBF Q1RfVFJVRShkaWRDaGFuZ2VTYWZlQXJlYVNob3VsZEFmZmVjdE9ic2N1cmVkSW5zZXRzKTsKIH0K IAorVEVTVChXZWJLaXQyLCBPdmVycmlkZUxheW91dFNpemVDaGFuZ2VzRHVyaW5nQW5pbWF0ZWRS ZXNpemVTdWNjZWVkKQoreworICAgIGF1dG8gd2ViVmlldyA9IGNyZWF0ZUFuaW1hdGVkUmVzaXpl V2ViVmlldygpOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6d2ViVmlldy5nZXQoKV07CisK KyAgICBbd2ViVmlldyBfb3ZlcnJpZGVMYXlvdXRQYXJhbWV0ZXJzV2l0aE1pbmltdW1MYXlvdXRT aXplOkNHU2l6ZU1ha2UoMjAwLCA1MCkgbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGU6Q0dT aXplTWFrZSgyMDAsIDUwKV07CisKKyAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpAIjxoZWFk PjxtZXRhIG5hbWU9J3ZpZXdwb3J0JyBjb250ZW50PSdpbml0aWFsLXNjYWxlPTEnIC8+PC9oZWFk PiIgYmFzZVVSTDpuaWxdOworICAgIFt3ZWJWaWV3IF90ZXN0X3dhaXRGb3JEaWRGaW5pc2hOYXZp Z2F0aW9uXTsKKworICAgIFJldGFpblB0cjxVSVdpbmRvdz4gd2luZG93ID0gYWRvcHROUyhbW1VJ V2luZG93IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgODAwLCA2MDApXSk7 CisgICAgW3dpbmRvdyBhZGRTdWJ2aWV3OndlYlZpZXcuZ2V0KCldOworICAgIFt3aW5kb3cgc2V0 SGlkZGVuOk5PXTsKKworICAgIFt3ZWJWaWV3IF9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0 ZXM6XiB7CisgICAgICAgIFt3ZWJWaWV3IHNldEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgW3dlYlZp ZXcgZnJhbWVdLnNpemUud2lkdGggKyAxMDAsIDQwMCldOworICAgIH1dOworCisgICAgW3dlYlZp ZXcgX292ZXJyaWRlTGF5b3V0UGFyYW1ldGVyc1dpdGhNaW5pbXVtTGF5b3V0U2l6ZTpDR1NpemVN YWtlKDEwMCwgMjAwKSBtYXhpbXVtVW5vYnNjdXJlZFNpemVPdmVycmlkZTpDR1NpemVNYWtlKDEw MCwgMjAwKV07CisgICAgW3dlYlZpZXcgX2VuZEFuaW1hdGVkUmVzaXplXTsKKworICAgIF9fYmxv Y2sgYm9vbCBkaWRSZWFkTGF5b3V0U2l6ZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IGV2YWx1YXRl SmF2YVNjcmlwdDpAIlt3aW5kb3cuaW5uZXJXaWR0aCwgd2luZG93LmlubmVySGVpZ2h0XSIgY29t cGxldGlvbkhhbmRsZXI6XihpZCB2YWx1ZSwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgQ0dG bG9hdCBpbm5lcldpZHRoID0gW1t2YWx1ZSBvYmplY3RBdEluZGV4OjBdIGZsb2F0VmFsdWVdOwor ICAgICAgICBDR0Zsb2F0IGlubmVySGVpZ2h0ID0gW1t2YWx1ZSBvYmplY3RBdEluZGV4OjFdIGZs b2F0VmFsdWVdOworCisgICAgICAgIEVYUEVDVF9FUShpbm5lcldpZHRoLCAxMDApOworICAgICAg ICBFWFBFQ1RfRVEoaW5uZXJIZWlnaHQsIDIwMCk7CisKKyAgICAgICAgZGlkUmVhZExheW91dFNp emUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGlkUmVh ZExheW91dFNpemUpOworfQorCiAjZW5kaWYK