122480 2013-10-07 19:31:16 -0700 Consolidate findString functions 2013-10-08 16:47:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam eflews.bot gtk-ews gyuyoung.kim xan.lopez oldest_to_newest 937326 0 sam 2013-10-07 19:31:16 -0700 Consolidate findString functions 937327 1 213639 sam 2013-10-07 19:32:17 -0700 Created attachment 213639 Patch 937336 2 213639 buildbot 2013-10-07 20:18:51 -0700 Comment on attachment 213639 Patch Attachment 213639 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/3715070 937347 3 213639 eflews.bot 2013-10-07 20:31:34 -0700 Comment on attachment 213639 Patch Attachment 213639 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/3706080 937364 4 213639 gtk-ews 2013-10-07 21:46:23 -0700 Comment on attachment 213639 Patch Attachment 213639 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/3714105 937394 5 213659 sam 2013-10-07 23:29:35 -0700 Created attachment 213659 Patch 937399 6 213659 eflews.bot 2013-10-07 23:35:24 -0700 Comment on attachment 213659 Patch Attachment 213659 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/3738041 937472 7 213659 darin 2013-10-08 02:17:49 -0700 Comment on attachment 213659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213659&action=review > Source/WebKit/efl/ewk/ewk_frame.cpp:501 > + WebCore::FindOptions options = (caseSensitive ? 0 : WebCore::CaseInsensitive) | (forward ? 0 : WebCore::Backwards) | (shouldWrap ? WebCore::WrapAround : 0) | WebCore::StartInSelection; It’s wrap, not shouldWrap, in this function. 937750 8 sam 2013-10-08 16:47:46 -0700 Committed r157146: <http://trac.webkit.org/changeset/157146> 213639 2013-10-07 19:32:17 -0700 2013-10-07 23:29:29 -0700 Patch bug-122480-20131007193216.patch text/plain 10717 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzA3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTA3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29uc29saWRhdGUgZmluZFN0cmluZyBm dW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMjQ4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZWRpdGluZy9FZGl0b3IuY3BwOgorICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmg6CisgICAg ICAgICogZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1 dGVGaW5kU3RyaW5nKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6OmZpbmQpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAg ICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgIEZpeCBhIGxvbmcgc3RhbmRpbmcgRklYTUUuCisK IDIwMTMtMTAtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAg ICAgICBVcGRhdGUgdGVzdCBhZ2Fpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJ KHJldmlzaW9uIDE1NzA3NikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjgyNSwxMyArMjgyNSw2IEBAIHZvaWQgRWRpdG9yOjphcHBseUVk aXRpbmdTdHlsZVRvRWxlbWVudCgKICAgICBzdHlsZS0+c2V0UHJvcGVydHlJbnRlcm5hbChDU1NQ cm9wZXJ0eVdlYmtpdExpbmVCcmVhaywgImFmdGVyLXdoaXRlLXNwYWNlIiwgZmFsc2UsIElHTk9S RV9FWENFUFRJT04pOwogfQogCi0vLyBTZWFyY2hlcyBmcm9tIHRoZSBiZWdpbm5pbmcgb2YgdGhl IGRvY3VtZW50IGlmIG5vdGhpbmcgaXMgc2VsZWN0ZWQuCi1ib29sIEVkaXRvcjo6ZmluZFN0cmlu Zyhjb25zdCBTdHJpbmcmIHRhcmdldCwgYm9vbCBmb3J3YXJkLCBib29sIGNhc2VGbGFnLCBib29s IHdyYXBGbGFnLCBib29sIHN0YXJ0SW5TZWxlY3Rpb24pCi17Ci0gICAgRmluZE9wdGlvbnMgb3B0 aW9ucyA9IChmb3J3YXJkID8gMCA6IEJhY2t3YXJkcykgfCAoY2FzZUZsYWcgPyAwIDogQ2FzZUlu c2Vuc2l0aXZlKSB8ICh3cmFwRmxhZyA/IFdyYXBBcm91bmQgOiAwKSB8IChzdGFydEluU2VsZWN0 aW9uID8gU3RhcnRJblNlbGVjdGlvbiA6IDApOwotICAgIHJldHVybiBmaW5kU3RyaW5nKHRhcmdl dCwgb3B0aW9ucyk7Ci19Ci0KIGJvb2wgRWRpdG9yOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYg dGFyZ2V0LCBGaW5kT3B0aW9ucyBvcHRpb25zKQogewogICAgIFZpc2libGVTZWxlY3Rpb24gc2Vs ZWN0aW9uID0gbV9mcmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRp dGluZy9FZGl0b3IuaAkocmV2aXNpb24gMTU3MDc2KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9FZGl0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMzI1LDggKzMyNSw2IEBAIHB1YmxpYzoKICAg ICBTdHJpbmcgc2VsZWN0ZWRUZXh0KCkgY29uc3Q7CiAgICAgU3RyaW5nIHNlbGVjdGVkVGV4dEZv ckNsaXBib2FyZCgpIGNvbnN0OwogICAgIGJvb2wgZmluZFN0cmluZyhjb25zdCBTdHJpbmcmLCBG aW5kT3B0aW9ucyk7Ci0gICAgLy8gRklYTUU6IFN3aXRjaCBjYWxsZXJzIG92ZXIgdG8gdGhlIEZp bmRPcHRpb25zIHZlcnNpb24gYW5kIHJldGlyZSB0aGlzIG9uZS4KLSAgICBib29sIGZpbmRTdHJp bmcoY29uc3QgU3RyaW5nJiwgYm9vbCBmb3J3YXJkLCBib29sIGNhc2VGbGFnLCBib29sIHdyYXBG bGFnLCBib29sIHN0YXJ0SW5TZWxlY3Rpb24pOwogCiAgICAgUGFzc1JlZlB0cjxSYW5nZT4gcmFu Z2VPZlN0cmluZyhjb25zdCBTdHJpbmcmLCBSYW5nZSosIEZpbmRPcHRpb25zKTsKICAgICBQYXNz UmVmUHRyPFJhbmdlPiBmaW5kU3RyaW5nQW5kU2Nyb2xsVG9WaXNpYmxlKGNvbnN0IFN0cmluZyYs IFJhbmdlKiwgRmluZE9wdGlvbnMpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 b3JDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRv ckNvbW1hbmQuY3BwCShyZXZpc2lvbiAxNTcwNzYpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0VkaXRvckNvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTIsNyArNDEyLDcgQEAgc3Rh dGljIGJvb2wgZXhlY3V0ZURlbGV0ZVdvcmRGb3J3YXJkKEZyYQogCiBzdGF0aWMgYm9vbCBleGVj dXRlRmluZFN0cmluZyhGcmFtZSYgZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwg Y29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKLSAgICByZXR1cm4gZnJhbWUuZWRpdG9yKCkuZmluZFN0 cmluZyh2YWx1ZSwgdHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlKTsKKyAgICByZXR1cm4gZnJhbWUu ZWRpdG9yKCkuZmluZFN0cmluZyh2YWx1ZSwgQ2FzZUluc2Vuc2l0aXZlIHwgV3JhcEFyb3VuZCk7 CiB9CiAKIHN0YXRpYyBib29sIGV4ZWN1dGVGb250TmFtZShGcmFtZSYgZnJhbWUsIEV2ZW50Kiwg RWRpdG9yQ29tbWFuZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYgdmFsdWUpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCShyZXZpc2lvbiAxNTcwNzYpCisrKyBTb3VyY2UvV2Vi Q29yZS9wYWdlL0RPTVdpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOTgsOCArMTA5OCw5 IEBAIGJvb2wgRE9NV2luZG93OjpmaW5kKGNvbnN0IFN0cmluZyYgc3RyaW4KICAgICBpZiAoIWlz Q3VycmVudGx5RGlzcGxheWVkSW5GcmFtZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICAvLyBGSVhNRSAoMTMwMTYpOiBTdXBwb3J0IHdob2xlV29yZCwgc2VhcmNoSW5GcmFtZXMgYW5k IHNob3dEaWFsb2cKLSAgICByZXR1cm4gbV9mcmFtZS0+ZWRpdG9yKCkuZmluZFN0cmluZyhzdHJp bmcsICFiYWNrd2FyZHMsIGNhc2VTZW5zaXRpdmUsIHdyYXAsIGZhbHNlKTsKKyAgICAvLyBGSVhN RSAoMTMwMTYpOiBTdXBwb3J0IHdob2xlV29yZCwgc2VhcmNoSW5GcmFtZXMgYW5kIHNob3dEaWFs b2cuICAgIAorICAgIEZpbmRPcHRpb25zIG9wdGlvbnMgPSAoYmFja3dhcmRzID8gQmFja3dhcmRz IDogMCkgfCAoY2FzZVNlbnNpdGl2ZSA/IDAgOiBDYXNlSW5zZW5zaXRpdmUpIHwgKHdyYXAgPyBX cmFwQXJvdW5kIDogMCk7CisgICAgcmV0dXJuIG1fZnJhbWUtPmVkaXRvcigpLmZpbmRTdHJpbmco c3RyaW5nLCBvcHRpb25zKTsKIH0KIAogYm9vbCBET01XaW5kb3c6Om9mZnNjcmVlbkJ1ZmZlcmlu ZygpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDE1NzA3NikKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0NywxMSArNTQ3 LDYgQEAgc3RhdGljIEZyYW1lKiBpbmNyZW1lbnRGcmFtZShGcmFtZSogY3VycgogICAgICAgICA6 IGN1cnItPnRyZWUoKS50cmF2ZXJzZVByZXZpb3VzV2l0aFdyYXAod3JhcEZsYWcpOwogfQogCi1i b29sIFBhZ2U6OmZpbmRTdHJpbmcoY29uc3QgU3RyaW5nJiB0YXJnZXQsIFRleHRDYXNlU2Vuc2l0 aXZpdHkgY2FzZVNlbnNpdGl2aXR5LCBGaW5kRGlyZWN0aW9uIGRpcmVjdGlvbiwgYm9vbCBzaG91 bGRXcmFwKQotewotICAgIHJldHVybiBmaW5kU3RyaW5nKHRhcmdldCwgKGNhc2VTZW5zaXRpdml0 eSA9PSBUZXh0Q2FzZUluc2Vuc2l0aXZlID8gQ2FzZUluc2Vuc2l0aXZlIDogMCkgfCAoZGlyZWN0 aW9uID09IEZpbmREaXJlY3Rpb25CYWNrd2FyZCA/IEJhY2t3YXJkcyA6IDApIHwgKHNob3VsZFdy YXAgPyBXcmFwQXJvdW5kIDogMCkpOwotfQotCiBib29sIFBhZ2U6OmZpbmRTdHJpbmcoY29uc3Qg U3RyaW5nJiB0YXJnZXQsIEZpbmRPcHRpb25zIG9wdGlvbnMpCiB7CiAgICAgaWYgKHRhcmdldC5p c0VtcHR5KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gMTU3MDc2KQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNiw4ICsyMzYsNiBAQCBw dWJsaWM6CiAgICAgYm9vbCB0YWJLZXlDeWNsZXNUaHJvdWdoRWxlbWVudHMoKSBjb25zdCB7IHJl dHVybiBtX3RhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50czsgfQogCiAgICAgYm9vbCBmaW5kU3Ry aW5nKGNvbnN0IFN0cmluZyYsIEZpbmRPcHRpb25zKTsKLSAgICAvLyBGSVhNRTogU3dpdGNoIGNh bGxlcnMgb3ZlciB0byB0aGUgRmluZE9wdGlvbnMgdmVyc2lvbiBhbmQgcmV0aXJlIHRoaXMgb25l LgotICAgIGJvb2wgZmluZFN0cmluZyhjb25zdCBTdHJpbmcmLCBUZXh0Q2FzZVNlbnNpdGl2aXR5 LCBGaW5kRGlyZWN0aW9uLCBib29sIHNob3VsZFdyYXApOwogCiAgICAgUGFzc1JlZlB0cjxSYW5n ZT4gcmFuZ2VPZlN0cmluZyhjb25zdCBTdHJpbmcmLCBSYW5nZSosIEZpbmRPcHRpb25zKTsKIApJ bmRleDogU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvZWZsL0NoYW5nZUxvZwkocmV2aXNpb24gMTU3MDc3KQorKysgU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTAtMDcg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBDb25zb2xpZGF0ZSBmaW5k U3RyaW5nIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyNDgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBld2svZXdrX2ZyYW1lLmNwcDoKKyAgICAgICAgKGV3a19mcmFtZV90ZXh0X3Nl YXJjaCk6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3Rl eHRfc2VhcmNoKToKKwogMjAxMy0xMC0wNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgog CiAgICAgICAgIENUVEU6IFVzZSByZWZlcmVuY2VzIGluIGFuZCBhcm91bmQgRHJhZ0NvbnRyb2xs ZXIKSW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCShyZXZpc2lvbiAxNTcwNzYp CisrKyBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDk4LDcgKzQ5OCw4IEBAIEVpbmFfQm9vbCBld2tfZnJhbWVfdGV4dF9zZWFyY2goY29uc3Qg RXYKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc21hcnREYXRhLT5mcmFtZSwg ZmFsc2UpOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTCh0ZXh0LCBmYWxzZSk7 CiAKLSAgICByZXR1cm4gc21hcnREYXRhLT5mcmFtZS0+ZWRpdG9yKCkuZmluZFN0cmluZyhXVEY6 OlN0cmluZzo6ZnJvbVVURjgodGV4dCksIGZvcndhcmQsIGNhc2VTZW5zaXRpdmUsIHdyYXAsIHRy dWUpOworICAgIFdlYkNvcmU6OkZpbmRPcHRpb25zIG9wdGlvbnMgPSAoY2FzZVNlbnNpdGl2ZSA/ IDAgOiBXZWJDb3JlOjpDYXNlSW5zZW5zaXRpdmUpIHwgKGZvcndhcmQgPyAwIHwgV2ViQ29yZTo6 QmFja3dhcmRzKSB8IChzaG91bGRXcmFwID8gV2ViQ29yZTo6V3JhcEFyb3VuZCB8IDApIHwgV2Vi Q29yZTo6U3RhcnRJblNlbGVjdGlvbjsKKyAgICByZXR1cm4gc21hcnREYXRhLT5mcmFtZS0+ZWRp dG9yKCkuZmluZFN0cmluZyhXVEY6OlN0cmluZzo6ZnJvbVVURjgodGV4dCksIG9wdGlvbnMpOwog fQogCiB1bnNpZ25lZCBpbnQgZXdrX2ZyYW1lX3RleHRfbWF0Y2hlc19tYXJrKEV2YXNfT2JqZWN0 KiBld2tGcmFtZSwgY29uc3QgY2hhciogc3RyaW5nLCBFaW5hX0Jvb2wgY2FzZVNlbnNpdGl2ZSwg RWluYV9Cb29sIGhpZ2hsaWdodCwgdW5zaWduZWQgaW50IGxpbWl0KQpJbmRleDogU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCShyZXZpc2lvbiAxNTcwNzYpCisrKyBTb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDk2LDIwICsxNDk2LDkgQEAg RWluYV9Cb29sIGV3a192aWV3X3RleHRfc2VhcmNoKGNvbnN0IEV2YQogICAgIEVXS19WSUVXX1NE X0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdf UFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOX1ZBTChzdHJpbmcsIGZhbHNlKTsKLSAgICBXVEY6OlRleHRDYXNl U2Vuc2l0aXZpdHkgc2Vuc2l0aXZlOwotICAgIFdlYkNvcmU6OkZpbmREaXJlY3Rpb24gZGlyZWN0 aW9uOwotCi0gICAgaWYgKGNhc2VTZW5zaXRpdmUpCi0gICAgICAgIHNlbnNpdGl2ZSA9IFdURjo6 VGV4dENhc2VTZW5zaXRpdmU7Ci0gICAgZWxzZQotICAgICAgICBzZW5zaXRpdmUgPSBXVEY6OlRl eHRDYXNlSW5zZW5zaXRpdmU7Ci0KLSAgICBpZiAoZm9yd2FyZCkKLSAgICAgICAgZGlyZWN0aW9u ID0gV2ViQ29yZTo6RmluZERpcmVjdGlvbkZvcndhcmQ7Ci0gICAgZWxzZQotICAgICAgICBkaXJl Y3Rpb24gPSBXZWJDb3JlOjpGaW5kRGlyZWN0aW9uQmFja3dhcmQ7CiAKLSAgICByZXR1cm4gcHJp di0+cGFnZS0+ZmluZFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KHN0cmluZyksIHNlbnNpdGl2ZSwg ZGlyZWN0aW9uLCB3cmFwKTsKKyAgICBXZWJDb3JlOjpGaW5kT3B0aW9ucyBvcHRpb25zID0gKGNh c2VTZW5zaXRpdmUgPyAwIDogV2ViQ29yZTo6Q2FzZUluc2Vuc2l0aXZlKSB8IChmb3J3YXJkID8g MCB8IFdlYkNvcmU6OkJhY2t3YXJkcykgfCAod3JhcCA/IFdlYkNvcmU6OldyYXBBcm91bmQgfCAw KTsKKyAgICByZXR1cm4gcHJpdi0+cGFnZS0+ZmluZFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KHN0 cmluZyksIG9wdGlvbnMpOwogfQogCiAvKioKSW5kZXg6IFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlzaW9u IDE1NzA3NykKKysrIFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDEzLTEwLTA3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgQ29uc29saWRhdGUgZmluZFN0cmluZyBmdW5jdGlvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjQ4MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NlYXJjaF90ZXh0KToKKwogMjAxMy0x MC0wNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIENUVEU6IFVzZSBy ZWZlcmVuY2VzIGluIGFuZCBhcm91bmQgRHJhZ0NvbnRyb2xsZXIKSW5kZXg6IFNvdXJjZS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAJKHJldmlzaW9uIDE1NzA3NikKKysrIFNv dXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDM3NSwxMCArNDM3NSw4IEBAIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19zZWFyY2hfdGV4 dChXZWIKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmll dyksIEZBTFNFKTsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChzdHJpbmcsIEZBTFNFKTsKIAot ICAgIFRleHRDYXNlU2Vuc2l0aXZpdHkgY2FzZVNlbnNpdGl2aXR5ID0gY2FzZVNlbnNpdGl2ZSA/ IFRleHRDYXNlU2Vuc2l0aXZlIDogVGV4dENhc2VJbnNlbnNpdGl2ZTsKLSAgICBGaW5kRGlyZWN0 aW9uIGRpcmVjdGlvbiA9IGZvcndhcmQgPyBGaW5kRGlyZWN0aW9uRm9yd2FyZCA6IEZpbmREaXJl Y3Rpb25CYWNrd2FyZDsKLQotICAgIHJldHVybiBjb3JlKHdlYlZpZXcpLT5maW5kU3RyaW5nKFN0 cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwgY2FzZVNlbnNpdGl2aXR5LCBkaXJlY3Rpb24sIHNob3Vs ZFdyYXApOworICAgIEZpbmRPcHRpb25zIG9wdGlvbnMgPSAoY2FzZVNlbnNpdGl2ZSA/IDAgOiBD YXNlSW5zZW5zaXRpdmUpIHwgKGZvcndhcmQgPyAwIHwgQmFja3dhcmRzKSB8IChzaG91bGRXcmFw ID8gV3JhcEFyb3VuZCB8IDApOworICAgIHJldHVybiBjb3JlKHdlYlZpZXcpLT5maW5kU3RyaW5n KFN0cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwgb3B0aW9ucyk7CiB9CiAKIC8qKgpJbmRleDogU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZwkocmV2aXNpb24gMTU3MDc3KQorKysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTAtMDcgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBDb25zb2xpZGF0ZSBmaW5kU3RyaW5nIGZ1 bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTIyNDgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OnNlYXJjaEZvcik6CisKIDIwMTMtMTAt MDcgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBDVFRFOiBVc2UgcmVm ZXJlbmNlcyBpbiBhbmQgYXJvdW5kIERyYWdDb250cm9sbGVyCkluZGV4OiBTb3VyY2UvV2ViS2l0 L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3 LmNwcAkocmV2aXNpb24gMTU3MDc2KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTM1MTEsNyArMzUxMSw4IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FM TFRZUEUgV2ViVmlldzo6c2VhcmMKICAgICBpZiAoIXN0ciB8fCAhU3lzU3RyaW5nTGVuKHN0cikp CiAgICAgICAgIHJldHVybiBFX0lOVkFMSURBUkc7CiAKLSAgICAqZm91bmQgPSBtX3BhZ2UtPmZp bmRTdHJpbmcodG9TdHJpbmcoc3RyKSwgY2FzZUZsYWcgPyBUZXh0Q2FzZVNlbnNpdGl2ZSA6IFRl eHRDYXNlSW5zZW5zaXRpdmUsIGZvcndhcmQgPyBGaW5kRGlyZWN0aW9uRm9yd2FyZCA6IEZpbmRE aXJlY3Rpb25CYWNrd2FyZCwgd3JhcEZsYWcpOworICAgIEZpbmRPcHRpb25zIG9wdGlvbnMgPSAo Y2FzZUZsYWcgPyAwIDogQ2FzZUluc2Vuc2l0aXZlKSB8IChmb3J3YXJkID8gMCB8IEJhY2t3YXJk cykgfCAod3JhcEZsYWcgPyBXcmFwQXJvdW5kIHwgMCk7CisgICAgKmZvdW5kID0gbV9wYWdlLT5m aW5kU3RyaW5nKHRvU3RyaW5nKHN0ciksIG9wdGlvbnMpOwogICAgIHJldHVybiBTX09LOwogfQog Cg== 213659 2013-10-07 23:29:35 -0700 2013-10-08 02:17:48 -0700 Patch bug-122480-20131007232934.patch text/plain 10717 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzA3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTA3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29uc29saWRhdGUgZmluZFN0cmluZyBm dW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMjQ4MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZWRpdGluZy9FZGl0b3IuY3BwOgorICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmg6CisgICAg ICAgICogZWRpdGluZy9FZGl0b3JDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1 dGVGaW5kU3RyaW5nKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpET01XaW5kb3c6OmZpbmQpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAg ICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgIEZpeCBhIGxvbmcgc3RhbmRpbmcgRklYTUUuCisK IDIwMTMtMTAtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAg ICAgICBVcGRhdGUgdGVzdCBhZ2Fpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJ KHJldmlzaW9uIDE1NzA3NikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjgyNSwxMyArMjgyNSw2IEBAIHZvaWQgRWRpdG9yOjphcHBseUVk aXRpbmdTdHlsZVRvRWxlbWVudCgKICAgICBzdHlsZS0+c2V0UHJvcGVydHlJbnRlcm5hbChDU1NQ cm9wZXJ0eVdlYmtpdExpbmVCcmVhaywgImFmdGVyLXdoaXRlLXNwYWNlIiwgZmFsc2UsIElHTk9S RV9FWENFUFRJT04pOwogfQogCi0vLyBTZWFyY2hlcyBmcm9tIHRoZSBiZWdpbm5pbmcgb2YgdGhl IGRvY3VtZW50IGlmIG5vdGhpbmcgaXMgc2VsZWN0ZWQuCi1ib29sIEVkaXRvcjo6ZmluZFN0cmlu Zyhjb25zdCBTdHJpbmcmIHRhcmdldCwgYm9vbCBmb3J3YXJkLCBib29sIGNhc2VGbGFnLCBib29s IHdyYXBGbGFnLCBib29sIHN0YXJ0SW5TZWxlY3Rpb24pCi17Ci0gICAgRmluZE9wdGlvbnMgb3B0 aW9ucyA9IChmb3J3YXJkID8gMCA6IEJhY2t3YXJkcykgfCAoY2FzZUZsYWcgPyAwIDogQ2FzZUlu c2Vuc2l0aXZlKSB8ICh3cmFwRmxhZyA/IFdyYXBBcm91bmQgOiAwKSB8IChzdGFydEluU2VsZWN0 aW9uID8gU3RhcnRJblNlbGVjdGlvbiA6IDApOwotICAgIHJldHVybiBmaW5kU3RyaW5nKHRhcmdl dCwgb3B0aW9ucyk7Ci19Ci0KIGJvb2wgRWRpdG9yOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYg dGFyZ2V0LCBGaW5kT3B0aW9ucyBvcHRpb25zKQogewogICAgIFZpc2libGVTZWxlY3Rpb24gc2Vs ZWN0aW9uID0gbV9mcmFtZS5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRp dGluZy9FZGl0b3IuaAkocmV2aXNpb24gMTU3MDc2KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9FZGl0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMzI1LDggKzMyNSw2IEBAIHB1YmxpYzoKICAg ICBTdHJpbmcgc2VsZWN0ZWRUZXh0KCkgY29uc3Q7CiAgICAgU3RyaW5nIHNlbGVjdGVkVGV4dEZv ckNsaXBib2FyZCgpIGNvbnN0OwogICAgIGJvb2wgZmluZFN0cmluZyhjb25zdCBTdHJpbmcmLCBG aW5kT3B0aW9ucyk7Ci0gICAgLy8gRklYTUU6IFN3aXRjaCBjYWxsZXJzIG92ZXIgdG8gdGhlIEZp bmRPcHRpb25zIHZlcnNpb24gYW5kIHJldGlyZSB0aGlzIG9uZS4KLSAgICBib29sIGZpbmRTdHJp bmcoY29uc3QgU3RyaW5nJiwgYm9vbCBmb3J3YXJkLCBib29sIGNhc2VGbGFnLCBib29sIHdyYXBG bGFnLCBib29sIHN0YXJ0SW5TZWxlY3Rpb24pOwogCiAgICAgUGFzc1JlZlB0cjxSYW5nZT4gcmFu Z2VPZlN0cmluZyhjb25zdCBTdHJpbmcmLCBSYW5nZSosIEZpbmRPcHRpb25zKTsKICAgICBQYXNz UmVmUHRyPFJhbmdlPiBmaW5kU3RyaW5nQW5kU2Nyb2xsVG9WaXNpYmxlKGNvbnN0IFN0cmluZyYs IFJhbmdlKiwgRmluZE9wdGlvbnMpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 b3JDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRv ckNvbW1hbmQuY3BwCShyZXZpc2lvbiAxNTcwNzYpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L0VkaXRvckNvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTIsNyArNDEyLDcgQEAgc3Rh dGljIGJvb2wgZXhlY3V0ZURlbGV0ZVdvcmRGb3J3YXJkKEZyYQogCiBzdGF0aWMgYm9vbCBleGVj dXRlRmluZFN0cmluZyhGcmFtZSYgZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwg Y29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsKLSAgICByZXR1cm4gZnJhbWUuZWRpdG9yKCkuZmluZFN0 cmluZyh2YWx1ZSwgdHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlKTsKKyAgICByZXR1cm4gZnJhbWUu ZWRpdG9yKCkuZmluZFN0cmluZyh2YWx1ZSwgQ2FzZUluc2Vuc2l0aXZlIHwgV3JhcEFyb3VuZCk7 CiB9CiAKIHN0YXRpYyBib29sIGV4ZWN1dGVGb250TmFtZShGcmFtZSYgZnJhbWUsIEV2ZW50Kiwg RWRpdG9yQ29tbWFuZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYgdmFsdWUpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCShyZXZpc2lvbiAxNTcwNzYpCisrKyBTb3VyY2UvV2Vi Q29yZS9wYWdlL0RPTVdpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOTgsOCArMTA5OCw5 IEBAIGJvb2wgRE9NV2luZG93OjpmaW5kKGNvbnN0IFN0cmluZyYgc3RyaW4KICAgICBpZiAoIWlz Q3VycmVudGx5RGlzcGxheWVkSW5GcmFtZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICAvLyBGSVhNRSAoMTMwMTYpOiBTdXBwb3J0IHdob2xlV29yZCwgc2VhcmNoSW5GcmFtZXMgYW5k IHNob3dEaWFsb2cKLSAgICByZXR1cm4gbV9mcmFtZS0+ZWRpdG9yKCkuZmluZFN0cmluZyhzdHJp bmcsICFiYWNrd2FyZHMsIGNhc2VTZW5zaXRpdmUsIHdyYXAsIGZhbHNlKTsKKyAgICAvLyBGSVhN RSAoMTMwMTYpOiBTdXBwb3J0IHdob2xlV29yZCwgc2VhcmNoSW5GcmFtZXMgYW5kIHNob3dEaWFs b2cuICAgIAorICAgIEZpbmRPcHRpb25zIG9wdGlvbnMgPSAoYmFja3dhcmRzID8gQmFja3dhcmRz IDogMCkgfCAoY2FzZVNlbnNpdGl2ZSA/IDAgOiBDYXNlSW5zZW5zaXRpdmUpIHwgKHdyYXAgPyBX cmFwQXJvdW5kIDogMCk7CisgICAgcmV0dXJuIG1fZnJhbWUtPmVkaXRvcigpLmZpbmRTdHJpbmco c3RyaW5nLCBvcHRpb25zKTsKIH0KIAogYm9vbCBET01XaW5kb3c6Om9mZnNjcmVlbkJ1ZmZlcmlu ZygpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDE1NzA3NikKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0NywxMSArNTQ3 LDYgQEAgc3RhdGljIEZyYW1lKiBpbmNyZW1lbnRGcmFtZShGcmFtZSogY3VycgogICAgICAgICA6 IGN1cnItPnRyZWUoKS50cmF2ZXJzZVByZXZpb3VzV2l0aFdyYXAod3JhcEZsYWcpOwogfQogCi1i b29sIFBhZ2U6OmZpbmRTdHJpbmcoY29uc3QgU3RyaW5nJiB0YXJnZXQsIFRleHRDYXNlU2Vuc2l0 aXZpdHkgY2FzZVNlbnNpdGl2aXR5LCBGaW5kRGlyZWN0aW9uIGRpcmVjdGlvbiwgYm9vbCBzaG91 bGRXcmFwKQotewotICAgIHJldHVybiBmaW5kU3RyaW5nKHRhcmdldCwgKGNhc2VTZW5zaXRpdml0 eSA9PSBUZXh0Q2FzZUluc2Vuc2l0aXZlID8gQ2FzZUluc2Vuc2l0aXZlIDogMCkgfCAoZGlyZWN0 aW9uID09IEZpbmREaXJlY3Rpb25CYWNrd2FyZCA/IEJhY2t3YXJkcyA6IDApIHwgKHNob3VsZFdy YXAgPyBXcmFwQXJvdW5kIDogMCkpOwotfQotCiBib29sIFBhZ2U6OmZpbmRTdHJpbmcoY29uc3Qg U3RyaW5nJiB0YXJnZXQsIEZpbmRPcHRpb25zIG9wdGlvbnMpCiB7CiAgICAgaWYgKHRhcmdldC5p c0VtcHR5KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gMTU3MDc2KQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNiw4ICsyMzYsNiBAQCBw dWJsaWM6CiAgICAgYm9vbCB0YWJLZXlDeWNsZXNUaHJvdWdoRWxlbWVudHMoKSBjb25zdCB7IHJl dHVybiBtX3RhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50czsgfQogCiAgICAgYm9vbCBmaW5kU3Ry aW5nKGNvbnN0IFN0cmluZyYsIEZpbmRPcHRpb25zKTsKLSAgICAvLyBGSVhNRTogU3dpdGNoIGNh bGxlcnMgb3ZlciB0byB0aGUgRmluZE9wdGlvbnMgdmVyc2lvbiBhbmQgcmV0aXJlIHRoaXMgb25l LgotICAgIGJvb2wgZmluZFN0cmluZyhjb25zdCBTdHJpbmcmLCBUZXh0Q2FzZVNlbnNpdGl2aXR5 LCBGaW5kRGlyZWN0aW9uLCBib29sIHNob3VsZFdyYXApOwogCiAgICAgUGFzc1JlZlB0cjxSYW5n ZT4gcmFuZ2VPZlN0cmluZyhjb25zdCBTdHJpbmcmLCBSYW5nZSosIEZpbmRPcHRpb25zKTsKIApJ bmRleDogU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvZWZsL0NoYW5nZUxvZwkocmV2aXNpb24gMTU3MDc3KQorKysgU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTAtMDcg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBDb25zb2xpZGF0ZSBmaW5k U3RyaW5nIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIyNDgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBld2svZXdrX2ZyYW1lLmNwcDoKKyAgICAgICAgKGV3a19mcmFtZV90ZXh0X3Nl YXJjaCk6CisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a192aWV3X3Rl eHRfc2VhcmNoKToKKwogMjAxMy0xMC0wNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgog CiAgICAgICAgIENUVEU6IFVzZSByZWZlcmVuY2VzIGluIGFuZCBhcm91bmQgRHJhZ0NvbnRyb2xs ZXIKSW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCShyZXZpc2lvbiAxNTcwNzYp CisrKyBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDk4LDcgKzQ5OCw4IEBAIEVpbmFfQm9vbCBld2tfZnJhbWVfdGV4dF9zZWFyY2goY29uc3Qg RXYKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc21hcnREYXRhLT5mcmFtZSwg ZmFsc2UpOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTCh0ZXh0LCBmYWxzZSk7 CiAKLSAgICByZXR1cm4gc21hcnREYXRhLT5mcmFtZS0+ZWRpdG9yKCkuZmluZFN0cmluZyhXVEY6 OlN0cmluZzo6ZnJvbVVURjgodGV4dCksIGZvcndhcmQsIGNhc2VTZW5zaXRpdmUsIHdyYXAsIHRy dWUpOworICAgIFdlYkNvcmU6OkZpbmRPcHRpb25zIG9wdGlvbnMgPSAoY2FzZVNlbnNpdGl2ZSA/ IDAgOiBXZWJDb3JlOjpDYXNlSW5zZW5zaXRpdmUpIHwgKGZvcndhcmQgPyAwIDogV2ViQ29yZTo6 QmFja3dhcmRzKSB8IChzaG91bGRXcmFwID8gV2ViQ29yZTo6V3JhcEFyb3VuZCA6IDApIHwgV2Vi Q29yZTo6U3RhcnRJblNlbGVjdGlvbjsKKyAgICByZXR1cm4gc21hcnREYXRhLT5mcmFtZS0+ZWRp dG9yKCkuZmluZFN0cmluZyhXVEY6OlN0cmluZzo6ZnJvbVVURjgodGV4dCksIG9wdGlvbnMpOwog fQogCiB1bnNpZ25lZCBpbnQgZXdrX2ZyYW1lX3RleHRfbWF0Y2hlc19tYXJrKEV2YXNfT2JqZWN0 KiBld2tGcmFtZSwgY29uc3QgY2hhciogc3RyaW5nLCBFaW5hX0Jvb2wgY2FzZVNlbnNpdGl2ZSwg RWluYV9Cb29sIGhpZ2hsaWdodCwgdW5zaWduZWQgaW50IGxpbWl0KQpJbmRleDogU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCShyZXZpc2lvbiAxNTcwNzYpCisrKyBTb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDk2LDIwICsxNDk2LDkgQEAg RWluYV9Cb29sIGV3a192aWV3X3RleHRfc2VhcmNoKGNvbnN0IEV2YQogICAgIEVXS19WSUVXX1NE X0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdf UFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOX1ZBTChzdHJpbmcsIGZhbHNlKTsKLSAgICBXVEY6OlRleHRDYXNl U2Vuc2l0aXZpdHkgc2Vuc2l0aXZlOwotICAgIFdlYkNvcmU6OkZpbmREaXJlY3Rpb24gZGlyZWN0 aW9uOwotCi0gICAgaWYgKGNhc2VTZW5zaXRpdmUpCi0gICAgICAgIHNlbnNpdGl2ZSA9IFdURjo6 VGV4dENhc2VTZW5zaXRpdmU7Ci0gICAgZWxzZQotICAgICAgICBzZW5zaXRpdmUgPSBXVEY6OlRl eHRDYXNlSW5zZW5zaXRpdmU7Ci0KLSAgICBpZiAoZm9yd2FyZCkKLSAgICAgICAgZGlyZWN0aW9u ID0gV2ViQ29yZTo6RmluZERpcmVjdGlvbkZvcndhcmQ7Ci0gICAgZWxzZQotICAgICAgICBkaXJl Y3Rpb24gPSBXZWJDb3JlOjpGaW5kRGlyZWN0aW9uQmFja3dhcmQ7CiAKLSAgICByZXR1cm4gcHJp di0+cGFnZS0+ZmluZFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KHN0cmluZyksIHNlbnNpdGl2ZSwg ZGlyZWN0aW9uLCB3cmFwKTsKKyAgICBXZWJDb3JlOjpGaW5kT3B0aW9ucyBvcHRpb25zID0gKGNh c2VTZW5zaXRpdmUgPyAwIDogV2ViQ29yZTo6Q2FzZUluc2Vuc2l0aXZlKSB8IChmb3J3YXJkID8g MCA6IFdlYkNvcmU6OkJhY2t3YXJkcykgfCAod3JhcCA/IFdlYkNvcmU6OldyYXBBcm91bmQgOiAw KTsKKyAgICByZXR1cm4gcHJpdi0+cGFnZS0+ZmluZFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KHN0 cmluZyksIG9wdGlvbnMpOwogfQogCiAvKioKSW5kZXg6IFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cJKHJldmlzaW9u IDE1NzA3NykKKysrIFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDEzLTEwLTA3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgQ29uc29saWRhdGUgZmluZFN0cmluZyBmdW5jdGlvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjQ4MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NlYXJjaF90ZXh0KToKKwogMjAxMy0x MC0wNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIENUVEU6IFVzZSBy ZWZlcmVuY2VzIGluIGFuZCBhcm91bmQgRHJhZ0NvbnRyb2xsZXIKSW5kZXg6IFNvdXJjZS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAJKHJldmlzaW9uIDE1NzA3NikKKysrIFNv dXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDM3NSwxMCArNDM3NSw4IEBAIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19zZWFyY2hfdGV4 dChXZWIKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmll dyksIEZBTFNFKTsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChzdHJpbmcsIEZBTFNFKTsKIAot ICAgIFRleHRDYXNlU2Vuc2l0aXZpdHkgY2FzZVNlbnNpdGl2aXR5ID0gY2FzZVNlbnNpdGl2ZSA/ IFRleHRDYXNlU2Vuc2l0aXZlIDogVGV4dENhc2VJbnNlbnNpdGl2ZTsKLSAgICBGaW5kRGlyZWN0 aW9uIGRpcmVjdGlvbiA9IGZvcndhcmQgPyBGaW5kRGlyZWN0aW9uRm9yd2FyZCA6IEZpbmREaXJl Y3Rpb25CYWNrd2FyZDsKLQotICAgIHJldHVybiBjb3JlKHdlYlZpZXcpLT5maW5kU3RyaW5nKFN0 cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwgY2FzZVNlbnNpdGl2aXR5LCBkaXJlY3Rpb24sIHNob3Vs ZFdyYXApOworICAgIEZpbmRPcHRpb25zIG9wdGlvbnMgPSAoY2FzZVNlbnNpdGl2ZSA/IDAgOiBD YXNlSW5zZW5zaXRpdmUpIHwgKGZvcndhcmQgPyAwIDogQmFja3dhcmRzKSB8IChzaG91bGRXcmFw ID8gV3JhcEFyb3VuZCA6IDApOworICAgIHJldHVybiBjb3JlKHdlYlZpZXcpLT5maW5kU3RyaW5n KFN0cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwgb3B0aW9ucyk7CiB9CiAKIC8qKgpJbmRleDogU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZwkocmV2aXNpb24gMTU3MDc3KQorKysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMTAtMDcgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBDb25zb2xpZGF0ZSBmaW5kU3RyaW5nIGZ1 bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTIyNDgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OnNlYXJjaEZvcik6CisKIDIwMTMtMTAt MDcgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBDVFRFOiBVc2UgcmVm ZXJlbmNlcyBpbiBhbmQgYXJvdW5kIERyYWdDb250cm9sbGVyCkluZGV4OiBTb3VyY2UvV2ViS2l0 L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3 LmNwcAkocmV2aXNpb24gMTU3MDc2KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTM1MTEsNyArMzUxMSw4IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FM TFRZUEUgV2ViVmlldzo6c2VhcmMKICAgICBpZiAoIXN0ciB8fCAhU3lzU3RyaW5nTGVuKHN0cikp CiAgICAgICAgIHJldHVybiBFX0lOVkFMSURBUkc7CiAKLSAgICAqZm91bmQgPSBtX3BhZ2UtPmZp bmRTdHJpbmcodG9TdHJpbmcoc3RyKSwgY2FzZUZsYWcgPyBUZXh0Q2FzZVNlbnNpdGl2ZSA6IFRl eHRDYXNlSW5zZW5zaXRpdmUsIGZvcndhcmQgPyBGaW5kRGlyZWN0aW9uRm9yd2FyZCA6IEZpbmRE aXJlY3Rpb25CYWNrd2FyZCwgd3JhcEZsYWcpOworICAgIEZpbmRPcHRpb25zIG9wdGlvbnMgPSAo Y2FzZUZsYWcgPyAwIDogQ2FzZUluc2Vuc2l0aXZlKSB8IChmb3J3YXJkID8gMCA6IEJhY2t3YXJk cykgfCAod3JhcEZsYWcgPyBXcmFwQXJvdW5kIDogMCk7CisgICAgKmZvdW5kID0gbV9wYWdlLT5m aW5kU3RyaW5nKHRvU3RyaW5nKHN0ciksIG9wdGlvbnMpOwogICAgIHJldHVybiBTX09LOwogfQog Cg==