135938 2014-08-14 07:00:22 -0700 Remove nonRendererStyle 2014-08-14 10:52:10 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue oldest_to_newest 1029074 0 koivisto 2014-08-14 07:00:22 -0700 We should use computedStyle instead. 1029076 1 236588 koivisto 2014-08-14 07:13:02 -0700 Created attachment 236588 patch 1029077 2 commit-queue 2014-08-14 07:14:41 -0700 Attachment 236588 did not pass style-queue: ERROR: Source/WebCore/dom/Element.cpp:2865: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1029128 3 236588 kling 2014-08-14 10:24:46 -0700 Comment on attachment 236588 patch r=me Would be nice if we could allow style sharing for option and optgroup after this is fixed. 1029131 4 koivisto 2014-08-14 10:52:10 -0700 https://trac.webkit.org/r172591 236588 2014-08-14 07:13:02 -0700 2014-08-14 10:24:45 -0700 patch remove-nonrendererstyle.patch text/plain 13698 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjU4MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU1IEBACisyMDE0LTA4LTE0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgbm9uUmVuZGVyZXJT dHlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1 OTM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQg aXMgdXNlZCB0byBzdXBwb3J0IHN0eWxpbmcgb2Ygbm9uLXJlbmRlcmVyIG9wdGlvbiBlbGVtZW50 cy4gV2UgaGF2ZSBhIGJldHRlcgorICAgICAgICBtZWNoYW5pc20gZm9yIHRoaXMsIEVsZW1lbnQ6 OmNvbXB1dGVkU3R5bGUoKS4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkVsZW1lbnQ6OnJlc2V0Q29tcHV0ZWRTdHlsZSk6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50Ojp3aWxsUmVzZXRDb21wdXRlZFN0eWxlKToKKyAgICAgICAgCisgICAgICAgICAg ICBBZGQgYSB2aXJ0dWFsIGNhbGxiYWNrIGZvciBjb21wdXRlZCBzdHlsZSByZXNldC4KKworICAg ICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgICogZG9tL05vZGUuaDoKKyAgICAgICAgKFdl YkNvcmU6Ok5vZGU6Om5vblJlbmRlcmVyU3R5bGUpOiBEZWxldGVkLgorICAgICAgICAqIGRvbS9O b2RlUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnJlbmRlclN0eWxlKToK KyAgICAgICAgCisgICAgICAgICAgICByZW5kZXJTdHlsZSgpIG5vdyBhbHdheXMgbWF0Y2hlcyBy ZW5kZXJlcigpLT5zdHlsZSgpCisKKyAgICAgICAgKiBodG1sL0hUTUxPcHRHcm91cEVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdEdyb3VwRWxlbWVudDo6SFRNTE9wdEdyb3Vw RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MT3B0R3JvdXBFbGVtZW50Ojppc0ZvY3Vz YWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MT3B0R3JvdXBFbGVtZW50OjpkaWRBdHRhY2hS ZW5kZXJlcnMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdEdyb3VwRWxlbWVu dDo6d2lsbERldGFjaFJlbmRlcmVycyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpIVE1M T3B0R3JvdXBFbGVtZW50Ojp1cGRhdGVOb25SZW5kZXJTdHlsZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpIVE1MT3B0R3JvdXBFbGVtZW50Ojpub25SZW5kZXJlclN0eWxlKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRHcm91cEVsZW1lbnQ6OmN1c3RvbVN0eWxlRm9y UmVuZGVyZXIpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvSFRNTE9wdEdyb3VwRWxlbWVudC5o OgorICAgICAgICAqIGh0bWwvSFRNTE9wdGlvbkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTE9wdGlvbkVsZW1lbnQ6OmlzRm9jdXNhYmxlKToKKyAgICAgICAgCisgICAgICAgICAg ICBVc2UgY29tcHV0ZWRTdHlsZS4KKworICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1l bnQ6OndpbGxSZXNldENvbXB1dGVkU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdGlv bkVsZW1lbnQ6OmRpZEF0dGFjaFJlbmRlcmVycyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpIVE1MT3B0aW9uRWxlbWVudDo6d2lsbERldGFjaFJlbmRlcmVycyk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpIVE1MT3B0aW9uRWxlbWVudDo6dXBkYXRlTm9uUmVuZGVyU3R5bGUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQ6Om5vblJlbmRlcmVy U3R5bGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQ6OmN1 c3RvbVN0eWxlRm9yUmVuZGVyZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9w dGlvbkVsZW1lbnQ6OmRpZFJlY2FsY1N0eWxlKTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL0hU TUxPcHRpb25FbGVtZW50Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNw cDoKKyAgICAgICAgKFJlbmRlck1lbnVMaXN0Ojp1cGRhdGVPcHRpb25zV2lkdGgpOgorICAgICAg ICAoUmVuZGVyTWVudUxpc3Q6OnNldFRleHRGcm9tT3B0aW9uKToKKyAgICAgICAgCisgICAgICAg ICAgICBVc2UgY29tcHV0ZWRTdHlsZS4KKwogMjAxNC0wOC0xNCAgWmFuIERvYmVyc2VrICA8emRv YmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgSW1hZ2VCdWZmZXJEYXRhQ2Fpcm8uaCBpcyBt aXNzaW5nIGhlYWRlciBndWFyZHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHJldmlzaW9u IDE3MjU4MCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjg2MSwxMSArMjg2MSwxNyBAQCB2b2lkIEVsZW1lbnQ6OnJlc2V0Q29tcHV0ZWRTdHls ZSgpCiB7CiAgICAgaWYgKCFoYXNSYXJlRGF0YSgpIHx8ICFlbGVtZW50UmFyZURhdGEoKS0+Y29t cHV0ZWRTdHlsZSgpKQogICAgICAgICByZXR1cm47Ci0gICAgZWxlbWVudFJhcmVEYXRhKCktPnJl c2V0Q29tcHV0ZWRTdHlsZSgpOwotICAgIGZvciAoYXV0byYgY2hpbGQgOiBkZXNjZW5kYW50c09m VHlwZTxFbGVtZW50PigqdGhpcykpIHsKLSAgICAgICAgaWYgKGNoaWxkLmhhc1JhcmVEYXRhKCkp Ci0gICAgICAgICAgICBjaGlsZC5lbGVtZW50UmFyZURhdGEoKS0+cmVzZXRDb21wdXRlZFN0eWxl KCk7Ci0gICAgfQorCisgICAgYXV0byByZXNldCA9IFtdIChFbGVtZW50JiBlbGVtZW50KSB7Cisg ICAgICAgIGlmICghZWxlbWVudC5oYXNSYXJlRGF0YSgpIHx8ICFlbGVtZW50LmVsZW1lbnRSYXJl RGF0YSgpLT5jb21wdXRlZFN0eWxlKCkpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlm IChlbGVtZW50Lmhhc0N1c3RvbVN0eWxlUmVzb2x2ZUNhbGxiYWNrcygpKQorICAgICAgICAgICAg ZWxlbWVudC53aWxsUmVzZXRDb21wdXRlZFN0eWxlKCk7CisgICAgICAgIGVsZW1lbnQuZWxlbWVu dFJhcmVEYXRhKCktPnJlc2V0Q29tcHV0ZWRTdHlsZSgpOworICAgIH07CisgICAgcmVzZXQoKnRo aXMpOworICAgIGZvciAoYXV0byYgY2hpbGQgOiBkZXNjZW5kYW50c09mVHlwZTxFbGVtZW50Pigq dGhpcykpCisgICAgICAgIHJlc2V0KGNoaWxkKTsKIH0KIAogdm9pZCBFbGVtZW50OjpjbGVhclN0 eWxlRGVyaXZlZERhdGFCZWZvcmVEZXRhY2hpbmdSZW5kZXJlcigpCkBAIC0yOTAzLDYgKzI5MDks MTEgQEAgdm9pZCBFbGVtZW50OjpkaWRSZWNhbGNTdHlsZShTdHlsZTo6Q2hhbgogICAgIEFTU0VS VChoYXNDdXN0b21TdHlsZVJlc29sdmVDYWxsYmFja3MoKSk7CiB9CiAKK3ZvaWQgRWxlbWVudDo6 d2lsbFJlc2V0Q29tcHV0ZWRTdHlsZSgpCit7CisgICAgQVNTRVJUKGhhc0N1c3RvbVN0eWxlUmVz b2x2ZUNhbGxiYWNrcygpKTsKK30KKwogdm9pZCBFbGVtZW50Ojp3aWxsQXR0YWNoUmVuZGVyZXJz KCkKIHsKICAgICBBU1NFUlQoaGFzQ3VzdG9tU3R5bGVSZXNvbHZlQ2FsbGJhY2tzKCkpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5oCShyZXZpc2lvbiAxNzI1ODApCisrKyBTb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01NDYsNiArNTQ2LDcgQEAgcHVibGljOgog CiAgICAgdmlydHVhbCBib29sIHdpbGxSZWNhbGNTdHlsZShTdHlsZTo6Q2hhbmdlKTsKICAgICB2 aXJ0dWFsIHZvaWQgZGlkUmVjYWxjU3R5bGUoU3R5bGU6OkNoYW5nZSk7CisgICAgdmlydHVhbCB2 b2lkIHdpbGxSZXNldENvbXB1dGVkU3R5bGUoKTsKICAgICB2aXJ0dWFsIHZvaWQgd2lsbEF0dGFj aFJlbmRlcmVycygpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRBdHRhY2hSZW5kZXJlcnMoKTsKICAg ICB2aXJ0dWFsIHZvaWQgd2lsbERldGFjaFJlbmRlcmVycygpOwpJbmRleDogU291cmNlL1dlYkNv cmUvZG9tL05vZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCShy ZXZpc2lvbiAxNzI1ODApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCSh3b3JraW5nIGNv cHkpCkBAIC02ODYsOCArNjg2LDYgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgcmVmRXZl bnRUYXJnZXQoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGVyZWZFdmVudFRhcmdldCgp IG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCBSZW5kZXJTdHlsZSogbm9uUmVuZGVyZXJTdHlsZSgp IGNvbnN0IHsgcmV0dXJuIG51bGxwdHI7IH0KLQogICAgIEVsZW1lbnQqIGFuY2VzdG9yRWxlbWVu dCgpIGNvbnN0OwogCiAgICAgdm9pZCB0cmFja0ZvckRlYnVnZ2luZygpOwpJbmRleDogU291cmNl L1dlYkNvcmUvZG9tL05vZGVSZW5kZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2RvbS9Ob2RlUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gMTcyNTgwKQorKysgU291cmNlL1dl YkNvcmUvZG9tL05vZGVSZW5kZXJTdHlsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNCwxMSArMzQs MTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBpbmxpbmUgUmVuZGVyU3R5bGUqIE5vZGU6OnJl bmRlclN0eWxlKCkgY29uc3QKIHsKLSAgICAvLyBVc2luZyBhIHRlcm5hcnkgaGVyZSBjb25mdXNl cyB0aGUgU29sYXJpcyBTdHVkaW8gMTIvMTIuMS8xMi4yIGNvbXBpbGVyczoKLSAgICAvLyBCdWcg aXMgQ1IgNjU2OTE5NCwgIlByb2JsZW0gd2l0aCBxdWVzdGlvbiBvcGVyYXRvciBiaW5kaW5nIGlu IGlubGluZSBmdW5jdGlvbiIKLSAgICBpZiAoUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IHRoaXMt PnJlbmRlcmVyKCkpCi0gICAgICAgIHJldHVybiAmcmVuZGVyZXItPnN0eWxlKCk7Ci0gICAgcmV0 dXJuIG5vblJlbmRlcmVyU3R5bGUoKTsKKyAgICBhdXRvKiByZW5kZXJlciA9IHRoaXMtPnJlbmRl cmVyKCk7CisgICAgaWYgKCFyZW5kZXJlcikKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAg cmV0dXJuICZyZW5kZXJlci0+c3R5bGUoKTsKIH0KIAogfQpJbmRleDogU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MT3B0R3JvdXBFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxPcHRHcm91cEVsZW1lbnQuY3BwCShyZXZpc2lvbiAxNzI1ODApCisrKyBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxPcHRHcm91cEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00MSw3ICs0MSw2IEBAIGlubGluZSBIVE1MT3B0R3JvdXBFbGVtZW50OjpIVE1MT3B0R3JvdXAK ICAgICA6IEhUTUxFbGVtZW50KHRhZ05hbWUsIGRvY3VtZW50KQogewogICAgIEFTU0VSVChoYXNU YWdOYW1lKG9wdGdyb3VwVGFnKSk7Ci0gICAgc2V0SGFzQ3VzdG9tU3R5bGVSZXNvbHZlQ2FsbGJh Y2tzKCk7CiB9CiAKIFBhc3NSZWZQdHI8SFRNTE9wdEdyb3VwRWxlbWVudD4gSFRNTE9wdEdyb3Vw RWxlbWVudDo6Y3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50JiBk b2N1bWVudCkKQEAgLTU2LDggKzU1LDExIEBAIGJvb2wgSFRNTE9wdEdyb3VwRWxlbWVudDo6aXNE aXNhYmxlZEZvcm0KIAogYm9vbCBIVE1MT3B0R3JvdXBFbGVtZW50Ojppc0ZvY3VzYWJsZSgpIGNv bnN0CiB7Ci0gICAgLy8gT3B0Z3JvdXAgZWxlbWVudHMgZG8gbm90IGhhdmUgYSByZW5kZXJlciBz byB3ZSBjaGVjayB0aGUgcmVuZGVyU3R5bGUgaW5zdGVhZC4KLSAgICByZXR1cm4gc3VwcG9ydHNG b2N1cygpICYmIHJlbmRlclN0eWxlKCkgJiYgcmVuZGVyU3R5bGUoKS0+ZGlzcGxheSgpICE9IE5P TkU7CisgICAgaWYgKCFzdXBwb3J0c0ZvY3VzKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAvLyBPcHRncm91cCBlbGVtZW50cyBkbyBub3QgaGF2ZSBhIHJlbmRlcmVyLgorICAgIGF1dG8q IHN0eWxlID0gY29uc3RfY2FzdDxIVE1MT3B0R3JvdXBFbGVtZW50Jj4oKnRoaXMpLmNvbXB1dGVk U3R5bGUoKTsKKyAgICByZXR1cm4gc3R5bGUgJiYgc3R5bGUtPmRpc3BsYXkoKSAhPSBOT05FOwog fQogCiBjb25zdCBBdG9taWNTdHJpbmcmIEhUTUxPcHRHcm91cEVsZW1lbnQ6OmZvcm1Db250cm9s VHlwZSgpIGNvbnN0CkBAIC05MCwzOCArOTIsNiBAQCB2b2lkIEhUTUxPcHRHcm91cEVsZW1lbnQ6 OnJlY2FsY1NlbGVjdE9wCiAgICAgICAgIHRvSFRNTFNlbGVjdEVsZW1lbnQoc2VsZWN0KS0+c2V0 UmVjYWxjTGlzdEl0ZW1zKCk7CiB9CiAKLXZvaWQgSFRNTE9wdEdyb3VwRWxlbWVudDo6ZGlkQXR0 YWNoUmVuZGVyZXJzKCkKLXsKLSAgICAvLyBJZiBhZnRlciBhdHRhY2hpbmcgbm90aGluZyBjYWxs ZWQgc3R5bGVGb3JSZW5kZXJlcigpIG9uIHRoaXMgbm9kZSB3ZQotICAgIC8vIG1hbnVhbGx5IGNh Y2hlIHRoZSB2YWx1ZS4gVGhpcyBoYXBwZW5zIGlmIG91ciBwYXJlbnQgZG9lc24ndCBoYXZlIGEK LSAgICAvLyByZW5kZXJlciBsaWtlIDxvcHRncm91cD4gb3IgaWYgaXQgZG9lc24ndCBhbGxvdyBj aGlsZHJlbiBsaWtlIDxzZWxlY3Q+LgotICAgIGlmICghbV9zdHlsZSAmJiBwYXJlbnROb2RlKCkt PnJlbmRlclN0eWxlKCkpCi0gICAgICAgIHVwZGF0ZU5vblJlbmRlclN0eWxlKCpwYXJlbnROb2Rl KCktPnJlbmRlclN0eWxlKCkpOwotfQotCi12b2lkIEhUTUxPcHRHcm91cEVsZW1lbnQ6OndpbGxE ZXRhY2hSZW5kZXJlcnMoKQotewotICAgIG1fc3R5bGUuY2xlYXIoKTsKLX0KLQotdm9pZCBIVE1M T3B0R3JvdXBFbGVtZW50Ojp1cGRhdGVOb25SZW5kZXJTdHlsZShSZW5kZXJTdHlsZSYgcGFyZW50 U3R5bGUpCi17Ci0gICAgbV9zdHlsZSA9IGRvY3VtZW50KCkuZW5zdXJlU3R5bGVSZXNvbHZlcigp LnN0eWxlRm9yRWxlbWVudCh0aGlzLCAmcGFyZW50U3R5bGUpOwotfQotCi1SZW5kZXJTdHlsZSog SFRNTE9wdEdyb3VwRWxlbWVudDo6bm9uUmVuZGVyZXJTdHlsZSgpIGNvbnN0Ci17Ci0gICAgcmV0 dXJuIG1fc3R5bGUuZ2V0KCk7Ci19Ci0KLVBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IEhUTUxPcHRH cm91cEVsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIoUmVuZGVyU3R5bGUmIHBhcmVudFN0 eWxlKQotewotICAgIC8vIHN0eWxlRm9yUmVuZGVyZXIgaXMgY2FsbGVkIHdoZW5ldmVyIGEgbmV3 IHN0eWxlIHNob3VsZCBiZSBhc3NvY2lhdGVkCi0gICAgLy8gd2l0aCBhbiBFbGVtZW50IHNvIG5v dyBpcyBhIGdvb2QgdGltZSB0byB1cGRhdGUgb3VyIGNhY2hlZCBzdHlsZS4KLSAgICB1cGRhdGVO b25SZW5kZXJTdHlsZShwYXJlbnRTdHlsZSk7Ci0gICAgcmV0dXJuIG1fc3R5bGU7Ci19Ci0KIFN0 cmluZyBIVE1MT3B0R3JvdXBFbGVtZW50Ojpncm91cExhYmVsVGV4dCgpIGNvbnN0CiB7CiAgICAg U3RyaW5nIGl0ZW1UZXh0ID0gZG9jdW1lbnQoKS5kaXNwbGF5U3RyaW5nTW9kaWZpZWRCeUVuY29k aW5nKGdldEF0dHJpYnV0ZShsYWJlbEF0dHIpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE9wdEdyb3VwRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE9wdEdyb3VwRWxlbWVudC5oCShyZXZpc2lvbiAxNzI1ODApCisrKyBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxPcHRHcm91cEVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsMjEgKzQ2 LDEyIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGlzRm9jdXNhYmxlKCkgY29uc3Qgb3Zl cnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHBhcnNlQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5h bWUmLCBjb25zdCBBdG9taWNTdHJpbmcmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgcmVu ZGVyZXJJc05lZWRlZChjb25zdCBSZW5kZXJTdHlsZSYpIG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNl OyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZEF0dGFjaFJlbmRlcmVycygpIG92ZXJyaWRlOwotICAg IHZpcnR1YWwgdm9pZCB3aWxsRGV0YWNoUmVuZGVyZXJzKCkgb3ZlcnJpZGU7CiAKICAgICB2aXJ0 dWFsIHZvaWQgY2hpbGRyZW5DaGFuZ2VkKGNvbnN0IENoaWxkQ2hhbmdlJikgb3ZlcnJpZGU7CiAK ICAgICB2aXJ0dWFsIHZvaWQgYWNjZXNzS2V5QWN0aW9uKGJvb2wgc2VuZE1vdXNlRXZlbnRzKSBv dmVycmlkZTsKIAotICAgIC8vIDxvcHRncm91cD4gbmV2ZXIgaGFzIGEgcmVuZGVyZXIgc28gd2Ug bWFudWFsbHkgbWFuYWdlIGEgY2FjaGVkIHN0eWxlLgotICAgIHZvaWQgdXBkYXRlTm9uUmVuZGVy U3R5bGUoUmVuZGVyU3R5bGUmIHBhcmVudFN0eWxlKTsKLSAgICB2aXJ0dWFsIFJlbmRlclN0eWxl KiBub25SZW5kZXJlclN0eWxlKCkgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCBQYXNzUmVm UHRyPFJlbmRlclN0eWxlPiBjdXN0b21TdHlsZUZvclJlbmRlcmVyKFJlbmRlclN0eWxlJiBwYXJl bnRTdHlsZSkgb3ZlcnJpZGU7Ci0KICAgICB2b2lkIHJlY2FsY1NlbGVjdE9wdGlvbnMoKTsKLQot ICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gbV9zdHlsZTsKIH07CiAKIE5PREVfVFlQRV9DQVNUUyhI VE1MT3B0R3JvdXBFbGVtZW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT3B0aW9u RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT3B0aW9u RWxlbWVudC5jcHAJKHJldmlzaW9uIDE3MjU4MCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE9wdGlvbkVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OCwyNCArODgsMTMgQEAgUGFz c1JlZlB0cjxIVE1MT3B0aW9uRWxlbWVudD4gSFRNTE9wdGlvbgogICAgIHJldHVybiBlbGVtZW50 LnJlbGVhc2UoKTsKIH0KIAotdm9pZCBIVE1MT3B0aW9uRWxlbWVudDo6ZGlkQXR0YWNoUmVuZGVy ZXJzKCkKLXsKLSAgICAvLyBJZiBhZnRlciBhdHRhY2hpbmcgbm90aGluZyBjYWxsZWQgc3R5bGVG b3JSZW5kZXJlcigpIG9uIHRoaXMgbm9kZSB3ZQotICAgIC8vIG1hbnVhbGx5IGNhY2hlIHRoZSB2 YWx1ZS4gVGhpcyBoYXBwZW5zIGlmIG91ciBwYXJlbnQgZG9lc24ndCBoYXZlIGEKLSAgICAvLyBy ZW5kZXJlciBsaWtlIDxvcHRncm91cD4gb3IgaWYgaXQgZG9lc24ndCBhbGxvdyBjaGlsZHJlbiBs aWtlIDxzZWxlY3Q+LgotICAgIGlmICghbV9zdHlsZSAmJiBwYXJlbnROb2RlKCktPnJlbmRlclN0 eWxlKCkpCi0gICAgICAgIHVwZGF0ZU5vblJlbmRlclN0eWxlKCpwYXJlbnROb2RlKCktPnJlbmRl clN0eWxlKCkpOwotfQotCi12b2lkIEhUTUxPcHRpb25FbGVtZW50Ojp3aWxsRGV0YWNoUmVuZGVy ZXJzKCkKLXsKLSAgICBtX3N0eWxlLmNsZWFyKCk7Ci19Ci0KIGJvb2wgSFRNTE9wdGlvbkVsZW1l bnQ6OmlzRm9jdXNhYmxlKCkgY29uc3QKIHsKLSAgICAvLyBPcHRpb24gZWxlbWVudHMgZG8gbm90 IGhhdmUgYSByZW5kZXJlciBzbyB3ZSBjaGVjayB0aGUgcmVuZGVyU3R5bGUgaW5zdGVhZC4KLSAg ICByZXR1cm4gc3VwcG9ydHNGb2N1cygpICYmIHJlbmRlclN0eWxlKCkgJiYgcmVuZGVyU3R5bGUo KS0+ZGlzcGxheSgpICE9IE5PTkU7CisgICAgaWYgKCFzdXBwb3J0c0ZvY3VzKCkpCisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAvLyBPcHRpb24gZWxlbWVudHMgZG8gbm90IGhhdmUgYSByZW5k ZXJlci4KKyAgICBhdXRvKiBzdHlsZSA9IGNvbnN0X2Nhc3Q8SFRNTE9wdGlvbkVsZW1lbnQmPigq dGhpcykuY29tcHV0ZWRTdHlsZSgpOworICAgIHJldHVybiBzdHlsZSAmJiBzdHlsZS0+ZGlzcGxh eSgpICE9IE5PTkU7CiB9CiAKIFN0cmluZyBIVE1MT3B0aW9uRWxlbWVudDo6dGV4dCgpIGNvbnN0 CkBAIC0zMDAsMjUgKzI4OSw3IEBAIHZvaWQgSFRNTE9wdGlvbkVsZW1lbnQ6OnNldExhYmVsKGNv bnN0IFMKICAgICBzZXRBdHRyaWJ1dGUobGFiZWxBdHRyLCBsYWJlbCk7CiB9CiAKLXZvaWQgSFRN TE9wdGlvbkVsZW1lbnQ6OnVwZGF0ZU5vblJlbmRlclN0eWxlKFJlbmRlclN0eWxlJiBwYXJlbnRT dHlsZSkKLXsKLSAgICBtX3N0eWxlID0gZG9jdW1lbnQoKS5lbnN1cmVTdHlsZVJlc29sdmVyKCku c3R5bGVGb3JFbGVtZW50KHRoaXMsICZwYXJlbnRTdHlsZSk7Ci19Ci0KLVJlbmRlclN0eWxlKiBI VE1MT3B0aW9uRWxlbWVudDo6bm9uUmVuZGVyZXJTdHlsZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJu IG1fc3R5bGUuZ2V0KCk7Ci19Ci0KLVBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IEhUTUxPcHRpb25F bGVtZW50OjpjdXN0b21TdHlsZUZvclJlbmRlcmVyKFJlbmRlclN0eWxlJiBwYXJlbnRTdHlsZSkK LXsKLSAgICAvLyBzdHlsZUZvclJlbmRlcmVyIGlzIGNhbGxlZCB3aGVuZXZlciBhIG5ldyBzdHls ZSBzaG91bGQgYmUgYXNzb2NpYXRlZAotICAgIC8vIHdpdGggYW4gRWxlbWVudCBzbyBub3cgaXMg YSBnb29kIHRpbWUgdG8gdXBkYXRlIG91ciBjYWNoZWQgc3R5bGUuCi0gICAgdXBkYXRlTm9uUmVu ZGVyU3R5bGUocGFyZW50U3R5bGUpOwotICAgIHJldHVybiBtX3N0eWxlOwotfQotCi12b2lkIEhU TUxPcHRpb25FbGVtZW50OjpkaWRSZWNhbGNTdHlsZShTdHlsZTo6Q2hhbmdlKQordm9pZCBIVE1M T3B0aW9uRWxlbWVudDo6d2lsbFJlc2V0Q29tcHV0ZWRTdHlsZSgpCiB7CiAgICAgLy8gRklYTUU6 IFRoaXMgaXMgbmFzdHksIHdlIGFzayBvdXIgb3duZXIgc2VsZWN0IHRvIHJlcGFpbnQgZXZlbiBp ZiB0aGUgbmV3CiAgICAgLy8gc3R5bGUgaXMgZXhhY3RseSB0aGUgc2FtZS4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE9wdGlvbkVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxPcHRpb25FbGVtZW50LmgJKHJldmlzaW9uIDE3MjU4MCkKKysrIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdGlvbkVsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAt NzEsOCArNzEsNiBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCBib29sIGlzRm9jdXNhYmxlKCkg Y29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBib29sIHJlbmRlcmVySXNOZWVkZWQoY29uc3Qg UmVuZGVyU3R5bGUmKSBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgdm9p ZCBkaWRBdHRhY2hSZW5kZXJlcnMoKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgd2lsbERl dGFjaFJlbmRlcmVycygpIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCB2b2lkIHBhcnNlQXR0cmli dXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBjb25zdCBBdG9taWNTdHJpbmcmKSBvdmVycmlkZTsK IApAQCAtODEsMTggKzc5LDEyIEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgY2hpbGRy ZW5DaGFuZ2VkKGNvbnN0IENoaWxkQ2hhbmdlJikgb3ZlcnJpZGU7CiAKLSAgICAvLyA8b3B0aW9u PiBuZXZlciBoYXMgYSByZW5kZXJlciBzbyB3ZSBtYW51YWxseSBtYW5hZ2UgYSBjYWNoZWQgc3R5 bGUuCi0gICAgdm9pZCB1cGRhdGVOb25SZW5kZXJTdHlsZShSZW5kZXJTdHlsZSYgcGFyZW50U3R5 bGUpOwotICAgIHZpcnR1YWwgUmVuZGVyU3R5bGUqIG5vblJlbmRlcmVyU3R5bGUoKSBjb25zdCBv dmVycmlkZTsKLSAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IGN1c3RvbVN0eWxl Rm9yUmVuZGVyZXIoUmVuZGVyU3R5bGUmIHBhcmVudFN0eWxlKSBvdmVycmlkZTsKLQotICAgIHZp cnR1YWwgdm9pZCBkaWRSZWNhbGNTdHlsZShTdHlsZTo6Q2hhbmdlKSBvdmVycmlkZTsKKyAgICB2 aXJ0dWFsIHZvaWQgd2lsbFJlc2V0Q29tcHV0ZWRTdHlsZSgpIG92ZXJyaWRlOwogCiAgICAgU3Ry aW5nIGNvbGxlY3RPcHRpb25Jbm5lclRleHQoKSBjb25zdDsKIAogICAgIGJvb2wgbV9kaXNhYmxl ZDsKICAgICBib29sIG1faXNTZWxlY3RlZDsKLSAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IG1fc3R5 bGU7CiB9OwogCiBOT0RFX1RZUEVfQ0FTVFMoSFRNTE9wdGlvbkVsZW1lbnQpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAJKHJldmlzaW9uIDE3MjU4 MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTIyMiw3ICsyMjIsNyBAQCB2b2lkIFJlbmRlck1lbnVMaXN0Ojp1cGRhdGVP cHRpb25zV2lkdGgoCiAgICAgICAgIGlmICh0aGVtZSgpLnBvcHVwT3B0aW9uU3VwcG9ydHNUZXh0 SW5kZW50KCkpIHsKICAgICAgICAgICAgIC8vIEFkZCBpbiB0aGUgb3B0aW9uJ3MgdGV4dCBpbmRl bnQuICBXZSBjYW4ndCBjYWxjdWxhdGUgcGVyY2VudGFnZSB2YWx1ZXMgZm9yIG5vdy4KICAgICAg ICAgICAgIGZsb2F0IG9wdGlvbldpZHRoID0gMDsKLSAgICAgICAgICAgIGlmIChSZW5kZXJTdHls ZSogb3B0aW9uU3R5bGUgPSBlbGVtZW50LT5yZW5kZXJTdHlsZSgpKQorICAgICAgICAgICAgaWYg KFJlbmRlclN0eWxlKiBvcHRpb25TdHlsZSA9IGVsZW1lbnQtPmNvbXB1dGVkU3R5bGUoKSkKICAg ICAgICAgICAgICAgICBvcHRpb25XaWR0aCArPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgob3B0aW9u U3R5bGUtPnRleHRJbmRlbnQoKSwgMCk7CiAgICAgICAgICAgICBpZiAoIXRleHQuaXNFbXB0eSgp KSB7CiAgICAgICAgICAgICAgICAgY29uc3QgRm9udCYgZm9udCA9IHN0eWxlKCkuZm9udCgpOwpA QCAtMjcyLDcgKzI3Miw3IEBAIHZvaWQgUmVuZGVyTWVudUxpc3Q6OnNldFRleHRGcm9tT3B0aW9u KGkKICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IGxpc3RJdGVtc1tpXTsKICAgICAgICAgaWYg KGlzSFRNTE9wdGlvbkVsZW1lbnQoZWxlbWVudCkpIHsKICAgICAgICAgICAgIHRleHQgPSB0b0hU TUxPcHRpb25FbGVtZW50KGVsZW1lbnQpLT50ZXh0SW5kZW50ZWRUb1Jlc3BlY3RHcm91cExhYmVs KCk7Ci0gICAgICAgICAgICBtX29wdGlvblN0eWxlID0gZWxlbWVudC0+cmVuZGVyU3R5bGUoKTsK KyAgICAgICAgICAgIG1fb3B0aW9uU3R5bGUgPSBlbGVtZW50LT5jb21wdXRlZFN0eWxlKCk7CiAg ICAgICAgIH0KICAgICB9CiAK