93021 2012-08-02 13:20:22 -0700 [chromium] Make CCScrollbarLayerImpl handle lost contexts properly 2012-08-02 15:29:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne cc-bugs enne jamesr webkit.review.bot oldest_to_newest 685720 0 enne 2012-08-02 13:20:22 -0700 [chromium] Make CCScrollbarLayerImpl handle lost contexts properly 685758 1 156154 enne 2012-08-02 13:42:16 -0700 Created attachment 156154 Patch 685906 2 156154 webkit.review.bot 2012-08-02 15:29:54 -0700 Comment on attachment 156154 Patch Clearing flags on attachment: 156154 Committed r124511: <http://trac.webkit.org/changeset/124511> 685907 3 webkit.review.bot 2012-08-02 15:29:57 -0700 All reviewed patches have been landed. Closing bug. 156154 2012-08-02 13:42:16 -0700 2012-08-02 15:29:54 -0700 Patch bug-93021-20120802134157.patch text/plain 9801 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJjZTA5ZWE5MjE3MWM5 NzExNTA4ZDEzYzgxMWRiZDZiYWMwMzE1Yi4uNDYxNDAyZTMwOTQ4ZDk0MDEyZDJhNWQ1ZGExY2Rk M2U3NmFkNGRjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA4LTAyICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBNYWtl IENDU2Nyb2xsYmFyTGF5ZXJJbXBsIGhhbmRsZSBsb3N0IGNvbnRleHRzIHByb3Blcmx5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzAyMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSByZXNvdXJjZSBp ZHMgdGhhdCBDQ1Njcm9sbGJhckxheWVySW1wbCBob2xkcyBvbnRvIG5lZWQgdG8gYmUKKyAgICAg ICAgZGlzY2FyZGVkIGR1cmluZyBhIGxvc3QgY29udGV4dCBhcyB0aGUgcmVzb3VyY2UgcHJvdmlk ZXIgdGhleSBjYW1lCisgICAgICAgIGZyb20gaXMgYWxzbyBkZXN0cm95ZWQuCisKKyAgICAgICAg TWFrZSBhIHNjcm9sbGJhckdlb21ldHJ5IGZ1bmN0aW9uIHRoYXQgd3JhcHMgYWxsIHVzZXMgb2Yg dGhlCisgICAgICAgIG1fZ2VvbWV0cnkgbWVtYmVyIHRvIG1ha2UgaXQgcG9zc2libGUgdG8gdGVz dCBDQ1Njcm9sbGJhckxheWVySW1wbAorICAgICAgICB3aXRob3V0IGRlcGVuZGluZyBvbiBXZWJD b3JlLgorCisgICAgICAgIFRlc3Q6IENDTGF5ZXJUcmVlSG9zdEltcGxUZXN0LmRvbnRVc2VPbGRS ZXNvdXJjZXNBZnRlckxvc3RDb250ZXh0CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ1Njcm9sbGJhckxheWVySW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD Q1Njcm9sbGJhckxheWVySW1wbDo6c2Nyb2xsYmFyR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ1Njcm9sbGJhckxheWVySW1wbDo6YXBwZW5kUXVhZHMp OgorICAgICAgICAoV2ViQ29yZTo6Q0NTY3JvbGxiYXJMYXllckltcGw6OmRpZExvc2VDb250ZXh0 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJhckxh eWVySW1wbC5oOgorICAgICAgICAoQ0NTY3JvbGxiYXJMYXllckltcGwpOgorCiAyMDEyLTA4LTAy ICBBZGR5IE9zbWFuaSAgPGFkZHlvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBSZW5hbWUgJ1VzZXIgYWdlbnQnIHRvICdPdmVycmlkZXMnIGluIHNldHRpbmdzIHNjcmVl bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBjN2IzNmY4NjIxM2E1ZTc4MDBlYWRmZTU0 ZTRlZTZjMzk4ZDhkZTdhLi42OTIyNGY2MWJmMzdjODIwNzZiOTAwMTBhOGU4ZjMyYTc1MmQyZTEz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4LTAy ICBBZHJpZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVt XSBNYWtlIENDU2Nyb2xsYmFyTGF5ZXJJbXBsIGhhbmRsZSBsb3N0IGNvbnRleHRzIHByb3Blcmx5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzAyMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBDQ1Nj cm9sbGJhckxheWVySW1wbCB0byB0aGUgZG9udFVzZU9sZFJlc291cmNlQWZ0ZXJMb3N0Q29udGV4 dAorICAgICAgICB0ZXN0LiBBZGRpdGlvbmFsbHksIG1vZGlmeSB0aGlzIHRlc3Qgc28gdGhhdCBz dGFsZSByZXNvdXJjZSBpZHMKKyAgICAgICAgcHJvcGVybHkgcG9pbnQgYXQgaW52YWxpZCB0ZXh0 dXJlIGlkcyBzbyB0aGF0IHRoZSB0ZXN0IGFjdHVhbGx5IHRlc3RzCisgICAgICAgIHdoYXQgaXQg aXMgc3VwcG9zZWQgdG8gYmUgdGVzdGluZy4KKworICAgICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVl SG9zdEltcGxUZXN0LmNwcDoKKwogMjAxMi0wOC0wMiAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBBZGQgYSBzdHViIGZvciBXZWJWaWV3 OjpnZXRUb3VjaEhpZ2hsaWdodFF1YWRzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFyTGF5ZXJJbXBsLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFyTGF5 ZXJJbXBsLmNwcAppbmRleCA1MDEwZTQ3ZDk3ODAzY2JmMmI4MjNhNzdhNGE3NWE0YTQ3NmJjZDRj Li4wNjJhM2RmZGFiNDc0ZjdjNzBjMTFkMjhjYTFhMTNlZmEyZTM5ZmEzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Njcm9sbGJhckxh eWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NTY3JvbGxiYXJMYXllckltcGwuY3BwCkBAIC04Niw2ICs4NiwxMyBAQCBzdGF0aWMg RmxvYXRSZWN0IHRvVVZSZWN0KGNvbnN0IFdlYlJlY3QmIHIsIGNvbnN0IFdlYlJlY3QmIGJvdW5k cykKICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PGZsb2F0PihyLndpZHRoKSAvIGJv dW5kcy53aWR0aCwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KHIuaGVpZ2h0KSAvIGJvdW5kcy5oZWlnaHQp OwogfQogCit2b2lkIENDU2Nyb2xsYmFyTGF5ZXJJbXBsOjpzY3JvbGxiYXJHZW9tZXRyeShXZWJS ZWN0JiB0aHVtYlJlY3QsIFdlYlJlY3QmIGJhY2tUcmFja1JlY3QsIFdlYlJlY3QmIGZvcmVUcmFj a1JlY3QpCit7CisgICAgbV9nZW9tZXRyeS5zcGxpdFRyYWNrKCZtX3Njcm9sbGJhciwgbV9nZW9t ZXRyeS50cmFja1JlY3QoJm1fc2Nyb2xsYmFyKSwgYmFja1RyYWNrUmVjdCwgdGh1bWJSZWN0LCBm b3JlVHJhY2tSZWN0KTsKKyAgICBpZiAoIW1fZ2VvbWV0cnkuaGFzVGh1bWIoJm1fc2Nyb2xsYmFy KSkKKyAgICAgICAgdGh1bWJSZWN0ID0gV2ViUmVjdCgpOworfQorCiB2b2lkIENDU2Nyb2xsYmFy TGF5ZXJJbXBsOjphcHBlbmRRdWFkcyhDQ1F1YWRTaW5rJiBxdWFkTGlzdCwgY29uc3QgQ0NTaGFy ZWRRdWFkU3RhdGUqIHNoYXJlZFF1YWRTdGF0ZSwgYm9vbCYpCiB7CiAgICAgYm9vbCBwcmVtdWx0 aXBsZWRBbHBoYSA9IGZhbHNlOwpAQCAtOTQsOSArMTAxLDkgQEAgdm9pZCBDQ1Njcm9sbGJhckxh eWVySW1wbDo6YXBwZW5kUXVhZHMoQ0NRdWFkU2luayYgcXVhZExpc3QsIGNvbnN0IENDU2hhcmVk UXVhZFMKICAgICBJbnRSZWN0IGJvdW5kc1JlY3QoSW50UG9pbnQoKSwgY29udGVudEJvdW5kcygp KTsKIAogICAgIFdlYlJlY3QgdGh1bWJSZWN0LCBiYWNrVHJhY2tSZWN0LCBmb3JlVHJhY2tSZWN0 OwotICAgIG1fZ2VvbWV0cnkuc3BsaXRUcmFjaygmbV9zY3JvbGxiYXIsIG1fZ2VvbWV0cnkudHJh Y2tSZWN0KCZtX3Njcm9sbGJhciksIGJhY2tUcmFja1JlY3QsIHRodW1iUmVjdCwgZm9yZVRyYWNr UmVjdCk7CisgICAgc2Nyb2xsYmFyR2VvbWV0cnkodGh1bWJSZWN0LCBiYWNrVHJhY2tSZWN0LCBm b3JlVHJhY2tSZWN0KTsKIAotICAgIGlmIChtX3RodW1iUmVzb3VyY2VJZCAmJiBtX2dlb21ldHJ5 Lmhhc1RodW1iKCZtX3Njcm9sbGJhcikgJiYgIXRodW1iUmVjdC5pc0VtcHR5KCkpIHsKKyAgICBp ZiAobV90aHVtYlJlc291cmNlSWQgJiYgIXRodW1iUmVjdC5pc0VtcHR5KCkpIHsKICAgICAgICAg T3duUHRyPENDVGV4dHVyZURyYXdRdWFkPiBxdWFkID0gQ0NUZXh0dXJlRHJhd1F1YWQ6OmNyZWF0 ZShzaGFyZWRRdWFkU3RhdGUsIEludFJlY3QodGh1bWJSZWN0KSwgbV90aHVtYlJlc291cmNlSWQs IHByZW11bHRpcGxlZEFscGhhLCB1dlJlY3QsIGZsaXBwZWQpOwogICAgICAgICBxdWFkLT5zZXRO ZWVkc0JsZW5kaW5nKCk7CiAgICAgICAgIHF1YWRMaXN0LmFwcGVuZChxdWFkLnJlbGVhc2UoKSk7 CkBAIC0xMTUsNiArMTIyLDEzIEBAIHZvaWQgQ0NTY3JvbGxiYXJMYXllckltcGw6OmFwcGVuZFF1 YWRzKENDUXVhZFNpbmsmIHF1YWRMaXN0LCBjb25zdCBDQ1NoYXJlZFF1YWRTCiAgICAgICAgIHF1 YWRMaXN0LmFwcGVuZChDQ1RleHR1cmVEcmF3UXVhZDo6Y3JlYXRlKHNoYXJlZFF1YWRTdGF0ZSwg SW50UmVjdChib3VuZHNSZWN0KSwgbV9iYWNrVHJhY2tSZXNvdXJjZUlkLCBwcmVtdWx0aXBsZWRB bHBoYSwgdXZSZWN0LCBmbGlwcGVkKSk7CiB9CiAKK3ZvaWQgQ0NTY3JvbGxiYXJMYXllckltcGw6 OmRpZExvc2VDb250ZXh0KCkKK3sKKyAgICBtX2JhY2tUcmFja1Jlc291cmNlSWQgPSAwOworICAg IG1fZm9yZVRyYWNrUmVzb3VyY2VJZCA9IDA7CisgICAgbV90aHVtYlJlc291cmNlSWQgPSAwOwor fQorCiBib29sIENDU2Nyb2xsYmFyTGF5ZXJJbXBsOjpDQ1Njcm9sbGJhcjo6aXNPdmVybGF5KCkg Y29uc3QKIHsKICAgICByZXR1cm4gbV9vd25lci0+bV9pc092ZXJsYXlTY3JvbGxiYXI7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1Nj cm9sbGJhckxheWVySW1wbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NTY3JvbGxiYXJMYXllckltcGwuaAppbmRleCBmMmQyYTJlZjMxZDU4N2I3YjJh MTJjMWIxZmZmZWU0ODM2YjdlM2JkLi4zYmNiOWMxYjMxYTZkODQ3MjM4NmMxYWE2NDUzOWI1ZDRk OTZiNjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ1Njcm9sbGJhckxheWVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xsYmFyTGF5ZXJJbXBsLmgKQEAgLTU0LDkg KzU0LDEzIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBhcHBlbmRRdWFkcyhDQ1F1YWRT aW5rJiwgY29uc3QgQ0NTaGFyZWRRdWFkU3RhdGUqLCBib29sJiBoYWRNaXNzaW5nVGlsZXMpIE9W RVJSSURFOwogCisgICAgdm9pZCBkaWRMb3NlQ29udGV4dCgpIE9WRVJSSURFOworCiBwcm90ZWN0 ZWQ6CiAgICAgZXhwbGljaXQgQ0NTY3JvbGxiYXJMYXllckltcGwoaW50IGlkKTsKIAorICAgIHZp cnR1YWwgdm9pZCBzY3JvbGxiYXJHZW9tZXRyeShXZWJLaXQ6OldlYlJlY3QmIHRodW1iUmVjdCwg V2ViS2l0OjpXZWJSZWN0JiBiYWNrVHJhY2tSZWN0LCBXZWJLaXQ6OldlYlJlY3QmIGZvcmVUcmFj a1JlY3QpOworCiBwcml2YXRlOgogICAgIENDTGF5ZXJJbXBsKiBtX3Njcm9sbExheWVyOwogCkBA IC04Nyw2ICs5MSw3IEBAIHByaXZhdGU6CiAgICAgICAgIENDU2Nyb2xsYmFyTGF5ZXJJbXBsKiBt X293bmVyOwogCiAgICAgfTsKKwogICAgIENDU2Nyb2xsYmFyIG1fc2Nyb2xsYmFyOwogCiAgICAg Q0NSZXNvdXJjZVByb3ZpZGVyOjpSZXNvdXJjZUlkIG1fYmFja1RyYWNrUmVzb3VyY2VJZDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1w bFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJ bXBsVGVzdC5jcHAKaW5kZXggMDA4ZWY4NGJmMWQ1YmU5ODQxODhmZjZiMzRiMDgwNzI5NTM1N2Jk Ny4uYzEyNjc1ZWJlMWJjMWU0ZDNiN2FiYjIyMDAwYWQ5NTViZjMyYjM3OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVz dC5jcHAKQEAgLTIxMjMsMTYgKzIxMjMsNiBAQCBURVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRl c3QsIGZpbmlzaEFsbFJlbmRlcmluZ0FmdGVyQ29udGV4dExvc3QpCiAgICAgbV9ob3N0SW1wbC0+ ZmluaXNoQWxsUmVuZGVyaW5nKCk7CiB9CiAKLWNsYXNzIFNjcm9sbGJhckxheWVyRmFrZVBhaW50 IDogcHVibGljIENDU2Nyb2xsYmFyTGF5ZXJJbXBsIHsKLXB1YmxpYzoKLSAgICBzdGF0aWMgUGFz c093blB0cjxTY3JvbGxiYXJMYXllckZha2VQYWludD4gY3JlYXRlKGludCBpZCkgeyByZXR1cm4g YWRvcHRQdHIobmV3IFNjcm9sbGJhckxheWVyRmFrZVBhaW50KGlkKSk7IH0KLQotICAgIHZpcnR1 YWwgdm9pZCBwYWludChHcmFwaGljc0NvbnRleHQqKSB7IH0KLQotcHJpdmF0ZToKLSAgICBTY3Jv bGxiYXJMYXllckZha2VQYWludChpbnQgaWQpIDogQ0NTY3JvbGxiYXJMYXllckltcGwoaWQpIHsg fQotfTsKLQogLy8gRmFrZSBXZWJHcmFwaGljc0NvbnRleHQzRCB0aGF0IHdpbGwgY2F1c2UgYSBm YWlsdXJlIGlmIHRyeWluZyB0byB1c2UgYQogLy8gcmVzb3VyY2UgdGhhdCB3YXNuJ3QgY3JlYXRl ZCBieSBpdCAocmVzb3VyY2VzIGNyZWF0ZWQgYnkKIC8vIEZha2VXZWJHcmFwaGljc0NvbnRleHQz RCBoYXZlIGFuIGlkIG9mIDEpLgpAQCAtMjI5Miw2ICsyMjgyLDQwIEBAIHB1YmxpYzoKICAgICB9 CiB9OwogCitjbGFzcyBGYWtlU2Nyb2xsYmFyTGF5ZXJJbXBsIDogcHVibGljIENDU2Nyb2xsYmFy TGF5ZXJJbXBsIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUGFzc093blB0cjxGYWtlU2Nyb2xsYmFy TGF5ZXJJbXBsPiBjcmVhdGUoaW50IGlkKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRy KG5ldyBGYWtlU2Nyb2xsYmFyTGF5ZXJJbXBsKGlkKSk7CisgICAgfQorCisgICAgdm9pZCBjcmVh dGVSZXNvdXJjZXMoQ0NSZXNvdXJjZVByb3ZpZGVyKiBwcm92aWRlcikKKyAgICB7CisgICAgICAg IEFTU0VSVChwcm92aWRlcik7CisgICAgICAgIGludCBwb29sID0gMDsKKyAgICAgICAgSW50U2l6 ZSBzaXplKDEwLCAxMCk7CisgICAgICAgIEdDM0RlbnVtIGZvcm1hdCA9IEdyYXBoaWNzQ29udGV4 dDNEOjpSR0JBOworICAgICAgICBDQ1Jlc291cmNlUHJvdmlkZXI6OlRleHR1cmVVc2FnZUhpbnQg aGludCA9IENDUmVzb3VyY2VQcm92aWRlcjo6VGV4dHVyZVVzYWdlQW55OworCisgICAgICAgIHNl dEJhY2tUcmFja1Jlc291cmNlSWQocHJvdmlkZXItPmNyZWF0ZVJlc291cmNlKHBvb2wsIHNpemUs IGZvcm1hdCwgaGludCkpOworICAgICAgICBzZXRGb3JlVHJhY2tSZXNvdXJjZUlkKHByb3ZpZGVy LT5jcmVhdGVSZXNvdXJjZShwb29sLCBzaXplLCBmb3JtYXQsIGhpbnQpKTsKKyAgICAgICAgc2V0 VGh1bWJSZXNvdXJjZUlkKHByb3ZpZGVyLT5jcmVhdGVSZXNvdXJjZShwb29sLCBzaXplLCBmb3Jt YXQsIGhpbnQpKTsKKyAgICB9CisKK3Byb3RlY3RlZDoKKyAgICBleHBsaWNpdCBGYWtlU2Nyb2xs YmFyTGF5ZXJJbXBsKGludCBpZCkKKyAgICAgICAgOiBDQ1Njcm9sbGJhckxheWVySW1wbChpZCkK KyAgICB7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIHNjcm9sbGJhckdlb21ldHJ5KFdlYlJl Y3QmIHRodW1iUmVjdCwgV2ViUmVjdCYgYmFja1RyYWNrUmVjdCwgV2ViUmVjdCYgZm9yZVRyYWNr UmVjdCkgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIHRodW1iUmVjdCA9IFdlYlJlY3QoMCwgNSwg NSwgMik7CisgICAgICAgIGJhY2tUcmFja1JlY3QgPSBXZWJSZWN0KDAsIDUsIDAsIDUpOworICAg ICAgICBmb3JlVHJhY2tSZWN0ID0gV2ViUmVjdCgwLCAwLCAwLCA1KTsKKyAgICB9Cit9OworCiBU RVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIGRvbnRVc2VPbGRSZXNvdXJjZXNBZnRlckxv c3RDb250ZXh0KQogewogICAgIE93blB0cjxDQ0xheWVySW1wbD4gcm9vdExheWVyKENDTGF5ZXJJ bXBsOjpjcmVhdGUoMSkpOwpAQCAtMjM0NCw2ICsyMzY4LDE1IEBAIFRFU1RfRihDQ0xheWVyVHJl ZUhvc3RJbXBsVGVzdCwgZG9udFVzZU9sZFJlc291cmNlc0FmdGVyTG9zdENvbnRleHQpCiAgICAg aHVkTGF5ZXItPnNldExheWVyVHJlZUhvc3RJbXBsKG1faG9zdEltcGwuZ2V0KCkpOwogICAgIHJv b3RMYXllci0+YWRkQ2hpbGQoaHVkTGF5ZXIucmVsZWFzZSgpKTsKIAorICAgIE93blB0cjxGYWtl U2Nyb2xsYmFyTGF5ZXJJbXBsPiBzY3JvbGxiYXJMYXllcihGYWtlU2Nyb2xsYmFyTGF5ZXJJbXBs OjpjcmVhdGUoNykpOworICAgIHNjcm9sbGJhckxheWVyLT5zZXRMYXllclRyZWVIb3N0SW1wbCht X2hvc3RJbXBsLmdldCgpKTsKKyAgICBzY3JvbGxiYXJMYXllci0+c2V0Qm91bmRzKEludFNpemUo MTAsIDEwKSk7CisgICAgc2Nyb2xsYmFyTGF5ZXItPnNldENvbnRlbnRCb3VuZHMoSW50U2l6ZSgx MCwgMTApKTsKKyAgICBzY3JvbGxiYXJMYXllci0+c2V0RHJhd3NDb250ZW50KHRydWUpOworICAg IHNjcm9sbGJhckxheWVyLT5zZXRMYXllclRyZWVIb3N0SW1wbChtX2hvc3RJbXBsLmdldCgpKTsK KyAgICBzY3JvbGxiYXJMYXllci0+Y3JlYXRlUmVzb3VyY2VzKG1faG9zdEltcGwtPnJlc291cmNl UHJvdmlkZXIoKSk7CisgICAgcm9vdExheWVyLT5hZGRDaGlsZChzY3JvbGxiYXJMYXllci5yZWxl YXNlKCkpOworCiAgICAgLy8gVXNlIGEgY29udGV4dCB0aGF0IHN1cHBvcnRzIElPU3VyZmFjZXMK ICAgICBtX2hvc3RJbXBsLT5pbml0aWFsaXplTGF5ZXJSZW5kZXJlcihDQ0dyYXBoaWNzQ29udGV4 dDo6Y3JlYXRlM0QoYWRvcHRQdHIobmV3IEZha2VXZWJHcmFwaGljc0NvbnRleHQzRFdpdGhJT1N1 cmZhY2UpKSwgVW50aHJvdHRsZWRVcGxvYWRlcik7CiAKQEAgLTIzNTUsOSArMjM4OCwxNyBAQCBU RVNUX0YoQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QsIGRvbnRVc2VPbGRSZXNvdXJjZXNBZnRlckxv c3RDb250ZXh0KQogICAgIG1faG9zdEltcGwtPmRpZERyYXdBbGxMYXllcnMoZnJhbWUpOwogICAg IG1faG9zdEltcGwtPnN3YXBCdWZmZXJzKCk7CiAKKyAgICB1bnNpZ25lZCBudW1SZXNvdXJjZXMg PSBtX2hvc3RJbXBsLT5yZXNvdXJjZVByb3ZpZGVyKCktPm51bVJlc291cmNlcygpOworCiAgICAg Ly8gTG9zZSB0aGUgY29udGV4dCwgcmVwbGFjaW5nIGl0IHdpdGggYSBTdHJpY3RXZWJHcmFwaGlj c0NvbnRleHQzRFdpdGhJT1N1cmZhY2UsCiAgICAgLy8gdGhhdCB3aWxsIHdhcm4gaWYgYW55IHJl c291cmNlIGZyb20gdGhlIHByZXZpb3VzIGNvbnRleHQgZ2V0cyB1c2VkLgogICAgIG1faG9zdElt cGwtPmluaXRpYWxpemVMYXllclJlbmRlcmVyKENDR3JhcGhpY3NDb250ZXh0OjpjcmVhdGUzRChh ZG9wdFB0cihuZXcgU3RyaWN0V2ViR3JhcGhpY3NDb250ZXh0M0RXaXRoSU9TdXJmYWNlKSksIFVu dGhyb3R0bGVkVXBsb2FkZXIpOworCisgICAgLy8gQ3JlYXRlIGR1bW15IHJlc291cmNlcyBzbyB0 aGF0IGxvb2tpbmcgdXAgYW4gb2xkIHJlc291cmNlIHdpbGwgZ2V0IGFuCisgICAgLy8gaW52YWxp ZCB0ZXh0dXJlIGlkIG1hcHBpbmcuCisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bVJl c291cmNlczsgKytpKQorICAgICAgICBtX2hvc3RJbXBsLT5yZXNvdXJjZVByb3ZpZGVyKCktPmNy ZWF0ZVJlc291cmNlRnJvbUV4dGVybmFsVGV4dHVyZSgxKTsKKwogICAgIEVYUEVDVF9UUlVFKG1f aG9zdEltcGwtPnByZXBhcmVUb0RyYXcoZnJhbWUpKTsKICAgICBtX2hvc3RJbXBsLT5kcmF3TGF5 ZXJzKGZyYW1lKTsKICAgICBtX2hvc3RJbXBsLT5kaWREcmF3QWxsTGF5ZXJzKGZyYW1lKTsK