114275 2013-04-09 06:11:09 -0700 [BlackBerry] Accelerated compositing debug rectangle incorrectly drawn for layers with surfaces 2013-04-11 07:26:35 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson anlo cgarcia commit-queue jpetsovits mifenton rwlbuis tonikitoo xan.lopez oldest_to_newest 871718 0 anilsson 2013-04-09 06:11:09 -0700 PR 323746 873734 1 197569 anilsson 2013-04-11 04:02:14 -0700 Created attachment 197569 Patch 873741 2 197569 cgarcia 2013-04-11 04:10:11 -0700 Comment on attachment 197569 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197569&action=review Looks good. > Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp:598 > + // If we're rendering to a surface, don't include debug border inside the surface Finish comments with a period. ;-) > Source/WebCore/platform/graphics/blackberry/LayerRendererSurface.cpp:67 > +FloatQuad LayerRendererSurface::getTransformedBounds() const getFoo is typically used for methods that return the value as an out parameter. Sou you could either pass the FloatQuad as a reference and keep the name or rename it to transformedBounds(). I this case passing it as a reference we safe a copy, I think. 873745 3 anilsson 2013-04-11 04:13:07 -0700 (In reply to comment #2) > (From update of attachment 197569 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=197569&action=review > > Looks good. > > > Source/WebCore/platform/graphics/blackberry/LayerRenderer.cpp:598 > > + // If we're rendering to a surface, don't include debug border inside the surface > > Finish comments with a period. ;-) > > > Source/WebCore/platform/graphics/blackberry/LayerRendererSurface.cpp:67 > > +FloatQuad LayerRendererSurface::getTransformedBounds() const > > getFoo is typically used for methods that return the value as an out parameter. Sou you could either pass the FloatQuad as a reference and keep the name or rename it to transformedBounds(). I this case passing it as a reference we safe a copy, I think. I copied LayerCompositingThread::getTransformedBounds() which does return a reference and I guess thus deserves the "get" prefix. The LayerRendererSurface doesn't bother with caching the transformed bounds and can't return a reference. It's not worth caching them either, so let's just drop the "get" bit. 873746 4 197572 anilsson 2013-04-11 04:18:38 -0700 Created attachment 197572 Patch 873747 5 anilsson 2013-04-11 04:21:40 -0700 I was under the impression that WebKit coding style guidelines sometimes allows using the "get" prefix when some more computation is required than just returning the value of a data member, for example when a hash map lookup or other extra work is needed. Maybe that's just something I imagined =) 873749 6 anilsson 2013-04-11 04:23:42 -0700 (In reply to comment #5) > I was under the impression that WebKit coding style guidelines sometimes allows using the "get" prefix when some more computation is required than just returning the value of a data member, for example when a hash map lookup or other extra work is needed. Maybe that's just something I imagined =) That was just my imagination, the coding style guidelines only talks about using "get" when the method has out parameters. 873793 7 197572 anilsson 2013-04-11 06:54:28 -0700 Comment on attachment 197572 Patch Thanks for the review, I should have a look at the code here and see what other getters should have their "get" prefix removed. 873804 8 197572 commit-queue 2013-04-11 07:26:33 -0700 Comment on attachment 197572 Patch Clearing flags on attachment: 197572 Committed r148200: <http://trac.webkit.org/changeset/148200> 873805 9 commit-queue 2013-04-11 07:26:35 -0700 All reviewed patches have been landed. Closing bug. 197569 2013-04-11 04:02:14 -0700 2013-04-11 04:18:33 -0700 Patch bug-114275-20130411130151.patch text/plain 5711 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM4ZDg1NzI5NDA5OGEy ZTZiM2VkNWU1YzMxZTM0ODVhZGY1ZDgwYi4uNzBlNjE5MmFkMDcxMWRiNDc5YjNmYTQ4ZDM1NGQ1 YzBlZmRiZDJiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDEzLTA0LTExICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KIAorICAgICAgICBbQmxhY2tCZXJyeV0gQWNj ZWxlcmF0ZWQgY29tcG9zaXRpbmcgZGVidWcgcmVjdGFuZ2xlIGluY29ycmVjdGx5IGRyYXduIGZv ciBsYXllcnMgd2l0aCBzdXJmYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE0Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIGRyYXdEZWJ1Z0JvcmRlciBtZXRob2Qgd2FzIHVwZGF0ZWQgdG8g bWlycm9yIHRoZSBsb2dpYyBpbgorICAgICAgICBjb21wb3NpdGVMYXllcnNSZWN1cnNpdmUsIGku ZS4gaWYgd2UncmUgY29tcG9zaXRpbmcgYSBzdXJmYWNlIHRvIHRoZQorICAgICAgICBzY3JlZW4s IHVzZSB0aGUgdHJhbnNmb3JtZWQgYm91bmRzIHN0b3JlZCBpbiB0aGUgc3VyZmFjZS4gVGhlIGJv dW5kcworICAgICAgICBzdG9yZWQgaW4gdGhlIGxheWVyIHNob3VsZCBvbmx5IGJlIHVzZWQgd2hl biBkcmF3aW5nIHRoZSBsYXllciB0byB0aGUKKyAgICAgICAgc3VyZmFjZS4KKworICAgICAgICBT cGVha2luZyBvZiB3aGljaCwgYWxzbyB1cGRhdGUgdGhlIGNvZGUgdG8gc2tpcCBib3JkZXIgZHJh d2luZyB3aGVuCisgICAgICAgIGRyYXdpbmcgYSBsYXllciB0byBhIHN1cmZhY2UuIERyYXdpbmcg dGhlIGJvcmRlcnMgaW5zaWRlIHRoZSBzdXJmYWNlCisgICAgICAgIHdvdWxkIG9ubHkgcmVzdWx0 IGluIG1lc3NpbmcgdXAgdGhlIHN1cmZhY2UgY29udGVudHMsIGVzcGVjaWFsbHkgd2hlbgorICAg ICAgICBDU1MgZmlsdGVycyBsaWtlIGJsdXIgd2VyZSB0aGUgcmVhc29uIGZvciBoYXZpbmcgYSBz dXJmYWNlIGluIHRoZSBmaXJzdAorICAgICAgICBwbGFjZSAtIHRoZSBib3JkZXIgd291bGQgYmUg Ymx1cnJlZCBhbmQgaGFyZCB0byBkaXNjZXJuLgorCisgICAgICAgIE9ubHkgbWFudWFsbHkgdGVz dGFibGUsIHRoZSBkZWJ1ZyBib3JkZXIgaXMgZGlzYWJsZWQgZHVyaW5nIGxheW91dAorICAgICAg ICB0ZXN0cy4KKworICAgICAgICBQUiAzMjM3NDYKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXll clJlbmRlcmVyOjpkcmF3RGVidWdCb3JkZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlclN1cmZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5ZXJSZW5kZXJlclN1cmZhY2U6OmRyYXdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy UmVuZGVyZXJTdXJmYWNlOjpnZXRUcmFuc2Zvcm1lZEJvdW5kcyk6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXJT dXJmYWNlLmg6CisgICAgICAgIChMYXllclJlbmRlcmVyU3VyZmFjZSk6CisKKzIwMTMtMDQtMTEg IEFydmlkIE5pbHNzb24gIDxhbmlsc3NvbkByaW0uY29tPgorCiAgICAgICAgIFtCbGFja0JlcnJ5 XVtDU1MgRmlsdGVyc10gQmx1ciBmaWx0ZXIgZmFpbHMgdG8gcmVjb21wdXRlIGJsdXIgc2l6ZSB3 aGVuIGxheWVyIHNpemUgY2hhbmdlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE0MjcyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwCmluZGV4IGE1 NzZjYTRkNmZjMDJkMDU3YWJjNTIzOGQ1YzMyNGZmZWE3OTk5MDguLmMzOWE3NWQyMTNlNjRlMjU0 MGYyZDUwZGJkMGJjNzFjNWQzNDVjZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyLmNwcApAQCAt NTk1LDggKzU5NSwxOCBAQCB2b2lkIExheWVyUmVuZGVyZXI6OmRyYXdEZWJ1Z0JvcmRlcihMYXll ckNvbXBvc2l0aW5nVGhyZWFkKiBsYXllcikKICAgICB9IGVsc2UKICAgICAgICAgZ2xEaXNhYmxl KEdMX0JMRU5EKTsKIAorICAgIC8vIElmIHdlJ3JlIHJlbmRlcmluZyB0byBhIHN1cmZhY2UsIGRv bid0IGluY2x1ZGUgZGVidWcgYm9yZGVyIGluc2lkZSB0aGUgc3VyZmFjZQorICAgIGlmIChtX2N1 cnJlbnRMYXllclJlbmRlcmVyU3VyZmFjZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRmxvYXRR dWFkIHRyYW5zZm9ybWVkQm91bmRzOworICAgIGlmIChsYXllckFscmVhZHlPblN1cmZhY2UobGF5 ZXIpKQorICAgICAgICB0cmFuc2Zvcm1lZEJvdW5kcyA9IGxheWVyLT5sYXllclJlbmRlcmVyU3Vy ZmFjZSgpLT5nZXRUcmFuc2Zvcm1lZEJvdW5kcygpOworICAgIGVsc2UKKyAgICAgICAgdHJhbnNm b3JtZWRCb3VuZHMgPSBsYXllci0+Z2V0VHJhbnNmb3JtZWRCb3VuZHMoKTsKKwogICAgIGNvbnN0 IEdMRVMyUHJvZ3JhbSYgcHJvZ3JhbSA9IHVzZVByb2dyYW0oQ29sb3JQcm9ncmFtKTsKLSAgICBn bFZlcnRleEF0dHJpYlBvaW50ZXIocHJvZ3JhbS5wb3NpdGlvbkxvY2F0aW9uKCksIDIsIEdMX0ZM T0FULCBHTF9GQUxTRSwgMCwgJmxheWVyLT5nZXRUcmFuc2Zvcm1lZEJvdW5kcygpKTsKKyAgICBn bFZlcnRleEF0dHJpYlBvaW50ZXIocHJvZ3JhbS5wb3NpdGlvbkxvY2F0aW9uKCksIDIsIEdMX0ZM T0FULCBHTF9GQUxTRSwgMCwgJnRyYW5zZm9ybWVkQm91bmRzKTsKICAgICBnbFVuaWZvcm00Ziht X2NvbG9yQ29sb3JMb2NhdGlvbiwgYm9yZGVyQ29sb3IucmVkKCkgLyAyNTUuMCwgYm9yZGVyQ29s b3IuZ3JlZW4oKSAvIDI1NS4wLCBib3JkZXJDb2xvci5ibHVlKCkgLyAyNTUuMCwgMSk7CiAKICAg ICBnbExpbmVXaWR0aChzdGQ6Om1heCgxLjBmLCBsYXllci0+Ym9yZGVyV2lkdGgoKSkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXll clJlbmRlcmVyU3VyZmFjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L0xheWVyUmVuZGVyZXJTdXJmYWNlLmNwcAppbmRleCA5MTJjYmJhYzVlODI0YzFm ZGYwMjFkOTM4ZTg1YWJjN2QwYWVmY2NjLi43MjQ1MzgyNWYwYjVhOTkyY2IxZWZjZGI5ZTVmNGJi NmM5YjFkZjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L0xheWVyUmVuZGVyZXJTdXJmYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXJTdXJmYWNlLmNwcApAQCAt NTAsMTMgKzUwLDcgQEAgRmxvYXRSZWN0IExheWVyUmVuZGVyZXJTdXJmYWNlOjpkcmF3UmVjdCgp IGNvbnN0CiAgICAgZmxvYXQgYnggPSBtX3NpemUud2lkdGgoKSAvIDIuMDsKICAgICBmbG9hdCBi eSA9IG1fc2l6ZS5oZWlnaHQoKSAvIDIuMDsKIAotICAgIEZsb2F0UXVhZCB0cmFuc2Zvcm1lZEJv dW5kczsKLSAgICB0cmFuc2Zvcm1lZEJvdW5kcy5zZXRQMShtX2RyYXdUcmFuc2Zvcm0ubWFwUG9p bnQoRmxvYXRQb2ludCgtYngsIC1ieSkpKTsKLSAgICB0cmFuc2Zvcm1lZEJvdW5kcy5zZXRQMiht X2RyYXdUcmFuc2Zvcm0ubWFwUG9pbnQoRmxvYXRQb2ludCgtYngsIGJ5KSkpOwotICAgIHRyYW5z Zm9ybWVkQm91bmRzLnNldFAzKG1fZHJhd1RyYW5zZm9ybS5tYXBQb2ludChGbG9hdFBvaW50KGJ4 LCBieSkpKTsKLSAgICB0cmFuc2Zvcm1lZEJvdW5kcy5zZXRQNChtX2RyYXdUcmFuc2Zvcm0ubWFw UG9pbnQoRmxvYXRQb2ludChieCwgLWJ5KSkpOwotCi0gICAgRmxvYXRSZWN0IHJlY3QgPSB0cmFu c2Zvcm1lZEJvdW5kcy5ib3VuZGluZ0JveCgpOworICAgIEZsb2F0UmVjdCByZWN0ID0gZ2V0VHJh bnNmb3JtZWRCb3VuZHMoKS5ib3VuZGluZ0JveCgpOwogCiAgICAgaWYgKG1fb3duZXJMYXllci0+ cmVwbGljYUxheWVyKCkpIHsKICAgICAgICAgRmxvYXRRdWFkIGJvdW5kczsKQEAgLTcwLDYgKzY0 LDIwIEBAIEZsb2F0UmVjdCBMYXllclJlbmRlcmVyU3VyZmFjZTo6ZHJhd1JlY3QoKSBjb25zdAog ICAgIHJldHVybiByZWN0OwogfQogCitGbG9hdFF1YWQgTGF5ZXJSZW5kZXJlclN1cmZhY2U6Omdl dFRyYW5zZm9ybWVkQm91bmRzKCkgY29uc3QKK3sKKyAgICBmbG9hdCBieCA9IG1fc2l6ZS53aWR0 aCgpIC8gMi4wOworICAgIGZsb2F0IGJ5ID0gbV9zaXplLmhlaWdodCgpIC8gMi4wOworCisgICAg RmxvYXRRdWFkIHRyYW5zZm9ybWVkQm91bmRzOworICAgIHRyYW5zZm9ybWVkQm91bmRzLnNldFAx KG1fZHJhd1RyYW5zZm9ybS5tYXBQb2ludChGbG9hdFBvaW50KC1ieCwgLWJ5KSkpOworICAgIHRy YW5zZm9ybWVkQm91bmRzLnNldFAyKG1fZHJhd1RyYW5zZm9ybS5tYXBQb2ludChGbG9hdFBvaW50 KC1ieCwgYnkpKSk7CisgICAgdHJhbnNmb3JtZWRCb3VuZHMuc2V0UDMobV9kcmF3VHJhbnNmb3Jt Lm1hcFBvaW50KEZsb2F0UG9pbnQoYngsIGJ5KSkpOworICAgIHRyYW5zZm9ybWVkQm91bmRzLnNl dFA0KG1fZHJhd1RyYW5zZm9ybS5tYXBQb2ludChGbG9hdFBvaW50KGJ4LCAtYnkpKSk7CisKKyAg ICByZXR1cm4gdHJhbnNmb3JtZWRCb3VuZHM7Cit9CisKIGJvb2wgTGF5ZXJSZW5kZXJlclN1cmZh Y2U6OmVuc3VyZVRleHR1cmUoKQogewogICAgIGlmICghbV90ZXh0dXJlKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVy U3VyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9M YXllclJlbmRlcmVyU3VyZmFjZS5oCmluZGV4IGVmOWQ2OTE1OTdlMzRjZmQzYzllZDE1MTRmYjRj YTVlNzgwMGVhYzIuLmM0ZDI3ODkzY2JhZTFjOWUzZjQyNTRhMjA2MWJkNGZiMDVjZTgxMGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5 ZXJSZW5kZXJlclN1cmZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXJTdXJmYWNlLmgKQEAgLTUxLDYgKzUxLDcgQEAgcHVi bGljOgogICAgIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiByZXBsaWNhRHJhd1RyYW5zZm9y bSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVwbGljYURyYXdUcmFuc2Zvcm07IH0KIAogICAgIEZsb2F0 UmVjdCBkcmF3UmVjdCgpIGNvbnN0OworICAgIEZsb2F0UXVhZCBnZXRUcmFuc2Zvcm1lZEJvdW5k cygpIGNvbnN0OwogCiAgICAgYm9vbCBlbnN1cmVUZXh0dXJlKCk7CiAgICAgdm9pZCByZWxlYXNl VGV4dHVyZSgpOwo= 197572 2013-04-11 04:18:38 -0700 2013-04-11 07:26:33 -0700 Patch bug-114275-20130411131815.patch text/plain 5638 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM4ZDg1NzI5NDA5OGEy ZTZiM2VkNWU1YzMxZTM0ODVhZGY1ZDgwYi4uZmJjNjhjODMxMzk4YTMyODE3ZGNlYmVmNDEyNDhj MzJkMDU1NDBjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDEzLTA0LTExICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KIAorICAgICAgICBbQmxhY2tCZXJyeV0gQWNj ZWxlcmF0ZWQgY29tcG9zaXRpbmcgZGVidWcgcmVjdGFuZ2xlIGluY29ycmVjdGx5IGRyYXduIGZv ciBsYXllcnMgd2l0aCBzdXJmYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE0Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIGRyYXdEZWJ1Z0JvcmRlciBtZXRob2Qgd2FzIHVwZGF0ZWQgdG8g bWlycm9yIHRoZSBsb2dpYyBpbgorICAgICAgICBjb21wb3NpdGVMYXllcnNSZWN1cnNpdmUsIGku ZS4gaWYgd2UncmUgY29tcG9zaXRpbmcgYSBzdXJmYWNlIHRvIHRoZQorICAgICAgICBzY3JlZW4s IHVzZSB0aGUgdHJhbnNmb3JtZWQgYm91bmRzIHN0b3JlZCBpbiB0aGUgc3VyZmFjZS4gVGhlIGJv dW5kcworICAgICAgICBzdG9yZWQgaW4gdGhlIGxheWVyIHNob3VsZCBvbmx5IGJlIHVzZWQgd2hl biBkcmF3aW5nIHRoZSBsYXllciB0byB0aGUKKyAgICAgICAgc3VyZmFjZS4KKworICAgICAgICBT cGVha2luZyBvZiB3aGljaCwgYWxzbyB1cGRhdGUgdGhlIGNvZGUgdG8gc2tpcCBib3JkZXIgZHJh d2luZyB3aGVuCisgICAgICAgIGRyYXdpbmcgYSBsYXllciB0byBhIHN1cmZhY2UuIERyYXdpbmcg dGhlIGJvcmRlcnMgaW5zaWRlIHRoZSBzdXJmYWNlCisgICAgICAgIHdvdWxkIG9ubHkgcmVzdWx0 IGluIG1lc3NpbmcgdXAgdGhlIHN1cmZhY2UgY29udGVudHMsIGVzcGVjaWFsbHkgd2hlbgorICAg ICAgICBDU1MgZmlsdGVycyBsaWtlIGJsdXIgd2VyZSB0aGUgcmVhc29uIGZvciBoYXZpbmcgYSBz dXJmYWNlIGluIHRoZSBmaXJzdAorICAgICAgICBwbGFjZSAtIHRoZSBib3JkZXIgd291bGQgYmUg Ymx1cnJlZCBhbmQgaGFyZCB0byBkaXNjZXJuLgorCisgICAgICAgIE9ubHkgbWFudWFsbHkgdGVz dGFibGUsIHRoZSBkZWJ1ZyBib3JkZXIgaXMgZGlzYWJsZWQgZHVyaW5nIGxheW91dAorICAgICAg ICB0ZXN0cy4KKworICAgICAgICBQUiAzMjM3NDYKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXll clJlbmRlcmVyOjpkcmF3RGVidWdCb3JkZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlclN1cmZhY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5ZXJSZW5kZXJlclN1cmZhY2U6OmRyYXdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy UmVuZGVyZXJTdXJmYWNlOjp0cmFuc2Zvcm1lZEJvdW5kcyk6IEFkZGVkLgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRl cmVyU3VyZmFjZS5oOgorICAgICAgICAoTGF5ZXJSZW5kZXJlclN1cmZhY2UpOgorCisyMDEzLTA0 LTExICBBcnZpZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKwogICAgICAgICBbQmxhY2tC ZXJyeV1bQ1NTIEZpbHRlcnNdIEJsdXIgZmlsdGVyIGZhaWxzIHRvIHJlY29tcHV0ZSBibHVyIHNp emUgd2hlbiBsYXllciBzaXplIGNoYW5nZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDI3MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyLmNwcAppbmRl eCBhNTc2Y2E0ZDZmYzAyZDA1N2FiYzUyMzhkNWMzMjRmZmVhNzk5OTA4Li44NWM2MWUwNzU4ZjU1 M2JlMTBhYTVjNTk5ZGRkOGRiZTNkYTU5NjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlci5jcHAK QEAgLTU5NSw4ICs1OTUsMTggQEAgdm9pZCBMYXllclJlbmRlcmVyOjpkcmF3RGVidWdCb3JkZXIo TGF5ZXJDb21wb3NpdGluZ1RocmVhZCogbGF5ZXIpCiAgICAgfSBlbHNlCiAgICAgICAgIGdsRGlz YWJsZShHTF9CTEVORCk7CiAKKyAgICAvLyBJZiB3ZSdyZSByZW5kZXJpbmcgdG8gYSBzdXJmYWNl LCBkb24ndCBpbmNsdWRlIGRlYnVnIGJvcmRlciBpbnNpZGUgdGhlIHN1cmZhY2UuCisgICAgaWYg KG1fY3VycmVudExheWVyUmVuZGVyZXJTdXJmYWNlKQorICAgICAgICByZXR1cm47CisKKyAgICBG bG9hdFF1YWQgdHJhbnNmb3JtZWRCb3VuZHM7CisgICAgaWYgKGxheWVyQWxyZWFkeU9uU3VyZmFj ZShsYXllcikpCisgICAgICAgIHRyYW5zZm9ybWVkQm91bmRzID0gbGF5ZXItPmxheWVyUmVuZGVy ZXJTdXJmYWNlKCktPnRyYW5zZm9ybWVkQm91bmRzKCk7CisgICAgZWxzZQorICAgICAgICB0cmFu c2Zvcm1lZEJvdW5kcyA9IGxheWVyLT5nZXRUcmFuc2Zvcm1lZEJvdW5kcygpOworCiAgICAgY29u c3QgR0xFUzJQcm9ncmFtJiBwcm9ncmFtID0gdXNlUHJvZ3JhbShDb2xvclByb2dyYW0pOwotICAg IGdsVmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLnBvc2l0aW9uTG9jYXRpb24oKSwgMiwgR0xf RkxPQVQsIEdMX0ZBTFNFLCAwLCAmbGF5ZXItPmdldFRyYW5zZm9ybWVkQm91bmRzKCkpOworICAg IGdsVmVydGV4QXR0cmliUG9pbnRlcihwcm9ncmFtLnBvc2l0aW9uTG9jYXRpb24oKSwgMiwgR0xf RkxPQVQsIEdMX0ZBTFNFLCAwLCAmdHJhbnNmb3JtZWRCb3VuZHMpOwogICAgIGdsVW5pZm9ybTRm KG1fY29sb3JDb2xvckxvY2F0aW9uLCBib3JkZXJDb2xvci5yZWQoKSAvIDI1NS4wLCBib3JkZXJD b2xvci5ncmVlbigpIC8gMjU1LjAsIGJvcmRlckNvbG9yLmJsdWUoKSAvIDI1NS4wLCAxKTsKIAog ICAgIGdsTGluZVdpZHRoKHN0ZDo6bWF4KDEuMGYsIGxheWVyLT5ib3JkZXJXaWR0aCgpKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xh eWVyUmVuZGVyZXJTdXJmYWNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlclN1cmZhY2UuY3BwCmluZGV4IDkxMmNiYmFjNWU4MjRj MWZkZjAyMWQ5MzhlODVhYmM3ZDBhZWZjY2MuLjNmZjA3OGFkNzViYTgwYWJiMGY5YzVhMDU0M2Fj NDk0YWYzNWUwNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlclN1cmZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJSZW5kZXJlclN1cmZhY2UuY3BwCkBA IC01MCwxMyArNTAsNyBAQCBGbG9hdFJlY3QgTGF5ZXJSZW5kZXJlclN1cmZhY2U6OmRyYXdSZWN0 KCkgY29uc3QKICAgICBmbG9hdCBieCA9IG1fc2l6ZS53aWR0aCgpIC8gMi4wOwogICAgIGZsb2F0 IGJ5ID0gbV9zaXplLmhlaWdodCgpIC8gMi4wOwogCi0gICAgRmxvYXRRdWFkIHRyYW5zZm9ybWVk Qm91bmRzOwotICAgIHRyYW5zZm9ybWVkQm91bmRzLnNldFAxKG1fZHJhd1RyYW5zZm9ybS5tYXBQ b2ludChGbG9hdFBvaW50KC1ieCwgLWJ5KSkpOwotICAgIHRyYW5zZm9ybWVkQm91bmRzLnNldFAy KG1fZHJhd1RyYW5zZm9ybS5tYXBQb2ludChGbG9hdFBvaW50KC1ieCwgYnkpKSk7Ci0gICAgdHJh bnNmb3JtZWRCb3VuZHMuc2V0UDMobV9kcmF3VHJhbnNmb3JtLm1hcFBvaW50KEZsb2F0UG9pbnQo YngsIGJ5KSkpOwotICAgIHRyYW5zZm9ybWVkQm91bmRzLnNldFA0KG1fZHJhd1RyYW5zZm9ybS5t YXBQb2ludChGbG9hdFBvaW50KGJ4LCAtYnkpKSk7Ci0KLSAgICBGbG9hdFJlY3QgcmVjdCA9IHRy YW5zZm9ybWVkQm91bmRzLmJvdW5kaW5nQm94KCk7CisgICAgRmxvYXRSZWN0IHJlY3QgPSB0cmFu c2Zvcm1lZEJvdW5kcygpLmJvdW5kaW5nQm94KCk7CiAKICAgICBpZiAobV9vd25lckxheWVyLT5y ZXBsaWNhTGF5ZXIoKSkgewogICAgICAgICBGbG9hdFF1YWQgYm91bmRzOwpAQCAtNzAsNiArNjQs MjAgQEAgRmxvYXRSZWN0IExheWVyUmVuZGVyZXJTdXJmYWNlOjpkcmF3UmVjdCgpIGNvbnN0CiAg ICAgcmV0dXJuIHJlY3Q7CiB9CiAKK0Zsb2F0UXVhZCBMYXllclJlbmRlcmVyU3VyZmFjZTo6dHJh bnNmb3JtZWRCb3VuZHMoKSBjb25zdAoreworICAgIGZsb2F0IGJ4ID0gbV9zaXplLndpZHRoKCkg LyAyLjA7CisgICAgZmxvYXQgYnkgPSBtX3NpemUuaGVpZ2h0KCkgLyAyLjA7CisKKyAgICBGbG9h dFF1YWQgYm91bmRzOworICAgIGJvdW5kcy5zZXRQMShtX2RyYXdUcmFuc2Zvcm0ubWFwUG9pbnQo RmxvYXRQb2ludCgtYngsIC1ieSkpKTsKKyAgICBib3VuZHMuc2V0UDIobV9kcmF3VHJhbnNmb3Jt Lm1hcFBvaW50KEZsb2F0UG9pbnQoLWJ4LCBieSkpKTsKKyAgICBib3VuZHMuc2V0UDMobV9kcmF3 VHJhbnNmb3JtLm1hcFBvaW50KEZsb2F0UG9pbnQoYngsIGJ5KSkpOworICAgIGJvdW5kcy5zZXRQ NChtX2RyYXdUcmFuc2Zvcm0ubWFwUG9pbnQoRmxvYXRQb2ludChieCwgLWJ5KSkpOworCisgICAg cmV0dXJuIGJvdW5kczsKK30KKwogYm9vbCBMYXllclJlbmRlcmVyU3VyZmFjZTo6ZW5zdXJlVGV4 dHVyZSgpCiB7CiAgICAgaWYgKCFtX3RleHR1cmUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXJTdXJmYWNlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyUmVuZGVyZXJT dXJmYWNlLmgKaW5kZXggZWY5ZDY5MTU5N2UzNGNmZDNjOWVkMTUxNGZiNGNhNWU3ODAwZWFjMi4u ZTg5Njk1NTFhODc0MjhkZDJiOTU4NzhmNGE5ZTU0MzBlM2Y2ZTAyOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllclJlbmRlcmVyU3Vy ZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv TGF5ZXJSZW5kZXJlclN1cmZhY2UuaApAQCAtNTEsNiArNTEsNyBAQCBwdWJsaWM6CiAgICAgY29u c3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIHJlcGxpY2FEcmF3VHJhbnNmb3JtKCkgY29uc3QgeyBy ZXR1cm4gbV9yZXBsaWNhRHJhd1RyYW5zZm9ybTsgfQogCiAgICAgRmxvYXRSZWN0IGRyYXdSZWN0 KCkgY29uc3Q7CisgICAgRmxvYXRRdWFkIHRyYW5zZm9ybWVkQm91bmRzKCkgY29uc3Q7CiAKICAg ICBib29sIGVuc3VyZVRleHR1cmUoKTsKICAgICB2b2lkIHJlbGVhc2VUZXh0dXJlKCk7Cg==