105970 2013-01-02 16:45:37 -0800 Fix incorrect assumption about in-flow descendants of inlines in touch event rect tracking 2013-01-03 11:11:05 -0800 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 leviw leviw andersca dglazkov jamesr simon.fraser tonikitoo webkit.review.bot yusufo oldest_to_newest 799074 0 leviw 2013-01-02 16:45:37 -0800 Previously, we were only walking the child sub-tree of Blocks to accumulate touch event rectangles. This change will do it for all renderers, but short circuit for regular children. 799089 1 181111 leviw 2013-01-02 16:59:43 -0800 Created attachment 181111 Patch 799227 2 181111 webkit.review.bot 2013-01-02 21:01:04 -0800 Comment on attachment 181111 Patch Attachment 181111 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15656315 New failing tests: platform/chromium/fast/events/touch/compositor-touch-hit-rects.html 799502 3 181111 leviw 2013-01-03 11:11:01 -0800 Comment on attachment 181111 Patch Committed r138717: <http://trac.webkit.org/changeset/138717> 181111 2013-01-02 16:59:43 -0800 2013-01-03 11:11:00 -0800 Patch bug-105970-20130102165651.patch text/plain 12856 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzODY3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAxLTAyICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggaW5jb3JyZWN0IGFz c3VtcHRpb24gYWJvdXQgaW4tZmxvdyBkZXNjZW5kYW50cyBvZiBpbmxpbmVzIGluIHRvdWNoIGV2 ZW50IHJlY3QgdHJhY2tpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNTk3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIENvcnJlY3RpbmcgdGhlIHRvdWNoIGV2ZW50IHRhcmdldCByZWN0IGFjY3VtdWxh dGlvbiBjb2RlIHRvIG5vIGxvbmdlciBpbmNvcnJlY3RseSBhc3N1bWUgdGhhdAorICAgICAgICBu b24tYmxvY2sgcmVuZGVyZXJzIGhlbGQgb25seSBub3JtYWwtZmxvdyBjaGlsZHJlbi4gVGhlIHVw ZGF0ZWQgY29kZSB3aWxsIGFsd2F5cyB3YWxrIHRoZQorICAgICAgICBjb21wbGV0ZSByZW5kZXJl ciBzdWItdHJlZSwgYnV0IG9ubHkgZG8gdGhlIHdvcmsgb2YgY2FsY3VsYXRpbmcgdGhlIGFic29s dXRlIHJlY3Qgd2hlbiB0aGUKKyAgICAgICAgY2hpbGQgd29uJ3QgbmVjZXNzYXJpbHkgZmFsbCBp bnNpZGUgaXRzIHBhcmVudCAoZmxvYXRpbmcsIHBvc2l0aW9uZWQsIG9yIHRyYW5zZm9ybWVkKS4K KworICAgICAgICBUZXN0czogcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9ldmVudHMvdG91Y2gvY29t cG9zaXRvci10b3VjaC1oaXQtcmVjdHMuaHRtbCB1cGRhdGVkIHRvIGNhdGNoIGJ1Zy4KKworICAg ICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmFjY3VtdWxhdGVSZW5kZXJlclRvdWNoRXZlbnRUYXJnZXRSZWN0cyk6IFdhbGsg YWxsIHJlbmRlcmVyIHN1Yi10cmVlcy4gQWxzbyBrZWVwaW5nCisgICAgICAgIHRyYWNrIG9mIHRo ZSBsYXN0IGFkZGVkIHBhcmVudCBjb250YWluZXIgcmVjdCB0byBhdm9pZCBhZGRpbmcgcmVkdW5k YW50IHJlY3RhbmdsZXMuCisgICAgICAgIChXZWJDb3JlOjphY2N1bXVsYXRlRG9jdW1lbnRFdmVu dFRhcmdldFJlY3RzKTogQXZvaWRpbmcgYWRkaW5nIGVtcHR5IHJlY3RzLgorCiAyMDEzLTAxLTAy ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg cm9sbGluZyBvdXQgcjEzODY2MS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAJKHJldmlzaW9uIDEzODM5OSkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTc5LDE1ICsxNzksMjAgQEAgUmVnaW9uIFNjcm9sbGluZ0Nv b3JkaW5hdG9yOjpjb21wdXRlTm9uRgogfQogCiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UX1RSQUNL SU5HKQotc3RhdGljIHZvaWQgYWNjdW11bGF0ZVJlbmRlcmVyVG91Y2hFdmVudFRhcmdldFJlY3Rz KFZlY3RvcjxJbnRSZWN0PiYgcmVjdHMsIGNvbnN0IFJlbmRlck9iamVjdCogcmVuZGVyZXIpCitz dGF0aWMgdm9pZCBhY2N1bXVsYXRlUmVuZGVyZXJUb3VjaEV2ZW50VGFyZ2V0UmVjdHMoVmVjdG9y PEludFJlY3Q+JiByZWN0cywgY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJlciwgY29uc3QgSW50 UmVjdCYgcGFyZW50UmVjdCA9IEludFJlY3QoKSkKIHsKLSAgICAvLyBGSVhNRTogVGhpcyBtZXRo b2QgaXMgTyhOXjIpIGFzIGl0IHdhbGtzIHRoZSB0cmVlIHRvIHRoZSByb290IGZvciBldmVyeSBy ZW5kZXJlci4gUmVuZGVyR2VvbWV0cnlNYXAgd291bGQgZml4IHRoaXMuCi0gICAgcmVjdHMuYXBw ZW5kKGVuY2xvc2luZ0ludFJlY3QocmVuZGVyZXItPmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBh aW50KDApKSk7Ci0gICAgaWYgKHJlbmRlcmVyLT5pc1JlbmRlckJsb2NrKCkpIHsKLSAgICAgICAg Y29uc3QgUmVuZGVyQmxvY2sqIGJsb2NrID0gdG9SZW5kZXJCbG9jayhyZW5kZXJlcik7Ci0gICAg ICAgIGZvciAoUmVuZGVyT2JqZWN0KiBjaGlsZCA9IGJsb2NrLT5maXJzdENoaWxkKCk7IGNoaWxk OyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKQotICAgICAgICAgICAgYWNjdW11bGF0ZVJl bmRlcmVyVG91Y2hFdmVudFRhcmdldFJlY3RzKHJlY3RzLCBjaGlsZCk7CisgICAgSW50UmVjdCBh ZGp1c3RlZFBhcmVudFJlY3QgPSBwYXJlbnRSZWN0OworICAgIGlmIChwYXJlbnRSZWN0LmlzRW1w dHkoKSB8fCByZW5kZXJlci0+aXNGbG9hdGluZygpIHx8IHJlbmRlcmVyLT5pc1Bvc2l0aW9uZWQo KSB8fCByZW5kZXJlci0+aGFzVHJhbnNmb3JtKCkpIHsKKyAgICAgICAgLy8gRklYTUU6IFRoaXMg bWV0aG9kIGlzIE8oTl4yKSBhcyBpdCB3YWxrcyB0aGUgdHJlZSB0byB0aGUgcm9vdCBmb3IgZXZl cnkgcmVuZGVyZXIuIFJlbmRlckdlb21ldHJ5TWFwIHdvdWxkIGZpeCB0aGlzLgorICAgICAgICBJ bnRSZWN0IHIgPSBlbmNsb3NpbmdJbnRSZWN0KHJlbmRlcmVyLT5jbGlwcGVkT3ZlcmZsb3dSZWN0 Rm9yUmVwYWludCgwKSk7CisgICAgICAgIGlmICghci5pc0VtcHR5KCkgJiYgIXBhcmVudFJlY3Qu Y29udGFpbnMocikpIHsKKyAgICAgICAgICAgIHJlY3RzLmFwcGVuZChyKTsKKyAgICAgICAgICAg IGFkanVzdGVkUGFyZW50UmVjdCA9IHI7CisgICAgICAgIH0KICAgICB9CisKKyAgICBmb3IgKFJl bmRlck9iamVjdCogY2hpbGQgPSByZW5kZXJlci0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQg PSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkKKyAgICAgICAgYWNjdW11bGF0ZVJlbmRlcmVyVG91Y2hF dmVudFRhcmdldFJlY3RzKHJlY3RzLCBjaGlsZCwgYWRqdXN0ZWRQYXJlbnRSZWN0KTsKIH0KIAog c3RhdGljIHZvaWQgYWNjdW11bGF0ZURvY3VtZW50RXZlbnRUYXJnZXRSZWN0cyhWZWN0b3I8SW50 UmVjdD4mIHJlY3RzLCBjb25zdCBEb2N1bWVudCogZG9jdW1lbnQpCkBAIC0yMDMsOCArMjA4LDEx IEBAIHN0YXRpYyB2b2lkIGFjY3VtdWxhdGVEb2N1bWVudEV2ZW50VGFyZ2UKICAgICAgICAgICAg IGNvbnRpbnVlOwogCiAgICAgICAgIGlmICh0b3VjaFRhcmdldCA9PSBkb2N1bWVudCkgewotICAg ICAgICAgICAgaWYgKFJlbmRlclZpZXcqIHZpZXcgPSBkb2N1bWVudC0+cmVuZGVyVmlldygpKQot ICAgICAgICAgICAgICAgIHJlY3RzLmFwcGVuZChlbmNsb3NpbmdJbnRSZWN0KHZpZXctPmNsaXBw ZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KDApKSk7CisgICAgICAgICAgICBpZiAoUmVuZGVyVmll dyogdmlldyA9IGRvY3VtZW50LT5yZW5kZXJWaWV3KCkpIHsKKyAgICAgICAgICAgICAgICBJbnRS ZWN0IHIgPSBlbmNsb3NpbmdJbnRSZWN0KHZpZXctPmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBh aW50KDApKTsKKyAgICAgICAgICAgICAgICBpZiAoIXIuaXNFbXB0eSgpKQorICAgICAgICAgICAg ICAgICAgICByZWN0cy5hcHBlbmQocik7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTM4Njc4KQorKysgTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDEtMDIg IExldmkgV2VpbnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEZpeCBpbmNv cnJlY3QgYXNzdW1wdGlvbiBhYm91dCBpbi1mbG93IGRlc2NlbmRhbnRzIG9mIGlubGluZXMgaW4g dG91Y2ggZXZlbnQgcmVjdCB0cmFja2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA1OTcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS1saW51eC9wbGF0Zm9ybS9jaHJv bWl1bS9mYXN0L2V2ZW50cy90b3VjaC9jb21wb3NpdG9yLXRvdWNoLWhpdC1yZWN0cy1leHBlY3Rl ZC50eHQ6IFVwZGF0aW5nIGV4cGVjdGF0aW9ucworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L2Zhc3QvZXZlbnRzL3RvdWNoL2NvbXBvc2l0b3ItdG91Y2gtaGl0LXJlY3RzLmh0bWw6IFVwZGF0 aW5nIHRlc3QgdG8gY2hlY2sgcHJldmlvdXNseSBmYWlsaW5nIGNhc2Ugd2hlcmUKKyAgICAgICAg YW4gaW5saW5lIHdpdGggYSB0b3VjaCBoYW5kbGVyIGNvbnRhaW5zIGEgbm9uLW5vcm1hbC1mbG93 IGNoaWxkLiBBbHNvLCBmaXhpbmcgdGhlIHRlc3Qgc2luY2UgaXQgd2FzIGluY29ycmVjdGx5IGR1 cGxpY2F0ZWQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9uczoK KwogMjAxMy0wMS0wMiAgQmVtIEpvbmVzLUJleSAgPGJqb25lc2JlQGFkb2JlLmNvbT4KIAogICAg ICAgICBXaGVuIGEgYmxvY2sncyBoZWlnaHQgaXMgZGV0ZXJtaW5lZCBieSBtaW4taGVpZ2h0L21h eC1oZWlnaHQsIGNoaWxkcmVuIHdpdGggcGVyY2VudGFnZSBoZWlnaHRzIGFyZSBzaXplZCBpbmNv cnJlY3RseQpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0td2luL3BsYXRmb3Jt L2Nocm9taXVtL2Zhc3QvZXZlbnRzL3RvdWNoL2NvbXBvc2l0b3ItdG91Y2gtaGl0LXJlY3RzLWV4 cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS13 aW4vcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9ldmVudHMvdG91Y2gvY29tcG9zaXRvci10b3VjaC1o aXQtcmVjdHMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxMzgzOTkpCisrKyBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9jaHJvbWl1bS13aW4vcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9ldmVudHMvdG91Y2gv Y29tcG9zaXRvci10b3VjaC1oaXQtcmVjdHMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBA IC0xLDQ1ICsxLDE1IEBACiBUaGlzIHRlc3RzIHZlcmlmaWVzIHRoZSBoaXQgdGVzdCByZWdpb25z IGdpdmVuIHRvIHRoZSBjb21wb3NpdG9yLiBJdCBjYW4gb25seSBiZSBydW4gaW4gRHVtcFJlbmRl clRyZWUuIFRoZSBvdXRwdXR0ZWQgcmVjdHMgc2hvdWxkIGNvdmVyIHRoZSBoaXQgdGVzdCByZWdp b25zIG9mIGFsbCB0aGUgbGlzdGVkIGVsZW1lbnRzLgogCiBub3JtYWxGbG93WzBdOiAoOCwgNzIs IDc4NCwgMTApCi1ub3JtYWxGbG93WzFdOiAoOCwgNzIsIDc4NCwgMTApCi1ub3JtYWxGbG93WzJd OiAoMTI4LCA3MiwgMzAsIDEwKQotbm9ybWFsRmxvd1szXTogKDgsIDcyLCA3ODQsIDEwKQotYWJz b2x1dGVDaGlsZENvbnRhaW5lclswXTogKDgsIDE2MiwgNzg0LCAxMCkKLWFic29sdXRlQ2hpbGRD b250YWluZXJbMV06ICg4LCAxNjIsIDc4NCwgMTApCi1hYnNvbHV0ZUNoaWxkQ29udGFpbmVyWzJd OiAoOCwgMTYyLCA3ODQsIDEwKQotYWJzb2x1dGVDaGlsZENvbnRhaW5lclszXTogKDExOCwgMzAw LCAxNDAsIDEwKQotYWJzb2x1dGVDaGlsZENvbnRhaW5lcls0XTogKDExOCwgMzAwLCAxNDAsIDEw KQotcmVsYXRpdmVDaGlsZENvbnRhaW5lclswXTogKDgsIDI3MiwgNzg0LCAxMCkKLXJlbGF0aXZl Q2hpbGRDb250YWluZXJbMV06ICg4LCAyNzIsIDc4NCwgMTApCi1yZWxhdGl2ZUNoaWxkQ29udGFp bmVyWzJdOiAoOCwgMjcyLCA3ODQsIDEwKQotcmVsYXRpdmVDaGlsZENvbnRhaW5lclszXTogKDEy OCwgNDcyLCAxNDAsIDEwKQotb3ZlcmhhbmdpbmdDb250YWluZXJbMF06ICg4LCAzNjIsIDc4NCwg MTApCi1vdmVyaGFuZ2luZ0NvbnRhaW5lclsxXTogKDgsIDM2MiwgMTEwLCA4MCkKLW92ZXJoYW5n aW5nQ29udGFpbmVyWzJdOiAoOCwgMzYyLCAxMTAsIDgwKQotdHJhbnNmb3JtZWRDaGlsZENvbnRh aW5lclswXTogKDYyLCA0MjEsIDY2MSwgMzIpCi10cmFuc2Zvcm1lZENoaWxkQ29udGFpbmVyWzFd OiAoNjIsIDQyMSwgNjYxLCAzMikKLXRyYW5zZm9ybWVkQ2hpbGRDb250YWluZXJbMl06ICg4LCA0 MzIsIDc2OSwgMTApCi1jb250aW51YXRpb25bMF06ICgxMDgsIDUwMiwgMTEwLCAxMCkKLW5vcm1h bEZsb3dbMF06ICg4LCA1NDQsIDc2OSwgMTApCi1ub3JtYWxGbG93WzFdOiAoOCwgNTQ0LCA3Njks IDEwKQotbm9ybWFsRmxvd1syXTogKDEyOCwgNTQ0LCAzMCwgMTApCi1ub3JtYWxGbG93WzNdOiAo OCwgNTQ0LCA3NjksIDEwKQotYWJzb2x1dGVDaGlsZENvbnRhaW5lclswXTogKDExOCwgMzAwLCAx NDAsIDEwKQorYWJzb2x1dGVDaGlsZENvbnRhaW5lclswXTogKDgsIDEwMiwgNzg0LCAxMCkKIGFi c29sdXRlQ2hpbGRDb250YWluZXJbMV06ICgxMTgsIDMwMCwgMTQwLCAxMCkKLWFic29sdXRlQ2hp bGRDb250YWluZXJbMl06ICg4LCA2MzQsIDc2OSwgMTApCi1hYnNvbHV0ZUNoaWxkQ29udGFpbmVy WzNdOiAoOCwgNjM0LCA3NjksIDEwKQotYWJzb2x1dGVDaGlsZENvbnRhaW5lcls0XTogKDgsIDYz NCwgNzY5LCAxMCkKLXJlbGF0aXZlQ2hpbGRDb250YWluZXJbMF06ICg4LCA3NDQsIDc2OSwgMTAp Ci1yZWxhdGl2ZUNoaWxkQ29udGFpbmVyWzFdOiAoOCwgNzQ0LCA3NjksIDEwKQotcmVsYXRpdmVD aGlsZENvbnRhaW5lclsyXTogKDgsIDc0NCwgNzY5LCAxMCkKLXJlbGF0aXZlQ2hpbGRDb250YWlu ZXJbM106ICgxMjgsIDk0NCwgMTQwLCAxMCkKLW92ZXJoYW5naW5nQ29udGFpbmVyWzBdOiAoOCwg ODM0LCA3NjksIDEwKQotb3ZlcmhhbmdpbmdDb250YWluZXJbMV06ICg4LCA4MzQsIDExMCwgODAp Ci1vdmVyaGFuZ2luZ0NvbnRhaW5lclsyXTogKDgsIDgzNCwgMTEwLCA4MCkKLXRyYW5zZm9ybWVk Q2hpbGRDb250YWluZXJbMF06ICg2MiwgODkzLCA2NjEsIDMyKQotdHJhbnNmb3JtZWRDaGlsZENv bnRhaW5lclsxXTogKDYyLCA4OTMsIDY2MSwgMzIpCi10cmFuc2Zvcm1lZENoaWxkQ29udGFpbmVy WzJdOiAoOCwgOTA0LCA3NjksIDEwKQotY29udGludWF0aW9uWzBdOiAoMTA4LCA5NzQsIDExMCwg MTApCi1UaGlzIHRlc3RzIHZlcmlmaWVzIHRoZSBoaXQgdGVzdCByZWdpb25zIGdpdmVuIHRvIHRo ZSBjb21wb3NpdG9yLiBJdCBjYW4gb25seSBiZSBydW4gaW4gRHVtcFJlbmRlclRyZWUuIFRoZSBv dXRwdXR0ZWQgcmVjdHMgc2hvdWxkIGNvdmVyIHRoZSBoaXQgdGVzdCByZWdpb25zIG9mIGFsbCB0 aGUgbGlzdGVkIGVsZW1lbnRzLgotCityZWxhdGl2ZUNoaWxkQ29udGFpbmVyWzBdOiAoOCwgMTUy LCA3ODQsIDEwKQorcmVsYXRpdmVDaGlsZENvbnRhaW5lclsxXTogKDEyOCwgMzUyLCAxNDAsIDEw KQorb3ZlcmhhbmdpbmdDb250YWluZXJbMF06ICg4LCAyMDIsIDc4NCwgMTApCitvdmVyaGFuZ2lu Z0NvbnRhaW5lclsxXTogKDgsIDIwMiwgMTEwLCA4MCkKK3RyYW5zZm9ybWVkQ2hpbGRDb250YWlu ZXJbMF06ICg2MywgMjQwLCA2NzQsIDM0KQordHJhbnNmb3JtZWRDaGlsZENvbnRhaW5lclsxXTog KDgsIDI1MiwgNzg0LCAxMCkKK2NvbnRpbnVhdGlvblswXTogKDEwOCwgMzAyLCAxMDAsIDEwKQor aW5saW5lQWJzb2x1dGVDaGlsZENvbnRhaW5lclswXTogKDM3OCwgMzAwLCAyNTAsIDEwKQoraW5s aW5lQWJzb2x1dGVDaGlsZENvbnRhaW5lclsxXTogKDEwOCwgMzUyLCAyNzAsIDEwKQogCkluZGV4 OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25zCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBlY3RhdGlvbnMJKHJl dmlzaW9uIDEzODM5OSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBl Y3RhdGlvbnMJKHdvcmtpbmcgY29weSkKQEAgLTQwNDMsNiArNDA0Myw3IEBAIHdlYmtpdC5vcmcv Yi8xMDEyNTUgWyBNYWMgQW5kcm9pZCBdIGZhc3QKIAogIyBOZWVkcyBiYXNlbGluZXMKIEJ1Zyh0 aGFraXMpIFsgQW5kcm9pZCBSZWxlYXNlIF0gZmFzdC9mb3Jtcy96b29tZWQtY29udHJvbHMuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQorQnVnKGxldml3KSBbIEFuZHJvaWQgV2luIE1hYyBdIHBs YXRmb3JtL2Nocm9taXVtL2Zhc3QvZXZlbnRzL3RvdWNoL2NvbXBvc2l0b3ItdG91Y2gtaGl0LXJl Y3RzLmh0bWwgWyBGYWlsdXJlIF0KIAogIyBGbGFreSBvbiB3aW43IHNpbmNlIGF0IGxlYXN0IHIx NjI0MTAKIHdlYmtpdC5vcmcvYi85OTg4NiBbIFdpbjcgXSBmYXN0L2RvbS9zaGFkb3cvaW5wdXQt d2l0aC12YWxpZGF0aW9uLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIFBhc3MgXQpJbmRleDogTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZmFzdC9ldmVudHMvdG91Y2gvY29tcG9zaXRvci10 b3VjaC1oaXQtcmVjdHMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS9mYXN0L2V2ZW50cy90b3VjaC9jb21wb3NpdG9yLXRvdWNoLWhpdC1yZWN0cy5odG1s CShyZXZpc2lvbiAxMzgzOTkpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9mYXN0 L2V2ZW50cy90b3VjaC9jb21wb3NpdG9yLXRvdWNoLWhpdC1yZWN0cy5odG1sCSh3b3JraW5nIGNv cHkpCkBAIC01NCwxMTIgKzU0LDE1IEBAIFRoZSBvdXRwdXR0ZWQgcmVjdHMgc2hvdWxkIGNvdmVy IHRoZSBoaXQKIAkJPGRpdj5jYXVzZXMgYTwvZGl2PgogCQljb250aW51YXRpb248L2I+CiAJPC9k aXY+Ci08L2Rpdj4KLTxzY3JpcHQ+Ci1pZiAoIXdpbmRvdy50ZXN0UnVubmVyKQotCXJldHVybjsK LQotd2luZG93LnRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOwotCi1mdW5jdGlvbiBsaXN0ZW5lcigp IHsgfQotCi1mdW5jdGlvbiBsb2cobXNnKSB7Ci0JdmFyIHNwYW4gPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJzcGFuIik7Ci0JZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKS5hcHBl bmRDaGlsZChzcGFuKTsKLSAgICBzcGFuLmlubmVySFRNTCA9IG1zZyArICc8YnIgLz4nOwotfQot Ci1mdW5jdGlvbiBzb3J0UmVjdHMoYSwgYikgewotCXJldHVybiBhLnRvcCAtIGIudG9wOwotfQot Ci1mdW5jdGlvbiBsb2dSZWN0cyhpZCkgewotCWVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZChpZCk7Ci0JZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCd0b3VjaHN0YXJ0JywgbGlzdGVu ZXIsIGZhbHNlKTsKLQlyZWN0cyA9IHdpbmRvdy5pbnRlcm5hbHMudG91Y2hFdmVudFRhcmdldENs aWVudFJlY3RzKGRvY3VtZW50KTsKLQl2YXIgc29ydGVkUmVjdHMgPSBuZXcgQXJyYXkoKTsKLQlm b3IgKHZhciBpID0gMDsgaSA8IHJlY3RzLmxlbmd0aDsgKytpKQotCQlzb3J0ZWRSZWN0c1tpXSA9 IHJlY3RzW2ldOwotCXNvcnRlZFJlY3RzLnNvcnQoc29ydFJlY3RzKTsKLQlmb3IgKHZhciBpID0g MDsgaSA8IHJlY3RzLmxlbmd0aDsgKytpKQotCQlsb2coaWQgKyAiWyIgKyBpICsgIl06ICgiICsg c29ydGVkUmVjdHNbaV0ubGVmdCArICIsICIgKyBzb3J0ZWRSZWN0c1tpXS50b3AgKyAiLCAiICsg c29ydGVkUmVjdHNbaV0ud2lkdGggKyAiLCAiICsgc29ydGVkUmVjdHNbaV0uaGVpZ2h0ICsgIiki KTsKLQllbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoJ3RvdWNoc3RhcnQnLCBsaXN0ZW5lciwg ZmFsc2UpOwotfQotCi1sb2dSZWN0cygibm9ybWFsRmxvdyIpOwotbG9nUmVjdHMoImFic29sdXRl Q2hpbGRDb250YWluZXIiKTsKLWxvZ1JlY3RzKCJyZWxhdGl2ZUNoaWxkQ29udGFpbmVyIik7Ci1s b2dSZWN0cygib3ZlcmhhbmdpbmdDb250YWluZXIiKTsKLWxvZ1JlY3RzKCJ0cmFuc2Zvcm1lZENo aWxkQ29udGFpbmVyIik7Ci1sb2dSZWN0cygiY29udGludWF0aW9uIik7Ci0KLXZhciB0ZXN0Q29u dGFpbmVyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRlc3RzIik7Ci10ZXN0Q29udGFpbmVy LnBhcmVudE5vZGUucmVtb3ZlQ2hpbGQodGVzdENvbnRhaW5lcik7Ci0KLTwvc2NyaXB0PgotPC9i b2R5PgotPCFET0NUWVBFIGh0bWw+Ci08aHRtbD4KLTxoZWFkPgotPHN0eWxlPgotI3RyYW5zZm9y bWVkQ2hpbGQgewotCS13ZWJraXQtdHJhbnNmb3JtOiByb3RhdGUzZCgwLjIsIDEsIDAsIDM1Z3Jh ZCk7Ci19Ci0jYWJzb2x1dGVDaGlsZCB7Ci0JcG9zaXRpb246IGFic29sdXRlOwotCXRvcDogMzAw cHg7Ci19Ci0jcmVsYXRpdmVDaGlsZCB7Ci0JcG9zaXRpb246IHJlbGF0aXZlOwotCXRvcDogMjAw cHg7Ci19Ci0jb3ZlcmhhbmdpbmdDb250YWluZXIgewotCWhlaWdodDogMTBweDsKLX0KLSNvdmVy aGFuZ2luZ0Zsb2F0aW5nQ2hpbGQgewotCXdpZHRoOiAxMDBweDsKLQlmbG9hdDogbGVmdDsKLX0K LSN0ZXN0cyB7Ci0JZm9udDogMTBweCBBaGVtOwotfQotPC9zdHlsZT4KLTwvaGVhZD4KLTxib2R5 PgotPHAgaWQ9ImRlc2NyaXB0aW9uIj5UaGlzIHRlc3RzIHZlcmlmaWVzIHRoZSBoaXQgdGVzdCBy ZWdpb25zIGdpdmVuIHRvIHRoZSBjb21wb3NpdG9yLiBJdCBjYW4gb25seSBiZSBydW4gaW4gRHVt cFJlbmRlclRyZWUuCi1UaGUgb3V0cHV0dGVkIHJlY3RzIHNob3VsZCBjb3ZlciB0aGUgaGl0IHRl c3QgcmVnaW9ucyBvZiBhbGwgdGhlIGxpc3RlZCBlbGVtZW50cy48L3A+Ci08ZGl2IGlkPSJjb25z b2xlIj48L2Rpdj4KLQotPGRpdiBpZD0idGVzdHMiPgotCTxkaXYgaWQ9Im5vcm1hbEZsb3ciPgot CQlMb3JlbSBpcHN1bQotCQk8c3Bhbj5zdW08L3NwYW4+LgotCTwvZGl2PgotCTxkaXYgaWQ9ImFi c29sdXRlQ2hpbGRDb250YWluZXIiPgotCQlMb3JlbSBpcHN1bQotCQk8c3BhbiBpZD0iYWJzb2x1 dGVDaGlsZCI+QWJzb2x1dGUgY2hpbGQ8L3NwYW4+Ci0JPC9kaXY+Ci0JPGRpdiBpZD0icmVsYXRp dmVDaGlsZENvbnRhaW5lciI+Ci0JCUxvcmVtIGlwc3VtCi0JCTxzcGFuIGlkPSJyZWxhdGl2ZUNo aWxkIj5SZWxhdGl2ZSBjaGlsZDwvc3Bhbj4KLQk8L2Rpdj4KLQk8ZGl2IGlkPSJvdmVyaGFuZ2lu Z0NvbnRhaW5lciI+Ci0JCTxkaXYgaWQ9Im92ZXJoYW5naW5nRmxvYXRpbmdDaGlsZCI+T3Zlcmhh bmdpbmcgZmxvYXQgb3ZlcmhhbmdpbmcgZmxvYXQgb3ZlcmhhbmdpbmcgZmxvYXQgb3Zlcmhhbmdp bmcgZmxvYXQ8L2Rpdj4KLQk8L2Rpdj4KLQk8ZGl2IGlkPSJ0cmFuc2Zvcm1lZENoaWxkQ29udGFp bmVyIj4KLQkJPGRpdiBpZD0idHJhbnNmb3JtZWRDaGlsZCI+VHJhbnNmb3JtZWQ8L2Rpdj4KLQk8 L2Rpdj4KIAk8ZGl2PgotCQk8YiBpZD0iY29udGludWF0aW9uIj5UaGlzIGIgdGFnCi0JCTxkaXY+ Y2F1c2VzIGE8L2Rpdj4KLQkJY29udGludWF0aW9uPC9iPgorCQk8c3BhbiBpZD0iaW5saW5lQWJz b2x1dGVDaGlsZENvbnRhaW5lciI+CisJCQlJbmxpbmUgd2l0aCBhYnNvbHV0ZSBjaGlsZC4KKwkJ CTxzcGFuIGlkPSJhYnNvbHV0ZUNoaWxkIj5BYnNvbHV0ZSBjaGlsZCBpbiBpbmxpbmUuPC9zcGFu PgorCQk8L3NwYW4+CiAJPC9kaXY+CiA8L2Rpdj4KIDxzY3JpcHQ+Ci1pZiAoIXdpbmRvdy50ZXN0 UnVubmVyKQotCXJldHVybjsKIAotd2luZG93LnRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOwogCiBm dW5jdGlvbiBsaXN0ZW5lcigpIHsgfQogCkBAIC0xODYsMTUgKzg5LDIzIEBAIGZ1bmN0aW9uIGxv Z1JlY3RzKGlkKSB7CiAJZWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCd0b3VjaHN0YXJ0Jywg bGlzdGVuZXIsIGZhbHNlKTsKIH0KIAotbG9nUmVjdHMoIm5vcm1hbEZsb3ciKTsKLWxvZ1JlY3Rz KCJhYnNvbHV0ZUNoaWxkQ29udGFpbmVyIik7Ci1sb2dSZWN0cygicmVsYXRpdmVDaGlsZENvbnRh aW5lciIpOwotbG9nUmVjdHMoIm92ZXJoYW5naW5nQ29udGFpbmVyIik7Ci1sb2dSZWN0cygidHJh bnNmb3JtZWRDaGlsZENvbnRhaW5lciIpOwotbG9nUmVjdHMoImNvbnRpbnVhdGlvbiIpOworZnVu Y3Rpb24gcnVuVGVzdCgpIHsKKwlpZiAoIXdpbmRvdy50ZXN0UnVubmVyKQorCQlyZXR1cm47CisK Kwl3aW5kb3cudGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisJbG9nUmVjdHMoIm5vcm1hbEZsb3ci KTsKKwlsb2dSZWN0cygiYWJzb2x1dGVDaGlsZENvbnRhaW5lciIpOworCWxvZ1JlY3RzKCJyZWxh dGl2ZUNoaWxkQ29udGFpbmVyIik7CisJbG9nUmVjdHMoIm92ZXJoYW5naW5nQ29udGFpbmVyIik7 CisJbG9nUmVjdHMoInRyYW5zZm9ybWVkQ2hpbGRDb250YWluZXIiKTsKKwlsb2dSZWN0cygiY29u dGludWF0aW9uIik7CisJbG9nUmVjdHMoImlubGluZUFic29sdXRlQ2hpbGRDb250YWluZXIiKTsK IAotdmFyIHRlc3RDb250YWluZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdHMiKTsK LXRlc3RDb250YWluZXIucGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0ZXN0Q29udGFpbmVyKTsKKwl2 YXIgdGVzdENvbnRhaW5lciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXN0cyIpOworCXRl c3RDb250YWluZXIucGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0ZXN0Q29udGFpbmVyKTsKK30KIAor cnVuVGVzdCgpOwogPC9zY3JpcHQ+CiA8L2JvZHk+Cg==