72113 2011-11-11 04:28:38 -0800 [Qt][WK2] Remove QWebNavigationController 2011-11-11 04:40:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann menard vestbo webkit.review.bot zoltan oldest_to_newest 500664 0 hausmann 2011-11-11 04:28:38 -0800 [Qt][WK2] Remove QWebNavigationController 500666 1 114669 hausmann 2011-11-11 04:32:23 -0800 Created attachment 114669 [Qt][WK2] Remove QWebNavigationController 500669 2 114669 menard 2011-11-11 04:34:34 -0800 Comment on attachment 114669 [Qt][WK2] Remove QWebNavigationController View in context: https://bugs.webkit.org/attachment.cgi?id=114669&action=review LGTM goo! > Source/WebKit/qt/ChangeLog:9 > + (WebKitQmlPlugin::registerTypes): Don't register QWebNavigationController with qml. nitpick isn't it QML :D. 500672 3 114669 kling 2011-11-11 04:37:30 -0800 Comment on attachment 114669 [Qt][WK2] Remove QWebNavigationController LGTM. Good riddance :) 500674 4 114669 hausmann 2011-11-11 04:40:16 -0800 Comment on attachment 114669 [Qt][WK2] Remove QWebNavigationController Clearing flags on attachment: 114669 Committed r99946: <http://trac.webkit.org/changeset/99946> 500675 5 hausmann 2011-11-11 04:40:24 -0800 All reviewed patches have been landed. Closing bug. 114669 2011-11-11 04:32:23 -0800 2011-11-11 04:40:16 -0800 [Qt][WK2] Remove QWebNavigationController bug-72113-20111111133230.patch text/plain 25161 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogOTk5MzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggOGQ3YzFiMDYyMzZh ODk3OWVkYTA2MGU4MjRiZjY3ZGE4MjMxZmRhZC4uMDJjN2EyM2VlZjkwZWQ1MDdhNjU4OTNhM2Ex M2M5MjJjM2IyZDNjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0xMS0x MSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CisKKyAgICAgICAg W1F0XVtXSzJdIFJlbW92ZSBRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXIKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyMTEzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9wbHVnaW4uY3Bw OgorICAgICAgICAoV2ViS2l0UW1sUGx1Z2luOjpyZWdpc3RlclR5cGVzKTogRG9uJ3QgcmVnaXN0 ZXIgUVdlYk5hdmlnYXRpb25Db250cm9sbGVyIHdpdGggcW1sLgorCiAyMDExLTExLTAzICBMdWl6 IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBwYWxtLmNvbT4KIAogICAgICAgICBbUXRdIEFkZGlu ZyBtZXRob2RzIHNldEdlb21ldHJ5IGFuZCBzZXRGb250IHRvIFFXZWJTZWxlY3RNZXRob2QgY2xh c3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKaW5kZXggZTEyOTc0YWZjY2QyMjBmNjI1YWJhMThkMWI2MmMwNjg5ODYyZDE4 NC4uMmY4OWM2MTk3YWNhZDlkODZjYWNjOWRkZTAxNWMyNDk2OWNkNGNjZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpA QCAtMSwzICsxLDQxIEBACisyMDExLTExLTExICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNt YW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gUmVtb3ZlIFFXZWJOYXZpZ2F0aW9u Q29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzIxMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGb2xkIHRoZSBmdW5jdGlvbnMgYW5kIHByb3BlcnRpZXMgb2YgUVdlYk5hdmlnYXRpb25Db250 cm9sbGVyIGludG8KKyAgICAgICAgUVF1aWNrV2ViVmlldy4KKworICAgICAgICAqIFRhcmdldC5w cmk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9XS1ZpZXcuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwOgorICAgICAgICAoUVF1aWNrV2ViUGFnZVBy aXZhdGU6OlFRdWlja1dlYlBhZ2VQcml2YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnBhZ2UuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBh Z2VfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6Cisg ICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChRUXVp Y2tXZWJWaWV3Ojpnb0JhY2spOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6Z29Gb3J3YXJkKToK KyAgICAgICAgKFFRdWlja1dlYlZpZXc6OnN0b3ApOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6 cmVsb2FkKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OmNhbkdvQmFjayk6CisgICAgICAgIChR UXVpY2tXZWJWaWV3OjpjYW5Hb0ZvcndhcmQpOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6Y2Fu U3RvcCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3OjpjYW5SZWxvYWQpOgorICAgICAgICAoUVF1 aWNrV2ViVmlldzo6dGl0bGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25jb250cm9s bGVyLmNwcDogUmVtb3ZlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0 aW9uY29udHJvbGxlci5oOiBSZW1vdmVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVz dHMvcXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgICh0c3RfUVF1 aWNrV2ViVmlldzo6bmF2aWdhdGlvblN0YXR1c0F0U3RhcnR1cCk6CisgICAgICAgIChMb2FkU3Rh cnRlZENhdGNoZXI6Om9uTG9hZFN0YXJ0ZWQpOgorICAgICAgICAodHN0X1FRdWlja1dlYlZpZXc6 OnN0b3BFbmFibGVkQWZ0ZXJMb2FkU3RhcnRlZCk6CisgICAgICAgICh0c3RfUVF1aWNrV2ViVmll dzo6YmFja0FuZEZvcndhcmQpOgorICAgICAgICAodHN0X1FRdWlja1dlYlZpZXc6OnJlbG9hZCk6 CisgICAgICAgICh0c3RfUVF1aWNrV2ViVmlldzo6c3RvcCk6CisKIDIwMTEtMTEtMTAgIEJldGgg RGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIE9uY2UgbW9yZSBmb3IgdGhlIFFU IGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4u Y3BwIGIvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCmluZGV4IDJiOThi ZTdiYjg5NTgzMjIwZjE1NDM1NDg2OGU3N2Q3MGFmYjM3MTkuLjM3OWI5NzkwZjBmNmY2MWYzNWZk N2ZhYzFmMTRmMTc5M2IxZjJjYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFy YXRpdmUvcGx1Z2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdp bi5jcHAKQEAgLTI2LDcgKzI2LDYgQEAKICNpbmNsdWRlICJxcXVpY2t3ZWJwYWdlLmgiCiAjaW5j bHVkZSAicXF1aWNrd2Vidmlldy5oIgogI2luY2x1ZGUgInF3ZWJkb3dubG9hZGl0ZW0uaCIKLSNp bmNsdWRlICJxd2VibmF2aWdhdGlvbmNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJxd2VicHJlZmVy ZW5jZXMuaCIKIAogI2luY2x1ZGUgPFF0TmV0d29yay9xbmV0d29ya3JlcGx5Lmg+CkBAIC01MCw3 ICs0OSw2IEBAIHB1YmxpYzoKIAogI2lmIGRlZmluZWQoSEFWRV9XRUJLSVQyKQogICAgICAgICBx bWxSZWdpc3RlclR5cGU8UVF1aWNrV2ViVmlldz4odXJpLCAzLCAwLCAiV2ViVmlldyIpOwotICAg ICAgICBxbWxSZWdpc3RlclVuY3JlYXRhYmxlVHlwZTxRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXI+ KHVyaSwgMywgMCwgIk5hdmlnYXRpb25Db250cm9sbGVyIiwgUU9iamVjdDo6dHIoIkNhbm5vdCBj cmVhdGUgc2VwYXJhdGUgaW5zdGFuY2Ugb2YgTmF2aWdhdGlvbkNvbnRyb2xsZXIiKSk7CiAgICAg ICAgIHFtbFJlZ2lzdGVyVW5jcmVhdGFibGVUeXBlPFFXZWJQcmVmZXJlbmNlcz4odXJpLCAzLCAw LCAiV2ViUHJlZmVyZW5jZXMiLCBRT2JqZWN0Ojp0cigiQ2Fubm90IGNyZWF0ZSBzZXBhcmF0ZSBp bnN0YW5jZSBvZiBXZWJQcmVmZXJlbmNlcyIpKTsKICAgICAgICAgcW1sUmVnaXN0ZXJVbmNyZWF0 YWJsZVR5cGU8UVF1aWNrV2ViUGFnZT4odXJpLCAzLCAwLCAiV2ViUGFnZSIsIFFPYmplY3Q6OnRy KCJDYW5ub3QgY3JlYXRlIHNlcGFyYXRlIGluc3RhbmNlIG9mIFdlYlBhZ2UsIHVzZSBXZWJWaWV3 IikpOwogICAgICAgICBxbWxSZWdpc3RlclVuY3JlYXRhYmxlVHlwZTxRTmV0d29ya1JlcGx5Pih1 cmksIDMsIDAsICJOZXR3b3JrUmVwbHkiLCBRT2JqZWN0Ojp0cigiQ2Fubm90IGNyZWF0ZSBzZXBh cmF0ZSBpbnN0YW5jZSBvZiBOZXR3b3JrUmVwbHkiKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9UYXJnZXQucHJpIGIvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaQppbmRleCAwMTA2YjFl MjEzMDU2ZjY4MjgyNjAzNjNkZTAxMjI0MTZhNzM3OGFmLi45YzU5MTFlMmY1NzZmZjYxMjllN2Mx MjA4OGU3ZjZlNzJhMzM2OWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9UYXJnZXQucHJp CisrKyBiL1NvdXJjZS9XZWJLaXQyL1RhcmdldC5wcmkKQEAgLTI0Nyw3ICsyNDcsNiBAQCBIRUFE RVJTICs9IFwKICAgICBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2VfcC5oIFwKICAgICBV SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuaCBcCiAgICAgVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3X3AuaCBcCi0gICAgVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmNv bnRyb2xsZXIuaCBcCiAgICAgVUlQcm9jZXNzL0F1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlUHJveHkuaCBcCiAgICAgVUlQcm9jZXNzL0F1dGhlbnRpY2F0aW9uL0F1dGhlbnRp Y2F0aW9uRGVjaXNpb25MaXN0ZW5lci5oIFwKICAgICBVSVByb2Nlc3MvQXV0aGVudGljYXRpb24v V2ViQ3JlZGVudGlhbC5oIFwKQEAgLTU0Niw3ICs1NDUsNiBAQCBTT1VSQ0VTICs9IFwKICAgICBV SVByb2Nlc3MvQVBJL3F0L3F3ZWJkb3dubG9hZGl0ZW0uY3BwIFwKICAgICBVSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnBhZ2UuY3BwIFwKICAgICBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwIFwKLSAgICBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9uY29udHJvbGxlci5j cHAgXAogICAgIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzLmNwcCBcCiAgICAgVUlQ cm9jZXNzL0F1dGhlbnRpY2F0aW9uL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUHJveHkuY3BwIFwK ICAgICBVSVByb2Nlc3MvQXV0aGVudGljYXRpb24vQXV0aGVudGljYXRpb25EZWNpc2lvbkxpc3Rl bmVyLmNwcCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L1dL Vmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9XS1ZpZXcuaAppbmRleCAz NzNiN2RmYmI2MjZjZGRmNDkzOTgxNDc3MTZhN2JlMDUwZjY2ZTRlLi44YzAxMTIwNmJjNzA4MDhl NzdlMzE2MGI0MzI5MmI0ZjY0ZTc1YWFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L1dLVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvV0tWaWV3LmgKQEAgLTIzLDcgKzIzLDYgQEAKICNpbmNsdWRlIDxXZWJLaXQyL3FxdWlja3dl YnBhZ2UuaD4KICNpbmNsdWRlIDxXZWJLaXQyL3FxdWlja3dlYnZpZXcuaD4KICNpbmNsdWRlIDxX ZWJLaXQyL3F3ZWJkb3dubG9hZGl0ZW0uaD4KLSNpbmNsdWRlIDxXZWJLaXQyL3F3ZWJuYXZpZ2F0 aW9uY29udHJvbGxlci5oPgogI2luY2x1ZGUgPFdlYktpdDIvcXdlYnByZWZlcmVuY2VzLmg+CiAK ICNlbmRpZiAvKiBXS1ZpZXdfaCAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKaW5kZXggOGYwNTI1NjY5NjUxNGQzODI1ZmVmNjBjNzBi YjY3ZTI2MWU3MGFiZS4uYTU1MDQ1ZWE1YzI2YjFhOGY5Y2JhMGE2Y2IyMzA2Y2NhOTMyMDc3YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2Uu Y3BwCkBAIC0xNjMsNyArMTYzLDYgQEAgdm9pZCBRUXVpY2tXZWJQYWdlOjppdGVtQ2hhbmdlKEl0 ZW1DaGFuZ2UgY2hhbmdlLCBjb25zdCBJdGVtQ2hhbmdlRGF0YSYgZGF0YSkKIFFRdWlja1dlYlBh Z2VQcml2YXRlOjpRUXVpY2tXZWJQYWdlUHJpdmF0ZShRUXVpY2tXZWJQYWdlKiB2aWV3KQogICAg IDogcSh2aWV3KQogICAgICwgcGFnZVByb3h5KDApCi0gICAgLCBuYXZpZ2F0aW9uQ29udHJvbGxl cigwKQogICAgICwgc2dVcGRhdGVRdWV1ZSh2aWV3KQogICAgICwgcGFpbnRpbmdJc0luaXRpYWxp emVkKGZhbHNlKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJwYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnBhZ2UuaAppbmRleCA0ZmYxYzA2ZDFhNWI3ZTk3N2M2MjU0MWVmZjRkODQyOWM2MjdjOGRm Li4zOGI5Y2Q0NDQyODM3OWUyM2RiZWVjZDQ0ODI1MGI0MDViOTJlNWZlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuaApAQCAtMjgsNyArMjgs NiBAQAogCiBjbGFzcyBRUXVpY2tXZWJWaWV3OwogY2xhc3MgUVF1aWNrV2ViUGFnZVByaXZhdGU7 Ci1jbGFzcyBRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXI7CiBjbGFzcyBRV2ViUHJlZmVyZW5jZXM7 CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2VicGFnZV9wLmgKaW5kZXggMmFiNzE5OGY3ZTE0NjExNDcxZGVmMGM1YTY4 MjQ2OThiMTc1MGQxMi4uMThkODE4ZDRiNDU3NDQ2ZDg2NTRkOTA4MmE3MTk1NzgyZWVlMjZjZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdl X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2Vf cC5oCkBAIC0yMyw4ICsyMyw4IEBACiAKICNpbmNsdWRlICJRdFNHVXBkYXRlUXVldWUuaCIKICNp bmNsdWRlICJRdFZpZXdJbnRlcmZhY2UuaCIKKyNpbmNsdWRlICJRdFdlYlBhZ2VQcm94eS5oIgog I2luY2x1ZGUgInFxdWlja3dlYnBhZ2UuaCIKLSNpbmNsdWRlICJxd2VibmF2aWdhdGlvbmNvbnRy b2xsZXIuaCIKIAogUVRfQkVHSU5fTkFNRVNQQUNFCiBjbGFzcyBRUmVjdEY7CkBAIC00OCw3ICs0 OCw2IEBAIHB1YmxpYzoKIAogICAgIFFRdWlja1dlYlBhZ2UqIGNvbnN0IHE7CiAgICAgUXRXZWJQ YWdlUHJveHkqIHBhZ2VQcm94eTsKLSAgICBRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXIqIG5hdmln YXRpb25Db250cm9sbGVyOwogICAgIFdlYktpdDo6UXRTR1VwZGF0ZVF1ZXVlIHNnVXBkYXRlUXVl dWU7CiAgICAgYm9vbCBwYWludGluZ0lzSW5pdGlhbGl6ZWQ7CiB9OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggZWMyOTdmMTQz MjA1M2FhNmFiYTgyOGYwYzJlMjIwMjU1NTM4Y2ZmNy4uYjBhODVjMTQ5NDYyOWI1OWZjYzEzMDdm YWYyNmEwYzA1YmU2NmZkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0yOSw3ICsyOSw2IEBACiAKICNpbmNsdWRlICJxcXVp Y2t3ZWJwYWdlX3AuaCIKICNpbmNsdWRlICJxcXVpY2t3ZWJ2aWV3X3AuaCIKLSNpbmNsdWRlICJx d2VibmF2aWdhdGlvbmNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJxd2VicHJlZmVyZW5jZXNfcC5o IgogCiAjaW5jbHVkZSA8UXREZWNsYXJhdGl2ZS9RUXVpY2tDYW52YXM+CkBAIC03OCw2ICs3Nyw4 IEBAIHZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemUoUVF1aWNrV2ViVmlldyog dmlld3BvcnQsIFdLQ29udGV4dFJlZiBjb250CiAKICAgICBRV2ViUHJlZmVyZW5jZXNQcml2YXRl OjpnZXQocGFnZVByb3h5LT5wcmVmZXJlbmNlcygpKS0+c2V0QXR0cmlidXRlKFFXZWJQcmVmZXJl bmNlc1ByaXZhdGU6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkLCB0cnVlKTsKICAgICBw YWdlUHJveHktPmluaXQoKTsKKworICAgIFFPYmplY3Q6OmNvbm5lY3QocGFnZVByb3h5LmRhdGEo KSwgU0lHTkFMKHVwZGF0ZU5hdmlnYXRpb25TdGF0ZSgpKSwgcV9wdHIsIFNJR05BTChuYXZpZ2F0 aW9uU3RhdGVDaGFuZ2VkKCkpKTsKIH0KIAogdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5p dGlhbGl6ZURlc2t0b3AoUVF1aWNrV2ViVmlldyogdmlld3BvcnQpCkBAIC0zOTYsNiArMzk3LDMw IEBAIHZvaWQgUVF1aWNrV2ViVmlldzo6cG9zdE1lc3NhZ2UoY29uc3QgUVN0cmluZyYgbWVzc2Fn ZSkKICAgICBkLT5wYWdlUHJveHktPnBvc3RNZXNzYWdlVG9OYXZpZ2F0b3JRdE9iamVjdChtZXNz YWdlKTsKIH0KIAordm9pZCBRUXVpY2tXZWJWaWV3Ojpnb0JhY2soKQoreworICAgIFFfRChRUXVp Y2tXZWJWaWV3KTsKKyAgICBkLT5wYWdlUHJveHktPmdvQmFjaygpOworfQorCit2b2lkIFFRdWlj a1dlYlZpZXc6OmdvRm9yd2FyZCgpCit7CisgICAgUV9EKFFRdWlja1dlYlZpZXcpOworICAgIGQt PnBhZ2VQcm94eS0+Z29Gb3J3YXJkKCk7Cit9CisKK3ZvaWQgUVF1aWNrV2ViVmlldzo6c3RvcCgp Cit7CisgICAgUV9EKFFRdWlja1dlYlZpZXcpOworICAgIGQtPnBhZ2VQcm94eS0+c3RvcCgpOwor fQorCit2b2lkIFFRdWlja1dlYlZpZXc6OnJlbG9hZCgpCit7CisgICAgUV9EKFFRdWlja1dlYlZp ZXcpOworICAgIGQtPnBhZ2VQcm94eS0+cmVsb2FkKCk7Cit9CisKIFFVcmwgUVF1aWNrV2ViVmll dzo6dXJsKCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7CkBAIC00MDgs MTggKzQzMywzNCBAQCBpbnQgUVF1aWNrV2ViVmlldzo6bG9hZFByb2dyZXNzKCkgY29uc3QKICAg ICByZXR1cm4gZC0+cGFnZVByb3h5LT5sb2FkUHJvZ3Jlc3MoKTsKIH0KIAotUVN0cmluZyBRUXVp Y2tXZWJWaWV3Ojp0aXRsZSgpIGNvbnN0Citib29sIFFRdWlja1dlYlZpZXc6OmNhbkdvQmFjaygp IGNvbnN0CiB7CiAgICAgUV9EKGNvbnN0IFFRdWlja1dlYlZpZXcpOwotICAgIHJldHVybiBkLT5w YWdlUHJveHktPnRpdGxlKCk7CisgICAgcmV0dXJuIGQtPnBhZ2VQcm94eS0+Y2FuR29CYWNrKCk7 Cit9CisKK2Jvb2wgUVF1aWNrV2ViVmlldzo6Y2FuR29Gb3J3YXJkKCkgY29uc3QKK3sKKyAgICBR X0QoY29uc3QgUVF1aWNrV2ViVmlldyk7CisgICAgcmV0dXJuIGQtPnBhZ2VQcm94eS0+Y2FuR29G b3J3YXJkKCk7Cit9CisKK2Jvb2wgUVF1aWNrV2ViVmlldzo6Y2FuU3RvcCgpIGNvbnN0Cit7Cisg ICAgUV9EKGNvbnN0IFFRdWlja1dlYlZpZXcpOworICAgIHJldHVybiBkLT5wYWdlUHJveHktPmNh blN0b3AoKTsKK30KKworYm9vbCBRUXVpY2tXZWJWaWV3OjpjYW5SZWxvYWQoKSBjb25zdAorewor ICAgIFFfRChjb25zdCBRUXVpY2tXZWJWaWV3KTsKKyAgICByZXR1cm4gZC0+cGFnZVByb3h5LT5j YW5SZWxvYWQoKTsKIH0KIAotUVdlYk5hdmlnYXRpb25Db250cm9sbGVyKiBRUXVpY2tXZWJWaWV3 OjpuYXZpZ2F0aW9uQ29udHJvbGxlcigpIGNvbnN0CitRU3RyaW5nIFFRdWlja1dlYlZpZXc6OnRp dGxlKCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7Ci0gICAgaWYgKCFk LT5uYXZpZ2F0aW9uQ29udHJvbGxlcikKLSAgICAgICAgY29uc3RfY2FzdDxRUXVpY2tXZWJWaWV3 UHJpdmF0ZSo+KGQpLT5uYXZpZ2F0aW9uQ29udHJvbGxlciA9IG5ldyBRV2ViTmF2aWdhdGlvbkNv bnRyb2xsZXIoZC0+cGFnZVByb3h5LmRhdGEoKSk7Ci0gICAgcmV0dXJuIGQtPm5hdmlnYXRpb25D b250cm9sbGVyOworICAgIHJldHVybiBkLT5wYWdlUHJveHktPnRpdGxlKCk7CiB9CiAKIFFXZWJQ cmVmZXJlbmNlcyogUVF1aWNrV2ViVmlldzo6cHJlZmVyZW5jZXMoKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuaAppbmRleCAzZTQ0ODI3 MzEyZWFjM2I3MTU3OGRhZDkzOGEyOWQ1ZWMzZWIxZDhjLi5mOGJhODE3YTFmMzc1MTk0MzU0OWEz Y2UwMDhmMTI4NTY4OTM2MDczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXcuaApAQCAtMjcsNyArMjcsNiBAQAogY2xhc3MgUVF1aWNrV2ViUGFn ZTsKIGNsYXNzIFFRdWlja1dlYlZpZXdQcml2YXRlOwogY2xhc3MgUVdlYkRvd25sb2FkSXRlbTsK LWNsYXNzIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlcjsKIGNsYXNzIFFXZWJQcmVmZXJlbmNlczsK IAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC01Miw3ICs1MSwxMCBAQCBjbGFzcyBRV0VCS0lUX0VY UE9SVCBRUXVpY2tXZWJWaWV3IDogcHVibGljIFFRdWlja0l0ZW0gewogICAgIFFfUFJPUEVSVFko UVN0cmluZyB0aXRsZSBSRUFEIHRpdGxlIE5PVElGWSB0aXRsZUNoYW5nZWQpCiAgICAgUV9QUk9Q RVJUWShRVXJsIHVybCBSRUFEIHVybCBOT1RJRlkgdXJsQ2hhbmdlZCkKICAgICBRX1BST1BFUlRZ KGludCBsb2FkUHJvZ3Jlc3MgUkVBRCBsb2FkUHJvZ3Jlc3MgTk9USUZZIGxvYWRQcm9ncmVzc0No YW5nZWQpCi0gICAgUV9QUk9QRVJUWShRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXIqIG5hdmlnYXRp b24gUkVBRCBuYXZpZ2F0aW9uQ29udHJvbGxlciBDT05TVEFOVCBGSU5BTCkKKyAgICBRX1BST1BF UlRZKGJvb2wgY2FuR29CYWNrIFJFQUQgY2FuR29CYWNrIE5PVElGWSBuYXZpZ2F0aW9uU3RhdGVD aGFuZ2VkIEZJTkFMKQorICAgIFFfUFJPUEVSVFkoYm9vbCBjYW5Hb0ZvcndhcmQgUkVBRCBjYW5H b0ZvcndhcmQgTk9USUZZIG5hdmlnYXRpb25TdGF0ZUNoYW5nZWQgRklOQUwpCisgICAgUV9QUk9Q RVJUWShib29sIGNhblN0b3AgUkVBRCBjYW5TdG9wIE5PVElGWSBuYXZpZ2F0aW9uU3RhdGVDaGFu Z2VkIEZJTkFMKQorICAgIFFfUFJPUEVSVFkoYm9vbCBjYW5SZWxvYWQgUkVBRCBjYW5SZWxvYWQg Tk9USUZZIG5hdmlnYXRpb25TdGF0ZUNoYW5nZWQgRklOQUwpCiAgICAgUV9QUk9QRVJUWShRV2Vi UHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzIFJFQUQgcHJlZmVyZW5jZXMgQ09OU1RBTlQgRklOQUwp CiAgICAgUV9QUk9QRVJUWShRUXVpY2tXZWJQYWdlKiBwYWdlIFJFQUQgcGFnZSBDT05TVEFOVCBG SU5BTCkKICAgICBRX0VOVU1TKE5hdmlnYXRpb25Qb2xpY3kpCkBAIC03NywxMyArNzksMjIgQEAg cHVibGljOgogICAgIFFTdHJpbmcgdGl0bGUoKSBjb25zdDsKICAgICBpbnQgbG9hZFByb2dyZXNz KCkgY29uc3Q7CiAKLSAgICBRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXIqIG5hdmlnYXRpb25Db250 cm9sbGVyKCkgY29uc3Q7CisgICAgYm9vbCBjYW5Hb0JhY2soKSBjb25zdDsKKyAgICBib29sIGNh bkdvRm9yd2FyZCgpIGNvbnN0OworICAgIGJvb2wgY2FuU3RvcCgpIGNvbnN0OworICAgIGJvb2wg Y2FuUmVsb2FkKCkgY29uc3Q7CisKICAgICBRV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKCkg Y29uc3Q7CiAgICAgUVF1aWNrV2ViUGFnZSogcGFnZSgpOwogCiBwdWJsaWMgUV9TTE9UUzoKLSAg ICAgdm9pZCBsb2FkKGNvbnN0IFFVcmwmKTsKLSAgICAgdm9pZCBwb3N0TWVzc2FnZShjb25zdCBR U3RyaW5nJik7CisgICAgdm9pZCBsb2FkKGNvbnN0IFFVcmwmKTsKKyAgICB2b2lkIHBvc3RNZXNz YWdlKGNvbnN0IFFTdHJpbmcmKTsKKworICAgIHZvaWQgZ29CYWNrKCk7CisgICAgdm9pZCBnb0Zv cndhcmQoKTsKKyAgICB2b2lkIHN0b3AoKTsKKyAgICB2b2lkIHJlbG9hZCgpOwogCiBRX1NJR05B TFM6CiAgICAgdm9pZCB0aXRsZUNoYW5nZWQoY29uc3QgUVN0cmluZyYgdGl0bGUpOwpAQCAtOTcs NiArMTA4LDcgQEAgUV9TSUdOQUxTOgogICAgIHZvaWQgZG93bmxvYWRSZXF1ZXN0ZWQoUVdlYkRv d25sb2FkSXRlbSogZG93bmxvYWRJdGVtKTsKICAgICB2b2lkIGxpbmtIb3ZlcmVkKGNvbnN0IFFV cmwmIHVybCwgY29uc3QgUVN0cmluZyYgdGl0bGUpOwogICAgIHZvaWQgdmlld01vZGVDaGFuZ2Vk KCk7CisgICAgdm9pZCBuYXZpZ2F0aW9uU3RhdGVDaGFuZ2VkKCk7CiAKIHByb3RlY3RlZDoKICAg ICB2aXJ0dWFsIHZvaWQgZ2VvbWV0cnlDaGFuZ2VkKGNvbnN0IFFSZWN0RiYsIGNvbnN0IFFSZWN0 RiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2 aWdhdGlvbmNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbmNvbnRyb2xsZXIuY3BwCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCA0YjBiODcxYmFmOGM0ZmMzNWE1YjY3OTgwNDQxNDdjZDFjNmJjYzA5Li4wMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdlYm5hdmlnYXRpb25jb250cm9sbGVyLmNwcAorKysgL2Rldi9udWxsCkBAIC0x LDg4ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEgTm9raWEgQ29ycG9yYXRpb24g YW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCi0gKgotICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUg c29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgotICogbW9kaWZ5IGl0IHVu ZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKLSAqIExpY2Vu c2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgot ICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRl ciB2ZXJzaW9uLgotICoKLSAqIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9w ZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAotICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3 aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKLSAqIE1FUkNIQU5UQUJJTElUWSBv ciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCi0gKiBMaWJy YXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KLSAqCi0gKiBZb3Ug c2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlCi0gKiBhbG9uZyB3aXRoIHRoaXMgcHJvZ3JhbTsgc2VlIHRoZSBmaWxlIENP UFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bwotICogdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKLSAqIEJvc3Rvbiwg TUEgMDIxMTAtMTMwMSwgVVNBLgotICoKLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0KLSNp bmNsdWRlICJxd2VibmF2aWdhdGlvbmNvbnRyb2xsZXIuaCIKLQotI2luY2x1ZGUgIlF0V2ViUGFn ZVByb3h5LmgiCi0KLWNsYXNzIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlclByaXZhdGUgewotcHVi bGljOgotICAgIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlclByaXZhdGUoUXRXZWJQYWdlUHJveHkq IHBhZ2VQcm94eSkKLSAgICAgICAgOiBwYWdlUHJveHkocGFnZVByb3h5KQotICAgIHsKLSAgICAg ICAgQVNTRVJUKHBhZ2VQcm94eSk7Ci0gICAgfQotCi0gICAgUXRXZWJQYWdlUHJveHkqIHBhZ2VQ cm94eTsKLX07Ci0KLVFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlcjo6UVdlYk5hdmlnYXRpb25Db250 cm9sbGVyKFF0V2ViUGFnZVByb3h5KiBwYWdlUHJveHkpCi0gICAgOiBRT2JqZWN0KHBhZ2VQcm94 eSkKLSAgICAsIGQobmV3IFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlclByaXZhdGUocGFnZVByb3h5 KSkKLXsKLSAgICBjb25uZWN0KHBhZ2VQcm94eSwgU0lHTkFMKHVwZGF0ZU5hdmlnYXRpb25TdGF0 ZSgpKSwgdGhpcywgU0lHTkFMKG5hdmlnYXRpb25TdGF0ZUNoYW5nZWQoKSkpOwotfQotCi1RV2Vi TmF2aWdhdGlvbkNvbnRyb2xsZXI6On5RV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXIoKQotewotICAg IGRlbGV0ZSBkOwotfQotCi1ib29sIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlcjo6Y2FuR29CYWNr KCkgY29uc3QKLXsKLSAgICByZXR1cm4gZC0+cGFnZVByb3h5LT5jYW5Hb0JhY2soKTsKLX0KLQot Ym9vbCBRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXI6OmNhbkdvRm9yd2FyZCgpIGNvbnN0Ci17Ci0g ICAgcmV0dXJuIGQtPnBhZ2VQcm94eS0+Y2FuR29Gb3J3YXJkKCk7Ci19Ci0KLWJvb2wgUVdlYk5h dmlnYXRpb25Db250cm9sbGVyOjpjYW5TdG9wKCkgY29uc3QKLXsKLSAgICByZXR1cm4gZC0+cGFn ZVByb3h5LT5jYW5TdG9wKCk7Ci19Ci0KLWJvb2wgUVdlYk5hdmlnYXRpb25Db250cm9sbGVyOjpj YW5SZWxvYWQoKSBjb25zdAotewotICAgIHJldHVybiBkLT5wYWdlUHJveHktPmNhblJlbG9hZCgp OwotfQotCi12b2lkIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlcjo6Z29CYWNrKCkKLXsKLSAgICBk LT5wYWdlUHJveHktPmdvQmFjaygpOwotfQotCi12b2lkIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxl cjo6Z29Gb3J3YXJkKCkKLXsKLSAgICBkLT5wYWdlUHJveHktPmdvRm9yd2FyZCgpOwotfQotCi12 b2lkIFFXZWJOYXZpZ2F0aW9uQ29udHJvbGxlcjo6c3RvcCgpCi17Ci0gICAgZC0+cGFnZVByb3h5 LT5zdG9wKCk7Ci19Ci0KLXZvaWQgUVdlYk5hdmlnYXRpb25Db250cm9sbGVyOjpyZWxvYWQoKQot ewotICAgIGQtPnBhZ2VQcm94eS0+cmVsb2FkKCk7Ci19CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9uY29udHJvbGxlci5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmNvbnRyb2xsZXIuaApkZWxl dGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggYzA5N2QyZWM0ODJiZGM5NzhkNThkNjZlMDliZjI0 MGJmMDdjYTE0Yi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9uY29udHJvbGxl ci5oCisrKyAvZGV2L251bGwKQEAgLTEsNjMgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykg MjAxMSBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKLSAqCi0g KiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg YW5kL29yCi0gKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBH ZW5lcmFsIFB1YmxpYwotICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdh cmUgRm91bmRhdGlvbjsgZWl0aGVyCi0gKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChh dCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCi0gKgotICogVGhpcyBwcm9ncmFtIGlz IGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCi0gKiBidXQg V0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBv ZgotICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NF LiAgU2VlIHRoZSBHTlUKLSAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9y ZSBkZXRhaWxzLgotICoKLSAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhl IEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKLSAqIGFsb25nIHdpdGggdGhpcyBw cm9ncmFtOyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCi0gKiB0 aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZp ZnRoIEZsb29yLAotICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCi0gKgotICovCi0KLSNp Zm5kZWYgcXdlYm5hdmlnYXRpb25jb250cm9sbGVyX2gKLSNkZWZpbmUgcXdlYm5hdmlnYXRpb25j b250cm9sbGVyX2gKLQotCi0jaW5jbHVkZSAicXdlYmtpdGdsb2JhbC5oIgotI2luY2x1ZGUgPFF0 Q29yZS9RT2JqZWN0PgotCi1RVF9CRUdJTl9OQU1FU1BBQ0UKLWNsYXNzIFFBY3Rpb247Ci1RVF9F TkRfTkFNRVNQQUNFCi0KLWNsYXNzIFF0V2ViUGFnZVByb3h5OwotY2xhc3MgUVdlYk5hdmlnYXRp b25Db250cm9sbGVyUHJpdmF0ZTsKLQotY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdlYk5hdmlnYXRp b25Db250cm9sbGVyIDogcHVibGljIFFPYmplY3QgewotICAgIFFfT0JKRUNUCi0gICAgUV9QUk9Q RVJUWShib29sIGNhbkdvQmFjayBSRUFEIGNhbkdvQmFjayBOT1RJRlkgbmF2aWdhdGlvblN0YXRl Q2hhbmdlZCBGSU5BTCkKLSAgICBRX1BST1BFUlRZKGJvb2wgY2FuR29Gb3J3YXJkIFJFQUQgY2Fu R29Gb3J3YXJkIE5PVElGWSBuYXZpZ2F0aW9uU3RhdGVDaGFuZ2VkIEZJTkFMKQotICAgIFFfUFJP UEVSVFkoYm9vbCBjYW5TdG9wIFJFQUQgY2FuU3RvcCBOT1RJRlkgbmF2aWdhdGlvblN0YXRlQ2hh bmdlZCBGSU5BTCkKLSAgICBRX1BST1BFUlRZKGJvb2wgY2FuUmVsb2FkIFJFQUQgY2FuUmVsb2Fk IE5PVElGWSBuYXZpZ2F0aW9uU3RhdGVDaGFuZ2VkIEZJTkFMKQotcHVibGljOgotICAgIFFXZWJO YXZpZ2F0aW9uQ29udHJvbGxlcihRdFdlYlBhZ2VQcm94eSopOwotICAgIH5RV2ViTmF2aWdhdGlv bkNvbnRyb2xsZXIoKTsKLQotICAgIGJvb2wgY2FuR29CYWNrKCkgY29uc3Q7Ci0gICAgYm9vbCBj YW5Hb0ZvcndhcmQoKSBjb25zdDsKLSAgICBib29sIGNhblN0b3AoKSBjb25zdDsKLSAgICBib29s IGNhblJlbG9hZCgpIGNvbnN0OwotCi1wdWJsaWMgc2xvdHM6Ci0gICAgdm9pZCBnb0JhY2soKTsK LSAgICB2b2lkIGdvRm9yd2FyZCgpOwotICAgIHZvaWQgc3RvcCgpOwotICAgIHZvaWQgcmVsb2Fk KCk7Ci0KLVFfU0lHTkFMUzoKLSAgICB2b2lkIG5hdmlnYXRpb25TdGF0ZUNoYW5nZWQoKTsKLQot cHJpdmF0ZToKLSAgICBRV2ViTmF2aWdhdGlvbkNvbnRyb2xsZXJQcml2YXRlKiBkOwotfTsKLQot I2VuZGlmIC8vIHF3ZWJuYXZpZ2F0aW9uY29udHJvbGxlcl9oCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FxdWlja3dlYnZpZXcvdHN0X3FxdWlja3dl YnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xcXVpY2t3 ZWJ2aWV3L3RzdF9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCAyYTM5MTUxYjQwNzg0MGJiNGJlNTBi MTJjZGNhY2ZkZTAzODI4ZDQ0Li5lYjQ5ZjJlNGMwYTY2OWIyMTI4ZTRiMjU2NjBlYmY5OTlmMmUy OTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3Fx dWlja3dlYnZpZXcvdHN0X3FxdWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvdGVzdHMvcXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHAK QEAgLTI0LDcgKzI0LDYgQEAKICNpbmNsdWRlIDxRdFRlc3QvUXRUZXN0PgogI2luY2x1ZGUgPHFx dWlja3dlYnBhZ2UuaD4KICNpbmNsdWRlIDxxcXVpY2t3ZWJ2aWV3Lmg+Ci0jaW5jbHVkZSA8cXdl Ym5hdmlnYXRpb25jb250cm9sbGVyLmg+CiAKIGNsYXNzIHRzdF9RUXVpY2tXZWJWaWV3IDogcHVi bGljIFFPYmplY3QgewogICAgIFFfT0JKRUNUCkBAIC04NywxMyArODYsMTMgQEAgdm9pZCB0c3Rf UVF1aWNrV2ViVmlldzo6YWNjZXNzUGFnZSgpCiAKIHZvaWQgdHN0X1FRdWlja1dlYlZpZXc6Om5h dmlnYXRpb25TdGF0dXNBdFN0YXJ0dXAoKQogewotICAgIFFDT01QQVJFKHdlYlZpZXcoKS0+bmF2 aWdhdGlvbkNvbnRyb2xsZXIoKS0+Y2FuR29CYWNrKCksIGZhbHNlKTsKKyAgICBRQ09NUEFSRSh3 ZWJWaWV3KCktPmNhbkdvQmFjaygpLCBmYWxzZSk7CiAKLSAgICBRQ09NUEFSRSh3ZWJWaWV3KCkt Pm5hdmlnYXRpb25Db250cm9sbGVyKCktPmNhbkdvRm9yd2FyZCgpLCBmYWxzZSk7CisgICAgUUNP TVBBUkUod2ViVmlldygpLT5jYW5Hb0ZvcndhcmQoKSwgZmFsc2UpOwogCi0gICAgUUNPTVBBUkUo d2ViVmlldygpLT5uYXZpZ2F0aW9uQ29udHJvbGxlcigpLT5jYW5TdG9wKCksIGZhbHNlKTsKKyAg ICBRQ09NUEFSRSh3ZWJWaWV3KCktPmNhblN0b3AoKSwgZmFsc2UpOwogCi0gICAgUUNPTVBBUkUo d2ViVmlldygpLT5uYXZpZ2F0aW9uQ29udHJvbGxlcigpLT5jYW5SZWxvYWQoKSwgZmFsc2UpOwor ICAgIFFDT01QQVJFKHdlYlZpZXcoKS0+Y2FuUmVsb2FkKCksIGZhbHNlKTsKIH0KIAogY2xhc3Mg TG9hZFN0YXJ0ZWRDYXRjaGVyIDogcHVibGljIFFPYmplY3QgewpAQCAtMTEwLDcgKzEwOSw3IEBA IHB1YmxpYyBzbG90czoKICAgICB7CiAgICAgICAgIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2Qo dGhpcywgImZpbmlzaGVkIiwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24pOwogCi0gICAgICAgIFFDT01Q QVJFKG1fd2ViVmlldy0+bmF2aWdhdGlvbkNvbnRyb2xsZXIoKS0+Y2FuU3RvcCgpLCB0cnVlKTsK KyAgICAgICAgUUNPTVBBUkUobV93ZWJWaWV3LT5jYW5TdG9wKCksIHRydWUpOwogICAgIH0KIAog c2lnbmFsczoKQEAgLTEyMiwxMyArMTIxLDEzIEBAIHByaXZhdGU6CiAKIHZvaWQgdHN0X1FRdWlj a1dlYlZpZXc6OnN0b3BFbmFibGVkQWZ0ZXJMb2FkU3RhcnRlZCgpCiB7Ci0gICAgUUNPTVBBUkUo d2ViVmlldygpLT5uYXZpZ2F0aW9uQ29udHJvbGxlcigpLT5jYW5TdG9wKCksIGZhbHNlKTsKKyAg ICBRQ09NUEFSRSh3ZWJWaWV3KCktPmNhblN0b3AoKSwgZmFsc2UpOwogCiAgICAgTG9hZFN0YXJ0 ZWRDYXRjaGVyIGNhdGNoZXIod2ViVmlldygpKTsKICAgICB3ZWJWaWV3KCktPmxvYWQoUVVybDo6 ZnJvbUxvY2FsRmlsZShRTGF0aW4xU3RyaW5nKFRFU1RTX1NPVVJDRV9ESVIgIi9odG1sL2Jhc2lj X3BhZ2UuaHRtbCIpKSk7CiAgICAgd2FpdEZvclNpZ25hbCgmY2F0Y2hlciwgU0lHTkFMKGZpbmlz aGVkKCkpKTsKIAotICAgIFFDT01QQVJFKHdlYlZpZXcoKS0+bmF2aWdhdGlvbkNvbnRyb2xsZXIo KS0+Y2FuU3RvcCgpLCB0cnVlKTsKKyAgICBRQ09NUEFSRSh3ZWJWaWV3KCktPmNhblN0b3AoKSwg dHJ1ZSk7CiAKICAgICB3YWl0Rm9yU2lnbmFsKHdlYlZpZXcoKSwgU0lHTkFMKGxvYWRTdWNjZWVk ZWQoKSkpOwogfQpAQCAtMTgzLDEyICsxODIsMTIgQEAgdm9pZCB0c3RfUVF1aWNrV2ViVmlldzo6 YmFja0FuZEZvcndhcmQoKQogCiAgICAgUUNPTVBBUkUod2ViVmlldygpLT51cmwoKS5wYXRoKCks IFFMYXRpbjFTdHJpbmcoVEVTVFNfU09VUkNFX0RJUiAiL2h0bWwvYmFzaWNfcGFnZTIuaHRtbCIp KTsKIAotICAgIHdlYlZpZXcoKS0+bmF2aWdhdGlvbkNvbnRyb2xsZXIoKS0+Z29CYWNrKCk7Cisg ICAgd2ViVmlldygpLT5nb0JhY2soKTsKICAgICBRVkVSSUZZKHdhaXRGb3JTaWduYWwod2ViVmll dygpLCBTSUdOQUwobG9hZFN1Y2NlZWRlZCgpKSkpOwogCiAgICAgUUNPTVBBUkUod2ViVmlldygp LT51cmwoKS5wYXRoKCksIFFMYXRpbjFTdHJpbmcoVEVTVFNfU09VUkNFX0RJUiAiL2h0bWwvYmFz aWNfcGFnZS5odG1sIikpOwogCi0gICAgd2ViVmlldygpLT5uYXZpZ2F0aW9uQ29udHJvbGxlcigp LT5nb0ZvcndhcmQoKTsKKyAgICB3ZWJWaWV3KCktPmdvRm9yd2FyZCgpOwogICAgIFFWRVJJRlko d2FpdEZvclNpZ25hbCh3ZWJWaWV3KCksIFNJR05BTChsb2FkU3VjY2VlZGVkKCkpKSk7CiAKICAg ICBRQ09NUEFSRSh3ZWJWaWV3KCktPnVybCgpLnBhdGgoKSwgUUxhdGluMVN0cmluZyhURVNUU19T T1VSQ0VfRElSICIvaHRtbC9iYXNpY19wYWdlMi5odG1sIikpOwpAQCAtMjAxLDcgKzIwMCw3IEBA IHZvaWQgdHN0X1FRdWlja1dlYlZpZXc6OnJlbG9hZCgpCiAKICAgICBRQ09NUEFSRSh3ZWJWaWV3 KCktPnVybCgpLnBhdGgoKSwgUUxhdGluMVN0cmluZyhURVNUU19TT1VSQ0VfRElSICIvaHRtbC9i YXNpY19wYWdlLmh0bWwiKSk7CiAKLSAgICB3ZWJWaWV3KCktPm5hdmlnYXRpb25Db250cm9sbGVy KCktPnJlbG9hZCgpOworICAgIHdlYlZpZXcoKS0+cmVsb2FkKCk7CiAgICAgUVZFUklGWSh3YWl0 Rm9yU2lnbmFsKHdlYlZpZXcoKSwgU0lHTkFMKGxvYWRTdWNjZWVkZWQoKSkpKTsKIAogICAgIFFD T01QQVJFKHdlYlZpZXcoKS0+dXJsKCkucGF0aCgpLCBRTGF0aW4xU3RyaW5nKFRFU1RTX1NPVVJD RV9ESVIgIi9odG1sL2Jhc2ljX3BhZ2UuaHRtbCIpKTsKQEAgLTIxNSw3ICsyMTQsNyBAQCB2b2lk IHRzdF9RUXVpY2tXZWJWaWV3OjpzdG9wKCkKICAgICBRQ09NUEFSRSh3ZWJWaWV3KCktPnVybCgp LnBhdGgoKSwgUUxhdGluMVN0cmluZyhURVNUU19TT1VSQ0VfRElSICIvaHRtbC9iYXNpY19wYWdl Lmh0bWwiKSk7CiAKICAgICAvLyBGSVhNRTogVGhpcyB0ZXN0IHNob3VsZCBiZSBmbGVzaGVkIG91 dC4gUmlnaHQgbm93IGl0J3MganVzdCBoZXJlIHRvIG1ha2Ugc3VyZSB3ZSBkb24ndCBjcmFzaC4K LSAgICB3ZWJWaWV3KCktPm5hdmlnYXRpb25Db250cm9sbGVyKCktPnN0b3AoKTsKKyAgICB3ZWJW aWV3KCktPnN0b3AoKTsKIH0KIAogdm9pZCB0c3RfUVF1aWNrV2ViVmlldzo6bG9hZFByb2dyZXNz KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAw YTI4MGI0ZTk2N2QzZGQ1Y2E1N2Q1MTdjMDgxZDBmYjc0MDg5MDBjLi5hYWJiMGE4NWQ5NGViMTEx MjA5NTEzZTQ5NTFiZDMyZjVjZWYzZmQ5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTEtMTEtMTEgIFNpbW9uIEhh dXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCisgICAgICAgIFtRdF1bV0syXSBS ZW1vdmUgUVdlYk5hdmlnYXRpb25Db250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjExMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IHRvIHRoZSBtb3ZlIG9mIHRoZSBRV2ViTmF2aWdh dGlvbkNvbnRyb2xsZXIgZnVuY3Rpb25zL3Byb3BlcnRpZXMgdG8KKyAgICAgICAgUVF1aWNrV2Vi Vmlldy4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24u Y3BwOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0L3FtbC9Ccm93c2VyV2luZG93LnFtbDoKKwor MjAxMS0xMS0xMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CisK ICAgICAgICAgW1F0XSBCdWlsZCBzeXN0ZW0gdHdlYWsKIAogICAgICAgICBSZXZpZXdlZCBieSBU b3IgQXJuZSBWZXN0YsO4LgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJy b3dzZXJBcHBsaWNhdGlvbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFw cGxpY2F0aW9uLmNwcAppbmRleCAxYmIyM2IxZTMwNGUyMzY2N2RiNGE0Njk4YjFhMDhhOGZlODI0 Y2RjLi5mYzIwZmY3MDQzOTNkNGU0MTFmOTc2ZDliOTViNmZlNjRkNDBiMGU5IDEwMDY0NAotLS0g YS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcAorKysgYi9U b29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmNwcApAQCAtMjgsNyAr MjgsNiBAQAogCiAjaW5jbHVkZSAiTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5oIgogCi0jaW5jbHVk ZSAicXdlYm5hdmlnYXRpb25jb250cm9sbGVyLmgiCiAjaW5jbHVkZSAidXRpbHMuaCIKICNpbmNs dWRlIDxRUmVnRXhwPgogI2luY2x1ZGUgPFFFdmVudD4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL3F0L3FtbC9Ccm93c2VyV2luZG93LnFtbCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3Ft bC9Ccm93c2VyV2luZG93LnFtbAppbmRleCAzZjMxOTllYWQxZmY5ZWU4MDgzN2Y0NmQ0ODRlMWU4 MDBmYTczNzZhLi41Y2MxNTJhZjQ5N2M1MWJiM2JmNDQ5YjFkOWVkMDJiYzM4M2QxNGZjIDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWwKKysrIGIv VG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0Jyb3dzZXJXaW5kb3cucW1sCkBAIC0zMiw5ICszMiw2 IEBAIGltcG9ydCBRdFdlYktpdCAzLjAKIFJlY3RhbmdsZSB7CiAgICAgLy8gRG8gbm90IGRlZmlu ZSBhbmNob3JzIG9yIGFuIGluaXRpYWwgc2l6ZSBoZXJlISBUaGlzIHdvdWxkIG1lc3MgdXAgd2l0 aCBRU0dWaWV3OjpTaXplUm9vdE9iamVjdFRvVmlldy4KIAotICAgIHByb3BlcnR5IGJvb2wgY2Fu R29CYWNrOiBmYWxzZQotICAgIHByb3BlcnR5IGJvb2wgY2FuR29Gb3J3YXJkOiBmYWxzZQotICAg IHByb3BlcnR5IGJvb2wgY2FuU3RvcDogZmFsc2UKICAgICBwcm9wZXJ0eSBhbGlhcyB3ZWJ2aWV3 OiB3ZWJWaWV3CiAKICAgICBzaWduYWwgcGFnZVRpdGxlQ2hhbmdlZChzdHJpbmcgdGl0bGUpCkBA IC03NiwxNCArNzMsMTQgQEAgUmVjdGFuZ2xlIHsKICAgICAgICAgICAgICAgICAgICAgYW5jaG9y cy5maWxsOiBwYXJlbnQKICAgICAgICAgICAgICAgICAgICAgY29sb3I6IHJlbG9hZEJ1dHRvbi5j b2xvcgogICAgICAgICAgICAgICAgICAgICBvcGFjaXR5OiAwLjgKLSAgICAgICAgICAgICAgICAg ICAgdmlzaWJsZTogIWNhbkdvQmFjaworICAgICAgICAgICAgICAgICAgICB2aXNpYmxlOiAhd2Vi Vmlldy5jYW5Hb0JhY2sKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBNb3Vz ZUFyZWEgewogICAgICAgICAgICAgICAgICAgICBhbmNob3JzLmZpbGw6IHBhcmVudAogICAgICAg ICAgICAgICAgICAgICBvbkNsaWNrZWQ6IHsKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNv bGUubG9nKCJnb2luZyBiYWNrIikKLSAgICAgICAgICAgICAgICAgICAgICAgIHdlYlZpZXcubmF2 aWdhdGlvbi5nb0JhY2soKQorICAgICAgICAgICAgICAgICAgICAgICAgd2ViVmlldy5nb0JhY2so KQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQpAQCAtMTAyLDE0ICs5OSwxNCBAQCBSZWN0YW5nbGUgewogICAgICAgICAgICAgICAgICAgICBh bmNob3JzLmZpbGw6IHBhcmVudAogICAgICAgICAgICAgICAgICAgICBjb2xvcjogZm9yd2FyZEJ1 dHRvbi5jb2xvcgogICAgICAgICAgICAgICAgICAgICBvcGFjaXR5OiAwLjgKLSAgICAgICAgICAg ICAgICAgICAgdmlzaWJsZTogIWNhbkdvRm9yd2FyZAorICAgICAgICAgICAgICAgICAgICB2aXNp YmxlOiAhd2ViVmlldy5jYW5Hb0ZvcndhcmQKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgICAgICBNb3VzZUFyZWEgewogICAgICAgICAgICAgICAgICAgICBhbmNob3JzLmZpbGw6IHBh cmVudAogICAgICAgICAgICAgICAgICAgICBvbkNsaWNrZWQ6IHsKICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnNvbGUubG9nKCJnb2luZyBmb3J3YXJkIikKLSAgICAgICAgICAgICAgICAgICAg ICAgIHdlYlZpZXcubmF2aWdhdGlvbi5nb0ZvcndhcmQoKQorICAgICAgICAgICAgICAgICAgICAg ICAgd2ViVmlldy5nb0ZvcndhcmQoKQogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgfQpAQCAtMTIxLDE4ICsxMTgsMTggQEAgUmVjdGFuZ2xlIHsK IAogICAgICAgICAgICAgICAgIEltYWdlIHsKICAgICAgICAgICAgICAgICAgICAgYW5jaG9ycy5j ZW50ZXJJbjogcGFyZW50Ci0gICAgICAgICAgICAgICAgICAgIHNvdXJjZTogY2FuU3RvcCA/ICIu Li9pY29ucy9zdG9wLnBuZyIgOiAiLi4vaWNvbnMvcmVmcmVzaC5wbmciCisgICAgICAgICAgICAg ICAgICAgIHNvdXJjZTogd2ViVmlldy5jYW5TdG9wID8gIi4uL2ljb25zL3N0b3AucG5nIiA6ICIu Li9pY29ucy9yZWZyZXNoLnBuZyIKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAg ICBNb3VzZUFyZWEgewogICAgICAgICAgICAgICAgICAgICBhbmNob3JzLmZpbGw6IHBhcmVudAog ICAgICAgICAgICAgICAgICAgICBvbkNsaWNrZWQ6IHsKLSAgICAgICAgICAgICAgICAgICAgICAg IGlmIChjYW5TdG9wKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAod2ViVmlldy5jYW5T dG9wKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coInN0b3AgbG9h ZGluZyIpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgd2ViVmlldy5uYXZpZ2F0aW9uLnN0 b3AoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdlYlZpZXcuc3RvcCgpCiAgICAgICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnNvbGUubG9nKCJyZWxvYWRpbmciKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdlYlZp ZXcubmF2aWdhdGlvbi5yZWxvYWQoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdlYlZp ZXcucmVsb2FkKCkKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIH0KQEAgLTE5OSwxMCArMTk2LDYgQEAgUmVjdGFuZ2xlIHsK ICAgICAgICAgICAgIGJvdHRvbTogcGFyZW50LmJvdHRvbQogICAgICAgICB9CiAKLSAgICAgICAg c2lnbmFsIG5hdmlnYXRpb25TdGF0ZUNoYW5nZWQKLQotICAgICAgICBDb21wb25lbnQub25Db21w bGV0ZWQ6IG5hdmlnYXRpb24ubmF2aWdhdGlvblN0YXRlQ2hhbmdlZC5jb25uZWN0KG5hdmlnYXRp b25TdGF0ZUNoYW5nZWQpOwotCiAgICAgICAgIG9uVGl0bGVDaGFuZ2VkOiBwYWdlVGl0bGVDaGFu Z2VkKHRpdGxlKQogICAgICAgICBvblVybENoYW5nZWQ6IHsKICAgICAgICAgICAgIGFkZHJlc3NM aW5lLnRleHQgPSB1cmwKQEAgLTIxMCwxMSArMjAzLDYgQEAgUmVjdGFuZ2xlIHsKICAgICAgICAg ICAgICAgICBjb25zb2xlLmxvZygiTG9hZGVkOiIsIHdlYlZpZXcudXJsKTsKICAgICAgICAgICAg IGZvcmNlQWN0aXZlRm9jdXMoKTsKICAgICAgICAgfQotICAgICAgICBvbk5hdmlnYXRpb25TdGF0 ZUNoYW5nZWQ6IHsKLSAgICAgICAgICAgIGNhbkdvQmFjayA9IG5hdmlnYXRpb24uY2FuR29CYWNr Ci0gICAgICAgICAgICBjYW5Hb0ZvcndhcmQgPSBuYXZpZ2F0aW9uLmNhbkdvRm9yd2FyZAotICAg ICAgICAgICAgY2FuU3RvcCA9IG5hdmlnYXRpb24uY2FuU3RvcAotICAgICAgICB9CiAgICAgfQog CiAgICAgS2V5cy5vblByZXNzZWQ6IHsK