81730 2012-03-20 20:20:37 -0700 [chromium] Use origin transform to transform occlusion from surface content space to its target content space 2012-03-20 22:29:21 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj backer cc-bugs dglazkov enne jamesr piman webkit.review.bot oldest_to_newest 583732 0 danakj 2012-03-20 20:20:37 -0700 [chromium] Use origin transform to transform occlusion from surface content space to its target content space 583741 1 danakj 2012-03-20 20:27:44 -0700 I was doing some weird mojo to use the surface draw transform, which is centered in the surface clip rect. Anyhow it was lot of nonsense based in my misunderstandings. All I needed to do was use the origin transform! 583742 2 132955 danakj 2012-03-20 20:27:51 -0700 Created attachment 132955 Patch 583743 3 danakj 2012-03-20 20:28:21 -0700 This fixes android.com 583756 4 132955 danakj 2012-03-20 20:53:52 -0700 Comment on attachment 132955 Patch Oops broken unit test 583770 5 132955 webkit.review.bot 2012-03-20 21:10:24 -0700 Comment on attachment 132955 Patch Attachment 132955 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/12066165 583778 6 132965 danakj 2012-03-20 21:23:14 -0700 Created attachment 132965 Patch Fixed unit test 583803 7 132965 enne 2012-03-20 21:55:55 -0700 Comment on attachment 132965 Patch The new code looks way better. R=me. 583821 8 132965 webkit.review.bot 2012-03-20 22:29:15 -0700 Comment on attachment 132965 Patch Clearing flags on attachment: 132965 Committed r111502: <http://trac.webkit.org/changeset/111502> 583822 9 webkit.review.bot 2012-03-20 22:29:21 -0700 All reviewed patches have been landed. Closing bug. 132955 2012-03-20 20:27:51 -0700 2012-03-20 21:23:10 -0700 Patch bug-81730-20120320232749.patch text/plain 6572 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjg2ZWFlYjI3MjI5ODBj YmE5M2RiYjgyZjA2ZTFhYzA1YTU3ODZhMS4uZDdkM2I5MTA3NDU3MTdhOGZkNDRmZWMxZTlmZTZl ZDViMDdiMDQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTIwICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNl IG9yaWdpbiB0cmFuc2Zvcm0gdG8gdHJhbnNmb3JtIG9jY2x1c2lvbiBmcm9tIHN1cmZhY2UgY29u dGVudCBzcGFjZSB0byBpdHMgdGFyZ2V0IGNvbnRlbnQgc3BhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNzMwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5pdCB0ZXN0OiBDQ09jY2x1c2lvblRyYWNr ZXJUZXN0U3VyZmFjZU9jY2x1c2lvblRyYW5zbGF0ZXNUb1BhcmVudAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NPY2NsdXNpb25UcmFja2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnRyYW5zZm9ybVN1cmZhY2VPcGFxdWVSZWdpb24pOgorICAgICAgICAoV2Vi Q29yZTo6OjpsZWF2ZVRvVGFyZ2V0UmVuZGVyU3VyZmFjZSk6CisKIDIwMTItMDMtMjAgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogT3BlbiByZXNvdXJjZSBkaWFsb2cgc2NyaXB0cyBsaXN0IHNob3VsZCBiZSBzb3J0ZWQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGIyNTMxYzcyNzFmYzkyMzVmYjkxZWNmM2U5N2Qy OWUyMTcyNmRiNzYuLmJlZmM2NjA5OWQyOWNiN2NjMzExYTRhYTVlNzQ0ZWI0NzQ2MGVmM2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTItMDMtMjAgIERh bmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBV c2Ugb3JpZ2luIHRyYW5zZm9ybSB0byB0cmFuc2Zvcm0gb2NjbHVzaW9uIGZyb20gc3VyZmFjZSBj b250ZW50IHNwYWNlIHRvIGl0cyB0YXJnZXQgY29udGVudCBzcGFjZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE3MzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL0NDT2NjbHVzaW9uVHJhY2tl clRlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChDQ09jY2x1c2lvblRyYWNr ZXJUZXN0U3VyZmFjZU9jY2x1c2lvblRyYW5zbGF0ZXNUb1BhcmVudCk6CisgICAgICAgIChXZWJD b3JlOjpDQ09jY2x1c2lvblRyYWNrZXJUZXN0U3VyZmFjZU9jY2x1c2lvblRyYW5zbGF0ZXNUb1Bh cmVudDo6cnVuTXlUZXN0KToKKworMjAxMi0wMy0yMCAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNo cm9taXVtLm9yZz4KKwogICAgICAgICBbY2hyb21pdW1dIFVzZSBvcGFxdWUgY29udGVudHMgZm9y IHBhaW50IGN1bGxpbmcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxNjc2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDT2NjbHVzaW9uVHJhY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ09jY2x1c2lvblRyYWNrZXIuY3BwCmluZGV4 IDRjNjE3YWQ2N2U0NjFmNmJmNmVmOGM2MjMwNTk1MGI3ZWE1Y2NmZDQuLjEwMGE3ODkxZjk4ZjIz ZGViOGNhYmQ4NjIxMzNlNzliYmNmOTAwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDT2NjbHVzaW9uVHJhY2tlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NPY2NsdXNpb25U cmFja2VyLmNwcApAQCAtMTE0LDIyICsxMTQsMTUgQEAgc3RhdGljIGlubGluZSBSZWdpb24gdHJh bnNmb3JtU3VyZmFjZU9wYXF1ZVJlZ2lvbihjb25zdCBSZW5kZXJTdXJmYWNlVHlwZSogc3VyZmEK ICAgICAvLyBWZXJpZnkgdGhhdCByZWN0cyB3aXRoaW4gdGhlIHxzdXJmYWNlfCB3aWxsIHJlbWFp biByZWN0cyBpbiBpdHMgdGFyZ2V0IHN1cmZhY2UgYWZ0ZXIgYXBwbHlpbmcgfHRyYW5zZm9ybXwu IElmIHRoaXMgaXMgdHJ1ZSwgdGhlbgogICAgIC8vIGFwcGx5IHx0cmFuc2Zvcm18IHRvIGVhY2gg cmVjdCB3aXRoaW4gfHJlZ2lvbnwgaW4gb3JkZXIgdG8gdHJhbnNmb3JtIHRoZSBlbnRpcmUgUmVn aW9uLgogCi0gICAgSW50UmVjdCBib3VuZHMgPSByZWdpb24uYm91bmRzKCk7Ci0gICAgRmxvYXRS ZWN0IGNlbnRlcmVkQm91bmRzKC1ib3VuZHMud2lkdGgoKSAvIDIuMCwgLWJvdW5kcy5oZWlnaHQo KSAvIDIuMCwgYm91bmRzLndpZHRoKCksIGJvdW5kcy5oZWlnaHQoKSk7Ci0gICAgRmxvYXRRdWFk IHRyYW5zZm9ybWVkQm91bmRzUXVhZCA9IHRyYW5zZm9ybS5tYXBRdWFkKEZsb2F0UXVhZChjZW50 ZXJlZEJvdW5kcykpOworICAgIEZsb2F0UXVhZCB0cmFuc2Zvcm1lZEJvdW5kc1F1YWQgPSB0cmFu c2Zvcm0ubWFwUXVhZChGbG9hdFF1YWQocmVnaW9uLmJvdW5kcygpKSk7CiAgICAgaWYgKCF0cmFu c2Zvcm1lZEJvdW5kc1F1YWQuaXNSZWN0aWxpbmVhcigpKQogICAgICAgICByZXR1cm4gUmVnaW9u KCk7CiAKICAgICBSZWdpb24gdHJhbnNmb3JtZWRSZWdpb247CiAKLSAgICBJbnRSZWN0IHN1cmZh Y2VCb3VuZHMgPSBzdXJmYWNlLT5jb250ZW50UmVjdCgpOwogICAgIFZlY3RvcjxJbnRSZWN0PiBy ZWN0cyA9IHJlZ2lvbi5yZWN0cygpOwotICAgIFZlY3RvcjxJbnRSZWN0Pjo6Y29uc3RfaXRlcmF0 b3IgZW5kID0gcmVjdHMuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8SW50UmVjdD46OmNvbnN0X2l0 ZXJhdG9yIGkgPSByZWN0cy5iZWdpbigpOyBpICE9IGVuZDsgKytpKSB7Ci0gICAgICAgIEZsb2F0 UmVjdCBjZW50ZXJlZE9yaWdpblJlY3QoLWktPndpZHRoKCkgLyAyLjAgKyBpLT54KCkgLSBzdXJm YWNlQm91bmRzLngoKSwgLWktPmhlaWdodCgpIC8gMi4wICsgaS0+eSgpIC0gc3VyZmFjZUJvdW5k cy55KCksIGktPndpZHRoKCksIGktPmhlaWdodCgpKTsKLSAgICAgICAgRmxvYXRSZWN0IHRyYW5z Zm9ybWVkUmVjdCA9IHRyYW5zZm9ybS5tYXBSZWN0KEZsb2F0UmVjdChjZW50ZXJlZE9yaWdpblJl Y3QpKTsKLSAgICAgICAgdHJhbnNmb3JtZWRSZWdpb24udW5pdGUoZW5jbG9zZWRJbnRSZWN0KHRy YW5zZm9ybWVkUmVjdCkpOwotICAgIH0KKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJlY3Rz LnNpemUoKTsgKytpKQorICAgICAgICB0cmFuc2Zvcm1lZFJlZ2lvbi51bml0ZShlbmNsb3NlZElu dFJlY3QodHJhbnNmb3JtLm1hcFJlY3QoRmxvYXRSZWN0KHJlY3RzW2ldKSkpKTsKICAgICByZXR1 cm4gdHJhbnNmb3JtZWRSZWdpb247CiB9CiAKQEAgLTE0Myw3ICsxMzYsNyBAQCB2b2lkIENDT2Nj bHVzaW9uVHJhY2tlckJhc2U8TGF5ZXJUeXBlLCBSZW5kZXJTdXJmYWNlVHlwZT46OmxlYXZlVG9U YXJnZXRSZW5kZXJTdQogICAgIC8vIFRoZSB0YXJnZXQgb2NjbHVzaW9uIGNhbiBiZSBtZXJnZWQg b3V0IGFzIHdlbGwgYnV0IG5lZWRzIHRvIGJlIHRyYW5zZm9ybWVkIHRvIHRoZSBuZXcgdGFyZ2V0 LgogCiAgICAgY29uc3QgUmVuZGVyU3VyZmFjZVR5cGUqIG9sZFRhcmdldCA9IG1fc3RhY2tbbGFz dEluZGV4XS5zdXJmYWNlOwotICAgIFJlZ2lvbiBvbGRUYXJnZXRPY2NsdXNpb25Jbk5ld1Rhcmdl dCA9IHRyYW5zZm9ybVN1cmZhY2VPcGFxdWVSZWdpb248UmVuZGVyU3VyZmFjZVR5cGU+KG9sZFRh cmdldCwgbV9zdGFja1tsYXN0SW5kZXhdLm9jY2x1c2lvbkluVGFyZ2V0LCBvbGRUYXJnZXQtPmRy YXdUcmFuc2Zvcm0oKSk7CisgICAgUmVnaW9uIG9sZFRhcmdldE9jY2x1c2lvbkluTmV3VGFyZ2V0 ID0gdHJhbnNmb3JtU3VyZmFjZU9wYXF1ZVJlZ2lvbjxSZW5kZXJTdXJmYWNlVHlwZT4ob2xkVGFy Z2V0LCBtX3N0YWNrW2xhc3RJbmRleF0ub2NjbHVzaW9uSW5UYXJnZXQsIG9sZFRhcmdldC0+b3Jp Z2luVHJhbnNmb3JtKCkpOwogCiAgICAgaWYgKHN1cmZhY2VXaWxsQmVBdFRvcEFmdGVyUG9wKSB7 CiAgICAgICAgIC8vIE1lcmdlIHRoZSB0b3Agb2YgdGhlIHN0YWNrIGRvd24uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ09jY2x1c2lvblRyYWNrZXJUZXN0LmNw cAppbmRleCA3NTg5YTNjODY2NDE4N2ViZjQ4YzNlYWMwMjhhNGUxMmY3ZGIxMTQ1Li5iNWVjYjM4 NjFkYjhhNmUxZGJjZmE4MTFjNzJmZWJjNjFhOWFlZGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NPY2NsdXNpb25UcmFja2VyVGVzdC5jcHAKQEAgLTE4 NzgsNCArMTg3OCwzNiBAQCBwcm90ZWN0ZWQ6CiAKIE1BSU5fVEhSRUFEX1RFU1QoQ0NPY2NsdXNp b25UcmFja2VyVGVzdEFuaW1hdGlvblRyYW5zbGF0ZU9uTWFpblRocmVhZCk7CiAKK3RlbXBsYXRl PGNsYXNzIFR5cGVzLCBib29sIG9wYXF1ZUxheWVycz4KK2NsYXNzIENDT2NjbHVzaW9uVHJhY2tl clRlc3RTdXJmYWNlT2NjbHVzaW9uVHJhbnNsYXRlc1RvUGFyZW50IDogcHVibGljIENDT2NjbHVz aW9uVHJhY2tlclRlc3Q8VHlwZXMsIG9wYXF1ZUxheWVycz4geworcHJvdGVjdGVkOgorICAgIHZv aWQgcnVuTXlUZXN0KCkKKyAgICB7CisgICAgICAgIFRyYW5zZm9ybXRpb25NYXRyaXggdHJhbnNm b3JtOworICAgICAgICB0cmFuc2Zvcm0uc2NhbGUoMyk7CisgICAgICAgIHRyYW5zZm9ybS50cmFu c2xhdGUoMzAsIDMwKTsKKyAgICAgICAgdHJhbnNmb3JtLnJvdGF0ZSgyMCk7CisKKyAgICAgICAg dHlwZW5hbWUgVHlwZXM6OkNvbnRlbnRMYXllclR5cGUqIHBhcmVudCA9IHRoaXMtPmNyZWF0ZVJv b3QodGhpcy0+aWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwgMCksIEludFNpemUoMzAwLCAz MDApKTsKKyAgICAgICAgdHlwZW5hbWUgVHlwZXM6OkNvbnRlbnRMYXllclR5cGUqIHN1cmZhY2Ug PSB0aGlzLT5jcmVhdGVEcmF3aW5nU3VyZmFjZShwYXJlbnQsIHRyYW5zZm9ybSwgRmxvYXRQb2lu dCgwLCAwKSwgSW50U2l6ZSgzMDAsIDMwMCksIGZhbHNlKTsKKyAgICAgICAgc3VyZmFjZS0+c2V0 T3BhcXVlQ29udGVudHNSZWN0KEludFJlY3QoMCwgMCwgMjAwLCAyMDApKTsKKyAgICAgICAgdGhp cy0+Y2FsY0RyYXdFdGMocGFyZW50KTsKKworICAgICAgICBUZXN0Q0NPY2NsdXNpb25UcmFja2Vy QmFzZTx0eXBlbmFtZSBUeXBlczo6TGF5ZXJUeXBlLCB0eXBlbmFtZSBUeXBlczo6UmVuZGVyU3Vy ZmFjZVR5cGU+IG9jY2x1c2lvbihJbnRSZWN0KDAsIDAsIDEwMDAsIDEwMDApKTsKKworICAgICAg ICBvY2NsdXNpb24uZW50ZXJUYXJnZXRSZW5kZXJTdXJmYWNlKHN1cmZhY2UtPnJlbmRlclN1cmZh Y2UoKSk7CisgICAgICAgIG9jY2x1c2lvbi5tYXJrT2NjbHVkZWRCZWhpbmRMYXllcihzdXJmYWNl KTsKKyAgICAgICAgb2NjbHVzaW9uLmZpbmlzaGVkVGFyZ2V0UmVuZGVyU3VyZmFjZShzdXJmYWNl LCBzdXJmYWNlLT5yZW5kZXJTdXJmYWNlKCkpOworICAgICAgICBvY2NsdXNpb24ubGVhdmVUb1Rh cmdldFJlbmRlclN1cmZhY2UocGFyZW50LT5yZW5kZXJTdXJmYWNlKCkpOworCisgICAgICAgIEVY UEVDVF9FUV9SRUNUKGVuY2xvc2luZ0ludFJlY3QodHJhbnNmb3JtLm1hcFJlY3QoRmxvYXRSZWN0 KDAsIDAsIDIwMCwgMjAwKSkpLCBvY2NsdXNpb24ub2NjbHVzaW9uSW5TY3JlZW5TcGFjZSgpLmJv dW5kcygpKTsKKyAgICAgICAgRVhQRUNUX0VRKDF1LCBvY2NsdXNpb24ub2NjbHVzaW9uSW5TY3Jl ZW5TcGFjZSgpLnJlY3RzKCkuc2l6ZSgpKTsKKworICAgICAgICBFWFBFQ1RfRVFfUkVDVChlbmNs b3NpbmdJbnRSZWN0KHRyYW5zZm9ybS5tYXBSZWN0KEZsb2F0UmVjdCgwLCAwLCAyMDAsIDIwMCkp KSwgb2NjbHVzaW9uLm9jY2x1c2lvbkluVGFyZ2V0U3VyZmFjZSgpLmJvdW5kcygpKTsKKyAgICAg ICAgRVhQRUNUX0VRKDF1LCBvY2NsdXNpb24ub2NjbHVzaW9uSW5UYXJnZXRTdXJmYWNlKCkucmVj dHMoKS5zaXplKCkpOworICAgIH0KK307CisKK01BSU5fQU5EX0lNUExfVEhSRUFEX1RFU1QoQ0NP Y2NsdXNpb25UcmFja2VyVGVzdFN1cmZhY2VPY2NsdXNpb25UcmFuc2xhdGVzVG9QYXJlbnQpOwor CiB9IC8vIG5hbWVzcGFjZQo= 132965 2012-03-20 21:23:14 -0700 2012-03-20 22:29:15 -0700 Patch bug-81730-20120321002313.patch text/plain 7828 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjg2ZWFlYjI3MjI5ODBj YmE5M2RiYjgyZjA2ZTFhYzA1YTU3ODZhMS4uZDdkM2I5MTA3NDU3MTdhOGZkNDRmZWMxZTlmZTZl ZDViMDdiMDQ3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTIwICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNl IG9yaWdpbiB0cmFuc2Zvcm0gdG8gdHJhbnNmb3JtIG9jY2x1c2lvbiBmcm9tIHN1cmZhY2UgY29u dGVudCBzcGFjZSB0byBpdHMgdGFyZ2V0IGNvbnRlbnQgc3BhY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNzMwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5pdCB0ZXN0OiBDQ09jY2x1c2lvblRyYWNr ZXJUZXN0U3VyZmFjZU9jY2x1c2lvblRyYW5zbGF0ZXNUb1BhcmVudAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NPY2NsdXNpb25UcmFja2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnRyYW5zZm9ybVN1cmZhY2VPcGFxdWVSZWdpb24pOgorICAgICAgICAoV2Vi Q29yZTo6OjpsZWF2ZVRvVGFyZ2V0UmVuZGVyU3VyZmFjZSk6CisKIDIwMTItMDMtMjAgIFZzZXZv bG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogT3BlbiByZXNvdXJjZSBkaWFsb2cgc2NyaXB0cyBsaXN0IHNob3VsZCBiZSBzb3J0ZWQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGIyNTMxYzcyNzFmYzkyMzVmYjkxZWNmM2U5N2Qy OWUyMTcyNmRiNzYuLmJlZmM2NjA5OWQyOWNiN2NjMzExYTRhYTVlNzQ0ZWI0NzQ2MGVmM2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTItMDMtMjAgIERh bmEgSmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBV c2Ugb3JpZ2luIHRyYW5zZm9ybSB0byB0cmFuc2Zvcm0gb2NjbHVzaW9uIGZyb20gc3VyZmFjZSBj b250ZW50IHNwYWNlIHRvIGl0cyB0YXJnZXQgY29udGVudCBzcGFjZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE3MzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL0NDT2NjbHVzaW9uVHJhY2tl clRlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChDQ09jY2x1c2lvblRyYWNr ZXJUZXN0U3VyZmFjZU9jY2x1c2lvblRyYW5zbGF0ZXNUb1BhcmVudCk6CisgICAgICAgIChXZWJD b3JlOjpDQ09jY2x1c2lvblRyYWNrZXJUZXN0U3VyZmFjZU9jY2x1c2lvblRyYW5zbGF0ZXNUb1Bh cmVudDo6cnVuTXlUZXN0KToKKworMjAxMi0wMy0yMCAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNo cm9taXVtLm9yZz4KKwogICAgICAgICBbY2hyb21pdW1dIFVzZSBvcGFxdWUgY29udGVudHMgZm9y IHBhaW50IGN1bGxpbmcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxNjc2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDT2NjbHVzaW9uVHJhY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ09jY2x1c2lvblRyYWNrZXIuY3BwCmluZGV4 IDRjNjE3YWQ2N2U0NjFmNmJmNmVmOGM2MjMwNTk1MGI3ZWE1Y2NmZDQuLjEwMGE3ODkxZjk4ZjIz ZGViOGNhYmQ4NjIxMzNlNzliYmNmOTAwYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDT2NjbHVzaW9uVHJhY2tlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NPY2NsdXNpb25U cmFja2VyLmNwcApAQCAtMTE0LDIyICsxMTQsMTUgQEAgc3RhdGljIGlubGluZSBSZWdpb24gdHJh bnNmb3JtU3VyZmFjZU9wYXF1ZVJlZ2lvbihjb25zdCBSZW5kZXJTdXJmYWNlVHlwZSogc3VyZmEK ICAgICAvLyBWZXJpZnkgdGhhdCByZWN0cyB3aXRoaW4gdGhlIHxzdXJmYWNlfCB3aWxsIHJlbWFp biByZWN0cyBpbiBpdHMgdGFyZ2V0IHN1cmZhY2UgYWZ0ZXIgYXBwbHlpbmcgfHRyYW5zZm9ybXwu IElmIHRoaXMgaXMgdHJ1ZSwgdGhlbgogICAgIC8vIGFwcGx5IHx0cmFuc2Zvcm18IHRvIGVhY2gg cmVjdCB3aXRoaW4gfHJlZ2lvbnwgaW4gb3JkZXIgdG8gdHJhbnNmb3JtIHRoZSBlbnRpcmUgUmVn aW9uLgogCi0gICAgSW50UmVjdCBib3VuZHMgPSByZWdpb24uYm91bmRzKCk7Ci0gICAgRmxvYXRS ZWN0IGNlbnRlcmVkQm91bmRzKC1ib3VuZHMud2lkdGgoKSAvIDIuMCwgLWJvdW5kcy5oZWlnaHQo KSAvIDIuMCwgYm91bmRzLndpZHRoKCksIGJvdW5kcy5oZWlnaHQoKSk7Ci0gICAgRmxvYXRRdWFk IHRyYW5zZm9ybWVkQm91bmRzUXVhZCA9IHRyYW5zZm9ybS5tYXBRdWFkKEZsb2F0UXVhZChjZW50 ZXJlZEJvdW5kcykpOworICAgIEZsb2F0UXVhZCB0cmFuc2Zvcm1lZEJvdW5kc1F1YWQgPSB0cmFu c2Zvcm0ubWFwUXVhZChGbG9hdFF1YWQocmVnaW9uLmJvdW5kcygpKSk7CiAgICAgaWYgKCF0cmFu c2Zvcm1lZEJvdW5kc1F1YWQuaXNSZWN0aWxpbmVhcigpKQogICAgICAgICByZXR1cm4gUmVnaW9u KCk7CiAKICAgICBSZWdpb24gdHJhbnNmb3JtZWRSZWdpb247CiAKLSAgICBJbnRSZWN0IHN1cmZh Y2VCb3VuZHMgPSBzdXJmYWNlLT5jb250ZW50UmVjdCgpOwogICAgIFZlY3RvcjxJbnRSZWN0PiBy ZWN0cyA9IHJlZ2lvbi5yZWN0cygpOwotICAgIFZlY3RvcjxJbnRSZWN0Pjo6Y29uc3RfaXRlcmF0 b3IgZW5kID0gcmVjdHMuZW5kKCk7Ci0gICAgZm9yIChWZWN0b3I8SW50UmVjdD46OmNvbnN0X2l0 ZXJhdG9yIGkgPSByZWN0cy5iZWdpbigpOyBpICE9IGVuZDsgKytpKSB7Ci0gICAgICAgIEZsb2F0 UmVjdCBjZW50ZXJlZE9yaWdpblJlY3QoLWktPndpZHRoKCkgLyAyLjAgKyBpLT54KCkgLSBzdXJm YWNlQm91bmRzLngoKSwgLWktPmhlaWdodCgpIC8gMi4wICsgaS0+eSgpIC0gc3VyZmFjZUJvdW5k cy55KCksIGktPndpZHRoKCksIGktPmhlaWdodCgpKTsKLSAgICAgICAgRmxvYXRSZWN0IHRyYW5z Zm9ybWVkUmVjdCA9IHRyYW5zZm9ybS5tYXBSZWN0KEZsb2F0UmVjdChjZW50ZXJlZE9yaWdpblJl Y3QpKTsKLSAgICAgICAgdHJhbnNmb3JtZWRSZWdpb24udW5pdGUoZW5jbG9zZWRJbnRSZWN0KHRy YW5zZm9ybWVkUmVjdCkpOwotICAgIH0KKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJlY3Rz LnNpemUoKTsgKytpKQorICAgICAgICB0cmFuc2Zvcm1lZFJlZ2lvbi51bml0ZShlbmNsb3NlZElu dFJlY3QodHJhbnNmb3JtLm1hcFJlY3QoRmxvYXRSZWN0KHJlY3RzW2ldKSkpKTsKICAgICByZXR1 cm4gdHJhbnNmb3JtZWRSZWdpb247CiB9CiAKQEAgLTE0Myw3ICsxMzYsNyBAQCB2b2lkIENDT2Nj bHVzaW9uVHJhY2tlckJhc2U8TGF5ZXJUeXBlLCBSZW5kZXJTdXJmYWNlVHlwZT46OmxlYXZlVG9U YXJnZXRSZW5kZXJTdQogICAgIC8vIFRoZSB0YXJnZXQgb2NjbHVzaW9uIGNhbiBiZSBtZXJnZWQg b3V0IGFzIHdlbGwgYnV0IG5lZWRzIHRvIGJlIHRyYW5zZm9ybWVkIHRvIHRoZSBuZXcgdGFyZ2V0 LgogCiAgICAgY29uc3QgUmVuZGVyU3VyZmFjZVR5cGUqIG9sZFRhcmdldCA9IG1fc3RhY2tbbGFz dEluZGV4XS5zdXJmYWNlOwotICAgIFJlZ2lvbiBvbGRUYXJnZXRPY2NsdXNpb25Jbk5ld1Rhcmdl dCA9IHRyYW5zZm9ybVN1cmZhY2VPcGFxdWVSZWdpb248UmVuZGVyU3VyZmFjZVR5cGU+KG9sZFRh cmdldCwgbV9zdGFja1tsYXN0SW5kZXhdLm9jY2x1c2lvbkluVGFyZ2V0LCBvbGRUYXJnZXQtPmRy YXdUcmFuc2Zvcm0oKSk7CisgICAgUmVnaW9uIG9sZFRhcmdldE9jY2x1c2lvbkluTmV3VGFyZ2V0 ID0gdHJhbnNmb3JtU3VyZmFjZU9wYXF1ZVJlZ2lvbjxSZW5kZXJTdXJmYWNlVHlwZT4ob2xkVGFy Z2V0LCBtX3N0YWNrW2xhc3RJbmRleF0ub2NjbHVzaW9uSW5UYXJnZXQsIG9sZFRhcmdldC0+b3Jp Z2luVHJhbnNmb3JtKCkpOwogCiAgICAgaWYgKHN1cmZhY2VXaWxsQmVBdFRvcEFmdGVyUG9wKSB7 CiAgICAgICAgIC8vIE1lcmdlIHRoZSB0b3Agb2YgdGhlIHN0YWNrIGRvd24uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3Bw IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ09jY2x1c2lvblRyYWNrZXJUZXN0LmNw cAppbmRleCA3NTg5YTNjODY2NDE4N2ViZjQ4YzNlYWMwMjhhNGUxMmY3ZGIxMTQ1Li44OWI0NzI3 YjUyY2FiY2I0ODUxMTYyY2Y3MTE1YTk3ZDIxMjdlOWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NPY2NsdXNpb25UcmFja2VyVGVzdC5jcHAKQEAgLTE4 NzgsNCArMTg3OCw1NSBAQCBwcm90ZWN0ZWQ6CiAKIE1BSU5fVEhSRUFEX1RFU1QoQ0NPY2NsdXNp b25UcmFja2VyVGVzdEFuaW1hdGlvblRyYW5zbGF0ZU9uTWFpblRocmVhZCk7CiAKK3RlbXBsYXRl PGNsYXNzIFR5cGVzLCBib29sIG9wYXF1ZUxheWVycz4KK2NsYXNzIENDT2NjbHVzaW9uVHJhY2tl clRlc3RTdXJmYWNlT2NjbHVzaW9uVHJhbnNsYXRlc1RvUGFyZW50IDogcHVibGljIENDT2NjbHVz aW9uVHJhY2tlclRlc3Q8VHlwZXMsIG9wYXF1ZUxheWVycz4geworcHJvdGVjdGVkOgorICAgIHZv aWQgcnVuTXlUZXN0KCkKKyAgICB7CisgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHN1cmZh Y2VUcmFuc2Zvcm07CisgICAgICAgIHN1cmZhY2VUcmFuc2Zvcm0udHJhbnNsYXRlKDMwMCwgMzAw KTsKKyAgICAgICAgc3VyZmFjZVRyYW5zZm9ybS5zY2FsZSgyKTsKKyAgICAgICAgc3VyZmFjZVRy YW5zZm9ybS50cmFuc2xhdGUoLTE1MCwgLTE1MCk7CisKKyAgICAgICAgdHlwZW5hbWUgVHlwZXM6 OkNvbnRlbnRMYXllclR5cGUqIHBhcmVudCA9IHRoaXMtPmNyZWF0ZVJvb3QodGhpcy0+aWRlbnRp dHlNYXRyaXgsIEZsb2F0UG9pbnQoMCwgMCksIEludFNpemUoNTAwLCA1MDApKTsKKyAgICAgICAg dHlwZW5hbWUgVHlwZXM6OkNvbnRlbnRMYXllclR5cGUqIHN1cmZhY2UgPSB0aGlzLT5jcmVhdGVE cmF3aW5nU3VyZmFjZShwYXJlbnQsIHN1cmZhY2VUcmFuc2Zvcm0sIEZsb2F0UG9pbnQoMCwgMCks IEludFNpemUoMzAwLCAzMDApLCBmYWxzZSk7CisgICAgICAgIHR5cGVuYW1lIFR5cGVzOjpDb250 ZW50TGF5ZXJUeXBlKiBzdXJmYWNlMiA9IHRoaXMtPmNyZWF0ZURyYXdpbmdTdXJmYWNlKHBhcmVu dCwgdGhpcy0+aWRlbnRpdHlNYXRyaXgsIEZsb2F0UG9pbnQoNTAsIDUwKSwgSW50U2l6ZSgzMDAs IDMwMCksIGZhbHNlKTsKKyAgICAgICAgc3VyZmFjZS0+c2V0T3BhcXVlQ29udGVudHNSZWN0KElu dFJlY3QoMCwgMCwgMjAwLCAyMDApKTsKKyAgICAgICAgc3VyZmFjZTItPnNldE9wYXF1ZUNvbnRl bnRzUmVjdChJbnRSZWN0KDAsIDAsIDIwMCwgMjAwKSk7CisgICAgICAgIHRoaXMtPmNhbGNEcmF3 RXRjKHBhcmVudCk7CisKKyAgICAgICAgVGVzdENDT2NjbHVzaW9uVHJhY2tlckJhc2U8dHlwZW5h bWUgVHlwZXM6OkxheWVyVHlwZSwgdHlwZW5hbWUgVHlwZXM6OlJlbmRlclN1cmZhY2VUeXBlPiBv Y2NsdXNpb24oSW50UmVjdCgwLCAwLCAxMDAwLCAxMDAwKSk7CisKKyAgICAgICAgb2NjbHVzaW9u LmVudGVyVGFyZ2V0UmVuZGVyU3VyZmFjZShzdXJmYWNlMi0+cmVuZGVyU3VyZmFjZSgpKTsKKyAg ICAgICAgb2NjbHVzaW9uLm1hcmtPY2NsdWRlZEJlaGluZExheWVyKHN1cmZhY2UyKTsKKyAgICAg ICAgb2NjbHVzaW9uLmZpbmlzaGVkVGFyZ2V0UmVuZGVyU3VyZmFjZShzdXJmYWNlMiwgc3VyZmFj ZTItPnJlbmRlclN1cmZhY2UoKSk7CisgICAgICAgIG9jY2x1c2lvbi5sZWF2ZVRvVGFyZ2V0UmVu ZGVyU3VyZmFjZShwYXJlbnQtPnJlbmRlclN1cmZhY2UoKSk7CisKKyAgICAgICAgRVhQRUNUX0VR X1JFQ1QoSW50UmVjdCg1MCwgNTAsIDIwMCwgMjAwKSwgb2NjbHVzaW9uLm9jY2x1c2lvbkluU2Ny ZWVuU3BhY2UoKS5ib3VuZHMoKSk7CisgICAgICAgIEVYUEVDVF9FUSgxdSwgb2NjbHVzaW9uLm9j Y2x1c2lvbkluU2NyZWVuU3BhY2UoKS5yZWN0cygpLnNpemUoKSk7CisgICAgICAgIEVYUEVDVF9F UV9SRUNUKEludFJlY3QoNTAsIDUwLCAyMDAsIDIwMCksIG9jY2x1c2lvbi5vY2NsdXNpb25JblRh cmdldFN1cmZhY2UoKS5ib3VuZHMoKSk7CisgICAgICAgIEVYUEVDVF9FUSgxdSwgb2NjbHVzaW9u Lm9jY2x1c2lvbkluVGFyZ2V0U3VyZmFjZSgpLnJlY3RzKCkuc2l6ZSgpKTsKKworICAgICAgICAv LyBDbGVhciBhbnkgc3RvcmVkIG9jY2x1c2lvbi4KKyAgICAgICAgb2NjbHVzaW9uLnNldE9jY2x1 c2lvbkluU2NyZWVuU3BhY2UoUmVnaW9uKCkpOworICAgICAgICBvY2NsdXNpb24uc2V0T2NjbHVz aW9uSW5UYXJnZXRTdXJmYWNlKFJlZ2lvbigpKTsKKworICAgICAgICBvY2NsdXNpb24uZW50ZXJU YXJnZXRSZW5kZXJTdXJmYWNlKHN1cmZhY2UtPnJlbmRlclN1cmZhY2UoKSk7CisgICAgICAgIG9j Y2x1c2lvbi5tYXJrT2NjbHVkZWRCZWhpbmRMYXllcihzdXJmYWNlKTsKKyAgICAgICAgb2NjbHVz aW9uLmZpbmlzaGVkVGFyZ2V0UmVuZGVyU3VyZmFjZShzdXJmYWNlLCBzdXJmYWNlLT5yZW5kZXJT dXJmYWNlKCkpOworICAgICAgICBvY2NsdXNpb24ubGVhdmVUb1RhcmdldFJlbmRlclN1cmZhY2Uo cGFyZW50LT5yZW5kZXJTdXJmYWNlKCkpOworCisgICAgICAgIEVYUEVDVF9FUV9SRUNUKEludFJl Y3QoMCwgMCwgNDAwLCA0MDApLCBvY2NsdXNpb24ub2NjbHVzaW9uSW5TY3JlZW5TcGFjZSgpLmJv dW5kcygpKTsKKyAgICAgICAgRVhQRUNUX0VRKDF1LCBvY2NsdXNpb24ub2NjbHVzaW9uSW5TY3Jl ZW5TcGFjZSgpLnJlY3RzKCkuc2l6ZSgpKTsKKyAgICAgICAgRVhQRUNUX0VRX1JFQ1QoSW50UmVj dCgwLCAwLCA0MDAsIDQwMCksIG9jY2x1c2lvbi5vY2NsdXNpb25JblRhcmdldFN1cmZhY2UoKS5i b3VuZHMoKSk7CisgICAgICAgIEVYUEVDVF9FUSgxdSwgb2NjbHVzaW9uLm9jY2x1c2lvbkluVGFy Z2V0U3VyZmFjZSgpLnJlY3RzKCkuc2l6ZSgpKTsKKworICAgICAgICBFWFBFQ1RfRVFfUkVDVChv Y2NsdXNpb24ub2NjbHVzaW9uSW5TY3JlZW5TcGFjZSgpLmJvdW5kcygpLCBvY2NsdXNpb24ub2Nj bHVzaW9uSW5UYXJnZXRTdXJmYWNlKCkuYm91bmRzKCkpOworICAgICAgICBFWFBFQ1RfRVEoMXUs IG9jY2x1c2lvbi5vY2NsdXNpb25JblNjcmVlblNwYWNlKCkucmVjdHMoKS5zaXplKCkpOworICAg ICAgICBFWFBFQ1RfRVEoMXUsIG9jY2x1c2lvbi5vY2NsdXNpb25JblRhcmdldFN1cmZhY2UoKS5y ZWN0cygpLnNpemUoKSk7CisgICAgfQorfTsKKworTUFJTl9BTkRfSU1QTF9USFJFQURfVEVTVChD Q09jY2x1c2lvblRyYWNrZXJUZXN0U3VyZmFjZU9jY2x1c2lvblRyYW5zbGF0ZXNUb1BhcmVudCk7 CisKIH0gLy8gbmFtZXNwYWNlCg==