52489 2011-01-14 15:32:05 -0800 GraphicsLayers in subframes can get sync'd multiple times 2011-07-21 18:02:50 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser buildbot dev+webkit simon.fraser webkit-ews oldest_to_newest 334670 0 simon.fraser 2011-01-14 15:32:05 -0800 FrameView::syncCompositingStateRecursive() calls sync on the root GraphicsLayer each frame, so when compositing layers are connected between frames, we'll end up syncing subframe's layers multiple times. 337020 1 79535 simon.fraser 2011-01-19 18:24:59 -0800 Created attachment 79535 Preliminary cleanup. 337027 2 webkit-ews 2011-01-19 18:40:52 -0800 Attachment 79535 did not build on qt: Build output: http://queues.webkit.org/results/7498206 337031 3 buildbot 2011-01-19 18:46:34 -0800 Attachment 79535 did not build on win: Build output: http://queues.webkit.org/results/7507229 337033 4 79537 simon.fraser 2011-01-19 18:50:36 -0800 Created attachment 79537 Patch 337045 5 webkit-ews 2011-01-19 19:10:33 -0800 Attachment 79537 did not build on qt: Build output: http://queues.webkit.org/results/7612226 337055 6 79537 sam 2011-01-19 19:18:42 -0800 Comment on attachment 79537 Patch Make sure to fix the Qt. 337057 7 79535 simon.fraser 2011-01-19 19:21:15 -0800 Comment on attachment 79535 Preliminary cleanup. http://trac.webkit.org/changeset/76196 337058 8 79537 simon.fraser 2011-01-19 19:21:44 -0800 Comment on attachment 79537 Patch Actually this one: http://trac.webkit.org/changeset/76196 440675 9 101651 simon.fraser 2011-07-21 15:30:57 -0700 Created attachment 101651 Patch 440764 10 101651 jamesr 2011-07-21 18:00:39 -0700 Comment on attachment 101651 Patch Cool, R=me 440766 11 simon.fraser 2011-07-21 18:02:50 -0700 http://trac.webkit.org/changeset/91542 79535 2011-01-19 18:24:59 -0800 2011-07-21 17:59:03 -0700 Preliminary cleanup. bug-52489-20110119182458.patch text/plain 11348 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiOWU0NWE2OTVmM2Q0ZDgzNjM4MmEwMjk0YzhkNzk1MGE4MzkxZDJlLi5i Mjc0MGYxNjQyNGJjYzRhNmVmODQ3NTI3YWQ5NWZjM2I5YTNiODJhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzcgQEAKKzIwMTEtMDEtMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg R3JhcGhpY3NMYXllcnMgaW4gc3ViZnJhbWVzIGNhbiBnZXQgc3luYydkIG11bHRpcGxlIHRpbWVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjQ4OQor CisgICAgICAgIFNvbWUgY2xlYW51cCB0aGF0IHdpbGwgd29yayB0b3dhcmRzIGZpeGluZyB0aGlz IGJ1Zy4KKyAgICAgICAgCisgICAgICAgIFRlc3RlZCBieSBleGlzdGluZyBpZnJhbWUgY29tcG9z aXRpbmcgdGVzdHMuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogc3luY0NvbXBvc2l0aW5n U3RhdGVSZWN1cnNpdmUoKQorICAgICAgICB3YXMgcmVuYW1lZCB0byBzeW5jQ29tcG9zaXRpbmdT dGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKTogU29tZQorICAgICAgICBjb2Rl IGNsZWFudXA6IGRvIGFsbCB0aGUgd29yZCB3ZSBuZWVkIHRvIGRvIGZvciB0aGlzIGZyYW1lLAor ICAgICAgICBpbmNsdWRpbmcgdGhlIG5lZWRzTGF5b3V0KCkgY2hlY2suCisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKToK KyAgICAgICAgVGhpcyBpcyBubyBsb25nZXIgcmVjdXJzaXZlOyBpbnN0ZWFkLCBpdCBpdGVyYXRl cyBvdmVyIGRlc2NlbmRhbnQKKyAgICAgICAgZnJhbWVzIHZpYSB0aGUgZnJhbWUgdHJlZSwgY2Fs bGluZyBzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgpCisgICAgICAgIG9uIGVhY2gg RnJhbWUncyB2aWV3LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRv ci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjppc0ZsdXNoaW5n TGF5ZXJzKTogR2V0dGVyIGZvciB0aGUgZmxhZy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcDogCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBv c2l0b3I6OlJlbmRlckxheWVyQ29tcG9zaXRvcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckNvbXBvc2l0b3I6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6IE1haW50YWluCisgICAg ICAgIGEgZmxhZyB0byBzYXkgaWYgd2UncmUgZmx1c2hpbmcsIHdoaWNoIGFsbG93cyB1cyB0byBh c3NlcnQgb24gcmUtZW50cmFudCBmbHVzaGVzLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjplbmNsb3NpbmdDb21wb3NpdG9yRmx1c2hpbmdMYXllcnMpOgorICAgICAg ICBBZGQgdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSByb290bW9zdCBjb21wb3NpdG9yIHRoYXQgaXMg aW4gdGhlIG1pZGRsZQorICAgICAgICBvZiBhIGZsdXNoLgorCiAyMDExLTAxLTEyICBNYXJ0aW4g Um9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBH dXN0YXZvIE5vcm9uaGEgU2lsdmEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGExMGQ2M2U2N2Q2 Mjg3NDgxMmEzNjU0NGQ5ZjZmZmVlOWJmZGZkYzMuLmZjYjhhMDA1NGY1OWJhOWVhZTY0YWExZjdj ODJhZmMwZTk4MTE1OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC04NzQsNyArODc0LDcgQEAg X19aTjdXZWJDb3JlOUZyYW1lVmlldzIzdXBkYXRlQ2FuSGF2ZVNjcm9sbGJhcnNFdgogX19aTjdX ZWJDb3JlOUZyYW1lVmlldzI0Zm9yY2VMYXlvdXRGb3JQYWdpbmF0aW9uRVJLTlNfOUZsb2F0U2l6 ZUVmTlNfNUZyYW1lMTlBZGp1c3RWaWV3U2l6ZU9yTm90RQogX19aTjdXZWJDb3JlOUZyYW1lVmll dzI2YWRqdXN0UGFnZUhlaWdodERlcHJlY2F0ZWRFUGZmZmYKIF9fWk43V2ViQ29yZTlGcmFtZVZp ZXcyOXNldFNob3VsZFVwZGF0ZVdoaWxlT2Zmc2NyZWVuRWIKLV9fWk43V2ViQ29yZTlGcmFtZVZp ZXcyOXN5bmNDb21wb3NpdGluZ1N0YXRlUmVjdXJzaXZlRXYKK19fWk43V2ViQ29yZTlGcmFtZVZp ZXczOHN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzRXYKIF9fWk43V2ViQ29y ZTlGcmFtZVZpZXczN3VwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmVFdgogX19a TjdXZWJDb3JlOUZyYW1lVmlldzM4c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRn ZXRFdgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzZjcmVhdGVFUE5TXzVGcmFtZUUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAppbmRleCAxMTg3MzE4ZmMwMjgwYTUzMzc3ODRlYWZiYTMzOTA2OGNj MTRhYTRiLi5iY2M4YjlmMTFmNTBiOWFmNzRhZTRjMDZkODBkZWUwYmM2M2QyNWM4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC01NTQsMTAgKzU1NCwxOSBAQCB2b2lkIEZyYW1lVmll dzo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoKQogI2VuZGlmCiB9CiAKLXZvaWQgRnJhbWVWaWV3 OjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgpCitib29sIEZyYW1lVmlldzo6c3lu Y0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKQogewotICAgIGlmIChSZW5kZXJWaWV3KiB2 aWV3ID0gbV9mcmFtZS0+Y29udGVudFJlbmRlcmVyKCkpCi0gICAgICAgIHZpZXctPmNvbXBvc2l0 b3IoKS0+Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7CisgICAgQVNTRVJUKG1fZnJhbWUtPnZp ZXcoKSA9PSB0aGlzKTsKKyAgICBSZW5kZXJWaWV3KiB2aWV3ID0gbV9mcmFtZS0+Y29udGVudFJl bmRlcmVyKCk7CisgICAgaWYgKCF2aWV3KQorICAgICAgICByZXR1cm4gdHJ1ZTsgLy8gV2UgZG9u J3Qgd2FudCB0byBrZWVwIHRyeWluZyB0byB1cGRhdGUgbGF5ZXJzIGlmIHdlIGhhdmUgbm8gcmVu ZGVyZXIuCisKKyAgICAvLyBJZiB3ZSBzeW5jIGNvbXBvc2l0aW5nIGxheWVycyB3aGVuIGEgbGF5 b3V0IGlzIHBlbmRpbmcsIHdlIG1heSBjYXVzZSBwYWludGluZyBvZiBjb21wb3NpdGluZworICAg IC8vIGxheWVyIGNvbnRlbnQgdG8gb2NjdXIgYmVmb3JlIGxheW91dCBoYXMgaGFwcGVuZWQsIHdo aWNoIHdpbGwgY2F1c2UgcGFpbnRDb250ZW50cygpIHRvIGJhaWwuCisgICAgaWYgKG5lZWRzTGF5 b3V0KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHZpZXctPmNvbXBvc2l0b3IoKS0+ Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7CiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkp CiAgICAgLy8gVGhlIGZ1bGxTY3JlZW5SZW5kZXJlcidzIGdyYXBoaWNzTGF5ZXIgIGhhcyBiZWVu IHJlLXBhcmVudGVkLCBhbmQgdGhlIGFib3ZlIHJlY3Vyc2l2ZSBzeW5jQ29tcG9zaXRpbmdTdGF0 ZQpAQCAtNTY5LDcgKzU3OCw4IEBAIHZvaWQgRnJhbWVWaWV3OjpzeW5jQ29tcG9zaXRpbmdTdGF0 ZUZvclRoaXNGcmFtZSgpCiAgICAgICAgIGlmIChHcmFwaGljc0xheWVyKiBmdWxsU2NyZWVuTGF5 ZXIgPSBiYWNraW5nLT5ncmFwaGljc0xheWVyKCkpCiAgICAgICAgICAgICBmdWxsU2NyZWVuTGF5 ZXItPnN5bmNDb21wb3NpdGluZ1N0YXRlKCk7CiAgICAgfQotI2VuZGlmICAgIAorI2VuZGlmCisg ICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpzZXROZWVkc09uZVNob3REcmF3 aW5nU3luY2hyb25pemF0aW9uKCkKQEAgLTY0OCwzMiArNjU4LDE2IEBAIGJvb2wgRnJhbWVWaWV3 Ojppc0VuY2xvc2VkSW5Db21wb3NpdGluZ0xheWVyKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAgICAgCi1ib29sIEZyYW1lVmlldzo6c3luY0NvbXBvc2l0aW5nU3RhdGVSZWN1cnNpdmUo KQorYm9vbCBGcmFtZVZpZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVz KCkKIHsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgQVNTRVJUKG1fZnJh bWUtPnZpZXcoKSA9PSB0aGlzKTsKLSAgICBSZW5kZXJWaWV3KiBjb250ZW50UmVuZGVyZXIgPSBt X2ZyYW1lLT5jb250ZW50UmVuZGVyZXIoKTsKLSAgICBpZiAoIWNvbnRlbnRSZW5kZXJlcikKLSAg ICAgICAgcmV0dXJuIHRydWU7ICAgIC8vIFdlIGRvbid0IHdhbnQgdG8ga2VlcCB0cnlpbmcgdG8g dXBkYXRlIGxheWVycyBpZiB3ZSBoYXZlIG5vIHJlbmRlcmVyLgotCi0gICAgLy8gSWYgd2Ugc3lu YyBjb21wb3NpdGluZyBsYXllcnMgd2hlbiBhIGxheW91dCBpcyBwZW5kaW5nLCB3ZSBtYXkgY2F1 c2UgcGFpbnRpbmcgb2YgY29tcG9zaXRpbmcKLSAgICAvLyBsYXllciBjb250ZW50IHRvIG9jY3Vy IGJlZm9yZSBsYXlvdXQgaGFzIGhhcHBlbmVkLCB3aGljaCB3aWxsIGNhdXNlIHBhaW50Q29udGVu dHMoKSB0byBiYWlsLgotICAgIGlmIChuZWVkc0xheW91dCgpKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgCi0gICAgc3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKKyAgICBi b29sIGFsbEZyYW1lc1N5bmNlZCA9IHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCk7 CiAgICAgCi0gICAgYm9vbCBhbGxTdWJmcmFtZXNTeW5jZWQgPSB0cnVlOwotICAgIGNvbnN0IEhh c2hTZXQ8UmVmUHRyPFdpZGdldD4gPiogdmlld0NoaWxkcmVuID0gY2hpbGRyZW4oKTsKLSAgICBI YXNoU2V0PFJlZlB0cjxXaWRnZXQ+ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHZpZXdDaGlsZHJl bi0+ZW5kKCk7Ci0gICAgZm9yIChIYXNoU2V0PFJlZlB0cjxXaWRnZXQ+ID46OmNvbnN0X2l0ZXJh dG9yIGN1cnJlbnQgPSB2aWV3Q2hpbGRyZW4tPmJlZ2luKCk7IGN1cnJlbnQgIT0gZW5kOyArK2N1 cnJlbnQpIHsKLSAgICAgICAgV2lkZ2V0KiB3aWRnZXQgPSAoKmN1cnJlbnQpLmdldCgpOwotICAg ICAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmlldygpKSB7Ci0gICAgICAgICAgICBib29sIHN5bmNl ZCA9IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHdpZGdldCktPnN5bmNDb21wb3NpdGluZ1N0YXRl UmVjdXJzaXZlKCk7Ci0gICAgICAgICAgICBhbGxTdWJmcmFtZXNTeW5jZWQgJj0gc3luY2VkOwot ICAgICAgICB9CisgICAgZm9yIChGcmFtZSogY2hpbGQgPSBtX2ZyYW1lLT50cmVlKCktPmZpcnN0 Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KG1fZnJh bWUuZ2V0KCkpKSB7CisgICAgICAgIGJvb2wgc3luY2VkID0gY2hpbGQtPnZpZXcoKS0+c3luY0Nv bXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKKyAgICAgICAgYWxsRnJhbWVzU3luY2VkICY9 IHN5bmNlZDsKICAgICB9Ci0gICAgcmV0dXJuIGFsbFN1YmZyYW1lc1N5bmNlZDsKKyAgICByZXR1 cm4gYWxsRnJhbWVzU3luY2VkOwogI2Vsc2UgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQogICAgIHJldHVybiB0cnVlOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA2 NWEzYTg1MTk4NDgxMTU3NzA2MzU2OGMyZjBlY2UyYjUwMGQwZTgwLi5iZTEwNmFlZWEzNzJhMzA5 ZWEyY2FjZDY3NDk2ZGY5NTFiMTNkNGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTk5 LDcgKzk5LDcgQEAgcHVibGljOgogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQog ICAgIHZvaWQgdXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoKTsKLSAgICB2b2lkIHN5bmNDb21wb3Np dGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCk7CisgICAgYm9vbCBzeW5jQ29tcG9zaXRpbmdTdGF0ZUZv clRoaXNGcmFtZSgpOwogCiAgICAgLy8gQ2FsbGVkIHdoZW4gY2hhbmdlcyB0byB0aGUgR3JhcGhp Y3NMYXllciBoaWVyYXJjaHkgaGF2ZSB0byBiZSBzeW5jaHJvbml6ZWQgd2l0aAogICAgIC8vIGNv bnRlbnQgcmVuZGVyZWQgdmlhIHRoZSBub3JtYWwgcGFpbnRpbmcgcGF0aC4KQEAgLTExNCw3ICsx MTQsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBPbmx5IHVzZWQgd2l0aCBhY2NlbGVyYXRlZCBjb21w b3NpdGluZywgYnV0IG91dHNpZGUgdGhlICNpZmRlZiB0byBtYWtlIGxpbmthZ2UgZWFzaWVyLgog ICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgc3luYyB3YXMgY29tcGxldGVkLgotICAgIGJvb2wg c3luY0NvbXBvc2l0aW5nU3RhdGVSZWN1cnNpdmUoKTsKKyAgICBib29sIHN5bmNDb21wb3NpdGlu Z1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiAKICAgICAvLyBSZXR1cm5zIHRydWUgd2hlbiBh IHBhaW50IHdpdGggdGhlIFBhaW50QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXllcnMgZmxh ZyBzZXQgZ2l2ZXMKICAgICAvLyBhIGZhaXRoZnVsIHJlcHJlc2VudGF0aW9uIG9mIHRoZSBjb250 ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcAppbmRleCAxN2YxNmMzZDgyYWNiYjBiMDg5M2NjYTNiODA1MWUzMzEwMWEwNGQzLi40 NjExZmE0NjMzMzg0YmNiYmY3YTVhZWMyMDkxMjkyM2M5MjhhMWIxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTAyLDYg KzEwMiw3IEBAIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yKFJl bmRlclZpZXcqIHJlbmRlclZpZXcpCiAgICAgLCBtX2NvbXBvc2l0aW5nRGVwZW5kc09uR2VvbWV0 cnkoZmFsc2UpCiAgICAgLCBtX2NvbXBvc2l0aW5nKGZhbHNlKQogICAgICwgbV9jb21wb3NpdGlu Z0xheWVyc05lZWRSZWJ1aWxkKGZhbHNlKQorICAgICwgbV9mbHVzaGluZ0xheWVycyhmYWxzZSkK ICAgICAsIG1fcm9vdExheWVyQXR0YWNobWVudChSb290TGF5ZXJVbmF0dGFjaGVkKQogI2lmIFBS T0ZJTEVfTEFZRVJfUkVCVUlMRAogICAgICwgbV9yb290TGF5ZXJVcGRhdGVDb3VudCgwKQpAQCAt MTgyLDEyICsxODMsMzIgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNjaGVkdWxlTGF5 ZXJGbHVzaCgpCiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpmbHVzaFBlbmRpbmdMYXll ckNoYW5nZXMoKQogeworICAgIEFTU0VSVCghbV9mbHVzaGluZ0xheWVycyk7CisgICAgbV9mbHVz aGluZ0xheWVycyA9IHRydWU7CisKICAgICAvLyBGSVhNRTogRnJhbWVWaWV3OjpzeW5jQ29tcG9z aXRpbmdTdGF0ZVJlY3Vyc2l2ZSgpIGNhbGxzIHRoaXMgZm9yIGVhY2gKICAgICAvLyBmcmFtZSwg c28gd2hlbiBjb21wb3NpdGluZyBsYXllcnMgYXJlIGNvbm5lY3RlZCBiZXR3ZWVuIGZyYW1lcywg d2UnbGwKICAgICAvLyBlbmQgdXAgc3luY2luZyBzdWJmcmFtZSdzIGxheWVycyBtdWx0aXBsZSB0 aW1lcy4KICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI0 ODkKICAgICBpZiAoR3JhcGhpY3NMYXllciogcm9vdExheWVyID0gcm9vdFBsYXRmb3JtTGF5ZXIo KSkKICAgICAgICAgcm9vdExheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZSgpOworCisgICAgQVNT RVJUKG1fZmx1c2hpbmdMYXllcnMpOworICAgIG1fZmx1c2hpbmdMYXllcnMgPSBmYWxzZTsKK30K KworUmVuZGVyTGF5ZXJDb21wb3NpdG9yKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmVuY2xvc2lu Z0NvbXBvc2l0b3JGbHVzaGluZ0xheWVycygpIGNvbnN0Cit7CisgICAgaWYgKCFtX3JlbmRlclZp ZXctPmZyYW1lVmlldygpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIGZvciAoRnJhbWUqIGZy YW1lID0gbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXcoKS0+ZnJhbWUoKTsgZnJhbWU7IGZyYW1lID0g ZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkpIHsKKyAgICAgICAgUmVuZGVyTGF5ZXJDb21wb3NpdG9y KiBjb21wb3NpdG9yID0gZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigpID8gZnJhbWUtPmNvbnRlbnRS ZW5kZXJlcigpLT5jb21wb3NpdG9yKCkgOiAwOworICAgICAgICBpZiAoY29tcG9zaXRvci0+aXNG bHVzaGluZ0xheWVycygpKQorICAgICAgICAgICAgcmV0dXJuIGNvbXBvc2l0b3I7CisgICAgfQor ICAgIAorICAgIHJldHVybiAwOwogfQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6c2No ZWR1bGVDb21wb3NpdGluZ0xheWVyVXBkYXRlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCBmYzM2ZGNhYTU4MDE0NGNlZDg0Yjlk NmMwMmRhYjM2OWZkZmVmNGRhLi4zMmQ2NGQzMzk2NjlhNTFiZWYyYTFlNWRhMTk2Mzg1Y2VjMGQ1 MGRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5oCkBAIC04OCw2ICs4OCwxMSBAQCBwdWJsaWM6CiAgICAgLy8gYXQgc3BlY2lmaWMgdGlt ZXMuCiAgICAgdm9pZCBzY2hlZHVsZUxheWVyRmx1c2goKTsKICAgICB2b2lkIGZsdXNoUGVuZGlu Z0xheWVyQ2hhbmdlcygpOworICAgIGJvb2wgaXNGbHVzaGluZ0xheWVycygpIGNvbnN0IHsgcmV0 dXJuIG1fZmx1c2hpbmdMYXllcnM7IH0KKyAgICAKKyAgICAvLyBmbHVzaFBlbmRpbmdMYXllckNo YW5nZXMoKSBmbHVzaGVzIHRoZSBlbnRpcmUgR3JhcGhpY3NMYXllciB0cmVlLCB3aGljaCBjYW4g Y3Jvc3MgZnJhbWUgYm91bmRhcmllcy4KKyAgICAvLyBUaGlzIGNhbGwgcmV0dXJucyB0aGUgcm9v dG1vc3QgY29tcG9zaXRvciB0aGF0IGlzIGJlaW5nIGZsdXNoZWQgKGluY2x1ZGluZyBzZWxmKS4K KyAgICBSZW5kZXJMYXllckNvbXBvc2l0b3IqIGVuY2xvc2luZ0NvbXBvc2l0b3JGbHVzaGluZ0xh eWVycygpIGNvbnN0OwogICAgIAogICAgIC8vIFJlYnVpbGQgdGhlIHRyZWUgb2YgY29tcG9zaXRp bmcgbGF5ZXJzCiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1Vw ZGF0ZVR5cGUgPSBDb21wb3NpdGluZ1VwZGF0ZUFmdGVyTGF5b3V0T3JTdHlsZUNoYW5nZSwgUmVu ZGVyTGF5ZXIqIHVwZGF0ZVJvb3QgPSAwKTsKQEAgLTI2Niw2ICsyNzEsNyBAQCBwcml2YXRlOgog CiAgICAgYm9vbCBtX2NvbXBvc2l0aW5nOwogICAgIGJvb2wgbV9jb21wb3NpdGluZ0xheWVyc05l ZWRSZWJ1aWxkOworICAgIGJvb2wgbV9mbHVzaGluZ0xheWVyczsKIAogICAgIFJvb3RMYXllckF0 dGFjaG1lbnQgbV9yb290TGF5ZXJBdHRhY2htZW50OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNTBm MmNkYjdkZmFkNTE2MmRiYmJlZDFiMmFhMjMwMTM4ZjQ0MjhlYy4uNWQ3OTBhZDg3OGI3Y2UzYTVi Njk3NmNiYWQwYjYwNjRhOGEwMWU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDExLTAxLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNzTGF5 ZXJzIGluIHN1YmZyYW1lcyBjYW4gZ2V0IHN5bmMnZCBtdWx0aXBsZSB0aW1lcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI0ODkKKyAgICAgICAgCisg ICAgICAgIFNvbWUgY2xlYW51cCB0aGF0IHdpbGwgd29yayB0b3dhcmRzIGZpeGluZyB0aGlzIGJ1 Zy4KKworICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBf c3luY0NvbXBvc2l0aW5nQ2hhbmdlc10pOiBzeW5jQ29tcG9zaXRpbmdTdGF0ZVJlY3Vyc2l2ZSgp CisgICAgICAgIHdhcyByZW5hbWVkIHRvIHN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3Vi ZnJhbWVzKCkuCisKIDIwMTEtMDEtMTkgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNaWhhaSBQYXJwYXJpdGEuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggODA5YjI4NmI1MDk2NTRkMzVhNDZlZDYwYmE3YTFh ZjRhMjhmOTI2NC4uM2E4OTVlMTc1NGQ0M2NjYTMyMjJmNWNhMWNjMzhmNmUyMTNiYjhjYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtNTk0Nyw3ICs1OTQ3LDcgQEAgc3Rh dGljIGlubGluZSB1aW50NjRfdCByb3VuZFVwVG9Qb3dlck9mMih1aW50NjRfdCBudW0pCiB7CiAg ICAgRnJhbWUqIGZyYW1lID0gW3NlbGYgX21haW5Db3JlRnJhbWVdOwogICAgIGlmIChmcmFtZSAm JiBmcmFtZS0+dmlldygpKQotICAgICAgICByZXR1cm4gZnJhbWUtPnZpZXcoKS0+c3luY0NvbXBv c2l0aW5nU3RhdGVSZWN1cnNpdmUoKTsKKyAgICAgICAgcmV0dXJuIGZyYW1lLT52aWV3KCktPnN5 bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiAKICAgICByZXR1cm4gWUVT OwogfQo= 79537 2011-01-19 18:50:36 -0800 2011-07-21 17:59:10 -0700 Patch bug-52489-20110119185035.patch text/plain 13941 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiOWU0NWE2OTVmM2Q0ZDgzNjM4MmEwMjk0YzhkNzk1MGE4MzkxZDJlLi5i Mjc0MGYxNjQyNGJjYzRhNmVmODQ3NTI3YWQ5NWZjM2I5YTNiODJhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzcgQEAKKzIwMTEtMDEtMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg R3JhcGhpY3NMYXllcnMgaW4gc3ViZnJhbWVzIGNhbiBnZXQgc3luYydkIG11bHRpcGxlIHRpbWVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjQ4OQor CisgICAgICAgIFNvbWUgY2xlYW51cCB0aGF0IHdpbGwgd29yayB0b3dhcmRzIGZpeGluZyB0aGlz IGJ1Zy4KKyAgICAgICAgCisgICAgICAgIFRlc3RlZCBieSBleGlzdGluZyBpZnJhbWUgY29tcG9z aXRpbmcgdGVzdHMuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjogc3luY0NvbXBvc2l0aW5n U3RhdGVSZWN1cnNpdmUoKQorICAgICAgICB3YXMgcmVuYW1lZCB0byBzeW5jQ29tcG9zaXRpbmdT dGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKTogU29tZQorICAgICAgICBjb2Rl IGNsZWFudXA6IGRvIGFsbCB0aGUgd29yZCB3ZSBuZWVkIHRvIGRvIGZvciB0aGlzIGZyYW1lLAor ICAgICAgICBpbmNsdWRpbmcgdGhlIG5lZWRzTGF5b3V0KCkgY2hlY2suCisgICAgICAgIChXZWJD b3JlOjpGcmFtZVZpZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKToK KyAgICAgICAgVGhpcyBpcyBubyBsb25nZXIgcmVjdXJzaXZlOyBpbnN0ZWFkLCBpdCBpdGVyYXRl cyBvdmVyIGRlc2NlbmRhbnQKKyAgICAgICAgZnJhbWVzIHZpYSB0aGUgZnJhbWUgdHJlZSwgY2Fs bGluZyBzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgpCisgICAgICAgIG9uIGVhY2gg RnJhbWUncyB2aWV3LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRv ci5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjppc0ZsdXNoaW5n TGF5ZXJzKTogR2V0dGVyIGZvciB0aGUgZmxhZy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcDogCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBv c2l0b3I6OlJlbmRlckxheWVyQ29tcG9zaXRvcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckNvbXBvc2l0b3I6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6IE1haW50YWluCisgICAg ICAgIGEgZmxhZyB0byBzYXkgaWYgd2UncmUgZmx1c2hpbmcsIHdoaWNoIGFsbG93cyB1cyB0byBh c3NlcnQgb24gcmUtZW50cmFudCBmbHVzaGVzLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjplbmNsb3NpbmdDb21wb3NpdG9yRmx1c2hpbmdMYXllcnMpOgorICAgICAg ICBBZGQgdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSByb290bW9zdCBjb21wb3NpdG9yIHRoYXQgaXMg aW4gdGhlIG1pZGRsZQorICAgICAgICBvZiBhIGZsdXNoLgorCiAyMDExLTAxLTEyICBNYXJ0aW4g Um9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBH dXN0YXZvIE5vcm9uaGEgU2lsdmEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGExMGQ2M2U2N2Q2 Mjg3NDgxMmEzNjU0NGQ5ZjZmZmVlOWJmZGZkYzMuLmZjYjhhMDA1NGY1OWJhOWVhZTY0YWExZjdj ODJhZmMwZTk4MTE1OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC04NzQsNyArODc0LDcgQEAg X19aTjdXZWJDb3JlOUZyYW1lVmlldzIzdXBkYXRlQ2FuSGF2ZVNjcm9sbGJhcnNFdgogX19aTjdX ZWJDb3JlOUZyYW1lVmlldzI0Zm9yY2VMYXlvdXRGb3JQYWdpbmF0aW9uRVJLTlNfOUZsb2F0U2l6 ZUVmTlNfNUZyYW1lMTlBZGp1c3RWaWV3U2l6ZU9yTm90RQogX19aTjdXZWJDb3JlOUZyYW1lVmll dzI2YWRqdXN0UGFnZUhlaWdodERlcHJlY2F0ZWRFUGZmZmYKIF9fWk43V2ViQ29yZTlGcmFtZVZp ZXcyOXNldFNob3VsZFVwZGF0ZVdoaWxlT2Zmc2NyZWVuRWIKLV9fWk43V2ViQ29yZTlGcmFtZVZp ZXcyOXN5bmNDb21wb3NpdGluZ1N0YXRlUmVjdXJzaXZlRXYKK19fWk43V2ViQ29yZTlGcmFtZVZp ZXczOHN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzRXYKIF9fWk43V2ViQ29y ZTlGcmFtZVZpZXczN3VwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmVFdgogX19a TjdXZWJDb3JlOUZyYW1lVmlldzM4c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhUGxhdGZvcm1XaWRn ZXRFdgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzZjcmVhdGVFUE5TXzVGcmFtZUUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAppbmRleCAxMTg3MzE4ZmMwMjgwYTUzMzc3ODRlYWZiYTMzOTA2OGNj MTRhYTRiLi5iY2M4YjlmMTFmNTBiOWFmNzRhZTRjMDZkODBkZWUwYmM2M2QyNWM4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC01NTQsMTAgKzU1NCwxOSBAQCB2b2lkIEZyYW1lVmll dzo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoKQogI2VuZGlmCiB9CiAKLXZvaWQgRnJhbWVWaWV3 OjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgpCitib29sIEZyYW1lVmlldzo6c3lu Y0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKQogewotICAgIGlmIChSZW5kZXJWaWV3KiB2 aWV3ID0gbV9mcmFtZS0+Y29udGVudFJlbmRlcmVyKCkpCi0gICAgICAgIHZpZXctPmNvbXBvc2l0 b3IoKS0+Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7CisgICAgQVNTRVJUKG1fZnJhbWUtPnZp ZXcoKSA9PSB0aGlzKTsKKyAgICBSZW5kZXJWaWV3KiB2aWV3ID0gbV9mcmFtZS0+Y29udGVudFJl bmRlcmVyKCk7CisgICAgaWYgKCF2aWV3KQorICAgICAgICByZXR1cm4gdHJ1ZTsgLy8gV2UgZG9u J3Qgd2FudCB0byBrZWVwIHRyeWluZyB0byB1cGRhdGUgbGF5ZXJzIGlmIHdlIGhhdmUgbm8gcmVu ZGVyZXIuCisKKyAgICAvLyBJZiB3ZSBzeW5jIGNvbXBvc2l0aW5nIGxheWVycyB3aGVuIGEgbGF5 b3V0IGlzIHBlbmRpbmcsIHdlIG1heSBjYXVzZSBwYWludGluZyBvZiBjb21wb3NpdGluZworICAg IC8vIGxheWVyIGNvbnRlbnQgdG8gb2NjdXIgYmVmb3JlIGxheW91dCBoYXMgaGFwcGVuZWQsIHdo aWNoIHdpbGwgY2F1c2UgcGFpbnRDb250ZW50cygpIHRvIGJhaWwuCisgICAgaWYgKG5lZWRzTGF5 b3V0KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHZpZXctPmNvbXBvc2l0b3IoKS0+ Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7CiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkp CiAgICAgLy8gVGhlIGZ1bGxTY3JlZW5SZW5kZXJlcidzIGdyYXBoaWNzTGF5ZXIgIGhhcyBiZWVu IHJlLXBhcmVudGVkLCBhbmQgdGhlIGFib3ZlIHJlY3Vyc2l2ZSBzeW5jQ29tcG9zaXRpbmdTdGF0 ZQpAQCAtNTY5LDcgKzU3OCw4IEBAIHZvaWQgRnJhbWVWaWV3OjpzeW5jQ29tcG9zaXRpbmdTdGF0 ZUZvclRoaXNGcmFtZSgpCiAgICAgICAgIGlmIChHcmFwaGljc0xheWVyKiBmdWxsU2NyZWVuTGF5 ZXIgPSBiYWNraW5nLT5ncmFwaGljc0xheWVyKCkpCiAgICAgICAgICAgICBmdWxsU2NyZWVuTGF5 ZXItPnN5bmNDb21wb3NpdGluZ1N0YXRlKCk7CiAgICAgfQotI2VuZGlmICAgIAorI2VuZGlmCisg ICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpzZXROZWVkc09uZVNob3REcmF3 aW5nU3luY2hyb25pemF0aW9uKCkKQEAgLTY0OCwzMiArNjU4LDE2IEBAIGJvb2wgRnJhbWVWaWV3 Ojppc0VuY2xvc2VkSW5Db21wb3NpdGluZ0xheWVyKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAgICAgCi1ib29sIEZyYW1lVmlldzo6c3luY0NvbXBvc2l0aW5nU3RhdGVSZWN1cnNpdmUo KQorYm9vbCBGcmFtZVZpZXc6OnN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVz KCkKIHsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgQVNTRVJUKG1fZnJh bWUtPnZpZXcoKSA9PSB0aGlzKTsKLSAgICBSZW5kZXJWaWV3KiBjb250ZW50UmVuZGVyZXIgPSBt X2ZyYW1lLT5jb250ZW50UmVuZGVyZXIoKTsKLSAgICBpZiAoIWNvbnRlbnRSZW5kZXJlcikKLSAg ICAgICAgcmV0dXJuIHRydWU7ICAgIC8vIFdlIGRvbid0IHdhbnQgdG8ga2VlcCB0cnlpbmcgdG8g dXBkYXRlIGxheWVycyBpZiB3ZSBoYXZlIG5vIHJlbmRlcmVyLgotCi0gICAgLy8gSWYgd2Ugc3lu YyBjb21wb3NpdGluZyBsYXllcnMgd2hlbiBhIGxheW91dCBpcyBwZW5kaW5nLCB3ZSBtYXkgY2F1 c2UgcGFpbnRpbmcgb2YgY29tcG9zaXRpbmcKLSAgICAvLyBsYXllciBjb250ZW50IHRvIG9jY3Vy IGJlZm9yZSBsYXlvdXQgaGFzIGhhcHBlbmVkLCB3aGljaCB3aWxsIGNhdXNlIHBhaW50Q29udGVu dHMoKSB0byBiYWlsLgotICAgIGlmIChuZWVkc0xheW91dCgpKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgCi0gICAgc3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKKyAgICBi b29sIGFsbEZyYW1lc1N5bmNlZCA9IHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCk7 CiAgICAgCi0gICAgYm9vbCBhbGxTdWJmcmFtZXNTeW5jZWQgPSB0cnVlOwotICAgIGNvbnN0IEhh c2hTZXQ8UmVmUHRyPFdpZGdldD4gPiogdmlld0NoaWxkcmVuID0gY2hpbGRyZW4oKTsKLSAgICBI YXNoU2V0PFJlZlB0cjxXaWRnZXQ+ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHZpZXdDaGlsZHJl bi0+ZW5kKCk7Ci0gICAgZm9yIChIYXNoU2V0PFJlZlB0cjxXaWRnZXQ+ID46OmNvbnN0X2l0ZXJh dG9yIGN1cnJlbnQgPSB2aWV3Q2hpbGRyZW4tPmJlZ2luKCk7IGN1cnJlbnQgIT0gZW5kOyArK2N1 cnJlbnQpIHsKLSAgICAgICAgV2lkZ2V0KiB3aWRnZXQgPSAoKmN1cnJlbnQpLmdldCgpOwotICAg ICAgICBpZiAod2lkZ2V0LT5pc0ZyYW1lVmlldygpKSB7Ci0gICAgICAgICAgICBib29sIHN5bmNl ZCA9IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHdpZGdldCktPnN5bmNDb21wb3NpdGluZ1N0YXRl UmVjdXJzaXZlKCk7Ci0gICAgICAgICAgICBhbGxTdWJmcmFtZXNTeW5jZWQgJj0gc3luY2VkOwot ICAgICAgICB9CisgICAgZm9yIChGcmFtZSogY2hpbGQgPSBtX2ZyYW1lLT50cmVlKCktPmZpcnN0 Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KG1fZnJh bWUuZ2V0KCkpKSB7CisgICAgICAgIGJvb2wgc3luY2VkID0gY2hpbGQtPnZpZXcoKS0+c3luY0Nv bXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKKyAgICAgICAgYWxsRnJhbWVzU3luY2VkICY9 IHN5bmNlZDsKICAgICB9Ci0gICAgcmV0dXJuIGFsbFN1YmZyYW1lc1N5bmNlZDsKKyAgICByZXR1 cm4gYWxsRnJhbWVzU3luY2VkOwogI2Vsc2UgLy8gVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQogICAgIHJldHVybiB0cnVlOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCA2 NWEzYTg1MTk4NDgxMTU3NzA2MzU2OGMyZjBlY2UyYjUwMGQwZTgwLi5iZTEwNmFlZWEzNzJhMzA5 ZWEyY2FjZDY3NDk2ZGY5NTFiMTNkNGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTk5 LDcgKzk5LDcgQEAgcHVibGljOgogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQog ICAgIHZvaWQgdXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoKTsKLSAgICB2b2lkIHN5bmNDb21wb3Np dGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCk7CisgICAgYm9vbCBzeW5jQ29tcG9zaXRpbmdTdGF0ZUZv clRoaXNGcmFtZSgpOwogCiAgICAgLy8gQ2FsbGVkIHdoZW4gY2hhbmdlcyB0byB0aGUgR3JhcGhp Y3NMYXllciBoaWVyYXJjaHkgaGF2ZSB0byBiZSBzeW5jaHJvbml6ZWQgd2l0aAogICAgIC8vIGNv bnRlbnQgcmVuZGVyZWQgdmlhIHRoZSBub3JtYWwgcGFpbnRpbmcgcGF0aC4KQEAgLTExNCw3ICsx MTQsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBPbmx5IHVzZWQgd2l0aCBhY2NlbGVyYXRlZCBjb21w b3NpdGluZywgYnV0IG91dHNpZGUgdGhlICNpZmRlZiB0byBtYWtlIGxpbmthZ2UgZWFzaWVyLgog ICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgc3luYyB3YXMgY29tcGxldGVkLgotICAgIGJvb2wg c3luY0NvbXBvc2l0aW5nU3RhdGVSZWN1cnNpdmUoKTsKKyAgICBib29sIHN5bmNDb21wb3NpdGlu Z1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiAKICAgICAvLyBSZXR1cm5zIHRydWUgd2hlbiBh IHBhaW50IHdpdGggdGhlIFBhaW50QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXllcnMgZmxh ZyBzZXQgZ2l2ZXMKICAgICAvLyBhIGZhaXRoZnVsIHJlcHJlc2VudGF0aW9uIG9mIHRoZSBjb250 ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcAppbmRleCAxN2YxNmMzZDgyYWNiYjBiMDg5M2NjYTNiODA1MWUzMzEwMWEwNGQzLi40 NjExZmE0NjMzMzg0YmNiYmY3YTVhZWMyMDkxMjkyM2M5MjhhMWIxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTAyLDYg KzEwMiw3IEBAIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yKFJl bmRlclZpZXcqIHJlbmRlclZpZXcpCiAgICAgLCBtX2NvbXBvc2l0aW5nRGVwZW5kc09uR2VvbWV0 cnkoZmFsc2UpCiAgICAgLCBtX2NvbXBvc2l0aW5nKGZhbHNlKQogICAgICwgbV9jb21wb3NpdGlu Z0xheWVyc05lZWRSZWJ1aWxkKGZhbHNlKQorICAgICwgbV9mbHVzaGluZ0xheWVycyhmYWxzZSkK ICAgICAsIG1fcm9vdExheWVyQXR0YWNobWVudChSb290TGF5ZXJVbmF0dGFjaGVkKQogI2lmIFBS T0ZJTEVfTEFZRVJfUkVCVUlMRAogICAgICwgbV9yb290TGF5ZXJVcGRhdGVDb3VudCgwKQpAQCAt MTgyLDEyICsxODMsMzIgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNjaGVkdWxlTGF5 ZXJGbHVzaCgpCiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpmbHVzaFBlbmRpbmdMYXll ckNoYW5nZXMoKQogeworICAgIEFTU0VSVCghbV9mbHVzaGluZ0xheWVycyk7CisgICAgbV9mbHVz aGluZ0xheWVycyA9IHRydWU7CisKICAgICAvLyBGSVhNRTogRnJhbWVWaWV3OjpzeW5jQ29tcG9z aXRpbmdTdGF0ZVJlY3Vyc2l2ZSgpIGNhbGxzIHRoaXMgZm9yIGVhY2gKICAgICAvLyBmcmFtZSwg c28gd2hlbiBjb21wb3NpdGluZyBsYXllcnMgYXJlIGNvbm5lY3RlZCBiZXR3ZWVuIGZyYW1lcywg d2UnbGwKICAgICAvLyBlbmQgdXAgc3luY2luZyBzdWJmcmFtZSdzIGxheWVycyBtdWx0aXBsZSB0 aW1lcy4KICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI0 ODkKICAgICBpZiAoR3JhcGhpY3NMYXllciogcm9vdExheWVyID0gcm9vdFBsYXRmb3JtTGF5ZXIo KSkKICAgICAgICAgcm9vdExheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZSgpOworCisgICAgQVNT RVJUKG1fZmx1c2hpbmdMYXllcnMpOworICAgIG1fZmx1c2hpbmdMYXllcnMgPSBmYWxzZTsKK30K KworUmVuZGVyTGF5ZXJDb21wb3NpdG9yKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmVuY2xvc2lu Z0NvbXBvc2l0b3JGbHVzaGluZ0xheWVycygpIGNvbnN0Cit7CisgICAgaWYgKCFtX3JlbmRlclZp ZXctPmZyYW1lVmlldygpKQorICAgICAgICByZXR1cm4gMDsKKworICAgIGZvciAoRnJhbWUqIGZy YW1lID0gbV9yZW5kZXJWaWV3LT5mcmFtZVZpZXcoKS0+ZnJhbWUoKTsgZnJhbWU7IGZyYW1lID0g ZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkpIHsKKyAgICAgICAgUmVuZGVyTGF5ZXJDb21wb3NpdG9y KiBjb21wb3NpdG9yID0gZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigpID8gZnJhbWUtPmNvbnRlbnRS ZW5kZXJlcigpLT5jb21wb3NpdG9yKCkgOiAwOworICAgICAgICBpZiAoY29tcG9zaXRvci0+aXNG bHVzaGluZ0xheWVycygpKQorICAgICAgICAgICAgcmV0dXJuIGNvbXBvc2l0b3I7CisgICAgfQor ICAgIAorICAgIHJldHVybiAwOwogfQogCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6c2No ZWR1bGVDb21wb3NpdGluZ0xheWVyVXBkYXRlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCBmYzM2ZGNhYTU4MDE0NGNlZDg0Yjlk NmMwMmRhYjM2OWZkZmVmNGRhLi4zMmQ2NGQzMzk2NjlhNTFiZWYyYTFlNWRhMTk2Mzg1Y2VjMGQ1 MGRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5oCkBAIC04OCw2ICs4OCwxMSBAQCBwdWJsaWM6CiAgICAgLy8gYXQgc3BlY2lmaWMgdGlt ZXMuCiAgICAgdm9pZCBzY2hlZHVsZUxheWVyRmx1c2goKTsKICAgICB2b2lkIGZsdXNoUGVuZGlu Z0xheWVyQ2hhbmdlcygpOworICAgIGJvb2wgaXNGbHVzaGluZ0xheWVycygpIGNvbnN0IHsgcmV0 dXJuIG1fZmx1c2hpbmdMYXllcnM7IH0KKyAgICAKKyAgICAvLyBmbHVzaFBlbmRpbmdMYXllckNo YW5nZXMoKSBmbHVzaGVzIHRoZSBlbnRpcmUgR3JhcGhpY3NMYXllciB0cmVlLCB3aGljaCBjYW4g Y3Jvc3MgZnJhbWUgYm91bmRhcmllcy4KKyAgICAvLyBUaGlzIGNhbGwgcmV0dXJucyB0aGUgcm9v dG1vc3QgY29tcG9zaXRvciB0aGF0IGlzIGJlaW5nIGZsdXNoZWQgKGluY2x1ZGluZyBzZWxmKS4K KyAgICBSZW5kZXJMYXllckNvbXBvc2l0b3IqIGVuY2xvc2luZ0NvbXBvc2l0b3JGbHVzaGluZ0xh eWVycygpIGNvbnN0OwogICAgIAogICAgIC8vIFJlYnVpbGQgdGhlIHRyZWUgb2YgY29tcG9zaXRp bmcgbGF5ZXJzCiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1Vw ZGF0ZVR5cGUgPSBDb21wb3NpdGluZ1VwZGF0ZUFmdGVyTGF5b3V0T3JTdHlsZUNoYW5nZSwgUmVu ZGVyTGF5ZXIqIHVwZGF0ZVJvb3QgPSAwKTsKQEAgLTI2Niw2ICsyNzEsNyBAQCBwcml2YXRlOgog CiAgICAgYm9vbCBtX2NvbXBvc2l0aW5nOwogICAgIGJvb2wgbV9jb21wb3NpdGluZ0xheWVyc05l ZWRSZWJ1aWxkOworICAgIGJvb2wgbV9mbHVzaGluZ0xheWVyczsKIAogICAgIFJvb3RMYXllckF0 dGFjaG1lbnQgbV9yb290TGF5ZXJBdHRhY2htZW50OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNTBm MmNkYjdkZmFkNTE2MmRiYmJlZDFiMmFhMjMwMTM4ZjQ0MjhlYy4uNWU1MjBkNjhmNDVmMzc2N2Nj NTkyNTlhMzFiYWIyOGE3MzYzOTE2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDExLTAxLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNzTGF5 ZXJzIGluIHN1YmZyYW1lcyBjYW4gZ2V0IHN5bmMnZCBtdWx0aXBsZSB0aW1lcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI0ODkKKworICAgICAgICAq IFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfc3luY0NvbXBvc2l0aW5n Q2hhbmdlc10pOiBzeW5jQ29tcG9zaXRpbmdTdGF0ZVJlY3Vyc2l2ZSgpCisgICAgICAgIHdhcyBy ZW5hbWVkIHRvIHN5bmNDb21wb3NpdGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCkuCisKIDIw MTEtMDEtMTkgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBNaWhhaSBQYXJwYXJpdGEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZp ZXcubW0KaW5kZXggODA5YjI4NmI1MDk2NTRkMzVhNDZlZDYwYmE3YTFhZjRhMjhmOTI2NC4uM2E4 OTVlMTc1NGQ0M2NjYTMyMjJmNWNhMWNjMzhmNmUyMTNiYjhjYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVmlldy5tbQpAQCAtNTk0Nyw3ICs1OTQ3LDcgQEAgc3RhdGljIGlubGluZSB1aW50 NjRfdCByb3VuZFVwVG9Qb3dlck9mMih1aW50NjRfdCBudW0pCiB7CiAgICAgRnJhbWUqIGZyYW1l ID0gW3NlbGYgX21haW5Db3JlRnJhbWVdOwogICAgIGlmIChmcmFtZSAmJiBmcmFtZS0+dmlldygp KQotICAgICAgICByZXR1cm4gZnJhbWUtPnZpZXcoKS0+c3luY0NvbXBvc2l0aW5nU3RhdGVSZWN1 cnNpdmUoKTsKKyAgICAgICAgcmV0dXJuIGZyYW1lLT52aWV3KCktPnN5bmNDb21wb3NpdGluZ1N0 YXRlSW5jbHVkaW5nU3ViZnJhbWVzKCk7CiAKICAgICByZXR1cm4gWUVTOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxv ZwppbmRleCAxZDM1YTllYmZlNjMxZTZkMWIzNDEyOWYwNGQxMTE1YzMzYmE1Mjk0Li5lYzUzZTRh Mjk5ZGU4ZWEyMGVlOTAxOGRmM2I5NTI5MzNlOTFkNmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDExLTAxLTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdy YXBoaWNzTGF5ZXJzIGluIHN1YmZyYW1lcyBjYW4gZ2V0IHN5bmMnZCBtdWx0aXBsZSB0aW1lcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI0ODkKKwor ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQYWdlQ2xpZW50UVdpZGdldDo6c3luY0xheWVycyk6IHN5bmNDb21wb3NpdGluZ1N0YXRl UmVjdXJzaXZlKCkKKyAgICAgICAgd2FzIHJlbmFtZWQgdG8gc3luY0NvbXBvc2l0aW5nU3RhdGVJ bmNsdWRpbmdTdWJmcmFtZXMoKS4KKwogMjAxMS0wMS0xOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8 b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IExhc3psbyBHb21ib3MgYW5k IFRvciBBcm5lIFZlc3Riw7guCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L1BhZ2VDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L1BhZ2VDbGllbnRRdC5jcHAKaW5kZXggYzM4NjljNWFjNzE4NjkwMTM5OWYxN2UxNWVhMGRhYjMz NTczNjk5MS4uM2FkYjgzNzFlZjljNTBjZTRjNzdlMzQ3YTljOGNkODVmYTcyNDBhNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9QYWdlQ2xpZW50UXQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvUGFnZUNsaWVudFF0LmNwcApAQCAt MTcwLDcgKzE3MCw3IEBAIHZvaWQgUGFnZUNsaWVudFFXaWRnZXQ6Om1hcmtGb3JTeW5jKGJvb2wg c2NoZWR1bGVTeW5jKQogCiB2b2lkIFBhZ2VDbGllbnRRV2lkZ2V0OjpzeW5jTGF5ZXJzKFRpbWVy PFBhZ2VDbGllbnRRV2lkZ2V0PiopCiB7Ci0gICAgUVdlYkZyYW1lUHJpdmF0ZTo6Y29yZShwYWdl LT5tYWluRnJhbWUoKSktPnZpZXcoKS0+c3luY0NvbXBvc2l0aW5nU3RhdGVSZWN1cnNpdmUoKTsK KyAgICBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKHBhZ2UtPm1haW5GcmFtZSgpKS0+dmlldygpLT5z eW5jQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOwogfQogI2VuZGlmCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2lu L0NoYW5nZUxvZwppbmRleCBmMjZmMGYyMjJhYzVmY2QzYzhlNmE4YjhhNjRhZmQ0YzViZmJkODlm Li4xY2Q4M2I4YzFlNzE3NGQ0ZTIwY2I3ZTNmZTk0NjRiM2NkYjNiMGJmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDEtMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgR3JhcGhpY3NMYXllcnMgaW4gc3ViZnJhbWVzIGNhbiBnZXQgc3luYydkIG11bHRp cGxlIHRpbWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01MjQ4OQorCisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpzeW5j Q29tcG9zaXRpbmdTdGF0ZSk6IHN5bmNDb21wb3NpdGluZ1N0YXRlUmVjdXJzaXZlKCkKKyAgICAg ICAgd2FzIHJlbmFtZWQgdG8gc3luY0NvbXBvc2l0aW5nU3RhdGVJbmNsdWRpbmdTdWJmcmFtZXMo KS4KKwogMjAxMS0wMS0xNyAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAg ICAgVXBkYXRlIGZvciBXS0NBQ0ZMYXllclJlbmRlcmVyIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5j cHAKaW5kZXggYWU5MTcyNGU2YWZjMDY2MTBjMDVhZWIxMjFjYTMwZTU2NDk3ZDlmZC4uNGM2YTQy M2U4OGM4ZTQ2M2E1MTA0NjFhMzc3OTlhNmVhYzYzZjc5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAK QEAgLTY1MjIsNyArNjUyMiw3IEBAIHZvaWQgV2ViVmlldzo6c3luY0NvbXBvc2l0aW5nU3RhdGUo KQogICAgIGlmIChtX2JhY2tpbmdMYXllcikKICAgICAgICAgbV9iYWNraW5nTGF5ZXItPnN5bmND b21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVyT25seSgpOwogCi0gICAgdmlldy0+c3luY0NvbXBv c2l0aW5nU3RhdGVSZWN1cnNpdmUoKTsKKyAgICB2aWV3LT5zeW5jQ29tcG9zaXRpbmdTdGF0ZUlu Y2x1ZGluZ1N1YmZyYW1lcygpOwogfQogCiAjZW5kaWYK 101651 2011-07-21 15:30:57 -0700 2011-07-21 18:00:39 -0700 Patch bug-52489-20110721153056.patch text/plain 7086 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogOTE1MTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxZDQzZmJmNzI2ZjFmYWE1 ZTNiODQ0NzM1NTg4NGViZGY0ZWMyNDc4Li5kYTU3ZDBmMmJlZWVmODU1Y2M0YjJmZTA4ZDhhM2Mx ZTkzNDJkZmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDctMjEgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgR3JhcGhpY3NMYXll cnMgaW4gc3ViZnJhbWVzIGNhbiBnZXQgc3luYydkIG11bHRpcGxlIHRpbWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjQ4OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgQXZvaWQgZG9pbmcg YSAnc3luY0NvbXBvc2l0aW5nU3RhdGUnIHBhc3Mgb24gdGhlIEdyYXBoaWNzTGF5ZXJzCisgICAg ICAgIGZvciBzdWJmcmFtZXMsIHdoZW4gdGhvc2UgR3JhcGhpY3NMYXllcnMgYXJlIHJvb3RlZCBp biB0aGUKKyAgICAgICAgcGFyZW50IGRvY3VtZW50LgorCisgICAgICAgICogcGFnZS9GcmFtZVZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzeW5jQ29tcG9zaXRpbmdTdGF0 ZUZvclRoaXNGcmFtZSk6IEFkZCBhIHBhcmFtZXRlcgorICAgICAgICB0aGF0IGNvbnRhaW5zIHRo ZSByb290bW9zdCBmcmFtZSBvbiB3aGljaCBzeW5jIHdhcyBjYWxsZWQuIFRoaXMgaXMgdXNlZAor ICAgICAgICB0byBpbmRpY2F0ZSB0byB0aGUgY29tcG9zaXRvciB3aGV0aGVyIGl0J3MgdGhlIHJv b3Qgb2YgdGhlIHN5bmMuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnN5bmNDb21wb3Np dGluZ1N0YXRlSW5jbHVkaW5nU3ViZnJhbWVzKTogUGFzcyB0aGUgY3VycmVudAorICAgICAgICBG cmFtZSBpbi4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGFpbnRDb250ZW50cyk6IFRo ZSBzeW5jIGlzIGZvciB0aGlzIGZyYW1lLCBzbyBwYXNzIG1fZnJhbWUuCisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zmx1c2hQZW5k aW5nTGF5ZXJDaGFuZ2VzKTogTmV3IHBhcmFtZXRlcgorICAgICAgICB0byBzcGVjaWZ5IHdoZXRo ZXIgdGhpcyBjb21wb3NpdG9yIGlzIGluIHRoZSByb290bW9zdCBGcmFtZSBiZWluZyBmbHVzaGVk LgorICAgICAgICBXZSBjYW4gYXZvaWQgZG9pbmcgd29yayBpZiB3ZSBrbm93IHRoYXQgZmx1c2hp bmcgc29tZSBhbmNlc3RvciBmcmFtZSB3b3VsZAorICAgICAgICBoYXZlIGFsc28gdHJhdmVyc2Vk IG91ciBHcmFwaGljc0xheWVycy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmlzRmx1 c2hpbmdMYXllcnMpOiBNYWtlIHRoaXMgcHJpdmF0ZSwgc2luY2UKKyAgICAgICAgY2FsbGVycyBh cmUgcHJvYmFibHkgbW9zdCBpbnRlcnN0ZWQgaW4gZW5jbG9zaW5nQ29tcG9zaXRvckZsdXNoaW5n TGF5ZXJzKCkuCisKIDIwMTEtMDctMjEgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29t PgogCiAgICAgICAgIFVwZGF0ZSB3ZWJnbGNvbnRleHRsb3N0IC8gd2ViZ2xjb250ZXh0cmVzdG9y ZWQgZGVsaXZlcnkgdG8gbWF0Y2ggc3BlYyBjaGFuZ2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKaW5kZXggYmM4ODgzMmUwODE3Mjc2MzYwYjNiZDgxODA4NmI5MmMyYjM3OTA0Mi4uOGQyMTZl YTViZTc3MDRjN2RhODE5ZjQyZDQ1MjllNDkwNmE0ZTAyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcApAQCAtNjg0LDcgKzY4NCw3IEBAIEdyYXBoaWNzTGF5ZXIqIEZyYW1lVmlldzo6bGF5 ZXJGb3JTY3JvbGxDb3JuZXIoKSBjb25zdAogICAgIHJldHVybiB2aWV3LT5jb21wb3NpdG9yKCkt PmxheWVyRm9yU2Nyb2xsQ29ybmVyKCk7CiB9CiAKLWJvb2wgRnJhbWVWaWV3OjpzeW5jQ29tcG9z aXRpbmdTdGF0ZUZvclRoaXNGcmFtZSgpCitib29sIEZyYW1lVmlldzo6c3luY0NvbXBvc2l0aW5n U3RhdGVGb3JUaGlzRnJhbWUoRnJhbWUqIHJvb3RGcmFtZUZvclN5bmMpCiB7CiAgICAgQVNTRVJU KG1fZnJhbWUtPnZpZXcoKSA9PSB0aGlzKTsKICAgICBSZW5kZXJWaWV3KiB2aWV3ID0gbV9mcmFt ZS0+Y29udGVudFJlbmRlcmVyKCk7CkBAIC02OTYsNyArNjk2LDcgQEAgYm9vbCBGcmFtZVZpZXc6 OnN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCkKICAgICBpZiAobmVlZHNMYXlvdXQo KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgdmlldy0+Y29tcG9zaXRvcigpLT5mbHVz aFBlbmRpbmdMYXllckNoYW5nZXMoKTsKKyAgICB2aWV3LT5jb21wb3NpdG9yKCktPmZsdXNoUGVu ZGluZ0xheWVyQ2hhbmdlcyhyb290RnJhbWVGb3JTeW5jID09IG1fZnJhbWUpOwogCiAjaWYgRU5B QkxFKEZVTExTQ1JFRU5fQVBJKQogICAgIC8vIFRoZSBmdWxsU2NyZWVuUmVuZGVyZXIncyBncmFw aGljc0xheWVyICBoYXMgYmVlbiByZS1wYXJlbnRlZCwgYW5kIHRoZSBhYm92ZSByZWN1cnNpdmUg c3luY0NvbXBvc2l0aW5nU3RhdGUKQEAgLTc4OSwxMCArNzg5LDEwIEBAIGJvb2wgRnJhbWVWaWV3 Ojppc0VuY2xvc2VkSW5Db21wb3NpdGluZ0xheWVyKCkgY29uc3QKIGJvb2wgRnJhbWVWaWV3Ojpz eW5jQ29tcG9zaXRpbmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpCiB7CiAjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIGJvb2wgYWxsRnJhbWVzU3luY2VkID0gc3luY0NvbXBv c2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKKyAgICBib29sIGFsbEZyYW1lc1N5bmNlZCA9IHN5 bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKG1fZnJhbWUuZ2V0KCkpOwogICAgIAogICAg IGZvciAoRnJhbWUqIGNoaWxkID0gbV9mcmFtZS0+dHJlZSgpLT5maXJzdENoaWxkKCk7IGNoaWxk OyBjaGlsZCA9IGNoaWxkLT50cmVlKCktPnRyYXZlcnNlTmV4dChtX2ZyYW1lLmdldCgpKSkgewot ICAgICAgICBib29sIHN5bmNlZCA9IGNoaWxkLT52aWV3KCktPnN5bmNDb21wb3NpdGluZ1N0YXRl Rm9yVGhpc0ZyYW1lKCk7CisgICAgICAgIGJvb2wgc3luY2VkID0gY2hpbGQtPnZpZXcoKS0+c3lu Y0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUobV9mcmFtZS5nZXQoKSk7CiAgICAgICAgIGFs bEZyYW1lc1N5bmNlZCAmPSBzeW5jZWQ7CiAgICAgfQogICAgIHJldHVybiBhbGxGcmFtZXNTeW5j ZWQ7CkBAIC0yNTIzLDcgKzI1MjMsNyBAQCB2b2lkIEZyYW1lVmlldzo6cGFpbnRDb250ZW50cyhH cmFwaGljc0NvbnRleHQqIHAsIGNvbnN0IEludFJlY3QmIHJlY3QpCiAKICNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCiAgICAgaWYgKCFwLT5wYWludGluZ0Rpc2FibGVkKCkpCi0gICAg ICAgIHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKCk7CisgICAgICAgIHN5bmNDb21w b3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKG1fZnJhbWUuZ2V0KCkpOwogI2VuZGlmCiAKICAgICBQ YWludEJlaGF2aW9yIG9sZFBhaW50QmVoYXZpb3IgPSBtX3BhaW50QmVoYXZpb3I7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuaAppbmRleCAwMzZiNThiZmY1NzRlZDRkYTAwMGNlMDY0NDc0YjZmYTMzY2Zm YmMzLi5hMzJmODEwNGUzODc0NGUwNWNlYmUwYjYwYzUxNjQ0MWU4NWMyYzkxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmgKQEAgLTExMCw3ICsxMTAsNyBAQCBwdWJsaWM6CiAKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ0xheWVycygp OwotICAgIGJvb2wgc3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzRnJhbWUoKTsKKyAgICBib29s IHN5bmNDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0ZyYW1lKEZyYW1lKiByb290RnJhbWVGb3JTeW5j KTsKIAogICAgIHZvaWQgY2xlYXJCYWNraW5nU3RvcmVzKCk7CiAgICAgdm9pZCByZXN0b3JlQmFj a2luZ1N0b3JlcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcAppbmRleCA1OGYzOWFhOTA1MzhjZDM5NzgzMThjODg4ZDEwOGJiMjI5 ZWMzYzM3Li5hZTcxZDBiODJiMzBmYTI3ZDc1MDg1ZTgyNzcyMDI2ZGQyYTEwNDdiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApA QCAtMTkxLDE1ICsxOTEsMTggQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnNjaGVkdWxl TGF5ZXJGbHVzaCgpCiAgICAgcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5zY2hlZHVsZUNvbXBv c2l0aW5nTGF5ZXJTeW5jKCk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpmbHVz aFBlbmRpbmdMYXllckNoYW5nZXMoKQordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZsdXNo UGVuZGluZ0xheWVyQ2hhbmdlcyhib29sIGlzRmx1c2hSb290KQogeworICAgIC8vIEZyYW1lVmll dzo6c3luY0NvbXBvc2l0aW5nU3RhdGVJbmNsdWRpbmdTdWJmcmFtZXMoKSBmbHVzaGVzIGVhY2gg c3ViZnJhbWUsCisgICAgLy8gYnV0IEdyYXBoaWNzTGF5ZXI6OnN5bmNDb21wb3NpdGluZ1N0YXRl KCkgd2lsbCBjcm9zcyBmcmFtZSBib3VuZGFyaWVzCisgICAgLy8gaWYgdGhlIEdyYXBoaWNzTGF5 ZXJzIGFyZSBjb25uZWN0ZWQgKHRoZSBSb290TGF5ZXJBdHRhY2hlZFZpYUVuY2xvc2luZ0ZyYW1l IGNhc2UpLgorICAgIC8vIEFzIGxvbmcgYXMgd2UncmUgbm90IHRoZSByb290IG9mIHRoZSBmbHVz aCwgd2UgY2FuIGJhaWwuCisgICAgaWYgKCFpc0ZsdXNoUm9vdCAmJiByb290TGF5ZXJBdHRhY2ht ZW50KCkgPT0gUm9vdExheWVyQXR0YWNoZWRWaWFFbmNsb3NpbmdGcmFtZSkKKyAgICAgICAgcmV0 dXJuOworICAgIAogICAgIEFTU0VSVCghbV9mbHVzaGluZ0xheWVycyk7CiAgICAgbV9mbHVzaGlu Z0xheWVycyA9IHRydWU7CiAKLSAgICAvLyBGSVhNRTogRnJhbWVWaWV3OjpzeW5jQ29tcG9zaXRp bmdTdGF0ZVJlY3Vyc2l2ZSgpIGNhbGxzIHRoaXMgZm9yIGVhY2gKLSAgICAvLyBmcmFtZSwgc28g d2hlbiBjb21wb3NpdGluZyBsYXllcnMgYXJlIGNvbm5lY3RlZCBiZXR3ZWVuIGZyYW1lcywgd2Un bGwKLSAgICAvLyBlbmQgdXAgc3luY2luZyBzdWJmcmFtZSdzIGxheWVycyBtdWx0aXBsZSB0aW1l cy4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI0ODkK ICAgICBpZiAoR3JhcGhpY3NMYXllciogcm9vdExheWVyID0gcm9vdEdyYXBoaWNzTGF5ZXIoKSkK ICAgICAgICAgcm9vdExheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZSgpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKaW5kZXggMWRiMzYw ZDlmODZkYWQ5NDg3YThiNTQzNTA3NzFlYzQ0MDU1M2U3Yi4uNWM3MjIyYmYxNTE0MzBkMDI3YzU5 ZTVhODc2YjNjM2ViNjcxNzI1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtODcsOCArODcsNyBAQCBwdWJsaWM6CiAgICAgLy8g R3JhcGhpY3NMYXllcnMgYnVmZmVyIHN0YXRlLCB3aGljaCBnZXRzIHB1c2hlZCB0byB0aGUgdW5k ZXJseWluZyBwbGF0Zm9ybSBsYXllcnMKICAgICAvLyBhdCBzcGVjaWZpYyB0aW1lcy4KICAgICB2 b2lkIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOwotICAgIHZvaWQgZmx1c2hQZW5kaW5nTGF5ZXJDaGFu Z2VzKCk7Ci0gICAgYm9vbCBpc0ZsdXNoaW5nTGF5ZXJzKCkgY29uc3QgeyByZXR1cm4gbV9mbHVz aGluZ0xheWVyczsgfQorICAgIHZvaWQgZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKGJvb2wgaXNG bHVzaFJvb3QgPSB0cnVlKTsKICAgICAKICAgICAvLyBmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMo KSBmbHVzaGVzIHRoZSBlbnRpcmUgR3JhcGhpY3NMYXllciB0cmVlLCB3aGljaCBjYW4gY3Jvc3Mg ZnJhbWUgYm91bmRhcmllcy4KICAgICAvLyBUaGlzIGNhbGwgcmV0dXJucyB0aGUgcm9vdG1vc3Qg Y29tcG9zaXRvciB0aGF0IGlzIGJlaW5nIGZsdXNoZWQgKGluY2x1ZGluZyBzZWxmKS4KQEAgLTI2 MCw2ICsyNTksOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBub3RpZnlJRnJhbWVzT2ZDb21wb3Np dGluZ0NoYW5nZSgpOwogCisgICAgYm9vbCBpc0ZsdXNoaW5nTGF5ZXJzKCkgY29uc3QgeyByZXR1 cm4gbV9mbHVzaGluZ0xheWVyczsgfQorCiAgICAgLy8gV2hldGhlciBhIHJ1bm5pbmcgdHJhbnNp dGlvbiBvciBhbmltYXRpb24gZW5mb3JjZXMgdGhlIG5lZWQgZm9yIGEgY29tcG9zaXRpbmcgbGF5 ZXIuCiAgICAgYm9vbCByZXF1aXJlc0NvbXBvc2l0aW5nRm9yQW5pbWF0aW9uKFJlbmRlck9iamVj dCopIGNvbnN0OwogICAgIGJvb2wgcmVxdWlyZXNDb21wb3NpdGluZ0ZvclRyYW5zZm9ybShSZW5k ZXJPYmplY3QqKSBjb25zdDsK