138398 2014-11-04 18:35:40 -0800 Move text-align CSS property to the new StyleBuilder 2014-11-05 10:24:58 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez buildbot commit-queue kling koivisto rniwa sam oldest_to_newest 1046340 0 cdumez 2014-11-04 18:35:40 -0800 Move text-align CSS property to the new StyleBuilder 1046349 1 240997 cdumez 2014-11-04 19:09:39 -0800 Created attachment 240997 Patch 1046448 2 240997 koivisto 2014-11-05 05:09:11 -0800 Comment on attachment 240997 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240997&action=review > Source/WebCore/css/StyleBuilderConverter.h:318 > + if (styleResolver.parentStyle()->textAlign() == TASTART) could use variable for styleResolver.parentStyle()->textAlign() 1046497 3 241035 cdumez 2014-11-05 09:28:49 -0800 Created attachment 241035 Patch 1046520 4 241035 commit-queue 2014-11-05 10:24:52 -0800 Comment on attachment 241035 Patch Clearing flags on attachment: 241035 Committed r175625: <http://trac.webkit.org/changeset/175625> 1046521 5 commit-queue 2014-11-05 10:24:58 -0800 All reviewed patches have been landed. Closing bug. 240997 2014-11-04 19:09:39 -0800 2014-11-05 09:28:46 -0800 Patch bug-138398-20141104190948.patch text/plain 6284 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQwYmI3NDE5OTZkNGZj MDZjMjRiOGM5YzZkZmE1NWRkYjI3YjEyMS4uOGIzMDc0MmYxMGQwNDgxY2I0NTkyOGMwMDQ4ZmNi Yzk2NGJiZmU4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTExLTA0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSB0ZXh0LWFsaWduIENT UyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4Mzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0ZXh0LWFsaWduIENTUyBwcm9wZXJ0eSBm cm9tIERlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIgdG8gdGhlIG5ldworICAgICAgICBTdHlsZUJ1aWxk ZXIgc28gdGhhdCBpdCBpcyBub3cgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydHlOYW1lcy5pbi4K KyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGEgVGV4dEFsaWduIENvbnZlcnRlciB0byBzdXBwb3J0 IHRoaXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAg ICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvRGVwcmVjYXRl ZFN0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNhdGVkU3R5bGVCdWls ZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlUZXh0QWxpZ246OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 QXBwbHlQcm9wZXJ0eVRleHRBbGlnbjo6Y3JlYXRlSGFuZGxlcik6IERlbGV0ZWQuCisgICAgICAg ICogY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVC dWlsZGVyQ29udmVydGVyOjpjb252ZXJ0VGV4dEFsaWduKToKKwogMjAxNC0xMS0wNCAgVGltIEhv cnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYnVuZGxlIFNQ SSBhbGxvd2luZyBQYWdlT3ZlcmxheSB0byBjdXN0b21pemUgdGhlIGFjdGlvbiBtZW51CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCmluZGV4IDQ0OTU3MWFhM2UxNjRkMjE5YzM2 ZGM1MjJmZDA3N2MwYjBiZjEyYmIuLjFmNTg1ODhiNWZlNGY0ZTRhNTZkODZjNTI0OTQxMTJmNjkz ZWFmZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmlu CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCkBAIC0yMTUsNyAr MjE1LDcgQEAgc3JjCiBzcGVhayBbSW5oZXJpdGVkLCBOZXdTdHlsZUJ1aWxkZXJdCiB0YWJsZS1s YXlvdXQgW05ld1N0eWxlQnVpbGRlcl0KIHRhYi1zaXplIFtJbmhlcml0ZWQsIE5ld1N0eWxlQnVp bGRlciwgVHlwZU5hbWU9dW5zaWduZWRdCi10ZXh0LWFsaWduIFtJbmhlcml0ZWRdCit0ZXh0LWFs aWduIFtJbmhlcml0ZWQsIE5ld1N0eWxlQnVpbGRlciwgQ29udmVydGVyPVRleHRBbGlnbl0KIHRl eHQtZGVjb3JhdGlvbiBbTmV3U3R5bGVCdWlsZGVyLCBDb252ZXJ0ZXI9VGV4dERlY29yYXRpb25d CiB0ZXh0LWluZGVudCBbSW5oZXJpdGVkXQogdGV4dC1saW5lLXRocm91Z2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAppbmRleCA0N2UzZmZmMzU3ZDgz MjU5YWZkZGQxMGVlYTBmODk2MzE3YmY0MzUwLi4wNTc4ZThkZGY0MTRkNGY3NmZhNTVlZTdkOGQ4 YTU2YWE0ZGI1ZWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0 eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1 aWxkZXIuY3BwCkBAIC05NzksMzIgKzk3OSw2IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUHJvcGVy dHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKSB7IHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5 SW5oZXJpdFZhbHVlLCAmYXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsgfQogfTsKIAot Y2xhc3MgQXBwbHlQcm9wZXJ0eVRleHRBbGlnbiB7Ci1wdWJsaWM6Ci0gICAgc3RhdGljIHZvaWQg YXBwbHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyLCBD U1NWYWx1ZSogdmFsdWUpCi0gICAgewotICAgICAgICBpZiAoIWlzPENTU1ByaW1pdGl2ZVZhbHVl PigqdmFsdWUpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIENTU1ByaW1pdGl2ZVZh bHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUp OwotICAgICAgICBBU1NFUlQocHJpbWl0aXZlVmFsdWUuaXNWYWx1ZUlEKCkpOwotCi0gICAgICAg IGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgIT0gQ1NTVmFsdWVXZWJraXRNYXRjaFBh cmVudCkKLSAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNldFRleHRBbGlnbihw cmltaXRpdmVWYWx1ZSk7Ci0gICAgICAgIGVsc2UgaWYgKHN0eWxlUmVzb2x2ZXItPnBhcmVudFN0 eWxlKCktPnRleHRBbGlnbigpID09IFRBU1RBUlQpCi0gICAgICAgICAgICBzdHlsZVJlc29sdmVy LT5zdHlsZSgpLT5zZXRUZXh0QWxpZ24oc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+aXNM ZWZ0VG9SaWdodERpcmVjdGlvbigpID8gTEVGVCA6IFJJR0hUKTsKLSAgICAgICAgZWxzZSBpZiAo c3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+dGV4dEFsaWduKCkgPT0gVEFFTkQpCi0gICAg ICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRUZXh0QWxpZ24oc3R5bGVSZXNvbHZl ci0+cGFyZW50U3R5bGUoKS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gUklHSFQgOiBMRUZU KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0 VGV4dEFsaWduKHN0eWxlUmVzb2x2ZXItPnBhcmVudFN0eWxlKCktPnRleHRBbGlnbigpKTsKLSAg ICB9Ci0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkKLSAgICB7Ci0g ICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0gQXBwbHlQcm9wZXJ0eURlZmF1bHRCYXNl PEVUZXh0QWxpZ24sICZSZW5kZXJTdHlsZTo6dGV4dEFsaWduLCBFVGV4dEFsaWduLCAmUmVuZGVy U3R5bGU6OnNldFRleHRBbGlnbiwgRVRleHRBbGlnbiwgJlJlbmRlclN0eWxlOjppbml0aWFsVGV4 dEFsaWduPjo6Y3JlYXRlSGFuZGxlcigpOwotICAgICAgICByZXR1cm4gUHJvcGVydHlIYW5kbGVy KGhhbmRsZXIuaW5oZXJpdEZ1bmN0aW9uKCksIGhhbmRsZXIuaW5pdGlhbEZ1bmN0aW9uKCksICZh cHBseVZhbHVlKTsKLSAgICB9Ci19OwotCiBzdGF0aWMgVGV4dERlY29yYXRpb25Ta2lwIHZhbHVl VG9EZWNvcmF0aW9uU2tpcChDU1NQcmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFsdWUpCiB7CiAg ICAgQVNTRVJUKHByaW1pdGl2ZVZhbHVlLmlzVmFsdWVJRCgpKTsKQEAgLTE5MzcsNyArMTkxMSw2 IEBAIERlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIoKQogICAg IHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU91dGxpbmVTdHlsZSwgQXBwbHlQcm9wZXJ0 eU91dGxpbmVTdHlsZTo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIo Q1NTUHJvcGVydHlSZXNpemUsIEFwcGx5UHJvcGVydHlSZXNpemU6OmNyZWF0ZUhhbmRsZXIoKSk7 CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5U2l6ZSwgQXBwbHlQcm9wZXJ0eVBh Z2VTaXplOjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eVRleHRBbGlnbiwgQXBwbHlQcm9wZXJ0eVRleHRBbGlnbjo6Y3JlYXRlSGFuZGxlcigpKTsK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUZXh0RGVjb3JhdGlvbkNv bG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9Jbmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxl Ojp0ZXh0RGVjb3JhdGlvbkNvbG9yLCAmUmVuZGVyU3R5bGU6OnNldFRleHREZWNvcmF0aW9uQ29s b3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtUZXh0RGVjb3JhdGlvbkNvbG9yLCAmUmVu ZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRs ZXIoQ1NTUHJvcGVydHlXZWJraXRUZXh0RGVjb3JhdGlvblNraXAsIEFwcGx5UHJvcGVydHlUZXh0 RGVjb3JhdGlvblNraXA6OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVy KENTU1Byb3BlcnR5V2Via2l0VGV4dFVuZGVybGluZVBvc2l0aW9uLCBBcHBseVByb3BlcnR5VGV4 dFVuZGVybGluZVBvc2l0aW9uOjpjcmVhdGVIYW5kbGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oIGIvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCmluZGV4IGI1OTA4MDgzNDYzMWYwNjlkYjM3ZTY4YjVk MjU2YjMzZjgyZjM0NjguLmQ2Y2M4YTM3NmJmYTQ4NGY4MjBmYzNlZTkzZTA3Y2ZhNTI5MGE4MWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmgKQEAgLTU3LDYg KzU3LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBTdHJpbmcgY29udmVydFN0cmluZ09yQXV0byhT dHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKICAgICBzdGF0aWMgU3RyaW5nIGNvbnZlcnRTdHJp bmdPck5vbmUoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CiAgICAgc3RhdGljIFRleHRFbXBo YXNpc1Bvc2l0aW9uIGNvbnZlcnRUZXh0RW1waGFzaXNQb3NpdGlvbihTdHlsZVJlc29sdmVyJiwg Q1NTVmFsdWUmKTsKKyAgICBzdGF0aWMgRVRleHRBbGlnbiBjb252ZXJ0VGV4dEFsaWduKFN0eWxl UmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogCiBwcml2YXRlOgogICAgIHN0YXRpYyBMZW5ndGggY29u dmVydFRvUmFkaXVzTGVuZ3RoKENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEmLCBDU1NQcmltaXRp dmVWYWx1ZSYpOwpAQCAtMzA3LDYgKzMwOCwyMCBAQCBpbmxpbmUgVGV4dEVtcGhhc2lzUG9zaXRp b24gU3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0VGV4dEVtcGhhc2lzUG9zaXRpb24oUwog ICAgIHJldHVybiBwb3NpdGlvbjsKIH0KIAoraW5saW5lIEVUZXh0QWxpZ24gU3R5bGVCdWlsZGVy Q29udmVydGVyOjpjb252ZXJ0VGV4dEFsaWduKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIs IENTU1ZhbHVlJiB2YWx1ZSkKK3sKKyAgICBhdXRvJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0 PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSk7CisgICAgQVNTRVJUKHByaW1pdGl2ZVZhbHVlLmlz VmFsdWVJRCgpKTsKKworICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgIT0gQ1NT VmFsdWVXZWJraXRNYXRjaFBhcmVudCkKKyAgICAgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVlOwor ICAgIGlmIChzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPnRleHRBbGlnbigpID09IFRBU1RB UlQpCisgICAgICAgIHJldHVybiBzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKSA/IExFRlQgOiBSSUdIVDsKKyAgICBpZiAoc3R5bGVSZXNvbHZlci5w YXJlbnRTdHlsZSgpLT50ZXh0QWxpZ24oKSA9PSBUQUVORCkKKyAgICAgICAgcmV0dXJuIHN0eWxl UmVzb2x2ZXIucGFyZW50U3R5bGUoKS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gUklHSFQg OiBMRUZUOworICAgIHJldHVybiBzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPnRleHRBbGln bigpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBTdHlsZUJ1aWxk ZXJDb252ZXJ0ZXJfaAo= 241035 2014-11-05 09:28:49 -0800 2014-11-05 10:24:52 -0800 Patch bug-138398-20141105092901.patch text/plain 6250 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRlMDRhMzg2MTc1NjVm YjdiYWZmYjJlMjE0YzM5MzE2NDg0NTUxYy4uYzIwZjExZjVmYzhlZjlmY2E5ZTYxY2VmZjUwYzY1 MjlhYWYzYjhlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTExLTA0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSB0ZXh0LWFsaWduIENT UyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4Mzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgTW92ZSB0ZXh0LWFsaWduIENTUyBwcm9wZXJ0eSBm cm9tIERlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIgdG8gdGhlIG5ldworICAgICAgICBTdHlsZUJ1aWxk ZXIgc28gdGhhdCBpdCBpcyBub3cgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydHlOYW1lcy5pbi4K KyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGEgVGV4dEFsaWduIENvbnZlcnRlciB0byBzdXBwb3J0 IHRoaXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAg ICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvRGVwcmVjYXRl ZFN0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNhdGVkU3R5bGVCdWls ZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlUZXh0QWxpZ246OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 QXBwbHlQcm9wZXJ0eVRleHRBbGlnbjo6Y3JlYXRlSGFuZGxlcik6IERlbGV0ZWQuCisgICAgICAg ICogY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVC dWlsZGVyQ29udmVydGVyOjpjb252ZXJ0VGV4dEFsaWduKToKKwogMjAxNC0xMS0wNSAgQW50dGkg S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTc1NjAx KTogQXNzZXJ0aW9uIGZhaWx1cmVzIGluIFNpbXBsZUxpbmVMYXlvdXQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluIGIvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5kZXggNDQ5NTcxYWEzZTE2NGQyMTljMzZkYzUyMmZkMDc3 YzBiMGJmMTJiYi4uMWY1ODU4OGI1ZmU0ZjRlNGE1NmQ4NmM1MjQ5NDExMmY2OTNlYWZlYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KQEAgLTIxNSw3ICsyMTUsNyBAQCBz cmMKIHNwZWFrIFtJbmhlcml0ZWQsIE5ld1N0eWxlQnVpbGRlcl0KIHRhYmxlLWxheW91dCBbTmV3 U3R5bGVCdWlsZGVyXQogdGFiLXNpemUgW0luaGVyaXRlZCwgTmV3U3R5bGVCdWlsZGVyLCBUeXBl TmFtZT11bnNpZ25lZF0KLXRleHQtYWxpZ24gW0luaGVyaXRlZF0KK3RleHQtYWxpZ24gW0luaGVy aXRlZCwgTmV3U3R5bGVCdWlsZGVyLCBDb252ZXJ0ZXI9VGV4dEFsaWduXQogdGV4dC1kZWNvcmF0 aW9uIFtOZXdTdHlsZUJ1aWxkZXIsIENvbnZlcnRlcj1UZXh0RGVjb3JhdGlvbl0KIHRleHQtaW5k ZW50IFtJbmhlcml0ZWRdCiB0ZXh0LWxpbmUtdGhyb3VnaApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDQ3ZTNmZmYzNTdkODMyNTlhZmRkZDEw ZWVhMGY4OTYzMTdiZjQzNTAuLjA1NzhlOGRkZjQxNGQ0Zjc2ZmE1NWVlN2Q4ZDhhNTZhYTRkYjVl ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAK QEAgLTk3OSwzMiArOTc5LDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIg Y3JlYXRlSGFuZGxlcigpIHsgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBwbHlJbmhlcml0VmFs dWUsICZhcHBseUluaXRpYWxWYWx1ZSwgJmFwcGx5VmFsdWUpOyB9CiB9OwogCi1jbGFzcyBBcHBs eVByb3BlcnR5VGV4dEFsaWduIHsKLXB1YmxpYzoKLSAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVl KENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2 YWx1ZSkKLSAgICB7Ci0gICAgICAgIGlmICghaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KCp2YWx1ZSkp Ci0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUmIHByaW1p dGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCp2YWx1ZSk7Ci0gICAgICAg IEFTU0VSVChwcmltaXRpdmVWYWx1ZS5pc1ZhbHVlSUQoKSk7Ci0KLSAgICAgICAgaWYgKHByaW1p dGl2ZVZhbHVlLmdldFZhbHVlSUQoKSAhPSBDU1NWYWx1ZVdlYmtpdE1hdGNoUGFyZW50KQotICAg ICAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0VGV4dEFsaWduKHByaW1pdGl2ZVZh bHVlKTsKLSAgICAgICAgZWxzZSBpZiAoc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+dGV4 dEFsaWduKCkgPT0gVEFTVEFSVCkKLSAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCkt PnNldFRleHRBbGlnbihzdHlsZVJlc29sdmVyLT5wYXJlbnRTdHlsZSgpLT5pc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKCkgPyBMRUZUIDogUklHSFQpOwotICAgICAgICBlbHNlIGlmIChzdHlsZVJlc29s dmVyLT5wYXJlbnRTdHlsZSgpLT50ZXh0QWxpZ24oKSA9PSBUQUVORCkKLSAgICAgICAgICAgIHN0 eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNldFRleHRBbGlnbihzdHlsZVJlc29sdmVyLT5wYXJlbnRT dHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBSSUdIVCA6IExFRlQpOwotICAgICAg ICBlbHNlCi0gICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRUZXh0QWxpZ24o c3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+dGV4dEFsaWduKCkpOwotICAgIH0KLSAgICBz dGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKQotICAgIHsKLSAgICAgICAgUHJv cGVydHlIYW5kbGVyIGhhbmRsZXIgPSBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8RVRleHRBbGln biwgJlJlbmRlclN0eWxlOjp0ZXh0QWxpZ24sIEVUZXh0QWxpZ24sICZSZW5kZXJTdHlsZTo6c2V0 VGV4dEFsaWduLCBFVGV4dEFsaWduLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0QWxpZ24+Ojpj cmVhdGVIYW5kbGVyKCk7Ci0gICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoaGFuZGxlci5p bmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rpb24oKSwgJmFwcGx5VmFsdWUp OwotICAgIH0KLX07Ci0KIHN0YXRpYyBUZXh0RGVjb3JhdGlvblNraXAgdmFsdWVUb0RlY29yYXRp b25Ta2lwKENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVWYWx1ZSkKIHsKICAgICBBU1NFUlQo cHJpbWl0aXZlVmFsdWUuaXNWYWx1ZUlEKCkpOwpAQCAtMTkzNyw3ICsxOTExLDYgQEAgRGVwcmVj YXRlZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRlZFN0eWxlQnVpbGRlcigpCiAgICAgc2V0UHJvcGVy dHlIYW5kbGVyKENTU1Byb3BlcnR5T3V0bGluZVN0eWxlLCBBcHBseVByb3BlcnR5T3V0bGluZVN0 eWxlOjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0 eVJlc2l6ZSwgQXBwbHlQcm9wZXJ0eVJlc2l6ZTo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQ cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlTaXplLCBBcHBseVByb3BlcnR5UGFnZVNpemU6OmNy ZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5VGV4dEFs aWduLCBBcHBseVByb3BlcnR5VGV4dEFsaWduOjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uQ29sb3IsIEFwcGx5 UHJvcGVydHlDb2xvcjxOb0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5bGU6OnRleHREZWNv cmF0aW9uQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VGV4dERlY29yYXRpb25Db2xvciwgJlJlbmRl clN0eWxlOjpzZXRWaXNpdGVkTGlua1RleHREZWNvcmF0aW9uQ29sb3IsICZSZW5kZXJTdHlsZTo6 Y29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uU2tpcCwgQXBwbHlQcm9wZXJ0eVRleHREZWNvcmF0aW9u U2tpcDo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlXZWJraXRUZXh0VW5kZXJsaW5lUG9zaXRpb24sIEFwcGx5UHJvcGVydHlUZXh0VW5kZXJsaW5l UG9zaXRpb246OmNyZWF0ZUhhbmRsZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWls ZGVyQ29udmVydGVyLmgKaW5kZXggYjU5MDgwODM0NjMxZjA2OWRiMzdlNjhiNWQyNTZiMzNmODJm MzQ2OC4uN2Y2OTA3NDc1NGE3YjFkNTVlNzJmYzA3MmU2ZWI4ZTRhNTFlYjI1ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaApAQCAtNTcsNiArNTcsNyBAQCBw dWJsaWM6CiAgICAgc3RhdGljIFN0cmluZyBjb252ZXJ0U3RyaW5nT3JBdXRvKFN0eWxlUmVzb2x2 ZXImLCBDU1NWYWx1ZSYpOwogICAgIHN0YXRpYyBTdHJpbmcgY29udmVydFN0cmluZ09yTm9uZShT dHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKICAgICBzdGF0aWMgVGV4dEVtcGhhc2lzUG9zaXRp b24gY29udmVydFRleHRFbXBoYXNpc1Bvc2l0aW9uKFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYp OworICAgIHN0YXRpYyBFVGV4dEFsaWduIGNvbnZlcnRUZXh0QWxpZ24oU3R5bGVSZXNvbHZlciYs IENTU1ZhbHVlJik7CiAKIHByaXZhdGU6CiAgICAgc3RhdGljIExlbmd0aCBjb252ZXJ0VG9SYWRp dXNMZW5ndGgoQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSYsIENTU1ByaW1pdGl2ZVZhbHVlJik7 CkBAIC0zMDcsNiArMzA4LDIyIEBAIGlubGluZSBUZXh0RW1waGFzaXNQb3NpdGlvbiBTdHlsZUJ1 aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRUZXh0RW1waGFzaXNQb3NpdGlvbihTCiAgICAgcmV0dXJu IHBvc2l0aW9uOwogfQogCitpbmxpbmUgRVRleHRBbGlnbiBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6 OmNvbnZlcnRUZXh0QWxpZ24oU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUm IHZhbHVlKQoreworICAgIGF1dG8mIHByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0 aXZlVmFsdWU+KHZhbHVlKTsKKyAgICBBU1NFUlQocHJpbWl0aXZlVmFsdWUuaXNWYWx1ZUlEKCkp OworCisgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSAhPSBDU1NWYWx1ZVdlYmtp dE1hdGNoUGFyZW50KQorICAgICAgICByZXR1cm4gcHJpbWl0aXZlVmFsdWU7CisKKyAgICBhdXRv KiBwYXJlbnRTdHlsZSA9IHN0eWxlUmVzb2x2ZXIucGFyZW50U3R5bGUoKTsKKyAgICBpZiAocGFy ZW50U3R5bGUtPnRleHRBbGlnbigpID09IFRBU1RBUlQpCisgICAgICAgIHJldHVybiBwYXJlbnRT dHlsZS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gTEVGVCA6IFJJR0hUOworICAgIGlmIChw YXJlbnRTdHlsZS0+dGV4dEFsaWduKCkgPT0gVEFFTkQpCisgICAgICAgIHJldHVybiBwYXJlbnRT dHlsZS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gUklHSFQgOiBMRUZUOworICAgIHJldHVy biBwYXJlbnRTdHlsZS0+dGV4dEFsaWduKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK IAogI2VuZGlmIC8vIFN0eWxlQnVpbGRlckNvbnZlcnRlcl9oCg==