128569 2014-02-10 17:58:35 -0800 Remove a couple of deprecatedCharacters() from WebKit2 2014-12-03 07:53:13 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128580 128603 1 andersca andersca benjamin commit-queue g.czajkowski ossy oldest_to_newest 979171 0 andersca 2014-02-10 17:58:35 -0800 Remove a couple of deprecatedCharacters() from WebKit2 979172 1 223780 andersca 2014-02-10 17:59:07 -0800 Created attachment 223780 Patch 979176 2 andersca 2014-02-10 18:07:40 -0800 Committed r163848: <http://trac.webkit.org/changeset/163848> 979240 3 benjamin 2014-02-10 21:00:18 -0800 Looks like you broke the iOS build again :( 979245 4 benjamin 2014-02-10 21:05:11 -0800 Fixed in http://trac.webkit.org/changeset/163856 979267 5 commit-queue 2014-02-10 22:09:18 -0800 Re-opened since this is blocked by bug 128580 979269 6 ap 2014-02-10 22:09:55 -0800 This change caused a lot of crashes on tests, http://build.webkit.org/results/Apple%20Mavericks%20Release%20WK2%20(Tests)/r163858%20(3106)/results.html In debug builds, it asserts like this: Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x0000000109d1071a WTFCrash + 42 (Assertions.cpp:333) 1 com.apple.JavaScriptCore 0x0000000109d68ddd WTF::String::fromUTF8(unsigned char const*, unsigned long) + 61 (WTFString.cpp:835) 2 com.apple.JavaScriptCore 0x0000000109d6911f WTF::String::fromUTF8WithLatin1Fallback(unsigned char const*, unsigned long) + 47 (WTFString.cpp:871) 3 WebKitTestRunnerInjectedBundle 0x000000011385c274 WTF::String::fromUTF8WithLatin1Fallback(char const*, unsigned long) + 36 (WTFString.h:429) 4 WebKitTestRunnerInjectedBundle 0x000000011385c088 WTR::toWTFString(OpaqueWKString const*) + 216 (StringFunctions.h:91) 5 WebKitTestRunnerInjectedBundle 0x000000011385940f WTR::toWTFString(WebKit::WKRetainPtr<OpaqueWKString const*> const&) + 47 (StringFunctions.h:96) 6 WebKitTestRunnerInjectedBundle 0x000000011387e185 WTR::dumpFrameText(OpaqueWKBundleFrame const*, WTF::StringBuilder&) + 85 (InjectedBundlePage.cpp:781) 7 WebKitTestRunnerInjectedBundle 0x000000011387e6e9 WTR::InjectedBundlePage::dump() + 713 (InjectedBundlePage.cpp:853) 8 WebKitTestRunnerInjectedBundle 0x000000011387de27 WTR::InjectedBundlePage::frameDidChangeLocation(OpaqueWKBundleFrame const*, bool) + 199 (InjectedBundlePage.cpp:1887) 9 WebKitTestRunnerInjectedBundle 0x000000011387c8a6 WTR::InjectedBundlePage::didFinishLoadForFrame(OpaqueWKBundleFrame const*) + 118 (InjectedBundlePage.cpp:894) 10 WebKitTestRunnerInjectedBundle 0x000000011387b648 WTR::InjectedBundlePage::didFinishLoadForFrame(OpaqueWKBundlePage const*, OpaqueWKBundleFrame const*, void const**, void const*) + 40 (InjectedBundlePage.cpp:550) 11 com.apple.WebKit2 0x000000010777f7c6 WebKit::InjectedBundlePageLoaderClient::didFinishLoadForFrame(WebKit::WebPage*, WebKit::WebFrame*, WTF::RefPtr<API::Object>&) + 118 (InjectedBundlePageLoaderClient.cpp:141) 979296 7 benjamin 2014-02-10 23:24:37 -0800 Is someone fixing? Should we revert? The bots are stuck since everything crashes. 979299 8 benjamin 2014-02-10 23:26:49 -0800 (In reply to comment #7) > Is someone fixing? Should we revert? > The bots are stuck since everything crashes. Cool, Alexey took care of it. 979437 9 223780 darin 2014-02-11 08:55:35 -0800 Comment on attachment 223780 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223780&action=review > Source/WebKit2/UIProcess/mac/TextCheckerMac.mm:301 > + auto textString = stringView.createNSStringWithoutCopying(); Why keep the local variable? I would get rid of it. 980187 10 g.czajkowski 2014-02-13 00:30:03 -0800 Feel free to commit EFL bits (bug 128603) after re-land. 1052156 11 ossy 2014-12-03 07:53:13 -0800 There is no deprecatedCharacters in WebKit2 now, maybe bug130197 removed the last bits. 223780 2014-02-10 17:59:07 -0800 2014-02-11 08:55:35 -0800 Patch bug-128569-20140210175906.patch text/plain 8505 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzODI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2NkYTFlMzI3N2FhNWJh Yzg2NmIwNjE5YTgyOTM2ZWE5ZjNlZWJlMS4uOTE3ZmQzOWQ5MTUwNWUxOTQwYWY4NjFmMzRiMjQ5 OTFkYmY2NGMzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAyLTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGEgY291 cGxlIG9mIGRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCkgZnJvbSBXZWJLaXQyCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg1NjkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9BUElTdHJpbmcuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvVGV4dENoZWNrZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjaGVja1Rl eHRPZlBhcmFncmFwaCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2hlY2tTcGVs bGluZ09mU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjaGVja0dyYW1t YXJPZlN0cmluZyk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9UZXh0Q2hlY2tlck1hYy5tbToK KyAgICAgICAgKFdlYktpdDo6VGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKToKKyAg ICAgICAgKFdlYktpdDo6VGV4dENoZWNrZXI6OmNoZWNrU3BlbGxpbmdPZlN0cmluZyk6CisgICAg ICAgIChXZWJLaXQ6OlRleHRDaGVja2VyOjpjaGVja0dyYW1tYXJPZlN0cmluZyk6CisKIDIwMTQt MDItMTAgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbW92ZSBXS1BhZ2VTZXRWaXNpYmlsaXR5U3RhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9BUElTdHJpbmcuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUElTdHJp bmcuaAppbmRleCA3NjdmMTYyNDVkYjlmMGQwYTFjNWJlOTI4NGRmNGViOWE3ZGM5NDlhLi40ZTVl OWJiZDkzZTkyZGM1MzYzNWQ3YzZjZTk0Y2I1MWMyNzJiYzY4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQVBJU3RyaW5nLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQ SVN0cmluZy5oCkBAIC03OCwxNSArNzgsMjMgQEAgcHVibGljOgogICAgIHNpemVfdCBtYXhpbXVt VVRGOENTdHJpbmdTaXplKCkgY29uc3QgeyByZXR1cm4gbV9zdHJpbmcubGVuZ3RoKCkgKiAzICsg MTsgfQogICAgIHNpemVfdCBnZXRVVEY4Q1N0cmluZyhjaGFyKiBidWZmZXIsIHNpemVfdCBidWZm ZXJTaXplKQogICAgIHsKLSAgICAgICAgaWYgKCFidWZmZXJTaXplKQorICAgICAgICBpZiAoIWJ1 ZmZlclNpemUgfHwgbV9zdHJpbmcuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0g ICAgICAgIGNoYXIqIHAgPSBidWZmZXI7Ci0gICAgICAgIGNvbnN0IFVDaGFyKiBkID0gbV9zdHJp bmcuZGVwcmVjYXRlZENoYXJhY3RlcnMoKTsKLSAgICAgICAgV1RGOjpVbmljb2RlOjpDb252ZXJz aW9uUmVzdWx0IHJlc3VsdCA9IFdURjo6VW5pY29kZTo6Y29udmVydFVURjE2VG9VVEY4KCZkLCBk ICsgbV9zdHJpbmcubGVuZ3RoKCksICZwLCBwICsgYnVmZmVyU2l6ZSAtIDEsIC8qIHN0cmljdCAq LyB0cnVlKTsKLSAgICAgICAgKnArKyA9ICdcMCc7CisgICAgICAgIGNoYXIqIGRlc3RpbmF0aW9u ID0gYnVmZmVyOworCisgICAgICAgIFdURjo6VW5pY29kZTo6Q29udmVyc2lvblJlc3VsdCByZXN1 bHQ7CisgICAgICAgIGlmIChtX3N0cmluZy5pczhCaXQoKSkgeworICAgICAgICAgICAgY29uc3Qg TENoYXIqIHNvdXJjZSA9IG1fc3RyaW5nLmNoYXJhY3RlcnM4KCk7CisgICAgICAgICAgICByZXN1 bHQgPSBXVEY6OlVuaWNvZGU6OmNvbnZlcnRMYXRpbjFUb1VURjgoJnNvdXJjZSwgc291cmNlICsg bV9zdHJpbmcubGVuZ3RoKCksICZkZXN0aW5hdGlvbiwgZGVzdGluYXRpb24gKyBidWZmZXJTaXpl IC0gMSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBjb25zdCBVQ2hhciogc291cmNl ID0gbV9zdHJpbmcuY2hhcmFjdGVyczE2KCk7CisgICAgICAgICAgICByZXN1bHQgPSBXVEY6OlVu aWNvZGU6OmNvbnZlcnRVVEYxNlRvVVRGOCgmc291cmNlLCBzb3VyY2UgKyBtX3N0cmluZy5sZW5n dGgoKSwgJmRlc3RpbmF0aW9uLCBkZXN0aW5hdGlvbiArIGJ1ZmZlclNpemUgLSAxLCAvKiBzdHJp Y3QgKi8gdHJ1ZSk7CisgICAgICAgIH0KKworICAgICAgICAqZGVzdGluYXRpb24rKyA9ICdcMCc7 CiAgICAgICAgIGlmIChyZXN1bHQgIT0gV1RGOjpVbmljb2RlOjpjb252ZXJzaW9uT0sgJiYgcmVz dWx0ICE9IFdURjo6VW5pY29kZTo6dGFyZ2V0RXhoYXVzdGVkKQogICAgICAgICAgICAgcmV0dXJu IDA7Ci0gICAgICAgIHJldHVybiBwIC0gYnVmZmVyOworICAgICAgICByZXR1cm4gZGVzdGluYXRp b24gLSBidWZmZXI7CiAgICAgfQogCiAgICAgYm9vbCBlcXVhbChTdHJpbmcqIG90aGVyKSB7IHJl dHVybiBtX3N0cmluZyA9PSBvdGhlci0+bV9zdHJpbmc7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9UZXh0Q2hlY2tlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1RleHRDaGVja2VyLmgKaW5kZXggYmQwOGQzNTRkM2VhZmRiNmJjZjVlMGVjMzRmOWJlMTUxM2Fm ZWE2Zi4uZjJkNTU4OTI3MjFhZDI3MTg4MzM5MDQ3ZmQ0MjI5OGU5MTI5NGUxMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1RleHRDaGVja2VyLmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1RleHRDaGVja2VyLmgKQEAgLTY3LDEwICs2NywxMCBAQCBwdWJsaWM6 CiAgICAgc3RhdGljIGludDY0X3QgdW5pcXVlU3BlbGxEb2N1bWVudFRhZyhXZWJQYWdlUHJveHkq KTsKICAgICBzdGF0aWMgdm9pZCBjbG9zZVNwZWxsRG9jdW1lbnRXaXRoVGFnKGludDY0X3QpOwog I2lmIFVTRShVTklGSUVEX1RFWFRfQ0hFQ0tJTkcpCi0gICAgc3RhdGljIFZlY3RvcjxXZWJDb3Jl OjpUZXh0Q2hlY2tpbmdSZXN1bHQ+IGNoZWNrVGV4dE9mUGFyYWdyYXBoKGludDY0X3Qgc3BlbGxE b2N1bWVudFRhZywgY29uc3QgVUNoYXIqIHRleHQsIGludCBsZW5ndGgsIHVpbnQ2NF90IGNoZWNr aW5nVHlwZXMpOworICAgIHN0YXRpYyBWZWN0b3I8V2ViQ29yZTo6VGV4dENoZWNraW5nUmVzdWx0 PiBjaGVja1RleHRPZlBhcmFncmFwaChpbnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIFN0cmluZ1Zp ZXcsIHVpbnQ2NF90IGNoZWNraW5nVHlwZXMpOwogI2VuZGlmCi0gICAgc3RhdGljIHZvaWQgY2hl Y2tTcGVsbGluZ09mU3RyaW5nKGludDY0X3Qgc3BlbGxEb2N1bWVudFRhZywgY29uc3QgVUNoYXIq IHRleHQsIHVpbnQzMl90IGxlbmd0aCwgaW50MzJfdCYgbWlzc3BlbGxpbmdMb2NhdGlvbiwgaW50 MzJfdCYgbWlzc3BlbGxpbmdMZW5ndGgpOwotICAgIHN0YXRpYyB2b2lkIGNoZWNrR3JhbW1hck9m U3RyaW5nKGludDY0X3Qgc3BlbGxEb2N1bWVudFRhZywgY29uc3QgVUNoYXIqIHRleHQsIHVpbnQz Ml90IGxlbmd0aCwgVmVjdG9yPFdlYkNvcmU6OkdyYW1tYXJEZXRhaWw+JiwgaW50MzJfdCYgYmFk R3JhbW1hckxvY2F0aW9uLCBpbnQzMl90JiBiYWRHcmFtbWFyTGVuZ3RoKTsKKyAgICBzdGF0aWMg dm9pZCBjaGVja1NwZWxsaW5nT2ZTdHJpbmcoaW50NjRfdCBzcGVsbERvY3VtZW50VGFnLCBTdHJp bmdWaWV3LCBpbnQzMl90JiBtaXNzcGVsbGluZ0xvY2F0aW9uLCBpbnQzMl90JiBtaXNzcGVsbGlu Z0xlbmd0aCk7CisgICAgc3RhdGljIHZvaWQgY2hlY2tHcmFtbWFyT2ZTdHJpbmcoaW50NjRfdCBz cGVsbERvY3VtZW50VGFnLCBTdHJpbmdWaWV3LCBWZWN0b3I8V2ViQ29yZTo6R3JhbW1hckRldGFp bD4mLCBpbnQzMl90JiBiYWRHcmFtbWFyTG9jYXRpb24sIGludDMyX3QmIGJhZEdyYW1tYXJMZW5n dGgpOwogICAgIHN0YXRpYyBib29sIHNwZWxsaW5nVUlJc1Nob3dpbmcoKTsKICAgICBzdGF0aWMg dm9pZCB0b2dnbGVTcGVsbGluZ1VJSXNTaG93aW5nKCk7CiAgICAgc3RhdGljIHZvaWQgdXBkYXRl U3BlbGxpbmdVSVdpdGhNaXNzcGVsbGVkV29yZChpbnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIGNv bnN0IFN0cmluZyYgbWlzc3BlbGxlZFdvcmQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAppbmRleCA4NGU5ZjlhMGMxOTQ5NTZjMGEwNmExYTkzZDI0Y2JjMjkwMzg4 Y2ZlLi45MjBiYzUyYjZmYWNkZDdlOTk3ZmQ2MTFmNjNmZThjMTZlMmRjMmNlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzQzMiwxOCArMzQzMiwxOCBA QCBpbnQ2NF90IFdlYlBhZ2VQcm94eTo6c3BlbGxEb2N1bWVudFRhZygpCiAjaWYgVVNFKFVOSUZJ RURfVEVYVF9DSEVDS0lORykKIHZvaWQgV2ViUGFnZVByb3h5OjpjaGVja1RleHRPZlBhcmFncmFw aChjb25zdCBTdHJpbmcmIHRleHQsIHVpbnQ2NF90IGNoZWNraW5nVHlwZXMsIFZlY3RvcjxUZXh0 Q2hlY2tpbmdSZXN1bHQ+JiByZXN1bHRzKQogewotICAgIHJlc3VsdHMgPSBUZXh0Q2hlY2tlcjo6 Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgoc3BlbGxEb2N1bWVudFRhZygpLCB0ZXh0LmRlcHJlY2F0ZWRD aGFyYWN0ZXJzKCksIHRleHQubGVuZ3RoKCksIGNoZWNraW5nVHlwZXMpOworICAgIHJlc3VsdHMg PSBUZXh0Q2hlY2tlcjo6Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgoc3BlbGxEb2N1bWVudFRhZygpLCB0 ZXh0LCBjaGVja2luZ1R5cGVzKTsKIH0KICNlbmRpZgogCiB2b2lkIFdlYlBhZ2VQcm94eTo6Y2hl Y2tTcGVsbGluZ09mU3RyaW5nKGNvbnN0IFN0cmluZyYgdGV4dCwgaW50MzJfdCYgbWlzc3BlbGxp bmdMb2NhdGlvbiwgaW50MzJfdCYgbWlzc3BlbGxpbmdMZW5ndGgpCiB7Ci0gICAgVGV4dENoZWNr ZXI6OmNoZWNrU3BlbGxpbmdPZlN0cmluZyhzcGVsbERvY3VtZW50VGFnKCksIHRleHQuZGVwcmVj YXRlZENoYXJhY3RlcnMoKSwgdGV4dC5sZW5ndGgoKSwgbWlzc3BlbGxpbmdMb2NhdGlvbiwgbWlz c3BlbGxpbmdMZW5ndGgpOworICAgIFRleHRDaGVja2VyOjpjaGVja1NwZWxsaW5nT2ZTdHJpbmco c3BlbGxEb2N1bWVudFRhZygpLCB0ZXh0LCBtaXNzcGVsbGluZ0xvY2F0aW9uLCBtaXNzcGVsbGlu Z0xlbmd0aCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjaGVja0dyYW1tYXJPZlN0cmluZyhj b25zdCBTdHJpbmcmIHRleHQsIFZlY3RvcjxHcmFtbWFyRGV0YWlsPiYgZ3JhbW1hckRldGFpbHMs IGludDMyX3QmIGJhZEdyYW1tYXJMb2NhdGlvbiwgaW50MzJfdCYgYmFkR3JhbW1hckxlbmd0aCkK IHsKLSAgICBUZXh0Q2hlY2tlcjo6Y2hlY2tHcmFtbWFyT2ZTdHJpbmcoc3BlbGxEb2N1bWVudFRh ZygpLCB0ZXh0LmRlcHJlY2F0ZWRDaGFyYWN0ZXJzKCksIHRleHQubGVuZ3RoKCksIGdyYW1tYXJE ZXRhaWxzLCBiYWRHcmFtbWFyTG9jYXRpb24sIGJhZEdyYW1tYXJMZW5ndGgpOworICAgIFRleHRD aGVja2VyOjpjaGVja0dyYW1tYXJPZlN0cmluZyhzcGVsbERvY3VtZW50VGFnKCksIHRleHQsIGdy YW1tYXJEZXRhaWxzLCBiYWRHcmFtbWFyTG9jYXRpb24sIGJhZEdyYW1tYXJMZW5ndGgpOwogfQog CiB2b2lkIFdlYlBhZ2VQcm94eTo6c3BlbGxpbmdVSUlzU2hvd2luZyhib29sJiBpc1Nob3dpbmcp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RleHRDaGVja2VyTWFj Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UZXh0Q2hlY2tlck1hYy5tbQppbmRl eCAwOTAyOTFkNjBjZWFhODFjMzQ0NWUyMzRkM2E0MDVkYjUxNDM5MWFiLi5iN2MyZmFjYThjZmJh MmIwMWE3ZDZlYzE4MWIwNGZkZGI2MThjYjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1RleHRDaGVja2VyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvVGV4dENoZWNrZXJNYWMubW0KQEAgLTI4LDYgKzI4LDcgQEAKIAogI2ltcG9ydCAi VGV4dENoZWNrZXJTdGF0ZS5oIgogI2ltcG9ydCA8V2ViQ29yZS9Ob3RJbXBsZW1lbnRlZC5oPgor I2ltcG9ydCA8d3RmL3RleHQvU3RyaW5nVmlldy5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5o PgogCiBAaW50ZXJmYWNlIE5TU3BlbGxDaGVja2VyIChXZWJOU1NwZWxsQ2hlY2tlckRldGFpbHMp CkBAIC0yOTMsMTMgKzI5NCwxMyBAQCB2b2lkIFRleHRDaGVja2VyOjpjbG9zZVNwZWxsRG9jdW1l bnRXaXRoVGFnKGludDY0X3QgdGFnKQogCiAjaWYgVVNFKFVOSUZJRURfVEVYVF9DSEVDS0lORykK IAotVmVjdG9yPFRleHRDaGVja2luZ1Jlc3VsdD4gVGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFy YWdyYXBoKGludDY0X3Qgc3BlbGxEb2N1bWVudFRhZywgY29uc3QgVUNoYXIqIHRleHQsIGludCBs ZW5ndGgsIHVpbnQ2NF90IGNoZWNraW5nVHlwZXMpCitWZWN0b3I8VGV4dENoZWNraW5nUmVzdWx0 PiBUZXh0Q2hlY2tlcjo6Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgoaW50NjRfdCBzcGVsbERvY3VtZW50 VGFnLCBTdHJpbmdWaWV3IHN0cmluZ1ZpZXcsIHVpbnQ2NF90IGNoZWNraW5nVHlwZXMpCiB7CiAg ICAgVmVjdG9yPFRleHRDaGVja2luZ1Jlc3VsdD4gcmVzdWx0czsKIAotICAgIFJldGFpblB0cjxO U1N0cmluZz4gdGV4dFN0cmluZyA9IGFkb3B0TlMoW1tOU1N0cmluZyBhbGxvY10gaW5pdFdpdGhD aGFyYWN0ZXJzTm9Db3B5OmNvbnN0X2Nhc3Q8VUNoYXIqPih0ZXh0KSBsZW5ndGg6bGVuZ3RoIGZy ZWVXaGVuRG9uZTpOT10pOwotICAgIE5TQXJyYXkgKmluY29taW5nUmVzdWx0cyA9IFtbTlNTcGVs bENoZWNrZXIgc2hhcmVkU3BlbGxDaGVja2VyXSBjaGVja1N0cmluZzp0ZXh0U3RyaW5nIC5nZXQo KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByYW5nZTpOU01ha2VSYW5nZSgwLCBsZW5ndGgpCisgICAgYXV0 byB0ZXh0U3RyaW5nID0gc3RyaW5nVmlldy5jcmVhdGVOU1N0cmluZ1dpdGhvdXRDb3B5aW5nKCk7 CisgICAgTlNBcnJheSAqaW5jb21pbmdSZXN1bHRzID0gW1tOU1NwZWxsQ2hlY2tlciBzaGFyZWRT cGVsbENoZWNrZXJdIGNoZWNrU3RyaW5nOnRleHRTdHJpbmcuZ2V0KCkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmFuZ2U6TlNNYWtlUmFuZ2UoMCwgc3RyaW5nVmlldy5sZW5ndGgoKSkKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdHlwZXM6Y2hlY2tpbmdUeXBlcyB8IE5TVGV4dENoZWNraW5nVHlwZU9ydGhvZ3JhcGh5 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBvcHRpb25zOm5pbAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5TcGVsbERvY3VtZW50V2l0aFRhZzpzcGVs bERvY3VtZW50VGFnIApAQCAtMzgyLDEzICszODMsMTMgQEAgVmVjdG9yPFRleHRDaGVja2luZ1Jl c3VsdD4gVGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKGludDY0X3Qgc3BlbGxEb2N1 bWUKIAogI2VuZGlmCiAKLXZvaWQgVGV4dENoZWNrZXI6OmNoZWNrU3BlbGxpbmdPZlN0cmluZyhp bnQ2NF90LCBjb25zdCBVQ2hhciosIHVpbnQzMl90LCBpbnQzMl90JiwgaW50MzJfdCYpCit2b2lk IFRleHRDaGVja2VyOjpjaGVja1NwZWxsaW5nT2ZTdHJpbmcoaW50NjRfdCwgU3RyaW5nVmlldywg aW50MzJfdCYsIGludDMyX3QmKQogewogICAgIC8vIE1hYyB1c2VzIGNoZWNrVGV4dE9mUGFyYWdy YXBoIGluc3RlYWQuCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBUZXh0Q2hlY2tl cjo6Y2hlY2tHcmFtbWFyT2ZTdHJpbmcoaW50NjRfdCwgY29uc3QgVUNoYXIqLCB1aW50MzJfdCwg VmVjdG9yPFdlYkNvcmU6OkdyYW1tYXJEZXRhaWw+JiwgaW50MzJfdCYsIGludDMyX3QmKQordm9p ZCBUZXh0Q2hlY2tlcjo6Y2hlY2tHcmFtbWFyT2ZTdHJpbmcoaW50NjRfdCwgU3RyaW5nVmlldywg VmVjdG9yPFdlYkNvcmU6OkdyYW1tYXJEZXRhaWw+JiwgaW50MzJfdCYsIGludDMyX3QmKQogewog ICAgIC8vIE1hYyB1c2VzIGNoZWNrVGV4dE9mUGFyYWdyYXBoIGluc3RlYWQuCiAgICAgbm90SW1w bGVtZW50ZWQoKTsK