67217 2011-08-30 12:04:01 -0700 Mitigate scrollbar differences when running pixel tests 2020-05-11 17:31:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 68134 76247 98011 1 simon.fraser simon.fraser ap aroben eae hyatt leandro leviw mitz rakuco sam simon.fraser webkit-bug-importer oldest_to_newest 459066 0 simon.fraser 2011-08-30 12:04:01 -0700 We need to find a way to avoid having scrollbar differences between OSes from prevent us from sharing pixel results between Mac OS versions. Possible solutions (not mutually exclusive): 1. Exclude the scrollbar area from the the part of the pixel result that gets checksummed 2. Make a scrollbar theme used by DRT that draws dummy scrollbars which look the same across OSes 3. Dump scrollbar thumb position and size in render tree output so that scrollbar bugs can be tested without having to look at pixels. 531276 1 121471 simon.fraser 2012-01-06 12:32:03 -0800 Created attachment 121471 Patch 531286 2 121471 mitz 2012-01-06 12:42:22 -0800 Comment on attachment 121471 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121471&action=review > Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm:46 > +@interface NSScrollView(AppKitSecretsIKnowAbout) The modern convention for such category names is “WebNSScrollViewDetails”. > Tools/DumpRenderTree/mac/DumpRenderTree.mm:458 > + CGFloat knobPosition = round([self doubleValue] * (trackLength - knobLength)); Will round() here work in 32-bit? > Tools/DumpRenderTree/mac/DumpRenderTree.mm:463 > + return NSMakeRect(bounds.origin.x, bounds.origin.y + + knobPosition, bounds.size.width, knobLength); + + > Tools/DumpRenderTree/mac/DumpRenderTree.mm:474 > + NSColor *knobColor = [NSColor colorWithDeviceRed:0x80 / 255.0 green:0x80 / 255.0 blue:0x80 / 255.0 alpha:1]; Could make this a function static (and retain the color). > Tools/DumpRenderTree/mac/DumpRenderTree.mm:482 > + NSColor *trackColor = [NSColor colorWithDeviceRed:0xC0 / 255.0 green:0xC0 / 255.0 blue:0xC0 / 255.0 alpha:1]; Ditto. 531350 3 121471 simon.fraser 2012-01-06 13:45:22 -0800 Comment on attachment 121471 Patch Landed in http://trac.webkit.org/changeset/104331 Keeping bug open to enable mock scrollbars by default. 539812 4 leviw 2012-01-20 14:56:02 -0800 (In reply to comment #3) > (From update of attachment 121471 [details]) > Landed in http://trac.webkit.org/changeset/104331 > > Keeping bug open to enable mock scrollbars by default. Is there a plan to update mac-snowleopard results to go along with this? On ToT right now, it's impossible to make it through the snowleopard pixel tests without bailing due to too many errors. I'd love for the intent of this patch to come through, but right now I can't even run the tests. This is very disruptive. 540878 5 leviw 2012-01-23 15:22:05 -0800 (In reply to comment #4) > Is there a plan to update mac-snowleopard results to go along with this? On ToT right now, it's impossible to make it through the snowleopard pixel tests without bailing due to too many errors. I'd love for the intent of this patch to come through, but right now I can't even run the tests. This is very disruptive. I'm just going to go ahead and add snowleopard expectations for the failing tests myself. 540910 6 simon.fraser 2012-01-23 15:52:04 -0800 Please do, sorry I didn't respond sooner. 554148 7 121471 eric 2012-02-10 10:18:55 -0800 Comment on attachment 121471 Patch Cleared Dan Bernstein's review+ from obsolete attachment 121471 so that this bug does not appear in http://webkit.org/pending-commit. 1651538 8 webkit-bug-importer 2020-05-11 17:31:14 -0700 <rdar://problem/63113462> 121471 2012-01-06 12:32:03 -0800 2012-02-10 10:18:55 -0800 Patch bug-67217-20120106123202.patch text/plain 9370 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjhjOTJlOGE0NzA5ZTlj NTBhYzkzOWIwMWU2ODMzNGRlN2Y1OWE5Zi4uZTVmNjdhZjllNzZjYjRkMjM3M2RmNjgzOWU2YmI1 YjYwZDczNDFhMiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTAxLTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1pdGlnYXRlIHNj cm9sbGJhciBkaWZmZXJlbmNlcyB3aGVuIHJ1bm5pbmcgcGl4ZWwgdGVzdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3MjE3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3J0IFdlYkNvcmU6OlNldHRp bmdzOjptb2NrU2Nyb2xsYmFyc0VuYWJsZWQoKSBmb3IgRFJULgorCisgICAgICAgICogV2ViQ29y ZS5leHAuaW46CisKIDIwMTItMDEtMDUgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHRlbXBvcmFsIGRpbWVuc2lvbiBwb3J0aW9uIG9m IE1lZGlhIEZyYWdtZW50cyBVUkkgc3BlY2lmaWNhdGlvbiBmb3IgdmlkZW8vYXVkaW8KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwppbmRleCBkNTY1ZmNlZmQyNWYxMzM3YmU2NjNhMjM5ZjI4YmU3ZWMzMjM0MTUzLi5i MTZmMzEzODk3NjY1OGU5NTgyYmIyNDk1NDc3ZDNjY2Q2ZWU3MjMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDEtMDYgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CisKKyAgICAgICAgTWl0aWdhdGUgc2Nyb2xsYmFyIGRpZmZlcmVuY2VzIHdo ZW4gcnVubmluZyBwaXhlbCB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjcyMTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKyAgICAgICAgCisgICAgICAgIE1ha2UgaXQgcG9zc2libGUgdG8gcmVnaXN0ZXIgYSBjdXN0 b20gTlNTY3JvbGxlciBjbGFzcywgd2hpY2gKKyAgICAgICAgdGhlIFdlYkR5bmFtaWNTY3JvbGxC YXJzVmlldyB3aWxsIHVzZSB3aGVuIG1vY2sgc2Nyb2xsYmFycyBhcmUgZW5hYmxlZC4KKyAgICAg ICAgCisgICAgICAgIEFsc28gZW5zdXJlIHRoYXQgdGhlIFdlYlByZWZlcmVuY2VzIG1vY2sgc2Ny b2xsYmFycyBwcmVmZXJlbmNlIGlzCisgICAgICAgIG1pZ3JhdGVkIGludG8gU2V0dGluZ3MuCisK KyAgICAgICAgKiBXZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5oOgorICAgICAgICAq IFdlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3Lm1tOgorICAgICAgICAoK1tXZWJEeW5h bWljU2Nyb2xsQmFyc1ZpZXcgX2hvcml6b250YWxTY3JvbGxlckNsYXNzXSk6CisgICAgICAgICgr W1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBfdmVydGljYWxTY3JvbGxlckNsYXNzXSk6CisgICAg ICAgICgrW1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldyBzZXRDdXN0b21TY3JvbGxlckNsYXNzOl0p OgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJl ZmVyZW5jZXNDaGFuZ2VkOl0pOgorCiAyMDEyLTAxLTA1ICBQcmF0aWsgU29sYW5raSAgPHBzb2xh bmtpQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJGcmFtZUxvYWRlckNsaWVudDo6dXNlckFnZW50 IGRvZXMgdW5uZWNlc3NhcnkgTlNTdHJpbmcvTlNVUkwgY29udmVyc2lvbnMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KaW5kZXggYTJhMDU2NDE1ZjY3ZDYxNmJlODcyYTlmNDI4ZjYyOTEyNGU3ZjQ1MS4uNmNk Nzc0ODllNDQxOTEzMTBiYTUyNzMyYWE3MzQ1ZGFkNjg1Y2M1NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KQEAgLTk0Myw2ICs5NDMsNyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MxOXNldFNob3dEZWJ1 Z0JvcmRlcnNFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMjBzZXRDdXJzaXZlRm9udEZhbWlseUVS S04zV1RGMTJBdG9taWNTdHJpbmdFMTFVU2NyaXB0Q29kZQogX19aTjdXZWJDb3JlOFNldHRpbmdz MjBzZXRGYW50YXN5Rm9udEZhbWlseUVSS04zV1RGMTJBdG9taWNTdHJpbmdFMTFVU2NyaXB0Q29k ZQogX19aTjdXZWJDb3JlOFNldHRpbmdzMjBzZXRYU1NBdWRpdG9yRW5hYmxlZEViCitfX1pON1dl YkNvcmU4U2V0dGluZ3MyMW1vY2tTY3JvbGxiYXJzRW5hYmxlZEV2CiBfX1pON1dlYkNvcmU4U2V0 dGluZ3MyMXNldFNob3dSZXBhaW50Q291bnRlckViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MyMXNl dFN0YW5kYXJkRm9udEZhbWlseUVSS04zV1RGMTJBdG9taWNTdHJpbmdFMTFVU2NyaXB0Q29kZQog X19aTjdXZWJDb3JlOFNldHRpbmdzMjFzZXRXZWJTZWN1cml0eUVuYWJsZWRFYgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcuaCBi L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3LmgKaW5k ZXggYzI4OWEwNDE0MTVmNTkxZGZlZjY0NTNkY2Y1MTkwYWZjNzg4ODQzOC4uMzBiNGRhYTBhZWFl YmY1M2I4ZjJjMGQyMjE5NTdiOThiNzA1MWFlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5oCkBAIC00Miw2ICs0Miw5IEBA IHN0cnVjdCBXZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXdQcml2YXRlOwogI2VuZGlmCiB9CiAKKy8v IEZvciB1c2UgYnkgRHVtcFJlbmRlclRyZWUgb25seS4KKysgKHZvaWQpc2V0Q3VzdG9tU2Nyb2xs ZXJDbGFzczooQ2xhc3Mpc2Nyb2xsZXJDbGFzczsKKwogLy8gVGhpcyB3YXMgb3JpZ2luYWxseSBh ZGRlZCBmb3IgU2FmYXJpJ3MgYmVuZWZpdCwgYnV0IFNhZmFyaSBoYXMgbm90IHVzZWQgaXQgZm9y IGEgbG9uZyB0aW1lLgogLy8gUGVyaGFwcyBpdCBjYW4gYmUgcmVtb3ZlZC4KIC0gKHZvaWQpc2V0 QWxsb3dzSG9yaXpvbnRhbFNjcm9sbGluZzooQk9PTClmbGFnOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJEeW5hbWljU2Nyb2xsQmFyc1ZpZXcubW0gYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5tbQppbmRleCA3MWVm NDkyYmYyMWQyMDA0NTRlMDIxZGUwNDkwZGEyYWEwZTU2MzhiLi5jNzM2YmU5Njk2NDM4NzQ5ZWNh Y2E4Y2UwNjE5MDA2NjQ2MDIzZmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYkR5bmFtaWNTY3JvbGxCYXJzVmlldy5tbQpAQCAtNDMsNiArNDMsMTEgQEAgY29u c3QgaW50IFdlYkNvcmVTY3JvbGxiYXJBbHdheXNPbiA9IFNjcm9sbGJhckFsd2F5c09uOwogQ09N UElMRV9BU1NFUlQoc2l6ZW9mKFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlldykgPT0gMHg4YywgV2Vi RHluYW1pY1Njcm9sbEJhcnNWaWV3X2lzX2V4cGVjdGVkX3NpemUpOwogI2VuZGlmCiAKK0BpbnRl cmZhY2UgTlNTY3JvbGxWaWV3KEFwcEtpdFNlY3JldHNJS25vd0Fib3V0KQorKyAoQ2xhc3MpX2hv cml6b250YWxTY3JvbGxlckNsYXNzOworKyAoQ2xhc3MpX3ZlcnRpY2FsU2Nyb2xsZXJDbGFzczsK K0BlbmQKKwogc3RydWN0IFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlld1ByaXZhdGUgewogICAgIHVu c2lnbmVkIGluVXBkYXRlU2Nyb2xsZXJzTGF5b3V0UGFzczsKIApAQCAtNzcsNiArODIsMjkgQEAg c3RydWN0IFdlYkR5bmFtaWNTY3JvbGxCYXJzVmlld1ByaXZhdGUgewogCiBAaW1wbGVtZW50YXRp b24gV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3CiAKK3N0YXRpYyBDbGFzcyBjdXN0b21TY3JvbGxl ckNsYXNzOworCisrIChDbGFzcylfaG9yaXpvbnRhbFNjcm9sbGVyQ2xhc3MKK3sKKyAgICBpZiAo U2V0dGluZ3M6Om1vY2tTY3JvbGxiYXJzRW5hYmxlZCgpICYmIGN1c3RvbVNjcm9sbGVyQ2xhc3Mp CisgICAgICAgIHJldHVybiBjdXN0b21TY3JvbGxlckNsYXNzOworCisgICAgcmV0dXJuIFtzdXBl ciBfaG9yaXpvbnRhbFNjcm9sbGVyQ2xhc3NdOworfQorCisrIChDbGFzcylfdmVydGljYWxTY3Jv bGxlckNsYXNzCit7CisgICAgaWYgKFNldHRpbmdzOjptb2NrU2Nyb2xsYmFyc0VuYWJsZWQoKSAm JiBjdXN0b21TY3JvbGxlckNsYXNzKQorICAgICAgICByZXR1cm4gY3VzdG9tU2Nyb2xsZXJDbGFz czsKKworICAgIHJldHVybiBbc3VwZXIgX2hvcml6b250YWxTY3JvbGxlckNsYXNzXTsKK30KKwor KyAodm9pZClzZXRDdXN0b21TY3JvbGxlckNsYXNzOihDbGFzcylzY3JvbGxlckNsYXNzCit7Cisg ICAgY3VzdG9tU2Nyb2xsZXJDbGFzcyA9IHNjcm9sbGVyQ2xhc3M7Cit9CisKIC0gKGlkKWluaXRX aXRoRnJhbWU6KE5TUmVjdClmcmFtZQogewogICAgIGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdFdp dGhGcmFtZTpmcmFtZV0pKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDUx YTViMjE5YWVkNzQ0NDQyZGY2Y2ZiN2M2ZjJmNjQxNjllMjZiYTQuLjdkZWQyYWE3MDNlYzNmOGRi OWNmYWZmMTU0OTgwNjQ5ZTFhZTQzOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcu bW0KQEAgLTE0OTcsNiArMTQ5Nyw3IEBAIHN0YXRpYyBib29sIG5lZWRzU2VsZlJldGFpbldoaWxl TG9hZGluZ1F1aXJrKCkKICAgICBzZXR0aW5ncy0+c2V0TWVkaWFQbGF5YmFja0FsbG93c0lubGlu ZShbcHJlZmVyZW5jZXMgbWVkaWFQbGF5YmFja0FsbG93c0lubGluZV0pOwogICAgIHNldHRpbmdz LT5zZXRTdXBwcmVzc0luY3JlbWVudGFsUmVuZGVyaW5nKFtwcmVmZXJlbmNlcyBzdXBwcmVzc0lu Y3JlbWVudGFsUmVuZGVyaW5nXSk7CiAgICAgc2V0dGluZ3MtPnNldEJhY2tzcGFjZUtleU5hdmln YXRpb25FbmFibGVkKFtwcmVmZXJlbmNlcyBiYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZF0p OworICAgIHNldHRpbmdzLT5zZXRNb2NrU2Nyb2xsYmFyc0VuYWJsZWQoW3ByZWZlcmVuY2VzIG1v Y2tTY3JvbGxiYXJzRW5hYmxlZF0pOwogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIHNl dHRpbmdzLT5zZXRTaG91bGREaXNwbGF5U3VidGl0bGVzKFtwcmVmZXJlbmNlcyBzaG91bGREaXNw bGF5U3VidGl0bGVzXSk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggZjFlZmMxZDFiMDE4YmJlYWJhNWRlNmE4MDg1NWY3MzI5YTcyOTI5Ni4uMGIz ZDFkM2YzMmRlOTQxY2RmZDVkYzJkYTU3NDFkMDQyZDQ5NDgyYSAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTAx LTA2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1p dGlnYXRlIHNjcm9sbGJhciBkaWZmZXJlbmNlcyB3aGVuIHJ1bm5pbmcgcGl4ZWwgdGVzdHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3MjE3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBBZGQg YW4gTlNTY3JvbGxlciBzdWJjbGFzcyB0aGF0IGRyYXdzIG1vY2sgc2Nyb2xsYmFycyBpZGVudGlj YWxseQorICAgICAgICB0byB0aGUgV2ViQ29yZSBtb2NrIHNjcm9sbGJhciB0aGVtZSwgYW5kIHJl Z2lzdGVyIGl0IHdpdGggdGhlCisgICAgICAgIFdlYkR5bmFtaWNTY3JvbGxiYXJzVmlldy4KKwor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAgICAgICAg KC1bRFJUTW9ja1Njcm9sbGVyIHJlY3RGb3JQYXJ0Ol0pOgorICAgICAgICAoLVtEUlRNb2NrU2Ny b2xsZXIgZHJhd0tub2JdKToKKyAgICAgICAgKC1bRFJUTW9ja1Njcm9sbGVyIGRyYXdSZWN0Ol0p OgorICAgICAgICAocmVnaXN0ZXJNb2NrU2Nyb2xsYmFycyk6CisgICAgICAgIChwcmVwYXJlQ29u c2lzdGVudFRlc3RpbmdFbnZpcm9ubWVudCk6CisKIDIwMTItMDEtMDUgIEFkYW0gUm9iZW4gIDxh cm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBzb21lIHVubmVjZXNzYXJ5IGNvZGUg ZnJvbSBvbGQtcnVuLXdlYmtpdC10ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBS ZW5kZXJUcmVlLm1tCmluZGV4IGIyNWZhMmE2MTAyOTZiYjBkZTc2OGZhYzFhNDBkMjMzZjBhYzcz M2QuLmFlZDFkNDUyZDljN2NkODQxNjJiMjI3MjI5NmQyMThhODJmZGY0NTEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQorKysgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KQEAgLTY4LDYgKzY4LDcgQEAKICNp bXBvcnQgPFdlYktpdC9XZWJEYXRhYmFzZU1hbmFnZXJQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJL aXQvV2ViRG9jdW1lbnRQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViRGV2aWNlT3JpZW50 YXRpb25Qcm92aWRlck1vY2suaD4KKyNpbXBvcnQgPFdlYktpdC9XZWJEeW5hbWljU2Nyb2xsYmFy c1ZpZXcuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJFZGl0aW5nRGVsZWdhdGUuaD4KICNpbXBvcnQg PFdlYktpdC9XZWJGcmFtZVZpZXcuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJIaXN0b3J5Lmg+CkBA IC00MzksNiArNDQwLDYwIEBAIHN0YXRpYyB2b2lkIGFkanVzdEZvbnRzKCkKICAgICBhY3RpdmF0 ZVRlc3RpbmdGb250cygpOwogfQogCitAaW50ZXJmYWNlIERSVE1vY2tTY3JvbGxlciA6IE5TU2Ny b2xsZXIKK0BlbmQKKworQGltcGxlbWVudGF0aW9uIERSVE1vY2tTY3JvbGxlcgorCistIChOU1Jl Y3QpcmVjdEZvclBhcnQ6KE5TU2Nyb2xsZXJQYXJ0KXBhcnRDb2RlCit7CisgICAgc3dpdGNoIChw YXJ0Q29kZSkgeworICAgIGNhc2UgTlNTY3JvbGxlcktub2I6IHsKKyAgICAgICAgTlNSZWN0IGZy YW1lUmVjdCA9IFtzZWxmIGZyYW1lXTsKKyAgICAgICAgTlNSZWN0IGJvdW5kcyA9IFtzZWxmIGJv dW5kc107CisgICAgICAgIEJPT0wgaXNIb3Jpem9udGFsID0gZnJhbWVSZWN0LnNpemUud2lkdGgg PiBmcmFtZVJlY3Quc2l6ZS5oZWlnaHQ7CisgICAgICAgIENHRmxvYXQgdHJhY2tMZW5ndGggPSBp c0hvcml6b250YWwgPyBib3VuZHMuc2l6ZS53aWR0aCA6IGJvdW5kcy5zaXplLmhlaWdodDsKKyAg ICAgICAgQ0dGbG9hdCBtaW5Lbm9iU2l6ZSA9IGlzSG9yaXpvbnRhbCA/IGJvdW5kcy5zaXplLmhl aWdodCA6IGJvdW5kcy5zaXplLndpZHRoOworICAgICAgICBDR0Zsb2F0IGtub2JMZW5ndGggPSBt YXgobWluS25vYlNpemUsIHJvdW5kKHRyYWNrTGVuZ3RoICogW3NlbGYga25vYlByb3BvcnRpb25d KSk7CisgICAgICAgIENHRmxvYXQga25vYlBvc2l0aW9uID0gcm91bmQoW3NlbGYgZG91YmxlVmFs dWVdICogKHRyYWNrTGVuZ3RoIC0ga25vYkxlbmd0aCkpOworICAgICAgICAKKyAgICAgICAgaWYg KGlzSG9yaXpvbnRhbCkKKyAgICAgICAgICAgIHJldHVybiBOU01ha2VSZWN0KGJvdW5kcy5vcmln aW4ueCArIGtub2JQb3NpdGlvbiwgYm91bmRzLm9yaWdpbi55LCBrbm9iTGVuZ3RoLCBib3VuZHMu c2l6ZS5oZWlnaHQpOworCisgICAgICAgIHJldHVybiBOU01ha2VSZWN0KGJvdW5kcy5vcmlnaW4u eCwgYm91bmRzLm9yaWdpbi55ICsgICsga25vYlBvc2l0aW9uLCBib3VuZHMuc2l6ZS53aWR0aCwg a25vYkxlbmd0aCk7CisgICAgfQorICAgIH0KKyAgICAKKyAgICByZXR1cm4gW3N1cGVyIHJlY3RG b3JQYXJ0OnBhcnRDb2RlXTsKK30KKworLSAodm9pZClkcmF3S25vYgoreworICAgIE5TUmVjdCBr bm9iUmVjdCA9IFtzZWxmIHJlY3RGb3JQYXJ0Ok5TU2Nyb2xsZXJLbm9iXTsKKyAgICAKKyAgICBO U0NvbG9yICprbm9iQ29sb3IgPSBbTlNDb2xvciBjb2xvcldpdGhEZXZpY2VSZWQ6MHg4MCAvIDI1 NS4wIGdyZWVuOjB4ODAgLyAyNTUuMCBibHVlOjB4ODAgLyAyNTUuMCBhbHBoYToxXTsKKyAgICBb a25vYkNvbG9yIHNldF07CisKKyAgICBOU1JlY3RGaWxsKGtub2JSZWN0KTsKK30KKworLSAodm9p ZClkcmF3UmVjdDooTlNSZWN0KWRpcnR5UmVjdAoreworICAgIE5TQ29sb3IgKnRyYWNrQ29sb3Ig PSBbTlNDb2xvciBjb2xvcldpdGhEZXZpY2VSZWQ6MHhDMCAvIDI1NS4wIGdyZWVuOjB4QzAgLyAy NTUuMCBibHVlOjB4QzAgLyAyNTUuMCBhbHBoYToxXTsKKyAgICBbdHJhY2tDb2xvciBzZXRdOwor CisgICAgTlNSZWN0RmlsbChkaXJ0eVJlY3QpOworICAgIAorICAgIFtzZWxmIGRyYXdLbm9iXTsK K30KKworQGVuZAorCitzdGF0aWMgdm9pZCByZWdpc3Rlck1vY2tTY3JvbGxiYXJzKCkKK3sKKyAg ICBbV2ViRHluYW1pY1Njcm9sbEJhcnNWaWV3IHNldEN1c3RvbVNjcm9sbGVyQ2xhc3M6W0RSVE1v Y2tTY3JvbGxlciBjbGFzc11dOworfQorCiBXZWJWaWV3ICpjcmVhdGVXZWJWaWV3QW5kT2Zmc2Ny ZWVuV2luZG93KCkKIHsKICAgICBOU1JlY3QgcmVjdCA9IE5TTWFrZVJlY3QoMCwgMCwgTGF5b3V0 VGVzdENvbnRyb2xsZXI6Om1heFZpZXdXaWR0aCwgTGF5b3V0VGVzdENvbnRyb2xsZXI6Om1heFZp ZXdIZWlnaHQpOwpAQCAtNzUyLDYgKzgwNyw3IEBAIHN0YXRpYyB2b2lkIHByZXBhcmVDb25zaXN0 ZW50VGVzdGluZ0Vudmlyb25tZW50KCkKIAogICAgIHNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFs dWVzRm9yVGVzdGluZygpOwogICAgIGFkanVzdEZvbnRzKCk7CisgICAgcmVnaXN0ZXJNb2NrU2Ny b2xsYmFycygpOwogICAgIAogICAgIGlmIChkdW1wUGl4ZWxzKQogICAgICAgICBzZXR1cE1haW5E aXNwbGF5Q29sb3JQcm9maWxlKCk7Cg==