66820 2011-08-23 16:30:27 -0700 [chromium] Need a way to test lost compositor context recovery 2011-08-23 18:33:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66814 1 jamesr jamesr enne fishd kbr nduca vangelis oldest_to_newest 455805 0 jamesr 2011-08-23 16:30:27 -0700 [chromium] Need a way to test lost compositor context recovery 455813 1 104929 jamesr 2011-08-23 16:36:09 -0700 Created attachment 104929 Patch 455814 2 jamesr 2011-08-23 16:37:11 -0700 Note that this test currently crashes because of https://bugs.webkit.org/show_bug.cgi?id=66814. This has been broken for a while now, but since we don't have a layout test for it it just keeps failing. 455828 3 104929 enne 2011-08-23 17:00:42 -0700 Comment on attachment 104929 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104929&action=review This is super exciting. > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp:128 > - doComposite(); > + composite(false); If this is to fix the WebGL path, can you add a lose compositor context test that involves WebGL? 455833 4 jamesr 2011-08-23 17:03:39 -0700 It's not for the WebGL path, it's for DumpRenderTree which uses the compositeAndReadback() path in order to get access to the composited content. It never calls WebWidget::composite(). I think that we should write some patches to make sure that things like WebGL and canvas keep working after a lost compositor context, this is just the start. 455838 5 enne 2011-08-23 17:08:00 -0700 (In reply to comment #4) > It's not for the WebGL path, it's for DumpRenderTree which uses the compositeAndReadback() path in order to get access to the composited content. It never calls WebWidget::composite(). > > I think that we should write some patches to make sure that things like WebGL and canvas keep working after a lost compositor context, this is just the start. Ah, then I misunderstood how that was being used. I wish DRT wasn't such a special case. In that case, unofficial LGTM once this test starts passing. ...and, more tests in the future would be more awesome. 455861 6 104943 jamesr 2011-08-23 17:26:04 -0700 Created attachment 104943 merged up and including expectations 455879 7 104943 kbr 2011-08-23 17:41:33 -0700 Comment on attachment 104943 merged up and including expectations This is great. Big thumbs up. Do you want to submit this to the EWS before r+? 455881 8 jamesr 2011-08-23 17:43:09 -0700 Yes, I'll submit to EWS and mark review? once it's safe to land. Right now this test actually crashes because we have bugs in our context recovery, so it can't land yet - I'm waiting for https://bugs.webkit.org/show_bug.cgi?id=66814 which is r+ cq+. 455914 9 104943 kbr 2011-08-23 18:24:33 -0700 Comment on attachment 104943 merged up and including expectations r=me 455916 10 jamesr 2011-08-23 18:33:25 -0700 Committed r93681: <http://trac.webkit.org/changeset/93681> 104929 2011-08-23 16:36:09 -0700 2011-08-23 17:25:59 -0700 Patch bug-66820-20110823163608.patch text/plain 10509 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogOTM1NjgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMmIzYWU2ZDIzYmI1NGNhNzQ2Yzg1 ZWJhNjJmN2U5MWZlODFkODEyLi42ZGE3Y2YyMGZmM2NjYmY0NTJhNjQ4OTE2NTZlY2JmMGEwYWZi MGI1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDgtMjMgIEphbWVzIFJvYmluc29uICA8 amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE5lZWQgYSB3YXkgdG8g dGVzdCBsb3N0IGNvbXBvc2l0b3IgY29udGV4dCByZWNvdmVyeQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY4MjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGEgc2ltcGxlIHRlc3QgZm9yIGxvc2lu ZyB0aGUgY29tcG9zaXRvciBjb250ZXh0IGluIGEgcmVjb3ZlcmFibGUKKyAgICAgICAgd2F5IG9u IGEgY29tcG9zaXRlZCBwYWdlLiBUZXN0cyB0aGF0IHdlIHJlY292ZXIgd2l0aG91dCBjcmFzaGlu ZyBhbmQKKyAgICAgICAgcmVuZGVyIHRoZSB1cGRhdGVkIGNvbnRlbnQgb24gdGhlIG5leHQgZnJh bWUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9jb21wb3NpdGluZy9sb3N0LWNvbXBv c2l0b3ItY29udGV4dC5odG1sOiBBZGRlZC4KKwogMjAxMS0wOC0yMiAgUGV0ZXIgS2FzdGluZyAg PHBrYXN0aW5nQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBNYXJrIHNvbWUgdGVz dHMgb24gV2luZG93cyBhcyBmbGFreS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtL2NvbXBvc2l0aW5nL2xvc3QtY29tcG9zaXRvci1jb250ZXh0Lmh0bWwgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9jb21wb3NpdGluZy9sb3N0LWNvbXBvc2l0b3ItY29u dGV4dC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUzZDE1Nzc5YzY5MWQxZjkzYjU5NTNjNGNmNTFkYmU1M2Zi ODUyOTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9j b21wb3NpdGluZy9sb3N0LWNvbXBvc2l0b3ItY29udGV4dC5odG1sCkBAIC0wLDAgKzEsNDAgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgPHN0eWxlIHR5cGU9InRleHQvY3Nz IiBtZWRpYT0ic2NyZWVuIj4KKyAgICAucmVkIHsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjog cmVkOworICAgIH0KKworICAgIC5ncmVlbiB7CisgICAgICAgIGJhY2tncm91bmQtY29sb3I6IGdy ZWVuOworICAgIH0KKyAgICBkaXYgeworICAgICAgaGVpZ2h0OiAxMDBweDsKKyAgICAgIHdpZHRo OiAxMDBweDsKKyAgICB9CisgICAgCisgICAgLmNvbXBvc2l0ZWQgeworICAgICAgLXdlYmtpdC10 cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgfQorICA8L3N0eWxlPgorPC9oZWFkPgorPGJv ZHk+CisgIDwhLS0gSW4gdGhlIHBpeGVsIHJlc3VsdHMsIG9uZSBncmVlbiBzcXVhcmVzIHNob3Vs ZCBiZSB2aXNpYmxlLiAtLT4KKyAgPGRpdiBjbGFzcz0icmVkIj4KKyAgICA8ZGl2IGlkPSJ0YXJn ZXQiIGNsYXNzPSJyZWQgY29tcG9zaXRlZCI+CisgICAgPC9kaXY+CisgIDwvZGl2PgorICA8cD4K KyAgPHNjcmlwdD4KKyAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQodHJ1ZSk7ICAvLyBUaGlzIGlzIG9ubHkgdXNl ZnVsIGFzIGEgcGl4ZWwgdGVzdC4KKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kaXNwbGF5KCk7 CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubG9zZUNvbXBvc2l0b3JDb250ZXh0KCk7CisgIH0K KyAgdmFyIHRhcmdldCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0YXJnZXQiKTsKKyAgdGFy Z2V0LmNsYXNzTGlzdC5yZW1vdmUoInJlZCIpOworICB0YXJnZXQuY2xhc3NMaXN0LmFkZCgiZ3Jl ZW4iKTsKKyAgPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZiODk4 YTQzNzdlMWU4MzIxNGRkMmNiYzQ4ZTE0Mzc0ZTk0YTEzOC4uMDBiYmJmNzgwYzk1ZWU2NTBkMzIw N2YzMzBjODg0YzZlNWRmY2YyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTA4 LTIzICBKYW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2No cm9taXVtXSBOZWVkIGEgd2F5IHRvIHRlc3QgbG9zdCBjb21wb3NpdG9yIGNvbnRleHQgcmVjb3Zl cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2ODIw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBz dXBwb3J0IGZvciByZWNyZWF0aW5nIGEgY29udGV4dCBhcyBpZiBpdCB3YXMgbG9zdCwgYW5kIGZp eGVzCisgICAgICAgIGNvbXBvc2l0ZUFuZFJlYWRiYWNrKCkgdG8gYXR0ZW1wdCBjb250ZXh0IHJl Y292ZXJ5LgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL2Nocm9taXVtL2NvbXBvc2l0aW5nL2xv c3QtY29tcG9zaXRvci1jb250ZXh0Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xh eWVyVHJlZUhvc3Q6OmNvbXBvc2l0ZUFuZFJlYWRiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkND TGF5ZXJUcmVlSG9zdDo6bG9zZUNvbXBvc2l0b3JDb250ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaDoKKwogMjAxMS0wOC0yMiAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBzaG93TW9kYWxE aWFsb2cgZG9lcyBub3QgY29ycmVjdGx5IHJldHVybiB0aGUgZGVmaW5lZCByZXR1cm5WYWx1ZSBp biBjYXNlIGRvbWFpbiByZWxheGluZyBpcyB1c2VkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0 LmNwcAppbmRleCAxZjNiOTc5NzkwMDA0N2MzM2ZmNGMzNmEwZTJlYjFmMDk4ZTIyZjMwLi5hM2Q4 MWMxMjIwZjFiNGI0NmQ4MGRjMTMxYTdkMmE3MzVhMWQ5OTFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdC5jcHAKQEAgLTEyNSw3ICsxMjUsNyBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6 Y29tcG9zaXRlQW5kUmVhZGJhY2sodm9pZCAqcGl4ZWxzLCBjb25zdCBJbnRSZWN0JiByZWN0KQog I2lmIFVTRShUSFJFQURFRF9DT01QT1NJVElORykKICAgICAvLyBGSVhNRTogbmVlZCB0byBpbXBs ZW1lbnQgdGhpcy4KICNlbHNlCi0gICAgZG9Db21wb3NpdGUoKTsKKyAgICBjb21wb3NpdGUoZmFs c2UpOwogICAgIG1fbGF5ZXJSZW5kZXJlci0+Z2V0RnJhbWVidWZmZXJQaXhlbHMocGl4ZWxzLCBy ZWN0KTsKICNlbmRpZgogfQpAQCAtMjY2LDYgKzI2NiwxMSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9z dDo6Y29tcG9zaXRlKGJvb2wgZmluaXNoKQogICAgIH0KIH0KIAordm9pZCBDQ0xheWVyVHJlZUhv c3Q6Omxvc2VDb21wb3NpdG9yQ29udGV4dCgpCit7CisgICAgbV9yZWNyZWF0aW5nR3JhcGhpY3ND b250ZXh0ID0gdHJ1ZTsKK30KKwogdm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnJlYWxsb2NhdGVSZW5k ZXJlcigpCiB7CiAgICAgUmVmUHRyPExheWVyUmVuZGVyZXJDaHJvbWl1bT4gbGF5ZXJSZW5kZXJl ciA9IGNyZWF0ZUxheWVyUmVuZGVyZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKaW5k ZXggYjA3YTI1ZmNhNjJjYmNiNWFkY2NhOTE4OWNhYmVhZGQzZTVlMGQ5OS4uZGExNDdkMTI1ZWJi MGRhNTMzMmFjNmY5MmMxYjYwNmQ1Y2Q4MTBmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0 LmgKQEAgLTExMyw2ICsxMTMsOCBAQCBwdWJsaWM6CiAgICAgLy8gVGVtcG9yYXJ5IGhvbWUgZm9y IHRoZSBub24tdGhyZWFkZWQgcmVuZGVyaW5nIHBhdGguCiAjaWYgIVVTRShUSFJFQURFRF9DT01Q T1NJVElORykKICAgICB2b2lkIGNvbXBvc2l0ZShib29sIGZpbmlzaCk7CisKKyAgICB2b2lkIGxv c2VDb21wb3NpdG9yQ29udGV4dCgpOwogI2VuZGlmCiAKICAgICBOb25Db21wb3NpdGVkQ29udGVu dEhvc3QqIG5vbkNvbXBvc2l0ZWRDb250ZW50SG9zdCgpIGNvbnN0IHsgcmV0dXJuIG1fbm9uQ29t cG9zaXRlZENvbnRlbnRIb3N0LmdldCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDM4M2Y4OGE3NTU2MDFmY2Q0YzE1NjEzYzdlYTczN2NiYjQxMjIxNzUuLmE3ZDk1NWUwODMzOGVk NzM1YzdmNTYxNmJhYjIxZGI4NWUwNzNkODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDgtMjMgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9t aXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE5lZWQgYSB3YXkgdG8gdGVzdCBsb3N0IGNv bXBvc2l0b3IgY29udGV4dCByZWNvdmVyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjY4MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRzIGEgdGVzdGluZy1vbmx5IEFQSSB0byBzaW11bGF0ZSBhIGxv c3QgY29tcG9zaXRvciBjb250ZXh0LgorCisgICAgICAgICogcHVibGljL1dlYlZpZXcuaDoKKyAg ICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1w bDo6bG9zZUNvbXBvc2l0b3JDb250ZXh0KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuaDoK KwogMjAxMS0wOC0yMiAgSWFpbiBNZXJyaWNrICA8aHVza3lAZ29vZ2xlLmNvbT4KIAogICAgICAg ICBbY2hyb21pdW1dIFdlYlZpZXdJbXBsIHNob3VsZCBub3QgcmVzaGFwZSB0aGUgM0QgY29udGV4 dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCmluZGV4IDE3OTdkYzUxYTYy MTcwOTRjMTE5NTY2MjRiMDc0ODIxZDlmNjUyZjAuLjBhNTcxNGE5NzA3ZDQyOWJjYjM5OTc3Y2Q5 MDZiOTBmODY5MTM0NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgK QEAgLTM5MCw2ICszOTAsMTEgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIGV4aXRGdWxs c2NyZWVuKCkgPSAwOwogCisgICAgLy8gVGVzdGluZyBmdW5jdGlvbmFsaXR5IGZvciBMYXlvdXRU ZXN0Q29udHJvbGxlciAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorCisgICAgLy8gU2ltdWxhdGVz IGEgY29tcG9zaXRvciBsb3N0IGNvbnRleHQuCisgICAgdmlydHVhbCB2b2lkIGxvc2VDb21wb3Np dG9yQ29udGV4dCgpID0gMDsKKwogCiBwcm90ZWN0ZWQ6CiAgICAgfldlYlZpZXcoKSB7fQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDM3YWFjYjgzOTY3 OTEzN2JmNzIyYjczNzhmZWU0MjViNjVlNTExMDcuLjllMTYxNzhhMjMwZTM1ZmU0NTVlNzgzMGYx OWE4ZTI2MDcyMWM4ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKQEAgLTExODQsNiArMTE4NCwxNCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpjb21wb3NpdGUo Ym9vbCBmaW5pc2gpCiAjZW5kaWYKIH0KIAordm9pZCBXZWJWaWV3SW1wbDo6bG9zZUNvbXBvc2l0 b3JDb250ZXh0KCkKK3sKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgaWYg KG1fbGF5ZXJUcmVlSG9zdCkKKyAgICAgICAgbV9sYXllclRyZWVIb3N0LT5sb3NlQ29tcG9zaXRv ckNvbnRleHQoKTsKKyNlbmRpZgorfQorCiBjb25zdCBXZWJJbnB1dEV2ZW50KiBXZWJWaWV3SW1w bDo6bV9jdXJyZW50SW5wdXRFdmVudCA9IDA7CiAKIGJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUlu cHV0RXZlbnQoY29uc3QgV2ViSW5wdXRFdmVudCYgaW5wdXRFdmVudCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IGM3Y2QxMmI2NzA0ZGM5NTYyMDRiMTA0NzUz NmNiZGExYmIxNjY0OWMuLmUxYmU5NDhmMjk1NDIxYjBiYjViMDkxNDEyZTVjZTM1NzliYzc0ZTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtNDA1LDYgKzQw NSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlc2V0R2VzdHVyZVJlY29nbml6ZXIoKTsKICNlbmRp ZgogCisgICAgdm9pZCBsb3NlQ29tcG9zaXRvckNvbnRleHQoKTsKKwogcHJpdmF0ZToKICAgICBm cmllbmQgY2xhc3MgV2ViVmlldzsgIC8vIFNvIFdlYlZpZXc6OkNyZWF0ZSBjYW4gY2FsbCBvdXIg Y29uc3RydWN0b3IKICAgICBmcmllbmQgY2xhc3MgV1RGOjpSZWZDb3VudGVkPFdlYlZpZXdJbXBs PjsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAx NzFmMjY3YWMzZDZiOTA4OTIyNDEyZTU2ZDNjNDMyNTE3YjM5OTJmLi43ZTJiYzY0YzIzZTI4YjQx NTA1NDZhZTg1MDk5ZjllZDUzZDBlNjQ5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDgtMjMgIEphbWVzIFJv Ymluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE5lZWQg YSB3YXkgdG8gdGVzdCBsb3N0IGNvbXBvc2l0b3IgY29udGV4dCByZWNvdmVyeQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY4MjAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBvc2VzIGEgTGF5b3V0VGVz dENvbnRyb2xsZXIgaW50ZXJmYWNlIGluIGNocm9taXVtIHRvIHNpbXVsYXRlIGEKKyAgICAgICAg bG9zdCBjb21wb3NpdG9yIGNvbnRleHQuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJv bGxlcjo6TGF5b3V0VGVzdENvbnRyb2xsZXIpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xs ZXI6Omxvc2VDb21wb3NpdG9yQ29udGV4dCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hy b21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuaDoKKwogMjAxMS0wOC0yMiAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSGFjayBzdGFydC1xdWV1ZS5zaCBpbiBhbiBh dHRlbXB0IHRvIHJlc3VycmVjdCB0aGUgY3ItamFpbC0xIGNyLW1hYy1ld3MgYm90LgpkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIu Y3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIu Y3BwCmluZGV4IDQwOWY4NTM4ZmY2MzQ2NmIzYjE0ZDQyZWJmM2QwYWVhMjM0ZTI2NjEuLmFkMjNh YWIyOTY5N2ZhYWUyYWE3Mjc1NmEyNmNkMTM0NjkxNjVkNzIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAKQEAgLTEx OCw2ICsxMTgsNyBAQCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6TGF5b3V0VGVzdENvbnRyb2xsZXIo VGVzdFNoZWxsKiBzaGVsbCkKICAgICBiaW5kTWV0aG9kKCJoYXNTcGVsbGluZ01hcmtlciIsICZM YXlvdXRUZXN0Q29udHJvbGxlcjo6aGFzU3BlbGxpbmdNYXJrZXIpOwogICAgIGJpbmRNZXRob2Qo ImlzQ29tbWFuZEVuYWJsZWQiLCAmTGF5b3V0VGVzdENvbnRyb2xsZXI6OmlzQ29tbWFuZEVuYWJs ZWQpOwogICAgIGJpbmRNZXRob2QoImxheWVyVHJlZUFzVGV4dCIsICZMYXlvdXRUZXN0Q29udHJv bGxlcjo6bGF5ZXJUcmVlQXNUZXh0KTsKKyAgICBiaW5kTWV0aG9kKCJsb3NlQ29tcG9zaXRvckNv bnRleHQiLCAmTGF5b3V0VGVzdENvbnRyb2xsZXI6Omxvc2VDb21wb3NpdG9yQ29udGV4dCk7CiAg ICAgYmluZE1ldGhvZCgibWFya2VyVGV4dEZvckxpc3RJdGVtIiwgJkxheW91dFRlc3RDb250cm9s bGVyOjptYXJrZXJUZXh0Rm9yTGlzdEl0ZW0pOwogICAgIGJpbmRNZXRob2QoIm5vdGlmeURvbmUi LCAmTGF5b3V0VGVzdENvbnRyb2xsZXI6Om5vdGlmeURvbmUpOwogICAgIGJpbmRNZXRob2QoIm51 bWJlck9mQWN0aXZlQW5pbWF0aW9ucyIsICZMYXlvdXRUZXN0Q29udHJvbGxlcjo6bnVtYmVyT2ZB Y3RpdmVBbmltYXRpb25zKTsKQEAgLTE3MjEsNiArMTcyMiwxMSBAQCB2b2lkIExheW91dFRlc3RD b250cm9sbGVyOjpsYXllclRyZWVBc1RleHQoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmdzLCBD cHBWYXJpYQogICAgIHJlc3VsdC0+c2V0KG1fc2hlbGwtPndlYlZpZXcoKS0+bWFpbkZyYW1lKCkt PmxheWVyVHJlZUFzVGV4dChtX3Nob3dEZWJ1Z0xheWVyVHJlZSkudXRmOCgpKTsKIH0KIAordm9p ZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bG9zZUNvbXBvc2l0b3JDb250ZXh0KGNvbnN0IENwcEFy Z3VtZW50TGlzdCYsIENwcFZhcmlhbnQqKQoreworICAgIG1fc2hlbGwtPndlYlZpZXcoKS0+bG9z ZUNvbXBvc2l0b3JDb250ZXh0KCk7Cit9CisKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6Om1h cmtlclRleHRGb3JMaXN0SXRlbShjb25zdCBDcHBBcmd1bWVudExpc3QmIGFyZ3MsIENwcFZhcmlh bnQqIHJlc3VsdCkKIHsKICAgICBXZWJFbGVtZW50IGVsZW1lbnQ7CmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuaAppbmRleCA2YWVh N2VjZjI3OGYwNDM0YWFkY2QxOTY3ZDQ1ZTM2M2E0ZWE2YzhiLi5iMGU3MTk5ZTI2ZThlMDVjOTBl YzQ5MjMwYjZjODYwMjgzM2YzZDAxIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmgKQEAgLTM1OCw2ICszNTgsOCBAQCBwdWJs aWM6CiAKICAgICB2b2lkIGxheWVyVHJlZUFzVGV4dChjb25zdCBDcHBBcmd1bWVudExpc3QmIGFy Z3MsIENwcFZhcmlhbnQqIHJlc3VsdCk7CiAKKyAgICB2b2lkIGxvc2VDb21wb3NpdG9yQ29udGV4 dChjb25zdCBDcHBBcmd1bWVudExpc3QmIGFyZ3MsIENwcFZhcmlhbnQqIHJlc3VsdCk7CisKICAg ICB2b2lkIG1hcmtlclRleHRGb3JMaXN0SXRlbShjb25zdCBDcHBBcmd1bWVudExpc3QmLCBDcHBW YXJpYW50Kik7CiAgICAgdm9pZCBoYXNTcGVsbGluZ01hcmtlcihjb25zdCBDcHBBcmd1bWVudExp c3QmLCBDcHBWYXJpYW50Kik7CiAK 104943 2011-08-23 17:26:04 -0700 2011-08-23 18:24:33 -0700 merged up and including expectations bug-66820-20110823172603.patch text/plain 11500 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogOTM2NjIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1YmYxNDgzODdjZDAwMmQwY2M2OGY4 YjA0N2Q4ZjlkYjNkNzFmYTc5Li45ZTEyYzAwYTAwMmM5ZDcwODA5OWJlYWY1ODc3ZmRmYjIxZTYw ZGQzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDgtMjMgIEphbWVzIFJvYmluc29uICA8 amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIE5lZWQgYSB3YXkgdG8g dGVzdCBsb3N0IGNvbXBvc2l0b3IgY29udGV4dCByZWNvdmVyeQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY4MjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGEgc2ltcGxlIHRlc3QgZm9yIGxvc2lu ZyB0aGUgY29tcG9zaXRvciBjb250ZXh0IGluIGEgcmVjb3ZlcmFibGUKKyAgICAgICAgd2F5IG9u IGEgY29tcG9zaXRlZCBwYWdlLiBUZXN0cyB0aGF0IHdlIHJlY292ZXIgd2l0aG91dCBjcmFzaGlu ZyBhbmQKKyAgICAgICAgcmVuZGVyIHRoZSB1cGRhdGVkIGNvbnRlbnQgb24gdGhlIG5leHQgZnJh bWUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9jb21wb3NpdGluZy9sb3N0LWNvbXBv c2l0b3ItY29udGV4dC5odG1sOiBBZGRlZC4KKwogMjAxMS0wOC0yMyAgUGV0ZXIgS2FzdGluZyAg PHBrYXN0aW5nQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgY29tbWVu dHMgZm9ybWVybHkgYXNzb2NpYXRlZCB3aXRoIG5vdy1yZWJhc2VsaW5lZCB0ZXN0cy4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2NvbXBvc2l0aW5nL2xvc3QtY29t cG9zaXRvci1jb250ZXh0LWV4cGVjdGVkLnBuZyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9t aXVtL2NvbXBvc2l0aW5nL2xvc3QtY29tcG9zaXRvci1jb250ZXh0LWV4cGVjdGVkLnBuZwpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi42Y2RhMTdhZDdiMThhZjc0NjVmM2M3ZTQ2ZDczMTkzYWJiNzZjMzQwCkdJVCBiaW5h cnkgcGF0Y2gKbGl0ZXJhbCAyODY0CnpjbWVBU0BOPyhvbEh5YHVWQnEhaWEweX55VXsrdllWMmE+ aTAqWik9aF5obEElQFdzJGxIYG9rPG19P29UbjRpdwp6Z1ZmfD9iN05DZUJOR0VsR2dISH5sciY/ TEcmNCluTH5+O1VHdm1KKjgoa1J+eERJKWBJRUdacmQzKG9AdWh+ST4KeiNjfUBBZGdadSVFaVVK eDZhcXI0UFBWTSYle3pPQm91VDJ9X2ppbTg0RWYzJTcjTmI2eEVVMUdGY3t4e2Y4WCR9CnpebDZ7 Xz82ZEpuMzxwbEtWcFdCeVomWUx1MkdxOCtYWVk2ITd9aF4oVnIzOHpqJG1MZ1kjZTJiMkV1NGM3 fGpLdgpveG5NTEdqT0sjVFRyZnktZmk7NzlHdzxyIzNsfX5FSGh+I0RVSHgzdklWQ2chMEdVanpj bU16WgoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vY2hyb21pdW0vY29tcG9zaXRpbmcvbG9zdC1jb21wb3NpdG9yLWNvbnRleHQtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vY29tcG9zaXRpbmcvbG9zdC1j b21wb3NpdG9yLWNvbnRleHQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhiMTM3ODkxNzkxZmU5 NjkyN2FkNzhlNjRiMGFhZDdiZGVkMDhiZGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9jaHJvbWl1bS9jb21wb3NpdGluZy9sb3N0LWNvbXBvc2l0b3ItY29udGV4dC1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9jaHJvbWl1bS9jb21wb3NpdGluZy9sb3N0LWNvbXBvc2l0b3ItY29udGV4dC5odG1sIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vY29tcG9zaXRpbmcvbG9zdC1jb21wb3NpdG9y LWNvbnRleHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lM2QxNTc3OWM2OTFkMWY5M2I1OTUzYzRjZjUxZGJl NTNmYjg1Mjk1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21p dW0vY29tcG9zaXRpbmcvbG9zdC1jb21wb3NpdG9yLWNvbnRleHQuaHRtbApAQCAtMCwwICsxLDQw IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0 L2NzcyIgbWVkaWE9InNjcmVlbiI+CisgICAgLnJlZCB7CisgICAgICAgIGJhY2tncm91bmQtY29s b3I6IHJlZDsKKyAgICB9CisKKyAgICAuZ3JlZW4geworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9y OiBncmVlbjsKKyAgICB9CisgICAgZGl2IHsKKyAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICB3 aWR0aDogMTAwcHg7CisgICAgfQorICAgIAorICAgIC5jb21wb3NpdGVkIHsKKyAgICAgIC13ZWJr aXQtdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgIH0KKyAgPC9zdHlsZT4KKzwvaGVhZD4K Kzxib2R5PgorICA8IS0tIEluIHRoZSBwaXhlbCByZXN1bHRzLCBvbmUgZ3JlZW4gc3F1YXJlcyBz aG91bGQgYmUgdmlzaWJsZS4gLS0+CisgIDxkaXYgY2xhc3M9InJlZCI+CisgICAgPGRpdiBpZD0i dGFyZ2V0IiBjbGFzcz0icmVkIGNvbXBvc2l0ZWQiPgorICAgIDwvZGl2PgorICA8L2Rpdj4KKyAg PHA+CisgIDxzY3JpcHQ+CisgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KHRydWUpOyAgLy8gVGhpcyBpcyBvbmx5 IHVzZWZ1bCBhcyBhIHBpeGVsIHRlc3QuCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZGlzcGxh eSgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmxvc2VDb21wb3NpdG9yQ29udGV4dCgpOwor ICB9CisgIHZhciB0YXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGFyZ2V0Iik7Cisg IHRhcmdldC5jbGFzc0xpc3QucmVtb3ZlKCJyZWQiKTsKKyAgdGFyZ2V0LmNsYXNzTGlzdC5hZGQo ImdyZWVuIik7CisgIDwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQy OTlmOWM4ZGNhNjkwYTIwM2UzOWYwM2NlMWY2ZThjYWM4MzRlMmQuLmZiN2ZjMGM0NWZmMGM3OWI1 MTM4YmNmZjdkZjMwZjVlNzMzNDQ2MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAx MS0wOC0yMyAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFtjaHJvbWl1bV0gTmVlZCBhIHdheSB0byB0ZXN0IGxvc3QgY29tcG9zaXRvciBjb250ZXh0IHJl Y292ZXJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NjgyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZHMgc3VwcG9ydCBmb3IgcmVjcmVhdGluZyBhIGNvbnRleHQgYXMgaWYgaXQgd2FzIGxvc3QsIGFu ZCBmaXhlcworICAgICAgICBjb21wb3NpdGVBbmRSZWFkYmFjaygpIHRvIGF0dGVtcHQgY29udGV4 dCByZWNvdmVyeS4KKworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9jaHJvbWl1bS9jb21wb3NpdGlu Zy9sb3N0LWNvbXBvc2l0b3ItY29udGV4dC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q0NMYXllclRyZWVIb3N0Ojpjb21wb3NpdGVBbmRSZWFkYmFjayk6CisgICAgICAgIChXZWJDb3Jl OjpDQ0xheWVyVHJlZUhvc3Q6Omxvc2VDb21wb3NpdG9yQ29udGV4dCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Lmg6CisKIDIwMTEtMDgt MjMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXgg YnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAppbmRleCA5ZjM1OTE4ZDhlYTZi NjA5NDc2MWIyNDMxMzFlNzRmMDY0NmQ5MjFkLi45N2U3NDJjYzE4MjgyNzhjNmI1MmUyOTZiODBk ZTk3YjRhYTE4MDVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAKQEAgLTEzNCw3 ICsxMzQsNyBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6Y29tcG9zaXRlQW5kUmVhZGJhY2sodm9p ZCAqcGl4ZWxzLCBjb25zdCBJbnRSZWN0JiByZWN0KQogI2lmIFVTRShUSFJFQURFRF9DT01QT1NJ VElORykKICAgICAvLyBGSVhNRTogbmVlZCB0byBpbXBsZW1lbnQgdGhpcy4KICNlbHNlCi0gICAg ZG9Db21wb3NpdGUoKTsKKyAgICBjb21wb3NpdGUoZmFsc2UpOwogICAgIG1fbGF5ZXJSZW5kZXJl ci0+Z2V0RnJhbWVidWZmZXJQaXhlbHMocGl4ZWxzLCByZWN0KTsKICNlbmRpZgogfQpAQCAtMjc1 LDYgKzI3NSwxMSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9zdDo6Y29tcG9zaXRlKGJvb2wgZmluaXNo KQogICAgIH0KIH0KIAordm9pZCBDQ0xheWVyVHJlZUhvc3Q6Omxvc2VDb21wb3NpdG9yQ29udGV4 dCgpCit7CisgICAgbV9yZWNyZWF0aW5nR3JhcGhpY3NDb250ZXh0ID0gdHJ1ZTsKK30KKwogdm9p ZCBDQ0xheWVyVHJlZUhvc3Q6OnJlYWxsb2NhdGVSZW5kZXJlcigpCiB7CiAgICAgUmVmUHRyPExh eWVyUmVuZGVyZXJDaHJvbWl1bT4gbGF5ZXJSZW5kZXJlciA9IGNyZWF0ZUxheWVyUmVuZGVyZXIo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDTGF5ZXJUcmVlSG9zdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKaW5kZXggOGM0MTk3NmMyODU5ZDdjYTc4ODNm NjliYWI1ZDdkYzM5NGRlMDMwYS4uNzJhYTZkY2U4NjcyODA0YmMxMTg3YTQ5YmZlNDNmNjFhMTU0 ZjdjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmgKQEAgLTExNCw2ICsxMTQsOSBAQCBw dWJsaWM6CiAgICAgLy8gVGVtcG9yYXJ5IGhvbWUgZm9yIHRoZSBub24tdGhyZWFkZWQgcmVuZGVy aW5nIHBhdGguCiAjaWYgIVVTRShUSFJFQURFRF9DT01QT1NJVElORykKICAgICB2b2lkIGNvbXBv c2l0ZShib29sIGZpbmlzaCk7CisKKyAgICB2b2lkIGxvc2VDb21wb3NpdG9yQ29udGV4dCgpOwor CiAgICAgTGF5ZXJSZW5kZXJlckNocm9taXVtKiBsYXllclJlbmRlcmVyKCkgY29uc3QgeyByZXR1 cm4gbV9sYXllclJlbmRlcmVyLmdldCgpOyB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCBiMzY5YjYxZTljMGFkNTQyMzE0ZmYyMzExNjZhMmE5NzBlNjUzYTQyLi4yYTQ1 ZjM4MmQwYzhjZGQ4NTRlZWE2ZjNlNjRkN2QyY2ZhYjY0ZWIzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTA4LTIzICBKYW1lcyBSb2JpbnNvbiAgPGph bWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBOZWVkIGEgd2F5IHRvIHRl c3QgbG9zdCBjb21wb3NpdG9yIGNvbnRleHQgcmVjb3ZlcnkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2ODIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIHRlc3Rpbmctb25seSBBUEkgdG8gc2lt dWxhdGUgYSBsb3N0IGNvbXBvc2l0b3IgY29udGV4dC4KKworICAgICAgICAqIHB1YmxpYy9XZWJW aWV3Lmg6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6Omxvc2VDb21wb3NpdG9yQ29udGV4dCk6CisgICAgICAgICogc3JjL1dlYlZp ZXdJbXBsLmg6CisKIDIwMTEtMDgtMjMgIERtaXRyeSBMb21vdiAgPERtaXRyeSBMb21vdiAoZHNs b21vdkBnb29nbGUuY29tKT4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjY3NTEgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgK aW5kZXggMTc5N2RjNTFhNjIxNzA5NGMxMTk1NjYyNGIwNzQ4MjFkOWY2NTJmMC4uMGE1NzE0YTk3 MDdkNDI5YmNiMzk5NzdjZDkwNmI5MGY4NjkxMzQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlZpZXcuaApAQCAtMzkwLDYgKzM5MCwxMSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0 dWFsIHZvaWQgZXhpdEZ1bGxzY3JlZW4oKSA9IDA7CiAKKyAgICAvLyBUZXN0aW5nIGZ1bmN0aW9u YWxpdHkgZm9yIExheW91dFRlc3RDb250cm9sbGVyIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisK KyAgICAvLyBTaW11bGF0ZXMgYSBjb21wb3NpdG9yIGxvc3QgY29udGV4dC4KKyAgICB2aXJ0dWFs IHZvaWQgbG9zZUNvbXBvc2l0b3JDb250ZXh0KCkgPSAwOworCiAKIHByb3RlY3RlZDoKICAgICB+ V2ViVmlldygpIHt9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAK aW5kZXggNmNjOTEwMDNiOWYzYmNmZTdhYWQ0YTkxMjE5NjI3NGM5NjhhN2FhNC4uMWFiYTdjNzc0 YjQ1YmZjOTJlYTBjODE5NThiZDFhYTI3ODcxNmUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTE4NSw2ICsxMTg1LDE0IEBAIHZvaWQgV2ViVmll d0ltcGw6OmNvbXBvc2l0ZShib29sIGZpbmlzaCkKICNlbmRpZgogfQogCit2b2lkIFdlYlZpZXdJ bXBsOjpsb3NlQ29tcG9zaXRvckNvbnRleHQoKQoreworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKKyAgICBpZiAobV9sYXllclRyZWVIb3N0KQorICAgICAgICBtX2xheWVyVHJlZUhv c3QtPmxvc2VDb21wb3NpdG9yQ29udGV4dCgpOworI2VuZGlmCit9CisKIGNvbnN0IFdlYklucHV0 RXZlbnQqIFdlYlZpZXdJbXBsOjptX2N1cnJlbnRJbnB1dEV2ZW50ID0gMDsKIAogYm9vbCBXZWJW aWV3SW1wbDo6aGFuZGxlSW5wdXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50JiBpbnB1dEV2ZW50 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggYzdjZDEyYjY3 MDRkYzk1NjIwNGIxMDQ3NTM2Y2JkYTFiYjE2NjQ5Yy4uZTFiZTk0OGYyOTU0MjFiMGJiNWIwOTE0 MTJlNWNlMzU3OWJjNzRlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5oCkBAIC00MDUsNiArNDA1LDggQEAgcHVibGljOgogICAgIHZvaWQgcmVzZXRHZXN0dXJlUmVj b2duaXplcigpOwogI2VuZGlmCiAKKyAgICB2b2lkIGxvc2VDb21wb3NpdG9yQ29udGV4dCgpOwor CiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXZWJWaWV3OyAgLy8gU28gV2ViVmlldzo6Q3Jl YXRlIGNhbiBjYWxsIG91ciBjb25zdHJ1Y3RvcgogICAgIGZyaWVuZCBjbGFzcyBXVEY6OlJlZkNv dW50ZWQ8V2ViVmlld0ltcGw+OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IGNiY2QyYjQ3YmJiYmIyMjY3YWQ3ZDc1ZjYzOTRjMGFjY2Q4NWY1ZWMu LmEwYTAxZjJjZjg3NjExMjJlMzI0MzdiMGIxZWFkZGY1NTQwNmE3YWYgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAx MS0wOC0yMyAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFtjaHJvbWl1bV0gTmVlZCBhIHdheSB0byB0ZXN0IGxvc3QgY29tcG9zaXRvciBjb250ZXh0IHJl Y292ZXJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NjgyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4 cG9zZXMgYSBMYXlvdXRUZXN0Q29udHJvbGxlciBpbnRlcmZhY2UgaW4gY2hyb21pdW0gdG8gc2lt dWxhdGUgYQorICAgICAgICBsb3N0IGNvbXBvc2l0b3IgY29udGV4dC4KKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KExheW91dFRlc3RDb250cm9sbGVyOjpMYXlvdXRUZXN0Q29udHJvbGxlcik6CisgICAgICAgIChM YXlvdXRUZXN0Q29udHJvbGxlcjo6bG9zZUNvbXBvc2l0b3JDb250ZXh0KToKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oOgorCiAyMDExLTA4 LTIzICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg Q2hhbmdlIGdhcmRlbi1vLW1hdGljIGZyb250ZW5kIGJ1aWxkZXIgYXJyYXkgdG8gYmUgYSBjb25m aWd1cmF0aW9uIG1hcC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L0xheW91dFRlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L0xheW91dFRlc3RDb250cm9sbGVyLmNwcAppbmRleCA0MDlmODUzOGZmNjM0NjZiM2IxNGQ0MmVi ZjNkMGFlYTIzNGUyNjYxLi5hZDIzYWFiMjk2OTdmYWFlMmFhNzI3NTZhMjZjZDEzNDY5MTY1ZDcy IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29u dHJvbGxlci5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVz dENvbnRyb2xsZXIuY3BwCkBAIC0xMTgsNiArMTE4LDcgQEAgTGF5b3V0VGVzdENvbnRyb2xsZXI6 OkxheW91dFRlc3RDb250cm9sbGVyKFRlc3RTaGVsbCogc2hlbGwpCiAgICAgYmluZE1ldGhvZCgi aGFzU3BlbGxpbmdNYXJrZXIiLCAmTGF5b3V0VGVzdENvbnRyb2xsZXI6Omhhc1NwZWxsaW5nTWFy a2VyKTsKICAgICBiaW5kTWV0aG9kKCJpc0NvbW1hbmRFbmFibGVkIiwgJkxheW91dFRlc3RDb250 cm9sbGVyOjppc0NvbW1hbmRFbmFibGVkKTsKICAgICBiaW5kTWV0aG9kKCJsYXllclRyZWVBc1Rl eHQiLCAmTGF5b3V0VGVzdENvbnRyb2xsZXI6OmxheWVyVHJlZUFzVGV4dCk7CisgICAgYmluZE1l dGhvZCgibG9zZUNvbXBvc2l0b3JDb250ZXh0IiwgJkxheW91dFRlc3RDb250cm9sbGVyOjpsb3Nl Q29tcG9zaXRvckNvbnRleHQpOwogICAgIGJpbmRNZXRob2QoIm1hcmtlclRleHRGb3JMaXN0SXRl bSIsICZMYXlvdXRUZXN0Q29udHJvbGxlcjo6bWFya2VyVGV4dEZvckxpc3RJdGVtKTsKICAgICBi aW5kTWV0aG9kKCJub3RpZnlEb25lIiwgJkxheW91dFRlc3RDb250cm9sbGVyOjpub3RpZnlEb25l KTsKICAgICBiaW5kTWV0aG9kKCJudW1iZXJPZkFjdGl2ZUFuaW1hdGlvbnMiLCAmTGF5b3V0VGVz dENvbnRyb2xsZXI6Om51bWJlck9mQWN0aXZlQW5pbWF0aW9ucyk7CkBAIC0xNzIxLDYgKzE3MjIs MTEgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bGF5ZXJUcmVlQXNUZXh0KGNvbnN0IENw cEFyZ3VtZW50TGlzdCYgYXJncywgQ3BwVmFyaWEKICAgICByZXN1bHQtPnNldChtX3NoZWxsLT53 ZWJWaWV3KCktPm1haW5GcmFtZSgpLT5sYXllclRyZWVBc1RleHQobV9zaG93RGVidWdMYXllclRy ZWUpLnV0ZjgoKSk7CiB9CiAKK3ZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6Omxvc2VDb21wb3Np dG9yQ29udGV4dChjb25zdCBDcHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50KikKK3sKKyAgICBt X3NoZWxsLT53ZWJWaWV3KCktPmxvc2VDb21wb3NpdG9yQ29udGV4dCgpOworfQorCiB2b2lkIExh eW91dFRlc3RDb250cm9sbGVyOjptYXJrZXJUZXh0Rm9yTGlzdEl0ZW0oY29uc3QgQ3BwQXJndW1l bnRMaXN0JiBhcmdzLCBDcHBWYXJpYW50KiByZXN1bHQpCiB7CiAgICAgV2ViRWxlbWVudCBlbGVt ZW50OwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVz dENvbnRyb2xsZXIuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RD b250cm9sbGVyLmgKaW5kZXggNmFlYTdlY2YyNzhmMDQzNGFhZGNkMTk2N2Q0NWUzNjNhNGVhNmM4 Yi4uYjBlNzE5OWUyNmU4ZTA1YzkwZWM0OTIzMGI2Yzg2MDI4MzNmM2QwMSAxMDA2NDQKLS0tIGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuaAorKysg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCkBA IC0zNTgsNiArMzU4LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBsYXllclRyZWVBc1RleHQoY29u c3QgQ3BwQXJndW1lbnRMaXN0JiBhcmdzLCBDcHBWYXJpYW50KiByZXN1bHQpOwogCisgICAgdm9p ZCBsb3NlQ29tcG9zaXRvckNvbnRleHQoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmdzLCBDcHBW YXJpYW50KiByZXN1bHQpOworCiAgICAgdm9pZCBtYXJrZXJUZXh0Rm9yTGlzdEl0ZW0oY29uc3Qg Q3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCopOwogICAgIHZvaWQgaGFzU3BlbGxpbmdNYXJr ZXIoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFudCopOwogCg==