62338 2011-06-08 16:29:59 -0700 Avoid flashing when exiting full-screen mode. 2011-06-13 11:05:18 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble andersca darin jeffm sam oldest_to_newest 417672 0 jer.noble 2011-06-08 16:29:59 -0700 Avoid flashing when exiting full-screen mode. 418136 1 96609 jer.noble 2011-06-09 11:34:59 -0700 Created attachment 96609 Patch 418145 2 jer.noble 2011-06-09 11:43:33 -0700 <rdar://problem/9432741> 418147 3 jer.noble 2011-06-09 11:44:24 -0700 From my testing, this patch appears to reduce the flashing to 0 during both entering full-screen and exiting full-screen. 418153 4 96609 darin 2011-06-09 11:50:33 -0700 Comment on attachment 96609 Patch Anders, Sam, do you have any comments on this approach? 419134 5 96609 jer.noble 2011-06-10 20:02:45 -0700 Comment on attachment 96609 Patch Obseleting this patch. A new one (which uses fewer synchronous messages) will follow shortly. 419188 6 96846 jer.noble 2011-06-11 00:30:04 -0700 Created attachment 96846 Patch Addressed Anders\' comments. No longer need to make any of the full-screen inter-process messages synchronous. 419205 7 96846 andersca 2011-06-11 06:53:55 -0700 Comment on attachment 96846 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96846&action=review > Source/WebKit2/ChangeLog:25 > + screen updates, to be re-enabled during exitAcceleratedCompositingMOde. Typo, MOde. 419695 8 jer.noble 2011-06-13 11:05:18 -0700 Committed r88654: <http://trac.webkit.org/changeset/88654> 96609 2011-06-09 11:34:59 -0700 2011-06-10 20:02:44 -0700 Patch bug-62338-20110609113459.patch text/plain 11883 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODc4NDQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBiOTFkZTJjMDA4NTllN2Yx NDc3NGY5NjFmZTZiMmRiZjNkMmJmY2Y4Li4yMjlkNWI0MDFlNzFhZWMzMWViOGQxOWY0YzExYWQ5 NThlYjZhOTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDYtMDkgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgZmxhc2hpbmcgd2hlbiBleGl0aW5nIGZ1bGwtc2Ny ZWVuIG1vZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MjMzOAorCisgICAgICAgIFRvIHN5bmNocm9uaXplIGRyYXdpbmcgYmV0d2VlbiB0aGUgVUlQ cm9jZXNzIGFuZCB0aGUgV2ViUHJvY2VzcywgbWFrZSBtYW55IG9mIHRoZSBjYWxscworICAgICAg ICBmcm9tIHRoZSBXZWJQcm9jZXNzLT5VSVByb2Nlc3Mgc3luY2hyb25vdXMuICBTcGVjaWZpY2Fs bHksIHRoZSBzZXQgb2YgY2FsbHMgdGhhdCBvY2N1cnMKKyAgICAgICAgYXQgdGhlIGVuZCBvZiB0 aGUgZnVsbC1zY3JlZW4gYW5pbWF0aW9uLiAgT24gdGhlIFVJUHJvY2VzcyBzaWRlLCBkbyBub3Qg cmUtZW5hYmxlIHNjcmVlbgorICAgICAgICB1cGRhdGVzIHRpbGwgdGhlIHZlcnkgZW5kIG9mIG91 ciBhbmltYXRpb24gcHJvY2VzcywgYWZ0ZXIgdGhlIHJlcGFpbnQgY29tcGxldGVzLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHkubWVzc2FnZXMuaW46IE1h a2Ugc29tZSBtZXNzYWdlcyBzeW5jaHJvbm91cy4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dL RnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKTogRG8gbm90 IG9yZGVyLW91dAorICAgICAgICAgICAgb3VyIGZ1bGwtc2NyZWVuIHdpbmRvdyB1bnRpbCB0aGUg cmVwYWludCBhZnRlciBleGl0aW5nIGNvbXBvc2l0aW5nIG1vZGUgY29tcGxldGVzLgorICAgICAg ICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGV4aXRBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZV0pOiBEbyBub3QgcmUtZW5hYmxlCisgICAgICAgICAgICBzY3JlZW4gdXBkYXRlcyBo ZXJlLgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGV4aXRDb21wb3Np dGVkTW9kZVJlcGFpbnRDb21wbGV0ZWRdKTogT3JkZXItb3V0IG91ciBmdWxsLQorICAgICAgICAg ICAgc2NyZWVuIHdpbmRvdy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVs bFNjcmVlbk1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdl cjo6ZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb24pOiBNYWtlIG1lc3NhZ2VzIHN5bmNo cm9ub3VzLgorICAgICAgICAoV2ViS2l0OjpXZWJGdWxsU2NyZWVuTWFuYWdlcjo6ZmluaXNoZWRF eGl0RnVsbFNjcmVlbkFuaW1hdGlvbik6IERpdHRvLgorICAgICAgICAqIFdlYlByb2Nlc3MvRnVs bFNjcmVlbi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMubW06CisgICAgICAgIChXZWJLaXQ6 OldlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjOjp+V2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMpOiBEaXR0 by4KKyAgICAgICAgKFdlYktpdDo6V2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OnNldFJvb3RGdWxs U2NyZWVuTGF5ZXIpOiBEaXR0by4gIEFsc28sIG5vIGxvbmdlciBjcmVhdGUgdGhlCisgICAgICAg ICAgICBzY3JlZW4gc2hvdCwgYXMgaXQgaXMgdW5uZWNlc3NhcnkuCisgICAgICAgIChXZWJLaXQ6 OldlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjOjpiZWdpbkVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbik6 CisgICAgICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjOjpiZWdpbkV4aXRGdWxs U2NyZWVuQW5pbWF0aW9uKToKKwogMjAxMS0wNi0wMSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5 Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZ1bGxTY3JlZW5NYW5h Z2VyUHJveHkubWVzc2FnZXMuaW4KaW5kZXggMDA3ZTMwOTE2ZDFkYTYwZTkyYzkwODQ5MTAxMWRh ZTEwYTBmMGJhNy4uZGE4ZmQxYzYxMGIwNTc5Y2IyYTQxNGI3OWYyZGEzMDBhZTY3OWNlNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJv eHkubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZ1bGxTY3Jl ZW5NYW5hZ2VyUHJveHkubWVzc2FnZXMuaW4KQEAgLTI2LDEzICsyNiwxMyBAQCBtZXNzYWdlcyAt PiBXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5IHsKICAgICBFbnRlckZ1bGxTY3JlZW4oKQogICAg IEV4aXRGdWxsU2NyZWVuKCkKICAgICBCZWdhbkVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbigpCi0g ICAgRmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb24oYm9vbCBjb21wbGV0ZWQpCisgICAg RmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb24oYm9vbCBjb21wbGV0ZWQpIC0+ICgpCiAg ICAgQmVnYW5FeGl0RnVsbFNjcmVlbkFuaW1hdGlvbigpCi0gICAgRmluaXNoZWRFeGl0RnVsbFNj cmVlbkFuaW1hdGlvbihib29sIGNvbXBsZXRlZCkKKyAgICBGaW5pc2hlZEV4aXRGdWxsU2NyZWVu QW5pbWF0aW9uKGJvb2wgY29tcGxldGVkKSAtPiAoKQogICAgIEdldEZ1bGxTY3JlZW5SZWN0KCkg LT4gKFdlYkNvcmU6OkludFJlY3QgcmVjdCkKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCi0gICAgRW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShXZWJLaXQ6OkxheWVyVHJl ZUNvbnRleHQgY29udGV4dCkKLSAgICBFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKQor ICAgIEVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoV2ViS2l0OjpMYXllclRyZWVDb250 ZXh0IGNvbnRleHQpIC0+ICgpCisgICAgRXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkg LT4gKCkKICNlbmRpZgogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KaW5kZXggYTMw NWI1NDRiNzdjYWRhZWUwZGU0MjhmNmVhNzVlY2UxYmZjMzY0NS4uNzNlYmE2ODhlZTEwNjQzNmRl OGVjN2FmMzhkOWEyNjk2MTEwNDVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQpAQCAtMjQ3 LDYgKzI0Nyw4IEBAIHN0YXRpYyB2b2lkIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0 ZWQoV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCk7CiAgICAgX2lzRW50ZXJpbmdGdWxsU2NyZWVu ID0gTk87CiAgICAgCiAgICAgaWYgKGNvbXBsZXRlZCkgeyAgICAgICAgICAgICAgICAKKyAgICAg ICAgTlNEaXNhYmxlU2NyZWVuVXBkYXRlcygpOworCiAgICAgICAgIC8vIFN3YXAgdGhlIHdlYlZp ZXcgcGxhY2Vob2xkZXIgaW50byBwbGFjZS4KICAgICAgICAgaWYgKCFfd2ViVmlld1BsYWNlaG9s ZGVyKQogICAgICAgICAgICAgX3dlYlZpZXdQbGFjZWhvbGRlci5hZG9wdE5TKFtbTlNWaWV3IGFs bG9jXSBpbml0XSk7CkBAIC0zNTMsMTEgKzM1NSw4IEBAIHN0YXRpYyB2b2lkIGV4aXRDb21wb3Np dGVkTW9kZVJlcGFpbnRDb21wbGV0ZWQoV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCk7CiAgICAg W3NlbGYgX3VwZGF0ZU1lbnVBbmREb2NrRm9yRnVsbFNjcmVlbl07CiAgICAgW3NlbGYgX3VwZGF0 ZVBvd2VyQXNzZXJ0aW9uc107CiAgICAgW05TQ3Vyc29yIHNldEhpZGRlblVudGlsTW91c2VNb3Zl czpZRVNdOwotICAgIFtbc2VsZiB3aW5kb3ddIG9yZGVyT3V0OnNlbGZdOwotICAgIFtbX3dlYlZp ZXcgd2luZG93XSBtYWtlS2V5QW5kT3JkZXJGcm9udDpzZWxmXTsKIAogICAgIFtzZWxmIF9tYW5h Z2VyXS0+ZGlkRXhpdEZ1bGxTY3JlZW4oKTsKLSAgICBOU0VuYWJsZVNjcmVlblVwZGF0ZXMoKTsg ICAgCiB9CiAKIC0gKHZvaWQpZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTooY29uc3Qg V2ViS2l0OjpMYXllclRyZWVDb250ZXh0JilsYXllclRyZWVDb250ZXh0CkBAIC00MDEsNyArNDAw LDYgQEAgc3RhdGljIHZvaWQgZXhpdENvbXBvc2l0ZWRNb2RlUmVwYWludENvbXBsZXRlZChXS0Vy cm9yUmVmLCB2b2lkKiBjb250ZXh0KTsKICAgICBbc2VsZiByZXRhaW5dOyAvLyBCYWxhbmNlZCBi eSByZWxlYXNlIGluIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0ZWQgYmVsb3cuCiAg ICAgX2lzRXhpdGluZ0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlID0gWUVTOwogCi0gICAgTlNE aXNhYmxlU2NyZWVuVXBkYXRlcygpOwogICAgIFtzZWxmIF9wYWdlXS0+Zm9yY2VSZXBhaW50KFZv aWRDYWxsYmFjazo6Y3JlYXRlKHNlbGYsIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0 ZWQpKTsKIH0KIApAQCAtNDE4LDYgKzQxNiwxMSBAQCBzdGF0aWMgdm9pZCBleGl0Q29tcG9zaXRl ZE1vZGVSZXBhaW50Q29tcGxldGVkKFdLRXJyb3JSZWYsIHZvaWQqIGNvbnRleHQpOwogICAgIFtf bGF5ZXJIb3N0aW5nVmlldy5nZXQoKSBzZXRXYW50c0xheWVyOk5PXTsKICAgICBbW1tzZWxmIF9m dWxsU2NyZWVuV2luZG93XSBiYWNrZ3JvdW5kTGF5ZXJdIHNldEhpZGRlbjpZRVNdOwogICAgIFtD QVRyYW5zYWN0aW9uIGNvbW1pdF07CisKKyAgICBpZiAoIV9pc0Z1bGxTY3JlZW4pIHsKKyAgICAg ICAgW1tzZWxmIHdpbmRvd10gb3JkZXJPdXQ6c2VsZl07CisgICAgICAgIFtbX3dlYlZpZXcgd2lu ZG93XSBtYWtlS2V5QW5kT3JkZXJGcm9udDpzZWxmXTsKKyAgICB9CiAgICAgCiAgICAgX2xheWVy SG9zdGluZ1ZpZXcgPSAwOwogICAgIE5TRW5hYmxlU2NyZWVuVXBkYXRlcygpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5h Z2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRnVsbFNjcmVlbi9XZWJGdWxsU2Ny ZWVuTWFuYWdlci5jcHAKaW5kZXggZWQ4NjkzNDgxYTY4M2E1NjNiN2JlMjI0ZWM3YzM2N2E2OTVj ZTdlMS4uODE0MDlmNzZjNjYxYTMyN2RiZDQ2ODRkNGZjMWZiYzgyNzc2Yjk3MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5h Z2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVs bFNjcmVlbk1hbmFnZXIuY3BwCkBAIC05Myw3ICs5Myw3IEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1h bmFnZXI6OmJlZ2FuRW50ZXJGdWxsU2NyZWVuQW5pbWF0aW9uKCkKIAogdm9pZCBXZWJGdWxsU2Ny ZWVuTWFuYWdlcjo6ZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb24oYm9vbCBjb21wbGV0 ZWQpCiB7Ci0gICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclBy b3h5OjpGaW5pc2hlZEVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbihjb21wbGV0ZWQpKTsKKyAgICBt X3BhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5OjpGaW5p c2hlZEVudGVyRnVsbFNjcmVlbkFuaW1hdGlvbihjb21wbGV0ZWQpLCBNZXNzYWdlczo6V2ViRnVs bFNjcmVlbk1hbmFnZXJQcm94eTo6RmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb246OlJl cGx5KCkpOwogfQogCiB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpiZWdhbkV4aXRGdWxsU2Ny ZWVuQW5pbWF0aW9uKCkKQEAgLTEwMyw3ICsxMDMsNyBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5h Z2VyOjpiZWdhbkV4aXRGdWxsU2NyZWVuQW5pbWF0aW9uKCkKIAogdm9pZCBXZWJGdWxsU2NyZWVu TWFuYWdlcjo6ZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbihib29sIGNvbXBsZXRlZCkK IHsKLSAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHk6 OkZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb24oY29tcGxldGVkKSk7CisgICAgbV9wYWdl LT5zZW5kU3luYyhNZXNzYWdlczo6V2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eTo6RmluaXNoZWRF eGl0RnVsbFNjcmVlbkFuaW1hdGlvbihjb21wbGV0ZWQpLCBNZXNzYWdlczo6V2ViRnVsbFNjcmVl bk1hbmFnZXJQcm94eTo6RmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjo6UmVwbHkoKSk7 CiB9CiAgICAgCiBJbnRSZWN0IFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpnZXRGdWxsU2NyZWVuUmVj dCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vbWFj L1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9G dWxsU2NyZWVuL21hYy9XZWJGdWxsU2NyZWVuTWFuYWdlck1hYy5tbQppbmRleCBhY2FjMDBiNzNk MGM4YmRlMTY1ZjRkMzY4OWIxYmYwYjc2ZmNmYjQ2Li5hNGI2NDU5MDVmNDczNWVmYzgxMjNiNjEx NTBlMDExYTU1YmM1ZGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1 bGxTY3JlZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvRnVsbFNjcmVlbi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMubW0K QEAgLTEyNyw0MiArMTI3LDI0IEBAIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjOjpXZWJGdWxsU2Ny ZWVuTWFuYWdlck1hYyhXZWJQYWdlKiBwYWdlKQogCiBXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6 fldlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjKCkKIHsKLSAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6 OldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9k ZSgpKTsKKyAgICBtX3BhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdl clByb3h5OjpFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSwgTWVzc2FnZXM6OldlYkZ1 bGxTY3JlZW5NYW5hZ2VyUHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTo6UmVw bHkoKSk7CiAgICAgW21fZW50ZXJGdWxsU2NyZWVuTGlzdGVuZXIuZ2V0KCkgaW52YWxpZGF0ZV07 CiAgICAgW21fZXhpdEZ1bGxTY3JlZW5MaXN0ZW5lci5nZXQoKSBpbnZhbGlkYXRlXTsKIH0KIAog dm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdlck1hYzo6c2V0Um9vdEZ1bGxTY3JlZW5MYXllcihXZWJD b3JlOjpHcmFwaGljc0xheWVyKiBsYXllcikKIHsKLSAgICBpZiAoKCFtX3Jvb3RMYXllciB8fCBt X3Jvb3RMYXllci0+Y2hpbGRyZW4oKS5pc0VtcHR5KCkpICYmICFsYXllcikKKyAgICBpZiAoIW1f cm9vdExheWVyICYmICFsYXllcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFsYXllcikg ewotICAgICAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJv eHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSgpKTsKLQotICAgICAgICBGcmFtZSog ZnJhbWUgPSBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCk7Ci0gICAgICAgIEZyYW1lVmll dyogdmlldyA9IGZyYW1lID8gZnJhbWUtPnZpZXcoKSA6IDA7Ci0gICAgICAgIERyYWdJbWFnZVJl ZiBkcmFnSW1hZ2UgPSAwOwotICAgICAgICBpZiAodmlldykgewotICAgICAgICAgICAgQ29sb3Ig c2F2ZWRCYWNrZ3JvdW5kQ29sb3IgPSB2aWV3LT5iYXNlQmFja2dyb3VuZENvbG9yKCk7Ci0gICAg ICAgICAgICBib29sIHNhdmVkSXNUcmFuc3BhcmVudCA9IHZpZXctPmlzVHJhbnNwYXJlbnQoKTsK LSAgICAgICAgICAgIHZpZXctPnNldEJhc2VCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6OnRyYW5zcGFy ZW50KTsKLSAgICAgICAgICAgIHZpZXctPnNldFRyYW5zcGFyZW50KHRydWUpOwotICAgICAgICAg ICAgZHJhZ0ltYWdlID0gZnJhbWUtPm5vZGVJbWFnZShtX2VsZW1lbnQuZ2V0KCkpOwotICAgICAg ICAgICAgdmlldy0+c2V0QmFzZUJhY2tncm91bmRDb2xvcihzYXZlZEJhY2tncm91bmRDb2xvcik7 Ci0gICAgICAgICAgICB2aWV3LT5zZXRUcmFuc3BhcmVudChzYXZlZElzVHJhbnNwYXJlbnQpOwot ICAgICAgICB9Ci0KLSAgICAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOworICAgICAgICBtX3Bh Z2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5OjpFeGl0QWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSwgTWVzc2FnZXM6OldlYkZ1bGxTY3JlZW5NYW5hZ2Vy UHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTo6UmVwbHkoKSk7CisKICAgICAg ICAgUGxhdGZvcm1MYXllciogcm9vdFBsYXRmb3JtTGF5ZXIgPSBtX3Jvb3RMYXllci0+cGxhdGZv cm1MYXllcigpOwogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IHBvc3ROb3RpZmljYXRpb25OYW1lOkAiV2ViS2l0TGF5ZXJIb3N0Q2hhbmdlZCIgb2JqZWN0OnJv b3RQbGF0Zm9ybUxheWVyIHVzZXJJbmZvOm5pbF07Ci0KICAgICAgICAgbV9yb290TGF5ZXItPnJl bW92ZUFsbENoaWxkcmVuKCk7CiAgICAgICAgIG1fcm9vdExheWVyLT5zeW5jQ29tcG9zaXRpbmdT dGF0ZUZvclRoaXNMYXllck9ubHkoKTsKICAgICAgICAgbV9yb290TGF5ZXIgPSBudWxscHRyOwot ICAgICAgICBbcm9vdFBsYXRmb3JtTGF5ZXIgc2V0Q29udGVudHM6ZHJhZ0ltYWdlLmdldCgpXTsK LSAgICAgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKLSAgICAgICAgCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKQEAgLTE4Myw3ICsxNjUsNyBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2Vy TWFjOjpzZXRSb290RnVsbFNjcmVlbkxheWVyKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIGxheQog ICAgICAgICBbbV9yb290TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSBzZXRHZW9tZXRyeUZsaXBwZWQ6 WUVTXTsKICAgICAgICAgV0tDQVJlbW90ZUxheWVyQ2xpZW50U2V0TGF5ZXIobV9yZW1vdGVMYXll ckNsaWVudC5nZXQoKSwgbV9yb290TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7CiAgICAgICAgIG1f bGF5ZXJUcmVlQ29udGV4dC5jb250ZXh0SUQgPSBXS0NBUmVtb3RlTGF5ZXJDbGllbnRHZXRDbGll bnRJZChtX3JlbW90ZUxheWVyQ2xpZW50LmdldCgpKTsKLSAgICAgICAgbV9wYWdlLT5zZW5kKE1l c3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5OjpFbnRlckFjY2VsZXJhdGVkQ29tcG9z aXRpbmdNb2RlKG1fbGF5ZXJUcmVlQ29udGV4dCkpOworICAgICAgICBtX3BhZ2UtPnNlbmRTeW5j KE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5OjpFbnRlckFjY2VsZXJhdGVkQ29t cG9zaXRpbmdNb2RlKG1fbGF5ZXJUcmVlQ29udGV4dCksIE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVu TWFuYWdlclByb3h5OjpFbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlOjpSZXBseSgpKTsK ICAgICB9CiAKICAgICBtX3Jvb3RMYXllci0+cmVtb3ZlQWxsQ2hpbGRyZW4oKTsKQEAgLTIwOCwx MCArMTkwLDEwIEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OmJlZ2luRW50ZXJGdWxs U2NyZWVuQW5pbWF0aW9uKGZsb2F0IGR1cmF0aW9uKQogICAgIAogICAgIGlmICghbV9yb290TGF5 ZXIgfHwgbV9yb290TGF5ZXItPmNoaWxkcmVuKCkuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIElm IHdlIGRvbid0IGhhdmUgYSByb290IGxheWVyLCB3ZSBjYW4ndCBhbmltYXRlIGluIGFuZCBvdXQg b2YgZnVsbCBzY3JlZW4KLSAgICAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJGdWxsU2Ny ZWVuTWFuYWdlclByb3h5OjpFbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKG1fbGF5ZXJU cmVlQ29udGV4dCkpOworICAgICAgICBtX3BhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJGdWxs U2NyZWVuTWFuYWdlclByb3h5OjpFbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKG1fbGF5 ZXJUcmVlQ29udGV4dCksIE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5OjpFbnRl ckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlOjpSZXBseSgpKTsKICAgICAgICAgdGhpcy0+YmVn YW5FbnRlckZ1bGxTY3JlZW5BbmltYXRpb24oKTsKICAgICAgICAgdGhpcy0+ZmluaXNoZWRFbnRl ckZ1bGxTY3JlZW5BbmltYXRpb24odHJ1ZSk7Ci0gICAgICAgIG1fcGFnZS0+c2VuZChNZXNzYWdl czo6V2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eTo6RXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdN b2RlKCkpOworICAgICAgICBtX3BhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVu TWFuYWdlclByb3h5OjpFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSwgTWVzc2FnZXM6 OldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9k ZTo6UmVwbHkoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTIzMSwxMCArMjEzLDEw IEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWM6OmJlZ2luRXhpdEZ1bGxTY3JlZW5Bbmlt YXRpb24oZmxvYXQgZHVyYXRpb24pCiAgICAgCiAgICAgaWYgKCFtX3Jvb3RMYXllciB8fCBtX3Jv b3RMYXllci0+Y2hpbGRyZW4oKS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gSWYgd2UgZG9uJ3Qg aGF2ZSBhIHJvb3QgbGF5ZXIsIHdlIGNhbid0IGFuaW1hdGUgaW4gYW5kIG91dCBvZiBmdWxsIHNj cmVlbgotICAgICAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYkZ1bGxTY3JlZW5NYW5hZ2Vy UHJveHk6OkVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUobV9sYXllclRyZWVDb250ZXh0 KSk7CisgICAgICAgIG1fcGFnZS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYkZ1bGxTY3JlZW5NYW5h Z2VyUHJveHk6OkVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUobV9sYXllclRyZWVDb250 ZXh0KSwgTWVzc2FnZXM6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHk6OkVudGVyQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGU6OlJlcGx5KCkpOwogICAgICAgICB0aGlzLT5iZWdhbkV4aXRGdWxs U2NyZWVuQW5pbWF0aW9uKCk7CiAgICAgICAgIHRoaXMtPmZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5B bmltYXRpb24odHJ1ZSk7Ci0gICAgICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViRnVsbFNj cmVlbk1hbmFnZXJQcm94eTo6RXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkpOworICAg ICAgICBtX3BhZ2UtPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5 OjpFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSwgTWVzc2FnZXM6OldlYkZ1bGxTY3Jl ZW5NYW5hZ2VyUHJveHk6OkV4aXRBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZTo6UmVwbHkoKSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK 96846 2011-06-11 00:30:04 -0700 2011-06-11 06:53:55 -0700 Patch bug-62338-20110611003002.patch text/plain 11278 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODg1OTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjNmNhNmUwNGExN2I1N2I1 NjMxNDc4ZDY0M2RmZGQ2YjI2MzJjYjA0Li5jOGU4ZjA3ZjM4YTUwYmM1MWVjZjYyMWI4YmMxN2Rm MzdjNzk5NzMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMTEgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgZmxhc2hpbmcgd2hlbiBleGl0aW5nIGZ1bGwtc2Ny ZWVuIG1vZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MjMzOAorCisgICAgICAgIE5vIG5ldyB0ZXN0czsgY292ZXJlZCBieSB0aGUgZXhpc3Rpbmcg ZnVsbC1zY3JlZW4gdGVzdHMuCisKKyAgICAgICAgTm93IHRoYXQgd2UgYXJlIGZvcmNpbmcgYSBy ZXBhaW50IGluc2lkZSBvZiBzZXRSb290RnVsbFNjcmVlbkxheWVyKCkgaW5zdGVhZCBvZiBkdXJp bmcKKyAgICAgICAgdGhlIG5leHQgcnVuIGxvb3AsIG1ha2Ugc3VyZSB0aGF0IHdlIGhhdmUgZGlz YWJsZWQgYW5pbWF0aW9uIGJlZm9yZSBjYWxsaW5nIAorICAgICAgICBzZXRSb290RnVsbFNjcmVl bkxheWVyKCkgc28gdGhhdCB0aGUgUmVuZGVyRnVsbFNjcmVlbiByZW5kZXJlciBhbmQgaXRzIGNv bnRlbnRzIGFyZQorICAgICAgICBwYWludGVkLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp3ZWJraXREaWRFbnRlckZ1bGxTY3JlZW5G b3JFbGVtZW50KToKKwogMjAxMS0wNi0xMCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCmluZGV4IDFhY2U5ZTAxYzU2OTIzMGY3NjY1ZjNmM2QzMmZhMDQ0NDNjMjA5OGIuLjdm ZGNkZWYzMjY1NDZjNmE1YzU4YzdjZmZlMGRlMWZlNmE1MGIyN2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcApAQCAtNDc5MiwxMiArNDc5MiwxMCBAQCB2b2lkIERvY3VtZW50Ojp3ZWJraXREaWRF bnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KEVsZW1lbnQqKQogICAgIG1fZnVsbFNjcmVlbkVsZW1l bnQtPmRpZEJlY29tZUZ1bGxzY3JlZW5FbGVtZW50KCk7CiAKICAgICBpZiAobV9mdWxsU2NyZWVu UmVuZGVyZXIpIHsKLSNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgICAgIHBh Z2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5zZXRSb290RnVsbFNjcmVlbkxheWVyKDApOwotI2Vu ZGlmCiAgICAgICAgIHNldEFuaW1hdGluZ0Z1bGxTY3JlZW4oZmFsc2UpOwogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAgdmlldygpLT51cGRhdGVDb21wb3NpdGluZ0xh eWVycygpOworICAgICAgICBwYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+c2V0Um9vdEZ1bGxT Y3JlZW5MYXllcigwKTsKICNlbmRpZgogICAgIH0KICAgICBtX2Z1bGxTY3JlZW5DaGFuZ2VFdmVu dFRhcmdldFF1ZXVlLmFwcGVuZChtX2Z1bGxTY3JlZW5FbGVtZW50KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0 MWZhM2Y3MWQ4YzZjYjk2YjY3ZWZlMjQ5YTMzNzA3MzM1ZDQ2ZTYyLi5mMDE5MGUyY2FjODA5NzM0 Y2U3MjExY2RmMGU3NzdjNjBmYjdhOTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIw MTEtMDYtMTEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgZmxhc2hpbmcgd2hlbiBl eGl0aW5nIGZ1bGwtc2NyZWVuIG1vZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MjMzOAorCisgICAgICAgIEluc3RlYWQgb2YgbWFraW5nIGEgcm91 bmQtdHJpcCBiZXR3ZWVuIHByb2Nlc3NlcyBieSBjYWxsaW5nIGZvcmNlUmVwYWludAorICAgICAg ICBhbmQgd2FpdGluZyBmb3IgYSBjYWxsYmFjaywgaW5zdGVhZCBtYWtlIGEgV2ViUHJvY2Vzcy1z aWRlIGNhbGwgdG8KKyAgICAgICAgZm9yY2VSZXBhaW50V2l0aG91dENhbGxiYWNrIGJlZm9yZSBz ZW5kaW5nIHRoZSBFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUKKyAgICAgICAgbWVzc2Fn ZSB0byB0aGUgV2ViRnVsbFNjcmVlbkNvbnRyb2xsZXJQcm94eS4gVGhpcyBhbHNvIG1lYW5zIHdl IGNhbiBnZXQgcmlkIG9mCisgICAgICAgIHRoZSBkcmFnSW1hZ2UgY3JlYXRpb24gYW5kIGRpc3Bs YXkuCisKKyAgICAgICAgQmVjYXVzZSB0aGlzIHJlZHJhdyB3aWxsIGhhcHBlbiBkdXJpbmcgdGhl IGN1cnJlbnQgcnVuLWxvb3AgaW5zdGVhZCBvZiBhIGZ1dHVyZQorICAgICAgICBvbmUsIG1ha2Ug c3VyZSB0aGUgYmFja2dyb3VuZCBjb2xvciBoYXMgYmVlbiBzZXQgYmVmb3JlIHRoZSByZWRyYXcg aW4gCisgICAgICAgIGRpZEVudGVyRnVsbFNjcmVlbigpLgorCisgICAgICAgIFdhaXQgdG8gaGlk ZSB0aGUgZnVsbC1zY3JlZW4gd2luZG93IHVudGlsIGFmdGVyIHdlIGhhdmUgcmVjZWl2ZWQgdGhl IAorICAgICAgICBFeGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUgbWVzc2FnZS4gIEJ5IHRo aXMgdGltZSwgcmVwYWludCB3aWxsIGhhdmUgYWxyZWFkeQorICAgICAgICBjb21wbGV0ZWQuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW06 CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFbnRlckZ1 bGxTY3JlZW5BbmltYXRpb246XSk6IERpc2FibGUKKyAgICAgICAgICAgIHNjcmVlbiB1cGRhdGVz LCB0byBiZSByZS1lbmFibGVkIGR1cmluZyBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01PZGUu CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVs bFNjcmVlbkFuaW1hdGlvbjpdKTogRG9uJ3QgaGlkZQorICAgICAgICAgICAgdGhlIGZ1bGwtc2Ny ZWVuIHdpbmRvdyBoZXJlOyB3YWl0IGZvciBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZyBpbnN0 ZWFkLgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGV4aXRBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZV0pOiBDb2xsYXBzZSAKKyAgICAgICAgICAgIHRoZSByZWRyYXdD b21wbGV0ZWQgbWV0aG9kIGludG8gdGhpcyBvbmUuCisgICAgICAgICgtW1dLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIgY2xvc2VdKTogUmVtb3ZlIHRoZSByZWZlcmVuY2UgdG8gCisgICAgICAg ICAgICBleGl0Q29tcG9zaXRlZE1vZGVSZXBhaW50Q29tcGxldGVkLgorICAgICAgICAqIFdlYlBy b2Nlc3MvRnVsbFNjcmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpkaWRFbnRlckZ1bGxTY3JlZW4pOiBTZXQgdGhlIGZ1 bGwgc2NyZWVuCisgICAgICAgICAgICBiYWNrZ3JvdW5kIGNvbG9yIGZpcnN0LgorICAgICAgICAq IFdlYlByb2Nlc3MvRnVsbFNjcmVlbi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMubW06Cisg ICAgICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjOjpzZXRSb290RnVsbFNjcmVl bkxheWVyKTogUmVwYWludCBiZWZvcmUKKyAgICAgICAgICAgIHNlbmRpbmcgdGhlIEV4aXRBY2Nl bGVyYXRlZENvbXBvc2l0aW5nTW9kZSBtZXNzYWdlLiAKKwogMjAxMS0wNi0wOSAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl ci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLmgKaW5kZXggMThjZGU0NWI1NDQ2YTMyN2IwMmYxNjI5MGEy YjhjODk1MmQ5ZmZiNC4uNmFiNzIxOWFiZmFiOGJhYzgwZGRkN2EyNmEyOTg4NDZlNzJkNWRlNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLmgKQEAgLTUxLDcgKzUxLDYgQEAgY2xhc3MgSW50UmVjdDsK ICAgICBCT09MIF9pc1dpbmRvd0xvYWRlZDsKICAgICBCT09MIF9mb3JjZURpc2FibGVBbmltYXRp b247CiAgICAgQk9PTCBfaXNQbGF5aW5nOwotICAgIEJPT0wgX2lzRXhpdGluZ0FjY2VsZXJhdGVk Q29tcG9zaXRpbmdNb2RlOwogICAgIENHUmVjdCBfaW5pdGlhbEZyYW1lOyAgICAKICAgICB1aW50 MzJfdCBfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbjsKICAgICB1aW50MzJfdCBfaWRsZVN5c3Rl bVNsZWVwQXNzZXJ0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCmluZGV4IDc0MjVlZWQ1OTgx ZTMyM2ExZTFkOWVkODExMjdiNmRjNmFlYTAxMDEuLmQzNDdiMjVlNmUzYmJjOTFiYjVhYmUwN2Yz ODA1YjgxMTEyMGVlMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv V0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTQ3LDggKzQ3LDYg QEAgc3RhdGljIGNvbnN0IE5TVGltZUludGVydmFsIHRpY2tsZVRpbWVySW50ZXJ2YWwgPSAxLjA7 CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLXN0 YXRpYyB2b2lkIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0ZWQoV0tFcnJvclJlZiwg dm9pZCogY29udGV4dCk7Ci0KICNpZiBkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCiBAaW50 ZXJmYWNlIENBVHJhbnNhY3Rpb24oU25vd0xlb3BhcmRDb252ZW5pZW5jZUZ1bmN0aW9ucykKICsg KHZvaWQpc2V0RGlzYWJsZUFjdGlvbnM6KEJPT0wpZmxhZzsKQEAgLTI0OCw2ICsyNDYsOCBAQCBz dGF0aWMgdm9pZCBleGl0Q29tcG9zaXRlZE1vZGVSZXBhaW50Q29tcGxldGVkKFdLRXJyb3JSZWYs IHZvaWQqIGNvbnRleHQpOwogICAgIF9pc0VudGVyaW5nRnVsbFNjcmVlbiA9IE5POwogICAgIAog ICAgIGlmIChjb21wbGV0ZWQpIHsgICAgICAgICAgICAgICAgCisgICAgICAgIE5TRGlzYWJsZVNj cmVlblVwZGF0ZXMoKTsKKwogICAgICAgICAvLyBTd2FwIHRoZSB3ZWJWaWV3IHBsYWNlaG9sZGVy IGludG8gcGxhY2UuCiAgICAgICAgIGlmICghX3dlYlZpZXdQbGFjZWhvbGRlcikKICAgICAgICAg ICAgIF93ZWJWaWV3UGxhY2Vob2xkZXIuYWRvcHROUyhbW05TVmlldyBhbGxvY10gaW5pdF0pOwpA QCAtMzU0LDExICszNTQsOCBAQCBzdGF0aWMgdm9pZCBleGl0Q29tcG9zaXRlZE1vZGVSZXBhaW50 Q29tcGxldGVkKFdLRXJyb3JSZWYsIHZvaWQqIGNvbnRleHQpOwogICAgIFtzZWxmIF91cGRhdGVN ZW51QW5kRG9ja0ZvckZ1bGxTY3JlZW5dOwogICAgIFtzZWxmIF91cGRhdGVQb3dlckFzc2VydGlv bnNdOwogICAgIFtOU0N1cnNvciBzZXRIaWRkZW5VbnRpbE1vdXNlTW92ZXM6WUVTXTsKLSAgICBb W3NlbGYgd2luZG93XSBvcmRlck91dDpzZWxmXTsKLSAgICBbW193ZWJWaWV3IHdpbmRvd10gbWFr ZUtleUFuZE9yZGVyRnJvbnQ6c2VsZl07CiAKICAgICBbc2VsZiBfbWFuYWdlcl0tPmRpZEV4aXRG dWxsU2NyZWVuKCk7Ci0gICAgTlNFbmFibGVTY3JlZW5VcGRhdGVzKCk7ICAgIAogfQogCiAtICh2 b2lkKWVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGU6KGNvbnN0IFdlYktpdDo6TGF5ZXJU cmVlQ29udGV4dCYpbGF5ZXJUcmVlQ29udGV4dApAQCAtMzk1LDIzICszOTIsNiBAQCBzdGF0aWMg dm9pZCBleGl0Q29tcG9zaXRlZE1vZGVSZXBhaW50Q29tcGxldGVkKFdLRXJyb3JSZWYsIHZvaWQq IGNvbnRleHQpOwogICAgIGlmICghX2xheWVySG9zdGluZ1ZpZXcpCiAgICAgICAgIHJldHVybjsK IAotICAgIEFTU0VSVCghX2lzRXhpdGluZ0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKTsKLSAg ICBpZiAoX2lzRXhpdGluZ0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKQotICAgICAgICByZXR1 cm47Ci0KLSAgICBbc2VsZiByZXRhaW5dOyAvLyBCYWxhbmNlZCBieSByZWxlYXNlIGluIGV4aXRD b21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0ZWQgYmVsb3cuCi0gICAgX2lzRXhpdGluZ0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlID0gWUVTOwotCi0gICAgTlNEaXNhYmxlU2NyZWVuVXBkYXRl cygpOwotICAgIFtzZWxmIF9wYWdlXS0+Zm9yY2VSZXBhaW50KFZvaWRDYWxsYmFjazo6Y3JlYXRl KHNlbGYsIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0ZWQpKTsKLX0KLQotLSAodm9p ZClleGl0Q29tcG9zaXRlZE1vZGVSZXBhaW50Q29tcGxldGVkCi17Ci0gICAgQVNTRVJUKF9pc0V4 aXRpbmdBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSk7Ci0gICAgaWYgKCFfaXNFeGl0aW5nQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUpCi0gICAgICAgIHJldHVybjsKLQogICAgIFtDQVRyYW5z YWN0aW9uIGJlZ2luXTsKICAgICBbQ0FUcmFuc2FjdGlvbiBzZXREaXNhYmxlQWN0aW9uczpZRVNd OwogICAgIFtfbGF5ZXJIb3N0aW5nVmlldy5nZXQoKSByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKQEAg LTQxOSwxOCArMzk5LDE5IEBAIHN0YXRpYyB2b2lkIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRD b21wbGV0ZWQoV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCk7CiAgICAgW19sYXllckhvc3RpbmdW aWV3LmdldCgpIHNldFdhbnRzTGF5ZXI6Tk9dOwogICAgIFtbW3NlbGYgX2Z1bGxTY3JlZW5XaW5k b3ddIGJhY2tncm91bmRMYXllcl0gc2V0SGlkZGVuOllFU107CiAgICAgW0NBVHJhbnNhY3Rpb24g Y29tbWl0XTsKKworICAgIC8vIENvbXBsZXRlIHRoZSBhbmltYXRpb24gb3V0IG9mIGZ1bGwtc2Ny ZWVuIG1vZGUKKyAgICAvLyBieSBoaWRpbmcgdGhlIGZ1bGwtc2NyZWVuIHdpbmRvdzoKKyAgICBp ZiAoIV9pc0Z1bGxTY3JlZW4pIHsKKyAgICAgICAgW1tfd2ViVmlldyB3aW5kb3ddIGRpc3BsYXld OworICAgICAgICBbW3NlbGYgd2luZG93XSBvcmRlck91dDpzZWxmXTsKKyAgICAgICAgW1tfd2Vi VmlldyB3aW5kb3ddIG1ha2VLZXlBbmRPcmRlckZyb250OnNlbGZdOworICAgIH0KICAgICAKICAg ICBfbGF5ZXJIb3N0aW5nVmlldyA9IDA7CiAgICAgTlNFbmFibGVTY3JlZW5VcGRhdGVzKCk7CiAK ICAgICBbc2VsZiBfbWFuYWdlcl0tPmRpc3Bvc2VPZkxheWVyQ2xpZW50KCk7Ci0gICAgX2lzRXhp dGluZ0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlID0gTk87Ci0gICAgW3NlbGYgcmVsZWFzZV07 IC8vIEJhbGFuY2VkIGJ5IHJldGFpbiBpbiBleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUg YWJvdmUuCi19Ci0KLXN0YXRpYyB2b2lkIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0 ZWQoV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKLXsKLSAgICBbc3RhdGljX2Nhc3Q8V0tGdWxs U2NyZWVuV2luZG93Q29udHJvbGxlciAqPihjb250ZXh0KSBleGl0Q29tcG9zaXRlZE1vZGVSZXBh aW50Q29tcGxldGVkXTsKIH0KIAogLSAoV2ViQ29yZTo6SW50UmVjdClnZXRGdWxsU2NyZWVuUmVj dApAQCAtNDUyLDkgKzQzMyw2IEBAIHN0YXRpYyB2b2lkIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFp bnRDb21wbGV0ZWQoV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKICAgICBpZiAoX2lzRXhpdGlu Z0Z1bGxTY3JlZW4pCiAgICAgICAgIFtzZWxmIGZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRp b246WUVTXTsKIAotICAgIGlmIChfaXNFeGl0aW5nQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUp Ci0gICAgICAgIFtzZWxmIGV4aXRDb21wb3NpdGVkTW9kZVJlcGFpbnRDb21wbGV0ZWRdOwotCiAg ICAgW3N1cGVyIGNsb3NlXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvRnVsbFNjcmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5jcHAKaW5kZXggZWQ4 NjkzNDgxYTY4M2E1NjNiN2JlMjI0ZWM3YzM2N2E2OTVjZTdlMS4uMjM3ZmQ0Y2Y2OGUxODUwYWY2 MWRhMGNjZTY3MTcwYjEyMDc2Njk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIuY3BwCkBAIC0x MjMsOCArMTIzLDggQEAgdm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdlcjo6d2lsbEVudGVyRnVsbFNj cmVlbigpCiB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpkaWRFbnRlckZ1bGxTY3JlZW4oKQog ewogICAgIEFTU0VSVChtX2VsZW1lbnQpOwotICAgIG1fZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Vi a2l0RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChtX2VsZW1lbnQuZ2V0KCkpOwogICAgIG1f ZWxlbWVudC0+ZG9jdW1lbnQoKS0+c2V0RnVsbFNjcmVlblJlbmRlcmVyQmFja2dyb3VuZENvbG9y KENvbG9yOjpibGFjayk7CisgICAgbV9lbGVtZW50LT5kb2N1bWVudCgpLT53ZWJraXREaWRFbnRl ckZ1bGxTY3JlZW5Gb3JFbGVtZW50KG1fZWxlbWVudC5nZXQoKSk7CiB9CiAKIHZvaWQgV2ViRnVs bFNjcmVlbk1hbmFnZXI6OndpbGxFeGl0RnVsbFNjcmVlbigpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFj Lm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL21hYy9XZWJGdWxsU2Ny ZWVuTWFuYWdlck1hYy5tbQppbmRleCBkMWE3NWZkYmI0MWQzZGQ3M2FmODEwMGNkY2FlZTVkMGZj MTVhZDkwLi43MzE1ZTg3ODZkMmQ4Yzk1NTc0MjBkMzA1YjE2MjNiYTgyZTY3NWYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vbWFjL1dlYkZ1bGxTY3Jl ZW5NYW5hZ2VyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvRnVsbFNjcmVl bi9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMubW0KQEAgLTEzNCwzNSArMTM0LDE4IEBAIFdl YkZ1bGxTY3JlZW5NYW5hZ2VyTWFjOjp+V2ViRnVsbFNjcmVlbk1hbmFnZXJNYWMoKQogCiB2b2lk IFdlYkZ1bGxTY3JlZW5NYW5hZ2VyTWFjOjpzZXRSb290RnVsbFNjcmVlbkxheWVyKFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXIqIGxheWVyKQogewotICAgIGlmICgoIW1fcm9vdExheWVyIHx8IG1fcm9v dExheWVyLT5jaGlsZHJlbigpLmlzRW1wdHkoKSkgJiYgIWxheWVyKQorICAgIGlmICghbV9yb290 TGF5ZXIgJiYgIWxheWVyKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIWxheWVyKSB7Cisg ICAgICAgIG1fcGFnZS0+Zm9yY2VSZXBhaW50V2l0aG91dENhbGxiYWNrKCk7CiAgICAgICAgIG1f cGFnZS0+c2VuZChNZXNzYWdlczo6V2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eTo6RXhpdEFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkpOwogCi0gICAgICAgIEZyYW1lKiBmcmFtZSA9IG1fZWxl bWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKLSAgICAgICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJh bWUgPyBmcmFtZS0+dmlldygpIDogMDsKLSAgICAgICAgRHJhZ0ltYWdlUmVmIGRyYWdJbWFnZSA9 IDA7Ci0gICAgICAgIGlmICh2aWV3KSB7Ci0gICAgICAgICAgICBDb2xvciBzYXZlZEJhY2tncm91 bmRDb2xvciA9IHZpZXctPmJhc2VCYWNrZ3JvdW5kQ29sb3IoKTsKLSAgICAgICAgICAgIGJvb2wg c2F2ZWRJc1RyYW5zcGFyZW50ID0gdmlldy0+aXNUcmFuc3BhcmVudCgpOwotICAgICAgICAgICAg dmlldy0+c2V0QmFzZUJhY2tncm91bmRDb2xvcihDb2xvcjo6dHJhbnNwYXJlbnQpOwotICAgICAg ICAgICAgdmlldy0+c2V0VHJhbnNwYXJlbnQodHJ1ZSk7Ci0gICAgICAgICAgICBkcmFnSW1hZ2Ug PSBmcmFtZS0+bm9kZUltYWdlKG1fZWxlbWVudC5nZXQoKSk7Ci0gICAgICAgICAgICB2aWV3LT5z ZXRCYXNlQmFja2dyb3VuZENvbG9yKHNhdmVkQmFja2dyb3VuZENvbG9yKTsKLSAgICAgICAgICAg IHZpZXctPnNldFRyYW5zcGFyZW50KHNhdmVkSXNUcmFuc3BhcmVudCk7Ci0gICAgICAgIH0KLQot ICAgICAgICBbQ0FUcmFuc2FjdGlvbiBiZWdpbl07CiAgICAgICAgIFBsYXRmb3JtTGF5ZXIqIHJv b3RQbGF0Zm9ybUxheWVyID0gbV9yb290TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKTsKICAgICAgICAg W1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBwb3N0Tm90aWZpY2F0aW9uTmFt ZTpAIldlYktpdExheWVySG9zdENoYW5nZWQiIG9iamVjdDpyb290UGxhdGZvcm1MYXllciB1c2Vy SW5mbzpuaWxdOwotCiAgICAgICAgIG1fcm9vdExheWVyLT5yZW1vdmVBbGxDaGlsZHJlbigpOwog ICAgICAgICBtX3Jvb3RMYXllci0+c3luY0NvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5 KCk7CiAgICAgICAgIG1fcm9vdExheWVyID0gbnVsbHB0cjsKLSAgICAgICAgW3Jvb3RQbGF0Zm9y bUxheWVyIHNldENvbnRlbnRzOmRyYWdJbWFnZS5nZXQoKV07Ci0gICAgICAgIFtDQVRyYW5zYWN0 aW9uIGNvbW1pdF07Ci0gICAgICAgIAogICAgICAgICByZXR1cm47CiAgICAgfQogCg==