128603 2014-02-11 08:26:15 -0800 [EFL][WK2] Buildfix after bug128569 2014-12-03 07:54:14 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WORKSFORME P1 Critical --- 128569 1 ossy g.czajkowski andersca benjamin bunhere bw80.lee cdumez commit-queue g.czajkowski gyuyoung.kim gyuyoung.kim k.czech kling ossy sergio oldest_to_newest 979421 0 ossy 2014-02-11 08:26:15 -0800 http://trac.webkit.org/changeset/163856 broke the EFL build, but it was reverted, because it broke regression tests on Mac. This bug is to fix the EFL build before or after relanding the patch in bug128569 cc Grzegorz who implemented the rest of TextCheckerEfl.cpp and other EFL developers. 979818 1 g.czajkowski 2014-02-12 02:16:01 -0800 Thanks. Seems that we need to apply StringView to TextCheckerEfl.cpp due to TextChecker.h is likely to use it. I'll take care of it. 979844 2 223962 g.czajkowski 2014-02-12 05:10:23 -0800 Created attachment 223962 Patch 979866 3 223962 andersca 2014-02-12 07:44:57 -0800 Comment on attachment 223962 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223962&action=review The patch in bug 128569 was rolled out, so this won't be needed until it's re-landed. > Source/WebKit2/UIProcess/efl/TextCheckerEfl.cpp:124 > +static unsigned nextWordOffset(const StringView& stringView, unsigned currentOffset) StringView should always be passed by value since it's such a small struct that it fits in two register. 980186 4 224051 g.czajkowski 2014-02-13 00:24:41 -0800 Created attachment 224051 patch for landing 1052157 5 ossy 2014-12-03 07:54:14 -0800 We don't need it anymore. 223962 2014-02-12 05:10:23 -0800 2014-02-13 00:24:32 -0800 Patch bug-128603-20140212141020.patch text/plain 6981 g.czajkowski U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzOTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjcyNWU4OGMwMjk0M2I3 MzNlMDVhMDFiMmZkMjk5OTgxMWNkMTY4YS4uMjhlZGFmYWI3YjM3YmRmMjhmODZhOTVmOGE5MGNm NWQyMzJhNzMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAyLTEyICBHcnpl Z29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdW1dLMl0gQnVpbGRmaXggYWZ0ZXIgYnVnMTI4NTY5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgU3RyaW5nVmlldyBpbiBUZXh0Q2hlY2tlckVm bC5jcHAuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1RleHRDaGVja2VyRWZsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6bmV4dFdvcmRPZmZzZXQpOgorICAgICAgICBVc2UgdW5zaWduZWQgZm9y IG9mZnNldCBhbmQgbGVuZ3RoIG9mIHRoZSBzdHJpbmcgdG8gZG8gbm90CisgICAgICAgIGNvbmZs aWN0IHdpdGggU3RyaW5nVmlldzo6bGVuZ3RoKCkuIFRoZXkgYXJlIGFsd2F5cyA+PSAwLgorICAg ICAgICAoV2ViS2l0OjpUZXh0Q2hlY2tlcjo6Y2hlY2tUZXh0T2ZQYXJhZ3JhcGgpOgorICAgICAg ICAoV2ViS2l0OjpUZXh0Q2hlY2tlcjo6Y2hlY2tTcGVsbGluZ09mU3RyaW5nKToKKyAgICAgICAg KFdlYktpdDo6VGV4dENoZWNrZXI6OmNoZWNrR3JhbW1hck9mU3RyaW5nKToKKyAgICAgICAgKFdl YktpdDo6VGV4dENoZWNrZXI6OnJlcXVlc3RDaGVja2luZ09mU3RyaW5nKToKKwogMjAxNC0wMi0x MiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSBhIGNvdXBsZSBvZiBkZXByZWNhdGVkQ2hhcmFjdGVycygpIGZyb20gV2ViS2l0MgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9UZXh0Q2hlY2tlckVmbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1RleHRDaGVja2VyRWZsLmNwcAppbmRleCBkYTEy OTBkYWQ2NzI5ZDc5Mzc0ZGFhOTA3M2QxZDFjYjM0NzhlODIxLi45OTY2OTUyYmE5OTZkNDg1YWM5 YWM1NDdiODhhZmQ5NzRhZGNhZjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZWZsL1RleHRDaGVja2VyRWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1RleHRDaGVja2VyRWZsLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIlRleHRD aGVja2VyU3RhdGUuaCIKIAogI2lmIEVOQUJMRShTUEVMTENIRUNLKQorI2luY2x1ZGUgPHd0Zi90 ZXh0L1N0cmluZ1ZpZXcuaD4KICNpbmNsdWRlICJUZXh0QnJlYWtJdGVyYXRvci5oIgogI2luY2x1 ZGUgIlRleHRDaGVja2VyQ2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiV2ViVGV4dENoZWNrZXIuaCIK QEAgLTEyMCwxOCArMTIxLDE5IEBAIHZvaWQgVGV4dENoZWNrZXI6OmNsb3NlU3BlbGxEb2N1bWVu dFdpdGhUYWcoaW50NjRfdCB0YWcpCiB9CiAKICNpZiBFTkFCTEUoU1BFTExDSEVDSykKLXN0YXRp YyBpbnQgbmV4dFdvcmRPZmZzZXQoY29uc3QgVUNoYXIqIHRleHQsIGludCBsZW5ndGgsIGludCBj dXJyZW50T2Zmc2V0KQorc3RhdGljIHVuc2lnbmVkIG5leHRXb3JkT2Zmc2V0KGNvbnN0IFN0cmlu Z1ZpZXcmIHN0cmluZ1ZpZXcsIHVuc2lnbmVkIGN1cnJlbnRPZmZzZXQpCiB7CiAgICAgLy8gRklY TUU6IGF2b2lkIGNyZWF0aW5nIHRleHRJdGVyYXRvciBvYmplY3QgaGVyZSwgaXQgY291bGQgYmUg cGFzc2VkIGFzIGEgcGFyYW1ldGVyLgogICAgIC8vICAgICAgICBpc1RleHRCcmVhaygpIGxlYXZl cyB0aGUgaXRlcmF0b3IgcG9pbnRpbmcgdG8gdGhlIGZpcnN0IGJvdW5kYXJ5IHBvc2l0aW9uIGF0 CiAgICAgLy8gICAgICAgIG9yIGFmdGVyICJvZmZzZXQiICh1YnJrX2lzQm91bmRhcnkgc2lkZSBl ZmZlY3QpLgogICAgIC8vICAgICAgICBGb3IgbWFueSB3b3JkIHNlcGFyYXRvcnMsIHRoZSBtZXRo b2QgZG9lc24ndCBwcm9wZXJseSBkZXRlcm1pbmUgdGhlIGJvdW5kYXJpZXMKICAgICAvLyAgICAg ICAgd2l0aG91dCByZXNldHRpbmcgdGhlIGl0ZXJhdG9yLgotICAgIFRleHRCcmVha0l0ZXJhdG9y KiB0ZXh0SXRlcmF0b3IgPSB3b3JkQnJlYWtJdGVyYXRvcihTdHJpbmdWaWV3KHRleHQsIGxlbmd0 aCkpOworICAgIFRleHRCcmVha0l0ZXJhdG9yKiB0ZXh0SXRlcmF0b3IgPSB3b3JkQnJlYWtJdGVy YXRvcihzdHJpbmdWaWV3KTsKICAgICBpZiAoIXRleHRJdGVyYXRvcikKICAgICAgICAgcmV0dXJu IGN1cnJlbnRPZmZzZXQ7CiAKLSAgICBpbnQgd29yZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQ7Cisg ICAgdW5zaWduZWQgd29yZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQ7CisgICAgdW5zaWduZWQgbGVu Z3RoID0gc3RyaW5nVmlldy5sZW5ndGgoKTsKICAgICB3aGlsZSAod29yZE9mZnNldCA8IGxlbmd0 aCAmJiBpc1RleHRCcmVhayh0ZXh0SXRlcmF0b3IsIHdvcmRPZmZzZXQpKQogICAgICAgICArK3dv cmRPZmZzZXQ7CiAKQEAgLTE0OCwyNiArMTUwLDI3IEBAIHN0YXRpYyBpbnQgbmV4dFdvcmRPZmZz ZXQoY29uc3QgVUNoYXIqIHRleHQsIGludCBsZW5ndGgsIGludCBjdXJyZW50T2Zmc2V0KQogI2Vu ZGlmIC8vIEVOQUJMRShTUEVMTENIRUNLKQogCiAjaWYgVVNFKFVOSUZJRURfVEVYVF9DSEVDS0lO RykKLVZlY3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IFRleHRDaGVja2VyOjpjaGVja1RleHRPZlBh cmFncmFwaChpbnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIGNvbnN0IFVDaGFyKiB0ZXh0LCBpbnQg bGVuZ3RoLCB1aW50NjRfdCBjaGVja2luZ1R5cGVzKQorVmVjdG9yPFRleHRDaGVja2luZ1Jlc3Vs dD4gVGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKGludDY0X3Qgc3BlbGxEb2N1bWVu dFRhZywgU3RyaW5nVmlldyBzdHJpbmdWaWV3LCB1aW50NjRfdCBjaGVja2luZ1R5cGVzKQogewog ICAgIFZlY3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IHBhcmFncmFwaENoZWNraW5nUmVzdWx0Owog I2lmIEVOQUJMRShTUEVMTENIRUNLKQogICAgIGlmIChjaGVja2luZ1R5cGVzICYgVGV4dENoZWNr aW5nVHlwZVNwZWxsaW5nKSB7Ci0gICAgICAgIFRleHRCcmVha0l0ZXJhdG9yKiB0ZXh0SXRlcmF0 b3IgPSB3b3JkQnJlYWtJdGVyYXRvcihTdHJpbmdWaWV3KHRleHQsIGxlbmd0aCkpOworICAgICAg ICBUZXh0QnJlYWtJdGVyYXRvciogdGV4dEl0ZXJhdG9yID0gd29yZEJyZWFrSXRlcmF0b3Ioc3Ry aW5nVmlldyk7CiAgICAgICAgIGlmICghdGV4dEl0ZXJhdG9yKQogICAgICAgICAgICAgcmV0dXJu IHBhcmFncmFwaENoZWNraW5nUmVzdWx0OwogCiAgICAgICAgIC8vIE9taXQgdGhlIHdvcmQgc2Vw YXJhdG9ycyBhdCB0aGUgYmVnaW5uaW5nL2VuZCBvZiB0aGUgdGV4dCB0byBkb24ndCB1bm5lY2Vz c2FyaWx5CiAgICAgICAgIC8vIGludm9sdmUgdGhlIGNsaWVudCB0byBjaGVjayBzcGVsbGluZyBm b3IgdGhlbS4KLSAgICAgICAgaW50IG9mZnNldCA9IG5leHRXb3JkT2Zmc2V0KHRleHQsIGxlbmd0 aCwgMCk7Ci0gICAgICAgIGludCBsZW5ndGhTdHJpcCA9IGxlbmd0aDsKKyAgICAgICAgdW5zaWdu ZWQgb2Zmc2V0ID0gbmV4dFdvcmRPZmZzZXQoc3RyaW5nVmlldywgMCk7CisgICAgICAgIHVuc2ln bmVkIGxlbmd0aFN0cmlwID0gc3RyaW5nVmlldy5sZW5ndGgoKTsKICAgICAgICAgd2hpbGUgKGxl bmd0aFN0cmlwID4gMCAmJiBpc1RleHRCcmVhayh0ZXh0SXRlcmF0b3IsIGxlbmd0aFN0cmlwIC0g MSkpCiAgICAgICAgICAgICAtLWxlbmd0aFN0cmlwOwogCi0gICAgICAgIHdoaWxlIChvZmZzZXQg Pj0gMCAmJiBvZmZzZXQgPCBsZW5ndGhTdHJpcCkgeworICAgICAgICBjb25zdCBTdHJpbmdWaWV3 IHN0cmlwcGVkU3RyaW5nID0gc3RyaW5nVmlldy5zdWJzdHJpbmcoMCwgbGVuZ3RoU3RyaXApOwor ICAgICAgICB3aGlsZSAob2Zmc2V0IDwgbGVuZ3RoU3RyaXApIHsKICAgICAgICAgICAgIGludDMy X3QgbWlzc3BlbGxpbmdMb2NhdGlvbiA9IC0xOwogICAgICAgICAgICAgaW50MzJfdCBtaXNzcGVs bGluZ0xlbmd0aCA9IDA7Ci0gICAgICAgICAgICBjaGVja1NwZWxsaW5nT2ZTdHJpbmcoc3BlbGxE b2N1bWVudFRhZywgdGV4dCArIG9mZnNldCwgbGVuZ3RoU3RyaXAgLSBvZmZzZXQsIG1pc3NwZWxs aW5nTG9jYXRpb24sIG1pc3NwZWxsaW5nTGVuZ3RoKTsKKyAgICAgICAgICAgIGNoZWNrU3BlbGxp bmdPZlN0cmluZyhzcGVsbERvY3VtZW50VGFnLCBzdHJpbmdWaWV3LnN1YnN0cmluZyhvZmZzZXQs IGxlbmd0aFN0cmlwIC0gb2Zmc2V0KSwgbWlzc3BlbGxpbmdMb2NhdGlvbiwgbWlzc3BlbGxpbmdM ZW5ndGgpOwogICAgICAgICAgICAgaWYgKCFtaXNzcGVsbGluZ0xlbmd0aCkKICAgICAgICAgICAg ICAgICBicmVhazsKIApAQCAtMTc4LDMzICsxODEsMzEgQEAgVmVjdG9yPFRleHRDaGVja2luZ1Jl c3VsdD4gVGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKGludDY0X3Qgc3BlbGxEb2N1 bWUKICAgICAgICAgICAgIHBhcmFncmFwaENoZWNraW5nUmVzdWx0LmFwcGVuZChtaXNzcGVsbGlu Z1Jlc3VsdCk7CiAgICAgICAgICAgICBvZmZzZXQgKz0gbWlzc3BlbGxpbmdMb2NhdGlvbiArIG1p c3NwZWxsaW5nTGVuZ3RoOwogICAgICAgICAgICAgLy8gR2VuZXJhbGx5LCB3ZSBlbmQgdXAgY2hl Y2tpbmcgYXQgdGhlIHdvcmQgc2VwYXJhdG9yLCBtb3ZlIHRvIHRoZSBhZGphY2VudCB3b3JkLgot ICAgICAgICAgICAgb2Zmc2V0ID0gbmV4dFdvcmRPZmZzZXQodGV4dCwgbGVuZ3RoU3RyaXAsIG9m ZnNldCk7CisgICAgICAgICAgICBvZmZzZXQgPSBuZXh0V29yZE9mZnNldChzdHJpcHBlZFN0cmlu Zywgb2Zmc2V0KTsKICAgICAgICAgfQogICAgIH0KICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHNw ZWxsRG9jdW1lbnRUYWcpOwotICAgIFVOVVNFRF9QQVJBTSh0ZXh0KTsKLSAgICBVTlVTRURfUEFS QU0obGVuZ3RoKTsKKyAgICBVTlVTRURfUEFSQU0oc3RyaW5nVmlldyk7CiAgICAgVU5VU0VEX1BB UkFNKGNoZWNraW5nVHlwZXMpOwogI2VuZGlmCiAgICAgcmV0dXJuIHBhcmFncmFwaENoZWNraW5n UmVzdWx0OwogfQogI2VuZGlmCiAKLXZvaWQgVGV4dENoZWNrZXI6OmNoZWNrU3BlbGxpbmdPZlN0 cmluZyhpbnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIGNvbnN0IFVDaGFyKiB0ZXh0LCB1aW50MzJf dCBsZW5ndGgsIGludDMyX3QmIG1pc3NwZWxsaW5nTG9jYXRpb24sIGludDMyX3QmIG1pc3NwZWxs aW5nTGVuZ3RoKQordm9pZCBUZXh0Q2hlY2tlcjo6Y2hlY2tTcGVsbGluZ09mU3RyaW5nKGludDY0 X3Qgc3BlbGxEb2N1bWVudFRhZywgU3RyaW5nVmlldyBzdHJpbmdWaWV3LCBpbnQzMl90JiBtaXNz cGVsbGluZ0xvY2F0aW9uLCBpbnQzMl90JiBtaXNzcGVsbGluZ0xlbmd0aCkKIHsKICNpZiBFTkFC TEUoU1BFTExDSEVDSykKLSAgICBXZWJUZXh0Q2hlY2tlcjo6c2hhcmVkKCktPmNsaWVudCgpLmNo ZWNrU3BlbGxpbmdPZlN0cmluZyhzcGVsbERvY3VtZW50VGFnLCBTdHJpbmcodGV4dCwgbGVuZ3Ro KSwgbWlzc3BlbGxpbmdMb2NhdGlvbiwgbWlzc3BlbGxpbmdMZW5ndGgpOworICAgIFdlYlRleHRD aGVja2VyOjpzaGFyZWQoKS0+Y2xpZW50KCkuY2hlY2tTcGVsbGluZ09mU3RyaW5nKHNwZWxsRG9j dW1lbnRUYWcsIHN0cmluZ1ZpZXcudG9TdHJpbmdXaXRob3V0Q29weWluZygpLCBtaXNzcGVsbGlu Z0xvY2F0aW9uLCBtaXNzcGVsbGluZ0xlbmd0aCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShz cGVsbERvY3VtZW50VGFnKTsKLSAgICBVTlVTRURfUEFSQU0odGV4dCk7Ci0gICAgVU5VU0VEX1BB UkFNKGxlbmd0aCk7CisgICAgVU5VU0VEX1BBUkFNKHN0cmluZ1ZpZXcpOwogICAgIFVOVVNFRF9Q QVJBTShtaXNzcGVsbGluZ0xvY2F0aW9uKTsKICAgICBVTlVTRURfUEFSQU0obWlzc3BlbGxpbmdM ZW5ndGgpOwogI2VuZGlmCiB9CiAKLXZvaWQgVGV4dENoZWNrZXI6OmNoZWNrR3JhbW1hck9mU3Ry aW5nKGludDY0X3QsIGNvbnN0IFVDaGFyKiwgdWludDMyX3QsIFZlY3RvcjxHcmFtbWFyRGV0YWls PiYsIGludDMyX3QmLCBpbnQzMl90JikKK3ZvaWQgVGV4dENoZWNrZXI6OmNoZWNrR3JhbW1hck9m U3RyaW5nKGludDY0X3QsIFN0cmluZ1ZpZXcsIFZlY3RvcjxHcmFtbWFyRGV0YWlsPiYsIGludDMy X3QmLCBpbnQzMl90JikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQpAQCAtMjcxLDggKzI3 Miw3IEBAIHZvaWQgVGV4dENoZWNrZXI6OnJlcXVlc3RDaGVja2luZ09mU3RyaW5nKFBhc3NSZWZQ dHI8VGV4dENoZWNrZXJDb21wbGV0aW9uPiBjb21wCiAgICAgQVNTRVJUKHJlcXVlc3Quc2VxdWVu Y2UoKSAhPSB1bnJlcXVlc3RlZFRleHRDaGVja2luZ1NlcXVlbmNlKTsKICAgICBBU1NFUlQocmVx dWVzdC5tYXNrKCkgIT0gVGV4dENoZWNraW5nVHlwZU5vbmUpOwogCi0gICAgU3RyaW5nIHRleHQg PSByZXF1ZXN0LnRleHQoKTsKLSAgICBWZWN0b3I8VGV4dENoZWNraW5nUmVzdWx0PiByZXN1bHQg PSBjaGVja1RleHRPZlBhcmFncmFwaChjb21wbGV0aW9uLT5zcGVsbERvY3VtZW50VGFnKCksIHRl eHQuZGVwcmVjYXRlZENoYXJhY3RlcnMoKSwgdGV4dC5sZW5ndGgoKSwgcmVxdWVzdC5tYXNrKCkp OworICAgIFZlY3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IHJlc3VsdCA9IGNoZWNrVGV4dE9mUGFy YWdyYXBoKGNvbXBsZXRpb24tPnNwZWxsRG9jdW1lbnRUYWcoKSwgU3RyaW5nVmlldyhyZXF1ZXN0 LnRleHQoKSksIHJlcXVlc3QubWFzaygpKTsKIAogICAgIGNvbXBsZXRpb24tPmRpZEZpbmlzaENo ZWNraW5nVGV4dChyZXN1bHQpOwogI2Vsc2UK 224051 2014-02-13 00:24:41 -0800 2014-02-13 00:24:41 -0800 patch for landing bug-128603-20140213092439.patch text/plain 6975 g.czajkowski U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0MDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzEyOGU4NzEwODQ2NWI1 MjdlMDRjOTEzMDk0NDAyZTRkZDY4Yzc1NC4uZDc3YzY2ODk3ZDg4NGQ4MTlkN2JlMjZlYjAxYzgw MWIxNWFkY2IzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAyLTEyICBHcnpl Z29yeiBDemFqa293c2tpICA8Zy5jemFqa293c2tpQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdW1dLMl0gQnVpbGRmaXggYWZ0ZXIgYnVnMTI4NTY5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBB bmRlcnMgQ2FybHNzb24uCisKKyAgICAgICAgVXNlIFN0cmluZ1ZpZXcgaW4gVGV4dENoZWNrZXJF ZmwuY3BwLgorCisgICAgICAgICogVUlQcm9jZXNzL2VmbC9UZXh0Q2hlY2tlckVmbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6Om5leHRXb3JkT2Zmc2V0KToKKyAgICAgICAgVXNlIHVuc2lnbmVkIGZv ciBvZmZzZXQgYW5kIGxlbmd0aCBvZiB0aGUgc3RyaW5nIHRvIGRvIG5vdAorICAgICAgICBjb25m bGljdCB3aXRoIFN0cmluZ1ZpZXc6Omxlbmd0aCgpLiBUaGV5IGFyZSBhbHdheXMgPj0gMC4KKyAg ICAgICAgKFdlYktpdDo6VGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKToKKyAgICAg ICAgKFdlYktpdDo6VGV4dENoZWNrZXI6OmNoZWNrU3BlbGxpbmdPZlN0cmluZyk6CisgICAgICAg IChXZWJLaXQ6OlRleHRDaGVja2VyOjpjaGVja0dyYW1tYXJPZlN0cmluZyk6CisgICAgICAgIChX ZWJLaXQ6OlRleHRDaGVja2VyOjpyZXF1ZXN0Q2hlY2tpbmdPZlN0cmluZyk6CisKIDIwMTQtMDIt MTIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1v dmUgYSBjb3VwbGUgb2YgZGVwcmVjYXRlZENoYXJhY3RlcnMoKSBmcm9tIFdlYktpdDIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvVGV4dENoZWNrZXJFZmwuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9UZXh0Q2hlY2tlckVmbC5jcHAKaW5kZXggZGEx MjkwZGFkNjcyOWQ3OTM3NGRhYTkwNzNkMWQxY2IzNDc4ZTgyMS4uMWZiOGRiMDRjNzI3MGQyN2M2 OWEzODcyZDEwMDVjOGIyOWM5OGMyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9UZXh0Q2hlY2tlckVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9UZXh0Q2hlY2tlckVmbC5jcHAKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJUZXh0 Q2hlY2tlclN0YXRlLmgiCiAKICNpZiBFTkFCTEUoU1BFTExDSEVDSykKKyNpbmNsdWRlIDx3dGYv dGV4dC9TdHJpbmdWaWV3Lmg+CiAjaW5jbHVkZSAiVGV4dEJyZWFrSXRlcmF0b3IuaCIKICNpbmNs dWRlICJUZXh0Q2hlY2tlckNsaWVudEVmbC5oIgogI2luY2x1ZGUgIldlYlRleHRDaGVja2VyLmgi CkBAIC0xMjAsMTggKzEyMSwxOSBAQCB2b2lkIFRleHRDaGVja2VyOjpjbG9zZVNwZWxsRG9jdW1l bnRXaXRoVGFnKGludDY0X3QgdGFnKQogfQogCiAjaWYgRU5BQkxFKFNQRUxMQ0hFQ0spCi1zdGF0 aWMgaW50IG5leHRXb3JkT2Zmc2V0KGNvbnN0IFVDaGFyKiB0ZXh0LCBpbnQgbGVuZ3RoLCBpbnQg Y3VycmVudE9mZnNldCkKK3N0YXRpYyB1bnNpZ25lZCBuZXh0V29yZE9mZnNldChTdHJpbmdWaWV3 IHN0cmluZ1ZpZXcsIHVuc2lnbmVkIGN1cnJlbnRPZmZzZXQpCiB7CiAgICAgLy8gRklYTUU6IGF2 b2lkIGNyZWF0aW5nIHRleHRJdGVyYXRvciBvYmplY3QgaGVyZSwgaXQgY291bGQgYmUgcGFzc2Vk IGFzIGEgcGFyYW1ldGVyLgogICAgIC8vICAgICAgICBpc1RleHRCcmVhaygpIGxlYXZlcyB0aGUg aXRlcmF0b3IgcG9pbnRpbmcgdG8gdGhlIGZpcnN0IGJvdW5kYXJ5IHBvc2l0aW9uIGF0CiAgICAg Ly8gICAgICAgIG9yIGFmdGVyICJvZmZzZXQiICh1YnJrX2lzQm91bmRhcnkgc2lkZSBlZmZlY3Qp LgogICAgIC8vICAgICAgICBGb3IgbWFueSB3b3JkIHNlcGFyYXRvcnMsIHRoZSBtZXRob2QgZG9l c24ndCBwcm9wZXJseSBkZXRlcm1pbmUgdGhlIGJvdW5kYXJpZXMKICAgICAvLyAgICAgICAgd2l0 aG91dCByZXNldHRpbmcgdGhlIGl0ZXJhdG9yLgotICAgIFRleHRCcmVha0l0ZXJhdG9yKiB0ZXh0 SXRlcmF0b3IgPSB3b3JkQnJlYWtJdGVyYXRvcihTdHJpbmdWaWV3KHRleHQsIGxlbmd0aCkpOwor ICAgIFRleHRCcmVha0l0ZXJhdG9yKiB0ZXh0SXRlcmF0b3IgPSB3b3JkQnJlYWtJdGVyYXRvcihz dHJpbmdWaWV3KTsKICAgICBpZiAoIXRleHRJdGVyYXRvcikKICAgICAgICAgcmV0dXJuIGN1cnJl bnRPZmZzZXQ7CiAKLSAgICBpbnQgd29yZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQ7CisgICAgdW5z aWduZWQgd29yZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQ7CisgICAgdW5zaWduZWQgbGVuZ3RoID0g c3RyaW5nVmlldy5sZW5ndGgoKTsKICAgICB3aGlsZSAod29yZE9mZnNldCA8IGxlbmd0aCAmJiBp c1RleHRCcmVhayh0ZXh0SXRlcmF0b3IsIHdvcmRPZmZzZXQpKQogICAgICAgICArK3dvcmRPZmZz ZXQ7CiAKQEAgLTE0OCwyNiArMTUwLDI3IEBAIHN0YXRpYyBpbnQgbmV4dFdvcmRPZmZzZXQoY29u c3QgVUNoYXIqIHRleHQsIGludCBsZW5ndGgsIGludCBjdXJyZW50T2Zmc2V0KQogI2VuZGlmIC8v IEVOQUJMRShTUEVMTENIRUNLKQogCiAjaWYgVVNFKFVOSUZJRURfVEVYVF9DSEVDS0lORykKLVZl Y3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IFRleHRDaGVja2VyOjpjaGVja1RleHRPZlBhcmFncmFw aChpbnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIGNvbnN0IFVDaGFyKiB0ZXh0LCBpbnQgbGVuZ3Ro LCB1aW50NjRfdCBjaGVja2luZ1R5cGVzKQorVmVjdG9yPFRleHRDaGVja2luZ1Jlc3VsdD4gVGV4 dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKGludDY0X3Qgc3BlbGxEb2N1bWVudFRhZywg U3RyaW5nVmlldyBzdHJpbmdWaWV3LCB1aW50NjRfdCBjaGVja2luZ1R5cGVzKQogewogICAgIFZl Y3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IHBhcmFncmFwaENoZWNraW5nUmVzdWx0OwogI2lmIEVO QUJMRShTUEVMTENIRUNLKQogICAgIGlmIChjaGVja2luZ1R5cGVzICYgVGV4dENoZWNraW5nVHlw ZVNwZWxsaW5nKSB7Ci0gICAgICAgIFRleHRCcmVha0l0ZXJhdG9yKiB0ZXh0SXRlcmF0b3IgPSB3 b3JkQnJlYWtJdGVyYXRvcihTdHJpbmdWaWV3KHRleHQsIGxlbmd0aCkpOworICAgICAgICBUZXh0 QnJlYWtJdGVyYXRvciogdGV4dEl0ZXJhdG9yID0gd29yZEJyZWFrSXRlcmF0b3Ioc3RyaW5nVmll dyk7CiAgICAgICAgIGlmICghdGV4dEl0ZXJhdG9yKQogICAgICAgICAgICAgcmV0dXJuIHBhcmFn cmFwaENoZWNraW5nUmVzdWx0OwogCiAgICAgICAgIC8vIE9taXQgdGhlIHdvcmQgc2VwYXJhdG9y cyBhdCB0aGUgYmVnaW5uaW5nL2VuZCBvZiB0aGUgdGV4dCB0byBkb24ndCB1bm5lY2Vzc2FyaWx5 CiAgICAgICAgIC8vIGludm9sdmUgdGhlIGNsaWVudCB0byBjaGVjayBzcGVsbGluZyBmb3IgdGhl bS4KLSAgICAgICAgaW50IG9mZnNldCA9IG5leHRXb3JkT2Zmc2V0KHRleHQsIGxlbmd0aCwgMCk7 Ci0gICAgICAgIGludCBsZW5ndGhTdHJpcCA9IGxlbmd0aDsKKyAgICAgICAgdW5zaWduZWQgb2Zm c2V0ID0gbmV4dFdvcmRPZmZzZXQoc3RyaW5nVmlldywgMCk7CisgICAgICAgIHVuc2lnbmVkIGxl bmd0aFN0cmlwID0gc3RyaW5nVmlldy5sZW5ndGgoKTsKICAgICAgICAgd2hpbGUgKGxlbmd0aFN0 cmlwID4gMCAmJiBpc1RleHRCcmVhayh0ZXh0SXRlcmF0b3IsIGxlbmd0aFN0cmlwIC0gMSkpCiAg ICAgICAgICAgICAtLWxlbmd0aFN0cmlwOwogCi0gICAgICAgIHdoaWxlIChvZmZzZXQgPj0gMCAm JiBvZmZzZXQgPCBsZW5ndGhTdHJpcCkgeworICAgICAgICBjb25zdCBTdHJpbmdWaWV3IHN0cmlw cGVkU3RyaW5nID0gc3RyaW5nVmlldy5zdWJzdHJpbmcoMCwgbGVuZ3RoU3RyaXApOworICAgICAg ICB3aGlsZSAob2Zmc2V0IDwgbGVuZ3RoU3RyaXApIHsKICAgICAgICAgICAgIGludDMyX3QgbWlz c3BlbGxpbmdMb2NhdGlvbiA9IC0xOwogICAgICAgICAgICAgaW50MzJfdCBtaXNzcGVsbGluZ0xl bmd0aCA9IDA7Ci0gICAgICAgICAgICBjaGVja1NwZWxsaW5nT2ZTdHJpbmcoc3BlbGxEb2N1bWVu dFRhZywgdGV4dCArIG9mZnNldCwgbGVuZ3RoU3RyaXAgLSBvZmZzZXQsIG1pc3NwZWxsaW5nTG9j YXRpb24sIG1pc3NwZWxsaW5nTGVuZ3RoKTsKKyAgICAgICAgICAgIGNoZWNrU3BlbGxpbmdPZlN0 cmluZyhzcGVsbERvY3VtZW50VGFnLCBzdHJpbmdWaWV3LnN1YnN0cmluZyhvZmZzZXQsIGxlbmd0 aFN0cmlwIC0gb2Zmc2V0KSwgbWlzc3BlbGxpbmdMb2NhdGlvbiwgbWlzc3BlbGxpbmdMZW5ndGgp OwogICAgICAgICAgICAgaWYgKCFtaXNzcGVsbGluZ0xlbmd0aCkKICAgICAgICAgICAgICAgICBi cmVhazsKIApAQCAtMTc4LDMzICsxODEsMzEgQEAgVmVjdG9yPFRleHRDaGVja2luZ1Jlc3VsdD4g VGV4dENoZWNrZXI6OmNoZWNrVGV4dE9mUGFyYWdyYXBoKGludDY0X3Qgc3BlbGxEb2N1bWUKICAg ICAgICAgICAgIHBhcmFncmFwaENoZWNraW5nUmVzdWx0LmFwcGVuZChtaXNzcGVsbGluZ1Jlc3Vs dCk7CiAgICAgICAgICAgICBvZmZzZXQgKz0gbWlzc3BlbGxpbmdMb2NhdGlvbiArIG1pc3NwZWxs aW5nTGVuZ3RoOwogICAgICAgICAgICAgLy8gR2VuZXJhbGx5LCB3ZSBlbmQgdXAgY2hlY2tpbmcg YXQgdGhlIHdvcmQgc2VwYXJhdG9yLCBtb3ZlIHRvIHRoZSBhZGphY2VudCB3b3JkLgotICAgICAg ICAgICAgb2Zmc2V0ID0gbmV4dFdvcmRPZmZzZXQodGV4dCwgbGVuZ3RoU3RyaXAsIG9mZnNldCk7 CisgICAgICAgICAgICBvZmZzZXQgPSBuZXh0V29yZE9mZnNldChzdHJpcHBlZFN0cmluZywgb2Zm c2V0KTsKICAgICAgICAgfQogICAgIH0KICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHNwZWxsRG9j dW1lbnRUYWcpOwotICAgIFVOVVNFRF9QQVJBTSh0ZXh0KTsKLSAgICBVTlVTRURfUEFSQU0obGVu Z3RoKTsKKyAgICBVTlVTRURfUEFSQU0oc3RyaW5nVmlldyk7CiAgICAgVU5VU0VEX1BBUkFNKGNo ZWNraW5nVHlwZXMpOwogI2VuZGlmCiAgICAgcmV0dXJuIHBhcmFncmFwaENoZWNraW5nUmVzdWx0 OwogfQogI2VuZGlmCiAKLXZvaWQgVGV4dENoZWNrZXI6OmNoZWNrU3BlbGxpbmdPZlN0cmluZyhp bnQ2NF90IHNwZWxsRG9jdW1lbnRUYWcsIGNvbnN0IFVDaGFyKiB0ZXh0LCB1aW50MzJfdCBsZW5n dGgsIGludDMyX3QmIG1pc3NwZWxsaW5nTG9jYXRpb24sIGludDMyX3QmIG1pc3NwZWxsaW5nTGVu Z3RoKQordm9pZCBUZXh0Q2hlY2tlcjo6Y2hlY2tTcGVsbGluZ09mU3RyaW5nKGludDY0X3Qgc3Bl bGxEb2N1bWVudFRhZywgU3RyaW5nVmlldyBzdHJpbmdWaWV3LCBpbnQzMl90JiBtaXNzcGVsbGlu Z0xvY2F0aW9uLCBpbnQzMl90JiBtaXNzcGVsbGluZ0xlbmd0aCkKIHsKICNpZiBFTkFCTEUoU1BF TExDSEVDSykKLSAgICBXZWJUZXh0Q2hlY2tlcjo6c2hhcmVkKCktPmNsaWVudCgpLmNoZWNrU3Bl bGxpbmdPZlN0cmluZyhzcGVsbERvY3VtZW50VGFnLCBTdHJpbmcodGV4dCwgbGVuZ3RoKSwgbWlz c3BlbGxpbmdMb2NhdGlvbiwgbWlzc3BlbGxpbmdMZW5ndGgpOworICAgIFdlYlRleHRDaGVja2Vy OjpzaGFyZWQoKS0+Y2xpZW50KCkuY2hlY2tTcGVsbGluZ09mU3RyaW5nKHNwZWxsRG9jdW1lbnRU YWcsIHN0cmluZ1ZpZXcudG9TdHJpbmdXaXRob3V0Q29weWluZygpLCBtaXNzcGVsbGluZ0xvY2F0 aW9uLCBtaXNzcGVsbGluZ0xlbmd0aCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShzcGVsbERv Y3VtZW50VGFnKTsKLSAgICBVTlVTRURfUEFSQU0odGV4dCk7Ci0gICAgVU5VU0VEX1BBUkFNKGxl bmd0aCk7CisgICAgVU5VU0VEX1BBUkFNKHN0cmluZ1ZpZXcpOwogICAgIFVOVVNFRF9QQVJBTSht aXNzcGVsbGluZ0xvY2F0aW9uKTsKICAgICBVTlVTRURfUEFSQU0obWlzc3BlbGxpbmdMZW5ndGgp OwogI2VuZGlmCiB9CiAKLXZvaWQgVGV4dENoZWNrZXI6OmNoZWNrR3JhbW1hck9mU3RyaW5nKGlu dDY0X3QsIGNvbnN0IFVDaGFyKiwgdWludDMyX3QsIFZlY3RvcjxHcmFtbWFyRGV0YWlsPiYsIGlu dDMyX3QmLCBpbnQzMl90JikKK3ZvaWQgVGV4dENoZWNrZXI6OmNoZWNrR3JhbW1hck9mU3RyaW5n KGludDY0X3QsIFN0cmluZ1ZpZXcsIFZlY3RvcjxHcmFtbWFyRGV0YWlsPiYsIGludDMyX3QmLCBp bnQzMl90JikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQpAQCAtMjcxLDggKzI3Miw3IEBA IHZvaWQgVGV4dENoZWNrZXI6OnJlcXVlc3RDaGVja2luZ09mU3RyaW5nKFBhc3NSZWZQdHI8VGV4 dENoZWNrZXJDb21wbGV0aW9uPiBjb21wCiAgICAgQVNTRVJUKHJlcXVlc3Quc2VxdWVuY2UoKSAh PSB1bnJlcXVlc3RlZFRleHRDaGVja2luZ1NlcXVlbmNlKTsKICAgICBBU1NFUlQocmVxdWVzdC5t YXNrKCkgIT0gVGV4dENoZWNraW5nVHlwZU5vbmUpOwogCi0gICAgU3RyaW5nIHRleHQgPSByZXF1 ZXN0LnRleHQoKTsKLSAgICBWZWN0b3I8VGV4dENoZWNraW5nUmVzdWx0PiByZXN1bHQgPSBjaGVj a1RleHRPZlBhcmFncmFwaChjb21wbGV0aW9uLT5zcGVsbERvY3VtZW50VGFnKCksIHRleHQuZGVw cmVjYXRlZENoYXJhY3RlcnMoKSwgdGV4dC5sZW5ndGgoKSwgcmVxdWVzdC5tYXNrKCkpOworICAg IFZlY3RvcjxUZXh0Q2hlY2tpbmdSZXN1bHQ+IHJlc3VsdCA9IGNoZWNrVGV4dE9mUGFyYWdyYXBo KGNvbXBsZXRpb24tPnNwZWxsRG9jdW1lbnRUYWcoKSwgU3RyaW5nVmlldyhyZXF1ZXN0LnRleHQo KSksIHJlcXVlc3QubWFzaygpKTsKIAogICAgIGNvbXBsZXRpb24tPmRpZEZpbmlzaENoZWNraW5n VGV4dChyZXN1bHQpOwogI2Vsc2UK