134570 2014-07-02 16:31:38 -0700 [iOS][WK2] Make is safe/fast to use the animated resize API without resizing anything 2014-07-02 20:52:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin bunhere cdumez commit-queue gyuyoung.kim sergio oldest_to_newest 1020098 0 benjamin 2014-07-02 16:31:38 -0700 [iOS][WK2] Make is safe/fast to use the animated resize API without resizing anything 1020101 1 234294 benjamin 2014-07-02 16:40:28 -0700 Created attachment 234294 Patch 1020105 2 234294 enrica 2014-07-02 17:03:52 -0700 Comment on attachment 234294 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234294&action=review Look good to me. > Source/WebKit2/ChangeLog:39 > + The remaining code is unchanged, it is just not intended due to the removal of the if() branch. What does it mean 'intended'? 1020172 3 benjamin 2014-07-02 20:52:49 -0700 Committed r170744: <http://trac.webkit.org/changeset/170744> 234294 2014-07-02 16:40:28 -0700 2014-07-02 17:03:52 -0700 Patch bug-134570-20140702163951.patch text/plain 14993 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2RiN2Q5ZTY3YjhiM2Fj NmIzY2QzNjhiMGQwYWQ2ZDlkNGYxNWM3Yi4uYzFlYjdkMDgxMDA4YzJiN2UzNWQ0YjM2MTRlYTEz NTAwOGM2NDM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE0LTA3LTAyICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBbaU9TXVtXSzJd IE1ha2UgaXMgc2FmZS9mYXN0IHRvIHVzZSB0aGUgYW5pbWF0ZWQgcmVzaXplIEFQSSB3aXRob3V0 IHJlc2l6aW5nIGFueXRoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzQ1NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUb2RheSwgaWYgc29tZW9uZSBjYWxscyBfYmVnaW5BbmltYXRlZFJlc2l6ZVdp dGhVcGRhdGVzLV9lbmRBbmltYXRlZFJlc2l6ZSwgaXQgaXMgYWx3YXlzIGEgdmVyeSBoZWF2eSBw cm9jZXNzCisgICAgICAgIGZvcmNpbmcgYSByZWxheW91dCBhbmQgY2FuIGNhdXNlIHN5bmNocm9u b3VzIG9wZXJhdGlvbnMuCisKKyAgICAgICAgV2Ugc2hvdWxkIG5vdCBmb3JjZSB0aGUgY2FsbGVy IG9mIHRoZSBBUEkgdG8gbWFpbnRhaW4gdGhlaXIgb3duIHN0YXRlIHRyYWNraW5nLCB3ZSBzaG91 bGQgZG8gdGhhdCBmb3IgdGhlbS4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2gsIHdlIHRyYWNr IGV2ZXJ5dGhpbmcgd2UgbmVlZCBmb3IgYSByZXNpemUgYW5kIG9ubHkgZG8gdGhlIGhlYXZ5IGxp ZnRpbmcgaWYgYW55dGhpbmcgaGFzIGFjdHVhbGx5IGNoYW5nZWQuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKGFjdGl2ZU1pbmltdW1MYXlv dXRTaXplKToKKyAgICAgICAgKGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKToK KyAgICAgICAgKGFjdGl2ZU1heGltdW1Vbm9ic2N1cmVkU2l6ZSk6CisgICAgICAgIChhY3RpdmVP cmllbnRhdGlvbik6CisgICAgICAgIFRoaXMgY29kZSBpcyB1c2VkIGluIGJvdGggX2RpZFJlbGF1 bmNoUHJvY2VzcyBhbmQgX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlcy4gSXQgaXMgbW92 ZWQgdG8gc3RhdGljIGZ1bmN0aW9ucworICAgICAgICB0byBhdm9pZCBoYXZpbmcgaXQgaW4gdHdv IHBsYWNlcy4KKworICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZFJlbGF1bmNoUHJvY2Vzc10pOgor CisgICAgICAgICgtW1dLV2ViVmlldyBfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOl0p OgorICAgICAgICBUaGUgdXBkYXRlcyBub3cgZ29lcyBsaWtlIHRoaXM6CisgICAgICAgIDEpIFNl dCBfaXNBbmltYXRpbmdSZXNpemUgdG8gcHJldmVudCB0aGUgdW5kZXNpcmVkIHNpZGUgZWZmZWN0 cyB1cGRhdGVCbG9jaygpIGlmIHdlIHJlYWxseSBuZWVkIHRvIHJlc2l6ZS4KKyAgICAgICAgMikg R2V0IGFsbCB0aGUgb3JpZ2luYWwgdmFsdWVzIGJlZm9yZSBjYWxsaW5nIHRoZSB1cGRhdGUgYmxv Y2suCisgICAgICAgIDMpIENhbGwgdGhlIHVwZGF0ZSBibG9jay4KKyAgICAgICAgNGEpIElmIG5v dGhpbmcgdXNlZnVsIGZvciByZXNpemUgaGFzIGNoYW5nZWQsIHJlc2V0IF9pc0FuaW1hdGluZ1Jl c2l6ZSB0byBmYWxzZS4KKyAgICAgICAgICAgIFdlIGFsc28gbmVlZCB0byB1cGRhdGUgdGhlIHZp c2libGUgY29udGVudCByZWN0IGJlY2F1c2UgdGhlIHVwZGF0ZSBibG9jayBtYXkgaGF2ZSBjaGFu Z2VkIHNvbWV0aGluZyB1bnJlbGF0ZWQKKyAgICAgICAgICAgIHRvIHRoZSB2aWV3IHNpemUgKHNj YWxlLCBzY3JvbGwgcG9zaXRpb24sIGV0YykuCisgICAgICAgIDRiKSBJZiB3ZSByZWFsbHkgbmVl ZCB0byByZXNpemUsIHByb2NlZWQgYXMgdXN1YWwuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9l bmRBbmltYXRlZFJlc2l6ZV0pOgorICAgICAgICBXaXRoIHRoZSBjaGFuZ2VzIGluIF9iZWdpbkFu aW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6LCBfaXNBbmltYXRpbmdSZXNpemUgaXMgb25seSBzZXQg Zm9yIHJlYWwgY2FzZXMgb2YgYW5pbWF0ZWQgcmVzaXplLAorICAgICAgICBiYWlsIG91dCBlYXJs eSBpZiB0aGF0IGZsYWcgaXNuJ3Qgc2V0LgorCisgICAgICAgIFRoZSByZW1haW5pbmcgY29kZSBp cyB1bmNoYW5nZWQsIGl0IGlzIGp1c3Qgbm90IGludGVuZGVkIGR1ZSB0byB0aGUgcmVtb3ZhbCBv ZiB0aGUgaWYoKSBicmFuY2guCisKIDIwMTQtMDctMDEgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5q YW1pbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtpT1NdW1dLMl0gRml4IGEgcmFjZSBiZXR3ZWVu IHRoZSBzaG9ydCB0YXAgYW5kIGxvbmcgdGFwIGhpZ2hsaWdodApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBlNjFhNTE3NTYyODMwNmZl ZmZlNDQ5M2Y2NzY1MWMzNGRkMjI0ZTkxLi40N2IzZTdiNDQ3YzYwNjc0ZWFkYTY1MjdmOTE2NmVh ZWY4MGFjN2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbQpAQCAtMTU0OCwxMyArMTU0OCwzNCBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQ b2ludCBjb25zdHJhaW5Db250ZW50T2Zmc2V0KFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9m ZgogICAgIF9wYWdlLT5wcm9jZXNzKCkudGVybWluYXRlKCk7CiB9CiAKK3N0YXRpYyBXZWJDb3Jl OjpGbG9hdFNpemUgYWN0aXZlTWluaW11bUxheW91dFNpemUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBj b25zdCBDR1JlY3QmIGJvdW5kcykKK3sKKyAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKHdl YlZpZXctPl9vdmVycmlkZXNNaW5pbXVtTGF5b3V0U2l6ZSA/IHdlYlZpZXctPl9taW5pbXVtTGF5 b3V0U2l6ZU92ZXJyaWRlIDogYm91bmRzLnNpemUpOworfQorCitzdGF0aWMgV2ViQ29yZTo6Rmxv YXRTaXplIGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKFdLV2ViVmlldyAqd2Vi VmlldywgV2ViQ29yZTo6RmxvYXRTaXplIG1pbmltdW1MYXlvdXRTaXplKQoreworICAgIHJldHVy biB3ZWJWaWV3LT5fb3ZlcnJpZGVzTWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkgPyBXZWJD b3JlOjpGbG9hdFNpemUod2ViVmlldy0+X21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGVGb3JNaW5p bWFsVUkpIDogbWluaW11bUxheW91dFNpemU7Cit9CisKK3N0YXRpYyBXZWJDb3JlOjpGbG9hdFNp emUgYWN0aXZlTWF4aW11bVVub2JzY3VyZWRTaXplKFdLV2ViVmlldyAqd2ViVmlldywgY29uc3Qg Q0dSZWN0JiBib3VuZHMpCit7CisgICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZSh3ZWJWaWV3 LT5fb3ZlcnJpZGVzTWF4aW11bVVub2JzY3VyZWRTaXplID8gd2ViVmlldy0+X21heGltdW1Vbm9i c2N1cmVkU2l6ZU92ZXJyaWRlIDogYm91bmRzLnNpemUpOworfQorCitzdGF0aWMgaW50MzJfdCBh Y3RpdmVPcmllbnRhdGlvbihXS1dlYlZpZXcgKndlYlZpZXcpCit7CisgICAgcmV0dXJuIHdlYlZp ZXctPl9vdmVycmlkZXNJbnRlcmZhY2VPcmllbnRhdGlvbiA/IGRldmljZU9yaWVudGF0aW9uRm9y VUlJbnRlcmZhY2VPcmllbnRhdGlvbih3ZWJWaWV3LT5faW50ZXJmYWNlT3JpZW50YXRpb25PdmVy cmlkZSkgOiB3ZWJWaWV3LT5fcGFnZS0+ZGV2aWNlT3JpZW50YXRpb24oKTsKK30KKwogLSAodm9p ZClfZGlkUmVsYXVuY2hQcm9jZXNzCiB7CiAjaWYgUExBVEZPUk0oSU9TKQotICAgIFdlYkNvcmU6 OkZsb2F0U2l6ZSBib3VuZHNTaXplKHNlbGYuYm91bmRzLnNpemUpOwotICAgIF9wYWdlLT5zZXRW aWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShfb3ZlcnJpZGVzTWluaW11bUxh eW91dFNpemUgPyBXZWJDb3JlOjpGbG9hdFNpemUoX21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGUp IDogYm91bmRzU2l6ZSk7Ci0gICAgX3BhZ2UtPnNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmlt dW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKF9vdmVycmlkZXNNaW5pbXVtTGF5b3V0U2l6ZUZvck1p bmltYWxVSSA/IFdlYkNvcmU6OkZsb2F0U2l6ZShfbWluaW11bUxheW91dFNpemVPdmVycmlkZUZv ck1pbmltYWxVSSkgOiBib3VuZHNTaXplKTsKLSAgICBfcGFnZS0+c2V0TWF4aW11bVVub2JzY3Vy ZWRTaXplKF9vdmVycmlkZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUgPyBXZWJDb3JlOjpGbG9hdFNp emUoX21heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlKSA6IGJvdW5kc1NpemUpOworICAgIENH UmVjdCBib3VuZHMgPSBzZWxmLmJvdW5kczsKKyAgICBXZWJDb3JlOjpGbG9hdFNpemUgbWluaW1h bExheW91dFNpemUgPSBhY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZShzZWxmLCBib3VuZHMpOworICAg IF9wYWdlLT5zZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShtaW5pbWFs TGF5b3V0U2l6ZSk7CisgICAgX3BhZ2UtPnNldFZpZXdwb3J0Q29uZmlndXJhdGlvbk1pbmltdW1M YXlvdXRTaXplRm9yTWluaW1hbFVJKGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJ KHNlbGYsIG1pbmltYWxMYXlvdXRTaXplKSk7CisgICAgX3BhZ2UtPnNldE1heGltdW1Vbm9ic2N1 cmVkU2l6ZShhY3RpdmVNYXhpbXVtVW5vYnNjdXJlZFNpemUoc2VsZiwgYm91bmRzKSk7CiAjZW5k aWYKIH0KIApAQCAtMjAwMywzNCArMjAyNCw1NiBAQCBzdGF0aWMgaW5saW5lIFdlYktpdDo6Rmlu ZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyB3a0ZpbmRPcHRpb25zKQogCiAt ICh2b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6KHZvaWQgKF4pKHZvaWQpKXVw ZGF0ZUJsb2NrCiB7Ci0gICAgX2lzQW5pbWF0aW5nUmVzaXplID0gWUVTOwotCiAgICAgaWYgKF9j dXN0b21Db250ZW50VmlldykgewogICAgICAgICB1cGRhdGVCbG9jaygpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCi0gICAgX3Jlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdG1lbnRzID0g Q0FUcmFuc2Zvcm0zRElkZW50aXR5OworICAgIF9pc0FuaW1hdGluZ1Jlc2l6ZSA9IFlFUzsKIAot ICAgIE5TVUludGVnZXIgaW5kZXhPZkNvbnRlbnRWaWV3ID0gW1tfc2Nyb2xsVmlldyBzdWJ2aWV3 c10gaW5kZXhPZk9iamVjdDpfY29udGVudFZpZXcuZ2V0KCldOwotICAgIF9yZXNpemVBbmltYXRp b25WaWV3ID0gYWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOwotICAgIFtfc2Nyb2xsVmll dyBpbnNlcnRTdWJ2aWV3Ol9yZXNpemVBbmltYXRpb25WaWV3LmdldCgpIGF0SW5kZXg6aW5kZXhP ZkNvbnRlbnRWaWV3XTsKLSAgICBbX3Jlc2l6ZUFuaW1hdGlvblZpZXcgYWRkU3VidmlldzpfY29u dGVudFZpZXcuZ2V0KCldOworICAgIENHUmVjdCBvbGRCb3VuZHMgPSBzZWxmLmJvdW5kczsKKyAg ICBXZWJDb3JlOjpGbG9hdFNpemUgb2xkTWluaW11bUxheW91dFNpemUgPSBhY3RpdmVNaW5pbXVt TGF5b3V0U2l6ZShzZWxmLCBvbGRCb3VuZHMpOworICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBvbGRN aW5pbXVtTGF5b3V0U2l6ZUZvck1pbmltYWxVSSA9IGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplRm9y TWluaW1hbFVJKHNlbGYsIG9sZE1pbmltdW1MYXlvdXRTaXplKTsKKyAgICBXZWJDb3JlOjpGbG9h dFNpemUgb2xkTWF4aW11bVVub2JzY3VyZWRTaXplID0gYWN0aXZlTWF4aW11bVVub2JzY3VyZWRT aXplKHNlbGYsIG9sZEJvdW5kcyk7CisgICAgaW50MzJfdCBvbGRPcmllbnRhdGlvbiA9IGFjdGl2 ZU9yaWVudGF0aW9uKHNlbGYpOworICAgIFVJRWRnZUluc2V0cyBvbGRPYnNjdXJlZEluc2V0cyA9 IF9vYnNjdXJlZEluc2V0czsKICAgICBXZWJDb3JlOjpGbG9hdFJlY3Qgb2xkVW5vYnNjdXJlZENv bnRlbnRSZWN0ID0gX3BhZ2UtPnVub2JzY3VyZWRDb250ZW50UmVjdCgpOwogCiAgICAgdXBkYXRl QmxvY2soKTsKIAogICAgIENHUmVjdCBuZXdCb3VuZHMgPSBzZWxmLmJvdW5kczsKLSAgICBDR1Np emUgbmV3TWluaW11bUxheW91dFNpemUgPSBuZXdCb3VuZHMuc2l6ZTsKKyAgICBXZWJDb3JlOjpG bG9hdFNpemUgbmV3TWluaW11bUxheW91dFNpemUgPSBhY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZShz ZWxmLCBuZXdCb3VuZHMpOworICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBuZXdNaW5pbXVtTGF5b3V0 U2l6ZUZvck1pbmltYWxVSSA9IGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKHNl bGYsIG5ld01pbmltdW1MYXlvdXRTaXplKTsKKyAgICBXZWJDb3JlOjpGbG9hdFNpemUgbmV3TWF4 aW11bVVub2JzY3VyZWRTaXplID0gYWN0aXZlTWF4aW11bVVub2JzY3VyZWRTaXplKHNlbGYsIG5l d0JvdW5kcyk7CisgICAgaW50MzJfdCBuZXdPcmllbnRhdGlvbiA9IGFjdGl2ZU9yaWVudGF0aW9u KHNlbGYpOworICAgIFVJRWRnZUluc2V0cyBuZXdPYnNjdXJlZEluc2V0cyA9IF9vYnNjdXJlZElu c2V0czsKKworICAgIGlmIChDR1JlY3RFcXVhbFRvUmVjdChvbGRCb3VuZHMsIG5ld0JvdW5kcykK KyAgICAgICAgJiYgb2xkTWluaW11bUxheW91dFNpemUgPT0gbmV3TWluaW11bUxheW91dFNpemUK KyAgICAgICAgJiYgb2xkTWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkgPT0gbmV3TWluaW11 bUxheW91dFNpemVGb3JNaW5pbWFsVUkKKyAgICAgICAgJiYgb2xkTWF4aW11bVVub2JzY3VyZWRT aXplID09IG5ld01heGltdW1Vbm9ic2N1cmVkU2l6ZQorICAgICAgICAmJiBvbGRPcmllbnRhdGlv biA9PSBuZXdPcmllbnRhdGlvbgorICAgICAgICAmJiBVSUVkZ2VJbnNldHNFcXVhbFRvRWRnZUlu c2V0cyhvbGRPYnNjdXJlZEluc2V0cywgbmV3T2JzY3VyZWRJbnNldHMpKSB7CisgICAgICAgIF9p c0FuaW1hdGluZ1Jlc2l6ZSA9IE5POworICAgICAgICBbc2VsZiBfdXBkYXRlVmlzaWJsZUNvbnRl bnRSZWN0c107CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBfcmVzaXplQW5pbWF0aW9u VHJhbnNmb3JtQWRqdXN0bWVudHMgPSBDQVRyYW5zZm9ybTNESWRlbnRpdHk7CisKKyAgICBOU1VJ bnRlZ2VyIGluZGV4T2ZDb250ZW50VmlldyA9IFtbX3Njcm9sbFZpZXcgc3Vidmlld3NdIGluZGV4 T2ZPYmplY3Q6X2NvbnRlbnRWaWV3LmdldCgpXTsKKyAgICBfcmVzaXplQW5pbWF0aW9uVmlldyA9 IGFkb3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRdKTsKKyAgICBbX3Njcm9sbFZpZXcgaW5zZXJ0 U3VidmlldzpfcmVzaXplQW5pbWF0aW9uVmlldy5nZXQoKSBhdEluZGV4OmluZGV4T2ZDb250ZW50 Vmlld107CisgICAgW19yZXNpemVBbmltYXRpb25WaWV3IGFkZFN1YnZpZXc6X2NvbnRlbnRWaWV3 LmdldCgpXTsKIAogICAgIENHU2l6ZSBjb250ZW50U2l6ZUluQ29udGVudFZpZXdDb29yZGluYXRl cyA9IFtfY29udGVudFZpZXcgYm91bmRzXS5zaXplOwotICAgIFtfc2Nyb2xsVmlldyBzZXRNaW5p bXVtWm9vbVNjYWxlOnN0ZDo6bWluKG5ld01pbmltdW1MYXlvdXRTaXplLndpZHRoIC8gY29udGVu dFNpemVJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZXMud2lkdGgsIFtfc2Nyb2xsVmlldyBtaW5pbXVt Wm9vbVNjYWxlXSldOwotICAgIFtfc2Nyb2xsVmlldyBzZXRNYXhpbXVtWm9vbVNjYWxlOnN0ZDo6 bWF4KG5ld01pbmltdW1MYXlvdXRTaXplLndpZHRoIC8gY29udGVudFNpemVJbkNvbnRlbnRWaWV3 Q29vcmRpbmF0ZXMud2lkdGgsIFtfc2Nyb2xsVmlldyBtYXhpbXVtWm9vbVNjYWxlXSldOworICAg IFtfc2Nyb2xsVmlldyBzZXRNaW5pbXVtWm9vbVNjYWxlOnN0ZDo6bWluKG5ld01pbmltdW1MYXlv dXRTaXplLndpZHRoKCkgLyBjb250ZW50U2l6ZUluQ29udGVudFZpZXdDb29yZGluYXRlcy53aWR0 aCwgW19zY3JvbGxWaWV3IG1pbmltdW1ab29tU2NhbGVdKV07CisgICAgW19zY3JvbGxWaWV3IHNl dE1heGltdW1ab29tU2NhbGU6c3RkOjptYXgobmV3TWluaW11bUxheW91dFNpemUud2lkdGgoKSAv IGNvbnRlbnRTaXplSW5Db250ZW50Vmlld0Nvb3JkaW5hdGVzLndpZHRoLCBbX3Njcm9sbFZpZXcg bWF4aW11bVpvb21TY2FsZV0pXTsKIAogICAgIC8vIENvbXB1dGUgdGhlIG5ldyBzY2FsZSB0byBr ZWVwIHRoZSBjdXJyZW50IGNvbnRlbnQgd2lkdGggaW4gdGhlIHNjcm9sbHZpZXcuCiAgICAgQ0dG bG9hdCBvbGRXZWJWaWV3V2lkdGhJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZXMgPSBvbGRVbm9ic2N1 cmVkQ29udGVudFJlY3Qud2lkdGgoKTsKICAgICBDR0Zsb2F0IHZpc2libGVDb250ZW50Vmlld1dp ZHRoSW5Db250ZW50Q29vcmRpbmF0ZXMgPSBzdGQ6Om1pbihjb250ZW50U2l6ZUluQ29udGVudFZp ZXdDb29yZGluYXRlcy53aWR0aCwgb2xkV2ViVmlld1dpZHRoSW5Db250ZW50Vmlld0Nvb3JkaW5h dGVzKTsKLSAgICBDR0Zsb2F0IHRhcmdldFNjYWxlID0gbmV3TWluaW11bUxheW91dFNpemUud2lk dGggLyB2aXNpYmxlQ29udGVudFZpZXdXaWR0aEluQ29udGVudENvb3JkaW5hdGVzOworICAgIENH RmxvYXQgdGFyZ2V0U2NhbGUgPSBuZXdNaW5pbXVtTGF5b3V0U2l6ZS53aWR0aCgpIC8gdmlzaWJs ZUNvbnRlbnRWaWV3V2lkdGhJbkNvbnRlbnRDb29yZGluYXRlczsKICAgICBDR0Zsb2F0IHJlc2l6 ZUFuaW1hdGlvblZpZXdBbmltYXRpb25TY2FsZSA9IHRhcmdldFNjYWxlIC8gY29udGVudFpvb21T Y2FsZShzZWxmKTsKICAgICBbX3Jlc2l6ZUFuaW1hdGlvblZpZXcgc2V0VHJhbnNmb3JtOkNHQWZm aW5lVHJhbnNmb3JtTWFrZVNjYWxlKHJlc2l6ZUFuaW1hdGlvblZpZXdBbmltYXRpb25TY2FsZSwg cmVzaXplQW5pbWF0aW9uVmlld0FuaW1hdGlvblNjYWxlKV07CiAKQEAgLTIwNjgsNjggKzIxMTEs NDkgQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlvbnMoX1dL RmluZE9wdGlvbnMgd2tGaW5kT3B0aW9ucykKICAgICBDR1JlY3QgdmlzaWJsZVJlY3RJbkNvbnRl bnRDb29yZGluYXRlcyA9IFtzZWxmIGNvbnZlcnRSZWN0Om5ld0JvdW5kcyB0b1ZpZXc6X2NvbnRl bnRWaWV3LmdldCgpXTsKICAgICBDR1JlY3QgdW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29yZGlu YXRlcyA9IFtzZWxmIGNvbnZlcnRSZWN0OmZ1dHVyZVVub2JzY3VyZWRSZWN0SW5TZWxmQ29vcmRp bmF0ZXMgdG9WaWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CiAKLSAgICBDR1NpemUgbWluaW11bUxh eW91dFNpemUgPSBuZXdCb3VuZHMuc2l6ZTsKLSAgICBpZiAoX292ZXJyaWRlc01pbmltdW1MYXlv dXRTaXplKQotICAgICAgICBtaW5pbXVtTGF5b3V0U2l6ZSA9IF9taW5pbXVtTGF5b3V0U2l6ZU92 ZXJyaWRlOwotCi0gICAgQ0dTaXplIG1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJID0gbWlu aW11bUxheW91dFNpemU7Ci0gICAgaWYgKF9vdmVycmlkZXNNaW5pbXVtTGF5b3V0U2l6ZUZvck1p bmltYWxVSSkKLSAgICAgICAgbWluaW11bUxheW91dFNpemVGb3JNaW5pbWFsVUkgPSBfbWluaW11 bUxheW91dFNpemVPdmVycmlkZUZvck1pbmltYWxVSTsKLQotICAgIENHU2l6ZSBtYXhpbXVtVW5v YnNjdXJlZFNpemUgPSBuZXdCb3VuZHMuc2l6ZTsKLSAgICBpZiAoX292ZXJyaWRlc01heGltdW1V bm9ic2N1cmVkU2l6ZSkKLSAgICAgICAgbWF4aW11bVVub2JzY3VyZWRTaXplID0gX21heGltdW1V bm9ic2N1cmVkU2l6ZU92ZXJyaWRlOwotCi0gICAgaW50MzJfdCBvcmllbnRhdGlvbjsKLSAgICBp ZiAoX292ZXJyaWRlc0ludGVyZmFjZU9yaWVudGF0aW9uKQotICAgICAgICBvcmllbnRhdGlvbiA9 IGRldmljZU9yaWVudGF0aW9uRm9yVUlJbnRlcmZhY2VPcmllbnRhdGlvbihfaW50ZXJmYWNlT3Jp ZW50YXRpb25PdmVycmlkZSk7Ci0gICAgZWxzZQotICAgICAgICBvcmllbnRhdGlvbiA9IF9wYWdl LT5kZXZpY2VPcmllbnRhdGlvbigpOwotCi0gICAgX3BhZ2UtPmR5bmFtaWNWaWV3cG9ydFNpemVV cGRhdGUoV2ViQ29yZTo6RmxvYXRTaXplKG1pbmltdW1MYXlvdXRTaXplKSwgV2ViQ29yZTo6Rmxv YXRTaXplKG1pbmltdW1MYXlvdXRTaXplRm9yTWluaW1hbFVJKSwgV2ViQ29yZTo6RmxvYXRTaXpl KG1heGltdW1Vbm9ic2N1cmVkU2l6ZSksIHZpc2libGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMs IHVub2JzY3VyZWRSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMsIGZ1dHVyZVVub2JzY3VyZWRSZWN0 SW5TZWxmQ29vcmRpbmF0ZXMsIHRhcmdldFNjYWxlLCBvcmllbnRhdGlvbik7CisgICAgX3BhZ2Ut PmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUobmV3TWluaW11bUxheW91dFNpemUsIG5ld01pbmlt dW1MYXlvdXRTaXplRm9yTWluaW1hbFVJLCBuZXdNYXhpbXVtVW5vYnNjdXJlZFNpemUsIHZpc2li bGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMsIHVub2JzY3VyZWRSZWN0SW5Db250ZW50Q29vcmRp bmF0ZXMsIGZ1dHVyZVVub2JzY3VyZWRSZWN0SW5TZWxmQ29vcmRpbmF0ZXMsIHRhcmdldFNjYWxl LCBuZXdPcmllbnRhdGlvbik7CiB9CiAKIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXplCiB7Cisg ICAgaWYgKCFfaXNBbmltYXRpbmdSZXNpemUpCisgICAgICAgIHJldHVybjsKKwogICAgIF9wYWdl LT5zeW5jaHJvbml6ZUR5bmFtaWNWaWV3cG9ydFVwZGF0ZSgpOwogCi0gICAgaWYgKCFfY3VzdG9t Q29udGVudFZpZXcgJiYgX2lzQW5pbWF0aW5nUmVzaXplKSB7Ci0gICAgICAgIE5TVUludGVnZXIg aW5kZXhPZlJlc2l6ZUFuaW1hdGlvblZpZXcgPSBbW19zY3JvbGxWaWV3IHN1YnZpZXdzXSBpbmRl eE9mT2JqZWN0Ol9yZXNpemVBbmltYXRpb25WaWV3LmdldCgpXTsKLSAgICAgICAgW19zY3JvbGxW aWV3IGluc2VydFN1YnZpZXc6X2NvbnRlbnRWaWV3LmdldCgpIGF0SW5kZXg6aW5kZXhPZlJlc2l6 ZUFuaW1hdGlvblZpZXddOworICAgIE5TVUludGVnZXIgaW5kZXhPZlJlc2l6ZUFuaW1hdGlvblZp ZXcgPSBbW19zY3JvbGxWaWV3IHN1YnZpZXdzXSBpbmRleE9mT2JqZWN0Ol9yZXNpemVBbmltYXRp b25WaWV3LmdldCgpXTsKKyAgICBbX3Njcm9sbFZpZXcgaW5zZXJ0U3VidmlldzpfY29udGVudFZp ZXcuZ2V0KCkgYXRJbmRleDppbmRleE9mUmVzaXplQW5pbWF0aW9uVmlld107CiAKLSAgICAgICAg Q0FMYXllciAqY29udGVudFZpZXdMYXllciA9IFtfY29udGVudFZpZXcgbGF5ZXJdOwotICAgICAg ICBDQVRyYW5zZm9ybTNEIHJlc2l6ZUFuaW1hdGlvblRyYW5zZm9ybUFkanVzdGVtZW50cyA9IF9y ZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50czsKLSAgICAgICAgQ0dGbG9hdCBhZGp1 c3RtZW50U2NhbGUgPSByZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1c3RlbWVudHMubTExOwot ICAgICAgICBjb250ZW50Vmlld0xheWVyLnN1YmxheWVyVHJhbnNmb3JtID0gQ0FUcmFuc2Zvcm0z RElkZW50aXR5OworICAgIENBTGF5ZXIgKmNvbnRlbnRWaWV3TGF5ZXIgPSBbX2NvbnRlbnRWaWV3 IGxheWVyXTsKKyAgICBDR0Zsb2F0IGFkanVzdG1lbnRTY2FsZSA9IF9yZXNpemVBbmltYXRpb25U cmFuc2Zvcm1BZGp1c3RtZW50cy5tMTE7CisgICAgY29udGVudFZpZXdMYXllci5zdWJsYXllclRy YW5zZm9ybSA9IENBVHJhbnNmb3JtM0RJZGVudGl0eTsKIAotICAgICAgICBDR0Zsb2F0IGFuaW1h dGluZ1NjYWxlVGFyZ2V0ID0gW1tfcmVzaXplQW5pbWF0aW9uVmlldyBsYXllcl0gdHJhbnNmb3Jt XS5tMTE7Ci0gICAgICAgIENBTGF5ZXIgKmNvbnRlbnRMYXllciA9IFtfY29udGVudFZpZXcgbGF5 ZXJdOwotICAgICAgICBDQVRyYW5zZm9ybTNEIGNvbnRlbnRMYXllclRyYW5zZm9ybSA9IGNvbnRl bnRMYXllci50cmFuc2Zvcm07Ci0gICAgICAgIENHRmxvYXQgY3VycmVudFNjYWxlID0gW1tfcmVz aXplQW5pbWF0aW9uVmlldyBsYXllcl0gdHJhbnNmb3JtXS5tMTEgKiBjb250ZW50TGF5ZXJUcmFu c2Zvcm0ubTExOwotCi0gICAgICAgIC8vIFdlIGNhbm5vdCB1c2UgW1VJU2Nyb2xsVmlldyBzZXRa b29tU2NhbGU6XSBkaXJlY3RseSBiZWNhdXNlIHRoZSBVSVNjcm9sbFZpZXcgZGVsZWdhdGUgd291 bGQgZ2V0IGEgY2FsbGJhY2sgd2l0aAotICAgICAgICAvLyBhbiBpbnZhbGlkIGNvbnRlbnRPZmZz ZXQuIFRoZSByZWFsIGNvbnRlbnQgb2Zmc2V0IGlzIG9ubHkgc2V0IGJlbG93LgotICAgICAgICAv LyBTaW5jZSB0aGVyZSBpcyBubyBwdWJsaWMgQVBJIGZvciBzZXR0aW5nIGJvdGggdGhlIHpvb21T Y2FsZSBhbmQgdGhlIGNvbnRlbnRPZmZzZXQsIHdlIHNldCB0aGUgem9vbVNjYWxlIG1hbnVhbGx5 Ci0gICAgICAgIC8vIG9uIHRoZSB6b29tIGxheWVyIGFuZCB0aGVuIG9ubHkgY2hhbmdlIHRoZSBj b250ZW50T2Zmc2V0LgotICAgICAgICBDR0Zsb2F0IGFkanVzdGVkU2NhbGUgPSBhZGp1c3RtZW50 U2NhbGUgKiBjdXJyZW50U2NhbGU7Ci0gICAgICAgIGNvbnRlbnRMYXllclRyYW5zZm9ybS5tMTEg PSBhZGp1c3RlZFNjYWxlOwotICAgICAgICBjb250ZW50TGF5ZXJUcmFuc2Zvcm0ubTIyID0gYWRq dXN0ZWRTY2FsZTsKLSAgICAgICAgY29udGVudExheWVyLnRyYW5zZm9ybSA9IGNvbnRlbnRMYXll clRyYW5zZm9ybTsKLQotICAgICAgICBDR1BvaW50IGN1cnJlbnRTY3JvbGxPZmZzZXQgPSBbX3Nj cm9sbFZpZXcgY29udGVudE9mZnNldF07Ci0gICAgICAgIGRvdWJsZSBob3Jpem9udGFsU2Nyb2xs QWRqdXN0ZW1lbnQgPSBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMubTQxICog YW5pbWF0aW5nU2NhbGVUYXJnZXQ7Ci0gICAgICAgIGRvdWJsZSB2ZXJ0aWNhbFNjcm9sbEFkanVz dG1lbnQgPSBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMubTQyICogYW5pbWF0 aW5nU2NhbGVUYXJnZXQ7CisgICAgQ0dGbG9hdCBhbmltYXRpbmdTY2FsZVRhcmdldCA9IFtbX3Jl c2l6ZUFuaW1hdGlvblZpZXcgbGF5ZXJdIHRyYW5zZm9ybV0ubTExOworICAgIENBTGF5ZXIgKmNv bnRlbnRMYXllciA9IFtfY29udGVudFZpZXcgbGF5ZXJdOworICAgIENBVHJhbnNmb3JtM0QgY29u dGVudExheWVyVHJhbnNmb3JtID0gY29udGVudExheWVyLnRyYW5zZm9ybTsKKyAgICBDR0Zsb2F0 IGN1cnJlbnRTY2FsZSA9IFtbX3Jlc2l6ZUFuaW1hdGlvblZpZXcgbGF5ZXJdIHRyYW5zZm9ybV0u bTExICogY29udGVudExheWVyVHJhbnNmb3JtLm0xMTsKIAotICAgICAgICBbX3Njcm9sbFZpZXcg c2V0Q29udGVudFNpemU6cm91bmRTY3JvbGxWaWV3Q29udGVudFNpemUoKl9wYWdlLCBbX2NvbnRl bnRWaWV3IGZyYW1lXS5zaXplKV07Ci0gICAgICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50T2Zm c2V0OkNHUG9pbnRNYWtlKGN1cnJlbnRTY3JvbGxPZmZzZXQueCAtIGhvcml6b250YWxTY3JvbGxB ZGp1c3RlbWVudCwgY3VycmVudFNjcm9sbE9mZnNldC55IC0gdmVydGljYWxTY3JvbGxBZGp1c3Rt ZW50KV07CisgICAgLy8gV2UgY2Fubm90IHVzZSBbVUlTY3JvbGxWaWV3IHNldFpvb21TY2FsZTpd IGRpcmVjdGx5IGJlY2F1c2UgdGhlIFVJU2Nyb2xsVmlldyBkZWxlZ2F0ZSB3b3VsZCBnZXQgYSBj YWxsYmFjayB3aXRoCisgICAgLy8gYW4gaW52YWxpZCBjb250ZW50T2Zmc2V0LiBUaGUgcmVhbCBj b250ZW50IG9mZnNldCBpcyBvbmx5IHNldCBiZWxvdy4KKyAgICAvLyBTaW5jZSB0aGVyZSBpcyBu byBwdWJsaWMgQVBJIGZvciBzZXR0aW5nIGJvdGggdGhlIHpvb21TY2FsZSBhbmQgdGhlIGNvbnRl bnRPZmZzZXQsIHdlIHNldCB0aGUgem9vbVNjYWxlIG1hbnVhbGx5CisgICAgLy8gb24gdGhlIHpv b20gbGF5ZXIgYW5kIHRoZW4gb25seSBjaGFuZ2UgdGhlIGNvbnRlbnRPZmZzZXQuCisgICAgQ0dG bG9hdCBhZGp1c3RlZFNjYWxlID0gYWRqdXN0bWVudFNjYWxlICogY3VycmVudFNjYWxlOworICAg IGNvbnRlbnRMYXllclRyYW5zZm9ybS5tMTEgPSBhZGp1c3RlZFNjYWxlOworICAgIGNvbnRlbnRM YXllclRyYW5zZm9ybS5tMjIgPSBhZGp1c3RlZFNjYWxlOworICAgIGNvbnRlbnRMYXllci50cmFu c2Zvcm0gPSBjb250ZW50TGF5ZXJUcmFuc2Zvcm07CiAKLSAgICAgICAgW19yZXNpemVBbmltYXRp b25WaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOwotICAgICAgICBfcmVzaXplQW5pbWF0aW9uVmll dyA9IG5pbDsKLSAgICB9CisgICAgQ0dQb2ludCBjdXJyZW50U2Nyb2xsT2Zmc2V0ID0gW19zY3Jv bGxWaWV3IGNvbnRlbnRPZmZzZXRdOworICAgIGRvdWJsZSBob3Jpem9udGFsU2Nyb2xsQWRqdXN0 ZW1lbnQgPSBfcmVzaXplQW5pbWF0aW9uVHJhbnNmb3JtQWRqdXN0bWVudHMubTQxICogYW5pbWF0 aW5nU2NhbGVUYXJnZXQ7CisgICAgZG91YmxlIHZlcnRpY2FsU2Nyb2xsQWRqdXN0bWVudCA9IF9y ZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50cy5tNDIgKiBhbmltYXRpbmdTY2FsZVRh cmdldDsKIAotICAgIF9pc0FuaW1hdGluZ1Jlc2l6ZSA9IE5POworICAgIFtfc2Nyb2xsVmlldyBz ZXRDb250ZW50U2l6ZTpyb3VuZFNjcm9sbFZpZXdDb250ZW50U2l6ZSgqX3BhZ2UsIFtfY29udGVu dFZpZXcgZnJhbWVdLnNpemUpXTsKKyAgICBbX3Njcm9sbFZpZXcgc2V0Q29udGVudE9mZnNldDpD R1BvaW50TWFrZShjdXJyZW50U2Nyb2xsT2Zmc2V0LnggLSBob3Jpem9udGFsU2Nyb2xsQWRqdXN0 ZW1lbnQsIGN1cnJlbnRTY3JvbGxPZmZzZXQueSAtIHZlcnRpY2FsU2Nyb2xsQWRqdXN0bWVudCld OworCisgICAgW19yZXNpemVBbmltYXRpb25WaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOworICAg IF9yZXNpemVBbmltYXRpb25WaWV3ID0gbmlsOwogICAgIF9yZXNpemVBbmltYXRpb25UcmFuc2Zv cm1BZGp1c3RtZW50cyA9IENBVHJhbnNmb3JtM0RJZGVudGl0eTsKIAorICAgIF9pc0FuaW1hdGlu Z1Jlc2l6ZSA9IE5POwogICAgIFtzZWxmIF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXTsKIH0K IAo=