141547 2015-02-12 18:18:39 -0800 determinePrimarySnapshottedPlugIn() should only traverse visible Frames 2015-02-13 11:13:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dbates kling koivisto mitz rmondello simon.fraser thorton zalan oldest_to_newest 1068817 0 simon.fraser 2015-02-12 18:18:39 -0800 determinePrimarySnapshottedPlugIn() should only traverse visible Frames 1068818 1 246497 simon.fraser 2015-02-12 18:23:15 -0800 Created attachment 246497 Patch 1068822 2 246497 andersca 2015-02-12 18:35:04 -0800 Comment on attachment 246497 Patch Test case? 1068842 3 246505 simon.fraser 2015-02-12 21:39:08 -0800 Created attachment 246505 Patch 1068970 4 simon.fraser 2015-02-13 11:04:44 -0800 https://trac.webkit.org/r180062 Anders reviewed this. 1068974 5 mitz 2015-02-13 11:13:01 -0800 A better title for this bug might be “Crashes under RenderLayer::hitTestLayer under determinePrimarySnapshottedPlugIn()”. 1068976 6 mitz 2015-02-13 11:13:30 -0800 (In reply to comment #5) > A better title for this bug might be “Crashes under > RenderLayer::hitTestLayer under determinePrimarySnapshottedPlugIn()”. Whoops, that’s a different bug. Never mind! 246497 2015-02-12 18:23:15 -0800 2015-02-12 21:39:05 -0800 Patch bug-141547-20150212182313.patch text/plain 8220 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5OTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTkwOTQ3MjJkMDgzMzFl Y2RkZTdhMzgxYTYxOTFlNjA5MDlkMGUwNi4uODEzNzNjNWMzOTMwYjA5MTJmYmM5NzM2NzEyOTYz YWZmOTMwN2JlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAyLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIGRldGVybWluZVBy aW1hcnlTbmFwc2hvdHRlZFBsdWdJbigpIHNob3VsZCBvbmx5IHRyYXZlcnNlIHZpc2libGUgRnJh bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE1 NDcKKyAgICAgICAgUGFydCBvZiByZGFyOi8vcHJvYmxlbS8xODQ0NTczMy4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdzIGFuIGV4cGVjdGF0 aW9uIGZyb20gY2xpZW50cyB0aGF0IEZyYW1lVmlldzo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5l ZWRlZFJlY3Vyc2l2ZSgpCisgICAgICAgIHVwZGF0ZXMgbGF5b3V0IGluIGFsbCBmcmFtZXMsIGJ1 dCBpdCB1c2VzIHRoZSB3aWRnZXQgdHJlZSwgc28gb25seSBoaXRzIGZyYW1lcworICAgICAgICB0 aGF0IGFyZSBwYXJlbnRlZCB2aWEgcmVuZGVyZXJzIChpLmUuIG5vdCBkaXNwbGF5Om5vbmUgZnJh bWVzIG9yIHRoZWlyIGRlc2NlbmRhbnRzKS4KKyAgICAgICAgCisgICAgICAgIE1vdmluZyB0b3dh cmRzIGEgZnV0dXJlIHdoZXJlIHdlIHJlbW92ZSBXaWRnZXRzLCBmaXggYnkgYWRkaW5nIGEgRnJh bWVUcmVlIAorICAgICAgICB0cmF2ZXJzYWwgZnVuY3Rpb24gdGhhdCBvbmx5IGZpbmRzIHJlbmRl cmVkIGZyYW1lcyAodGhvc2Ugd2l0aCBhbiBvd25lclJlbmRlcmVyKS4KKyAgICAgICAgCisgICAg ICAgIE5vdCB0ZXN0YWJsZS4KKworICAgICAgICAqIHBhZ2UvRnJhbWVUcmVlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6Zmlyc3RSZW5kZXJlZENoaWxkKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVHJlZTo6bmV4dFJlbmRlcmVkU2libGluZyk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVRyZWU6OnRyYXZlcnNlTmV4dFJlbmRlcmVkKToKKyAgICAgICAgKHByaW50RnJhbWVz KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVHJlZS5oOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJ Zk5lZWRlZFJlY3Vyc2l2ZSk6CisKIDIwMTUtMDItMTEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wcm92ZSB0aGUgc2hvd0ZyYW1lVHJlZSgpIG91 dHB1dCBzbGlnaHRseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGI5OWJmYWY2ODNlNGQwYjU1YmNlMGNjMDA0ZmU2 OThhMjFhMWNlNGEuLjZhMzVlMTEyNmRjMmRmNDQ4YjY3ZmNkNGUzMGE1MDhiMTI4YjE0N2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNS0wMi0xMiAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0 ZWRQbHVnSW4oKSBzaG91bGQgb25seSB0cmF2ZXJzZSB2aXNpYmxlIEZyYW1lcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTQ3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBVc2UgRnJhbWVU cmVlOjp0cmF2ZXJzZU5leHRSZW5kZXJlZCgpIHRvIGF2b2lkIGRvaW5nIHRoaW5ncyBpbiB1bnJl bmRlcmVkIGZyYW1lcworICAgICAgICB3aGljaCBhcmUgbm90IGd1YXJhbnRlZWQgdG8gaGF2ZSBi ZWVuIGxhaWQgb3V0LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkZXRlcm1pbmVQcmltYXJ5U25hcHNob3R0ZWRQ bHVnSW4pOgorCiAyMDE1LTAyLTExICBDaGFuZ1Nlb2sgT2ggIDxjaGFuZ3Nlb2sub2hAY29sbGFi b3JhLmNvbT4KIAogICAgICAgICBBY3RpdmF0ZSBSZWxpZWZMb2dnZXIgb2YgYSBtZW1vcnkgcHJl c3N1cmUgaGFuZGxlciBmb3IgbGludXggc3lzdGVtLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVRyZWUuY3Bw CmluZGV4IDQxN2EwMmZjMTMwMmVjZjYyMTZlYjI5Y2NlMzk2NWFjNzVjZmFlZDcuLjBmODI3Yjcx OWZjYmFjOTY5Yjc2NjdlMjViNzM4ZWY2Mzg0NTg5ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVHJl ZS5jcHAKQEAgLTM1Niw2ICszNTYsNjggQEAgRnJhbWUqIEZyYW1lVHJlZTo6dHJhdmVyc2VOZXh0 KGNvbnN0IEZyYW1lKiBzdGF5V2l0aGluKSBjb25zdAogICAgIHJldHVybiBudWxscHRyOwogfQog CitGcmFtZSogRnJhbWVUcmVlOjpmaXJzdFJlbmRlcmVkQ2hpbGQoKSBjb25zdAoreworICAgIEZy YW1lKiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsKKyAgICBpZiAoIWNoaWxkKQorICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKyAgICAKKyAgICBpZiAoY2hpbGQtPm93bmVyUmVuZGVyZXIoKSkKKyAgICAg ICAgcmV0dXJuIGNoaWxkOworCisgICAgd2hpbGUgKChjaGlsZCA9IGNoaWxkLT50cmVlKCkubmV4 dFNpYmxpbmcoKSkpIHsKKyAgICAgICAgaWYgKGNoaWxkLT5vd25lclJlbmRlcmVyKCkpCisgICAg ICAgICAgICByZXR1cm4gY2hpbGQ7CisgICAgfQorICAgIAorICAgIHJldHVybiBudWxscHRyOwor fQorCitGcmFtZSogRnJhbWVUcmVlOjpuZXh0UmVuZGVyZWRTaWJsaW5nKCkgY29uc3QKK3sKKyAg ICBGcmFtZSogc2libGluZyA9ICZtX3RoaXNGcmFtZTsKKworICAgIHdoaWxlICgoc2libGluZyA9 IHNpYmxpbmctPnRyZWUoKS5uZXh0U2libGluZygpKSkgeworICAgICAgICBpZiAoc2libGluZy0+ b3duZXJSZW5kZXJlcigpKQorICAgICAgICAgICAgcmV0dXJuIHNpYmxpbmc7CisgICAgfQorICAg IAorICAgIHJldHVybiBudWxscHRyOworfQorCitGcmFtZSogRnJhbWVUcmVlOjp0cmF2ZXJzZU5l eHRSZW5kZXJlZChjb25zdCBGcmFtZSogc3RheVdpdGhpbikgY29uc3QKK3sKKyAgICBGcmFtZSog Y2hpbGQgPSBmaXJzdFJlbmRlcmVkQ2hpbGQoKTsKKyAgICBpZiAoY2hpbGQpIHsKKyAgICAgICAg QVNTRVJUKCFzdGF5V2l0aGluIHx8IGNoaWxkLT50cmVlKCkuaXNEZXNjZW5kYW50T2Yoc3RheVdp dGhpbikpOworICAgICAgICByZXR1cm4gY2hpbGQ7CisgICAgfQorCisgICAgaWYgKCZtX3RoaXNG cmFtZSA9PSBzdGF5V2l0aGluKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIEZyYW1l KiBzaWJsaW5nID0gbmV4dFJlbmRlcmVkU2libGluZygpOworICAgIGlmIChzaWJsaW5nKSB7Cisg ICAgICAgIEFTU0VSVCghc3RheVdpdGhpbiB8fCBzaWJsaW5nLT50cmVlKCkuaXNEZXNjZW5kYW50 T2Yoc3RheVdpdGhpbikpOworICAgICAgICByZXR1cm4gc2libGluZzsKKyAgICB9CisKKyAgICBG cmFtZSogZnJhbWUgPSAmbV90aGlzRnJhbWU7CisgICAgd2hpbGUgKCFzaWJsaW5nICYmICghc3Rh eVdpdGhpbiB8fCBmcmFtZS0+dHJlZSgpLnBhcmVudCgpICE9IHN0YXlXaXRoaW4pKSB7CisgICAg ICAgIGZyYW1lID0gZnJhbWUtPnRyZWUoKS5wYXJlbnQoKTsKKyAgICAgICAgaWYgKCFmcmFtZSkK KyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICBzaWJsaW5nID0gZnJhbWUtPnRy ZWUoKS5uZXh0UmVuZGVyZWRTaWJsaW5nKCk7CisgICAgfQorCisgICAgaWYgKGZyYW1lKSB7Cisg ICAgICAgIEFTU0VSVCghc3RheVdpdGhpbiB8fCAhc2libGluZyB8fCBzaWJsaW5nLT50cmVlKCku aXNEZXNjZW5kYW50T2Yoc3RheVdpdGhpbikpOworICAgICAgICByZXR1cm4gc2libGluZzsKKyAg ICB9CisKKyAgICByZXR1cm4gbnVsbHB0cjsKK30KKwogRnJhbWUqIEZyYW1lVHJlZTo6dHJhdmVy c2VOZXh0V2l0aFdyYXAoYm9vbCB3cmFwKSBjb25zdAogewogICAgIGlmIChGcmFtZSogcmVzdWx0 ID0gdHJhdmVyc2VOZXh0KCkpCkBAIC00MjgsNyArNDkwLDkgQEAgc3RhdGljIHZvaWQgcHJpbnRG cmFtZXMoY29uc3QgV2ViQ29yZTo6RnJhbWUmIGZyYW1lLCBjb25zdCBXZWJDb3JlOjpGcmFtZSog dGFyZ2UKICAgICBwcmludEluZGVudChpbmRlbnQpOwogICAgIHByaW50ZigiICByZW5kZXJWaWV3 PSVwXG4iLCB2aWV3ID8gdmlldy0+cmVuZGVyVmlldygpIDogbnVsbHB0cik7CiAgICAgcHJpbnRJ bmRlbnQoaW5kZW50KTsKLSAgICBwcmludGYoIiAgZG9jdW1lbnQ9JXAgKG5lZWRzIHN0eWxlIHJl Y2FsYyAlZClcbiIsIGZyYW1lLmRvY3VtZW50KCksIGZyYW1lLmRvY3VtZW50KCkgPyBmcmFtZS5k b2N1bWVudCgpLT5uZWVkc1N0eWxlUmVjYWxjKCkgOiBmYWxzZSk7CisgICAgcHJpbnRmKCIgIG93 bmVyUmVuZGVyZXI9JXBcbiIsIGZyYW1lLm93bmVyUmVuZGVyZXIoKSk7CisgICAgcHJpbnRJbmRl bnQoaW5kZW50KTsKKyAgICBwcmludGYoIiAgZG9jdW1lbnQ9JXAgKG5lZWRzIHN0eWxlIHJlY2Fs YyAlZClcbiIsIGZyYW1lLmRvY3VtZW50KCksIGZyYW1lLmRvY3VtZW50KCkgPyBmcmFtZS5kb2N1 bWVudCgpLT5jaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSA6IGZhbHNlKTsKICAgICBwcmludEluZGVu dChpbmRlbnQpOwogICAgIHByaW50ZigiICB1cmk9JXNcbiIsIGZyYW1lLmRvY3VtZW50KCktPmRv Y3VtZW50VVJJKCkudXRmOCgpLmRhdGEoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVHJlZS5oCmluZGV4 IGM1NGY0N2Q5YjY0ZWQ0NTU3YTA1NmNlZjY1YTJjMDU3NzMzODlhNjcuLmMwMzY3ODM0YjE0NTk0 YmFkYTFmOGJkMzc1ZjJjNWE0NzkzZmJmZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVRyZWUuaApAQCAt NTYsNyArNTYsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBGcmFtZSogbGFzdENo aWxkKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0Q2hpbGQ7IH0KIAogICAgICAgICBXRUJDT1JFX0VY UE9SVCBib29sIGlzRGVzY2VuZGFudE9mKGNvbnN0IEZyYW1lKiBhbmNlc3RvcikgY29uc3Q7Ci0g ICAgICAgIFdFQkNPUkVfRVhQT1JUIEZyYW1lKiB0cmF2ZXJzZU5leHQoY29uc3QgRnJhbWUqIHN0 YXlXaXRoaW4gPSAwKSBjb25zdDsKKyAgICAgICAgCisgICAgICAgIFdFQkNPUkVfRVhQT1JUIEZy YW1lKiB0cmF2ZXJzZU5leHQoY29uc3QgRnJhbWUqIHN0YXlXaXRoaW4gPSBudWxscHRyKSBjb25z dDsKKyAgICAgICAgLy8gUmVuZGVyZWQgbWVhbnMgYmVpbmcgdGhlIG1haW4gZnJhbWUgb3IgaGF2 aW5nIGFuIG93bmVyUmVuZGVyZXIuIEl0IG1heSBub3QgaGF2ZSBiZWVuIHBhcmVudGVkIGluIHRo ZSBXaWRnZXQgdHJlZSB5ZXQgKHNlZSBXaWRnZXRIaWVyYXJjaHlVcGRhdGVzU3VzcGVuc2lvblNj b3BlKS4KKyAgICAgICAgV0VCQ09SRV9FWFBPUlQgRnJhbWUqIHRyYXZlcnNlTmV4dFJlbmRlcmVk KGNvbnN0IEZyYW1lKiBzdGF5V2l0aGluID0gbnVsbHB0cikgY29uc3Q7CiAgICAgICAgIFdFQkNP UkVfRVhQT1JUIEZyYW1lKiB0cmF2ZXJzZU5leHRXaXRoV3JhcChib29sKSBjb25zdDsKICAgICAg ICAgV0VCQ09SRV9FWFBPUlQgRnJhbWUqIHRyYXZlcnNlUHJldmlvdXNXaXRoV3JhcChib29sKSBj b25zdDsKICAgICAgICAgCkBAIC04Nyw2ICs5MCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgRnJhbWUqIHNjb3BlZENoaWxkKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgVHJlZVNj b3BlKikgY29uc3Q7CiAgICAgICAgIHVuc2lnbmVkIHNjb3BlZENoaWxkQ291bnQoVHJlZVNjb3Bl KikgY29uc3Q7CiAKKyAgICAgICAgRnJhbWUqIGZpcnN0UmVuZGVyZWRDaGlsZCgpIGNvbnN0Owor ICAgICAgICBGcmFtZSogbmV4dFJlbmRlcmVkU2libGluZygpIGNvbnN0OworCiAgICAgICAgIEZy YW1lJiBtX3RoaXNGcmFtZTsKIAogICAgICAgICBGcmFtZSogbV9wYXJlbnQ7CkBAIC0xMDQsNyAr MTEwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWZuZGVmIE5ERUJVRwogLy8gT3V0c2lk ZSB0aGUgV2ViQ29yZSBuYW1lc3BhY2UgZm9yIGVhc2Ugb2YgaW52b2NhdGlvbiBmcm9tIGdkYi4K LXZvaWQgc2hvd0ZyYW1lVHJlZShjb25zdCBXZWJDb3JlOjpGcmFtZSopOworV0VCQ09SRV9FWFBP UlQgdm9pZCBzaG93RnJhbWVUcmVlKGNvbnN0IFdlYkNvcmU6OkZyYW1lKik7CiAjZW5kaWYKIAog I2VuZGlmIC8vIEZyYW1lVHJlZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggOWY5 NGNlZjA5ZWJjMzY0OTIxMGQxYTI1MWU5ZWQ5NTgxNjUyYzFhYi4uOGZkMGVmMjgzZjk2YjRjMzI1 NzM0MTM1Nzc3M2FiNGI1ZGVhNTBlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAt Mzk2OCw2ICszOTY4LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZO ZWVkZWRSZWN1cnNpdmUoKQogICAgIC8vIGNhbGxzLCBhcyB0aGV5IGNhbiBwb3RlbnRpYWxseSBy ZS1lbnRlciBhIGxheW91dCBvZiB0aGUgcGFyZW50IGZyYW1lIHZpZXcsIHdoaWNoIG1heSBhZGQv cmVtb3ZlIHNjcm9sbGJhcnMKICAgICAvLyBhbmQgdGh1cyBtdXRhdGVzIHRoZSBjaGlsZHJlbigp IHNldC4KICAgICAvLyBXZSB1c2UgdGhlIFdpZGdldCBjaGlsZHJlbiBiZWNhdXNlIHdhbGtpbmcg dGhlIEZyYW1lIHRyZWUgd291bGQgaW5jbHVkZSBkaXNwbGF5Om5vbmUgZnJhbWVzLgorICAgIC8v IEZJWE1FOiB1c2UgRnJhbWVUcmVlOjp0cmF2ZXJzZU5leHRSZW5kZXJlZCgpLgogICAgIFZlY3Rv cjxSZWY8RnJhbWVWaWV3PiwgMTY+IGNoaWxkVmlld3M7CiAgICAgY2hpbGRWaWV3cy5yZXNlcnZl SW5pdGlhbENhcGFjaXR5KGNoaWxkcmVuKCkuc2l6ZSgpKTsKICAgICBmb3IgKGF1dG8mIHdpZGdl dCA6IGNoaWxkcmVuKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAppbmRleCA2MGExMGI5ODEzZjNmNDZlZWVjYjU3OTVmYmJmMjhlNWIxMmFlMzQ0 Li5hNzQzNTAzZTFhY2QxODk1NDFiZmE3OGU5YjVjMTQzOTc4YzUxZTc4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00NjQ4LDcgKzQ2NDgs NyBAQCB2b2lkIFdlYlBhZ2U6OmRldGVybWluZVByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbigpCiAg ICAgSFRNTFBsdWdJbkltYWdlRWxlbWVudCogY2FuZGlkYXRlUGx1Z0luID0gbnVsbHB0cjsKICAg ICB1bnNpZ25lZCBjYW5kaWRhdGVQbHVnSW5BcmVhID0gMDsKIAotICAgIGZvciAoRnJhbWUqIGZy YW1lID0gJm1haW5GcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5l eHQoKSkgeworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJm1haW5GcmFtZTsgZnJhbWU7IGZyYW1l ID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHRSZW5kZXJlZCgpKSB7CiAgICAgICAgIGlmICgh ZnJhbWUtPmxvYWRlcigpLnN1YmZyYW1lTG9hZGVyKCkuY29udGFpbnNQbHVnaW5zKCkpCiAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgaWYgKCFmcmFtZS0+ZG9jdW1lbnQoKSB8fCAhZnJh bWUtPnZpZXcoKSkK 246505 2015-02-12 21:39:08 -0800 2015-02-13 11:05:00 -0800 Patch bug-141547-20150212213906.patch text/plain 8787 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5OTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTkwOTQ3MjJkMDgzMzFl Y2RkZTdhMzgxYTYxOTFlNjA5MDlkMGUwNi4uYzZmOGU4OGE4NDkwODdhOWZhYTIyYmQ3NjY2NDk4 MTFmMWRmMzMyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAyLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIGRldGVybWluZVBy aW1hcnlTbmFwc2hvdHRlZFBsdWdJbigpIHNob3VsZCBvbmx5IHRyYXZlcnNlIHZpc2libGUgRnJh bWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE1 NDcKKyAgICAgICAgUGFydCBvZiByZGFyOi8vcHJvYmxlbS8xODQ0NTczMy4KKworICAgICAgICBS ZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCisKKyAgICAgICAgVGhlcmUncyBhbiBleHBlY3Rh dGlvbiBmcm9tIGNsaWVudHMgdGhhdCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZO ZWVkZWRSZWN1cnNpdmUoKQorICAgICAgICB1cGRhdGVzIGxheW91dCBpbiBhbGwgZnJhbWVzLCBi dXQgaXQgdXNlcyB0aGUgd2lkZ2V0IHRyZWUsIHNvIG9ubHkgaGl0cyBmcmFtZXMKKyAgICAgICAg dGhhdCBhcmUgcGFyZW50ZWQgdmlhIHJlbmRlcmVycyAoaS5lLiBub3QgZGlzcGxheTpub25lIGZy YW1lcyBvciB0aGVpciBkZXNjZW5kYW50cykuCisgICAgICAgIAorICAgICAgICBNb3ZpbmcgdG93 YXJkcyBhIGZ1dHVyZSB3aGVyZSB3ZSByZW1vdmUgV2lkZ2V0cywgZml4IGJ5IGFkZGluZyBhIEZy YW1lVHJlZSAKKyAgICAgICAgdHJhdmVyc2FsIGZ1bmN0aW9uIHRoYXQgb25seSBmaW5kcyByZW5k ZXJlZCBmcmFtZXMgKHRob3NlIHdpdGggYW4gb3duZXJSZW5kZXJlcikuCisgICAgICAgIAorICAg ICAgICBOb3QgdGVzdGFibGUuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVHJlZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVRyZWU6OmZpcnN0UmVuZGVyZWRDaGlsZCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVRyZWU6Om5leHRSZW5kZXJlZFNpYmxpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVUcmVlOjp0cmF2ZXJzZU5leHRSZW5kZXJlZCk6CisgICAgICAgIChwcmludEZyYW1l cyk6CisgICAgICAgICogcGFnZS9GcmFtZVRyZWUuaDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmll dy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxl SWZOZWVkZWRSZWN1cnNpdmUpOgorCiAyMDE1LTAyLTExICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEltcHJvdmUgdGhlIHNob3dGcmFtZVRyZWUoKSBv dXRwdXQgc2xpZ2h0bHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBiOTliZmFmNjgzZTRkMGI1NWJjZTBjYzAwNGZl Njk4YTIxYTFjZTRhLi44MGRmNDNkOGE3ZGU1ZWU2NTg1OGU5M2ZiYzZhNGJkNzM2ZGFhMzQxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTUtMDItMTIgIFNpbW9uIEZyYXNlciAgPHNp bW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgZGV0ZXJtaW5lUHJpbWFyeVNuYXBzaG90 dGVkUGx1Z0luKCkgc2hvdWxkIG9ubHkgdHJhdmVyc2UgdmlzaWJsZSBGcmFtZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTU0NworCisgICAgICAg IFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KKyAgICAgICAgCisgICAgICAgIFVzZSBGcmFt ZVRyZWU6OnRyYXZlcnNlTmV4dFJlbmRlcmVkKCkgdG8gYXZvaWQgZG9pbmcgdGhpbmdzIGluIHVu cmVuZGVyZWQgZnJhbWVzCisgICAgICAgIHdoaWNoIGFyZSBub3QgZ3VhcmFudGVlZCB0byBoYXZl IGJlZW4gbGFpZCBvdXQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRldGVybWluZVByaW1hcnlTbmFwc2hvdHRl ZFBsdWdJbik6CisKIDIwMTUtMDItMTEgIENoYW5nU2VvayBPaCAgPGNoYW5nc2Vvay5vaEBjb2xs YWJvcmEuY29tPgogCiAgICAgICAgIEFjdGl2YXRlIFJlbGllZkxvZ2dlciBvZiBhIG1lbW9yeSBw cmVzc3VyZSBoYW5kbGVyIGZvciBsaW51eCBzeXN0ZW0uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4 IGMwMDM3MzA2ODY0MDRhMTk3ZTlhNDkxNTU4MzlmMzI2MGEzZTgxZjMuLmEyNThhZDMxZTMzNTkz YWZlOWMyNzZkZjIyODAxOWZlMmNlZTdlMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0yMjU5 LDYgKzIyNTksNyBAQCBfd2tTZXRQYXR0ZXJuUGhhc2VJblVzZXJTcGFjZQogX19aTjdXZWJDb3Jl MTRTUUxpdGVEYXRhYmFzZTIyZGlzYWJsZVRocmVhZGluZ0NoZWNrc0V2CiBfX1pON1dlYkNvcmUy NE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjdzX2NvdW50RQogX19aTks3V2ViQ29yZTdFbGVtZW50 MjZmYXN0QXR0cmlidXRlTG9va3VwQWxsb3dlZEVSS05TXzEzUXVhbGlmaWVkTmFtZUUKK19fWk5L N1dlYkNvcmU5RnJhbWVUcmVlMjB0cmF2ZXJzZU5leHRSZW5kZXJlZEVQS05TXzVGcmFtZUUKICNl bmRpZgogCiAjaWYgIUFTU0VSVF9ESVNBQkxFRApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVRyZWUuY3BwCmlu ZGV4IDQxN2EwMmZjMTMwMmVjZjYyMTZlYjI5Y2NlMzk2NWFjNzVjZmFlZDcuLjBmODI3YjcxOWZj YmFjOTY5Yjc2NjdlMjViNzM4ZWY2Mzg0NTg5ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVHJlZS5j cHAKQEAgLTM1Niw2ICszNTYsNjggQEAgRnJhbWUqIEZyYW1lVHJlZTo6dHJhdmVyc2VOZXh0KGNv bnN0IEZyYW1lKiBzdGF5V2l0aGluKSBjb25zdAogICAgIHJldHVybiBudWxscHRyOwogfQogCitG cmFtZSogRnJhbWVUcmVlOjpmaXJzdFJlbmRlcmVkQ2hpbGQoKSBjb25zdAoreworICAgIEZyYW1l KiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsKKyAgICBpZiAoIWNoaWxkKQorICAgICAgICByZXR1cm4g bnVsbHB0cjsKKyAgICAKKyAgICBpZiAoY2hpbGQtPm93bmVyUmVuZGVyZXIoKSkKKyAgICAgICAg cmV0dXJuIGNoaWxkOworCisgICAgd2hpbGUgKChjaGlsZCA9IGNoaWxkLT50cmVlKCkubmV4dFNp YmxpbmcoKSkpIHsKKyAgICAgICAgaWYgKGNoaWxkLT5vd25lclJlbmRlcmVyKCkpCisgICAgICAg ICAgICByZXR1cm4gY2hpbGQ7CisgICAgfQorICAgIAorICAgIHJldHVybiBudWxscHRyOworfQor CitGcmFtZSogRnJhbWVUcmVlOjpuZXh0UmVuZGVyZWRTaWJsaW5nKCkgY29uc3QKK3sKKyAgICBG cmFtZSogc2libGluZyA9ICZtX3RoaXNGcmFtZTsKKworICAgIHdoaWxlICgoc2libGluZyA9IHNp YmxpbmctPnRyZWUoKS5uZXh0U2libGluZygpKSkgeworICAgICAgICBpZiAoc2libGluZy0+b3du ZXJSZW5kZXJlcigpKQorICAgICAgICAgICAgcmV0dXJuIHNpYmxpbmc7CisgICAgfQorICAgIAor ICAgIHJldHVybiBudWxscHRyOworfQorCitGcmFtZSogRnJhbWVUcmVlOjp0cmF2ZXJzZU5leHRS ZW5kZXJlZChjb25zdCBGcmFtZSogc3RheVdpdGhpbikgY29uc3QKK3sKKyAgICBGcmFtZSogY2hp bGQgPSBmaXJzdFJlbmRlcmVkQ2hpbGQoKTsKKyAgICBpZiAoY2hpbGQpIHsKKyAgICAgICAgQVNT RVJUKCFzdGF5V2l0aGluIHx8IGNoaWxkLT50cmVlKCkuaXNEZXNjZW5kYW50T2Yoc3RheVdpdGhp bikpOworICAgICAgICByZXR1cm4gY2hpbGQ7CisgICAgfQorCisgICAgaWYgKCZtX3RoaXNGcmFt ZSA9PSBzdGF5V2l0aGluKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIEZyYW1lKiBz aWJsaW5nID0gbmV4dFJlbmRlcmVkU2libGluZygpOworICAgIGlmIChzaWJsaW5nKSB7CisgICAg ICAgIEFTU0VSVCghc3RheVdpdGhpbiB8fCBzaWJsaW5nLT50cmVlKCkuaXNEZXNjZW5kYW50T2Yo c3RheVdpdGhpbikpOworICAgICAgICByZXR1cm4gc2libGluZzsKKyAgICB9CisKKyAgICBGcmFt ZSogZnJhbWUgPSAmbV90aGlzRnJhbWU7CisgICAgd2hpbGUgKCFzaWJsaW5nICYmICghc3RheVdp dGhpbiB8fCBmcmFtZS0+dHJlZSgpLnBhcmVudCgpICE9IHN0YXlXaXRoaW4pKSB7CisgICAgICAg IGZyYW1lID0gZnJhbWUtPnRyZWUoKS5wYXJlbnQoKTsKKyAgICAgICAgaWYgKCFmcmFtZSkKKyAg ICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICBzaWJsaW5nID0gZnJhbWUtPnRyZWUo KS5uZXh0UmVuZGVyZWRTaWJsaW5nKCk7CisgICAgfQorCisgICAgaWYgKGZyYW1lKSB7CisgICAg ICAgIEFTU0VSVCghc3RheVdpdGhpbiB8fCAhc2libGluZyB8fCBzaWJsaW5nLT50cmVlKCkuaXNE ZXNjZW5kYW50T2Yoc3RheVdpdGhpbikpOworICAgICAgICByZXR1cm4gc2libGluZzsKKyAgICB9 CisKKyAgICByZXR1cm4gbnVsbHB0cjsKK30KKwogRnJhbWUqIEZyYW1lVHJlZTo6dHJhdmVyc2VO ZXh0V2l0aFdyYXAoYm9vbCB3cmFwKSBjb25zdAogewogICAgIGlmIChGcmFtZSogcmVzdWx0ID0g dHJhdmVyc2VOZXh0KCkpCkBAIC00MjgsNyArNDkwLDkgQEAgc3RhdGljIHZvaWQgcHJpbnRGcmFt ZXMoY29uc3QgV2ViQ29yZTo6RnJhbWUmIGZyYW1lLCBjb25zdCBXZWJDb3JlOjpGcmFtZSogdGFy Z2UKICAgICBwcmludEluZGVudChpbmRlbnQpOwogICAgIHByaW50ZigiICByZW5kZXJWaWV3PSVw XG4iLCB2aWV3ID8gdmlldy0+cmVuZGVyVmlldygpIDogbnVsbHB0cik7CiAgICAgcHJpbnRJbmRl bnQoaW5kZW50KTsKLSAgICBwcmludGYoIiAgZG9jdW1lbnQ9JXAgKG5lZWRzIHN0eWxlIHJlY2Fs YyAlZClcbiIsIGZyYW1lLmRvY3VtZW50KCksIGZyYW1lLmRvY3VtZW50KCkgPyBmcmFtZS5kb2N1 bWVudCgpLT5uZWVkc1N0eWxlUmVjYWxjKCkgOiBmYWxzZSk7CisgICAgcHJpbnRmKCIgIG93bmVy UmVuZGVyZXI9JXBcbiIsIGZyYW1lLm93bmVyUmVuZGVyZXIoKSk7CisgICAgcHJpbnRJbmRlbnQo aW5kZW50KTsKKyAgICBwcmludGYoIiAgZG9jdW1lbnQ9JXAgKG5lZWRzIHN0eWxlIHJlY2FsYyAl ZClcbiIsIGZyYW1lLmRvY3VtZW50KCksIGZyYW1lLmRvY3VtZW50KCkgPyBmcmFtZS5kb2N1bWVu dCgpLT5jaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSA6IGZhbHNlKTsKICAgICBwcmludEluZGVudChp bmRlbnQpOwogICAgIHByaW50ZigiICB1cmk9JXNcbiIsIGZyYW1lLmRvY3VtZW50KCktPmRvY3Vt ZW50VVJJKCkudXRmOCgpLmRhdGEoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVHJlZS5oCmluZGV4IGM1 NGY0N2Q5YjY0ZWQ0NTU3YTA1NmNlZjY1YTJjMDU3NzMzODlhNjcuLmMwMzY3ODM0YjE0NTk0YmFk YTFmOGJkMzc1ZjJjNWE0NzkzZmJmZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVRyZWUuaApAQCAtNTYs NyArNTYsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBGcmFtZSogbGFzdENoaWxk KCkgY29uc3QgeyByZXR1cm4gbV9sYXN0Q2hpbGQ7IH0KIAogICAgICAgICBXRUJDT1JFX0VYUE9S VCBib29sIGlzRGVzY2VuZGFudE9mKGNvbnN0IEZyYW1lKiBhbmNlc3RvcikgY29uc3Q7Ci0gICAg ICAgIFdFQkNPUkVfRVhQT1JUIEZyYW1lKiB0cmF2ZXJzZU5leHQoY29uc3QgRnJhbWUqIHN0YXlX aXRoaW4gPSAwKSBjb25zdDsKKyAgICAgICAgCisgICAgICAgIFdFQkNPUkVfRVhQT1JUIEZyYW1l KiB0cmF2ZXJzZU5leHQoY29uc3QgRnJhbWUqIHN0YXlXaXRoaW4gPSBudWxscHRyKSBjb25zdDsK KyAgICAgICAgLy8gUmVuZGVyZWQgbWVhbnMgYmVpbmcgdGhlIG1haW4gZnJhbWUgb3IgaGF2aW5n IGFuIG93bmVyUmVuZGVyZXIuIEl0IG1heSBub3QgaGF2ZSBiZWVuIHBhcmVudGVkIGluIHRoZSBX aWRnZXQgdHJlZSB5ZXQgKHNlZSBXaWRnZXRIaWVyYXJjaHlVcGRhdGVzU3VzcGVuc2lvblNjb3Bl KS4KKyAgICAgICAgV0VCQ09SRV9FWFBPUlQgRnJhbWUqIHRyYXZlcnNlTmV4dFJlbmRlcmVkKGNv bnN0IEZyYW1lKiBzdGF5V2l0aGluID0gbnVsbHB0cikgY29uc3Q7CiAgICAgICAgIFdFQkNPUkVf RVhQT1JUIEZyYW1lKiB0cmF2ZXJzZU5leHRXaXRoV3JhcChib29sKSBjb25zdDsKICAgICAgICAg V0VCQ09SRV9FWFBPUlQgRnJhbWUqIHRyYXZlcnNlUHJldmlvdXNXaXRoV3JhcChib29sKSBjb25z dDsKICAgICAgICAgCkBAIC04Nyw2ICs5MCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgRnJhbWUqIHNjb3BlZENoaWxkKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgVHJlZVNjb3Bl KikgY29uc3Q7CiAgICAgICAgIHVuc2lnbmVkIHNjb3BlZENoaWxkQ291bnQoVHJlZVNjb3BlKikg Y29uc3Q7CiAKKyAgICAgICAgRnJhbWUqIGZpcnN0UmVuZGVyZWRDaGlsZCgpIGNvbnN0OworICAg ICAgICBGcmFtZSogbmV4dFJlbmRlcmVkU2libGluZygpIGNvbnN0OworCiAgICAgICAgIEZyYW1l JiBtX3RoaXNGcmFtZTsKIAogICAgICAgICBGcmFtZSogbV9wYXJlbnQ7CkBAIC0xMDQsNyArMTEw LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWZuZGVmIE5ERUJVRwogLy8gT3V0c2lkZSB0 aGUgV2ViQ29yZSBuYW1lc3BhY2UgZm9yIGVhc2Ugb2YgaW52b2NhdGlvbiBmcm9tIGdkYi4KLXZv aWQgc2hvd0ZyYW1lVHJlZShjb25zdCBXZWJDb3JlOjpGcmFtZSopOworV0VCQ09SRV9FWFBPUlQg dm9pZCBzaG93RnJhbWVUcmVlKGNvbnN0IFdlYkNvcmU6OkZyYW1lKik7CiAjZW5kaWYKIAogI2Vu ZGlmIC8vIEZyYW1lVHJlZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggOWY5NGNl ZjA5ZWJjMzY0OTIxMGQxYTI1MWU5ZWQ5NTgxNjUyYzFhYi4uOGZkMGVmMjgzZjk2YjRjMzI1NzM0 MTM1Nzc3M2FiNGI1ZGVhNTBlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMzk2 OCw2ICszOTY4LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVk ZWRSZWN1cnNpdmUoKQogICAgIC8vIGNhbGxzLCBhcyB0aGV5IGNhbiBwb3RlbnRpYWxseSByZS1l bnRlciBhIGxheW91dCBvZiB0aGUgcGFyZW50IGZyYW1lIHZpZXcsIHdoaWNoIG1heSBhZGQvcmVt b3ZlIHNjcm9sbGJhcnMKICAgICAvLyBhbmQgdGh1cyBtdXRhdGVzIHRoZSBjaGlsZHJlbigpIHNl dC4KICAgICAvLyBXZSB1c2UgdGhlIFdpZGdldCBjaGlsZHJlbiBiZWNhdXNlIHdhbGtpbmcgdGhl IEZyYW1lIHRyZWUgd291bGQgaW5jbHVkZSBkaXNwbGF5Om5vbmUgZnJhbWVzLgorICAgIC8vIEZJ WE1FOiB1c2UgRnJhbWVUcmVlOjp0cmF2ZXJzZU5leHRSZW5kZXJlZCgpLgogICAgIFZlY3RvcjxS ZWY8RnJhbWVWaWV3PiwgMTY+IGNoaWxkVmlld3M7CiAgICAgY2hpbGRWaWV3cy5yZXNlcnZlSW5p dGlhbENhcGFjaXR5KGNoaWxkcmVuKCkuc2l6ZSgpKTsKICAgICBmb3IgKGF1dG8mIHdpZGdldCA6 IGNoaWxkcmVuKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCA2MGExMGI5ODEzZjNmNDZlZWVjYjU3OTVmYmJmMjhlNWIxMmFlMzQ0Li5h NzQzNTAzZTFhY2QxODk1NDFiZmE3OGU5YjVjMTQzOTc4YzUxZTc4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00NjQ4LDcgKzQ2NDgsNyBA QCB2b2lkIFdlYlBhZ2U6OmRldGVybWluZVByaW1hcnlTbmFwc2hvdHRlZFBsdWdJbigpCiAgICAg SFRNTFBsdWdJbkltYWdlRWxlbWVudCogY2FuZGlkYXRlUGx1Z0luID0gbnVsbHB0cjsKICAgICB1 bnNpZ25lZCBjYW5kaWRhdGVQbHVnSW5BcmVhID0gMDsKIAotICAgIGZvciAoRnJhbWUqIGZyYW1l ID0gJm1haW5GcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQo KSkgeworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJm1haW5GcmFtZTsgZnJhbWU7IGZyYW1lID0g ZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHRSZW5kZXJlZCgpKSB7CiAgICAgICAgIGlmICghZnJh bWUtPmxvYWRlcigpLnN1YmZyYW1lTG9hZGVyKCkuY29udGFpbnNQbHVnaW5zKCkpCiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgaWYgKCFmcmFtZS0+ZG9jdW1lbnQoKSB8fCAhZnJhbWUt PnZpZXcoKSkK