138029 2014-10-23 15:54:09 -0700 Carets in GMail and iCloud compositions are the foreground text color 2014-10-23 20:23:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino joepeck simon.fraser thorton webkit-bug-importer oldest_to_newest 1043859 0 mmaxfield 2014-10-23 15:54:09 -0700 Carets in GMail and iCloud compositions are the foreground text color 1043860 1 240374 mmaxfield 2014-10-23 15:57:25 -0700 Created attachment 240374 Patch 1043861 2 mmaxfield 2014-10-23 15:58:28 -0700 <rdar://problem/18755592> 1043864 3 240374 mmaxfield 2014-10-23 16:03:12 -0700 Comment on attachment 240374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240374&action=review > Source/WebCore/editing/FrameSelection.cpp:1483 > + if (!topColor.alpha()) This needs to be topColor.hasAlpha() 1043865 4 240374 simon.fraser 2014-10-23 16:06:14 -0700 Comment on attachment 240374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240374&action=review > Source/WebCore/editing/FrameSelection.cpp:1477 > +static inline bool layeredColorsAppearSame(Color bottomColor, Color topColor) Not a huge fan of the name (would prefer something like colorDistinctOverColor() or something), Can this just call blend() and check if the result == bottomColor? > Source/WebCore/editing/FrameSelection.cpp:1481 > + if (bottomColor.red() == topColor.red() && bottomColor.green() == topColor.green() && bottomColor.blue() == topColor.blue()) Would be nice to push this into Color. (colorComponentsEqual or something). > Source/WebCore/editing/FrameSelection.cpp:1483 > + if (!topColor.alpha()) hasAlpha? Do you care about how much alpha? 1043867 5 240375 mmaxfield 2014-10-23 16:16:18 -0700 Created attachment 240375 Patch 1043881 6 240375 commit-queue 2014-10-23 16:49:04 -0700 Comment on attachment 240375 Patch Clearing flags on attachment: 240375 Committed r175152: <http://trac.webkit.org/changeset/175152> 1043882 7 commit-queue 2014-10-23 16:49:08 -0700 All reviewed patches have been landed. Closing bug. 1043891 8 joepeck 2014-10-23 17:33:33 -0700 Seems iOS builds are complaining: Source/WebCore/editing/FrameSelection.cpp:1477:20: error: unused function 'disappearsIntoBackground' [-Werror,-Wunused-function] static inline bool disappearsIntoBackground(Color foreground, Color background) 1 error generated. 1043919 9 240375 darin 2014-10-23 20:16:31 -0700 Comment on attachment 240375 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240375&action=review > Source/WebCore/editing/FrameSelection.cpp:1480 > +static inline bool disappearsIntoBackground(Color foreground, Color background) > +{ > + return background.blend(foreground) == background; > +} Needs to be wrapped in #if ENABLE(TEXT_CARET). Also, is == too strict? Should we have some threshold for close colors? 1043920 10 simon.fraser 2014-10-23 20:23:03 -0700 Build issue was fixed in http://trac.webkit.org/changeset/175155 I mentioned the perceptive matching issue to Myles; he didn't want to get into that rat hole. 240374 2014-10-23 15:57:25 -0700 2014-10-23 16:16:14 -0700 Patch bug-138029-20141023155732.patch text/plain 5729 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ0NmJkMWYyY2E3OWUw ZTFiN2I2NDAzMzhhM2M5NWQ1YWZjMGRkZi4uYWRhZWYxNDJlZmZlMTc0Y2M3NGFlOTA2MjZhNzFj ZjVjMTNjYWFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTEwLTIzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2FyZXRzIGlu IEdNYWlsIGFuZCBpQ2xvdWQgY29tcG9zaXRpb25zIGFyZSB0aGUgZm9yZWdyb3VuZCB0ZXh0IGNv bG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgw MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2 aW91c2x5LCB3ZSB3ZXJlIG9ubHkgY2hlY2tpbmcgd2hldGhlciB0aGUgYmFja2dyb3VuZCBjb2xv cnMgb2YgdGhlIGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQKKyAgICAgICAgZWxlbWVudHMgd2Vy ZSB0aGUgc2FtZSwgcmF0aGVyIHRoYW4gdGFraW5nIHZhbGlkaXR5IGFuZCBvcGFjaXR5IGludG8g Y29uc2lkZXJhdGlvbi4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL2NhcmV0L2NvbG9yLXNwYW4t aW5zaWRlLWVkaXRhYmxlLWJhY2tncm91bmQuaHRtbAorCisgICAgICAgICogZWRpdGluZy9GcmFt ZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsYXllcmVkQ29sb3JzQXBwZWFyU2Ft ZSk6CisgICAgICAgIChXZWJDb3JlOjpDYXJldEJhc2U6OnBhaW50Q2FyZXQpOgorCiAyMDE0LTEw LTIzICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFNh ZmFyaSBjYW5ub3QgcGxheSAnYXVkaW8vYW1yJyBjb250ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAppbmRleCA4MGEwNmY5MDNmZTMzMzFlZjMzODBiYjA5MmY1 OWZkYWU1M2EzMTBkLi4xZjU3NzhiODA3NWEwZjQ2NDcxZGQxOTAzODk4YzIyYTM4N2ZjNTMwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcApAQCAtMTQ3NCw2ICsx NDc0LDE3IEBAIHZvaWQgRnJhbWVTZWxlY3Rpb246OnBhaW50Q2FyZXQoR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBjb25zdCBMYXlvdXRQb2ludCYgcGFpCiAgICAgICAgIENhcmV0QmFzZTo6cGFp bnRDYXJldChtX3NlbGVjdGlvbi5zdGFydCgpLmRlcHJlY2F0ZWROb2RlKCksIGNvbnRleHQsIHBh aW50T2Zmc2V0LCBjbGlwUmVjdCk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBsYXllcmVkQ29s b3JzQXBwZWFyU2FtZShDb2xvciBib3R0b21Db2xvciwgQ29sb3IgdG9wQ29sb3IpCit7CisgICAg aWYgKCFib3R0b21Db2xvci5pc1ZhbGlkKCkgfHwgIXRvcENvbG9yLmlzVmFsaWQoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChib3R0b21Db2xvci5yZWQoKSA9PSB0b3BDb2xvci5y ZWQoKSAmJiBib3R0b21Db2xvci5ncmVlbigpID09IHRvcENvbG9yLmdyZWVuKCkgJiYgYm90dG9t Q29sb3IuYmx1ZSgpID09IHRvcENvbG9yLmJsdWUoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgaWYgKCF0b3BDb2xvci5hbHBoYSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1 cm4gZmFsc2U7Cit9CisKIHZvaWQgQ2FyZXRCYXNlOjpwYWludENhcmV0KE5vZGUqIG5vZGUsIEdy YXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0LCBj b25zdCBMYXlvdXRSZWN0JiBjbGlwUmVjdCkgY29uc3QKIHsKICNpZiBFTkFCTEUoVEVYVF9DQVJF VCkKQEAgLTE0OTksOSArMTUxMCwxMSBAQCB2b2lkIENhcmV0QmFzZTo6cGFpbnRDYXJldChOb2Rl KiBub2RlLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheW91dFBvaQogICAgICAg ICBpZiAocm9vdEVkaXRhYmxlRWxlbWVudCAmJiByb290RWRpdGFibGVFbGVtZW50LT5yZW5kZXJl cigpKSB7CiAgICAgICAgICAgICBjb25zdCBhdXRvJiByb290RWRpdGFibGVTdHlsZSA9IHJvb3RF ZGl0YWJsZUVsZW1lbnQtPnJlbmRlcmVyKCktPnN0eWxlKCk7CiAgICAgICAgICAgICBjb25zdCBh dXRvJiBlbGVtZW50U3R5bGUgPSBlbGVtZW50LT5yZW5kZXJlcigpLT5zdHlsZSgpOwotICAgICAg ICAgICAgaWYgKHJvb3RFZGl0YWJsZVN0eWxlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9w ZXJ0eUJhY2tncm91bmRDb2xvcikgPT0gZWxlbWVudFN0eWxlLnZpc2l0ZWREZXBlbmRlbnRDb2xv cihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcikpIHsKLSAgICAgICAgICAgICAgICBjYXJldENv bG9yID0gcm9vdEVkaXRhYmxlRWxlbWVudC0+cmVuZGVyZXIoKS0+c3R5bGUoKS52aXNpdGVkRGVw ZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlDb2xvcik7Ci0gICAgICAgICAgICAgICAgY29sb3JTcGFj ZSA9IHJvb3RFZGl0YWJsZUVsZW1lbnQtPnJlbmRlcmVyKCktPnN0eWxlKCkuY29sb3JTcGFjZSgp OworICAgICAgICAgICAgYXV0byByb290RWRpdGFibGVCR0NvbG9yID0gcm9vdEVkaXRhYmxlU3R5 bGUudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKKyAg ICAgICAgICAgIGF1dG8gZWxlbWVudEJHQ29sb3IgPSBlbGVtZW50U3R5bGUudmlzaXRlZERlcGVu ZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKKyAgICAgICAgICAgIGlmIChs YXllcmVkQ29sb3JzQXBwZWFyU2FtZShyb290RWRpdGFibGVCR0NvbG9yLCBlbGVtZW50QkdDb2xv cikpIHsKKyAgICAgICAgICAgICAgICBjYXJldENvbG9yID0gcm9vdEVkaXRhYmxlU3R5bGUudmlz aXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5Q29sb3IpOworICAgICAgICAgICAgICAgIGNv bG9yU3BhY2UgPSByb290RWRpdGFibGVTdHlsZS5jb2xvclNwYWNlKCk7CiAgICAgICAgICAgICAg ICAgc2V0VG9Sb290RWRpdGFibGVFbGVtZW50ID0gdHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDZhOGJlM2VhMjhjZDZlYWI5OTI3NDY5ODFkNzlmNjEyNmVhODIyOTUuLmNl NDkzMDM2MTJiMzZmYjkyMzlhZmFlZWZjYmM4MWFlNTFjNmNkZmQgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxNC0xMC0yMyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29t PgorCisgICAgICAgIENhcmV0cyBpbiBHTWFpbCBhbmQgaUNsb3VkIGNvbXBvc2l0aW9ucyBhcmUg dGhlIGZvcmVncm91bmQgdGV4dCBjb2xvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4MDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGVzdCB0aGUgY2FzZSB3aGVyZSB0aGUgY29udGVudCBlZGl0YWJs ZSByb290IGhhcyBhIGJhY2tncm91bmQgY29sb3Igc3BlY2lmaWVkLgorCisgICAgICAgICogZWRp dGluZy9jYXJldC9jb2xvci1zcGFuLWluc2lkZS1lZGl0YWJsZS1iYWNrZ3JvdW5kLWV4cGVjdGVk Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGVkaXRpbmcvY2FyZXQvY29sb3Itc3Bhbi1pbnNpZGUt ZWRpdGFibGUtYmFja2dyb3VuZC5odG1sOiBBZGRlZC4KKwogMjAxNC0xMC0yMyAgSmVyIE5vYmxl ICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBTYWZhcmkgY2Fubm90IHBs YXkgJ2F1ZGlvL2FtcicgY29udGVudC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcv Y2FyZXQvY29sb3Itc3Bhbi1pbnNpZGUtZWRpdGFibGUtYmFja2dyb3VuZC1leHBlY3RlZC5odG1s IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9jYXJldC9jb2xvci1zcGFuLWluc2lkZS1lZGl0YWJsZS1i YWNrZ3JvdW5kLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOWExZjViMTViNTYxOWJmMDk4YzFi ZDViZmViYjdiN2FhZGIyOTY5NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRp bmcvY2FyZXQvY29sb3Itc3Bhbi1pbnNpZGUtZWRpdGFibGUtYmFja2dyb3VuZC1leHBlY3RlZC5o dG1sCkBAIC0wLDAgKzEsNCBAQAorVGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCBjYXJldHMgaW4g Y29udGVudCBlZGl0YWJsZSBkaXZzIHdpdGggYSBiYWNrZ3JvdW5kIGNvbG9yIHNwZWNpZmllZCBy ZW1haW4gYmxhY2sgZXZlbiBpZiB0aGVyZSBpcyBhIHNwYW4gaW5zaWRlIHRoZW0gd2l0aCBhIGZv cmVncm91bmQgY29sb3Igc3BlY2lmaWVkLgorPGRpdiBzdHlsZT0id2lkdGg6IDUwNXB4OyBoZWln aHQ6IDUwNXB4OyBvdmVyZmxvdzogaGlkZGVuOyI+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogNTBweDsg aGVpZ2h0OiA1MDBweDsgYmFja2dyb3VuZC1jb2xvcjogYmxhY2siPjwvZGl2PgorPC9kaXY+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2NhcmV0L2NvbG9yLXNwYW4taW5zaWRlLWVk aXRhYmxlLWJhY2tncm91bmQuaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcvY2FyZXQvY29sb3It c3Bhbi1pbnNpZGUtZWRpdGFibGUtYmFja2dyb3VuZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJkMzMyZjJi OTI5MzZjMmUwNmRiZTA5ZWViZThhYWVkYTQ4NWYwNzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9lZGl0aW5nL2NhcmV0L2NvbG9yLXNwYW4taW5zaWRlLWVkaXRhYmxlLWJhY2tncm91 bmQuaHRtbApAQCAtMCwwICsxLDggQEAKK1RoaXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgY2FyZXRz IGluIGNvbnRlbnQgZWRpdGFibGUgZGl2cyB3aXRoIGEgYmFja2dyb3VuZCBjb2xvciBzcGVjaWZp ZWQgcmVtYWluIGJsYWNrIGV2ZW4gaWYgdGhlcmUgaXMgYSBzcGFuIGluc2lkZSB0aGVtIHdpdGgg YSBmb3JlZ3JvdW5kIGNvbG9yIHNwZWNpZmllZC4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDVweDsg aGVpZ2h0OiA1MDVweDsgb3ZlcmZsb3c6IGhpZGRlbjsiPgorPGRpdiBpZD0iZWRpdCIgY29udGVu dGVkaXRhYmxlPSJ0cnVlIiBzdHlsZT0iYmFja2dyb3VuZDogI2ZmZjsgLXdlYmtpdC10cmFuc2Zv cm0tb3JpZ2luOiBsZWZ0IHRvcDsgLXdlYmtpdC10cmFuc2Zvcm06IHNjYWxlKDUwLCA1MCk7IG91 dGxpbmU6IG5vbmU7IGZvbnQtZmFtaWx5OiBBaGVtOyBmb250LXNpemU6IDEwcHg7Ij48c3BhbiBp ZD0ic3BuIiBzdHlsZT0iY29sb3I6IHJlZDsiPiZuYnNwOyZuYnNwOzwvc3Bhbj48L2Rpdj4KKzwv ZGl2PgorPHNjcmlwdD4KK3ZhciBlZGl0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVkaXQi KTsKK2VkaXQuZm9jdXMoKTsKKzwvc2NyaXB0Pgo= 240375 2014-10-23 16:16:18 -0700 2014-10-23 16:49:04 -0700 Patch bug-138029-20141023161625.patch text/plain 5489 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODQ0NmJkMWYyY2E3OWUw ZTFiN2I2NDAzMzhhM2M5NWQ1YWZjMGRkZi4uYWU5MDJhNGRiNzBhYmY0YmEwMWZjYTczZjJiYWZm ZWZiMTNjNDg0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTEwLTIzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2FyZXRzIGlu IEdNYWlsIGFuZCBpQ2xvdWQgY29tcG9zaXRpb25zIGFyZSB0aGUgZm9yZWdyb3VuZCB0ZXh0IGNv bG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgw MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmV2 aW91c2x5LCB3ZSB3ZXJlIG9ubHkgY2hlY2tpbmcgd2hldGhlciB0aGUgYmFja2dyb3VuZCBjb2xv cnMgb2YgdGhlIGZvcmVncm91bmQgYW5kIGJhY2tncm91bmQKKyAgICAgICAgZWxlbWVudHMgd2Vy ZSB0aGUgc2FtZSwgcmF0aGVyIHRoYW4gdGFraW5nIHZhbGlkaXR5IGFuZCBvcGFjaXR5IGludG8g Y29uc2lkZXJhdGlvbi4KKworICAgICAgICBUZXN0OiBlZGl0aW5nL2NhcmV0L2NvbG9yLXNwYW4t aW5zaWRlLWVkaXRhYmxlLWJhY2tncm91bmQuaHRtbAorCisgICAgICAgICogZWRpdGluZy9GcmFt ZVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkaXNhcHBlYXJzSW50b0JhY2tncm91 bmQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FyZXRCYXNlOjpwYWludENhcmV0KToKKwogMjAxNC0x MC0yMyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBT YWZhcmkgY2Fubm90IHBsYXkgJ2F1ZGlvL2FtcicgY29udGVudC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvZWRp dGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKaW5kZXggODBhMDZmOTAzZmUzMzMxZWYzMzgwYmIwOTJm NTlmZGFlNTNhMzEwZC4uZDlmNGQ1Y2IxMWMxZDNhNjUxNDgxYWJhNjcyZTY2NDExYjA2NGI1YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKQEAgLTE0NzQsNiAr MTQ3NCwxMSBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjpwYWludENhcmV0KEdyYXBoaWNzQ29udGV4 dCogY29udGV4dCwgY29uc3QgTGF5b3V0UG9pbnQmIHBhaQogICAgICAgICBDYXJldEJhc2U6OnBh aW50Q2FyZXQobV9zZWxlY3Rpb24uc3RhcnQoKS5kZXByZWNhdGVkTm9kZSgpLCBjb250ZXh0LCBw YWludE9mZnNldCwgY2xpcFJlY3QpOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgZGlzYXBwZWFy c0ludG9CYWNrZ3JvdW5kKENvbG9yIGZvcmVncm91bmQsIENvbG9yIGJhY2tncm91bmQpCit7Cisg ICAgcmV0dXJuIGJhY2tncm91bmQuYmxlbmQoZm9yZWdyb3VuZCkgPT0gYmFja2dyb3VuZDsKK30K Kwogdm9pZCBDYXJldEJhc2U6OnBhaW50Q2FyZXQoTm9kZSogbm9kZSwgR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsIGNvbnN0IExheW91dFJl Y3QmIGNsaXBSZWN0KSBjb25zdAogewogI2lmIEVOQUJMRShURVhUX0NBUkVUKQpAQCAtMTQ5OSw5 ICsxNTA0LDExIEBAIHZvaWQgQ2FyZXRCYXNlOjpwYWludENhcmV0KE5vZGUqIG5vZGUsIEdyYXBo aWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UG9pCiAgICAgICAgIGlmIChyb290RWRp dGFibGVFbGVtZW50ICYmIHJvb3RFZGl0YWJsZUVsZW1lbnQtPnJlbmRlcmVyKCkpIHsKICAgICAg ICAgICAgIGNvbnN0IGF1dG8mIHJvb3RFZGl0YWJsZVN0eWxlID0gcm9vdEVkaXRhYmxlRWxlbWVu dC0+cmVuZGVyZXIoKS0+c3R5bGUoKTsKICAgICAgICAgICAgIGNvbnN0IGF1dG8mIGVsZW1lbnRT dHlsZSA9IGVsZW1lbnQtPnJlbmRlcmVyKCktPnN0eWxlKCk7Ci0gICAgICAgICAgICBpZiAocm9v dEVkaXRhYmxlU3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3Vu ZENvbG9yKSA9PSBlbGVtZW50U3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5 QmFja2dyb3VuZENvbG9yKSkgewotICAgICAgICAgICAgICAgIGNhcmV0Q29sb3IgPSByb290RWRp dGFibGVFbGVtZW50LT5yZW5kZXJlcigpLT5zdHlsZSgpLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihD U1NQcm9wZXJ0eUNvbG9yKTsKLSAgICAgICAgICAgICAgICBjb2xvclNwYWNlID0gcm9vdEVkaXRh YmxlRWxlbWVudC0+cmVuZGVyZXIoKS0+c3R5bGUoKS5jb2xvclNwYWNlKCk7CisgICAgICAgICAg ICBhdXRvIHJvb3RFZGl0YWJsZUJHQ29sb3IgPSByb290RWRpdGFibGVTdHlsZS52aXNpdGVkRGVw ZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOworICAgICAgICAgICAgYXV0 byBlbGVtZW50QkdDb2xvciA9IGVsZW1lbnRTdHlsZS52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NT UHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOworICAgICAgICAgICAgaWYgKGRpc2FwcGVhcnNJbnRv QmFja2dyb3VuZChlbGVtZW50QkdDb2xvciwgcm9vdEVkaXRhYmxlQkdDb2xvcikpIHsKKyAgICAg ICAgICAgICAgICBjYXJldENvbG9yID0gcm9vdEVkaXRhYmxlU3R5bGUudmlzaXRlZERlcGVuZGVu dENvbG9yKENTU1Byb3BlcnR5Q29sb3IpOworICAgICAgICAgICAgICAgIGNvbG9yU3BhY2UgPSBy b290RWRpdGFibGVTdHlsZS5jb2xvclNwYWNlKCk7CiAgICAgICAgICAgICAgICAgc2V0VG9Sb290 RWRpdGFibGVFbGVtZW50ID0gdHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDZhOGJlM2VhMjhjZDZlYWI5OTI3NDY5ODFkNzlmNjEyNmVhODIyOTUuLmNlNDkzMDM2MTJiMzZm YjkyMzlhZmFlZWZjYmM4MWFlNTFjNmNkZmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0x MC0yMyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAg IENhcmV0cyBpbiBHTWFpbCBhbmQgaUNsb3VkIGNvbXBvc2l0aW9ucyBhcmUgdGhlIGZvcmVncm91 bmQgdGV4dCBjb2xvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM4MDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdCB0aGUgY2FzZSB3aGVyZSB0aGUgY29udGVudCBlZGl0YWJsZSByb290IGhhcyBh IGJhY2tncm91bmQgY29sb3Igc3BlY2lmaWVkLgorCisgICAgICAgICogZWRpdGluZy9jYXJldC9j b2xvci1zcGFuLWluc2lkZS1lZGl0YWJsZS1iYWNrZ3JvdW5kLWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGVkaXRpbmcvY2FyZXQvY29sb3Itc3Bhbi1pbnNpZGUtZWRpdGFibGUtYmFj a2dyb3VuZC5odG1sOiBBZGRlZC4KKwogMjAxNC0xMC0yMyAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBTYWZhcmkgY2Fubm90IHBsYXkgJ2F1ZGlvL2Ft cicgY29udGVudC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvY2FyZXQvY29sb3It c3Bhbi1pbnNpZGUtZWRpdGFibGUtYmFja2dyb3VuZC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVz dHMvZWRpdGluZy9jYXJldC9jb2xvci1zcGFuLWluc2lkZS1lZGl0YWJsZS1iYWNrZ3JvdW5kLWV4 cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOWExZjViMTViNTYxOWJmMDk4YzFiZDViZmViYjdiN2Fh ZGIyOTY5NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvY2FyZXQvY29s b3Itc3Bhbi1pbnNpZGUtZWRpdGFibGUtYmFja2dyb3VuZC1leHBlY3RlZC5odG1sCkBAIC0wLDAg KzEsNCBAQAorVGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCBjYXJldHMgaW4gY29udGVudCBlZGl0 YWJsZSBkaXZzIHdpdGggYSBiYWNrZ3JvdW5kIGNvbG9yIHNwZWNpZmllZCByZW1haW4gYmxhY2sg ZXZlbiBpZiB0aGVyZSBpcyBhIHNwYW4gaW5zaWRlIHRoZW0gd2l0aCBhIGZvcmVncm91bmQgY29s b3Igc3BlY2lmaWVkLgorPGRpdiBzdHlsZT0id2lkdGg6IDUwNXB4OyBoZWlnaHQ6IDUwNXB4OyBv dmVyZmxvdzogaGlkZGVuOyI+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogNTBweDsgaGVpZ2h0OiA1MDBw eDsgYmFja2dyb3VuZC1jb2xvcjogYmxhY2siPjwvZGl2PgorPC9kaXY+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9lZGl0aW5nL2NhcmV0L2NvbG9yLXNwYW4taW5zaWRlLWVkaXRhYmxlLWJhY2tn cm91bmQuaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcvY2FyZXQvY29sb3Itc3Bhbi1pbnNpZGUt ZWRpdGFibGUtYmFja2dyb3VuZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJkMzMyZjJiOTI5MzZjMmUwNmRi ZTA5ZWViZThhYWVkYTQ4NWYwNzgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0 aW5nL2NhcmV0L2NvbG9yLXNwYW4taW5zaWRlLWVkaXRhYmxlLWJhY2tncm91bmQuaHRtbApAQCAt MCwwICsxLDggQEAKK1RoaXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgY2FyZXRzIGluIGNvbnRlbnQg ZWRpdGFibGUgZGl2cyB3aXRoIGEgYmFja2dyb3VuZCBjb2xvciBzcGVjaWZpZWQgcmVtYWluIGJs YWNrIGV2ZW4gaWYgdGhlcmUgaXMgYSBzcGFuIGluc2lkZSB0aGVtIHdpdGggYSBmb3JlZ3JvdW5k IGNvbG9yIHNwZWNpZmllZC4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MDVweDsgaGVpZ2h0OiA1MDVw eDsgb3ZlcmZsb3c6IGhpZGRlbjsiPgorPGRpdiBpZD0iZWRpdCIgY29udGVudGVkaXRhYmxlPSJ0 cnVlIiBzdHlsZT0iYmFja2dyb3VuZDogI2ZmZjsgLXdlYmtpdC10cmFuc2Zvcm0tb3JpZ2luOiBs ZWZ0IHRvcDsgLXdlYmtpdC10cmFuc2Zvcm06IHNjYWxlKDUwLCA1MCk7IG91dGxpbmU6IG5vbmU7 IGZvbnQtZmFtaWx5OiBBaGVtOyBmb250LXNpemU6IDEwcHg7Ij48c3BhbiBpZD0ic3BuIiBzdHls ZT0iY29sb3I6IHJlZDsiPiZuYnNwOyZuYnNwOzwvc3Bhbj48L2Rpdj4KKzwvZGl2PgorPHNjcmlw dD4KK3ZhciBlZGl0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVkaXQiKTsKK2VkaXQuZm9j dXMoKTsKKzwvc2NyaXB0Pgo=