133677 2014-06-09 23:13:15 -0700 Page::findStringMatchingRanges() should take Vector<RefPtr<Range>> by reference instead of pointer 2014-06-16 09:43:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan andersca oldest_to_newest 1014355 0 zan 2014-06-09 23:13:15 -0700 Page::findStringMatchingRanges() should take Vector<RefPtr<Range>> by reference instead of pointer 1014356 1 232772 zan 2014-06-09 23:15:18 -0700 Created attachment 232772 Patch 1015010 2 232772 andersca 2014-06-11 20:21:26 -0700 Comment on attachment 232772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232772&action=review > Source/WebCore/page/Page.cpp:542 > +void Page::findStringMatchingRanges(const String& target, FindOptions options, int limit, Vector<RefPtr<Range>>& matchRanges, int& indexForSelection) Can this be a const reference? 1015671 3 232772 zan 2014-06-14 10:56:19 -0700 Comment on attachment 232772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232772&action=review >> Source/WebCore/page/Page.cpp:542 >> +void Page::findStringMatchingRanges(const String& target, FindOptions options, int limit, Vector<RefPtr<Range>>& matchRanges, int& indexForSelection) > > Can this be a const reference? No, that would clash with Editor::countMatchesForText() which expects a pointer to a non-const Vector. 1015673 4 233112 zan 2014-06-14 11:01:04 -0700 Created attachment 233112 Patch 1015880 5 233112 zan 2014-06-16 09:42:59 -0700 Comment on attachment 233112 Patch Clearing flags on attachment: 233112 Committed r170012: <http://trac.webkit.org/changeset/170012> 1015881 6 zan 2014-06-16 09:43:06 -0700 All reviewed patches have been landed. Closing bug. 232772 2014-06-09 23:15:18 -0700 2014-06-14 11:00:57 -0700 Patch bug-133677-20140609231452.patch text/plain 6909 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDkyM2I3NGUxMGIxYTQy MDlmYWEwNjk4MjYzNjUwODNiYjYyN2I4OS4uN2U1OTRhMDA2NDE5MDY3ZTAxYTc5ZjdjZTMxYWIy MTczZmIyNmRlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA2LTA5ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQYWdlOjpmaW5kU3Ry aW5nTWF0Y2hpbmdSYW5nZXMoKSBzaG91bGQgdGFrZSBWZWN0b3I8UmVmUHRyPFJhbmdlPj4gYnkg cmVmZXJlbmNlIGluc3RlYWQgb2YgcG9pbnRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzNjc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZTo6ZmluZFN0cmluZ01hdGNoaW5nUmFuZ2VzKTogVGhlIG1ldGhvZCBleHBlY3RzIHRoZSBt YXRjaFJhbmdlcyBwYXJhbWV0ZXIgdG8gYmUgbm9uLW51bGwsCisgICAgICAgIHNvIGl0IHNob3Vs ZCB0YWtlIGluIHRoYXQgcGFyYW1ldGVyIGJ5IHJlZmVyZW5jZSBpbnN0ZWFkIG9mIHBvaW50ZXIu CisgICAgICAgICogcGFnZS9QYWdlLmg6CisKIDIwMTQtMDYtMDkgIEVyaWMgQ2FybHNvbiAgPGVy aWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gV2lyZWxlc3Mgcm91dGUgcGlj a2VyIGNvbnRyb2wgc2hvdWxkIHVzZSB0b3VjaCBldmVudCBoYW5kbGVycwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4 IDk3ZTY0N2VmMjI1NzhhMTIyNjY5Y2UyNjQzODk0Mzk2ZmVmYjg2MTYuLjRkZDhiZTc3MTRkN2M1 YjAzOWZjY2ExMGUwOTExMjI4NWE0MmFlMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxNC0wNi0wOSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAg ICAgUGFnZTo6ZmluZFN0cmluZ01hdGNoaW5nUmFuZ2VzKCkgc2hvdWxkIHRha2UgVmVjdG9yPFJl ZlB0cjxSYW5nZT4+IGJ5IHJlZmVyZW5jZSBpbnN0ZWFkIG9mIHBvaW50ZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzY3NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L0ZpbmRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OmZp bmRTdHJpbmcpOiBVcGRhdGUgdGhlIGNhbGwgdG8gUGFnZTo6ZmluZFN0cmluZ01hdGNoaW5nUmFu Z2VzKCkgdG8gcGFzcworICAgICAgICBpbiBhIFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiByZWZlcmVu Y2UgaW5zdGVhZCBvZiBhIHBvaW50ZXIuCisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVy OjpmaW5kU3RyaW5nTWF0Y2hlcyk6IERpdHRvLgorCiAyMDE0LTA2LTA5ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGJ1aWxkLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5jcHAKaW5kZXggMTFlODkzNDMyYjcwMDI3MmE5MDI3ZWNiODZmMmNjZmQxMTNjYzAxYS4uMjZh ZmUzN2ZiMzkxZDU2ZjQzZGNhMTY2ZDU0ZDgyZjVhNmQyY2JiMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3Bw CkBAIC01MzksMzUgKzUzOSwzNSBAQCBib29sIFBhZ2U6OmZpbmRTdHJpbmcoY29uc3QgU3RyaW5n JiB0YXJnZXQsIEZpbmRPcHRpb25zIG9wdGlvbnMpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12 b2lkIFBhZ2U6OmZpbmRTdHJpbmdNYXRjaGluZ1Jhbmdlcyhjb25zdCBTdHJpbmcmIHRhcmdldCwg RmluZE9wdGlvbnMgb3B0aW9ucywgaW50IGxpbWl0LCBWZWN0b3I8UmVmUHRyPFJhbmdlPj4qIG1h dGNoUmFuZ2VzLCBpbnQmIGluZGV4Rm9yU2VsZWN0aW9uKQordm9pZCBQYWdlOjpmaW5kU3RyaW5n TWF0Y2hpbmdSYW5nZXMoY29uc3QgU3RyaW5nJiB0YXJnZXQsIEZpbmRPcHRpb25zIG9wdGlvbnMs IGludCBsaW1pdCwgVmVjdG9yPFJlZlB0cjxSYW5nZT4+JiBtYXRjaFJhbmdlcywgaW50JiBpbmRl eEZvclNlbGVjdGlvbikKIHsKICAgICBpbmRleEZvclNlbGVjdGlvbiA9IDA7CiAKICAgICBGcmFt ZSogZnJhbWUgPSAmbWFpbkZyYW1lKCk7CiAgICAgRnJhbWUqIGZyYW1lV2l0aFNlbGVjdGlvbiA9 IDA7CiAgICAgZG8gewotICAgICAgICBmcmFtZS0+ZWRpdG9yKCkuY291bnRNYXRjaGVzRm9yVGV4 dCh0YXJnZXQsIDAsIG9wdGlvbnMsIGxpbWl0ID8gKGxpbWl0IC0gbWF0Y2hSYW5nZXMtPnNpemUo KSkgOiAwLCB0cnVlLCBtYXRjaFJhbmdlcyk7CisgICAgICAgIGZyYW1lLT5lZGl0b3IoKS5jb3Vu dE1hdGNoZXNGb3JUZXh0KHRhcmdldCwgMCwgb3B0aW9ucywgbGltaXQgPyAobGltaXQgLSBtYXRj aFJhbmdlcy5zaXplKCkpIDogMCwgdHJ1ZSwgJm1hdGNoUmFuZ2VzKTsKICAgICAgICAgaWYgKGZy YW1lLT5zZWxlY3Rpb24oKS5pc1JhbmdlKCkpCiAgICAgICAgICAgICBmcmFtZVdpdGhTZWxlY3Rp b24gPSBmcmFtZTsKICAgICAgICAgZnJhbWUgPSBpbmNyZW1lbnRGcmFtZShmcmFtZSwgdHJ1ZSwg ZmFsc2UpOwogICAgIH0gd2hpbGUgKGZyYW1lKTsKIAotICAgIGlmIChtYXRjaFJhbmdlcy0+aXNF bXB0eSgpKQorICAgIGlmIChtYXRjaFJhbmdlcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsK IAogICAgIGlmIChmcmFtZVdpdGhTZWxlY3Rpb24pIHsKICAgICAgICAgaW5kZXhGb3JTZWxlY3Rp b24gPSBOb01hdGNoQWZ0ZXJVc2VyU2VsZWN0aW9uOwogICAgICAgICBSZWZQdHI8UmFuZ2U+IHNl bGVjdGVkUmFuZ2UgPSBmcmFtZVdpdGhTZWxlY3Rpb24tPnNlbGVjdGlvbigpLnNlbGVjdGlvbigp LmZpcnN0UmFuZ2UoKTsKICAgICAgICAgaWYgKG9wdGlvbnMgJiBCYWNrd2FyZHMpIHsKLSAgICAg ICAgICAgIGZvciAoc2l6ZV90IGkgPSBtYXRjaFJhbmdlcy0+c2l6ZSgpOyBpID4gMDsgLS1pKSB7 Ci0gICAgICAgICAgICAgICAgaWYgKHNlbGVjdGVkUmFuZ2UtPmNvbXBhcmVCb3VuZGFyeVBvaW50 cyhSYW5nZTo6RU5EX1RPX1NUQVJULCBtYXRjaFJhbmdlcy0+YXQoaSAtIDEpLmdldCgpLCBJR05P UkVfRVhDRVBUSU9OKSA+IDApIHsKKyAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSBtYXRjaFJh bmdlcy5zaXplKCk7IGkgPiAwOyAtLWkpIHsKKyAgICAgICAgICAgICAgICBpZiAoc2VsZWN0ZWRS YW5nZS0+Y29tcGFyZUJvdW5kYXJ5UG9pbnRzKFJhbmdlOjpFTkRfVE9fU1RBUlQsIG1hdGNoUmFu Z2VzW2kgLSAxXS5nZXQoKSwgSUdOT1JFX0VYQ0VQVElPTikgPiAwKSB7CiAgICAgICAgICAgICAg ICAgICAgIGluZGV4Rm9yU2VsZWN0aW9uID0gaSAtIDE7CiAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsK LSAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbWF0Y2hSYW5nZXMtPnNpemUoKTsg KytpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKHNlbGVjdGVkUmFuZ2UtPmNvbXBhcmVCb3VuZGFy eVBvaW50cyhSYW5nZTo6U1RBUlRfVE9fRU5ELCBtYXRjaFJhbmdlcy0+YXQoaSkuZ2V0KCksIElH Tk9SRV9FWENFUFRJT04pIDwgMCkgeworICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDAsIHNp emUgPSBtYXRjaFJhbmdlcy5zaXplKCk7IGkgPCBzaXplOyArK2kpIHsKKyAgICAgICAgICAgICAg ICBpZiAoc2VsZWN0ZWRSYW5nZS0+Y29tcGFyZUJvdW5kYXJ5UG9pbnRzKFJhbmdlOjpTVEFSVF9U T19FTkQsIG1hdGNoUmFuZ2VzW2ldLmdldCgpLCBJR05PUkVfRVhDRVBUSU9OKSA8IDApIHsKICAg ICAgICAgICAgICAgICAgICAgaW5kZXhGb3JTZWxlY3Rpb24gPSBpOwogICAgICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CkBAIC01NzUsNyArNTc1LDcgQEAgdm9pZCBQ YWdlOjpmaW5kU3RyaW5nTWF0Y2hpbmdSYW5nZXMoY29uc3QgU3RyaW5nJiB0YXJnZXQsIEZpbmRP cHRpb25zIG9wdGlvbnMsIGkKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChv cHRpb25zICYgQmFja3dhcmRzKQotICAgICAgICAgICAgaW5kZXhGb3JTZWxlY3Rpb24gPSBtYXRj aFJhbmdlcy0+c2l6ZSgpIC0gMTsKKyAgICAgICAgICAgIGluZGV4Rm9yU2VsZWN0aW9uID0gbWF0 Y2hSYW5nZXMuc2l6ZSgpIC0gMTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgaW5kZXhGb3JT ZWxlY3Rpb24gPSAwOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggNGJmMDU2YTQ3OGQ0ZDAxM2Zj MDU0YTIxYzBlMjYxMDU1ZTA1NTViYS4uZTNiYjQ0MDIxZmUzNjNlMjA0ZDJmNDM1YjJmYzk3Nzlk NmJiYzY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTI1MSw3ICsyNTEsNyBAQCBwdWJsaWM6CiAgICAg Ly8gdGhlIGluZGV4IG9mIHRoZSBmaXJzdCByYW5nZSBhZnRlciB0aGUgdXNlciBzZWxlY3Rpb24K ICAgICAvLyBOb01hdGNoQWZ0ZXJVc2VyU2VsZWN0aW9uIGlmIHRoZXJlIGlzIG5vIG1hdGNoaW5n IHRleHQgYWZ0ZXIgdGhlIHVzZXIgc2VsZWN0aW9uLgogICAgIGVudW0geyBOb01hdGNoQWZ0ZXJV c2VyU2VsZWN0aW9uID0gLTEgfTsKLSAgICB2b2lkIGZpbmRTdHJpbmdNYXRjaGluZ1Jhbmdlcyhj b25zdCBTdHJpbmcmLCBGaW5kT3B0aW9ucywgaW50IG1heENvdW50LCBWZWN0b3I8UmVmUHRyPFJh bmdlPj4qLCBpbnQmIGluZGV4Rm9yU2VsZWN0aW9uKTsKKyAgICB2b2lkIGZpbmRTdHJpbmdNYXRj aGluZ1Jhbmdlcyhjb25zdCBTdHJpbmcmLCBGaW5kT3B0aW9ucywgaW50IG1heENvdW50LCBWZWN0 b3I8UmVmUHRyPFJhbmdlPj4mLCBpbnQmIGluZGV4Rm9yU2VsZWN0aW9uKTsKICNpZiBQTEFURk9S TShDT0NPQSkKICAgICB2b2lkIGFkZFNjaGVkdWxlUGFpcihQYXNzUmVmUHRyPFNjaGVkdWxlUGFp cj4pOwogICAgIHZvaWQgcmVtb3ZlU2NoZWR1bGVQYWlyKFBhc3NSZWZQdHI8U2NoZWR1bGVQYWly Pik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENv bnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250 cm9sbGVyLmNwcAppbmRleCAxZjAwMDA1NDU5ZGRlNWY3MGY1N2I3MGI3ZGQ4M2RhNzAzOTY4OTMz Li4zOWNjZDZhNzE2MjI5MGRiZTU5Yjc1MDVmNjE5ZTlkMjI2YTRiZTY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAg LTIwOSw3ICsyMDksNyBAQCB2b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0IFN0 cmluZyYgc3RyaW5nLCBGaW5kT3B0aW9ucyBvcHRpb25zLCB1bnNpZwogICAgICAgICAgICAgaWYg KGZzLnNlbGVjdGlvbkJvdW5kcygpLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgIG1fZmlu ZE1hdGNoZXMuY2xlYXIoKTsKICAgICAgICAgICAgICAgICBpbnQgaW5kZXhGb3JTZWxlY3Rpb247 Ci0gICAgICAgICAgICAgICAgbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5maW5kU3RyaW5nTWF0Y2hp bmdSYW5nZXMoc3RyaW5nLCBjb3JlKG9wdGlvbnMpLCBtYXhNYXRjaENvdW50LCAmbV9maW5kTWF0 Y2hlcywgaW5kZXhGb3JTZWxlY3Rpb24pOworICAgICAgICAgICAgICAgIG1fd2ViUGFnZS0+Y29y ZVBhZ2UoKS0+ZmluZFN0cmluZ01hdGNoaW5nUmFuZ2VzKHN0cmluZywgY29yZShvcHRpb25zKSwg bWF4TWF0Y2hDb3VudCwgbV9maW5kTWF0Y2hlcywgaW5kZXhGb3JTZWxlY3Rpb24pOwogICAgICAg ICAgICAgICAgIG1fZm91bmRTdHJpbmdNYXRjaEluZGV4ID0gaW5kZXhGb3JTZWxlY3Rpb247CiAg ICAgICAgICAgICAgICAgZm91bmRTdHJpbmdTdGFydHNBZnRlclNlbGVjdGlvbiA9IHRydWU7CiAg ICAgICAgICAgICB9CkBAIC0yMzcsNyArMjM3LDcgQEAgdm9pZCBGaW5kQ29udHJvbGxlcjo6Zmlu ZFN0cmluZ01hdGNoZXMoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmRPcHRpb25zIG9wdGlvbnMK ICAgICBtX2ZpbmRNYXRjaGVzLmNsZWFyKCk7CiAgICAgaW50IGluZGV4Rm9yU2VsZWN0aW9uOwog Ci0gICAgbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5maW5kU3RyaW5nTWF0Y2hpbmdSYW5nZXMoc3Ry aW5nLCBjb3JlKG9wdGlvbnMpLCBtYXhNYXRjaENvdW50LCAmbV9maW5kTWF0Y2hlcywgaW5kZXhG b3JTZWxlY3Rpb24pOworICAgIG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+ZmluZFN0cmluZ01hdGNo aW5nUmFuZ2VzKHN0cmluZywgY29yZShvcHRpb25zKSwgbWF4TWF0Y2hDb3VudCwgbV9maW5kTWF0 Y2hlcywgaW5kZXhGb3JTZWxlY3Rpb24pOwogCiAgICAgVmVjdG9yPFZlY3RvcjxJbnRSZWN0Pj4g bWF0Y2hSZWN0czsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fZmluZE1hdGNoZXMuc2l6 ZSgpOyArK2kpIHsK 233112 2014-06-14 11:01:04 -0700 2014-06-16 09:42:59 -0700 Patch bug-133677-20140614110040.patch text/plain 7879 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc3M2NlNzgwZGFjNDY5 YWFjZDk1OTMzMjRmZGEwYzFiNDAyYWRhMy4uN2I2N2FiYjdhM2E3YmY5MGIxODljOTg1ZDhiYjQz ZjEwNWYxYTQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA2LTE0ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQYWdlOjpmaW5kU3Ry aW5nTWF0Y2hpbmdSYW5nZXMoKSBzaG91bGQgdGFrZSBWZWN0b3I8UmVmUHRyPFJhbmdlPj4gYnkg cmVmZXJlbmNlIGluc3RlYWQgb2YgcG9pbnRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzNjc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogVXBkYXRlIHRoZSBjaGFuZ2Vk IHN5bWJvbC4KKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFn ZTo6ZmluZFN0cmluZ01hdGNoaW5nUmFuZ2VzKTogVGhlIG1ldGhvZCBleHBlY3RzIHRoZSBtYXRj aFJhbmdlcyBwYXJhbWV0ZXIgdG8gYmUgbm9uLW51bGwsCisgICAgICAgIHNvIGl0IHNob3VsZCB0 YWtlIGluIHRoYXQgcGFyYW1ldGVyIGJ5IHJlZmVyZW5jZSBpbnN0ZWFkIG9mIHBvaW50ZXIuCisg ICAgICAgICogcGFnZS9QYWdlLmg6CisKIDIwMTQtMDYtMTQgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggYWZ0ZXIgcjE2 OTk2MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwppbmRleCA3MjZjOTRlZGMxZWYwNDA2ZDk4NDk1ZjRjMjNlNjA4NWJiNzVk MTEzLi4wMTYyMTc1NmM4YTA2YTI3NjdjMmVmYjhlNmY2ZTRhOGQ3NTVjNDFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMTcgQEAKIDIwMTQtMDYtMTQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0Bp Z2FsaWEuY29tPgogCisgICAgICAgIFBhZ2U6OmZpbmRTdHJpbmdNYXRjaGluZ1JhbmdlcygpIHNo b3VsZCB0YWtlIFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiBieSByZWZlcmVuY2UgaW5zdGVhZCBvZiBw b2ludGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzM2NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6 OkZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKTogVXBkYXRlIHRoZSBjYWxsIHRvIFBhZ2U6OmZp bmRTdHJpbmdNYXRjaGluZ1JhbmdlcygpIHRvIHBhc3MKKyAgICAgICAgaW4gYSBWZWN0b3I8UmVm UHRyPFJhbmdlPj4gcmVmZXJlbmNlIGluc3RlYWQgb2YgYSBwb2ludGVyLgorICAgICAgICAoV2Vi S2l0OjpGaW5kQ29udHJvbGxlcjo6ZmluZFN0cmluZ01hdGNoZXMpOiBEaXR0by4KKworMjAxNC0w Ni0xNCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXggZm9yIHRoZSBHVEsrIHBvcnQuCiAgICAgICAgIEZpeGluZyB0aGUg Y2FsbGJhY2sgbGFtYmRhIHBhcmFtZXRlcnMgYWZ0ZXIgcjE2OTk2Mi4KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbgppbmRleCA1YWU5ODI3MWQxMDQ1ZjcyZjJlMzFlMDE0ZDgwNGQ3YTIzZGY5NTc3Li4wMmVl NGNiMGZlMTRjYmUwYTZkNWM2MzcyY2JhNjA2NGE5MjVlNzJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgpAQCAtMTEwOSw3ICsxMTA5LDcgQEAgX19aTjdXZWJDb3JlNFBhZ2UyMm5vbkZhc3RTY3JvbGxh YmxlUmVjdHNFUEtOU181RnJhbWVFCiBfX1pON1dlYkNvcmU0UGFnZTIycmVtb3ZlTGF5b3V0TWls ZXN0b25lc0VqCiBfX1pON1dlYkNvcmU0UGFnZTIzY2xlYXJVbmRvUmVkb09wZXJhdGlvbnNFdgog X19aTjdXZWJDb3JlNFBhZ2UyM2ludmFsaWRhdGVTdHlsZXNGb3JMaW5rRXkKLV9fWk43V2ViQ29y ZTRQYWdlMjRmaW5kU3RyaW5nTWF0Y2hpbmdSYW5nZXNFUktOM1dURjZTdHJpbmdFaGlQTlMxXzZW ZWN0b3JJTlMxXzZSZWZQdHJJTlNfNVJhbmdlRUVFTG0wRU5TMV8xNUNyYXNoT25PdmVyZmxvd0VF RVJpCitfX1pON1dlYkNvcmU0UGFnZTI0ZmluZFN0cmluZ01hdGNoaW5nUmFuZ2VzRVJLTjNXVEY2 U3RyaW5nRWhpUk5TMV82VmVjdG9ySU5TMV82UmVmUHRySU5TXzVSYW5nZUVFRUxtMEVOUzFfMTVD cmFzaE9uT3ZlcmZsb3dFRUVSaQogX19aTjdXZWJDb3JlNFBhZ2UyNHJlc3VtZVNjcmlwdGVkQW5p bWF0aW9uc0V2CiBfX1pON1dlYkNvcmU0UGFnZTI0c2Nyb2xsaW5nU3RhdGVUcmVlQXNUZXh0RXYK IF9fWk43V2ViQ29yZTRQYWdlMjVzdXNwZW5kU2NyaXB0ZWRBbmltYXRpb25zRXYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2UuY3BwCmluZGV4IDExZTg5MzQzMmI3MDAyNzJhOTAyN2VjYjg2ZjJjY2ZkMTEzY2MwMWEuLjI2 YWZlMzdmYjM5MWQ1NmY0M2RjYTE2NmQ1NGQ4MmY1YTZkMmNiYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNw cApAQCAtNTM5LDM1ICs1MzksMzUgQEAgYm9vbCBQYWdlOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmlu ZyYgdGFyZ2V0LCBGaW5kT3B0aW9ucyBvcHRpb25zKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAot dm9pZCBQYWdlOjpmaW5kU3RyaW5nTWF0Y2hpbmdSYW5nZXMoY29uc3QgU3RyaW5nJiB0YXJnZXQs IEZpbmRPcHRpb25zIG9wdGlvbnMsIGludCBsaW1pdCwgVmVjdG9yPFJlZlB0cjxSYW5nZT4+KiBt YXRjaFJhbmdlcywgaW50JiBpbmRleEZvclNlbGVjdGlvbikKK3ZvaWQgUGFnZTo6ZmluZFN0cmlu Z01hdGNoaW5nUmFuZ2VzKGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBGaW5kT3B0aW9ucyBvcHRpb25z LCBpbnQgbGltaXQsIFZlY3RvcjxSZWZQdHI8UmFuZ2U+PiYgbWF0Y2hSYW5nZXMsIGludCYgaW5k ZXhGb3JTZWxlY3Rpb24pCiB7CiAgICAgaW5kZXhGb3JTZWxlY3Rpb24gPSAwOwogCiAgICAgRnJh bWUqIGZyYW1lID0gJm1haW5GcmFtZSgpOwogICAgIEZyYW1lKiBmcmFtZVdpdGhTZWxlY3Rpb24g PSAwOwogICAgIGRvIHsKLSAgICAgICAgZnJhbWUtPmVkaXRvcigpLmNvdW50TWF0Y2hlc0ZvclRl eHQodGFyZ2V0LCAwLCBvcHRpb25zLCBsaW1pdCA/IChsaW1pdCAtIG1hdGNoUmFuZ2VzLT5zaXpl KCkpIDogMCwgdHJ1ZSwgbWF0Y2hSYW5nZXMpOworICAgICAgICBmcmFtZS0+ZWRpdG9yKCkuY291 bnRNYXRjaGVzRm9yVGV4dCh0YXJnZXQsIDAsIG9wdGlvbnMsIGxpbWl0ID8gKGxpbWl0IC0gbWF0 Y2hSYW5nZXMuc2l6ZSgpKSA6IDAsIHRydWUsICZtYXRjaFJhbmdlcyk7CiAgICAgICAgIGlmIChm cmFtZS0+c2VsZWN0aW9uKCkuaXNSYW5nZSgpKQogICAgICAgICAgICAgZnJhbWVXaXRoU2VsZWN0 aW9uID0gZnJhbWU7CiAgICAgICAgIGZyYW1lID0gaW5jcmVtZW50RnJhbWUoZnJhbWUsIHRydWUs IGZhbHNlKTsKICAgICB9IHdoaWxlIChmcmFtZSk7CiAKLSAgICBpZiAobWF0Y2hSYW5nZXMtPmlz RW1wdHkoKSkKKyAgICBpZiAobWF0Y2hSYW5nZXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47 CiAKICAgICBpZiAoZnJhbWVXaXRoU2VsZWN0aW9uKSB7CiAgICAgICAgIGluZGV4Rm9yU2VsZWN0 aW9uID0gTm9NYXRjaEFmdGVyVXNlclNlbGVjdGlvbjsKICAgICAgICAgUmVmUHRyPFJhbmdlPiBz ZWxlY3RlZFJhbmdlID0gZnJhbWVXaXRoU2VsZWN0aW9uLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb24o KS5maXJzdFJhbmdlKCk7CiAgICAgICAgIGlmIChvcHRpb25zICYgQmFja3dhcmRzKSB7Ci0gICAg ICAgICAgICBmb3IgKHNpemVfdCBpID0gbWF0Y2hSYW5nZXMtPnNpemUoKTsgaSA+IDA7IC0taSkg ewotICAgICAgICAgICAgICAgIGlmIChzZWxlY3RlZFJhbmdlLT5jb21wYXJlQm91bmRhcnlQb2lu dHMoUmFuZ2U6OkVORF9UT19TVEFSVCwgbWF0Y2hSYW5nZXMtPmF0KGkgLSAxKS5nZXQoKSwgSUdO T1JFX0VYQ0VQVElPTikgPiAwKSB7CisgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gbWF0Y2hS YW5nZXMuc2l6ZSgpOyBpID4gMDsgLS1pKSB7CisgICAgICAgICAgICAgICAgaWYgKHNlbGVjdGVk UmFuZ2UtPmNvbXBhcmVCb3VuZGFyeVBvaW50cyhSYW5nZTo6RU5EX1RPX1NUQVJULCBtYXRjaFJh bmdlc1tpIC0gMV0uZ2V0KCksIElHTk9SRV9FWENFUFRJT04pID4gMCkgewogICAgICAgICAgICAg ICAgICAgICBpbmRleEZvclNlbGVjdGlvbiA9IGkgLSAxOwogICAgICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1hdGNoUmFuZ2VzLT5zaXplKCk7 ICsraSkgewotICAgICAgICAgICAgICAgIGlmIChzZWxlY3RlZFJhbmdlLT5jb21wYXJlQm91bmRh cnlQb2ludHMoUmFuZ2U6OlNUQVJUX1RPX0VORCwgbWF0Y2hSYW5nZXMtPmF0KGkpLmdldCgpLCBJ R05PUkVfRVhDRVBUSU9OKSA8IDApIHsKKyAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwLCBz aXplID0gbWF0Y2hSYW5nZXMuc2l6ZSgpOyBpIDwgc2l6ZTsgKytpKSB7CisgICAgICAgICAgICAg ICAgaWYgKHNlbGVjdGVkUmFuZ2UtPmNvbXBhcmVCb3VuZGFyeVBvaW50cyhSYW5nZTo6U1RBUlRf VE9fRU5ELCBtYXRjaFJhbmdlc1tpXS5nZXQoKSwgSUdOT1JFX0VYQ0VQVElPTikgPCAwKSB7CiAg ICAgICAgICAgICAgICAgICAgIGluZGV4Rm9yU2VsZWN0aW9uID0gaTsKICAgICAgICAgICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQpAQCAtNTc1LDcgKzU3NSw3IEBAIHZvaWQg UGFnZTo6ZmluZFN0cmluZ01hdGNoaW5nUmFuZ2VzKGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBGaW5k T3B0aW9ucyBvcHRpb25zLCBpCiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpZiAo b3B0aW9ucyAmIEJhY2t3YXJkcykKLSAgICAgICAgICAgIGluZGV4Rm9yU2VsZWN0aW9uID0gbWF0 Y2hSYW5nZXMtPnNpemUoKSAtIDE7CisgICAgICAgICAgICBpbmRleEZvclNlbGVjdGlvbiA9IG1h dGNoUmFuZ2VzLnNpemUoKSAtIDE7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGluZGV4Rm9y U2VsZWN0aW9uID0gMDsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDRiZjA1NmE0NzhkNGQwMTNm YzA1NGEyMWMwZTI2MTA1NWUwNTU1YmEuLmUzYmI0NDAyMWZlMzYzZTIwNGQyZjQzNWIyZmM5Nzc5 ZDZiYmM2OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0yNTEsNyArMjUxLDcgQEAgcHVibGljOgogICAg IC8vIHRoZSBpbmRleCBvZiB0aGUgZmlyc3QgcmFuZ2UgYWZ0ZXIgdGhlIHVzZXIgc2VsZWN0aW9u CiAgICAgLy8gTm9NYXRjaEFmdGVyVXNlclNlbGVjdGlvbiBpZiB0aGVyZSBpcyBubyBtYXRjaGlu ZyB0ZXh0IGFmdGVyIHRoZSB1c2VyIHNlbGVjdGlvbi4KICAgICBlbnVtIHsgTm9NYXRjaEFmdGVy VXNlclNlbGVjdGlvbiA9IC0xIH07Ci0gICAgdm9pZCBmaW5kU3RyaW5nTWF0Y2hpbmdSYW5nZXMo Y29uc3QgU3RyaW5nJiwgRmluZE9wdGlvbnMsIGludCBtYXhDb3VudCwgVmVjdG9yPFJlZlB0cjxS YW5nZT4+KiwgaW50JiBpbmRleEZvclNlbGVjdGlvbik7CisgICAgdm9pZCBmaW5kU3RyaW5nTWF0 Y2hpbmdSYW5nZXMoY29uc3QgU3RyaW5nJiwgRmluZE9wdGlvbnMsIGludCBtYXhDb3VudCwgVmVj dG9yPFJlZlB0cjxSYW5nZT4+JiwgaW50JiBpbmRleEZvclNlbGVjdGlvbik7CiAjaWYgUExBVEZP Uk0oQ09DT0EpCiAgICAgdm9pZCBhZGRTY2hlZHVsZVBhaXIoUGFzc1JlZlB0cjxTY2hlZHVsZVBh aXI+KTsKICAgICB2b2lkIHJlbW92ZVNjaGVkdWxlUGFpcihQYXNzUmVmUHRyPFNjaGVkdWxlUGFp cj4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29u dHJvbGxlci5jcHAKaW5kZXggNGQ3MzkwYWIwYjRjNmM5MTNiYzM0MWI5OGI1NDZiMjJkYmQ1MTMy NS4uODVlMDVlYmNhNmNkMGI1NjM3YzQzN2NkMjYzOTg2ODJiNWE3OWUyMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCkBA IC0yMDksNyArMjA5LDcgQEAgdm9pZCBGaW5kQ29udHJvbGxlcjo6ZmluZFN0cmluZyhjb25zdCBT dHJpbmcmIHN0cmluZywgRmluZE9wdGlvbnMgb3B0aW9ucywgdW5zaWcKICAgICAgICAgICAgIGlm IChmcy5zZWxlY3Rpb25Cb3VuZHMoKS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgICAgICBtX2Zp bmRNYXRjaGVzLmNsZWFyKCk7CiAgICAgICAgICAgICAgICAgaW50IGluZGV4Rm9yU2VsZWN0aW9u OwotICAgICAgICAgICAgICAgIG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+ZmluZFN0cmluZ01hdGNo aW5nUmFuZ2VzKHN0cmluZywgY29yZShvcHRpb25zKSwgbWF4TWF0Y2hDb3VudCwgJm1fZmluZE1h dGNoZXMsIGluZGV4Rm9yU2VsZWN0aW9uKTsKKyAgICAgICAgICAgICAgICBtX3dlYlBhZ2UtPmNv cmVQYWdlKCktPmZpbmRTdHJpbmdNYXRjaGluZ1JhbmdlcyhzdHJpbmcsIGNvcmUob3B0aW9ucyks IG1heE1hdGNoQ291bnQsIG1fZmluZE1hdGNoZXMsIGluZGV4Rm9yU2VsZWN0aW9uKTsKICAgICAg ICAgICAgICAgICBtX2ZvdW5kU3RyaW5nTWF0Y2hJbmRleCA9IGluZGV4Rm9yU2VsZWN0aW9uOwog ICAgICAgICAgICAgICAgIGZvdW5kU3RyaW5nU3RhcnRzQWZ0ZXJTZWxlY3Rpb24gPSB0cnVlOwog ICAgICAgICAgICAgfQpAQCAtMjM3LDcgKzIzNyw3IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmZp bmRTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBGaW5kT3B0aW9ucyBvcHRpb25z CiAgICAgbV9maW5kTWF0Y2hlcy5jbGVhcigpOwogICAgIGludCBpbmRleEZvclNlbGVjdGlvbjsK IAotICAgIG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+ZmluZFN0cmluZ01hdGNoaW5nUmFuZ2VzKHN0 cmluZywgY29yZShvcHRpb25zKSwgbWF4TWF0Y2hDb3VudCwgJm1fZmluZE1hdGNoZXMsIGluZGV4 Rm9yU2VsZWN0aW9uKTsKKyAgICBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPmZpbmRTdHJpbmdNYXRj aGluZ1JhbmdlcyhzdHJpbmcsIGNvcmUob3B0aW9ucyksIG1heE1hdGNoQ291bnQsIG1fZmluZE1h dGNoZXMsIGluZGV4Rm9yU2VsZWN0aW9uKTsKIAogICAgIFZlY3RvcjxWZWN0b3I8SW50UmVjdD4+ IG1hdGNoUmVjdHM7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2ZpbmRNYXRjaGVzLnNp emUoKTsgKytpKSB7Cg==