182082 2018-01-24 19:10:57 -0800 ASSERT(CGSizeEqualToSize(m_resizeScrollOffset, CGSizeZero)) in WebViewImpl::setFrameAndScrollBy() 2018-01-31 08:53:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser berto cgarcia commit-queue eric.carlson ews-watchlist gustavo mcatanzaro simon.fraser thorton webkit-bug-importer oldest_to_newest 1392885 0 simon.fraser 2018-01-24 19:10:57 -0800 ASSERT(CGSizeEqualToSize(m_resizeScrollOffset, CGSizeZero)) in WebViewImpl::setFrameAndScrollBy() 1392886 1 332219 simon.fraser 2018-01-24 19:13:46 -0800 Created attachment 332219 Patch 1392897 2 332219 thorton 2018-01-24 19:44:59 -0800 Comment on attachment 332219 Patch I think you’ll (probably) want to fix the other ports builds. Though it does seem like AcceleratedDrawingAreaProxy might use m_scrollOffset... 1393085 3 332275 simon.fraser 2018-01-25 09:46:01 -0800 Created attachment 332275 Patch 1393088 4 ews-watchlist 2018-01-25 09:48:17 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1393291 5 332275 commit-queue 2018-01-25 14:27:32 -0800 Comment on attachment 332275 Patch Clearing flags on attachment: 332275 Committed r227630: <https://trac.webkit.org/changeset/227630> 1393528 6 332275 eric.carlson 2018-01-26 07:20:58 -0800 Comment on attachment 332275 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332275&action=review > Source/WebKit/ChangeLog:12 > + Rename to m_resizeScrollOffset to m_scrollOffsetAdjustment to reduce confusion with actual scroll offsets. Nit: Too many tos in "Rename to ... to ... to ..." 1395005 7 webkit-bug-importer 2018-01-31 08:53:25 -0800 <rdar://problem/37072206> 332219 2018-01-24 19:13:46 -0800 2018-01-24 19:44:59 -0800 Patch bug-182082-20180124191345.patch text/plain 16108 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgwYWIzNjFiMjdjMzZjOTY2 MmNkMTgyYmNhYTM5NzQwYWVkMDA0ZmMuLjMwZTA2NGUwZTNmMjljOTZjYzI2NmMyN2NiN2EyOTUx MDBmNzI5YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTgtMDEtMjQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUKENHU2l6ZUVx dWFsVG9TaXplKG1fcmVzaXplU2Nyb2xsT2Zmc2V0LCBDR1NpemVaZXJvKSkgaW4gV2ViVmlld0lt cGw6OnNldEZyYW1lQW5kU2Nyb2xsQnkoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTgyMDgyCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzEzOTcxODM4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2FmYXJp IGNvdWxkIGNhbGwgV2ViVmlld0ltcGw6OnNldEZyYW1lQW5kU2Nyb2xsQnkoKSBtdWx0aXBsZSB0 aW1lcyB3aXRoIGRpZmZlcmVudCBzY3JvbGwgb2Zmc2V0cywKKyAgICAgICAgdHJpZ2dlcmluZyB0 aGlzIGFzc2VydGlvbi4KKworICAgICAgICBtX3Jlc2l6ZVNjcm9sbE9mZnNldCB3YXMgYWN0dWFs bHkgdW51c2VkLCBzbyByZW1vdmUgaXQuIEFsc28gcmVtb3ZlIERyYXdpbmdBcmVhUHJveHkncyBt X2xheWVyUG9zaXRpb24KKyAgICAgICAgYW5kIG1fc2Nyb2xsT2Zmc2V0IHdoaWNoIHdlcmUgdW51 c2VkLCBhbmQgcmVtb3ZlIHRoZSBwYXJhbWV0ZXJzIGZyb20gdGhlIFVwZGF0ZUdlb21ldHJ5IG1l c3NhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF9mcmFtZU9yQm91bmRzQ2hhbmdlZF0pOgorICAgICAgICAoLVtX S1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlczpdKToKKyAgICAgICAgKiBV SVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2Ev V2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRGcmFtZUFu ZFNjcm9sbEJ5KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldERyYXdpbmdBcmVh U2l6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5OjpzZXRTaXplKToKKyAgICAgICAgKiBVSVByb2Nl c3MvRHJhd2luZ0FyZWFQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9SZW1vdGVMYXllclRy ZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6c2VuZFVwZGF0ZUdlb21ldHJ5KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHku bW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6 OnNlbmRVcGRhdGVHZW9tZXRyeSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdp bmdBcmVhLmg6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRyeSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLm1lc3NhZ2VzLmluOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWEuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5 ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6dXBkYXRlR2VvbWV0cnkpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6 dXBkYXRlR2VvbWV0cnkpOgorCiAyMDE4LTAxLTIzICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFw cGxlLmNvbT4KIAogICAgICAgICBBbGxvdyBwYXNzaW5nIE1lc3NhZ2VQb3J0cyBhY3Jvc3MgcHJv Y2Vzc2VzIChlLmcuIFNlcnZpY2VXb3JrZXJzKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGRkMjc1YTc0M2VjYzhkMzNkZGVhZmY1ZTFj YzRkYmEzMjE4NTlhNWMuLmNkYjVkMDcxZDE1NmU4NjNjNTE4OTQxODNjOTJlN2NiY2M5N2U3YTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpA QCAtMjUxNyw3ICsyNTE3LDcgQEAgLSAodm9pZClfZnJhbWVPckJvdW5kc0NoYW5nZWQKIAogICAg ICAgICBCT09MIHNpemVDaGFuZ2VkID0gTk87CiAgICAgICAgIGlmIChhdXRvIGRyYXdpbmdBcmVh ID0gX3BhZ2UtPmRyYXdpbmdBcmVhKCkpCi0gICAgICAgICAgICBzaXplQ2hhbmdlZCA9IGRyYXdp bmdBcmVhLT5zZXRTaXplKFdlYkNvcmU6OkludFNpemUoYm91bmRzLnNpemUpLCBXZWJDb3JlOjpJ bnRTaXplKCksIFdlYkNvcmU6OkludFNpemUoKSk7CisgICAgICAgICAgICBzaXplQ2hhbmdlZCA9 IGRyYXdpbmdBcmVhLT5zZXRTaXplKFdlYkNvcmU6OkludFNpemUoYm91bmRzLnNpemUpKTsKIAog ICAgICAgICBpZiAoc2l6ZUNoYW5nZWQgJiBbc2VsZiB1c2VzU3RhbmRhcmRDb250ZW50Vmlld10p CiAgICAgICAgICAgICBbX2NvbnRlbnRWaWV3IHNldFNpemVDaGFuZ2VkU2luY2VMYXN0VmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlOllFU107CkBAIC01MTM2LDcgKzUxMzYsNyBAQCAtICh2b2lkKV9i ZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6KHZvaWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2Nr CiAKICAgICBfcGFnZS0+ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZShuZXdNaW5pbXVtTGF5b3V0 U2l6ZSwgbmV3TWF4aW11bVVub2JzY3VyZWRTaXplLCB2aXNpYmxlUmVjdEluQ29udGVudENvb3Jk aW5hdGVzLCB1bm9ic2N1cmVkUmVjdEluQ29udGVudENvb3JkaW5hdGVzLCBmdXR1cmVVbm9ic2N1 cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzLCB1bm9ic2N1cmVkU2FmZUFyZWFJbnNldHNFeHRlbnQs IHRhcmdldFNjYWxlLCBuZXdPcmllbnRhdGlvbik7CiAgICAgaWYgKFdlYktpdDo6RHJhd2luZ0Fy ZWFQcm94eSogZHJhd2luZ0FyZWEgPSBfcGFnZS0+ZHJhd2luZ0FyZWEoKSkKLSAgICAgICAgZHJh d2luZ0FyZWEtPnNldFNpemUoV2ViQ29yZTo6SW50U2l6ZShuZXdCb3VuZHMuc2l6ZSksIFdlYkNv cmU6OkludFNpemUoKSwgV2ViQ29yZTo6SW50U2l6ZSgpKTsKKyAgICAgICAgZHJhd2luZ0FyZWEt PnNldFNpemUoV2ViQ29yZTo6SW50U2l6ZShuZXdCb3VuZHMuc2l6ZSkpOwogfQogCiAtICh2b2lk KV9lbmRBbmltYXRlZFJlc2l6ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZp ZXdJbXBsLmgKaW5kZXggYjM3ODBhNzQ4MDFkNzQ1OGIyMWNmMGQwZTBhZGI4MGUwMDUzNGU1My4u ZWRmYTE4MWNmYmNlNzJmM2M1NjdkNWFlOTQ3ZjRjZGUzMmM0OGVjYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCkBAIC02MjksOCArNjI5LDYgQEAgcHJp dmF0ZToKICAgICBDR0Zsb2F0IG1fcGVuZGluZ1RvcENvbnRlbnRJbnNldCB7IDAgfTsKICAgICBi b29sIG1fZGlkU2NoZWR1bGVTZXRUb3BDb250ZW50SW5zZXQgeyBmYWxzZSB9OwogCi0gICAgQ0dT aXplIG1fcmVzaXplU2Nyb2xsT2Zmc2V0IHsgMCwgMCB9OwotCiAgICAgQ0dTaXplIG1faW50cmlu c2ljQ29udGVudFNpemUgeyAwLCAwIH07CiAgICAgQ0dGbG9hdCBtX292ZXJyaWRlRGV2aWNlU2Nh bGVGYWN0b3IgeyAwIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dlYlZpZXdJbXBsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwubW0KaW5kZXggODRiODU2ZTJlNmIyMTM0ZGQxMDgyYmIwNjI3MTRmZDMzMzBkYzQ0ZS4u NmM2MTdmN2Y4NjBiZTRkNWZkM2EzODViNWVmZmYzNWFkZWFkNjAzYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KQEAgLTE1MjcsMTEgKzE1MjcsOCBA QCBib29sIFdlYlZpZXdJbXBsOjpmcmFtZVNpemVVcGRhdGVzRGlzYWJsZWQoKSBjb25zdAogICAg IHJldHVybiBbbV9sYXlvdXRTdHJhdGVneSBmcmFtZVNpemVVcGRhdGVzRGlzYWJsZWRdOwogfQog Ci12b2lkIFdlYlZpZXdJbXBsOjpzZXRGcmFtZUFuZFNjcm9sbEJ5KENHUmVjdCBmcmFtZSwgQ0dT aXplIG9mZnNldCkKK3ZvaWQgV2ViVmlld0ltcGw6OnNldEZyYW1lQW5kU2Nyb2xsQnkoQ0dSZWN0 IGZyYW1lLCBDR1NpemUpCiB7Ci0gICAgQVNTRVJUKENHU2l6ZUVxdWFsVG9TaXplKG1fcmVzaXpl U2Nyb2xsT2Zmc2V0LCBDR1NpemVaZXJvKSk7Ci0KLSAgICBtX3Jlc2l6ZVNjcm9sbE9mZnNldCA9 IG9mZnNldDsKICAgICBbbV92aWV3IGZyYW1lXSA9IE5TUmVjdEZyb21DR1JlY3QoZnJhbWUpOwog fQogCkBAIC0xNjAwLDggKzE1OTcsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzZXREcmF3aW5nQXJl YVNpemUoQ0dTaXplIHNpemUpCiAgICAgaWYgKCFtX3BhZ2UtPmRyYXdpbmdBcmVhKCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZShXZWJDb3Jl OjpJbnRTaXplKHNpemUpLCBXZWJDb3JlOjpJbnRTaXplKCksIFdlYkNvcmU6OkludFNpemUobV9y ZXNpemVTY3JvbGxPZmZzZXQpKTsKLSAgICBtX3Jlc2l6ZVNjcm9sbE9mZnNldCA9IENHU2l6ZVpl cm87CisgICAgbV9wYWdlLT5kcmF3aW5nQXJlYSgpLT5zZXRTaXplKFdlYkNvcmU6OkludFNpemUo c2l6ZSkpOwogfQogCiB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVMYXllcigpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHkuY3BwCmluZGV4IGM1NWMzZjViNWNiNDk0 ZjhjN2JjMjUyZDg1YmVlN2ZiMTE0NjU5MGEuLmEyNWM0NTA2ZjlmZTYwYTlhYWRhZDJiOTY0ZTEy MmE5ZDVmMjkwNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdB cmVhUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJv eHkuY3BwCkBAIC01NSwxNCArNTUsMTIgQEAgRHJhd2luZ0FyZWFQcm94eTo6fkRyYXdpbmdBcmVh UHJveHkoKQogICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5yZW1vdmVNZXNzYWdlUmVjZWl2 ZXIoTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV93 ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogfQogCi1ib29sIERyYXdpbmdBcmVhUHJveHk6OnNldFNp emUoY29uc3QgSW50U2l6ZSYgc2l6ZSwgY29uc3QgSW50U2l6ZSYgbGF5ZXJQb3NpdGlvbiwgY29u c3QgSW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KQorYm9vbCBEcmF3aW5nQXJlYVByb3h5OjpzZXRTaXpl KGNvbnN0IEludFNpemUmIHNpemUpCiB7IAotICAgIGlmIChtX3NpemUgPT0gc2l6ZSAmJiBtX2xh eWVyUG9zaXRpb24gPT0gbGF5ZXJQb3NpdGlvbiAmJiBzY3JvbGxPZmZzZXQuaXNaZXJvKCkpCisg ICAgaWYgKG1fc2l6ZSA9PSBzaXplKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBtX3Np emUgPSBzaXplOwotICAgIG1fbGF5ZXJQb3NpdGlvbiA9IGxheWVyUG9zaXRpb247Ci0gICAgbV9z Y3JvbGxPZmZzZXQgKz0gc2Nyb2xsT2Zmc2V0OwogICAgIHNpemVEaWRDaGFuZ2UoKTsKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHku aAppbmRleCBhZDgzNTZjNjVjMWI5MTU3OGFjMWMzNDgzOTI3YjRjNDdkYjBkMzZhLi40ODVhZmRm MGNlOWRkNmY4ZjJhZDdlNGJjMDJjNWE0Y2M5NTEwNDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCkBAIC0yNCw4ICsyNCw3IEBACiAgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBEcmF3aW5nQXJlYVByb3h5X2gK LSNkZWZpbmUgRHJhd2luZ0FyZWFQcm94eV9oCisjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkRy YXdpbmdBcmVhSW5mby5oIgogI2luY2x1ZGUgIkdlbmVyaWNDYWxsYmFjay5oIgpAQCAtNjYsNyAr NjUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHdhaXRGb3JCYWNraW5nU3RvcmVVcGRh dGVPbk5leHRQYWludCgpIHsgfQogCiAgICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQotICAgIGJvb2wgc2V0U2l6ZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYsIGNvbnN0IFdlYkNvcmU6OkludFNp emUmIHNjcm9sbE9mZnNldCk7CisgICAgYm9vbCBzZXRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNp emUmKTsKIAogICAgIC8vIFRoZSB0aW1lb3V0IHdlIHVzZSB3aGVuIHdhaXRpbmcgZm9yIGEgRGlk VXBkYXRlR2VvbWV0cnkgbWVzc2FnZS4KICAgICBzdGF0aWMgY29uc3RleHByIFNlY29uZHMgZGlk VXBkYXRlQmFja2luZ1N0b3JlU3RhdGVUaW1lb3V0KCkgeyByZXR1cm4gU2Vjb25kczo6ZnJvbU1p bGxpc2Vjb25kcyg1MDApOyB9CkBAIC0xMTQsOCArMTEzLDYgQEAgcHJvdGVjdGVkOgogICAgIFdl YlBhZ2VQcm94eSYgbV93ZWJQYWdlUHJveHk7CiAKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fc2l6 ZTsKLSAgICBXZWJDb3JlOjpJbnRTaXplIG1fbGF5ZXJQb3NpdGlvbjsKLSAgICBXZWJDb3JlOjpJ bnRTaXplIG1fc2Nyb2xsT2Zmc2V0OwogCiAgICAgLy8gSVBDOjpNZXNzYWdlUmVjZWl2ZXIKICAg ICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYsIElQQzo6RGVjb2RlciYp IG92ZXJyaWRlOwpAQCAtMTQ5LDQgKzE0NiwzIEBAIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkVH SU4oV2ViS2l0OjpUb1ZhbHVlVHlwZU5hbWUpIFwKICAgICBzdGF0aWMgYm9vbCBpc1R5cGUoY29u c3QgV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5JiBwcm94eSkgeyByZXR1cm4gcHJveHkudHlwZSgp ID09IFdlYktpdDo6UHJveHlUeXBlOyB9IFwKIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfRU5EKCkK IAotI2VuZGlmIC8vIERyYXdpbmdBcmVhUHJveHlfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJv eHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQppbmRleCAxYzI1MThlYjU5YjA0Mjg5ZThjYTA2MTUy MGY4NDNmN2I2MzVkMmUzLi5lMjNjOWVlMmY0YjFjMTRhMWMwODAzNjYwZmRhYTE0ODE4MDIzMGM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQpA QCAtMTcyLDcgKzE3Miw3IEBAIHZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6 ZGlkVXBkYXRlR2VvbWV0cnkoKQogdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5 OjpzZW5kVXBkYXRlR2VvbWV0cnkoKQogewogICAgIG1fbGFzdFNlbnRTaXplID0gbV9zaXplOwot ICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6 VXBkYXRlR2VvbWV0cnkobV9zaXplLCBJbnRTaXplKCksIGZhbHNlLCBNYWNoU2VuZFJpZ2h0KCkp LCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CisgICAgbV93ZWJQYWdlUHJveHkucHJvY2Vzcygp LnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVHZW9tZXRyeShtX3NpemUsIGZhbHNl IC8qIGZsdXNoU3luY2hyb25vdXNseSAqLywgTWFjaFNlbmRSaWdodCgpKSwgbV93ZWJQYWdlUHJv eHkucGFnZUlEKCkpOwogICAgIG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlR2VvbWV0cnkgPSB0cnVl OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21h Yy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCmluZGV4IGI5ZTAwNzM1NTM5 ZjhlZGFhYWM5Nzg5NzNjYWJiYWY0NGQxZmI0MGMuLjZjNzI3OTYzNWVjMmRhZTg1ZTY5NzExMDk3 MDRiMjUxMjFkMTc3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCkBAIC0x ODMsNyArMTgzLDcgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Ojpz ZW5kVXBkYXRlR2VvbWV0cnkoKQogICAgIEFTU0VSVCghbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVH ZW9tZXRyeSk7CiAKICAgICB3aWxsU2VuZFVwZGF0ZUdlb21ldHJ5KCk7Ci0gICAgbV93ZWJQYWdl UHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVHZW9tZXRy eShtX3NpemUsIG1fbGF5ZXJQb3NpdGlvbiwgdHJ1ZSwgY3JlYXRlRmVuY2UoKSksIG1fd2ViUGFn ZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBtX3dlYlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNz YWdlczo6RHJhd2luZ0FyZWE6OlVwZGF0ZUdlb21ldHJ5KG1fc2l6ZSwgdHJ1ZSAvKiBmbHVzaFN5 bmNocm9ub3VzbHkgKi8sIGNyZWF0ZUZlbmNlKCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7 CiB9CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6YWRqdXN0VHJh bnNpZW50Wm9vbShkb3VibGUgc2NhbGUsIEZsb2F0UG9pbnQgb3JpZ2luKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKaW5kZXggODhlOTBlODk1NzY1 YzhmYzIzMmViYzk1MDQ0MzYwYWQ4NDlkMDczMC4uNDI4NGRlY2EwNmYxNzhlYWMzYTk3YWI5YTlh MDA5Zjk4MDM4ODJlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9E cmF3aW5nQXJlYS5oCkBAIC0xMzEsNyArMTMxLDcgQEAgcHVibGljOgogCiAjaWYgUExBVEZPUk0o Q09DT0EpCiAgICAgLy8gVXNlZCBieSBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS4KLSAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlR2VvbWV0cnkoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgdmll d1NpemUsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIGxheWVyUG9zaXRpb24sIGJvb2wgZmx1c2hT eW5jaHJvbm91c2x5LCBjb25zdCBXZWJDb3JlOjpNYWNoU2VuZFJpZ2h0JiBmZW5jZVBvcnQpIHsg fQorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVHZW9tZXRyeShjb25zdCBXZWJDb3JlOjpJbnRTaXpl JiB2aWV3U2l6ZSwgYm9vbCBmbHVzaFN5bmNocm9ub3VzbHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hT ZW5kUmlnaHQmIGZlbmNlUG9ydCkgeyB9CiAjZW5kaWYKIAogICAgIHZpcnR1YWwgdm9pZCBsYXll ckhvc3REaWRGbHVzaExheWVycygpIHsgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMuaW4KaW5kZXggNmY1OGZlOGUy YTFmNWE0OTE3MDc3OTc1NGE1YjE3YmFmYjJlODczNC4uOTkzYjFjNDg4MGE0Y2QxNzhhZWI5Nzgz ODBmOTZhZWZhNDY5MjE1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMuaW4KQEAgLTI2LDcgKzI2LDcgQEAgbWVz c2FnZXMgLT4gRHJhd2luZ0FyZWEgewogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgLy8gVXNl ZCBieSBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS4KLSAgICBVcGRhdGVHZW9tZXRyeShX ZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplLCBXZWJDb3JlOjpJbnRTaXplIGxheWVyUG9zaXRpb24s IGJvb2wgZmx1c2hTeW5jaHJvbm91c2x5LCBXZWJDb3JlOjpNYWNoU2VuZFJpZ2h0IGZlbmNlUG9y dCkKKyAgICBVcGRhdGVHZW9tZXRyeShXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplLCBib29sIGZs dXNoU3luY2hyb25vdXNseSwgV2ViQ29yZTo6TWFjaFNlbmRSaWdodCBmZW5jZVBvcnQpCiAgICAg U2V0RGV2aWNlU2NhbGVGYWN0b3IoZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IpCiAgICAgU2V0Q29s b3JTcGFjZShzdHJ1Y3QgV2ViS2l0OjpDb2xvclNwYWNlRGF0YSBjb2xvclNwYWNlKQogICAgIFNl dFZpZXdFeHBvc2VkUmVjdChzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0UmVjdD4gdmlld0V4 cG9zZWRSZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv UmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJh d2luZ0FyZWEuaAppbmRleCBlNThkZDYxMzA4ZGM3N2RjMjY5OGRiNjliNzc0YzcxMzU0MjUzNzk3 Li41NTVjNTg0ZWViNjVhYzMyMzAyYTM3YmY3MDkxNDY3MDEyNmRkZWIwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaApAQCAtNjEsNyAr NjEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0TmVlZHNEaXNwbGF5KCkgb3ZlcnJpZGU7CiAg ICAgdm9pZCBzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIG92 ZXJyaWRlOwogICAgIHZvaWQgc2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9sbFJl Y3QsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbERlbHRhKSBvdmVycmlkZTsKLSAgICB2 b2lkIHVwZGF0ZUdlb21ldHJ5KGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplLCBjb25z dCBXZWJDb3JlOjpJbnRTaXplJiBsYXllclBvc2l0aW9uLCBib29sIGZsdXNoU3luY2hyb25vdXNs eSwgY29uc3QgV2ViQ29yZTo6TWFjaFNlbmRSaWdodCYgZmVuY2VQb3J0KSBvdmVycmlkZTsKKyAg ICB2b2lkIHVwZGF0ZUdlb21ldHJ5KGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplLCBi b29sIGZsdXNoU3luY2hyb25vdXNseSwgY29uc3QgV2ViQ29yZTo6TWFjaFNlbmRSaWdodCYgZmVu Y2VQb3J0KSBvdmVycmlkZTsKIAogICAgIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJGYWN0b3J5KiBn cmFwaGljc0xheWVyRmFjdG9yeSgpIG92ZXJyaWRlOwogICAgIHZvaWQgc2V0Um9vdENvbXBvc2l0 aW5nTGF5ZXIoV2ViQ29yZTo6R3JhcGhpY3NMYXllciopIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxh eWVyVHJlZURyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv UmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCmluZGV4IDllYmE5 YTlkNzhkNWQzYWQ2Y2Y0YTJjZjg2ZDhhOWRhOGM0MTBmOGUuLjI0M2M3ZmEzN2I4NTlhNDYwN2U2 ZWU4OTFhZmRmNjY0NmE2NWM1NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KQEAgLTE0Myw3ICsxNDMsNyBAQCB2b2lkIFJlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xh eWVyKiByb290TGF5ZQogICAgIHNjaGVkdWxlQ29tcG9zaXRpbmdMYXllckZsdXNoKCk7CiB9CiAK LXZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNvbnN0IElu dFNpemUmIHZpZXdTaXplLCBjb25zdCBJbnRTaXplJiBsYXllclBvc2l0aW9uLCBib29sIGZsdXNo U3luY2hyb25vdXNseSwgY29uc3QgV2ViQ29yZTo6TWFjaFNlbmRSaWdodCYpCit2b2lkIFJlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRyeShjb25zdCBJbnRTaXplJiB2aWV3 U2l6ZSwgYm9vbCBmbHVzaFN5bmNocm9ub3VzbHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmln aHQmKQogewogICAgIG1fdmlld1NpemUgPSB2aWV3U2l6ZTsKICAgICBtX3dlYlBhZ2Uuc2V0U2l6 ZSh2aWV3U2l6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCmluZGV4 IDUwYzQxMjY0Y2YzZTVhYTY4YWE2ZjJjNjQ5Zjk3MzVhNjAyYmMzNzQuLmI5Y2M3NTEyNDI2NzFh N2Y1Nzk0NzAxNjRmMzI0YmEzMzA4NmNhODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYS5oCkBAIC0yMyw4ICsyMyw3IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYV9o Ci0jZGVmaW5lIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhX2gKKyNwcmFnbWEgb25jZQog CiAjaWYgIVBMQVRGT1JNKElPUykKIApAQCAtOTMsNyArOTIsNyBAQCBwcml2YXRlOgogICAgIGJv b2wgZmx1c2hMYXllcnMoKSBvdmVycmlkZTsKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCi0g ICAgdm9pZCB1cGRhdGVHZW9tZXRyeShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3U2l6ZSwg Y29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgbGF5ZXJQb3NpdGlvbiwgYm9vbCBmbHVzaFN5bmNocm9u b3VzbHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQmIGZlbmNlUG9ydCkgb3ZlcnJpZGU7 CisgICAgdm9pZCB1cGRhdGVHZW9tZXRyeShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3U2l6 ZSwgYm9vbCBmbHVzaFN5bmNocm9ub3VzbHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQm IGZlbmNlUG9ydCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9h dCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzdXNwZW5kUGFpbnRpbmcoKTsKICAgICB2b2lkIHJlc3Vt ZVBhaW50aW5nKCk7CkBAIC0xNzEsNCArMTcwLDMgQEAgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19E UkFXSU5HX0FSRUEoVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEsIERyYXdpbmdBcmVhVHkK IAogI2VuZGlmIC8vICFQTEFURk9STShJT1MpCiAKLSNlbmRpZiAvLyBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0K aW5kZXggMGRkZjNjOWNjODdhZDQ3OWMwMGJkYjE5N2E1NTcwYmQ0OTA5MzhjYy4uYTc3MjIxYzhm ZDIyNzJiY2RkNTBmNzViN2ZkYzE1ZDNhMDM2MWZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtNTQwLDcgKzU0MCw3IEBAIHZvaWQgVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3QoKQogICAgIGZyYW1l Vmlldy0+c2V0Vmlld0V4cG9zZWRSZWN0KG1fc2Nyb2xsZWRWaWV3RXhwb3NlZFJlY3QpOwogfQog Ci12b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRyeShjb25z dCBJbnRTaXplJiB2aWV3U2l6ZSwgY29uc3QgSW50U2l6ZSYgbGF5ZXJQb3NpdGlvbiwgYm9vbCBm bHVzaFN5bmNocm9ub3VzbHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQmIGZlbmNlUG9y dCkKK3ZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNv bnN0IEludFNpemUmIHZpZXdTaXplLCBib29sIGZsdXNoU3luY2hyb25vdXNseSwgY29uc3QgV2Vi Q29yZTo6TWFjaFNlbmRSaWdodCYgZmVuY2VQb3J0KQogewogICAgIG1faW5VcGRhdGVHZW9tZXRy eSA9IHRydWU7CiAKQEAgLTU2OCw3ICs1NjgsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRyeShjb25zdCBJbnRTaXplJiB2aWV3U2l6ZSwgY29ucwog ICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKICAgICBbQ0FUcmFuc2FjdGlvbiBzZXREaXNhYmxl QWN0aW9uczpZRVNdOwogCi0gICAgW21faG9zdGluZ0xheWVyIHNldEZyYW1lOkNHUmVjdE1ha2Uo bGF5ZXJQb3NpdGlvbi53aWR0aCgpLCBsYXllclBvc2l0aW9uLmhlaWdodCgpLCB2aWV3U2l6ZS53 aWR0aCgpLCB2aWV3U2l6ZS5oZWlnaHQoKSldOworICAgIFttX2hvc3RpbmdMYXllciBzZXRGcmFt ZTpDR1JlY3RNYWtlKDAsIDAsIHZpZXdTaXplLndpZHRoKCksIHZpZXdTaXplLmhlaWdodCgpKV07 CiAKICAgICBbQ0FUcmFuc2FjdGlvbiBjb21taXRdOwogCg== 332275 2018-01-25 09:46:01 -0800 2018-01-25 14:27:32 -0800 Patch bug-182082-20180125094600.patch text/plain 18133 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3Mzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5N2FhMzI5OTExYTdlNzFm MmFkYmNlMTkyODQ0MmJhZGZjOGE3YzguLmNiZTQzYWJjMTc2OWNlNmMzMTc2NjAwZDkxZTk1MjQ1 OGIyZWU0YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMTgtMDEtMjUgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUKENHU2l6ZUVx dWFsVG9TaXplKG1fcmVzaXplU2Nyb2xsT2Zmc2V0LCBDR1NpemVaZXJvKSkgaW4gV2ViVmlld0lt cGw6OnNldEZyYW1lQW5kU2Nyb2xsQnkoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTgyMDgyCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzEzOTcxODM4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBTYWZhcmkgY291 bGQgY2FsbCBXZWJWaWV3SW1wbDo6c2V0RnJhbWVBbmRTY3JvbGxCeSgpIG11bHRpcGxlIHRpbWVz IHdpdGggZGlmZmVyZW50IHNjcm9sbCBvZmZzZXRzLAorICAgICAgICB0cmlnZ2VyaW5nIHRoaXMg YXNzZXJ0aW9uLgorCisgICAgICAgIFJlbmFtZSB0byBtX3Jlc2l6ZVNjcm9sbE9mZnNldCB0byBt X3Njcm9sbE9mZnNldEFkanVzdG1lbnQgdG8gcmVkdWNlIGNvbmZ1c2lvbiB3aXRoIGFjdHVhbCBz Y3JvbGwgb2Zmc2V0cy4KKyAgICAgICAgVGhpcyBwYXJhbWV0ZXIgaGFzIG5vIGVmZmVjdCBvbiBt YWNPUywgYnV0IGlzIHVzZWQgYnkgdGhlIC1bV0tXZWJWaWV3IHNldEZyYW1lOmFuZFNjcm9sbEJ5 Ol0gc28gYXQgc29tZSBwb2ludAorICAgICAgICBuZWVkcyB0byBiZSBob29rZWQgdXAgdG8gYWxs b3cgc3luY2hyb25vdXMgdmlldyByZXNpemUgYW5kIHNjcm9sbCBhZGp1c3RtZW50IChlLmcuIGZv ciB0aGUgRmluZCBiYXIgYW5pbWF0aW9uKS4KKyAgICAgICAgCisgICAgICAgIFJlbW92ZSBEcmF3 aW5nQXJlYVByb3h5J3MgbV9sYXllclBvc2l0aW9uIHdoaWNoIHdhcyB1bnVzZWQsIGFuZCByZW1v dmUgdGhlIHBhcmFtZXRlcnMgZnJvbSB0aGUgVXBkYXRlR2VvbWV0cnkgbWVzc2FnZS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dl YlZpZXcgX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfYmVn aW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2Nv YS9XZWJWaWV3SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5t bToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldEZyYW1lQW5kU2Nyb2xsQnkpOgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0RHJhd2luZ0FyZWFTaXplKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRy YXdpbmdBcmVhUHJveHk6OnNldFNpemUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9EcmF3aW5nQXJl YVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYVByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbToKKyAgICAgICAg KFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eTo6c2VuZFVwZGF0ZUdl b21ldHJ5KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaDoKKyAg ICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMuaW46CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRyZWVEcmF3aW5nQXJl YS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUxheWVyVHJl ZURyYXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRyeSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW06CisgICAg ICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRy eSk6CisKIDIwMTgtMDEtMjIgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAgICAg IFVwZGF0ZSB0aXRsZSBsYWJlbCBzaXplCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbQppbmRleCAyMGQzYzFkNWUxNDczNzg3YWJjMTRjYjM4MDJhYTdm NjgxMWIwMjc1Li45MjljNTE2ZmU0Zjg4YTBmNjBjYmM1N2QwMDhmZGFiMjhmMzQxZGM5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTI1 MTcsNyArMjUxNyw3IEBAIC0gKHZvaWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkCiAKICAgICAgICAg Qk9PTCBzaXplQ2hhbmdlZCA9IE5POwogICAgICAgICBpZiAoYXV0byBkcmF3aW5nQXJlYSA9IF9w YWdlLT5kcmF3aW5nQXJlYSgpKQotICAgICAgICAgICAgc2l6ZUNoYW5nZWQgPSBkcmF3aW5nQXJl YS0+c2V0U2l6ZShXZWJDb3JlOjpJbnRTaXplKGJvdW5kcy5zaXplKSwgV2ViQ29yZTo6SW50U2l6 ZSgpLCBXZWJDb3JlOjpJbnRTaXplKCkpOworICAgICAgICAgICAgc2l6ZUNoYW5nZWQgPSBkcmF3 aW5nQXJlYS0+c2V0U2l6ZShXZWJDb3JlOjpJbnRTaXplKGJvdW5kcy5zaXplKSk7CiAKICAgICAg ICAgaWYgKHNpemVDaGFuZ2VkICYgW3NlbGYgdXNlc1N0YW5kYXJkQ29udGVudFZpZXddKQogICAg ICAgICAgICAgW19jb250ZW50VmlldyBzZXRTaXplQ2hhbmdlZFNpbmNlTGFzdFZpc2libGVDb250 ZW50UmVjdFVwZGF0ZTpZRVNdOwpAQCAtNTEzNiw3ICs1MTM2LDcgQEAgLSAodm9pZClfYmVnaW5B bmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogCiAg ICAgX3BhZ2UtPmR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGUobmV3TWluaW11bUxheW91dFNpemUs IG5ld01heGltdW1Vbm9ic2N1cmVkU2l6ZSwgdmlzaWJsZVJlY3RJbkNvbnRlbnRDb29yZGluYXRl cywgdW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcywgZnV0dXJlVW5vYnNjdXJlZFJl Y3RJblNlbGZDb29yZGluYXRlcywgdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzRXh0ZW50LCB0YXJn ZXRTY2FsZSwgbmV3T3JpZW50YXRpb24pOwogICAgIGlmIChXZWJLaXQ6OkRyYXdpbmdBcmVhUHJv eHkqIGRyYXdpbmdBcmVhID0gX3BhZ2UtPmRyYXdpbmdBcmVhKCkpCi0gICAgICAgIGRyYXdpbmdB cmVhLT5zZXRTaXplKFdlYkNvcmU6OkludFNpemUobmV3Qm91bmRzLnNpemUpLCBXZWJDb3JlOjpJ bnRTaXplKCksIFdlYkNvcmU6OkludFNpemUoKSk7CisgICAgICAgIGRyYXdpbmdBcmVhLT5zZXRT aXplKFdlYkNvcmU6OkludFNpemUobmV3Qm91bmRzLnNpemUpKTsKIH0KIAogLSAodm9pZClfZW5k QW5pbWF0ZWRSZXNpemUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXggY2E2Y2E4OWU2MWM3YjgzNGYzMTkwMjMyYjc0 MmY0ZTgwZDlhZGU2Yi4uMGUwYTJhZmNmZDQ3YTYyZmJhMmNjZDAwMzE0ZWE4MzRlMTM0YWIzMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3QmFzZS5jcHAKQEAgLTYwMSw3ICs2MDEsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3 QmFzZVNpemVBbGxvY2F0ZShHdGtXaWRnZXQqIHdpZGdldCwgR3RrQWxsb2NhdGlvbiogYWxsbwog ICAgIH0KIAogICAgIGlmIChEcmF3aW5nQXJlYVByb3h5SW1wbCogZHJhd2luZ0FyZWEgPSBzdGF0 aWNfY2FzdDxEcmF3aW5nQXJlYVByb3h5SW1wbCo+KHByaXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0Fy ZWEoKSkpCi0gICAgICAgIGRyYXdpbmdBcmVhLT5zZXRTaXplKHZpZXdSZWN0LnNpemUoKSwgSW50 U2l6ZSgpLCBJbnRTaXplKCkpOworICAgICAgICBkcmF3aW5nQXJlYS0+c2V0U2l6ZSh2aWV3UmVj dC5zaXplKCkpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUdldFByZWZlcnJl ZFdpZHRoKEd0a1dpZGdldCogd2lkZ2V0LCBnaW50KiBtaW5pbXVtU2l6ZSwgZ2ludCogbmF0dXJh bFNpemUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dQRVZp ZXcuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XUEVWaWV3LmNwcAppbmRl eCBlNzk5NzdiNDYyYTYyOWFhZTAwNDE3OWMwOTJhNjgwMTBhYmE2MDhjLi40OWI2NDI0ZWIxMmNk YmQ3YjMwMjQyOGM1ZDhhNGJkZWQ4YzRhZmRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvd3BlL1dQRVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS93cGUvV1BFVmlldy5jcHAKQEAgLTE2NSw3ICsxNjUsNyBAQCB2b2lkIFZpZXc6OnNldFNp emUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSkKIHsKICAgICBtX3NpemUgPSBzaXplOwog ICAgIGlmIChtX3BhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKSkKLSAgICAgICAgbV9wYWdlUHJveHkt PmRyYXdpbmdBcmVhKCktPnNldFNpemUoc2l6ZSwgV2ViQ29yZTo6SW50U2l6ZSgpLCBXZWJDb3Jl OjpJbnRTaXplKCkpOworICAgICAgICBtX3BhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6 ZShzaXplKTsKIH0KIAogdm9pZCBWaWV3OjpzZXRWaWV3U3RhdGUoV2ViQ29yZTo6QWN0aXZpdHlT dGF0ZTo6RmxhZ3MgZmxhZ3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwuaAppbmRleCBiMzc4MGE3NDgwMWQ3NDU4YjIxY2YwZDBlMGFkYjgwZTAwNTM0ZTUzLi40 ZDc1YWEzMjA4MjBlNWU5NWQ4ZmJkYzkxMTc3ZmRiNzA5MThiYzllIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKQEAgLTYyOCw4ICs2MjgsOCBAQCBwcml2 YXRlOgogICAgIGJvb2wgbV9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHMgeyBmYWxz ZSB9OwogICAgIENHRmxvYXQgbV9wZW5kaW5nVG9wQ29udGVudEluc2V0IHsgMCB9OwogICAgIGJv b2wgbV9kaWRTY2hlZHVsZVNldFRvcENvbnRlbnRJbnNldCB7IGZhbHNlIH07Ci0KLSAgICBDR1Np emUgbV9yZXNpemVTY3JvbGxPZmZzZXQgeyAwLCAwIH07CisgICAgCisgICAgQ0dTaXplIG1fc2Ny b2xsT2Zmc2V0QWRqdXN0bWVudCB7IDAsIDAgfTsKIAogICAgIENHU2l6ZSBtX2ludHJpbnNpY0Nv bnRlbnRTaXplIHsgMCwgMCB9OwogICAgIENHRmxvYXQgbV9vdmVycmlkZURldmljZVNjYWxlRmFj dG9yIHsgMCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi Vmlld0ltcGwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5t bQppbmRleCA4NGI4NTZlMmU2YjIxMzRkZDEwODJiYjA2MjcxNGZkMzMzMGRjNDRlLi42NzE5M2Yy YzlhZTA3ZjMzY2M0M2NmMjU3MjEzMjVlYjJiZTg1MzNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQpAQCAtMTUyNywxMSArMTUyNywxMSBAQCBib29s IFdlYlZpZXdJbXBsOjpmcmFtZVNpemVVcGRhdGVzRGlzYWJsZWQoKSBjb25zdAogICAgIHJldHVy biBbbV9sYXlvdXRTdHJhdGVneSBmcmFtZVNpemVVcGRhdGVzRGlzYWJsZWRdOwogfQogCi12b2lk IFdlYlZpZXdJbXBsOjpzZXRGcmFtZUFuZFNjcm9sbEJ5KENHUmVjdCBmcmFtZSwgQ0dTaXplIG9m ZnNldCkKK3ZvaWQgV2ViVmlld0ltcGw6OnNldEZyYW1lQW5kU2Nyb2xsQnkoQ0dSZWN0IGZyYW1l LCBDR1NpemUgc2Nyb2xsRGVsdGEpCiB7Ci0gICAgQVNTRVJUKENHU2l6ZUVxdWFsVG9TaXplKG1f cmVzaXplU2Nyb2xsT2Zmc2V0LCBDR1NpemVaZXJvKSk7CisgICAgaWYgKCFDR1NpemVFcXVhbFRv U2l6ZShzY3JvbGxEZWx0YSwgQ0dTaXplWmVybykpCisgICAgICAgIG1fc2Nyb2xsT2Zmc2V0QWRq dXN0bWVudCA9IHNjcm9sbERlbHRhOwogCi0gICAgbV9yZXNpemVTY3JvbGxPZmZzZXQgPSBvZmZz ZXQ7CiAgICAgW21fdmlldyBmcmFtZV0gPSBOU1JlY3RGcm9tQ0dSZWN0KGZyYW1lKTsKIH0KIApA QCAtMTYwMCw4ICsxNjAwLDggQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0RHJhd2luZ0FyZWFTaXpl KENHU2l6ZSBzaXplKQogICAgIGlmICghbV9wYWdlLT5kcmF3aW5nQXJlYSgpKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBtX3BhZ2UtPmRyYXdpbmdBcmVhKCktPnNldFNpemUoV2ViQ29yZTo6SW50 U2l6ZShzaXplKSwgV2ViQ29yZTo6SW50U2l6ZSgpLCBXZWJDb3JlOjpJbnRTaXplKG1fcmVzaXpl U2Nyb2xsT2Zmc2V0KSk7Ci0gICAgbV9yZXNpemVTY3JvbGxPZmZzZXQgPSBDR1NpemVaZXJvOwor ICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZShXZWJDb3JlOjpJbnRTaXplKHNpemUp LCBXZWJDb3JlOjpJbnRTaXplKG1fc2Nyb2xsT2Zmc2V0QWRqdXN0bWVudCkpOworICAgIG1fc2Ny b2xsT2Zmc2V0QWRqdXN0bWVudCA9IENHU2l6ZVplcm87CiB9CiAKIHZvaWQgV2ViVmlld0ltcGw6 OnVwZGF0ZUxheWVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94 eS5jcHAKaW5kZXggYzU1YzNmNWI1Y2I0OTRmOGM3YmMyNTJkODViZWU3ZmIxMTQ2NTkwYS4uZmIy ZWI0MjdhNzg3M2RmOTM3Zjg0NGYyNjhhMjI1OGE3MWRiMzM4MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5jcHAKQEAgLTU1LDE0ICs1NSwxMyBAQCBEcmF3 aW5nQXJlYVByb3h5Ojp+RHJhd2luZ0FyZWFQcm94eSgpCiAgICAgbV93ZWJQYWdlUHJveHkucHJv Y2VzcygpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94eTo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKLWJv b2wgRHJhd2luZ0FyZWFQcm94eTo6c2V0U2l6ZShjb25zdCBJbnRTaXplJiBzaXplLCBjb25zdCBJ bnRTaXplJiBsYXllclBvc2l0aW9uLCBjb25zdCBJbnRTaXplJiBzY3JvbGxPZmZzZXQpCitib29s IERyYXdpbmdBcmVhUHJveHk6OnNldFNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSwgY29uc3QgSW50 U2l6ZSYgc2Nyb2xsRGVsdGEpCiB7IAotICAgIGlmIChtX3NpemUgPT0gc2l6ZSAmJiBtX2xheWVy UG9zaXRpb24gPT0gbGF5ZXJQb3NpdGlvbiAmJiBzY3JvbGxPZmZzZXQuaXNaZXJvKCkpCisgICAg aWYgKG1fc2l6ZSA9PSBzaXplICYmIHNjcm9sbERlbHRhLmlzWmVybygpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICBtX3NpemUgPSBzaXplOwotICAgIG1fbGF5ZXJQb3NpdGlvbiA9IGxh eWVyUG9zaXRpb247Ci0gICAgbV9zY3JvbGxPZmZzZXQgKz0gc2Nyb2xsT2Zmc2V0OworICAgIG1f c2Nyb2xsT2Zmc2V0ICs9IHNjcm9sbERlbHRhOwogICAgIHNpemVEaWRDaGFuZ2UoKTsKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdp bmdBcmVhUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHku aAppbmRleCBhZDgzNTZjNjVjMWI5MTU3OGFjMWMzNDgzOTI3YjRjNDdkYjBkMzZhLi4wNGM1MmFm OTdlNWY5ZTc4OTA5NDUyNTgwYTkzZDUzZDA2YmMxMDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCkBAIC0yNCw4ICsyNCw3IEBACiAgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBEcmF3aW5nQXJlYVByb3h5X2gK LSNkZWZpbmUgRHJhd2luZ0FyZWFQcm94eV9oCisjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkRy YXdpbmdBcmVhSW5mby5oIgogI2luY2x1ZGUgIkdlbmVyaWNDYWxsYmFjay5oIgpAQCAtNjYsNyAr NjUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHdhaXRGb3JCYWNraW5nU3RvcmVVcGRh dGVPbk5leHRQYWludCgpIHsgfQogCiAgICAgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQotICAgIGJvb2wgc2V0U2l6ZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYsIGNvbnN0IFdlYkNvcmU6OkludFNp emUmIHNjcm9sbE9mZnNldCk7CisgICAgYm9vbCBzZXRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNp emUmLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZzZXQgPSB7IH0pOwogCiAgICAg Ly8gVGhlIHRpbWVvdXQgd2UgdXNlIHdoZW4gd2FpdGluZyBmb3IgYSBEaWRVcGRhdGVHZW9tZXRy eSBtZXNzYWdlLgogICAgIHN0YXRpYyBjb25zdGV4cHIgU2Vjb25kcyBkaWRVcGRhdGVCYWNraW5n U3RvcmVTdGF0ZVRpbWVvdXQoKSB7IHJldHVybiBTZWNvbmRzOjpmcm9tTWlsbGlzZWNvbmRzKDUw MCk7IH0KQEAgLTExNCw3ICsxMTMsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgV2ViUGFnZVByb3h5JiBt X3dlYlBhZ2VQcm94eTsKIAogICAgIFdlYkNvcmU6OkludFNpemUgbV9zaXplOwotICAgIFdlYkNv cmU6OkludFNpemUgbV9sYXllclBvc2l0aW9uOwogICAgIFdlYkNvcmU6OkludFNpemUgbV9zY3Jv bGxPZmZzZXQ7CiAKICAgICAvLyBJUEM6Ok1lc3NhZ2VSZWNlaXZlcgpAQCAtMTQ5LDQgKzE0Nywz IEBAIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQkVHSU4oV2ViS2l0OjpUb1ZhbHVlVHlwZU5hbWUp IFwKICAgICBzdGF0aWMgYm9vbCBpc1R5cGUoY29uc3QgV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5 JiBwcm94eSkgeyByZXR1cm4gcHJveHkudHlwZSgpID09IFdlYktpdDo6UHJveHlUeXBlOyB9IFwK IFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfRU5EKCkKIAotI2VuZGlmIC8vIERyYXdpbmdBcmVhUHJv eHlfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQpp bmRleCAxYzI1MThlYjU5YjA0Mjg5ZThjYTA2MTUyMGY4NDNmN2I2MzVkMmUzLi5lMjNjOWVlMmY0 YjFjMTRhMWMwODAzNjYwZmRhYTE0ODE4MDIzMGM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94 eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eS5tbQpAQCAtMTcyLDcgKzE3Miw3IEBAIHZvaWQgUmVt b3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWFQcm94eTo6ZGlkVXBkYXRlR2VvbWV0cnkoKQogdm9pZCBS ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkoKQogewog ICAgIG1fbGFzdFNlbnRTaXplID0gbV9zaXplOwotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3Mo KS5zZW5kKE1lc3NhZ2VzOjpEcmF3aW5nQXJlYTo6VXBkYXRlR2VvbWV0cnkobV9zaXplLCBJbnRT aXplKCksIGZhbHNlLCBNYWNoU2VuZFJpZ2h0KCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7 CisgICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OkRyYXdpbmdBcmVh OjpVcGRhdGVHZW9tZXRyeShtX3NpemUsIGZhbHNlIC8qIGZsdXNoU3luY2hyb25vdXNseSAqLywg TWFjaFNlbmRSaWdodCgpKSwgbV93ZWJQYWdlUHJveHkucGFnZUlEKCkpOwogICAgIG1faXNXYWl0 aW5nRm9yRGlkVXBkYXRlR2VvbWV0cnkgPSB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5n QXJlYVByb3h5Lm1tCmluZGV4IGI5ZTAwNzM1NTM5ZjhlZGFhYWM5Nzg5NzNjYWJiYWY0NGQxZmI0 MGMuLjZjNzI3OTYzNWVjMmRhZTg1ZTY5NzExMDk3MDRiMjUxMjFkMTc3ZTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YVByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL21hYy9UaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCkBAIC0xODMsNyArMTgzLDcgQEAgdm9pZCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlR2VvbWV0cnkoKQogICAgIEFT U0VSVCghbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVHZW9tZXRyeSk7CiAKICAgICB3aWxsU2VuZFVw ZGF0ZUdlb21ldHJ5KCk7Ci0gICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnNlbmQoTWVzc2Fn ZXM6OkRyYXdpbmdBcmVhOjpVcGRhdGVHZW9tZXRyeShtX3NpemUsIG1fbGF5ZXJQb3NpdGlvbiwg dHJ1ZSwgY3JlYXRlRmVuY2UoKSksIG1fd2ViUGFnZVByb3h5LnBhZ2VJRCgpKTsKKyAgICBtX3dl YlBhZ2VQcm94eS5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6RHJhd2luZ0FyZWE6OlVwZGF0ZUdl b21ldHJ5KG1fc2l6ZSwgdHJ1ZSAvKiBmbHVzaFN5bmNocm9ub3VzbHkgKi8sIGNyZWF0ZUZlbmNl KCkpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKIHZvaWQgVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWFQcm94eTo6YWRqdXN0VHJhbnNpZW50Wm9vbShkb3VibGUgc2NhbGUsIEZs b2F0UG9pbnQgb3JpZ2luKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhLmgKaW5kZXggODhlOTBlODk1NzY1YzhmYzIzMmViYzk1MDQ0MzYwYWQ4NDlkMDcz MC4uNDI4NGRlY2EwNmYxNzhlYWMzYTk3YWI5YTlhMDA5Zjk4MDM4ODJlYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCkBAIC0xMzEsNyArMTMx LDcgQEAgcHVibGljOgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgLy8gVXNlZCBieSBUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS4KLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlR2VvbWV0 cnkoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgdmlld1NpemUsIGNvbnN0IFdlYkNvcmU6OkludFNp emUmIGxheWVyUG9zaXRpb24sIGJvb2wgZmx1c2hTeW5jaHJvbm91c2x5LCBjb25zdCBXZWJDb3Jl OjpNYWNoU2VuZFJpZ2h0JiBmZW5jZVBvcnQpIHsgfQorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVH ZW9tZXRyeShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3U2l6ZSwgYm9vbCBmbHVzaFN5bmNo cm9ub3VzbHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQmIGZlbmNlUG9ydCkgeyB9CiAj ZW5kaWYKIAogICAgIHZpcnR1YWwgdm9pZCBsYXllckhvc3REaWRGbHVzaExheWVycygpIHsgfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVh Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0Fy ZWEubWVzc2FnZXMuaW4KaW5kZXggNmY1OGZlOGUyYTFmNWE0OTE3MDc3OTc1NGE1YjE3YmFmYjJl ODczNC4uOTkzYjFjNDg4MGE0Y2QxNzhhZWI5NzgzODBmOTZhZWZhNDY5MjE1NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVzc2FnZXMu aW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEubWVz c2FnZXMuaW4KQEAgLTI2LDcgKzI2LDcgQEAgbWVzc2FnZXMgLT4gRHJhd2luZ0FyZWEgewogCiAj aWYgUExBVEZPUk0oQ09DT0EpCiAgICAgLy8gVXNlZCBieSBUaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS4KLSAgICBVcGRhdGVHZW9tZXRyeShXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplLCBX ZWJDb3JlOjpJbnRTaXplIGxheWVyUG9zaXRpb24sIGJvb2wgZmx1c2hTeW5jaHJvbm91c2x5LCBX ZWJDb3JlOjpNYWNoU2VuZFJpZ2h0IGZlbmNlUG9ydCkKKyAgICBVcGRhdGVHZW9tZXRyeShXZWJD b3JlOjpJbnRTaXplIHZpZXdTaXplLCBib29sIGZsdXNoU3luY2hyb25vdXNseSwgV2ViQ29yZTo6 TWFjaFNlbmRSaWdodCBmZW5jZVBvcnQpCiAgICAgU2V0RGV2aWNlU2NhbGVGYWN0b3IoZmxvYXQg ZGV2aWNlU2NhbGVGYWN0b3IpCiAgICAgU2V0Q29sb3JTcGFjZShzdHJ1Y3QgV2ViS2l0OjpDb2xv clNwYWNlRGF0YSBjb2xvclNwYWNlKQogICAgIFNldFZpZXdFeHBvc2VkUmVjdChzdGQ6Om9wdGlv bmFsPFdlYkNvcmU6OkZsb2F0UmVjdD4gdmlld0V4cG9zZWRSZWN0KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1v dGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaAppbmRleCBlNThkZDYxMzA4 ZGM3N2RjMjY5OGRiNjliNzc0YzcxMzU0MjUzNzk3Li41NTVjNTg0ZWViNjVhYzMyMzAyYTM3YmY3 MDkxNDY3MDEyNmRkZWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWEuaApAQCAtNjEsNyArNjEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQg c2V0TmVlZHNEaXNwbGF5KCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzZXROZWVkc0Rpc3BsYXlJblJl Y3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIG92ZXJyaWRlOwogICAgIHZvaWQgc2Nyb2xsKGNv bnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFNpemUm IHNjcm9sbERlbHRhKSBvdmVycmlkZTsKLSAgICB2b2lkIHVwZGF0ZUdlb21ldHJ5KGNvbnN0IFdl YkNvcmU6OkludFNpemUmIHZpZXdTaXplLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBsYXllclBv c2l0aW9uLCBib29sIGZsdXNoU3luY2hyb25vdXNseSwgY29uc3QgV2ViQ29yZTo6TWFjaFNlbmRS aWdodCYgZmVuY2VQb3J0KSBvdmVycmlkZTsKKyAgICB2b2lkIHVwZGF0ZUdlb21ldHJ5KGNvbnN0 IFdlYkNvcmU6OkludFNpemUmIHZpZXdTaXplLCBib29sIGZsdXNoU3luY2hyb25vdXNseSwgY29u c3QgV2ViQ29yZTo6TWFjaFNlbmRSaWdodCYgZmVuY2VQb3J0KSBvdmVycmlkZTsKIAogICAgIFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJGYWN0b3J5KiBncmFwaGljc0xheWVyRmFjdG9yeSgpIG92ZXJy aWRlOwogICAgIHZvaWQgc2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIoV2ViQ29yZTo6R3JhcGhpY3NM YXllciopIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVy VHJlZURyYXdpbmdBcmVhLm1tCmluZGV4IDllYmE5YTlkNzhkNWQzYWQ2Y2Y0YTJjZjg2ZDhhOWRh OGM0MTBmOGUuLjI0M2M3ZmEzN2I4NTlhNDYwN2U2ZWU4OTFhZmRmNjY0NmE2NWM1NzEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9S ZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0K QEAgLTE0Myw3ICsxNDMsNyBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjpzZXRS b290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiByb290TGF5ZQogICAgIHNjaGVkdWxl Q29tcG9zaXRpbmdMYXllckZsdXNoKCk7CiB9CiAKLXZvaWQgUmVtb3RlTGF5ZXJUcmVlRHJhd2lu Z0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNvbnN0IEludFNpemUmIHZpZXdTaXplLCBjb25zdCBJbnRT aXplJiBsYXllclBvc2l0aW9uLCBib29sIGZsdXNoU3luY2hyb25vdXNseSwgY29uc3QgV2ViQ29y ZTo6TWFjaFNlbmRSaWdodCYpCit2b2lkIFJlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhOjp1cGRh dGVHZW9tZXRyeShjb25zdCBJbnRTaXplJiB2aWV3U2l6ZSwgYm9vbCBmbHVzaFN5bmNocm9ub3Vz bHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQmKQogewogICAgIG1fdmlld1NpemUgPSB2 aWV3U2l6ZTsKICAgICBtX3dlYlBhZ2Uuc2V0U2l6ZSh2aWV3U2l6ZSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCmluZGV4IDUwYzQxMjY0Y2YzZTVhYTY4YWE2ZjJjNjQ5 Zjk3MzVhNjAyYmMzNzQuLmI5Y2M3NTEyNDI2NzFhN2Y1Nzk0NzAxNjRmMzI0YmEzMzA4NmNhODQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCkBAIC0yMyw4ICsyMyw3 IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYV9oCi0jZGVmaW5lIFRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhX2gKKyNwcmFnbWEgb25jZQogCiAjaWYgIVBMQVRGT1JNKElPUykKIApAQCAt OTMsNyArOTIsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgZmx1c2hMYXllcnMoKSBvdmVycmlkZTsK IAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCi0gICAgdm9pZCB1cGRhdGVHZW9tZXRyeShjb25z dCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3U2l6ZSwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgbGF5 ZXJQb3NpdGlvbiwgYm9vbCBmbHVzaFN5bmNocm9ub3VzbHksIGNvbnN0IFdlYkNvcmU6Ok1hY2hT ZW5kUmlnaHQmIGZlbmNlUG9ydCkgb3ZlcnJpZGU7CisgICAgdm9pZCB1cGRhdGVHZW9tZXRyeShj b25zdCBXZWJDb3JlOjpJbnRTaXplJiB2aWV3U2l6ZSwgYm9vbCBmbHVzaFN5bmNocm9ub3VzbHks IGNvbnN0IFdlYkNvcmU6Ok1hY2hTZW5kUmlnaHQmIGZlbmNlUG9ydCkgb3ZlcnJpZGU7CiAgICAg dm9pZCBzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9hdCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBzdXNw ZW5kUGFpbnRpbmcoKTsKICAgICB2b2lkIHJlc3VtZVBhaW50aW5nKCk7CkBAIC0xNzEsNCArMTcw LDMgQEAgU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19EUkFXSU5HX0FSRUEoVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEsIERyYXdpbmdBcmVhVHkKIAogI2VuZGlmIC8vICFQTEFURk9STShJT1Mp CiAKLSNlbmRpZiAvLyBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYV9oCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggMGRkZjNjOWNjODdhZDQ3OWMwMGJk YjE5N2E1NTcwYmQ0OTA5MzhjYy4uYTc3MjIxYzhmZDIyNzJiY2RkNTBmNzViN2ZkYzE1ZDNhMDM2 MWZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtNTQw LDcgKzU0MCw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVNj cm9sbGVkRXhwb3NlZFJlY3QoKQogICAgIGZyYW1lVmlldy0+c2V0Vmlld0V4cG9zZWRSZWN0KG1f c2Nyb2xsZWRWaWV3RXhwb3NlZFJlY3QpOwogfQogCi12b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRyeShjb25zdCBJbnRTaXplJiB2aWV3U2l6ZSwgY29uc3Qg SW50U2l6ZSYgbGF5ZXJQb3NpdGlvbiwgYm9vbCBmbHVzaFN5bmNocm9ub3VzbHksIGNvbnN0IFdl YkNvcmU6Ok1hY2hTZW5kUmlnaHQmIGZlbmNlUG9ydCkKK3ZvaWQgVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWE6OnVwZGF0ZUdlb21ldHJ5KGNvbnN0IEludFNpemUmIHZpZXdTaXplLCBib29s IGZsdXNoU3luY2hyb25vdXNseSwgY29uc3QgV2ViQ29yZTo6TWFjaFNlbmRSaWdodCYgZmVuY2VQ b3J0KQogewogICAgIG1faW5VcGRhdGVHZW9tZXRyeSA9IHRydWU7CiAKQEAgLTU2OCw3ICs1Njgs NyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVHZW9tZXRyeShj b25zdCBJbnRTaXplJiB2aWV3U2l6ZSwgY29ucwogICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsK ICAgICBbQ0FUcmFuc2FjdGlvbiBzZXREaXNhYmxlQWN0aW9uczpZRVNdOwogCi0gICAgW21faG9z dGluZ0xheWVyIHNldEZyYW1lOkNHUmVjdE1ha2UobGF5ZXJQb3NpdGlvbi53aWR0aCgpLCBsYXll clBvc2l0aW9uLmhlaWdodCgpLCB2aWV3U2l6ZS53aWR0aCgpLCB2aWV3U2l6ZS5oZWlnaHQoKSld OworICAgIFttX2hvc3RpbmdMYXllciBzZXRGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIHZpZXdTaXpl LndpZHRoKCksIHZpZXdTaXplLmhlaWdodCgpKV07CiAKICAgICBbQ0FUcmFuc2FjdGlvbiBjb21t aXRdOwogCg==