131329 2014-04-07 17:09:31 -0700 [iOS][WK2] Implement the update of content offset on animated resize 2014-04-07 19:13:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin sam simon.fraser thorton oldest_to_newest 998308 0 benjamin 2014-04-07 17:09:31 -0700 [iOS][WK2] Implement the update of content offset on animated resize 998314 1 228779 benjamin 2014-04-07 17:13:36 -0700 Created attachment 228779 Patch 998348 2 228788 benjamin 2014-04-07 18:27:59 -0700 Created attachment 228788 Patch 998361 3 228788 thorton 2014-04-07 18:45:08 -0700 Comment on attachment 228788 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228788&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1200 > + CGSize contentSizeInContentViewCoordinate = [_contentView bounds].size; coordinate*s* > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1215 > + CGFloat oldWebViewWidthInContentViewCoordinate = oldBounds.size.width / contentZoomScale(self); so many "s" missing 998376 4 benjamin 2014-04-07 19:13:34 -0700 Committed r166905: <http://trac.webkit.org/changeset/166905> 228779 2014-04-07 17:13:36 -0700 2014-04-07 18:27:58 -0700 Patch bug-131329-20140407171316.patch text/plain 5634 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWQ4ODFlYWJiMTgxYjk3 N2E0MzIyNjU4MTExMWRiMGMxMjFjOTIzNC4uZDg3MjUxN2ZhNDU3MTllNTZiNjE3ZmJmODdhZThk MGE5MTNmYzE4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA0LTA3ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g SW1wbGVtZW50IHRoZSB1cGRhdGUgb2YgY29udGVudCBvZmZzZXQgb24gYW5pbWF0ZWQgcmVzaXpl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wdXRl IGEgcmVhc29uYWJsZSB0YXJnZXQgb2Zmc2V0IG9uIHJvdGF0aW9uLiBUaGlzIGdvZXMgaW4gMyBz dGVwczoKKyAgICAgICAgMSkgTW92ZSB0aGUgcGFnZSBzbyB0aGF0IHRoZSBjZW50ZXIgZG9lcyBu b3QgbW92ZSBkdXJpbmcgc2NhbGluZy4KKyAgICAgICAgMikgTGltaXQgdGhlIHJhbmdlIHRvIGtl ZXAgdGhlIHBhZ2UgaW4gc2Nyb2xsdmlldyB3aXRob3V0IHJ1YmJlcmJhbmRpbmcuCisgICAgICAg IDMpIFRoZSBob3Jpem9udGFsIGNvbnRlbnQgc3RheXMgdGhlIHNhbWUgYnV0IHRoZSB2ZXJ0aWNh bCBhcmVhIGNoYW5nZXMuIFdoZW4gb24gdGhlIHRvcCBvciBib3R0b20KKyAgICAgICAgICAgZWRn ZSwgc3RpY2sgdG8gdGhlIGVkZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9mcmFtZU9yQm91bmRzQ2hhbmdlZEZy b206XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c10p OgorCiAyMDE0LTA0LTA3ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAg ICAgSW50cm9kdWNlIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlBhZ2VVSUNsaWVudApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBhOWUyYmVk MDExNmZiMTExYmMwNzFiMDBjNDMyODg0OTQ3MTk5NjRjLi4zNzE0MmYzODZlNGYzNjczNzQ2Mzc4 NjJiYmNhOTgxYTA3YzhjMDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQpAQCAtNjc1LDYgKzY3NSw3IEBAIHN0YXRpYyBXZWJDb3JlOjpG bG9hdFBvaW50IGNvbnN0cmFpbkNvbnRlbnRPZmZzZXQoV2ViQ29yZTo6RmxvYXRQb2ludCBjb250 ZW50T2ZmCiAtICh2b2lkKV9mcmFtZU9yQm91bmRzQ2hhbmdlZEZyb206KENHUmVjdClvbGRCb3Vu ZHMKIHsKICAgICBDR1JlY3QgYm91bmRzID0gc2VsZi5ib3VuZHM7CisgICAgV2ViQ29yZTo6Rmxv YXRSZWN0IG9yaWdpbmFsVW5vYnNjdXJlZENvbnRlbnRSZWN0ID0gX3BhZ2UtPnVub2JzY3VyZWRD b250ZW50UmVjdCgpOwogCiAgICAgaWYgKCFfaGFzU3RhdGljTWluaW11bUxheW91dFNpemUpCiAg ICAgICAgIFtfY29udGVudFZpZXcgc2V0TWluaW11bUxheW91dFNpemU6Ym91bmRzLnNpemVdOwpA QCAtNjg0LDExICs2ODUsNDMgQEAgc3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWlu Q29udGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICBbc2VsZiBf dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c107CiAKICAgICBpZiAoX2lzQW5pbWF0aW5nUmVzaXpl ICYmICFfY3VzdG9tQ29udGVudFZpZXcpIHsKKyAgICAgICAgLy8gVXBkYXRlIHRoZSBjb250ZW50 IHNjYWxlIHRvIGtlZXAgdGhlIHNhbWUgY29udGVudCB3aWR0aCBpbiB0aGUgbmV3IHNpemUuCiAg ICAgICAgIENHRmxvYXQgb2xkV2ViVmlld1dpZHRoSW5Db250ZW50Q29vcmRpbmF0ZSA9IG9sZEJv dW5kcy5zaXplLndpZHRoIC8gY29udGVudFpvb21TY2FsZShzZWxmKTsKLSAgICAgICAgQ0dGbG9h dCB2aXNpYmxlQ29udGVudFZpZXdXaWR0aEluQ29udGVudENvb3JkaW5hdGUgPSBzdGQ6Om1pbihb X2NvbnRlbnRWaWV3IGJvdW5kc10uc2l6ZS53aWR0aCwgb2xkV2ViVmlld1dpZHRoSW5Db250ZW50 Q29vcmRpbmF0ZSk7CisgICAgICAgIENHU2l6ZSBjb250ZW50U2l6ZUluQ29udGVudFZpZXdDb29y ZGluYXRlID0gW19jb250ZW50VmlldyBib3VuZHNdLnNpemU7CisgICAgICAgIENHRmxvYXQgdmlz aWJsZUNvbnRlbnRWaWV3V2lkdGhJbkNvbnRlbnRDb29yZGluYXRlID0gc3RkOjptaW4oY29udGVu dFNpemVJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZS53aWR0aCwgb2xkV2ViVmlld1dpZHRoSW5Db250 ZW50Q29vcmRpbmF0ZSk7CiAgICAgICAgIENHRmxvYXQgdGFyZ2V0U2NhbGUgPSBib3VuZHMuc2l6 ZS53aWR0aCAvIHZpc2libGVDb250ZW50Vmlld1dpZHRoSW5Db250ZW50Q29vcmRpbmF0ZTsKICAg ICAgICAgW19zY3JvbGxWaWV3IHNldFpvb21TY2FsZTp0YXJnZXRTY2FsZV07Ci0gICAgICAgIC8v IEZJWE1FOiBjb21wdXRlIHRoZSByZWFsIHRhcmdldCBvZmZzZXQgYmFzZWQgb24gdGhlIGZ1dHVy ZSBleHBvc2VkIHJlY3QsIHRoZSBjb250ZW50IGFuZCBsaW1pdCBpdCB0byB0aGUgdmFsaWQgcmFu Z2UuCisKKyAgICAgICAgLy8gQ29tcHV0ZSBhIG5ldyBwb3NpdGlvbiB0byBrZWVwIHRoZSBjb250 ZW50IGNlbnRlcmVkLiBXZSBhc3N1bWUgdGhlIGxheW91dCBzaXplIHdpbGwgbm90IGNoYW5nZSBo ZXJlLgorICAgICAgICBDR1BvaW50IG9yaWdpbmFsQ29udGVudENlbnRlciA9IG9yaWdpbmFsVW5v YnNjdXJlZENvbnRlbnRSZWN0LmNlbnRlcigpOworICAgICAgICBDR1BvaW50IG9yaWdpbmFsQ29u dGVudENlbnRlckluU2VsZkNvb3JkaW5hdGVzID0gW3NlbGYgY29udmVydFBvaW50Om9yaWdpbmFs Q29udGVudENlbnRlciBmcm9tVmlldzpfY29udGVudFZpZXcuZ2V0KCldOworICAgICAgICBDR1Jl Y3QgZnV0dXJlVW5vYnNjdXJlZFJlY3RJblNlbGZDb29yZGluYXRlcyA9IFVJRWRnZUluc2V0c0lu c2V0UmVjdChib3VuZHMsIF9vYnNjdXJlZEluc2V0cyk7CisgICAgICAgIENHUG9pbnQgZnV0dXJl VW5vYnNjdXJlZFJlY3RDZW50ZXJJblNlbGZDb29yZGluYXRlcyA9IENHUG9pbnRNYWtlKGZ1dHVy ZVVub2JzY3VyZWRSZWN0SW5TZWxmQ29vcmRpbmF0ZXMub3JpZ2luLnggKyBmdXR1cmVVbm9ic2N1 cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzLnNpemUud2lkdGggLyAyLCBmdXR1cmVVbm9ic2N1cmVk UmVjdEluU2VsZkNvb3JkaW5hdGVzLm9yaWdpbi55ICsgZnV0dXJlVW5vYnNjdXJlZFJlY3RJblNl bGZDb29yZGluYXRlcy5zaXplLmhlaWdodCAvIDIpOworCisgICAgICAgIENHUG9pbnQgb3JpZ2lu YWxDb250ZW50T2Zmc2V0ID0gW19zY3JvbGxWaWV3IGNvbnRlbnRPZmZzZXRdOworICAgICAgICBD R1BvaW50IGNvbnRlbnRPZmZzZXQgPSBvcmlnaW5hbENvbnRlbnRPZmZzZXQ7CisgICAgICAgIGNv bnRlbnRPZmZzZXQueCArPSAob3JpZ2luYWxDb250ZW50Q2VudGVySW5TZWxmQ29vcmRpbmF0ZXMu eCAtIGZ1dHVyZVVub2JzY3VyZWRSZWN0Q2VudGVySW5TZWxmQ29vcmRpbmF0ZXMueCk7CisgICAg ICAgIGNvbnRlbnRPZmZzZXQueSArPSAob3JpZ2luYWxDb250ZW50Q2VudGVySW5TZWxmQ29vcmRp bmF0ZXMueSAtIGZ1dHVyZVVub2JzY3VyZWRSZWN0Q2VudGVySW5TZWxmQ29vcmRpbmF0ZXMueSk7 CisKKyAgICAgICAgLy8gTGltaXQgdGhlIG5ldyBvZmZzZXQgd2l0aGluIHRoZSBzY3JvbGx2aWV3 LCB3ZSBkbyBub3Qgd2FudCB0byBydWJiZXIgYmFuZCBwcm9ncmFtbWF0aWNhbGx5LgorICAgICAg ICBDR1NpemUgZnV0dXJlQ29udGVudFNpemVJblNlbGZDb29yZGluYXRlID0gQ0dTaXplTWFrZShj b250ZW50U2l6ZUluQ29udGVudFZpZXdDb29yZGluYXRlLndpZHRoICogdGFyZ2V0U2NhbGUsIGNv bnRlbnRTaXplSW5Db250ZW50Vmlld0Nvb3JkaW5hdGUuaGVpZ2h0ICogdGFyZ2V0U2NhbGUpOwor ICAgICAgICBDR0Zsb2F0IG1heEhvcml6b250YWxPZmZzZXQgPSBmdXR1cmVDb250ZW50U2l6ZUlu U2VsZkNvb3JkaW5hdGUud2lkdGggLSBib3VuZHMuc2l6ZS53aWR0aCArIF9vYnNjdXJlZEluc2V0 cy5yaWdodDsKKyAgICAgICAgY29udGVudE9mZnNldC54ID0gc3RkOjptaW4oY29udGVudE9mZnNl dC54LCBtYXhIb3Jpem9udGFsT2Zmc2V0KTsKKyAgICAgICAgQ0dGbG9hdCBtYXhWZXJ0aWNhbE9m ZnNldCA9IGZ1dHVyZUNvbnRlbnRTaXplSW5TZWxmQ29vcmRpbmF0ZS5oZWlnaHQgLSBib3VuZHMu c2l6ZS5oZWlnaHQgKyBfb2JzY3VyZWRJbnNldHMuYm90dG9tOworICAgICAgICBjb250ZW50T2Zm c2V0LnkgPSBzdGQ6Om1pbihjb250ZW50T2Zmc2V0LnksIG1heFZlcnRpY2FsT2Zmc2V0KTsKKwor ICAgICAgICBjb250ZW50T2Zmc2V0LnggPSBzdGQ6Om1heChjb250ZW50T2Zmc2V0LngsIC1fb2Jz Y3VyZWRJbnNldHMubGVmdCk7CisgICAgICAgIGNvbnRlbnRPZmZzZXQueSA9IHN0ZDo6bWF4KGNv bnRlbnRPZmZzZXQueSwgLV9vYnNjdXJlZEluc2V0cy50b3ApOworCisgICAgICAgIC8vIE1ha2Ug dGhlIHRvcC9ib3R0b20gZWRnZXMgInN0aWNreSIgd2l0aGluIDEgcGl4ZWwuCisgICAgICAgIGlm IChvcmlnaW5hbFVub2JzY3VyZWRDb250ZW50UmVjdC5tYXhZKCkgPiBjb250ZW50U2l6ZUluQ29u dGVudFZpZXdDb29yZGluYXRlLmhlaWdodCAtIDEpCisgICAgICAgICAgICBjb250ZW50T2Zmc2V0 LnkgPSBtYXhWZXJ0aWNhbE9mZnNldDsKKyAgICAgICAgaWYgKG9yaWdpbmFsVW5vYnNjdXJlZENv bnRlbnRSZWN0LnkoKSA8IDEpCisgICAgICAgICAgICBjb250ZW50T2Zmc2V0LnkgPSAtX29ic2N1 cmVkSW5zZXRzLnRvcDsKKworICAgICAgICAvLyBGSVhNRTogaWYgd2UgaGF2ZSBjb250ZW50IGNl bnRlcmVkIGFmdGVyIGRvdWJsZSB0YXAgdG8gem9vbSwgd2Ugc2hvdWxkIGFsc28gdHJ5IHRvIGtl ZXAgdGhhdCByZWN0IGluIHZpZXcuCisKKyAgICAgICAgW19zY3JvbGxWaWV3IHNldENvbnRlbnRP ZmZzZXQ6Y29udGVudE9mZnNldF07CiAgICB9CiB9CiAKQEAgLTcwNyw2ICs3NDAsOSBAQCBzdGF0 aWMgV2ViQ29yZTo6RmxvYXRQb2ludCBjb25zdHJhaW5Db250ZW50T2Zmc2V0KFdlYkNvcmU6OkZs b2F0UG9pbnQgY29udGVudE9mZgogICAgIGlmICghW3NlbGYgdXNlc1N0YW5kYXJkQ29udGVudFZp ZXddKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoX2lzQW5pbWF0aW5nUmVzaXplKQorICAg ICAgICByZXR1cm47CisKICAgICBDR1JlY3QgZnVsbFZpZXdSZWN0ID0gc2VsZi5ib3VuZHM7CiAg ICAgQ0dSZWN0IHZpc2libGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMgPSBbc2VsZiBjb252ZXJ0 UmVjdDpmdWxsVmlld1JlY3QgdG9WaWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CiAK 228788 2014-04-07 18:27:59 -0700 2014-04-07 18:45:08 -0700 Patch bug-131329-20140407182738.patch text/plain 8307 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWQ4ODFlYWJiMTgxYjk3 N2E0MzIyNjU4MTExMWRiMGMxMjFjOTIzNC4uMzdiNGM3MjRiN2QzZmUwNGZjN2YzODZjYTJmNjhl YmIyNWQzMmMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA0LTA3ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g SW1wbGVtZW50IHRoZSB1cGRhdGUgb2YgY29udGVudCBvZmZzZXQgb24gYW5pbWF0ZWQgcmVzaXpl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wdXRl IGEgcmVhc29uYWJsZSB0YXJnZXQgb2Zmc2V0IG9uIHJvdGF0aW9uLiBUaGlzIGdvZXMgaW4gMyBz dGVwczoKKyAgICAgICAgMSkgTW92ZSB0aGUgcGFnZSBzbyB0aGF0IHRoZSBjZW50ZXIgZG9lcyBu b3QgbW92ZSBkdXJpbmcgc2NhbGluZy4KKyAgICAgICAgMikgTGltaXQgdGhlIHJhbmdlIHRvIGtl ZXAgdGhlIHBhZ2UgaW4gc2Nyb2xsdmlldyB3aXRob3V0IHJ1YmJlcmJhbmRpbmcuCisgICAgICAg IDMpIFRoZSBob3Jpem9udGFsIGNvbnRlbnQgc3RheXMgdGhlIHNhbWUgYnV0IHRoZSB2ZXJ0aWNh bCBhcmVhIGNoYW5nZXMuIFdoZW4gb24gdGhlIHRvcCBvciBib3R0b20KKyAgICAgICAgICAgZWRn ZSwgc3RpY2sgdG8gdGhlIGVkZ2UuCisKKyAgICAgICAgVGhlIGNvZGUgaXMgbW92ZWQgaW5zaWRl IF9iZWdpbkFuaW1hdGVkUmVzaXplVG9TaXplOm9ic2N1cmVkSW5zZXRzOm1pbmltdW1MYXlvdXRT aXplT3ZlcnJpZGU6IHNvIHRoYXQgd2UgY2FuIHRlbGwKKyAgICAgICAgdGhlIFdlYlByb2Nlc3Mg d2hlcmUgdGhlIHNjcm9sbCBwb3NpdGlvbiB3aWxsIGJlIGF0IHRoZSBlbmQgb2YgdGhlIGFuaW1h dGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkRnJvbTpdKToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXSk6CisgICAgICAgICgtW1dL V2ViVmlldyBfYmVnaW5BbmltYXRlZFJlc2l6ZVRvU2l6ZTpvYnNjdXJlZEluc2V0czptaW5pbXVt TGF5b3V0U2l6ZU92ZXJyaWRlOl0pOgorCiAyMDE0LTA0LTA3ICBEYW4gQmVybnN0ZWluICA8bWl0 ekBhcHBsZS5jb20+CiAKICAgICAgICAgSW50cm9kdWNlIEFQSTo6SW5qZWN0ZWRCdW5kbGU6OlBh Z2VVSUNsaWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQppbmRleCBhOWUyYmVkMDExNmZiMTExYmMwNzFiMDBjNDMyODg0OTQ3MTk5NjRjLi5j YmEyM2EyYjUwZjk1NmYxNzg0ZjAxZjY1ZmUyYjdlODhlOGIzMWRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTgxLDcgKzE4MSw3 IEBACiAgICAgW19jb250ZW50VmlldyBzZXRGcmFtZTpib3VuZHNdOwogICAgIFtfc2Nyb2xsVmll dyBhZGRTdWJ2aWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CiAKLSAgICBbc2VsZiBfZnJhbWVPckJv dW5kc0NoYW5nZWRGcm9tOnNlbGYuYm91bmRzXTsKKyAgICBbc2VsZiBfZnJhbWVPckJvdW5kc0No YW5nZWRdOwogCiAgICAgTlNOb3RpZmljYXRpb25DZW50ZXIgKmNlbnRlciA9IFtOU05vdGlmaWNh dGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXTsKICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYg c2VsZWN0b3I6QHNlbGVjdG9yKF9rZXlib2FyZFdpbGxDaGFuZ2VGcmFtZTopIG5hbWU6VUlLZXli b2FyZFdpbGxDaGFuZ2VGcmFtZU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKQEAgLTM0NywxMSAr MzQ3LDEwIEBACiAtICh2b2lkKXNldEZyYW1lOihDR1JlY3QpZnJhbWUKIHsKICAgICBDR1JlY3Qg b2xkRnJhbWUgPSBzZWxmLmZyYW1lOwotICAgIENHUmVjdCBvbGRCb3VuZHMgPSBzZWxmLmJvdW5k czsKICAgICBbc3VwZXIgc2V0RnJhbWU6ZnJhbWVdOwogCiAgICAgaWYgKCFDR1NpemVFcXVhbFRv U2l6ZShvbGRGcmFtZS5zaXplLCBmcmFtZS5zaXplKSkKLSAgICAgICAgW3NlbGYgX2ZyYW1lT3JC b3VuZHNDaGFuZ2VkRnJvbTpvbGRCb3VuZHNdOworICAgICAgICBbc2VsZiBfZnJhbWVPckJvdW5k c0NoYW5nZWRdOwogfQogCiAtICh2b2lkKXNldEJvdW5kczooQ0dSZWN0KWJvdW5kcwpAQCAtMzYw LDcgKzM1OSw3IEBACiAgICAgW3N1cGVyIHNldEJvdW5kczpib3VuZHNdOwogCiAgICAgaWYgKCFD R1NpemVFcXVhbFRvU2l6ZShvbGRCb3VuZHMuc2l6ZSwgYm91bmRzLnNpemUpKQotICAgICAgICBb c2VsZiBfZnJhbWVPckJvdW5kc0NoYW5nZWRGcm9tOm9sZEJvdW5kc107CisgICAgICAgIFtzZWxm IF9mcmFtZU9yQm91bmRzQ2hhbmdlZF07CiB9CiAKIC0gKFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZp ZXcKQEAgLTY3MiwyNCArNjcxLDE1IEBAIHN0YXRpYyBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnN0 cmFpbkNvbnRlbnRPZmZzZXQoV2ViQ29yZTo6RmxvYXRQb2ludCBjb250ZW50T2ZmCiAgICAgW19j b250ZW50VmlldyBkaWRab29tVG9TY2FsZTpzY2FsZV07CiB9CiAKLS0gKHZvaWQpX2ZyYW1lT3JC b3VuZHNDaGFuZ2VkRnJvbTooQ0dSZWN0KW9sZEJvdW5kcworLSAodm9pZClfZnJhbWVPckJvdW5k c0NoYW5nZWQKIHsKICAgICBDR1JlY3QgYm91bmRzID0gc2VsZi5ib3VuZHM7Ci0KLSAgICBpZiAo IV9oYXNTdGF0aWNNaW5pbXVtTGF5b3V0U2l6ZSkKKyAgICBpZiAoIV9oYXNTdGF0aWNNaW5pbXVt TGF5b3V0U2l6ZSAmJiAhX2lzQW5pbWF0aW5nUmVzaXplKQogICAgICAgICBbX2NvbnRlbnRWaWV3 IHNldE1pbmltdW1MYXlvdXRTaXplOmJvdW5kcy5zaXplXTsKICAgICBbX3Njcm9sbFZpZXcgc2V0 RnJhbWU6Ym91bmRzXTsKICAgICBbX2NvbnRlbnRWaWV3IHNldE1pbmltdW1TaXplOmJvdW5kcy5z aXplXTsKICAgICBbX2N1c3RvbUNvbnRlbnRWaWV3IHdlYl9zZXRNaW5pbXVtU2l6ZTpib3VuZHMu c2l6ZV07CiAgICAgW3NlbGYgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdOwotCi0gICAgaWYg KF9pc0FuaW1hdGluZ1Jlc2l6ZSAmJiAhX2N1c3RvbUNvbnRlbnRWaWV3KSB7Ci0gICAgICAgIENH RmxvYXQgb2xkV2ViVmlld1dpZHRoSW5Db250ZW50Q29vcmRpbmF0ZSA9IG9sZEJvdW5kcy5zaXpl LndpZHRoIC8gY29udGVudFpvb21TY2FsZShzZWxmKTsKLSAgICAgICAgQ0dGbG9hdCB2aXNpYmxl Q29udGVudFZpZXdXaWR0aEluQ29udGVudENvb3JkaW5hdGUgPSBzdGQ6Om1pbihbX2NvbnRlbnRW aWV3IGJvdW5kc10uc2l6ZS53aWR0aCwgb2xkV2ViVmlld1dpZHRoSW5Db250ZW50Q29vcmRpbmF0 ZSk7Ci0gICAgICAgIENHRmxvYXQgdGFyZ2V0U2NhbGUgPSBib3VuZHMuc2l6ZS53aWR0aCAvIHZp c2libGVDb250ZW50Vmlld1dpZHRoSW5Db250ZW50Q29vcmRpbmF0ZTsKLSAgICAgICAgW19zY3Jv bGxWaWV3IHNldFpvb21TY2FsZTp0YXJnZXRTY2FsZV07Ci0gICAgICAgIC8vIEZJWE1FOiBjb21w dXRlIHRoZSByZWFsIHRhcmdldCBvZmZzZXQgYmFzZWQgb24gdGhlIGZ1dHVyZSBleHBvc2VkIHJl Y3QsIHRoZSBjb250ZW50IGFuZCBsaW1pdCBpdCB0byB0aGUgdmFsaWQgcmFuZ2UuCi0gICB9CiB9 CiAKIC8vIFVub2JzY3VyZWQgY29udGVudCByZWN0IHdoZXJlIHRoZSB1c2VyIGNhbiBpbnRlcmFj dC4gV2hlbiB0aGUga2V5Ym9hcmQgaXMgdXAsIHRoaXMgc2hvdWxkIGJlIHRoZSBhcmVhIGFib3Zl IG9yIGJlbGxvdyB0aGUga2V5Ym9hcmQsIHdoZXJldmVyIHRoZXJlIGlzIGVub3VnaCBzcGFjZS4K QEAgLTcwNyw2ICs2OTcsOSBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRQb2ludCBjb25zdHJhaW5D b250ZW50T2Zmc2V0KFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZgogICAgIGlmICghW3Nl bGYgdXNlc1N0YW5kYXJkQ29udGVudFZpZXddKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAo X2lzQW5pbWF0aW5nUmVzaXplKQorICAgICAgICByZXR1cm47CisKICAgICBDR1JlY3QgZnVsbFZp ZXdSZWN0ID0gc2VsZi5ib3VuZHM7CiAgICAgQ0dSZWN0IHZpc2libGVSZWN0SW5Db250ZW50Q29v cmRpbmF0ZXMgPSBbc2VsZiBjb252ZXJ0UmVjdDpmdWxsVmlld1JlY3QgdG9WaWV3Ol9jb250ZW50 Vmlldy5nZXQoKV07CiAKQEAgLTEyMDQsMTIgKzExOTcsNTYgQEAgc3RhdGljIGlubGluZSBXZWJL aXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlvbnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9u cykKICAgICBpZiAoX2N1c3RvbUNvbnRlbnRWaWV3KQogICAgICAgICByZXR1cm47CiAKLSAgICBb X3Njcm9sbFZpZXcgc2V0TWluaW11bVpvb21TY2FsZTpzdGQ6Om1pbihmdXR1cmVTaXplLndpZHRo IC8gW19jb250ZW50VmlldyBib3VuZHNdLnNpemUud2lkdGgsIFtfc2Nyb2xsVmlldyBtaW5pbXVt Wm9vbVNjYWxlXSldOworICAgIENHU2l6ZSBjb250ZW50U2l6ZUluQ29udGVudFZpZXdDb29yZGlu YXRlID0gW19jb250ZW50VmlldyBib3VuZHNdLnNpemU7CisgICAgW19zY3JvbGxWaWV3IHNldE1p bmltdW1ab29tU2NhbGU6c3RkOjptaW4oZnV0dXJlU2l6ZS53aWR0aCAvIGNvbnRlbnRTaXplSW5D b250ZW50Vmlld0Nvb3JkaW5hdGUud2lkdGgsIFtfc2Nyb2xsVmlldyBtaW5pbXVtWm9vbVNjYWxl XSldOwogCiAgICAgX29ic2N1cmVkSW5zZXRzID0gZnV0dXJlT2JzY3VyZWRJbnNldHM7CiAgICAg aWYgKF9oYXNTdGF0aWNNaW5pbXVtTGF5b3V0U2l6ZSkKICAgICAgICAgX21pbmltdW1MYXlvdXRT aXplT3ZlcnJpZGUgPSBmdXR1cmVNaW5pbXVtTGF5b3V0U2l6ZTsKIAorICAgIENHUmVjdCBvbGRC b3VuZHMgPSBzZWxmLmJvdW5kczsKKyAgICBXZWJDb3JlOjpGbG9hdFJlY3Qgb3JpZ2luYWxVbm9i c2N1cmVkQ29udGVudFJlY3QgPSBfcGFnZS0+dW5vYnNjdXJlZENvbnRlbnRSZWN0KCk7CisKKyAg ICBDR1JlY3QgZnV0dXJlQm91bmRzID0gb2xkQm91bmRzOworICAgIGZ1dHVyZUJvdW5kcy5zaXpl ID0gZnV0dXJlU2l6ZTsKKyAgICBbc2VsZiBzZXRCb3VuZHM6ZnV0dXJlQm91bmRzXTsKKworICAg IC8vIENvbXB1dGUgdGhlIG5ldyBzY2FsZSB0byBrZWVwIHRoZSBjdXJyZW50IGNvbnRlbnQgd2lk dGggaW4gdGhlIHNjcm9sbHZpZXcuCisgICAgQ0dGbG9hdCBvbGRXZWJWaWV3V2lkdGhJbkNvbnRl bnRWaWV3Q29vcmRpbmF0ZSA9IG9sZEJvdW5kcy5zaXplLndpZHRoIC8gY29udGVudFpvb21TY2Fs ZShzZWxmKTsKKyAgICBDR0Zsb2F0IHZpc2libGVDb250ZW50Vmlld1dpZHRoSW5Db250ZW50Q29v cmRpbmF0ZSA9IHN0ZDo6bWluKGNvbnRlbnRTaXplSW5Db250ZW50Vmlld0Nvb3JkaW5hdGUud2lk dGgsIG9sZFdlYlZpZXdXaWR0aEluQ29udGVudFZpZXdDb29yZGluYXRlKTsKKyAgICBDR0Zsb2F0 IHRhcmdldFNjYWxlID0gZnV0dXJlQm91bmRzLnNpemUud2lkdGggLyB2aXNpYmxlQ29udGVudFZp ZXdXaWR0aEluQ29udGVudENvb3JkaW5hdGU7CisgICAgW19zY3JvbGxWaWV3IHNldFpvb21TY2Fs ZTp0YXJnZXRTY2FsZV07CisKKyAgICAvLyBDb21wdXRlIGEgbmV3IHBvc2l0aW9uIHRvIGtlZXAg dGhlIGNvbnRlbnQgY2VudGVyZWQuCisgICAgQ0dQb2ludCBvcmlnaW5hbENvbnRlbnRDZW50ZXIg PSBvcmlnaW5hbFVub2JzY3VyZWRDb250ZW50UmVjdC5jZW50ZXIoKTsKKyAgICBDR1BvaW50IG9y aWdpbmFsQ29udGVudENlbnRlckluU2VsZkNvb3JkaW5hdGVzID0gW3NlbGYgY29udmVydFBvaW50 Om9yaWdpbmFsQ29udGVudENlbnRlciBmcm9tVmlldzpfY29udGVudFZpZXcuZ2V0KCldOworICAg IENHUmVjdCBmdXR1cmVVbm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzID0gVUlFZGdlSW5z ZXRzSW5zZXRSZWN0KGZ1dHVyZUJvdW5kcywgZnV0dXJlT2JzY3VyZWRJbnNldHMpOworICAgIENH UG9pbnQgZnV0dXJlVW5vYnNjdXJlZFJlY3RDZW50ZXJJblNlbGZDb29yZGluYXRlcyA9IENHUG9p bnRNYWtlKGZ1dHVyZVVub2JzY3VyZWRSZWN0SW5TZWxmQ29vcmRpbmF0ZXMub3JpZ2luLnggKyBm dXR1cmVVbm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzLnNpemUud2lkdGggLyAyLCBmdXR1 cmVVbm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzLm9yaWdpbi55ICsgZnV0dXJlVW5vYnNj dXJlZFJlY3RJblNlbGZDb29yZGluYXRlcy5zaXplLmhlaWdodCAvIDIpOworCisgICAgQ0dQb2lu dCBvcmlnaW5hbENvbnRlbnRPZmZzZXQgPSBbX3Njcm9sbFZpZXcgY29udGVudE9mZnNldF07Cisg ICAgQ0dQb2ludCBjb250ZW50T2Zmc2V0ID0gb3JpZ2luYWxDb250ZW50T2Zmc2V0OworICAgIGNv bnRlbnRPZmZzZXQueCArPSAob3JpZ2luYWxDb250ZW50Q2VudGVySW5TZWxmQ29vcmRpbmF0ZXMu eCAtIGZ1dHVyZVVub2JzY3VyZWRSZWN0Q2VudGVySW5TZWxmQ29vcmRpbmF0ZXMueCk7CisgICAg Y29udGVudE9mZnNldC55ICs9IChvcmlnaW5hbENvbnRlbnRDZW50ZXJJblNlbGZDb29yZGluYXRl cy55IC0gZnV0dXJlVW5vYnNjdXJlZFJlY3RDZW50ZXJJblNlbGZDb29yZGluYXRlcy55KTsKKwor ICAgIC8vIExpbWl0IHRoZSBuZXcgb2Zmc2V0IHdpdGhpbiB0aGUgc2Nyb2xsdmlldywgd2UgZG8g bm90IHdhbnQgdG8gcnViYmVyIGJhbmQgcHJvZ3JhbW1hdGljYWxseS4KKyAgICBDR1NpemUgZnV0 dXJlQ29udGVudFNpemVJblNlbGZDb29yZGluYXRlID0gQ0dTaXplTWFrZShjb250ZW50U2l6ZUlu Q29udGVudFZpZXdDb29yZGluYXRlLndpZHRoICogdGFyZ2V0U2NhbGUsIGNvbnRlbnRTaXplSW5D b250ZW50Vmlld0Nvb3JkaW5hdGUuaGVpZ2h0ICogdGFyZ2V0U2NhbGUpOworICAgIENHRmxvYXQg bWF4SG9yaXpvbnRhbE9mZnNldCA9IGZ1dHVyZUNvbnRlbnRTaXplSW5TZWxmQ29vcmRpbmF0ZS53 aWR0aCAtIGZ1dHVyZUJvdW5kcy5zaXplLndpZHRoICsgX29ic2N1cmVkSW5zZXRzLnJpZ2h0Owor ICAgIGNvbnRlbnRPZmZzZXQueCA9IHN0ZDo6bWluKGNvbnRlbnRPZmZzZXQueCwgbWF4SG9yaXpv bnRhbE9mZnNldCk7CisgICAgQ0dGbG9hdCBtYXhWZXJ0aWNhbE9mZnNldCA9IGZ1dHVyZUNvbnRl bnRTaXplSW5TZWxmQ29vcmRpbmF0ZS5oZWlnaHQgLSBmdXR1cmVCb3VuZHMuc2l6ZS5oZWlnaHQg KyBfb2JzY3VyZWRJbnNldHMuYm90dG9tOworICAgIGNvbnRlbnRPZmZzZXQueSA9IHN0ZDo6bWlu KGNvbnRlbnRPZmZzZXQueSwgbWF4VmVydGljYWxPZmZzZXQpOworCisgICAgY29udGVudE9mZnNl dC54ID0gc3RkOjptYXgoY29udGVudE9mZnNldC54LCAtX29ic2N1cmVkSW5zZXRzLmxlZnQpOwor ICAgIGNvbnRlbnRPZmZzZXQueSA9IHN0ZDo6bWF4KGNvbnRlbnRPZmZzZXQueSwgLV9vYnNjdXJl ZEluc2V0cy50b3ApOworCisgICAgLy8gTWFrZSB0aGUgdG9wL2JvdHRvbSBlZGdlcyAic3RpY2t5 IiB3aXRoaW4gMSBwaXhlbC4KKyAgICBpZiAob3JpZ2luYWxVbm9ic2N1cmVkQ29udGVudFJlY3Qu bWF4WSgpID4gY29udGVudFNpemVJbkNvbnRlbnRWaWV3Q29vcmRpbmF0ZS5oZWlnaHQgLSAxKQor ICAgICAgICBjb250ZW50T2Zmc2V0LnkgPSBtYXhWZXJ0aWNhbE9mZnNldDsKKyAgICBpZiAob3Jp Z2luYWxVbm9ic2N1cmVkQ29udGVudFJlY3QueSgpIDwgMSkKKyAgICAgICAgY29udGVudE9mZnNl dC55ID0gLV9vYnNjdXJlZEluc2V0cy50b3A7CisKKyAgICAvLyBGSVhNRTogaWYgd2UgaGF2ZSBj b250ZW50IGNlbnRlcmVkIGFmdGVyIGRvdWJsZSB0YXAgdG8gem9vbSwgd2Ugc2hvdWxkIGFsc28g dHJ5IHRvIGtlZXAgdGhhdCByZWN0IGluIHZpZXcuCisgICAgW19zY3JvbGxWaWV3IHNldENvbnRl bnRPZmZzZXQ6Y29udGVudE9mZnNldF07CisKICAgICAvLyBGSVhNRTogU2VuZCBhIHNpbmdsZSBt ZXNzYWdlIHRvIHRoZSBXZWJQcm9jZXNzIHRvIGxheW91dCBhbmQgcmVwYWludCBpbnN0ZWFkLgog ICAgIC8vIEZJWE1FOiBTZW5kIHJlc2l6ZSBldmVudC4KICAgICBbX2NvbnRlbnRWaWV3IHNldE1p bmltdW1MYXlvdXRTaXplOmZ1dHVyZU1pbmltdW1MYXlvdXRTaXplXTsK