177696 2017-09-29 18:23:10 -0700 Remove redundant RenderObject::selectionRoot and dependencies 2017-09-30 16:50:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 177678 1 zalan zalan bfulgham commit-queue darin rniwa simon.fraser webkit-bug-importer zalan oldest_to_newest 1354812 0 zalan 2017-09-29 18:23:10 -0700 There's only one selection root. 1354815 1 322262 zalan 2017-09-29 18:25:49 -0700 Created attachment 322262 Patch 1354817 2 322262 rniwa 2017-09-29 18:58:06 -0700 Comment on attachment 322262 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322262&action=review > Source/WebCore/rendering/RenderView.h:96 > + void selectionStartEnd(unsigned& start, unsigned& end) const { selectionData().selectionStartEndPositions(start, end); } Can we rename this to getSelectionStartEnd? 1354826 3 322267 zalan 2017-09-29 19:44:23 -0700 Created attachment 322267 Patch 1354849 4 322267 commit-queue 2017-09-29 21:31:33 -0700 Comment on attachment 322267 Patch Clearing flags on attachment: 322267 Committed r222677: <http://trac.webkit.org/changeset/222677> 1354850 5 commit-queue 2017-09-29 21:31:34 -0700 All reviewed patches have been landed. Closing bug. 1354851 6 webkit-bug-importer 2017-09-29 21:32:38 -0700 <rdar://problem/34753244> 1354938 7 322262 darin 2017-09-30 16:50:14 -0700 Comment on attachment 322262 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322262&action=review >> Source/WebCore/rendering/RenderView.h:96 >> + void selectionStartEnd(unsigned& start, unsigned& end) const { selectionData().selectionStartEndPositions(start, end); } > > Can we rename this to getSelectionStartEnd? Or have it return a structure with both start and end rather than using two out arguments? 322262 2017-09-29 18:25:49 -0700 2017-09-29 19:44:20 -0700 Patch bug-177696-20170929182548.patch text/plain 7470 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDI3ZTZiY2ZiNWVjNmZm ZDYwMDNjMjE3ZTcyOTRhZjRiYmU2MjJlZC4uMmJhY2NlZTg1OTAyN2ZlYWUwNTFlMGM4N2I3MGYw MTIwMTQ4YjgzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE3LTA5LTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBS ZW5kZXJPYmplY3Q6OnNlbGVjdGlvblJvb3QgYW5kIGRlcGVuZGVuY2llcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3Njk2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUncyBvbmx5IG9uZSBzZWxl Y3Rpb24gcm9vdCAoUmVuZGVyVmlldykuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4 dEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25TdGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpzZWxlY3Rpb25TdGFydEVuZCBj b25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnNlbGVjdGlvblJvb3QgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpzZWxlY3Rpb25TdGFydEVuZCBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBs YWNlZDo6aXNTZWxlY3RlZCBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6Y29sbGVjdFNlbGVjdGlvblJlY3Rz Rm9yTGluZUJveGVzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0TGluZUJveGVzOjpzZXRTZWxlY3Rpb25T dGF0ZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvU2VsZWN0aW9uU3VidHJlZVJvb3QuaDoKKworMjAxNy0wOS0yOSAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgorCiAgICAgICAgIFJlbW92ZSBTZWxlY3Rpb25TdWJ0cmVlUm9v dDo6UmVuZGVyU3VidHJlZXNNYXAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3NzY4NQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lVGV4dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4 dEJveC5jcHAKaW5kZXggZWY2ZDNhOGYxMWIxMWM1NzZiZDg2YjdjMjAzNDM0NzcxYjE1NmY2NS4u NWMzYmVmZjMwODdjZTBlNmRjZmI2NTA0NWNmYTRmODRjNWY3ZTc2NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcApAQCAtMTQ1LDcgKzE0NSw3IEBAIFJlbmRl ck9iamVjdDo6U2VsZWN0aW9uU3RhdGUgSW5saW5lVGV4dEJveDo6c2VsZWN0aW9uU3RhdGUoKQog ICAgIFJlbmRlck9iamVjdDo6U2VsZWN0aW9uU3RhdGUgc3RhdGUgPSByZW5kZXJlcigpLnNlbGVj dGlvblN0YXRlKCk7CiAgICAgaWYgKHN0YXRlID09IFJlbmRlck9iamVjdDo6U2VsZWN0aW9uU3Rh cnQgfHwgc3RhdGUgPT0gUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25FbmQgfHwgc3RhdGUgPT0gUmVu ZGVyT2JqZWN0OjpTZWxlY3Rpb25Cb3RoKSB7CiAgICAgICAgIHVuc2lnbmVkIHN0YXJ0UG9zLCBl bmRQb3M7Ci0gICAgICAgIHJlbmRlcmVyKCkuc2VsZWN0aW9uU3RhcnRFbmQoc3RhcnRQb3MsIGVu ZFBvcyk7CisgICAgICAgIHJlbmRlcmVyKCkudmlldygpLnNlbGVjdGlvblN0YXJ0RW5kKHN0YXJ0 UG9zLCBlbmRQb3MpOwogICAgICAgICAvLyBUaGUgcG9zaXRpb24gYWZ0ZXIgYSBoYXJkIGxpbmUg YnJlYWsgaXMgY29uc2lkZXJlZCB0byBiZSBwYXN0IGl0cyBlbmQuCiAgICAgICAgIEFTU0VSVChz dGFydCgpICsgbGVuKCkgPj0gKGlzTGluZUJyZWFrKCkgPyAxIDogMCkpOwogICAgICAgICB1bnNp Z25lZCBsYXN0U2VsZWN0YWJsZSA9IHN0YXJ0KCkgKyBsZW4oKSAtIChpc0xpbmVCcmVhaygpID8g MSA6IDApOwpAQCAtNjQ0LDcgKzY0NCw3IEBAIHN0ZDo6cGFpcjx1bnNpZ25lZCwgdW5zaWduZWQ+ IElubGluZVRleHRCb3g6OnNlbGVjdGlvblN0YXJ0RW5kKCkgY29uc3QKICAgICAKICAgICB1bnNp Z25lZCBzdGFydDsKICAgICB1bnNpZ25lZCBlbmQ7Ci0gICAgcmVuZGVyZXIoKS5zZWxlY3Rpb25T dGFydEVuZChzdGFydCwgZW5kKTsKKyAgICByZW5kZXJlcigpLnZpZXcoKS5zZWxlY3Rpb25TdGFy dEVuZChzdGFydCwgZW5kKTsKICAgICBpZiAoc2VsZWN0aW9uU3RhdGUgPT0gUmVuZGVyT2JqZWN0 OjpTZWxlY3Rpb25TdGFydCkKICAgICAgICAgZW5kID0gcmVuZGVyZXIoKS50ZXh0TGVuZ3RoKCk7 CiAgICAgZWxzZSBpZiAoc2VsZWN0aW9uU3RhdGUgPT0gUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25F bmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IGNiNTAw MjkwZDYwNDZlNDc2MzFlZTY1Njg4YTA0ODI4Y2IwZWFkMWYuLjYxNDczODRhMjY0MzQyOTdkNTIz YmQ4Y2ExMjk0NjViYWY3OTVjZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJP YmplY3QuY3BwCkBAIC0xMjAyLDI2ICsxMjAyLDYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6Om91dHB1 dFJlbmRlclN1YlRyZWVBbmRNYXJrKFRleHRTdHJlYW0mIHN0cmVhbSwgY29uc3QgUmVuZGVyT2IK IAogI2VuZGlmIC8vIE5ERUJVRwogCi1TZWxlY3Rpb25TdWJ0cmVlUm9vdCYgUmVuZGVyT2JqZWN0 OjpzZWxlY3Rpb25Sb290KCkgY29uc3QKLXsKLSAgICBSZW5kZXJGcmFnbWVudGVkRmxvdyogZnJh Z21lbnRlZEZsb3cgPSBlbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpOwotICAgIGlmICghZnJhZ21l bnRlZEZsb3cpCi0gICAgICAgIHJldHVybiB2aWV3KCk7Ci0KLSAgICBpZiAoaXM8UmVuZGVyTXVs dGlDb2x1bW5GbG93PigqZnJhZ21lbnRlZEZsb3cpKSB7Ci0gICAgICAgIGlmICghZnJhZ21lbnRl ZEZsb3ctPmNvbnRhaW5pbmdCbG9jaygpKQotICAgICAgICAgICAgcmV0dXJuIHZpZXcoKTsKLSAg ICAgICAgcmV0dXJuIGZyYWdtZW50ZWRGbG93LT5jb250YWluaW5nQmxvY2soKS0+c2VsZWN0aW9u Um9vdCgpOwotICAgIH0KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gdmll dygpOwotfQotCi12b2lkIFJlbmRlck9iamVjdDo6c2VsZWN0aW9uU3RhcnRFbmQodW5zaWduZWQm IHNwb3MsIHVuc2lnbmVkJiBlcG9zKSBjb25zdAotewotICAgIHNlbGVjdGlvblJvb3QoKS5zZWxl Y3Rpb25EYXRhKCkuc2VsZWN0aW9uU3RhcnRFbmRQb3NpdGlvbnMoc3BvcywgZXBvcyk7Ci19Ci0K IEZsb2F0UG9pbnQgUmVuZGVyT2JqZWN0Ojpsb2NhbFRvQWJzb2x1dGUoY29uc3QgRmxvYXRQb2lu dCYgbG9jYWxQb2ludCwgTWFwQ29vcmRpbmF0ZXNGbGFncyBtb2RlLCBib29sKiB3YXNGaXhlZCkg Y29uc3QKIHsKICAgICBUcmFuc2Zvcm1TdGF0ZSB0cmFuc2Zvcm1TdGF0ZShUcmFuc2Zvcm1TdGF0 ZTo6QXBwbHlUcmFuc2Zvcm1EaXJlY3Rpb24sIGxvY2FsUG9pbnQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IGMzODQxNmQ4MzFkNWY0ZWRlMTFhNjNlZGE2ZTVl M2QyOGJkYmM0ZWQuLjU3OTJjOTIyZWIyOWI0MTE5NjU4MWE2NDA2NjViZTlkNjk3MmU2YTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTc1Miw5ICs3NTIsNiBA QCBwdWJsaWM6CiAgICAgdm9pZCBpbWFnZUNoYW5nZWQoQ2FjaGVkSW1hZ2UqLCBjb25zdCBJbnRS ZWN0KiA9IG51bGxwdHIpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBpbWFnZUNoYW5nZWQo V3JhcHBlZEltYWdlUHRyLCBjb25zdCBJbnRSZWN0KiA9IG51bGxwdHIpIHsgfQogCi0gICAgU2Vs ZWN0aW9uU3VidHJlZVJvb3QmIHNlbGVjdGlvblJvb3QoKSBjb25zdDsKLSAgICB2b2lkIHNlbGVj dGlvblN0YXJ0RW5kKHVuc2lnbmVkJiBzcG9zLCB1bnNpZ25lZCYgZXBvcykgY29uc3Q7Ci0gICAg CiAgICAgdm9pZCByZW1vdmVGcm9tUGFyZW50KCk7CiAKICAgICBDU1NBbmltYXRpb25Db250cm9s bGVyJiBhbmltYXRpb24oKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy UmVwbGFjZWQuY3BwCmluZGV4IGE5ZGI5MzQxZmM3ZGJiYWMyNTE2YWZlN2JjMDU5Y2NlNDNjMTBj ZDEuLmEwMTk0NjRkYjczOTkwNTE3ZGNkNWM0YmRkNmI5ZmY1ODRjMzEyZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNjUxLDcgKzY1MSw3IEBA IGJvb2wgUmVuZGVyUmVwbGFjZWQ6OmlzU2VsZWN0ZWQoKSBjb25zdAogICAgICAgICByZXR1cm4g dHJ1ZTsKIAogICAgIHVuc2lnbmVkIHNlbGVjdGlvblN0YXJ0LCBzZWxlY3Rpb25FbmQ7Ci0gICAg c2VsZWN0aW9uU3RhcnRFbmQoc2VsZWN0aW9uU3RhcnQsIHNlbGVjdGlvbkVuZCk7CisgICAgdmll dygpLnNlbGVjdGlvblN0YXJ0RW5kKHNlbGVjdGlvblN0YXJ0LCBzZWxlY3Rpb25FbmQpOwogICAg IGlmIChzID09IFNlbGVjdGlvblN0YXJ0KQogICAgICAgICByZXR1cm4gc2VsZWN0aW9uU3RhcnQg PT0gMDsKICAgICAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5k ZXggNDAzZDE4ODdjY2ZhM2YxYjMxNjcwNDkyODU4OGU1MDM2YWYxOWM4ZS4uMzg4Mzg1NDYzOWY5 ODcwYzJkY2Y3MmQ3N2NlNzhjNWZhZWE2MGU2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUZXh0LmNwcApAQCAtMTQ0Nyw3ICsxNDQ3LDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJUZXh0 Ojpjb2xsZWN0U2VsZWN0aW9uUmVjdHNGb3JMaW5lQm94ZXMoY29uc3QgUmVuZGVyTGF5ZXJNb2Rl bE8KICAgICAgICAgc3RhcnRQb3MgPSAwOwogICAgICAgICBlbmRQb3MgPSB0ZXh0TGVuZ3RoKCk7 CiAgICAgfSBlbHNlIHsKLSAgICAgICAgc2VsZWN0aW9uU3RhcnRFbmQoc3RhcnRQb3MsIGVuZFBv cyk7CisgICAgICAgIHZpZXcoKS5zZWxlY3Rpb25TdGFydEVuZChzdGFydFBvcywgZW5kUG9zKTsK ICAgICAgICAgaWYgKHNlbGVjdGlvblN0YXRlKCkgPT0gU2VsZWN0aW9uU3RhcnQpCiAgICAgICAg ICAgICBlbmRQb3MgPSB0ZXh0TGVuZ3RoKCk7CiAgICAgICAgIGVsc2UgaWYgKHNlbGVjdGlvblN0 YXRlKCkgPT0gU2VsZWN0aW9uRW5kKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHRMaW5lQm94ZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHRMaW5lQm94ZXMuY3BwCmluZGV4IDJjNDg5MjE4YWVhZTkxOWRhZmFmODJhMWJlZWI3 NWY1YmFiYmU3ZDYuLmEwZTlhYTYxNjUyODkxMDQ4M2ZiNWQzZmY3ZDRiOTQ3ZDJiZjM3NDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5jcHAK QEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJJbmxpbmVUZXh0Qm94LmgiCiAjaW5jbHVkZSAi UmVuZGVyQmxvY2suaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgorI2luY2x1ZGUgIlJlbmRl clZpZXcuaCIKICNpbmNsdWRlICJSb290SW5saW5lQm94LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKQEAgLTQ0Niw3ICs0NDcsNyBAQCB2b2lkIFJlbmRlclRleHRMaW5lQm94ZXM6OnNldFNlbGVj dGlvblN0YXRlKFJlbmRlclRleHQmIHJlbmRlcmVyLCBSZW5kZXJPYmplY3Q6OgogICAgIH0KIAog ICAgIHVuc2lnbmVkIHN0YXJ0LCBlbmQ7Ci0gICAgcmVuZGVyZXIuc2VsZWN0aW9uU3RhcnRFbmQo c3RhcnQsIGVuZCk7CisgICAgcmVuZGVyZXIudmlldygpLnNlbGVjdGlvblN0YXJ0RW5kKHN0YXJ0 LCBlbmQpOwogICAgIGlmIChzdGF0ZSA9PSBSZW5kZXJPYmplY3Q6OlNlbGVjdGlvblN0YXJ0KSB7 CiAgICAgICAgIGVuZCA9IHJlbmRlcmVyLnRleHRMZW5ndGgoKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJWaWV3LmgKaW5kZXggZDY4ZDdhZWNkYTUyMmU1MTFjNDJlNDY0YzhhYTA4MGFi ZGNjNDExMS4uYzYzMWY0NTVjYjExMmM2YTQ4M2QwNTVjNmYyN2ExYjM0M2M3YWE2MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBAIC05Myw2ICs5Myw3IEBAIHB1YmxpYzoK ICAgICBSZW5kZXJPYmplY3QqIHNlbGVjdGlvblVuc3BsaXRFbmQoKSBjb25zdCB7IHJldHVybiBt X3NlbGVjdGlvblVuc3BsaXRFbmQ7IH0KICAgICBJbnRSZWN0IHNlbGVjdGlvbkJvdW5kcyhib29s IGNsaXBUb1Zpc2libGVDb250ZW50ID0gdHJ1ZSkgY29uc3Q7CiAgICAgdm9pZCByZXBhaW50U2Vs ZWN0aW9uKCkgY29uc3Q7CisgICAgdm9pZCBzZWxlY3Rpb25TdGFydEVuZCh1bnNpZ25lZCYgc3Rh cnQsIHVuc2lnbmVkJiBlbmQpIGNvbnN0IHsgc2VsZWN0aW9uRGF0YSgpLnNlbGVjdGlvblN0YXJ0 RW5kUG9zaXRpb25zKHN0YXJ0LCBlbmQpOyB9CiAKICAgICBib29sIHByaW50aW5nKCkgY29uc3Q7 CiAK 322267 2017-09-29 19:44:23 -0700 2017-09-29 21:31:33 -0700 Patch bug-177696-20170929194422.patch text/plain 7443 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODkyMzQ5NTAxMGU5NWZk ZGM1N2UzOTE4NTYxM2FjOWRjMGI0YTRiYS4uMWJlMTgzNDNjNzY5MzQ0M2FkOWVmYjg0ZTg5NWY5 NmU1MDNkMWYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA5LTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBS ZW5kZXJPYmplY3Q6OnNlbGVjdGlvblJvb3QgYW5kIGRlcGVuZGVuY2llcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3Njk2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIFRoZXJlJ3Mgb25seSBvbmUgc2VsZWN0 aW9uIHJvb3QgKFJlbmRlclZpZXcpLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6c2VsZWN0aW9uU3RhdGUp OgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6c2VsZWN0aW9uU3RhcnRFbmQgY29u c3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyT2JqZWN0OjpzZWxlY3Rpb25Sb290IGNvbnN0KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6c2VsZWN0aW9uU3RhcnRFbmQgY29uc3QpOiBEZWxl dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFj ZWQ6OmlzU2VsZWN0ZWQgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNvbGxlY3RTZWxlY3Rpb25SZWN0c0Zv ckxpbmVCb3hlcyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRMaW5lQm94ZXMuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dExpbmVCb3hlczo6c2V0U2VsZWN0aW9uU3Rh dGUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3Lmg6CisgICAgICAgICogcmVuZGVy aW5nL1NlbGVjdGlvblN1YnRyZWVSb290Lmg6CisKIDIwMTctMDktMjkgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBodHRwL3Rlc3RzL3ByZWNvbm5lY3QvbGluay1y ZWwtcHJlY29ubmVjdC1odHRwcy5odG1sIGlzIGZsYWt5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lVGV4dEJveC5jcHAKaW5kZXggMzYxY2M0MzU3M2UwNWIwNTk1ZDFjMjNmMGNlYWM3 MmE5MmM5MGMxMS4uYjY0ZmNlYjNhOWYzOThjYzAxNjgzZTRmY2QyZTRlZWY2MTUzYzhiYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcApAQCAtMTQ1LDcgKzE0 NSw3IEBAIFJlbmRlck9iamVjdDo6U2VsZWN0aW9uU3RhdGUgSW5saW5lVGV4dEJveDo6c2VsZWN0 aW9uU3RhdGUoKQogICAgIFJlbmRlck9iamVjdDo6U2VsZWN0aW9uU3RhdGUgc3RhdGUgPSByZW5k ZXJlcigpLnNlbGVjdGlvblN0YXRlKCk7CiAgICAgaWYgKHN0YXRlID09IFJlbmRlck9iamVjdDo6 U2VsZWN0aW9uU3RhcnQgfHwgc3RhdGUgPT0gUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25FbmQgfHwg c3RhdGUgPT0gUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25Cb3RoKSB7CiAgICAgICAgIHVuc2lnbmVk IHN0YXJ0UG9zLCBlbmRQb3M7Ci0gICAgICAgIHJlbmRlcmVyKCkuc2VsZWN0aW9uU3RhcnRFbmQo c3RhcnRQb3MsIGVuZFBvcyk7CisgICAgICAgIHJlbmRlcmVyKCkudmlldygpLmdldFNlbGVjdGlv blN0YXJ0RW5kKHN0YXJ0UG9zLCBlbmRQb3MpOwogICAgICAgICAvLyBUaGUgcG9zaXRpb24gYWZ0 ZXIgYSBoYXJkIGxpbmUgYnJlYWsgaXMgY29uc2lkZXJlZCB0byBiZSBwYXN0IGl0cyBlbmQuCiAg ICAgICAgIEFTU0VSVChzdGFydCgpICsgbGVuKCkgPj0gKGlzTGluZUJyZWFrKCkgPyAxIDogMCkp OwogICAgICAgICB1bnNpZ25lZCBsYXN0U2VsZWN0YWJsZSA9IHN0YXJ0KCkgKyBsZW4oKSAtIChp c0xpbmVCcmVhaygpID8gMSA6IDApOwpAQCAtNjQxLDcgKzY0MSw3IEBAIHN0ZDo6cGFpcjx1bnNp Z25lZCwgdW5zaWduZWQ+IElubGluZVRleHRCb3g6OnNlbGVjdGlvblN0YXJ0RW5kKCkgY29uc3QK ICAgICAKICAgICB1bnNpZ25lZCBzdGFydDsKICAgICB1bnNpZ25lZCBlbmQ7Ci0gICAgcmVuZGVy ZXIoKS5zZWxlY3Rpb25TdGFydEVuZChzdGFydCwgZW5kKTsKKyAgICByZW5kZXJlcigpLnZpZXco KS5nZXRTZWxlY3Rpb25TdGFydEVuZChzdGFydCwgZW5kKTsKICAgICBpZiAoc2VsZWN0aW9uU3Rh dGUgPT0gUmVuZGVyT2JqZWN0OjpTZWxlY3Rpb25TdGFydCkKICAgICAgICAgZW5kID0gcmVuZGVy ZXIoKS50ZXh0TGVuZ3RoKCk7CiAgICAgZWxzZSBpZiAoc2VsZWN0aW9uU3RhdGUgPT0gUmVuZGVy T2JqZWN0OjpTZWxlY3Rpb25FbmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwCmluZGV4IGNiNTAwMjkwZDYwNDZlNDc2MzFlZTY1Njg4YTA0ODI4Y2IwZWFkMWYuLjYx NDczODRhMjY0MzQyOTdkNTIzYmQ4Y2ExMjk0NjViYWY3OTVjZmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0xMjAyLDI2ICsxMjAyLDYgQEAgdm9pZCBS ZW5kZXJPYmplY3Q6Om91dHB1dFJlbmRlclN1YlRyZWVBbmRNYXJrKFRleHRTdHJlYW0mIHN0cmVh bSwgY29uc3QgUmVuZGVyT2IKIAogI2VuZGlmIC8vIE5ERUJVRwogCi1TZWxlY3Rpb25TdWJ0cmVl Um9vdCYgUmVuZGVyT2JqZWN0OjpzZWxlY3Rpb25Sb290KCkgY29uc3QKLXsKLSAgICBSZW5kZXJG cmFnbWVudGVkRmxvdyogZnJhZ21lbnRlZEZsb3cgPSBlbmNsb3NpbmdGcmFnbWVudGVkRmxvdygp OwotICAgIGlmICghZnJhZ21lbnRlZEZsb3cpCi0gICAgICAgIHJldHVybiB2aWV3KCk7Ci0KLSAg ICBpZiAoaXM8UmVuZGVyTXVsdGlDb2x1bW5GbG93PigqZnJhZ21lbnRlZEZsb3cpKSB7Ci0gICAg ICAgIGlmICghZnJhZ21lbnRlZEZsb3ctPmNvbnRhaW5pbmdCbG9jaygpKQotICAgICAgICAgICAg cmV0dXJuIHZpZXcoKTsKLSAgICAgICAgcmV0dXJuIGZyYWdtZW50ZWRGbG93LT5jb250YWluaW5n QmxvY2soKS0+c2VsZWN0aW9uUm9vdCgpOwotICAgIH0KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKLSAgICByZXR1cm4gdmlldygpOwotfQotCi12b2lkIFJlbmRlck9iamVjdDo6c2VsZWN0aW9u U3RhcnRFbmQodW5zaWduZWQmIHNwb3MsIHVuc2lnbmVkJiBlcG9zKSBjb25zdAotewotICAgIHNl bGVjdGlvblJvb3QoKS5zZWxlY3Rpb25EYXRhKCkuc2VsZWN0aW9uU3RhcnRFbmRQb3NpdGlvbnMo c3BvcywgZXBvcyk7Ci19Ci0KIEZsb2F0UG9pbnQgUmVuZGVyT2JqZWN0Ojpsb2NhbFRvQWJzb2x1 dGUoY29uc3QgRmxvYXRQb2ludCYgbG9jYWxQb2ludCwgTWFwQ29vcmRpbmF0ZXNGbGFncyBtb2Rl LCBib29sKiB3YXNGaXhlZCkgY29uc3QKIHsKICAgICBUcmFuc2Zvcm1TdGF0ZSB0cmFuc2Zvcm1T dGF0ZShUcmFuc2Zvcm1TdGF0ZTo6QXBwbHlUcmFuc2Zvcm1EaXJlY3Rpb24sIGxvY2FsUG9pbnQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IGMzODQxNmQ4MzFk NWY0ZWRlMTFhNjNlZGE2ZTVlM2QyOGJkYmM0ZWQuLjU3OTJjOTIyZWIyOWI0MTE5NjU4MWE2NDA2 NjViZTlkNjk3MmU2YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgK QEAgLTc1Miw5ICs3NTIsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbWFnZUNoYW5nZWQoQ2FjaGVk SW1hZ2UqLCBjb25zdCBJbnRSZWN0KiA9IG51bGxwdHIpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg dm9pZCBpbWFnZUNoYW5nZWQoV3JhcHBlZEltYWdlUHRyLCBjb25zdCBJbnRSZWN0KiA9IG51bGxw dHIpIHsgfQogCi0gICAgU2VsZWN0aW9uU3VidHJlZVJvb3QmIHNlbGVjdGlvblJvb3QoKSBjb25z dDsKLSAgICB2b2lkIHNlbGVjdGlvblN0YXJ0RW5kKHVuc2lnbmVkJiBzcG9zLCB1bnNpZ25lZCYg ZXBvcykgY29uc3Q7Ci0gICAgCiAgICAgdm9pZCByZW1vdmVGcm9tUGFyZW50KCk7CiAKICAgICBD U1NBbmltYXRpb25Db250cm9sbGVyJiBhbmltYXRpb24oKSBjb25zdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IGE5ZGI5MzQxZmM3ZGJiYWMyNTE2 YWZlN2JjMDU5Y2NlNDNjMTBjZDEuLjY0MGE3YmFlZDhlYjNhN2E4NGRiYWI1OGM5NmE0MzlhYzNk NjY5MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNl ZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApA QCAtNjUxLDcgKzY1MSw3IEBAIGJvb2wgUmVuZGVyUmVwbGFjZWQ6OmlzU2VsZWN0ZWQoKSBjb25z dAogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHVuc2lnbmVkIHNlbGVjdGlvblN0YXJ0LCBz ZWxlY3Rpb25FbmQ7Ci0gICAgc2VsZWN0aW9uU3RhcnRFbmQoc2VsZWN0aW9uU3RhcnQsIHNlbGVj dGlvbkVuZCk7CisgICAgdmlldygpLmdldFNlbGVjdGlvblN0YXJ0RW5kKHNlbGVjdGlvblN0YXJ0 LCBzZWxlY3Rpb25FbmQpOwogICAgIGlmIChzID09IFNlbGVjdGlvblN0YXJ0KQogICAgICAgICBy ZXR1cm4gc2VsZWN0aW9uU3RhcnQgPT0gMDsKICAgICAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggNDAzZDE4ODdjY2ZhM2YxYjMxNjcwNDkyODU4OGU1MDM2 YWYxOWM4ZS4uZGYxMzMxOTgzMzc3ZTVhM2Q5NjMzNWFiOTJlNTkzN2ZjZDc0ZDNkMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAtMTQ0Nyw3ICsxNDQ3LDcgQEAg TGF5b3V0UmVjdCBSZW5kZXJUZXh0Ojpjb2xsZWN0U2VsZWN0aW9uUmVjdHNGb3JMaW5lQm94ZXMo Y29uc3QgUmVuZGVyTGF5ZXJNb2RlbE8KICAgICAgICAgc3RhcnRQb3MgPSAwOwogICAgICAgICBl bmRQb3MgPSB0ZXh0TGVuZ3RoKCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgc2VsZWN0aW9uU3Rh cnRFbmQoc3RhcnRQb3MsIGVuZFBvcyk7CisgICAgICAgIHZpZXcoKS5nZXRTZWxlY3Rpb25TdGFy dEVuZChzdGFydFBvcywgZW5kUG9zKTsKICAgICAgICAgaWYgKHNlbGVjdGlvblN0YXRlKCkgPT0g U2VsZWN0aW9uU3RhcnQpCiAgICAgICAgICAgICBlbmRQb3MgPSB0ZXh0TGVuZ3RoKCk7CiAgICAg ICAgIGVsc2UgaWYgKHNlbGVjdGlvblN0YXRlKCkgPT0gU2VsZWN0aW9uRW5kKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRMaW5lQm94ZXMuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRMaW5lQm94ZXMuY3BwCmluZGV4IDJjNDg5 MjE4YWVhZTkxOWRhZmFmODJhMWJlZWI3NWY1YmFiYmU3ZDYuLmMyNTBhNGRmYjc1MDIzNTg0Y2Fm MjJlYjhlMTVmN2M0ZGIwNTFmYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUZXh0TGluZUJveGVzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dExpbmVCb3hlcy5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJJbmxp bmVUZXh0Qm94LmgiCiAjaW5jbHVkZSAiUmVuZGVyQmxvY2suaCIKICNpbmNsdWRlICJSZW5kZXJT dHlsZS5oIgorI2luY2x1ZGUgIlJlbmRlclZpZXcuaCIKICNpbmNsdWRlICJSb290SW5saW5lQm94 LmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQ0Niw3ICs0NDcsNyBAQCB2b2lkIFJlbmRl clRleHRMaW5lQm94ZXM6OnNldFNlbGVjdGlvblN0YXRlKFJlbmRlclRleHQmIHJlbmRlcmVyLCBS ZW5kZXJPYmplY3Q6OgogICAgIH0KIAogICAgIHVuc2lnbmVkIHN0YXJ0LCBlbmQ7Ci0gICAgcmVu ZGVyZXIuc2VsZWN0aW9uU3RhcnRFbmQoc3RhcnQsIGVuZCk7CisgICAgcmVuZGVyZXIudmlldygp LmdldFNlbGVjdGlvblN0YXJ0RW5kKHN0YXJ0LCBlbmQpOwogICAgIGlmIChzdGF0ZSA9PSBSZW5k ZXJPYmplY3Q6OlNlbGVjdGlvblN0YXJ0KSB7CiAgICAgICAgIGVuZCA9IHJlbmRlcmVyLnRleHRM ZW5ndGgoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZp ZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKaW5kZXggZDY4ZDdh ZWNkYTUyMmU1MTFjNDJlNDY0YzhhYTA4MGFiZGNjNDExMS4uNTgxODg4ZGU3MzJhMGNlYTlmZmI3 ZDU5N2U3N2QxOWI4YmJmNGRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5o CkBAIC05Myw2ICs5Myw3IEBAIHB1YmxpYzoKICAgICBSZW5kZXJPYmplY3QqIHNlbGVjdGlvblVu c3BsaXRFbmQoKSBjb25zdCB7IHJldHVybiBtX3NlbGVjdGlvblVuc3BsaXRFbmQ7IH0KICAgICBJ bnRSZWN0IHNlbGVjdGlvbkJvdW5kcyhib29sIGNsaXBUb1Zpc2libGVDb250ZW50ID0gdHJ1ZSkg Y29uc3Q7CiAgICAgdm9pZCByZXBhaW50U2VsZWN0aW9uKCkgY29uc3Q7CisgICAgdm9pZCBnZXRT ZWxlY3Rpb25TdGFydEVuZCh1bnNpZ25lZCYgc3RhcnQsIHVuc2lnbmVkJiBlbmQpIGNvbnN0IHsg c2VsZWN0aW9uRGF0YSgpLnNlbGVjdGlvblN0YXJ0RW5kUG9zaXRpb25zKHN0YXJ0LCBlbmQpOyB9 CiAKICAgICBib29sIHByaW50aW5nKCkgY29uc3Q7CiAK