53752 2011-02-03 20:33:31 -0800 [JSC binding] Inconsistent behavior of DOMStringMap 2011-10-07 00:05:44 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 53578 1 tkent tkent mitz sam webkit.review.bot oldest_to_newest 345293 0 tkent 2011-02-03 20:33:31 -0800 The behavior of the current JSC binding for DOMStringMap is: put: Handle JavaScript property first, then handle HTML attribute if there is not JS property. delete: ditto. get: Handle HTML attribute, then handle JavaScript property. The get operation is inconsistent with put/delete. So, we have the following curious behavior: 1> document.body.dataset.toString function toString() { ... 2> document.body.setAttribute('data-to-string', 'attr') 3> document.body.dataset.toString "attr" 4> document.body.dataset.toString = function() { return "dataset"; } 5> document.body.dataset.toString "attr" Even if one sets a new value to .toString [4], .toString doesn't return the new value [5]. It's not good. I think it's reasonable to handle JavaScript properties first to protect JavaScript Object behavior. However, we should do it in the get operation too and should give up providing "data-to-string" attribute via HTMLElement::dataset for consistency. 346426 1 81440 tkent 2011-02-06 18:20:07 -0800 Created attachment 81440 Incomplete patch The last test (delete div.dataset.foobarbaz) doesn't work. 479022 2 tkent 2011-10-06 01:39:05 -0700 (In reply to comment #0) > I think it's reasonable to handle JavaScript properties first to protect JavaScript Object behavior. However, we should do it in the get operation too and should give up providing "data-to-string" attribute via HTMLElement::dataset for consistency. I changed my mind. Both of Firefox and Opera always handles data-* attributes first. We had better follow them. 479025 3 109933 tkent 2011-10-06 01:59:48 -0700 Created attachment 109933 Patch 479460 4 109933 darin 2011-10-06 14:01:55 -0700 Comment on attachment 109933 Patch Looks good. 479585 5 109933 tkent 2011-10-06 15:58:31 -0700 Comment on attachment 109933 Patch Thank you for reviewing. 479741 6 109933 webkit.review.bot 2011-10-06 19:43:59 -0700 Comment on attachment 109933 Patch Clearing flags on attachment: 109933 Committed r96893: <http://trac.webkit.org/changeset/96893> 479742 7 webkit.review.bot 2011-10-06 19:44:04 -0700 All reviewed patches have been landed. Closing bug. 479841 8 tkent 2011-10-07 00:05:44 -0700 A follow-up test change: http://trac.webkit.org/changeset/96911 81440 2011-02-06 18:20:07 -0800 2011-10-06 01:59:38 -0700 Incomplete patch bug-53752-20110207112005.patch text/plain 4072 tkent ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4ZjMwMmJjNDM2ZWY4NzE4MDAyNjFiODE5OTdlMjAxNDE4NGRmMjRjLi5lMTM0OTNi NzJmYWZmYTE5ZjM0ZTdhYjE2YTYyMTk4OGQ2OWEzN2VmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDItMDYgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtKU0MgYmluZGluZ10gSW5j b25zaXN0ZW50IGJlaGF2aW9yIG9mIERPTVN0cmluZ01hcAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM3NTIKKworICAgICAgICAqIGZhc3QvZG9tL3Nj cmlwdC10ZXN0cy9kYXRhc2V0LmpzOgorCiAyMDExLTAyLTA2ICBQYXRyaWNrIEdhbnN0ZXJlciAg PHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50Lgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vc2NyaXB0LXRlc3RzL2RhdGFzZXQuanMg Yi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zY3JpcHQtdGVzdHMvZGF0YXNldC5qcwppbmRleCA2YWFh MTRhMTJjYjkyYjk4OTRlYmRhY2RhZGFlMGVjYzlhOTE2ZGFjLi5jMjQyODViNGIwYzcyNDExYjIw ZjUwZjVjY2QwNjBhMmIyNGIxYTMyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9z Y3JpcHQtdGVzdHMvZGF0YXNldC5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9zY3JpcHQt dGVzdHMvZGF0YXNldC5qcwpAQCAtOTEsNCArOTEsMjUgQEAgc2hvdWxkQmUoInRlc3RGb3JJbihb J2RhdGEtZm9vJywgJ2RhdGEtYmFyJywgJ2RhdGFGb28nXSkiLCAiMiIpOwogc2hvdWxkQmUoInRl c3RGb3JJbihbJ2RhdGEtZm9vJywgJ2RhdGEtYmFyJywgJ3N0eWxlJ10pIiwgIjIiKTsKIHNob3Vs ZEJlKCJ0ZXN0Rm9ySW4oWydkYXRhLWZvbycsICdkYXRhLWJhcicsICdkYXRhLSddKSIsICIzIik7 CiAKKworZGVidWcoIiIpOworZGVidWcoIlByb3BlcnR5IG92ZXJyaWRlOiIpOwordmFyIGRpdiA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworLy8gSWYgdGhlIE9iamVjdCBwcm9yb3R5 cGUgYWxyZWFkeSBoYXMgImZvb2JhcmJheiIsIGRhdGFzZXQgZG9lc24ndCBjcmVhdGUgdGhlCisv LyBjb3JyZXNwb25kaW5nIGF0dHJpYnV0ZSBmb3IgImZvb2JhcmJheiIuCitzaG91bGRCZSgiT2Jq ZWN0LnByb3RvdHlwZS5mb29iYXJiYXogPSAnb24gT2JqZWN0JzsgZGl2LmRhdGFzZXQuZm9vYmFy YmF6IiwgIidvbiBPYmplY3QnIik7CitzaG91bGRCZSgiZGl2LmRhdGFzZXRbJ2Zvb2JhcmJheidd ID0gJ29uIGRhdGFzZXQnIiwgIidvbiBkYXRhc2V0JyIpOworc2hvdWxkQmUoImRpdi5kYXRhc2V0 LmZvb2JhcmJheiIsICInb24gZGF0YXNldCciKTsKK3Nob3VsZEJlKCJkaXYuc2V0QXR0cmlidXRl KCdkYXRhLWZvb2JhcmJheicsICdhdHRyJyk7IGRpdi5kYXRhc2V0LmZvb2JhcmJheiIsICInb24g ZGF0YXNldCciKTsKK2RlYnVnKCJVcGRhdGUgdGhlIEphdmFTY3JpcHQgcHJvcGVydHkgZW1wdHk6 Iik7CitzaG91bGRCZSgiZGl2LmRhdGFzZXQuZm9vYmFyYmF6ID0gJ3VwZGF0ZWQnOyBkaXYuZGF0 YXNldC5mb29iYXJiYXoiLCAiJ3VwZGF0ZWQnIik7CitzaG91bGRCZSgiZGl2LmdldEF0dHJpYnV0 ZSgnZGF0YS1mb29iYXJiYXonKSIsICInYXR0ciciKTsKK2RlYnVnKCJNYWtlIHRoZSBKYXZhU2Ny aXB0IHByb3BlcnR5IGVtcHR5OiIpOworc2hvdWxkQmUoImRpdi5kYXRhc2V0LmZvb2JhcmJheiA9 ICcnOyBkaXYuZGF0YXNldC5mb29iYXJiYXoiLCAiJyciKTsKK3Nob3VsZEJlKCJkaXYuZ2V0QXR0 cmlidXRlKCdkYXRhLWZvb2JhcmJheicpIiwgIidhdHRyJyIpOworZGVidWcoIlJlbW92ZSB0aGUg YXR0cmlidXRlOiIpOworc2hvdWxkQmUoImRpdi5kYXRhc2V0LmZvb2JhcmJheiA9ICdvbiBkYXRh c2V0JzsgZGl2LnJlbW92ZUF0dHJpYnV0ZSgnZGF0YS1mb29iYXJiYXonKTsgZGl2LmRhdGFzZXQu Zm9vYmFyYmF6IiwgIidvbiBkYXRhc2V0JyIpOworZGVidWcoIlJlbW92ZSB0aGUgSmF2YVNjcmlw dCBwcm9wZXJ0eToiKTsKK3Nob3VsZEJlKCJkaXYuc2V0QXR0cmlidXRlKCdkYXRhLWZvb2JhcmJh eicsICdhdHRyJyk7IGRlbGV0ZSBkaXYuZGF0YXNldC5mb29iYXJiYXo7IGRpdi5kYXRhc2V0LmZv b2JhcmJheiIsICInYXR0ciciKTsKKwogdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggMzZjMzU2YmJiOTgwN2E5ZDRmYzFiMjg2MzcwYmI4ZjU5ODY3MjVlNy4uNTU4 MjA5ZDU4ZTM0M2IzZjJiN2FjOWE1NDI5ZjQ3OWY0M2Y4NGI1YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEzIEBACisyMDExLTAyLTA2ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbSlNDIGJp bmRpbmddIEluY29uc2lzdGVudCBiZWhhdmlvciBvZiBET01TdHJpbmdNYXAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzNzUyCisKKyAgICAgICAgKiBi aW5kaW5ncy9qcy9KU0RPTVN0cmluZ01hcEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpK U0RPTVN0cmluZ01hcDo6bmFtZUdldHRlcik6CisKIDIwMTEtMDItMDYgIEJlbmphbWluIFBvdWxh aW4gIDxpa2lwb3VAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNET01TdHJpbmdNYXBDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNE T01TdHJpbmdNYXBDdXN0b20uY3BwCmluZGV4IGQxYzFkNjkwMTNiZjAzZGMwMWI4NTYzYjFkODdm YjM2ZTU4OGVhNWIuLjZkZjRmODE5ZjUwMzljYmE2MGVlMjQyOTJjYjBjOGQyMmNjMGVhMDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NU3RyaW5nTWFwQ3VzdG9t LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVN0cmluZ01hcEN1c3Rv bS5jcHAKQEAgLTQxLDYgKzQxLDE0IEBAIGJvb2wgSlNET01TdHJpbmdNYXA6OmNhbkdldEl0ZW1z Rm9yTmFtZShFeGVjU3RhdGUqLCBET01TdHJpbmdNYXAqIGltcGwsIGNvbnN0IElkCiBKU1ZhbHVl IEpTRE9NU3RyaW5nTWFwOjpuYW1lR2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBzbG90 QmFzZSwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lKQogewogICAgIEpTRE9NU3RyaW5n TWFwKiB0aGlzT2JqID0gc3RhdGljX2Nhc3Q8SlNET01TdHJpbmdNYXAqPihhc09iamVjdChzbG90 QmFzZSkpOworCisgICAgUHJvcGVydHlTbG90IHNsb3Q7CisgICAgaWYgKGdldFN0YXRpY1ZhbHVl U2xvdDxKU0RPTVN0cmluZ01hcCwgQmFzZT4oZXhlYywgc19pbmZvLnByb3BIYXNoVGFibGUoZXhl YyksIHRoaXNPYmosIHByb3BlcnR5TmFtZSwgc2xvdCkpCisgICAgICAgIHJldHVybiBzbG90Lmdl dFZhbHVlKGV4ZWMsIHByb3BlcnR5TmFtZSk7CisgICAgSlNWYWx1ZSBwcm90b3R5cGUgPSB0aGlz T2JqLT5wcm90b3R5cGUoKTsKKyAgICBpZiAocHJvdG90eXBlLmlzT2JqZWN0KCkgJiYgYXNPYmpl Y3QocHJvdG90eXBlKS0+aGFzUHJvcGVydHkoZXhlYywgcHJvcGVydHlOYW1lKSkKKyAgICAgICAg cmV0dXJuIHRoaXNPYmotPmdldChleGVjLCBwcm9wZXJ0eU5hbWUpOworCiAgICAgcmV0dXJuIGpz U3RyaW5nKGV4ZWMsIHRoaXNPYmotPmltcGwoKS0+aXRlbShpZGVudGlmaWVyVG9BdG9taWNTdHJp bmcocHJvcGVydHlOYW1lKSkpOwogfQogCg== 109933 2011-10-06 01:59:48 -0700 2011-10-06 19:43:59 -0700 Patch bug-53752-20111006175947.patch text/plain 9446 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogOTY3OTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxYjE2ODM1MzVmODFmNDlkZGY4NGMx M2I4M2E4ODM5OWQxNzVjOTJhLi4wY2IwMTgxNjVjZTA5Y2NiNTUzYTFmMTBkMTZiNzExMjA4YzIz ZDliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTAtMDYgIEtlbnQgVGFtdXJhICA8dGtl bnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtKU0MgYmluZGluZ10gRml4IGluY29uc2lzdGVu dCBiZWhhdmlvciBvZiBET01TdHJpbmdNYXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUzNzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBmYXN0L2RvbS9kYXRhc2V0LWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBmYXN0L2RvbS9zY3JpcHQtdGVzdHMvZGF0YXNldC5qczoKKyAgICAgICAgIC0gQ2hhbmdl IHRoZSBleHBlY3RhdGlvbiBmb3IgYSBjYXNlIGRlbGV0aW5nIGEgcHJvcGVydHkgb2Ygd2hpY2gg bmFtZSBjYW4ndCBiZSBhIGRhdGEtKiBhdHRyaWJ1dGUuCisgICAgICAgICAgIFRoaXMgYmVoYXZp b3IgbWF0Y2hlcyB0byBGaXJlZm94IGFuZCBPcGVyYS4KKyAgICAgICAgIC0gQWRkIHRlc3QgY2Fz ZXMgdG8gY2hlY2sgcHV0L2dldC9kZWxldGUgcHJpb3JpdGllcy4KKyAgICAgICAgKiBwbGF0Zm9y bS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQ6CisgICAgICAgICBWOCBiaW5kaW5nIGlz IG5vdCByZWFkeSBmb3IgdGhpcyBjaGFuZ2UuCisKIDIwMTEtMTAtMDUgIEJyZW50IEZ1bGdoYW0g IDxiZnVsZ2hhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXaW5DYWlyb10gVW5yZXZpZXdlZCBi dWlsZCBmaXguCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9kYXRhc2V0LWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2RhdGFzZXQtZXhwZWN0ZWQudHh0CmluZGV4 IDRjYjRhOGVhMTVlZDg0YzI5Nzg3YjBlNGQ5YzQxMmRmNjRmNmE1ODAuLmIxNDc1ZjllMzQxZmU2 N2IyOTYwM2VhMDQ0MDEyNmI2YzRlY2RhZWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qv ZG9tL2RhdGFzZXQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2RhdGFz ZXQtZXhwZWN0ZWQudHh0CkBAIC0zOSwxMiArMzksMzMgQEAgUEFTUyB0ZXN0RGVsZXRlKCdkYXRh LS0tZm9vJywgJy1Gb28nKSBpcyB0cnVlCiBQQVNTIHRlc3REZWxldGUoJ2RhdGEtJywgJycpIGlz IHRydWUKIFBBU1MgdGVzdERlbGV0ZSgnZGF0YS3DoCcsICfDoCcpIGlzIHRydWUKIAotUEFTUyB0 ZXN0RGVsZXRlKCdkdW1teScsICctZm9vJykgdGhyZXcgZXhjZXB0aW9uIEVycm9yOiBTWU5UQVhf RVJSOiBET00gRXhjZXB0aW9uIDEyLgorUEFTUyB0ZXN0RGVsZXRlKCdkdW1teScsICctZm9vJykg aXMgZmFsc2UKIAogUEFTUyB0ZXN0Rm9ySW4oWydkYXRhLWZvbycsICdkYXRhLWJhcicsICdkYXRh LWJheiddKSBpcyAzCiBQQVNTIHRlc3RGb3JJbihbJ2RhdGEtZm9vJywgJ2RhdGEtYmFyJywgJ2Rh dGFGb28nXSkgaXMgMgogUEFTUyB0ZXN0Rm9ySW4oWydkYXRhLWZvbycsICdkYXRhLWJhcicsICdz dHlsZSddKSBpcyAyCiBQQVNTIHRlc3RGb3JJbihbJ2RhdGEtZm9vJywgJ2RhdGEtYmFyJywgJ2Rh dGEtJ10pIGlzIDMKKworUHJvcGVydHkgb3ZlcnJpZGU6CitQQVNTIE9iamVjdC5wcm90b3R5cGUu Zm9vID0gJ29uIE9iamVjdCc7IGRpdi5kYXRhc2V0LmZvbyBpcyAnb24gT2JqZWN0JworUEFTUyBk aXYuZGF0YXNldFsnZm9vJ10gPSAnb24gZGF0YXNldCc7IGRpdi5kYXRhc2V0LmZvbyBpcyAnb24g ZGF0YXNldCcKK1BBU1MgZGl2Lmhhc0F0dHJpYnV0ZSgnZGF0YS1mb28nKSBpcyB0cnVlCitQQVNT IGRpdi5zZXRBdHRyaWJ1dGUoJ2RhdGEtZm9vJywgJ2F0dHInKTsgZGl2LmRhdGFzZXQuZm9vIGlz ICdhdHRyJworVXBkYXRlIHRoZSBKYXZhU2NyaXB0IHByb3BlcnR5OgorUEFTUyBkaXYuZGF0YXNl dC5mb28gPSAndXBkYXRlZCc7IGRpdi5kYXRhc2V0LmZvbyBpcyAndXBkYXRlZCcKK1BBU1MgZGl2 LmdldEF0dHJpYnV0ZSgnZGF0YS1mb28nKSBpcyAndXBkYXRlZCcKK1BBU1MgZGl2LmRhdGFzZXQu QmFyID0gJ29uIGRhdGFzZXQnOyBkaXYuZGF0YXNldC5CYXIgaXMgJ29uIGRhdGFzZXQnCitQQVNT IGRpdi5oYXNBdHRyaWJ1dGUoJ2RhdGEtQmFyJykgaXMgZmFsc2UKK01ha2UgdGhlIEphdmFTY3Jp cHQgcHJvcGVydHkgZW1wdHk6CitQQVNTIGRpdi5kYXRhc2V0LmZvbyA9ICcnOyBkaXYuZGF0YXNl dC5mb28gaXMgJycKK1BBU1MgZGl2LmdldEF0dHJpYnV0ZSgnZGF0YS1mb28nKSBpcyAnJworUmVt b3ZlIHRoZSBhdHRyaWJ1dGU6CitQQVNTIGRpdi5yZW1vdmVBdHRyaWJ1dGUoJ2RhdGEtZm9vJyk7 IGRpdi5kYXRhc2V0LmZvbyBpcyAnb24gT2JqZWN0JworUmVtb3ZlIHRoZSBKYXZhU2NyaXB0IHBy b3BlcnR5OgorUEFTUyBkaXYuc2V0QXR0cmlidXRlKCdkYXRhLWZvbycsICdhdHRyJyk7IGRlbGV0 ZSBkaXYuZGF0YXNldC5mb287IGRpdi5kYXRhc2V0LmZvbyBpcyAnb24gT2JqZWN0JworUEFTUyBk aXYuaGFzQXR0cmlidXRlKCdmb28nKSBpcyBmYWxzZQorUEFTUyBkZWxldGUgZGl2LmRhdGFzZXQu QmFyOyBkaXYuZGF0YXNldC5CYXIgaXMgdW5kZWZpbmVkLgorCiBQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvZG9tL3NjcmlwdC10ZXN0cy9kYXRhc2V0LmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vc2Ny aXB0LXRlc3RzL2RhdGFzZXQuanMKaW5kZXggNTdjODNiOWQ3NDdmZmFhOTU2NDMzZGU5NDg3YjM1 YWQ2YjU4YjhhOS4uMGI5NzdhYTc0OWY3YzU0OWFkYWNlMmE5NzJiYmZmYzc0ZTRlMTM4YiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vc2NyaXB0LXRlc3RzL2RhdGFzZXQuanMKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vc2NyaXB0LXRlc3RzL2RhdGFzZXQuanMKQEAgLTc0LDcg Kzc0LDcgQEAgc2hvdWxkQmVUcnVlKCJ0ZXN0RGVsZXRlKCdkYXRhLScsICcnKSIpOwogc2hvdWxk QmVUcnVlKCJ0ZXN0RGVsZXRlKCdkYXRhLVx4RTAnLCAnXHhFMCcpIik7CiBkZWJ1ZygiIik7CiAK LXNob3VsZFRocm93KCJ0ZXN0RGVsZXRlKCdkdW1teScsICctZm9vJykiLCAiJ0Vycm9yOiBTWU5U QVhfRVJSOiBET00gRXhjZXB0aW9uIDEyJyIpOworc2hvdWxkQmVGYWxzZSgidGVzdERlbGV0ZSgn ZHVtbXknLCAnLWZvbycpIik7CiBkZWJ1ZygiIik7CiAKIGZ1bmN0aW9uIHRlc3RGb3JJbihhcnJh eSkKQEAgLTk2LDQgKzk2LDMxIEBAIHNob3VsZEJlKCJ0ZXN0Rm9ySW4oWydkYXRhLWZvbycsICdk YXRhLWJhcicsICdkYXRhRm9vJ10pIiwgIjIiKTsKIHNob3VsZEJlKCJ0ZXN0Rm9ySW4oWydkYXRh LWZvbycsICdkYXRhLWJhcicsICdzdHlsZSddKSIsICIyIik7CiBzaG91bGRCZSgidGVzdEZvcklu KFsnZGF0YS1mb28nLCAnZGF0YS1iYXInLCAnZGF0YS0nXSkiLCAiMyIpOwogCisKK2RlYnVnKCIi KTsKK2RlYnVnKCJQcm9wZXJ0eSBvdmVycmlkZToiKTsKK3ZhciBkaXYgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKKy8vIElmIHRoZSBPYmplY3QgcHJvcm90eXBlIGFscmVhZHkgaGFz ICJmb28iLCBkYXRhc2V0IGRvZXNuJ3QgY3JlYXRlIHRoZQorLy8gY29ycmVzcG9uZGluZyBhdHRy aWJ1dGUgZm9yICJmb28iLgorc2hvdWxkQmUoIk9iamVjdC5wcm90b3R5cGUuZm9vID0gJ29uIE9i amVjdCc7IGRpdi5kYXRhc2V0LmZvbyIsICInb24gT2JqZWN0JyIpOworc2hvdWxkQmUoImRpdi5k YXRhc2V0Wydmb28nXSA9ICdvbiBkYXRhc2V0JzsgZGl2LmRhdGFzZXQuZm9vIiwgIidvbiBkYXRh c2V0JyIpOworc2hvdWxkQmVUcnVlKCJkaXYuaGFzQXR0cmlidXRlKCdkYXRhLWZvbycpIik7Citz aG91bGRCZSgiZGl2LnNldEF0dHJpYnV0ZSgnZGF0YS1mb28nLCAnYXR0cicpOyBkaXYuZGF0YXNl dC5mb28iLCAiJ2F0dHInIik7CitkZWJ1ZygiVXBkYXRlIHRoZSBKYXZhU2NyaXB0IHByb3BlcnR5 OiIpOworc2hvdWxkQmUoImRpdi5kYXRhc2V0LmZvbyA9ICd1cGRhdGVkJzsgZGl2LmRhdGFzZXQu Zm9vIiwgIid1cGRhdGVkJyIpOworc2hvdWxkQmUoImRpdi5nZXRBdHRyaWJ1dGUoJ2RhdGEtZm9v JykiLCAiJ3VwZGF0ZWQnIik7CisvLyAiQmFyIiBjYW4ndCBiZSByZXByZXNlbnRlZCBhcyBhIGRh dGEtIGF0dHJpYnV0ZS4KK3Nob3VsZEJlKCJkaXYuZGF0YXNldC5CYXIgPSAnb24gZGF0YXNldCc7 IGRpdi5kYXRhc2V0LkJhciIsICInb24gZGF0YXNldCciKTsKK3Nob3VsZEJlRmFsc2UoImRpdi5o YXNBdHRyaWJ1dGUoJ2RhdGEtQmFyJykiKTsKK2RlYnVnKCJNYWtlIHRoZSBKYXZhU2NyaXB0IHBy b3BlcnR5IGVtcHR5OiIpOworc2hvdWxkQmUoImRpdi5kYXRhc2V0LmZvbyA9ICcnOyBkaXYuZGF0 YXNldC5mb28iLCAiJyciKTsKK3Nob3VsZEJlKCJkaXYuZ2V0QXR0cmlidXRlKCdkYXRhLWZvbycp IiwgIicnIik7CitkZWJ1ZygiUmVtb3ZlIHRoZSBhdHRyaWJ1dGU6Iik7CitzaG91bGRCZSgiZGl2 LnJlbW92ZUF0dHJpYnV0ZSgnZGF0YS1mb28nKTsgZGl2LmRhdGFzZXQuZm9vIiwgIidvbiBPYmpl Y3QnIik7CitkZWJ1ZygiUmVtb3ZlIHRoZSBKYXZhU2NyaXB0IHByb3BlcnR5OiIpOworc2hvdWxk QmUoImRpdi5zZXRBdHRyaWJ1dGUoJ2RhdGEtZm9vJywgJ2F0dHInKTsgZGVsZXRlIGRpdi5kYXRh c2V0LmZvbzsgZGl2LmRhdGFzZXQuZm9vIiwgIidvbiBPYmplY3QnIik7CitzaG91bGRCZUZhbHNl KCJkaXYuaGFzQXR0cmlidXRlKCdmb28nKSIpOworc2hvdWxkQmVVbmRlZmluZWQoImRlbGV0ZSBk aXYuZGF0YXNldC5CYXI7IGRpdi5kYXRhc2V0LkJhciIpOworCitkZWJ1ZygiIik7CiB2YXIgc3Vj Y2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2No cm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAppbmRleCAwNzZlYjkyNTkzZjNjOTY0Y2NkNzg1 M2M5NGI5ODhiNTlhNDA1YTExLi4wMzhjZTJlOGYzYWUxNDRiZjFmNDA5NjdkMzUxNmU5NTg4OWVj NTIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVj dGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBl Y3RhdGlvbnMudHh0CkBAIC0zNzU4LDYgKzM3NTgsOSBAQCBCVUdXSzY4OTcwIE1BQyBDUFUtQ0cg UkVMRUFTRSA6IHN2Zy90ZXh0L3NlbGVjdGlvbi1iYWNrZ3JvdW5kLWNvbG9yLnhodG1sID0gSU1B RwogQlVHV0s2ODk4MiA6IHN2Zy9jdXN0b20vb3ZlcnNpemVkLXBhdHRlcm4tc2NhbGUuc3ZnID0g SU1BR0UgUEFTUwogQlVHV0s2ODk4MiA6IHN2Zy9jdXN0b20vdHJhbnNmb3JtZWQtcGF0dGVybi1j bGFtcC1zdmctcm9vdC5zdmcgPSBJTUFHRSBQQVNTCiAKKy8vIE5lZWQgdG8gZm9sbG93IGEgSlND IGJpbmRpbmcgY2hhbmdlLiBTZWUgd2Via2l0Lm9yZy9iLzUzNzUyLgorQlVHV0s1MzU3OCA6IGZh c3QvZG9tL2RhdGFzZXQuaHRtbCA9IFRFWFQKKwogLy8gTmVlZCByZWJhc2VsaW5lcyBhZnRlciBy OTYyNTcKIEJVR1dLNjIwOTIgV0lOIExJTlVYIDogZWRpdGluZy9kZWxldGluZy9kZWxldGUtYnIt MDExLmh0bWwgPSBURVhUCiBCVUdXSzYyMDkyIFdJTiBMSU5VWCA6IGVkaXRpbmcvZGVsZXRpbmcv ZGVsZXRlLWxpbmUtMDExLmh0bWwgPSBURVhUCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDNlOGIxNjE1MjVmYmRi MDliOWY3MGRiNmU1YmQ4NzRhZGQ4ZTk1NS4uMjM0MWQ3NGU4YjMzNzNkNTY5M2FhZmY4NzhiYjZk NTk0NjlhMTQwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDExLTEwLTA2ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBbSlNDIGJpbmRpbmddIEZp eCBpbmNvbnNpc3RlbnQgYmVoYXZpb3Igb2YgRE9NU3RyaW5nTWFwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mzc1MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBkYXRhc2V0IGJlaGF2aW9yIHdhcyBp bmNvbnNpc3RlbnQuIFRoZSBnZXQgb3BlcmF0aW9uIGhhbmRsZWQKKyAgICAgICAgZGF0YS0qIGF0 dHJpYnV0ZXMgZmlyc3QsIGFuZCB0aGUgcHV0IGFuZCBkZWxldGUgb3BlcmF0aW9ucyBoYW5kbGVk CisgICAgICAgIEphdmFTY3JpcHQgcHJvcGVydGllcyBmaXJzdC4KKworICAgICAgICBMaWtlIEZp cmVmb3ggYW5kIE9wZXJhLCB0aGUgcHV0IGFuZCBkZWxldGUgb3BlcmF0aW9ucyBzaG91bGQKKyAg ICAgICAgaGFuZGxlIGRhdGEtKiBhdHRyaWJ1dGUgZmlyc3QuCisKKyAgICAgICAgKiBiaW5kaW5n cy9qcy9KU0RPTVN0cmluZ01hcEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVN0 cmluZ01hcDo6ZGVsZXRlUHJvcGVydHkpOgorICAgICAgICAgSGFuZGxlcyBET01TdHJpbmdNYXAg Zmlyc3QsIHRoZW4gcmV0dXJucyBmYWxzZSBpZiB0aGUgRE9NU3RyaW5nTWFwIG1ha2VzIGFuIGVy cm9yLgorICAgICAgICAoV2ViQ29yZTo6SlNET01TdHJpbmdNYXA6OnB1dERlbGVnYXRlKTogZGl0 dG8uCisKIDIwMTEtMTAtMDUgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJlZmFjdG9yIElETCBhdHRyaWJ1dGVzIGFib3V0IGNvbnN0cnVjdG9yCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVN0cmluZ01hcEN1c3RvbS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVN0cmluZ01hcEN1c3RvbS5jcHAK aW5kZXggMGMzNDgzNjM4ZDg5YTNhOThkMDM0ZmFlMGE4YTlkMmU5Y2NhZDg4OS4uZTNkZTY0ZTdi NGJmYTc0MmNmM2Q4MGZlMmIwYTM1ODdjZTg3MmUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNET01TdHJpbmdNYXBDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRE9NU3RyaW5nTWFwQ3VzdG9tLmNwcApAQCAtNTksNDYgKzU5LDI0 IEBAIHZvaWQgSlNET01TdHJpbmdNYXA6OmdldE93blByb3BlcnR5TmFtZXMoRXhlY1N0YXRlKiBl eGVjLCBQcm9wZXJ0eU5hbWVBcnJheSYgcHJvCiAKIGJvb2wgSlNET01TdHJpbmdNYXA6OmRlbGV0 ZVByb3BlcnR5KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1l KQogewotICAgIC8vIE9ubHkgcGVyZm9ybSB0aGUgY3VzdG9tIGRlbGV0ZSBpZiB0aGUgb2JqZWN0 IGRvZXNuJ3QgaGF2ZSBhIG5hdGl2ZSBwcm9wZXJ0eSBieSB0aGlzIG5hbWUuCi0gICAgLy8gU2lu Y2UgaGFzUHJvcGVydHkoKSB3b3VsZCBlbmQgdXAgY2FsbGluZyBjYW5HZXRJdGVtc0Zvck5hbWUo KSBhbmQgYmUgZm9vbGVkLCB3ZSBuZWVkIHRvIGNoZWNrCi0gICAgLy8gdGhlIG5hdGl2ZSBwcm9w ZXJ0eSBzbG90cyBtYW51YWxseS4KLSAgICBQcm9wZXJ0eVNsb3Qgc2xvdDsKLSAgICBpZiAoZ2V0 U3RhdGljVmFsdWVTbG90PEpTRE9NU3RyaW5nTWFwLCBCYXNlPihleGVjLCBzX2luZm8ucHJvcEhh c2hUYWJsZShleGVjKSwgdGhpcywgcHJvcGVydHlOYW1lLCBzbG90KSkKKyAgICBBdG9taWNTdHJp bmcgc3RyaW5nTmFtZSA9IGlkZW50aWZpZXJUb0F0b21pY1N0cmluZyhwcm9wZXJ0eU5hbWUpOwor ICAgIGlmICghbV9pbXBsLT5jb250YWlucyhzdHJpbmdOYW1lKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgICAgICAKLSAgICBKU1ZhbHVlIHByb3RvdHlwZSA9IHRoaXMtPnByb3RvdHlwZSgp OwotICAgIGlmIChwcm90b3R5cGUuaXNPYmplY3QoKSAmJiBhc09iamVjdChwcm90b3R5cGUpLT5o YXNQcm9wZXJ0eShleGVjLCBwcm9wZXJ0eU5hbWUpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K ICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICBtX2ltcGwtPmRlbGV0ZUl0ZW0oaWRlbnRp ZmllclRvU3RyaW5nKHByb3BlcnR5TmFtZSksIGVjKTsKKyAgICBtX2ltcGwtPmRlbGV0ZUl0ZW0o c3RyaW5nTmFtZSwgZWMpOwogICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBlYyk7Ci0KLSAgICBy ZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gIWVjOwogfQogCiBib29sIEpTRE9NU3RyaW5nTWFwOjpw dXREZWxlZ2F0ZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFt ZSwgSlNWYWx1ZSB2YWx1ZSwgUHV0UHJvcGVydHlTbG90JikKIHsKLSAgICAvLyBPbmx5IHBlcmZv cm0gdGhlIGN1c3RvbSBwdXQgaWYgdGhlIG9iamVjdCBkb2Vzbid0IGhhdmUgYSBuYXRpdmUgcHJv cGVydHkgYnkgdGhpcyBuYW1lLgotICAgIC8vIFNpbmNlIGhhc1Byb3BlcnR5KCkgd291bGQgZW5k IHVwIGNhbGxpbmcgY2FuR2V0SXRlbXNGb3JOYW1lKCkgYW5kIGJlIGZvb2xlZCwgd2UgbmVlZCB0 byBjaGVjawotICAgIC8vIHRoZSBuYXRpdmUgcHJvcGVydHkgc2xvdHMgbWFudWFsbHkuCi0gICAg UHJvcGVydHlTbG90IHNsb3Q7Ci0gICAgaWYgKGdldFN0YXRpY1ZhbHVlU2xvdDxKU0RPTVN0cmlu Z01hcCwgQmFzZT4oZXhlYywgc19pbmZvLnByb3BIYXNoVGFibGUoZXhlYyksIHRoaXMsIHByb3Bl cnR5TmFtZSwgc2xvdCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgCi0gICAgSlNW YWx1ZSBwcm90b3R5cGUgPSB0aGlzLT5wcm90b3R5cGUoKTsKLSAgICBpZiAocHJvdG90eXBlLmlz T2JqZWN0KCkgJiYgYXNPYmplY3QocHJvdG90eXBlKS0+aGFzUHJvcGVydHkoZXhlYywgcHJvcGVy dHlOYW1lKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAogICAgIFN0cmluZyBzdHJpbmdW YWx1ZSA9IHVzdHJpbmdUb1N0cmluZyh2YWx1ZS50b1N0cmluZyhleGVjKSk7CiAgICAgaWYgKGV4 ZWMtPmhhZEV4Y2VwdGlvbigpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAKKyAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIGltcGwoKS0+c2V0 SXRlbShpZGVudGlmaWVyVG9TdHJpbmcocHJvcGVydHlOYW1lKSwgc3RyaW5nVmFsdWUsIGVjKTsK ICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgZWMpOwotCi0gICAgcmV0dXJuIHRydWU7CisgICAg cmV0dXJuICFlYzsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=