97024 2012-09-18 09:29:10 -0700 Remove isStartColumn in the border collapsing code 2012-09-20 08:05:12 -0700 1 1 1 Unclassified WebKit Tables 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix dglazkov eric inferno pravind.2k4 robert webkit.review.bot oldest_to_newest 722860 0 jchaffraix 2012-09-18 09:29:10 -0700 Those 2 booleans are duplicating the information stored in prevCell / nextCell. As we have to compute the previous / next cell in the common case, it's probably better to stick with them. Patch forthcoming. 722874 1 164580 jchaffraix 2012-09-18 10:02:50 -0700 Created attachment 164580 Proposed change: remove isEndColumn / isStartColumn and clean up the code. 723111 2 164580 jchaffraix 2012-09-18 15:57:08 -0700 Comment on attachment 164580 Proposed change: remove isEndColumn / isStartColumn and clean up the code. The cr-linux EWS is sick but I confirm that it regresses fast/repaint/table-collapsed-border.html. Holding the patch until I can investigate. 723245 3 164580 webkit.review.bot 2012-09-18 21:06:44 -0700 Comment on attachment 164580 Proposed change: remove isEndColumn / isStartColumn and clean up the code. Attachment 164580 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13896379 New failing tests: fast/repaint/table-collapsed-border.html 723614 4 jchaffraix 2012-09-19 09:41:13 -0700 > The cr-linux EWS is sick but I confirm that it regresses fast/repaint/table-collapsed-border.html. Holding the patch until I can investigate. OK, one of the assumption I made is wrong: isEndColumn == !cellAfter is just untrue because the table doesn't have to be regular in structure. <table> <tr> <td></td> <td></td> </tr> <tr> <td></td> </tr> </table> The previous table is valid but we would wrongly computes the second row's cell's end border. 723629 5 jchaffraix 2012-09-19 10:12:55 -0700 We need isEndColumn for the previous reason but isStartColumn is fully embedded into cellBefore as we add the cells in order. Renaming the bug. 723648 6 164754 jchaffraix 2012-09-19 10:33:46 -0700 Created attachment 164754 Change v2. Keep isEndColumn and explain why it's needed. 724071 7 164822 jchaffraix 2012-09-19 19:00:13 -0700 Created attachment 164822 Patch for landing. 724525 8 164822 webkit.review.bot 2012-09-20 08:05:08 -0700 Comment on attachment 164822 Patch for landing. Clearing flags on attachment: 164822 Committed r129136: <http://trac.webkit.org/changeset/129136> 724526 9 webkit.review.bot 2012-09-20 08:05:12 -0700 All reviewed patches have been landed. Closing bug. 164580 2012-09-18 10:02:50 -0700 2012-09-19 10:33:43 -0700 Proposed change: remove isEndColumn / isStartColumn and clean up the code. bug-97024-20120918100217.patch text/plain 7196 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk0ZmMyZGExNGRiMTJl MGRiOTZhYTcyNDUyM2UwY2QyMmI4MjAxYS4uNjcwNDYxYmE3Y2NhMmY1N2VmMDJlYjExZDEwMTk4 ZjUwYzNhZWFiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTE4ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBp c1N0YXJ0Q29sdW1uIC8gaXNFbmRDb2x1bW4gaW4gdGhlIGJvcmRlciBjb2xsYXBzaW5nIGNvZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3MDI0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaXNTdGFydENv bHVtbiAvIGlzRW5kQ29sdW1uIGFyZSBlbWJlZGRpbmcgdGhlIHNhbWUgaW5mb3JtYXRpb24gYXMK KyAgICAgICAgcHJldkNlbGwgLyBuZXh0Q2VsbC4gQXMgd2UgbmVlZCB0byBjb21wdXRlIHRoZW0g aW4gbW9zdCBvZiB0aGUgY2FzZXMsCisgICAgICAgIHdlIG1heSBhcyB3ZWxsIGp1c3QgcmV1c2Ug dGhlbS4KKworICAgICAgICBXaGlsZSB0b3VjaGluZyB0aGlzIGNvZGUsIEkgY2xlYW5lZCB1cCB0 aGUgY29kZSBieSByZW1vdmluZyBzb21lIHVubmVlZGVkIGNoZWNrcyBhbmQgcmVuYW1pbmcKKyAg ICAgICAgc29tZSB2YXJpYWJsZXMgaW4gcHJlcGFyYXRpb24gZm9yIGJ1ZyA3OTI3Mi4KKworICAg ICAgICBSZWZhY3RvcmluZyBjb3ZlcmVkIGJ5IGV4aXN0aW5nIGNvbGxhcHNpbmcgYm9yZGVycyB0 ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpjb21wdXRlQ29sbGFwc2VkU3RhcnRCb3JkZXIp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpjb21wdXRlQ29sbGFwc2VkRW5k Qm9yZGVyKToKKwogMjAxMi0wOS0xOCAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtFeHRlbnNpb25zIEFQSV0gcG9zdHBvbmUg cmVxdWVzdHMgdG8gYWRkIGV4dGVuc2lvbnMgdW50aWwgZXh0ZW5zaW9uIHNlcnZlciBpcyBpbml0 aWFsaXplZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl Q2VsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcApp bmRleCBlNDlhYzEwYWYzOGY4OTk2Zjg1ZDIzY2U5ZGFlNzU4OTQyMTkwZjg4Li4xM2M0M2U4YzAx ZDYwMzkxNzlmOGNkYjljZWZlMjc0Mjk1MWE3OGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcApAQCAtNDEyLDcgKzQxMiw2IEBAIENvbGxhcHNlZEJv cmRlclZhbHVlIFJlbmRlclRhYmxlQ2VsbDo6Y29sbGFwc2VkU3RhcnRCb3JkZXIoSW5jbHVkZUJv cmRlckNvbG9yT3JOCiBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1 dGVDb2xsYXBzZWRTdGFydEJvcmRlcihJbmNsdWRlQm9yZGVyQ29sb3JPck5vdCBpbmNsdWRlQ29s b3IpIGNvbnN0CiB7CiAgICAgUmVuZGVyVGFibGUqIHRhYmxlID0gdGhpcy0+dGFibGUoKTsKLSAg ICBib29sIGlzU3RhcnRDb2x1bW4gPSBjb2woKSA9PSAwOwogCiAgICAgLy8gRm9yIHRoZSBzdGFy dCBib3JkZXIsIHdlIG5lZWQgdG8gY2hlY2ssIGluIG9yZGVyIG9mIHByZWNlZGVuY2U6CiAgICAg Ly8gKDEpIE91ciBzdGFydCBib3JkZXIuCkBAIC00MjEsMTIgKzQyMCwxNCBAQCBDb2xsYXBzZWRC b3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBzZWRTdGFydEJvcmRlcihJ bmNsdWRlQm9yZGVyQwogICAgIENvbGxhcHNlZEJvcmRlclZhbHVlIHJlc3VsdChzdHlsZSgpLT5i b3JkZXJTdGFydCgpLCBpbmNsdWRlQ29sb3IgPyBzdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29s b3Ioc3RhcnRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJDRUxMKTsKIAogICAgIC8vICgyKSBU aGUgZW5kIGJvcmRlciBvZiB0aGUgcHJlY2VkaW5nIGNlbGwuCi0gICAgaWYgKFJlbmRlclRhYmxl Q2VsbCogcHJldkNlbGwgPSB0YWJsZS0+Y2VsbEJlZm9yZSh0aGlzKSkgewotICAgICAgICBDb2xs YXBzZWRCb3JkZXJWYWx1ZSBwcmV2Q2VsbEJvcmRlciA9IENvbGxhcHNlZEJvcmRlclZhbHVlKHBy ZXZDZWxsLT5zdHlsZSgpLT5ib3JkZXJFbmQoKSwgaW5jbHVkZUNvbG9yID8gcHJldkNlbGwtPnN0 eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihlbmRDb2xvclByb3BlcnR5KSA6IENvbG9yKCks IEJDRUxMKTsKLSAgICAgICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKHByZXZDZWxsQm9yZGVyLCBy ZXN1bHQpOworICAgIFJlbmRlclRhYmxlQ2VsbCogY2VsbEJlZm9yZSA9IHRhYmxlLT5jZWxsQmVm b3JlKHRoaXMpOworICAgIGlmIChjZWxsQmVmb3JlKSB7CisgICAgICAgIENvbGxhcHNlZEJvcmRl clZhbHVlIGNlbGxCZWZvcmVBZGpvaW5pbmdCb3JkZXIgPSBDb2xsYXBzZWRCb3JkZXJWYWx1ZShj ZWxsQmVmb3JlLT5zdHlsZSgpLT5ib3JkZXJFbmQoKSwgaW5jbHVkZUNvbG9yID8gY2VsbEJlZm9y ZS0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVudENvbG9yKGVuZENvbG9yUHJvcGVydHkpIDogQ29s b3IoKSwgQkNFTEwpOworICAgICAgICAvLyB8cmVzdWx0fCBzaG91bGQgYmUgdGhlIDJuZCBhcmd1 bWVudCBhcyB8Y2VsbEJlZm9yZXwgc2hvdWxkIHdpbiBpbiBjYXNlIG9mIGVxdWFsaXR5IHBlciBD U1MgMi4xIChCb3JkZXIgY29uZmxpY3QgcmVzb2x1dGlvbiwgcG9pbnQgNCkuCisgICAgICAgIHJl c3VsdCA9IGNob29zZUJvcmRlcihjZWxsQmVmb3JlQWRqb2luaW5nQm9yZGVyLCByZXN1bHQpOwog ICAgICAgICBpZiAoIXJlc3VsdC5leGlzdHMoKSkKICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7 Ci0gICAgfSBlbHNlIGlmIChpc1N0YXJ0Q29sdW1uKSB7CisgICAgfSBlbHNlIHsKICAgICAgICAg Ly8gKDMpIE91ciByb3cncyBzdGFydCBib3JkZXIuCiAgICAgICAgIHJlc3VsdCA9IGNob29zZUJv cmRlcihyZXN1bHQsIENvbGxhcHNlZEJvcmRlclZhbHVlKHBhcmVudCgpLT5zdHlsZSgpLT5ib3Jk ZXJTdGFydCgpLCBpbmNsdWRlQ29sb3IgPyBwYXJlbnQoKS0+c3R5bGUoKS0+dmlzaXRlZERlcGVu ZGVudENvbG9yKHN0YXJ0Q29sb3JQcm9wZXJ0eSkgOiBDb2xvcigpLCBCUk9XKSk7CiAgICAgICAg IGlmICghcmVzdWx0LmV4aXN0cygpKQpAQCAtNDU0LDExICs0NTUsMTEgQEAgQ29sbGFwc2VkQm9y ZGVyVmFsdWUgUmVuZGVyVGFibGVDZWxsOjpjb21wdXRlQ29sbGFwc2VkU3RhcnRCb3JkZXIoSW5j bHVkZUJvcmRlckMKICAgICB9CiAgICAgCiAgICAgLy8gKDYpIFRoZSBlbmQgYm9yZGVyIG9mIHRo ZSBwcmVjZWRpbmcgY29sdW1uLgotICAgIGlmICghaXNTdGFydENvbHVtbikgeworICAgIGlmIChj ZWxsQmVmb3JlKSB7CiAgICAgICAgIGNvbEVsdCA9IHRhYmxlLT5jb2xFbGVtZW50KGNvbCgpIC0x LCAmc3RhcnRDb2xFZGdlLCAmZW5kQ29sRWRnZSk7CiAgICAgICAgIGlmIChjb2xFbHQgJiYgZW5k Q29sRWRnZSkgewotICAgICAgICAgICAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgZW5kQm9yZGVyID0g Q29sbGFwc2VkQm9yZGVyVmFsdWUoY29sRWx0LT5zdHlsZSgpLT5ib3JkZXJFbmQoKSwgaW5jbHVk ZUNvbG9yID8gY29sRWx0LT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoZW5kQ29sb3JQ cm9wZXJ0eSkgOiBDb2xvcigpLCBCQ09MKTsKLSAgICAgICAgICAgIHJlc3VsdCA9IGNob29zZUJv cmRlcihlbmRCb3JkZXIsIHJlc3VsdCk7CisgICAgICAgICAgICBDb2xsYXBzZWRCb3JkZXJWYWx1 ZSBjb2x1bW5CZWZvcmVBZGpvaW5pbmdCb3JkZXIgPSBDb2xsYXBzZWRCb3JkZXJWYWx1ZShjb2xF bHQtPnN0eWxlKCktPmJvcmRlckVuZCgpLCBpbmNsdWRlQ29sb3IgPyBjb2xFbHQtPnN0eWxlKCkt PnZpc2l0ZWREZXBlbmRlbnRDb2xvcihlbmRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJDT0wp OworICAgICAgICAgICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKGNvbHVtbkJlZm9yZUFkam9pbmlu Z0JvcmRlciwgcmVzdWx0KTsKICAgICAgICAgICAgIGlmICghcmVzdWx0LmV4aXN0cygpKQogICAg ICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgICAgIH0KQEAgLTQ4Myw3ICs0ODQsNiBA QCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbGxhcHNlZEVuZEJvcmRl cihJbmNsdWRlQm9yZGVyQ29sb3JPck5vdAogQ29sbGFwc2VkQm9yZGVyVmFsdWUgUmVuZGVyVGFi bGVDZWxsOjpjb21wdXRlQ29sbGFwc2VkRW5kQm9yZGVyKEluY2x1ZGVCb3JkZXJDb2xvck9yTm90 IGluY2x1ZGVDb2xvcikgY29uc3QKIHsKICAgICBSZW5kZXJUYWJsZSogdGFibGUgPSB0aGlzLT50 YWJsZSgpOwotICAgIGJvb2wgaXNFbmRDb2x1bW4gPSB0YWJsZS0+Y29sVG9FZmZDb2woY29sKCkg KyBjb2xTcGFuKCkgLSAxKSA9PSB0YWJsZS0+bnVtRWZmQ29scygpIC0gMTsKIAogICAgIC8vIEZv ciBlbmQgYm9yZGVyLCB3ZSBuZWVkIHRvIGNoZWNrLCBpbiBvcmRlciBvZiBwcmVjZWRlbmNlOgog ICAgIC8vICgxKSBPdXIgZW5kIGJvcmRlci4KQEAgLTQ5MiwxNCArNDkyLDEyIEBAIENvbGxhcHNl ZEJvcmRlclZhbHVlIFJlbmRlclRhYmxlQ2VsbDo6Y29tcHV0ZUNvbGxhcHNlZEVuZEJvcmRlcihJ bmNsdWRlQm9yZGVyQ29sCiAgICAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgcmVzdWx0ID0gQ29sbGFw c2VkQm9yZGVyVmFsdWUoc3R5bGUoKS0+Ym9yZGVyRW5kKCksIGluY2x1ZGVDb2xvciA/IHN0eWxl KCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihlbmRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJD RUxMKTsKICAgICAKICAgICAvLyAoMikgVGhlIHN0YXJ0IGJvcmRlciBvZiB0aGUgZm9sbG93aW5n IGNlbGwuCi0gICAgaWYgKCFpc0VuZENvbHVtbikgewotICAgICAgICBSZW5kZXJUYWJsZUNlbGwq IG5leHRDZWxsID0gdGFibGUtPmNlbGxBZnRlcih0aGlzKTsKLSAgICAgICAgaWYgKG5leHRDZWxs ICYmIG5leHRDZWxsLT5zdHlsZSgpKSB7Ci0gICAgICAgICAgICBDb2xsYXBzZWRCb3JkZXJWYWx1 ZSBzdGFydEJvcmRlciA9IENvbGxhcHNlZEJvcmRlclZhbHVlKG5leHRDZWxsLT5zdHlsZSgpLT5i b3JkZXJTdGFydCgpLCBpbmNsdWRlQ29sb3IgPyBuZXh0Q2VsbC0+c3R5bGUoKS0+dmlzaXRlZERl cGVuZGVudENvbG9yKHN0YXJ0Q29sb3JQcm9wZXJ0eSkgOiBDb2xvcigpLCBCQ0VMTCk7Ci0gICAg ICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3JkZXIocmVzdWx0LCBzdGFydEJvcmRlcik7Ci0gICAg ICAgICAgICBpZiAoIXJlc3VsdC5leGlzdHMoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gcmVz dWx0OwotICAgICAgICB9CisgICAgUmVuZGVyVGFibGVDZWxsKiBjZWxsQWZ0ZXIgPSB0YWJsZS0+ Y2VsbEFmdGVyKHRoaXMpOworICAgIGlmIChjZWxsQWZ0ZXIpIHsKKyAgICAgICAgQ29sbGFwc2Vk Qm9yZGVyVmFsdWUgY2VsbEFmdGVyQWRqb2luaW5nQm9yZGVyID0gQ29sbGFwc2VkQm9yZGVyVmFs dWUoY2VsbEFmdGVyLT5zdHlsZSgpLT5ib3JkZXJTdGFydCgpLCBpbmNsdWRlQ29sb3IgPyBjZWxs QWZ0ZXItPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihzdGFydENvbG9yUHJvcGVydHkp IDogQ29sb3IoKSwgQkNFTEwpOworICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3JkZXIocmVzdWx0 LCBjZWxsQWZ0ZXJBZGpvaW5pbmdCb3JkZXIpOworICAgICAgICBpZiAoIXJlc3VsdC5leGlzdHMo KSkKKyAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8g KDMpIE91ciByb3cncyBlbmQgYm9yZGVyLgogICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3JkZXIo cmVzdWx0LCBDb2xsYXBzZWRCb3JkZXJWYWx1ZShwYXJlbnQoKS0+c3R5bGUoKS0+Ym9yZGVyRW5k KCksIGluY2x1ZGVDb2xvciA/IHBhcmVudCgpLT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29s b3IoZW5kQ29sb3JQcm9wZXJ0eSkgOiBDb2xvcigpLCBCUk9XKSk7CkBAIC01MjgsMTEgKzUyNiwx MSBAQCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBz ZWRFbmRCb3JkZXIoSW5jbHVkZUJvcmRlckNvbAogICAgIH0KICAgICAKICAgICAvLyAoNikgVGhl IHN0YXJ0IGJvcmRlciBvZiB0aGUgbmV4dCBjb2x1bW4uCi0gICAgaWYgKCFpc0VuZENvbHVtbikg eworICAgIGlmIChjZWxsQWZ0ZXIpIHsKICAgICAgICAgY29sRWx0ID0gdGFibGUtPmNvbEVsZW1l bnQoY29sKCkgKyBjb2xTcGFuKCksICZzdGFydENvbEVkZ2UsICZlbmRDb2xFZGdlKTsKICAgICAg ICAgaWYgKGNvbEVsdCAmJiBzdGFydENvbEVkZ2UpIHsKLSAgICAgICAgICAgIENvbGxhcHNlZEJv cmRlclZhbHVlIHN0YXJ0Qm9yZGVyID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUoY29sRWx0LT5zdHls ZSgpLT5ib3JkZXJTdGFydCgpLCBpbmNsdWRlQ29sb3IgPyBjb2xFbHQtPnN0eWxlKCktPnZpc2l0 ZWREZXBlbmRlbnRDb2xvcihzdGFydENvbG9yUHJvcGVydHkpIDogQ29sb3IoKSwgQkNPTCk7Ci0g ICAgICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3JkZXIocmVzdWx0LCBzdGFydEJvcmRlcik7Cisg ICAgICAgICAgICBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBjb2x1bW5BZnRlckFkam9pbmluZ0JvcmRl ciA9IENvbGxhcHNlZEJvcmRlclZhbHVlKGNvbEVsdC0+c3R5bGUoKS0+Ym9yZGVyU3RhcnQoKSwg aW5jbHVkZUNvbG9yID8gY29sRWx0LT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3Ioc3Rh cnRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJDT0wpOworICAgICAgICAgICAgcmVzdWx0ID0g Y2hvb3NlQm9yZGVyKHJlc3VsdCwgY29sdW1uQWZ0ZXJBZGpvaW5pbmdCb3JkZXIpOwogICAgICAg ICAgICAgaWYgKCFyZXN1bHQuZXhpc3RzKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3Vs dDsKICAgICAgICAgfQo= 164754 2012-09-19 10:33:46 -0700 2012-09-19 19:00:10 -0700 Change v2. Keep isEndColumn and explain why it's needed. bug-97024-20120919103312.patch text/plain 6917 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc4MTNjMGM2M2M2NDM3 OGZmNjA3NzY0ZjcxNjM3MjY2Y2RjMmVlZC4uY2ZlOWI1NjQ3ZTRjYmY2MDA4MjUzOTFlYzdlZDZh NTg1MzQyZDAxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA5LTE4ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBp c1N0YXJ0Q29sdW1uIGluIHRoZSBib3JkZXIgY29sbGFwc2luZyBjb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzAyNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGlzU3RhcnRDb2x1bW4gaXMgZW1iZWRk aW5nIHRoZSBzYW1lIGluZm9ybWF0aW9uIGFzIHByZXZDZWxsLiBBcyB3ZSBuZWVkIHRvIGNvbXB1 dGUgaXQKKyAgICAgICAgaW4gbW9zdCBvZiB0aGUgY2FzZXMsIHdlIG1heSBhcyB3ZWxsIGp1c3Qg cmV1c2UgdGhlbS4KKworICAgICAgICBXaGlsZSB0b3VjaGluZyB0aGlzIGNvZGUsIEkgY2xlYW5l ZCB1cCB0aGUgY29kZSBieSByZW1vdmluZyBzb21lIHVubmVlZGVkIGNoZWNrcyBhbmQgcmVuYW1p bmcKKyAgICAgICAgc29tZSB2YXJpYWJsZXMgaW4gcHJlcGFyYXRpb24gZm9yIGJ1ZyA3OTI3Mi4K KworICAgICAgICBSZWZhY3RvcmluZyBjb3ZlcmVkIGJ5IGV4aXN0aW5nIGNvbGxhcHNpbmcgYm9y ZGVycyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpjb21wdXRlQ29sbGFwc2VkU3RhcnRC b3JkZXIpOgorICAgICAgICBSZW1vdmVkIHxpc1N0YXJ0Q29sdW1ufC4KKworICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGFibGVDZWxsOjpjb21wdXRlQ29sbGFwc2VkRW5kQm9yZGVyKToKKyAgICAg ICAgQWRkZWQgYSBjb21tZW50IGFib3V0IHdoeSB8aXNFbmRDb2x1bW58IGlzIG5lZWRlZC4gQWxz byBjbGVhbmVkIHVwIHRoaXMgY29kZSB0byBiZQorICAgICAgICBjb25zaXN0ZW50IHdpdGggY29t cHV0ZUNvbGxhcHNlZFN0YXJ0Qm9yZGVyLgorCiAyMDEyLTA5LTE4ICBKb2huIE1lbGxvciAgPGpv aG5tZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGV4dCBBdXRvc2l6aW5nOiBJZ25vcmUgY29u c3RyYWluZWQgaGVpZ2h0cyBpbiBjZXJ0YWluIGNpcmN1bXN0YW5jZXMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCmluZGV4IGU0OWFjMTBhZjM4Zjg5OTZm ODVkMjNjZTlkYWU3NTg5NDIxOTBmODguLmJiMWE5NDNkZjI2OGRjYzQ5NGQ2MDVhNDE3MDcyNDc4 MmRiNDUyMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZUNlbGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwu Y3BwCkBAIC00MTIsNyArNDEyLDYgQEAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgUmVuZGVyVGFibGVD ZWxsOjpjb2xsYXBzZWRTdGFydEJvcmRlcihJbmNsdWRlQm9yZGVyQ29sb3JPck4KIENvbGxhcHNl ZEJvcmRlclZhbHVlIFJlbmRlclRhYmxlQ2VsbDo6Y29tcHV0ZUNvbGxhcHNlZFN0YXJ0Qm9yZGVy KEluY2x1ZGVCb3JkZXJDb2xvck9yTm90IGluY2x1ZGVDb2xvcikgY29uc3QKIHsKICAgICBSZW5k ZXJUYWJsZSogdGFibGUgPSB0aGlzLT50YWJsZSgpOwotICAgIGJvb2wgaXNTdGFydENvbHVtbiA9 IGNvbCgpID09IDA7CiAKICAgICAvLyBGb3IgdGhlIHN0YXJ0IGJvcmRlciwgd2UgbmVlZCB0byBj aGVjaywgaW4gb3JkZXIgb2YgcHJlY2VkZW5jZToKICAgICAvLyAoMSkgT3VyIHN0YXJ0IGJvcmRl ci4KQEAgLTQyMSwxMiArNDIwLDE0IEBAIENvbGxhcHNlZEJvcmRlclZhbHVlIFJlbmRlclRhYmxl Q2VsbDo6Y29tcHV0ZUNvbGxhcHNlZFN0YXJ0Qm9yZGVyKEluY2x1ZGVCb3JkZXJDCiAgICAgQ29s bGFwc2VkQm9yZGVyVmFsdWUgcmVzdWx0KHN0eWxlKCktPmJvcmRlclN0YXJ0KCksIGluY2x1ZGVD b2xvciA/IHN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihzdGFydENvbG9yUHJvcGVydHkp IDogQ29sb3IoKSwgQkNFTEwpOwogCiAgICAgLy8gKDIpIFRoZSBlbmQgYm9yZGVyIG9mIHRoZSBw cmVjZWRpbmcgY2VsbC4KLSAgICBpZiAoUmVuZGVyVGFibGVDZWxsKiBwcmV2Q2VsbCA9IHRhYmxl LT5jZWxsQmVmb3JlKHRoaXMpKSB7Ci0gICAgICAgIENvbGxhcHNlZEJvcmRlclZhbHVlIHByZXZD ZWxsQm9yZGVyID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUocHJldkNlbGwtPnN0eWxlKCktPmJvcmRl ckVuZCgpLCBpbmNsdWRlQ29sb3IgPyBwcmV2Q2VsbC0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVu dENvbG9yKGVuZENvbG9yUHJvcGVydHkpIDogQ29sb3IoKSwgQkNFTEwpOwotICAgICAgICByZXN1 bHQgPSBjaG9vc2VCb3JkZXIocHJldkNlbGxCb3JkZXIsIHJlc3VsdCk7CisgICAgUmVuZGVyVGFi bGVDZWxsKiBjZWxsQmVmb3JlID0gdGFibGUtPmNlbGxCZWZvcmUodGhpcyk7CisgICAgaWYgKGNl bGxCZWZvcmUpIHsKKyAgICAgICAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgY2VsbEJlZm9yZUFkam9p bmluZ0JvcmRlciA9IENvbGxhcHNlZEJvcmRlclZhbHVlKGNlbGxCZWZvcmUtPnN0eWxlKCktPmJv cmRlckVuZCgpLCBpbmNsdWRlQ29sb3IgPyBjZWxsQmVmb3JlLT5zdHlsZSgpLT52aXNpdGVkRGVw ZW5kZW50Q29sb3IoZW5kQ29sb3JQcm9wZXJ0eSkgOiBDb2xvcigpLCBCQ0VMTCk7CisgICAgICAg IC8vIHxyZXN1bHR8IHNob3VsZCBiZSB0aGUgMm5kIGFyZ3VtZW50IGFzIHxjZWxsQmVmb3JlfCBz aG91bGQgd2luIGluIGNhc2Ugb2YgZXF1YWxpdHkgcGVyIENTUyAyLjEgKEJvcmRlciBjb25mbGlj dCByZXNvbHV0aW9uLCBwb2ludCA0KS4KKyAgICAgICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKGNl bGxCZWZvcmVBZGpvaW5pbmdCb3JkZXIsIHJlc3VsdCk7CiAgICAgICAgIGlmICghcmVzdWx0LmV4 aXN0cygpKQogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICB9IGVsc2UgaWYgKGlzU3Rh cnRDb2x1bW4pIHsKKyAgICB9IGVsc2UgewogICAgICAgICAvLyAoMykgT3VyIHJvdydzIHN0YXJ0 IGJvcmRlci4KICAgICAgICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKHJlc3VsdCwgQ29sbGFwc2Vk Qm9yZGVyVmFsdWUocGFyZW50KCktPnN0eWxlKCktPmJvcmRlclN0YXJ0KCksIGluY2x1ZGVDb2xv ciA/IHBhcmVudCgpLT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3Ioc3RhcnRDb2xvclBy b3BlcnR5KSA6IENvbG9yKCksIEJST1cpKTsKICAgICAgICAgaWYgKCFyZXN1bHQuZXhpc3RzKCkp CkBAIC00NTQsMTEgKzQ1NSwxMSBAQCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNl bGw6OmNvbXB1dGVDb2xsYXBzZWRTdGFydEJvcmRlcihJbmNsdWRlQm9yZGVyQwogICAgIH0KICAg ICAKICAgICAvLyAoNikgVGhlIGVuZCBib3JkZXIgb2YgdGhlIHByZWNlZGluZyBjb2x1bW4uCi0g ICAgaWYgKCFpc1N0YXJ0Q29sdW1uKSB7CisgICAgaWYgKGNlbGxCZWZvcmUpIHsKICAgICAgICAg Y29sRWx0ID0gdGFibGUtPmNvbEVsZW1lbnQoY29sKCkgLTEsICZzdGFydENvbEVkZ2UsICZlbmRD b2xFZGdlKTsKICAgICAgICAgaWYgKGNvbEVsdCAmJiBlbmRDb2xFZGdlKSB7Ci0gICAgICAgICAg ICBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBlbmRCb3JkZXIgPSBDb2xsYXBzZWRCb3JkZXJWYWx1ZShj b2xFbHQtPnN0eWxlKCktPmJvcmRlckVuZCgpLCBpbmNsdWRlQ29sb3IgPyBjb2xFbHQtPnN0eWxl KCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihlbmRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJD T0wpOwotICAgICAgICAgICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKGVuZEJvcmRlciwgcmVzdWx0 KTsKKyAgICAgICAgICAgIENvbGxhcHNlZEJvcmRlclZhbHVlIGNvbHVtbkJlZm9yZUFkam9pbmlu Z0JvcmRlciA9IENvbGxhcHNlZEJvcmRlclZhbHVlKGNvbEVsdC0+c3R5bGUoKS0+Ym9yZGVyRW5k KCksIGluY2x1ZGVDb2xvciA/IGNvbEVsdC0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVudENvbG9y KGVuZENvbG9yUHJvcGVydHkpIDogQ29sb3IoKSwgQkNPTCk7CisgICAgICAgICAgICByZXN1bHQg PSBjaG9vc2VCb3JkZXIoY29sdW1uQmVmb3JlQWRqb2luaW5nQm9yZGVyLCByZXN1bHQpOwogICAg ICAgICAgICAgaWYgKCFyZXN1bHQuZXhpc3RzKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHJl c3VsdDsKICAgICAgICAgfQpAQCAtNDgzLDYgKzQ4NCw4IEBAIENvbGxhcHNlZEJvcmRlclZhbHVl IFJlbmRlclRhYmxlQ2VsbDo6Y29sbGFwc2VkRW5kQm9yZGVyKEluY2x1ZGVCb3JkZXJDb2xvck9y Tm90CiBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBz ZWRFbmRCb3JkZXIoSW5jbHVkZUJvcmRlckNvbG9yT3JOb3QgaW5jbHVkZUNvbG9yKSBjb25zdAog ewogICAgIFJlbmRlclRhYmxlKiB0YWJsZSA9IHRoaXMtPnRhYmxlKCk7CisgICAgLy8gTm90ZTog V2UgaGF2ZSB0byB1c2UgdGhlIGVmZmVjdGl2ZSBjb2x1bW4gaW5mb3JtYXRpb24gaW5zdGVhZCBv ZiB3aGV0aGVyIHdlIGhhdmUgYSBjZWxsIGFmdGVyIGFzIGEgdGFibGUgZG9lc24ndAorICAgIC8v IGhhdmUgdG8gYmUgcmVndWxhciAoYW55IHJvdyBjYW4gaGF2ZSBsZXNzIGNlbGxzIHRoYW4gdGhl IHRvdGFsIGNlbGwgY291bnQpLgogICAgIGJvb2wgaXNFbmRDb2x1bW4gPSB0YWJsZS0+Y29sVG9F ZmZDb2woY29sKCkgKyBjb2xTcGFuKCkgLSAxKSA9PSB0YWJsZS0+bnVtRWZmQ29scygpIC0gMTsK IAogICAgIC8vIEZvciBlbmQgYm9yZGVyLCB3ZSBuZWVkIHRvIGNoZWNrLCBpbiBvcmRlciBvZiBw cmVjZWRlbmNlOgpAQCAtNDkzLDEwICs0OTYsOSBAQCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5k ZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBzZWRFbmRCb3JkZXIoSW5jbHVkZUJvcmRlckNvbAog ICAgIAogICAgIC8vICgyKSBUaGUgc3RhcnQgYm9yZGVyIG9mIHRoZSBmb2xsb3dpbmcgY2VsbC4K ICAgICBpZiAoIWlzRW5kQ29sdW1uKSB7Ci0gICAgICAgIFJlbmRlclRhYmxlQ2VsbCogbmV4dENl bGwgPSB0YWJsZS0+Y2VsbEFmdGVyKHRoaXMpOwotICAgICAgICBpZiAobmV4dENlbGwgJiYgbmV4 dENlbGwtPnN0eWxlKCkpIHsKLSAgICAgICAgICAgIENvbGxhcHNlZEJvcmRlclZhbHVlIHN0YXJ0 Qm9yZGVyID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUobmV4dENlbGwtPnN0eWxlKCktPmJvcmRlclN0 YXJ0KCksIGluY2x1ZGVDb2xvciA/IG5leHRDZWxsLT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50 Q29sb3Ioc3RhcnRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJDRUxMKTsKLSAgICAgICAgICAg IHJlc3VsdCA9IGNob29zZUJvcmRlcihyZXN1bHQsIHN0YXJ0Qm9yZGVyKTsKKyAgICAgICAgaWYg KFJlbmRlclRhYmxlQ2VsbCogY2VsbEFmdGVyID0gdGFibGUtPmNlbGxBZnRlcih0aGlzKSkgewor ICAgICAgICAgICAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgY2VsbEFmdGVyQWRqb2luaW5nQm9yZGVy ID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUoY2VsbEFmdGVyLT5zdHlsZSgpLT5ib3JkZXJTdGFydCgp LCBpbmNsdWRlQ29sb3IgPyBjZWxsQWZ0ZXItPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xv cihzdGFydENvbG9yUHJvcGVydHkpIDogQ29sb3IoKSwgQkNFTEwpOworICAgICAgICAgICAgcmVz dWx0ID0gY2hvb3NlQm9yZGVyKHJlc3VsdCwgY2VsbEFmdGVyQWRqb2luaW5nQm9yZGVyKTsKICAg ICAgICAgICAgIGlmICghcmVzdWx0LmV4aXN0cygpKQogICAgICAgICAgICAgICAgIHJldHVybiBy ZXN1bHQ7CiAgICAgICAgIH0KQEAgLTUzMSw4ICs1MzMsOCBAQCBDb2xsYXBzZWRCb3JkZXJWYWx1 ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBzZWRFbmRCb3JkZXIoSW5jbHVkZUJvcmRl ckNvbAogICAgIGlmICghaXNFbmRDb2x1bW4pIHsKICAgICAgICAgY29sRWx0ID0gdGFibGUtPmNv bEVsZW1lbnQoY29sKCkgKyBjb2xTcGFuKCksICZzdGFydENvbEVkZ2UsICZlbmRDb2xFZGdlKTsK ICAgICAgICAgaWYgKGNvbEVsdCAmJiBzdGFydENvbEVkZ2UpIHsKLSAgICAgICAgICAgIENvbGxh cHNlZEJvcmRlclZhbHVlIHN0YXJ0Qm9yZGVyID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUoY29sRWx0 LT5zdHlsZSgpLT5ib3JkZXJTdGFydCgpLCBpbmNsdWRlQ29sb3IgPyBjb2xFbHQtPnN0eWxlKCkt PnZpc2l0ZWREZXBlbmRlbnRDb2xvcihzdGFydENvbG9yUHJvcGVydHkpIDogQ29sb3IoKSwgQkNP TCk7Ci0gICAgICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3JkZXIocmVzdWx0LCBzdGFydEJvcmRl cik7CisgICAgICAgICAgICBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBjb2x1bW5BZnRlckFkam9pbmlu Z0JvcmRlciA9IENvbGxhcHNlZEJvcmRlclZhbHVlKGNvbEVsdC0+c3R5bGUoKS0+Ym9yZGVyU3Rh cnQoKSwgaW5jbHVkZUNvbG9yID8gY29sRWx0LT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29s b3Ioc3RhcnRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJDT0wpOworICAgICAgICAgICAgcmVz dWx0ID0gY2hvb3NlQm9yZGVyKHJlc3VsdCwgY29sdW1uQWZ0ZXJBZGpvaW5pbmdCb3JkZXIpOwog ICAgICAgICAgICAgaWYgKCFyZXN1bHQuZXhpc3RzKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJu IHJlc3VsdDsKICAgICAgICAgfQo= 164822 2012-09-19 19:00:13 -0700 2012-09-20 08:05:08 -0700 Patch for landing. bug-97024-20120919185938.patch text/plain 7055 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA4Zjg0N2U0YzI5ZTUx Yjg2NzY1OTVlYzE4MGRiM2Q5MmFlNjQwOC4uNTY4M2E3NGQ0YzBkNzdlMzlhNjJlMWJiMGQ2MjZh YzYzZjZhMjM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTA5LTE5ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgogCisgICAgICAgIFJlbW92ZSBp c1N0YXJ0Q29sdW1uIGluIHRoZSBib3JkZXIgY29sbGFwc2luZyBjb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzAyNAorCisgICAgICAgIFJldmll d2VkIGJ5IEFiaGlzaGVrIEFyeWEuCisKKyAgICAgICAgaXNTdGFydENvbHVtbiBpcyBlbWJlZGRp bmcgdGhlIHNhbWUgaW5mb3JtYXRpb24gYXMgcHJldkNlbGwuIEFzIHdlIG5lZWQgdG8gY29tcHV0 ZSBpdAorICAgICAgICBpbiBtb3N0IG9mIHRoZSBjYXNlcywgd2UgbWF5IGFzIHdlbGwganVzdCBy ZXVzZSB0aGVtLgorCisgICAgICAgIFdoaWxlIHRvdWNoaW5nIHRoaXMgY29kZSwgSSBjbGVhbmVk IHVwIHRoZSBjb2RlIGJ5IHJlbW92aW5nIHNvbWUgdW5uZWVkZWQgY2hlY2tzIGFuZCByZW5hbWlu ZworICAgICAgICBzb21lIHZhcmlhYmxlcyBpbiBwcmVwYXJhdGlvbiBmb3IgYnVnIDc5MjcyLgor CisgICAgICAgIFJlZmFjdG9yaW5nIGNvdmVyZWQgYnkgZXhpc3RpbmcgY29sbGFwc2luZyBib3Jk ZXJzIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBzZWRTdGFydEJv cmRlcik6CisgICAgICAgIFJlbW92ZWQgfGlzU3RhcnRDb2x1bW58LgorCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBzZWRFbmRCb3JkZXIpOgorICAgICAg ICBBZGRlZCBhIGNvbW1lbnQgYWJvdXQgd2h5IHxpc0VuZENvbHVtbnwgaXMgbmVlZGVkLiBBbHNv IGNsZWFuZWQgdXAgdGhpcyBjb2RlIHRvIGJlCisgICAgICAgIGNvbnNpc3RlbnQgd2l0aCBjb21w dXRlQ29sbGFwc2VkU3RhcnRCb3JkZXIuCisKKzIwMTItMDktMTkgIEp1bGllbiBDaGFmZnJhaXgg IDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+CisKICAgICAgICAgVGhlIGNvbGxhcHNpbmcgYm9yZGVy IGNvZGUgbmVlZHMgZGlyZWN0aW9uLWF3YXJlIGJvcmRlciBnZXR0ZXJzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjcxMAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCmluZGV4IDhlMGNkNmVmMmFmZDgwMjRm YjAxNGNjOWVlNTNhZWFlZTYwMjUyMGYuLjNjMGUzZTNiZGE3N2ZjZmIzNzIyYmYzYTAxNjI3OWY4 MDRmYzYyMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZUNlbGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwu Y3BwCkBAIC00MTIsNyArNDEyLDYgQEAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgUmVuZGVyVGFibGVD ZWxsOjpjb2xsYXBzZWRTdGFydEJvcmRlcihJbmNsdWRlQm9yZGVyQ29sb3JPck4KIENvbGxhcHNl ZEJvcmRlclZhbHVlIFJlbmRlclRhYmxlQ2VsbDo6Y29tcHV0ZUNvbGxhcHNlZFN0YXJ0Qm9yZGVy KEluY2x1ZGVCb3JkZXJDb2xvck9yTm90IGluY2x1ZGVDb2xvcikgY29uc3QKIHsKICAgICBSZW5k ZXJUYWJsZSogdGFibGUgPSB0aGlzLT50YWJsZSgpOwotICAgIGJvb2wgaXNTdGFydENvbHVtbiA9 IGNvbCgpID09IDA7CiAKICAgICAvLyBGb3IgdGhlIHN0YXJ0IGJvcmRlciwgd2UgbmVlZCB0byBj aGVjaywgaW4gb3JkZXIgb2YgcHJlY2VkZW5jZToKICAgICAvLyAoMSkgT3VyIHN0YXJ0IGJvcmRl ci4KQEAgLTQyMSwxMiArNDIwLDE0IEBAIENvbGxhcHNlZEJvcmRlclZhbHVlIFJlbmRlclRhYmxl Q2VsbDo6Y29tcHV0ZUNvbGxhcHNlZFN0YXJ0Qm9yZGVyKEluY2x1ZGVCb3JkZXJDCiAgICAgQ29s bGFwc2VkQm9yZGVyVmFsdWUgcmVzdWx0KHN0eWxlKCktPmJvcmRlclN0YXJ0KCksIGluY2x1ZGVD b2xvciA/IHN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihzdGFydENvbG9yUHJvcGVydHkp IDogQ29sb3IoKSwgQkNFTEwpOwogCiAgICAgLy8gKDIpIFRoZSBlbmQgYm9yZGVyIG9mIHRoZSBw cmVjZWRpbmcgY2VsbC4KLSAgICBpZiAoUmVuZGVyVGFibGVDZWxsKiBwcmV2Q2VsbCA9IHRhYmxl LT5jZWxsQmVmb3JlKHRoaXMpKSB7Ci0gICAgICAgIENvbGxhcHNlZEJvcmRlclZhbHVlIHByZXZD ZWxsQm9yZGVyID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUocHJldkNlbGwtPmJvcmRlckFkam9pbmlu Z0NlbGxBZnRlcih0aGlzKSwgaW5jbHVkZUNvbG9yID8gcHJldkNlbGwtPnN0eWxlKCktPnZpc2l0 ZWREZXBlbmRlbnRDb2xvcihlbmRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJDRUxMKTsKLSAg ICAgICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKHByZXZDZWxsQm9yZGVyLCByZXN1bHQpOworICAg IFJlbmRlclRhYmxlQ2VsbCogY2VsbEJlZm9yZSA9IHRhYmxlLT5jZWxsQmVmb3JlKHRoaXMpOwor ICAgIGlmIChjZWxsQmVmb3JlKSB7CisgICAgICAgIENvbGxhcHNlZEJvcmRlclZhbHVlIGNlbGxC ZWZvcmVBZGpvaW5pbmdCb3JkZXIgPSBDb2xsYXBzZWRCb3JkZXJWYWx1ZShjZWxsQmVmb3JlLT5i b3JkZXJBZGpvaW5pbmdDZWxsQWZ0ZXIodGhpcyksIGluY2x1ZGVDb2xvciA/IGNlbGxCZWZvcmUt PnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihlbmRDb2xvclByb3BlcnR5KSA6IENvbG9y KCksIEJDRUxMKTsKKyAgICAgICAgLy8gfHJlc3VsdHwgc2hvdWxkIGJlIHRoZSAybmQgYXJndW1l bnQgYXMgfGNlbGxCZWZvcmV8IHNob3VsZCB3aW4gaW4gY2FzZSBvZiBlcXVhbGl0eSBwZXIgQ1NT IDIuMSAoQm9yZGVyIGNvbmZsaWN0IHJlc29sdXRpb24sIHBvaW50IDQpLgorICAgICAgICByZXN1 bHQgPSBjaG9vc2VCb3JkZXIoY2VsbEJlZm9yZUFkam9pbmluZ0JvcmRlciwgcmVzdWx0KTsKICAg ICAgICAgaWYgKCFyZXN1bHQuZXhpc3RzKCkpCiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0Owot ICAgIH0gZWxzZSBpZiAoaXNTdGFydENvbHVtbikgeworICAgIH0gZWxzZSB7CiAgICAgICAgIC8v ICgzKSBPdXIgcm93J3Mgc3RhcnQgYm9yZGVyLgogICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3Jk ZXIocmVzdWx0LCBDb2xsYXBzZWRCb3JkZXJWYWx1ZShyb3coKS0+Ym9yZGVyQWRqb2luaW5nU3Rh cnRDZWxsKHRoaXMpLCBpbmNsdWRlQ29sb3IgPyBwYXJlbnQoKS0+c3R5bGUoKS0+dmlzaXRlZERl cGVuZGVudENvbG9yKHN0YXJ0Q29sb3JQcm9wZXJ0eSkgOiBDb2xvcigpLCBCUk9XKSk7CiAgICAg ICAgIGlmICghcmVzdWx0LmV4aXN0cygpKQpAQCAtNDU0LDExICs0NTUsMTEgQEAgQ29sbGFwc2Vk Qm9yZGVyVmFsdWUgUmVuZGVyVGFibGVDZWxsOjpjb21wdXRlQ29sbGFwc2VkU3RhcnRCb3JkZXIo SW5jbHVkZUJvcmRlckMKICAgICB9CiAgICAgCiAgICAgLy8gKDYpIFRoZSBlbmQgYm9yZGVyIG9m IHRoZSBwcmVjZWRpbmcgY29sdW1uLgotICAgIGlmICghaXNTdGFydENvbHVtbikgeworICAgIGlm IChjZWxsQmVmb3JlKSB7CiAgICAgICAgIGNvbEVsdCA9IHRhYmxlLT5jb2xFbGVtZW50KGNvbCgp IC0xLCAmc3RhcnRDb2xFZGdlLCAmZW5kQ29sRWRnZSk7CiAgICAgICAgIGlmIChjb2xFbHQgJiYg ZW5kQ29sRWRnZSkgewotICAgICAgICAgICAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgZW5kQm9yZGVy ID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUoY29sRWx0LT5ib3JkZXJBZGpvaW5pbmdDZWxsQWZ0ZXIo dGhpcyksIGluY2x1ZGVDb2xvciA/IGNvbEVsdC0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVudENv bG9yKGVuZENvbG9yUHJvcGVydHkpIDogQ29sb3IoKSwgQkNPTCk7Ci0gICAgICAgICAgICByZXN1 bHQgPSBjaG9vc2VCb3JkZXIoZW5kQm9yZGVyLCByZXN1bHQpOworICAgICAgICAgICAgQ29sbGFw c2VkQm9yZGVyVmFsdWUgY29sdW1uQmVmb3JlQWRqb2luaW5nQm9yZGVyID0gQ29sbGFwc2VkQm9y ZGVyVmFsdWUoY29sRWx0LT5ib3JkZXJBZGpvaW5pbmdDZWxsQWZ0ZXIodGhpcyksIGluY2x1ZGVD b2xvciA/IGNvbEVsdC0+c3R5bGUoKS0+dmlzaXRlZERlcGVuZGVudENvbG9yKGVuZENvbG9yUHJv cGVydHkpIDogQ29sb3IoKSwgQkNPTCk7CisgICAgICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3Jk ZXIoY29sdW1uQmVmb3JlQWRqb2luaW5nQm9yZGVyLCByZXN1bHQpOwogICAgICAgICAgICAgaWYg KCFyZXN1bHQuZXhpc3RzKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAg ICAgfQpAQCAtNDgzLDYgKzQ4NCw4IEBAIENvbGxhcHNlZEJvcmRlclZhbHVlIFJlbmRlclRhYmxl Q2VsbDo6Y29sbGFwc2VkRW5kQm9yZGVyKEluY2x1ZGVCb3JkZXJDb2xvck9yTm90CiBDb2xsYXBz ZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBzZWRFbmRCb3JkZXIo SW5jbHVkZUJvcmRlckNvbG9yT3JOb3QgaW5jbHVkZUNvbG9yKSBjb25zdAogewogICAgIFJlbmRl clRhYmxlKiB0YWJsZSA9IHRoaXMtPnRhYmxlKCk7CisgICAgLy8gTm90ZTogV2UgaGF2ZSB0byB1 c2UgdGhlIGVmZmVjdGl2ZSBjb2x1bW4gaW5mb3JtYXRpb24gaW5zdGVhZCBvZiB3aGV0aGVyIHdl IGhhdmUgYSBjZWxsIGFmdGVyIGFzIGEgdGFibGUgZG9lc24ndAorICAgIC8vIGhhdmUgdG8gYmUg cmVndWxhciAoYW55IHJvdyBjYW4gaGF2ZSBsZXNzIGNlbGxzIHRoYW4gdGhlIHRvdGFsIGNlbGwg Y291bnQpLgogICAgIGJvb2wgaXNFbmRDb2x1bW4gPSB0YWJsZS0+Y29sVG9FZmZDb2woY29sKCkg KyBjb2xTcGFuKCkgLSAxKSA9PSB0YWJsZS0+bnVtRWZmQ29scygpIC0gMTsKIAogICAgIC8vIEZv ciBlbmQgYm9yZGVyLCB3ZSBuZWVkIHRvIGNoZWNrLCBpbiBvcmRlciBvZiBwcmVjZWRlbmNlOgpA QCAtNDkzLDEwICs0OTYsOSBAQCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6 OmNvbXB1dGVDb2xsYXBzZWRFbmRCb3JkZXIoSW5jbHVkZUJvcmRlckNvbAogICAgIAogICAgIC8v ICgyKSBUaGUgc3RhcnQgYm9yZGVyIG9mIHRoZSBmb2xsb3dpbmcgY2VsbC4KICAgICBpZiAoIWlz RW5kQ29sdW1uKSB7Ci0gICAgICAgIFJlbmRlclRhYmxlQ2VsbCogbmV4dENlbGwgPSB0YWJsZS0+ Y2VsbEFmdGVyKHRoaXMpOwotICAgICAgICBpZiAobmV4dENlbGwgJiYgbmV4dENlbGwtPnN0eWxl KCkpIHsKLSAgICAgICAgICAgIENvbGxhcHNlZEJvcmRlclZhbHVlIHN0YXJ0Qm9yZGVyID0gQ29s bGFwc2VkQm9yZGVyVmFsdWUobmV4dENlbGwtPmJvcmRlckFkam9pbmluZ0NlbGxCZWZvcmUodGhp cyksIGluY2x1ZGVDb2xvciA/IG5leHRDZWxsLT5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29s b3Ioc3RhcnRDb2xvclByb3BlcnR5KSA6IENvbG9yKCksIEJDRUxMKTsKLSAgICAgICAgICAgIHJl c3VsdCA9IGNob29zZUJvcmRlcihyZXN1bHQsIHN0YXJ0Qm9yZGVyKTsKKyAgICAgICAgaWYgKFJl bmRlclRhYmxlQ2VsbCogY2VsbEFmdGVyID0gdGFibGUtPmNlbGxBZnRlcih0aGlzKSkgeworICAg ICAgICAgICAgQ29sbGFwc2VkQm9yZGVyVmFsdWUgY2VsbEFmdGVyQWRqb2luaW5nQm9yZGVyID0g Q29sbGFwc2VkQm9yZGVyVmFsdWUoY2VsbEFmdGVyLT5ib3JkZXJBZGpvaW5pbmdDZWxsQmVmb3Jl KHRoaXMpLCBpbmNsdWRlQ29sb3IgPyBjZWxsQWZ0ZXItPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRl bnRDb2xvcihzdGFydENvbG9yUHJvcGVydHkpIDogQ29sb3IoKSwgQkNFTEwpOworICAgICAgICAg ICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKHJlc3VsdCwgY2VsbEFmdGVyQWRqb2luaW5nQm9yZGVy KTsKICAgICAgICAgICAgIGlmICghcmVzdWx0LmV4aXN0cygpKQogICAgICAgICAgICAgICAgIHJl dHVybiByZXN1bHQ7CiAgICAgICAgIH0KQEAgLTUzMSw4ICs1MzMsOCBAQCBDb2xsYXBzZWRCb3Jk ZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVDb2xsYXBzZWRFbmRCb3JkZXIoSW5jbHVk ZUJvcmRlckNvbAogICAgIGlmICghaXNFbmRDb2x1bW4pIHsKICAgICAgICAgY29sRWx0ID0gdGFi bGUtPmNvbEVsZW1lbnQoY29sKCkgKyBjb2xTcGFuKCksICZzdGFydENvbEVkZ2UsICZlbmRDb2xF ZGdlKTsKICAgICAgICAgaWYgKGNvbEVsdCAmJiBzdGFydENvbEVkZ2UpIHsKLSAgICAgICAgICAg IENvbGxhcHNlZEJvcmRlclZhbHVlIHN0YXJ0Qm9yZGVyID0gQ29sbGFwc2VkQm9yZGVyVmFsdWUo Y29sRWx0LT5ib3JkZXJBZGpvaW5pbmdDZWxsQmVmb3JlKHRoaXMpLCBpbmNsdWRlQ29sb3IgPyBj b2xFbHQtPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihzdGFydENvbG9yUHJvcGVydHkp IDogQ29sb3IoKSwgQkNPTCk7Ci0gICAgICAgICAgICByZXN1bHQgPSBjaG9vc2VCb3JkZXIocmVz dWx0LCBzdGFydEJvcmRlcik7CisgICAgICAgICAgICBDb2xsYXBzZWRCb3JkZXJWYWx1ZSBjb2x1 bW5BZnRlckFkam9pbmluZ0JvcmRlciA9IENvbGxhcHNlZEJvcmRlclZhbHVlKGNvbEVsdC0+Ym9y ZGVyQWRqb2luaW5nQ2VsbEJlZm9yZSh0aGlzKSwgaW5jbHVkZUNvbG9yID8gY29sRWx0LT5zdHls ZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3Ioc3RhcnRDb2xvclByb3BlcnR5KSA6IENvbG9yKCks IEJDT0wpOworICAgICAgICAgICAgcmVzdWx0ID0gY2hvb3NlQm9yZGVyKHJlc3VsdCwgY29sdW1u QWZ0ZXJBZGpvaW5pbmdCb3JkZXIpOwogICAgICAgICAgICAgaWYgKCFyZXN1bHQuZXhpc3RzKCkp CiAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAgfQo=