173274 2017-06-12 14:28:09 -0700 [iOS WK2] Peeking on an image could result in a preview at the wrong size 2017-10-02 18:10:55 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser megan_gardner simon.fraser thorton webkit-bug-importer oldest_to_newest 1318367 0 simon.fraser 2017-06-12 14:28:09 -0700 [iOS WK2] Peeking on an image could result in a preview at the wrong size 1318373 1 312698 simon.fraser 2017-06-12 14:34:24 -0700 Created attachment 312698 Patch 1318374 2 simon.fraser 2017-06-12 14:34:45 -0700 rdar://problem/30404627 1318376 3 312698 thorton 2017-06-12 14:38:27 -0700 Comment on attachment 312698 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312698&action=review > Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:54 > + uint64_t lastCommittedTransactionID() const { return m_currentTransactionID; } Is this name right? Isn't it also the current transaction ID while building? When is it incremented? 1318428 4 simon.fraser 2017-06-12 15:56:57 -0700 https://trac.webkit.org/r218149 1355660 5 megan_gardner 2017-10-02 18:10:55 -0700 *** Bug 172792 has been marked as a duplicate of this bug. *** 312698 2017-06-12 14:34:24 -0700 2017-06-12 14:38:27 -0700 Patch bug-173274-20170612143423.patch text/plain 9497 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3ODA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjgyZDk1Y2Q4YmRjZmUw MDdmMDhiYjY1ODM5MjA1MWVkYWNlZGUwOS4uMmY2YjdiZWUxMGY0NTYzN2Q1NmJiMTk5NDY0MWU2 YmZjYzUyYTkxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE3LTA2LTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBQ ZWVraW5nIG9uIGFuIGltYWdlIGNvdWxkIHJlc3VsdCBpbiBhIHByZXZpZXcgYXQgdGhlIHdyb25n IHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MzI3NAorICAgICAgICByZGFyOi8vcHJvYmxlbS8zMDQwNDYyNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIHdlcmUgYSBjb3VwbGUgb2YgaXNz dWVzIHdpdGggdGhlIHdheSB0aGUgcGFnZSBzY2FsZSBpcyBjb21tdW5pY2F0ZWQgYmV0d2VlbiB0 aGUgd2ViIHByb2Nlc3MKKyAgICAgICAgYW5kIHRoZSBVSSBwcm9jZXNzLgorCisgICAgICAgIEdl bmVyYWxseSwgdGhlIHBhZ2Ugc2NhbGUgaXMgY29tcHV0ZWQgYnkgdGhlIHdlYiBwcm9jZXNzLCBh bmQgc2VudCB0byB0aGUgVUkgcHJvY2VzcyB2aWEKKyAgICAgICAgbGF5ZXIgdHJlZSBjb21taXRz LiBVSS1zaWRlIHNjYWxlIGlzIHRoZW0gY29tbXVuaWNhdGVkIGJhY2sgdG8gdGhlIHdlYiBwcm9j ZXNzIHZpYSB2aXNpYmxlQ29udGVudFJlY3QKKyAgICAgICAgdXBkYXRlcy4gV2hlbiByZWNlaXZp bmcgYSBuZXcgc2NhbGUsIFdlYlBhZ2UgaGFzIGEgInNjYWxlIHdhcyBzZXQgYnkgdGhlIFVJIHBy b2Nlc3MiIGZsYWcgdG8gaGFuZGxlCisgICAgICAgIHRoZSBjYXNlIHdoZXJlIHVzZXIgaW50ZXJh Y3Rpb24gb3ZlcnJpZGVzIHRoZSB2aWV3cG9ydC1jb21wdXRlZCBwYWdlIHNjYWxlLiBIb3dldmVy LCB0aGlzIGZsYWcgd291bGQKKyAgICAgICAgZ2V0IHNldCBlcnJvbmVvdXNseSBpbiBhIGNvdXBs ZSBvZiBzaXR1YXRpb25zLgorCisgICAgICAgIEZpcnN0LCBkdXJpbmcgcGFnZSBsb2FkaW5nLCBs YXllciBmbHVzaGluZyBpcyBzdXNwZW5kZWQgdGVtcG9yYXJpbHksIHNvIHdlYiBwcm9jZXNzIHNj YWxlIGNoYW5nZXMgbmV2ZXIKKyAgICAgICAgbWFrZSBpdCB0byB0aGUgVUkgcHJvY2Vzcy4gSW4g dGhhdCBzY2VuYXJpbywgdGhlIFVJIHByb2Nlc3MgY291bGQgc2VuZCBhbiBvbGQgc2NhbGUgYmFj ayB0byB0aGUgd2ViIHByb2Nlc3MsCisgICAgICAgIHNldHRpbmcgdGhlICJzY2FsZSB3YXMgc2V0 IGJ5IHRoZSBVSSBwcm9jZXNzIiB3aGVuIGl0IHJlYWxseSB3YXNuJ3QuCisKKyAgICAgICAgU2Vj b25kbHksIHdlYiAtPiBVSSBsYXllciBjb21taXQgbWVzc2FnZXMsIGFuZCBVSSAtPiB3ZWIgdXBk YXRlVmlzaWJsZUNvbnRlbnRSZWN0IG1lc3NhZ2VzIGNhbiBiZSBpbiBmbGlnaHQgYXQgdGhlCisg ICAgICAgIHNhbWUgdGltZSwgYWdhaW4gY2F1c2luZyBhIHN0YWxlIHNjYWxlIHRvIHJlYWNoIHRo ZSB3ZWIgcHJvY2Vzcy4KKworICAgICAgICBGaXggdGhpcyBieSBvbmx5IHNldHRpbmcgdGhlICJz Y2FsZSB3YXMgc2V0IGJ5IHRoZSBVSSBwcm9jZXNzIiB3aGVuIHdlIGtub3cgdGhlIFVJIHNjYWxl IHNob3VsZCBiZSBpbiBzeW5jLCBieSBjb21wYXJpbmcKKyAgICAgICAgY29tbWl0IElEcyBvZiBz ZW50IGFuZCByZWNlaXZlZCBzY2FsZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2NhbGVGcm9tVUlQcm9jZXNzKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oOgor ICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6bGFzdENvbW1pdHRl ZFRyYW5zYWN0aW9uSUQpOgorCiAyMDE3LTA2LTA1ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBs ZS5jb20+CiAKICAgICAgICAgVHJpZWQgdG8gZml4IHRoZSBidWlsZCB3aGVuIHRhcmdydGluZyBt YWNPUyAxMC4xMiB1c2luZyB0aGUgbWFjT1MgMTAuMTMgZGV2ZWxvcGVyIGJldGEgU0RLLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMTk1Y2NiZjE1 NmJjMWMwNTVlNTE2ZDJhYTJmOTcwZjVkNDRiN2Y4Ni4uNjZiZDVmZDQ4M2FjNWJhZTYxNGU2MmQ0 YzBiNTI0ZGE3M2FkZjI2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCkBAIC04MjUsNiArODI1LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RGV2aWNl T3JpZW50YXRpb24oaW50MzJfdCk7CiAgICAgdm9pZCBkeW5hbWljVmlld3BvcnRTaXplVXBkYXRl KGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYgbWluaW11bUxheW91dFNpemUsIGNvbnN0IFdlYkNv cmU6OkZsb2F0U2l6ZSYgbWF4aW11bVVub2JzY3VyZWRTaXplLCBjb25zdCBXZWJDb3JlOjpGbG9h dFJlY3QmIHRhcmdldEV4cG9zZWRDb250ZW50UmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0 JiB0YXJnZXRVbm9ic2N1cmVkUmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB0YXJnZXRV bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzLCBkb3VibGUgc2NhbGUsIGludDMy X3QgZGV2aWNlT3JpZW50YXRpb24sIHVpbnQ2NF90IGR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVJ RCk7CiAgICAgdm9pZCBzeW5jaHJvbml6ZUR5bmFtaWNWaWV3cG9ydFVwZGF0ZShkb3VibGUmIG5l d1RhcmdldFNjYWxlLCBXZWJDb3JlOjpGbG9hdFBvaW50JiBuZXdTY3JvbGxQb3NpdGlvbiwgdWlu dDY0X3QmIG5leHRWYWxpZExheWVyVHJlZVRyYW5zYWN0aW9uSUQpOworICAgIHN0ZDo6b3B0aW9u YWw8ZmxvYXQ+IHNjYWxlRnJvbVVJUHJvY2Vzcyhjb25zdCBWaXNpYmxlQ29udGVudFJlY3RVcGRh dGVJbmZvJikgY29uc3Q7CiAgICAgdm9pZCB1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0 IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8mLCBNb25vdG9uaWNUaW1lIG9sZGVzdFRpbWVz dGFtcCk7CiAgICAgYm9vbCBzY2FsZVdhc1NldEJ5VUlQcm9jZXNzKCkgY29uc3QgeyByZXR1cm4g bV9zY2FsZVdhc1NldEJ5VUlQcm9jZXNzOyB9CiAgICAgdm9pZCB3aWxsU3RhcnRVc2VyVHJpZ2dl cmVkWm9vbWluZygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IGIwMTkxNjhjMDg4MWFmY2UxYzMxZTM4YTA3Zjc3NDUw ZGUzY2VkM2YuLmY1MzdkZDgwZDE3Mzg2YWRiYWI3NjRhZTAxNzM3OWIwYWZlZjRhNjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0KQEAgLTMxNjMsNiArMzE2MywzMCBAQCBzdGF0aWMgaW5saW5lIEZsb2F0UmVjdCBhZGp1c3RF eHBvc2VkUmVjdEZvckJvdW5kZWRTY2FsZShjb25zdCBGbG9hdFJlY3QmIGV4cG9zZQogICAgIHJl dHVybiBhZGp1c3RFeHBvc2VkUmVjdEZvck5ld1NjYWxlKGV4cG9zZWRSZWN0LCBleHBvc2VkUmVj dFNjYWxlLCBuZXdTY2FsZSk7CiB9CiAKK3N0ZDo6b3B0aW9uYWw8ZmxvYXQ+IFdlYlBhZ2U6OnNj YWxlRnJvbVVJUHJvY2Vzcyhjb25zdCBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvJiB2aXNp YmxlQ29udGVudFJlY3RVcGRhdGVJbmZvKSBjb25zdAoreworICAgIGF1dG8gdHJhbnNhY3Rpb25J REZvckxhc3RTY2FsZVNlbnRUb1VJUHJvY2VzcyA9IGRvd25jYXN0PFJlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhPigqbV9kcmF3aW5nQXJlYSkubGFzdENvbW1pdHRlZFRyYW5zYWN0aW9uSUQoKTsK KyAgICBhdXRvIHRyYW5zYWN0aW9uSURGb3JMYXN0U2NhbGVGcm9tVUlQcm9jZXNzID0gdmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5sYXN0TGF5ZXJUcmVlVHJhbnNhY3Rpb25JRCgpOworICAg IGlmICh0cmFuc2FjdGlvbklERm9yTGFzdFNjYWxlU2VudFRvVUlQcm9jZXNzICE9IHRyYW5zYWN0 aW9uSURGb3JMYXN0U2NhbGVGcm9tVUlQcm9jZXNzKQorICAgICAgICByZXR1cm4gc3RkOjpudWxs b3B0OworCisgICAgZmxvYXQgc2NhbGVGcm9tVUlQcm9jZXNzID0gdmlzaWJsZUNvbnRlbnRSZWN0 VXBkYXRlSW5mby5zY2FsZSgpOworICAgIGZsb2F0IGN1cnJlbnRTY2FsZSA9IG1fcGFnZS0+cGFn ZVNjYWxlRmFjdG9yKCk7CisKKyAgICBkb3VibGUgc2NhbGVOb2lzZVRocmVzaG9sZCA9IDAuMDA1 OworICAgIGlmICghbV9pc0luU3RhYmxlU3RhdGUgJiYgZmFicyhzY2FsZUZyb21VSVByb2Nlc3Mg LSBjdXJyZW50U2NhbGUpIDwgc2NhbGVOb2lzZVRocmVzaG9sZCkgeworICAgICAgICAvLyBUaW55 IGNoYW5nZXMgb2Ygc2NhbGUgZHVyaW5nIGludGVyYWN0aXZlIHpvb20gY2F1c2UgY29udGVudCB0 byBqdW1wIGJ5IG9uZSBwaXhlbCwgY3JlYXRpbmcKKyAgICAgICAgLy8gdmlzdWFsIG5vaXNlLiBX ZSBmaWx0ZXIgdGhvc2UgdXNlbGVzcyB1cGRhdGVzLgorICAgICAgICBzY2FsZUZyb21VSVByb2Nl c3MgPSBjdXJyZW50U2NhbGU7CisgICAgfQorICAgIAorICAgIHNjYWxlRnJvbVVJUHJvY2VzcyA9 IHN0ZDo6bWluPGZsb2F0PihtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5tYXhpbXVtU2NhbGUoKSwg c3RkOjptYXg8ZmxvYXQ+KG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1pbmltdW1TY2FsZSgpLCBz Y2FsZUZyb21VSVByb2Nlc3MpKTsKKyAgICBpZiAoYXJlRXNzZW50aWFsbHlFcXVhbEFzRmxvYXQo Y3VycmVudFNjYWxlLCBzY2FsZUZyb21VSVByb2Nlc3MpKQorICAgICAgICByZXR1cm4gc3RkOjpu dWxsb3B0OworCisgICAgcmV0dXJuIHNjYWxlRnJvbVVJUHJvY2VzczsKK30KKwogdm9pZCBXZWJQ YWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVw ZGF0ZUluZm8mIHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8sIE1vbm90b25pY1RpbWUgb2xk ZXN0VGltZXN0YW1wKQogewogICAgIExPR19XSVRIX1NUUkVBTShWaXNpYmxlUmVjdHMsIHN0cmVh bSA8PCAiXG5XZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzICIgPDwgdmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlSW5mbyk7CkBAIC0zMTc0LDIwICszMTk4LDEwIEBAIHZvaWQgV2ViUGFn ZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyhjb25zdCBWaXNpYmxlQ29udGVudFJlY3RVcGRh dGVJbmZvJiB2aXNpCiAgICAgbV9oYXNSZWNlaXZlZFZpc2libGVDb250ZW50UmVjdHNBZnRlckRp ZENvbW1pdExvYWQgPSB0cnVlOwogICAgIG1faXNJblN0YWJsZVN0YXRlID0gdmlzaWJsZUNvbnRl bnRSZWN0VXBkYXRlSW5mby5pblN0YWJsZVN0YXRlKCk7CiAKLSAgICBkb3VibGUgc2NhbGVOb2lz ZVRocmVzaG9sZCA9IDAuMDA1OwotICAgIGZsb2F0IGZpbHRlcmVkU2NhbGUgPSB2aXNpYmxlQ29u dGVudFJlY3RVcGRhdGVJbmZvLnNjYWxlKCk7Ci0gICAgZmxvYXQgY3VycmVudFNjYWxlID0gbV9w YWdlLT5wYWdlU2NhbGVGYWN0b3IoKTsKLQotICAgIGlmICghbV9pc0luU3RhYmxlU3RhdGUgJiYg ZmFicyhmaWx0ZXJlZFNjYWxlIC0gY3VycmVudFNjYWxlKSA8IHNjYWxlTm9pc2VUaHJlc2hvbGQp IHsKLSAgICAgICAgLy8gVGlueSBjaGFuZ2VzIG9mIHNjYWxlIGR1cmluZyBpbnRlcmFjdGl2ZSB6 b29tIGNhdXNlIGNvbnRlbnQgdG8ganVtcCBieSBvbmUgcGl4ZWwsIGNyZWF0aW5nCi0gICAgICAg IC8vIHZpc3VhbCBub2lzZS4gV2UgZmlsdGVyIHRob3NlIHVzZWxlc3MgdXBkYXRlcy4KLSAgICAg ICAgZmlsdGVyZWRTY2FsZSA9IGN1cnJlbnRTY2FsZTsKLSAgICB9Ci0KLSAgICBmbG9hdCBib3Vu ZGVkU2NhbGUgPSBzdGQ6Om1pbjxmbG9hdD4obV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWF4aW11 bVNjYWxlKCksIHN0ZDo6bWF4PGZsb2F0PihtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5taW5pbXVt U2NhbGUoKSwgZmlsdGVyZWRTY2FsZSkpOworICAgIGF1dG8gc2NhbGVGcm9tVUlQcm9jZXNzID0g dGhpcy0+c2NhbGVGcm9tVUlQcm9jZXNzKHZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8pOwog CiAgICAgLy8gU2tpcCBwcm9ncmVzc2l2ZWx5IHJlZHJhd2luZyB0aWxlcyBpZiBwaW5jaC16b29t aW5nIHdoaWxlIHRoZSBzeXN0ZW0gaXMgdW5kZXIgbWVtb3J5IHByZXNzdXJlLgotICAgIGlmIChi b3VuZGVkU2NhbGUgIT0gY3VycmVudFNjYWxlICYmICFtX2lzSW5TdGFibGVTdGF0ZSAmJiBNZW1v cnlQcmVzc3VyZUhhbmRsZXI6OnNpbmdsZXRvbigpLmlzVW5kZXJNZW1vcnlQcmVzc3VyZSgpKQor ICAgIGlmIChzY2FsZUZyb21VSVByb2Nlc3MgJiYgIW1faXNJblN0YWJsZVN0YXRlICYmIE1lbW9y eVByZXNzdXJlSGFuZGxlcjo6c2luZ2xldG9uKCkuaXNVbmRlck1lbW9yeVByZXNzdXJlKCkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIGlmIChtX2lzSW5TdGFibGVTdGF0ZSkKQEAgLTMxOTcsMjYg KzMyMTEsMjcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0 IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8mIHZpc2kKICAgICAgICAgICAgIG1fb2xkZXN0 Tm9uU3RhYmxlVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c1RpbWVzdGFtcCA9IG9sZGVzdFRpbWVz dGFtcDsKICAgICB9CiAKKyAgICBmbG9hdCBzY2FsZVRvVXNlID0gc2NhbGVGcm9tVUlQcm9jZXNz LnZhbHVlX29yKG1fcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOwogICAgIEZsb2F0UmVjdCBleHBv c2VkQ29udGVudFJlY3QgPSB2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmV4cG9zZWRDb250 ZW50UmVjdCgpOwotICAgIEZsb2F0UmVjdCBhZGp1c3RlZEV4cG9zZWRDb250ZW50UmVjdCA9IGFk anVzdEV4cG9zZWRSZWN0Rm9yQm91bmRlZFNjYWxlKGV4cG9zZWRDb250ZW50UmVjdCwgdmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5zY2FsZSgpLCBib3VuZGVkU2NhbGUpOworICAgIEZsb2F0 UmVjdCBhZGp1c3RlZEV4cG9zZWRDb250ZW50UmVjdCA9IGFkanVzdEV4cG9zZWRSZWN0Rm9yQm91 bmRlZFNjYWxlKGV4cG9zZWRDb250ZW50UmVjdCwgdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5m by5zY2FsZSgpLCBzY2FsZVRvVXNlKTsKICAgICBtX2RyYXdpbmdBcmVhLT5zZXRFeHBvc2VkQ29u dGVudFJlY3QoYWRqdXN0ZWRFeHBvc2VkQ29udGVudFJlY3QpOwogCiAgICAgSW50UG9pbnQgc2Ny b2xsUG9zaXRpb24gPSByb3VuZGVkSW50UG9pbnQodmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5m by51bm9ic2N1cmVkQ29udGVudFJlY3QoKS5sb2NhdGlvbigpKTsKIAogICAgIGJvb2wgaGFzU2V0 UGFnZVNjYWxlID0gZmFsc2U7Ci0gICAgaWYgKGJvdW5kZWRTY2FsZSAhPSBjdXJyZW50U2NhbGUp IHsKKyAgICBpZiAoc2NhbGVGcm9tVUlQcm9jZXNzKSB7CiAgICAgICAgIG1fc2NhbGVXYXNTZXRC eVVJUHJvY2VzcyA9IHRydWU7CiAgICAgICAgIG1faGFzU3RhYmxlUGFnZVNjYWxlRmFjdG9yID0g bV9pc0luU3RhYmxlU3RhdGU7CiAKICAgICAgICAgbV9keW5hbWljU2l6ZVVwZGF0ZUhpc3Rvcnku Y2xlYXIoKTsKIAotICAgICAgICBtX3BhZ2UtPnNldFBhZ2VTY2FsZUZhY3Rvcihib3VuZGVkU2Nh bGUsIHNjcm9sbFBvc2l0aW9uLCBtX2lzSW5TdGFibGVTdGF0ZSk7CisgICAgICAgIG1fcGFnZS0+ c2V0UGFnZVNjYWxlRmFjdG9yKHNjYWxlRnJvbVVJUHJvY2Vzcy52YWx1ZSgpLCBzY3JvbGxQb3Np dGlvbiwgbV9pc0luU3RhYmxlU3RhdGUpOwogICAgICAgICBoYXNTZXRQYWdlU2NhbGUgPSB0cnVl OwotICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlBhZ2VTY2FsZUZhY3RvckRp ZENoYW5nZShib3VuZGVkU2NhbGUpKTsKKyAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpQYWdlU2NhbGVGYWN0b3JEaWRDaGFuZ2Uoc2NhbGVGcm9tVUlQcm9jZXNzLnZhbHVlKCkp KTsKICAgICB9Ci0KKyAgICAKICAgICBpZiAoIWhhc1NldFBhZ2VTY2FsZSAmJiBtX2lzSW5TdGFi bGVTdGF0ZSkgewotICAgICAgICBtX3BhZ2UtPnNldFBhZ2VTY2FsZUZhY3Rvcihib3VuZGVkU2Nh bGUsIHNjcm9sbFBvc2l0aW9uLCB0cnVlKTsKKyAgICAgICAgbV9wYWdlLT5zZXRQYWdlU2NhbGVG YWN0b3Ioc2NhbGVUb1VzZSwgc2Nyb2xsUG9zaXRpb24sIHRydWUpOwogICAgICAgICBoYXNTZXRQ YWdlU2NhbGUgPSB0cnVlOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5oIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJl YS5oCmluZGV4IDhhMzIwODMzOWVjNzYzNzBiMThmZGFmODIzYmM5YTE0OTI1NTY0YTQuLjNkZmEx MGZkYjEyMDk5NmIyYTg5YTdjZWZlZTdhMzZhMTYzMWU3YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhLmgKQEAgLTUxLDkgKzUxLDEwIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IH5SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYSgpOwogCiAgICAgdWludDY0X3QgbmV4dFRyYW5z YWN0aW9uSUQoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRUcmFuc2FjdGlvbklEICsgMTsgfQor ICAgIHVpbnQ2NF90IGxhc3RDb21taXR0ZWRUcmFuc2FjdGlvbklEKCkgY29uc3QgeyByZXR1cm4g bV9jdXJyZW50VHJhbnNhY3Rpb25JRDsgfQogCiAgICAgV2Vha1B0cjxSZW1vdGVMYXllclRyZWVE cmF3aW5nQXJlYT4gY3JlYXRlV2Vha1B0cigpIHsgcmV0dXJuIG1fd2Vha1B0ckZhY3RvcnkuY3Jl YXRlV2Vha1B0cigpOyB9Ci0gICAgCisKIHByaXZhdGU6CiAgICAgLy8gRHJhd2luZ0FyZWEKICAg ICB2b2lkIHNldE5lZWRzRGlzcGxheSgpIG92ZXJyaWRlOwo=