118235 2013-07-01 04:12:40 -0700 Adopt is/toHTMLMapElement for code cleanup 2013-07-03 21:32:19 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kangil.han kangil.han aboxhall apinheiro cfleizach commit-queue dmazzoni esprehn+autocc jdiggs kling koivisto mario oldest_to_newest 904976 0 kangil.han 2013-07-01 04:12:40 -0700 Adopt is/toHTMLMapElement for code cleanup 904977 1 205796 kangil.han 2013-07-01 04:15:03 -0700 Created attachment 205796 Patch 904981 2 205796 kling 2013-07-01 04:40:57 -0700 Comment on attachment 205796 Patch r=me It's a little bit unfortunate that the isFooElement(Node*) helpers incur the cost of an isElementNode() check that wouldn't be necessary if the argument were an Element*. Perhaps we could templatize the method so the compiler would skip the check when the argument is of a narrower type. Food for thought. 905012 3 kangil.han 2013-07-01 07:01:28 -0700 (In reply to comment #2) > > It's a little bit unfortunate that the isFooElement(Node*) helpers incur the cost of an isElementNode() check that wouldn't be necessary if the argument were an Element*. Perhaps we could templatize the method so the compiler would skip the check when the argument is of a narrower type. Food for thought. Oops, you are right. :( IMHO, thinking about node-element inheritance has led a choice to use Node* as an argument of isFooElement. Though hasTagName() is not a virtual function. :( How about to take Element* as an argument of is/toFooElement? Plus why don't we make Element::hasTagName an inline function? 905021 4 kangil.han 2013-07-01 07:13:45 -0700 (In reply to comment #3) > Plus why don't we make Element::hasTagName an inline function? My bad. :( We can't make this function an inline. Sorry to confuse you. :) 905024 5 kling 2013-07-01 07:25:50 -0700 (In reply to comment #4) > (In reply to comment #3) > > Plus why don't we make Element::hasTagName an inline function? > > My bad. :( > We can't make this function an inline. > Sorry to confuse you. :) Element::hasTagName() is already an inline function, defined in Element.h It could be nice to use Element* arguments instead, though I suspect that would require a lot of type checking at various call sites. 905027 6 kangil.han 2013-07-01 07:35:20 -0700 (In reply to comment #5) > > It could be nice to use Element* arguments instead, though I suspect that would require a lot of type checking at various call sites. I guess so. :( Anyway, I will try it and let you know. :) 906028 7 206047 kangil.han 2013-07-03 19:36:03 -0700 Created attachment 206047 Patch 906029 8 kangil.han 2013-07-03 19:37:57 -0700 (In reply to comment #2) > (From update of attachment 205796 [details]) > r=me > > It's a little bit unfortunate that the isFooElement(Node*) helpers incur the cost of an isElementNode() check that wouldn't be necessary if the argument were an Element*. Perhaps we could templatize the method so the compiler would skip the check when the argument is of a narrower type. Food for thought. Done by appending overloading isFooElement(Element*) inline function. :) Thx! 906034 9 206047 commit-queue 2013-07-03 21:32:15 -0700 Comment on attachment 206047 Patch Clearing flags on attachment: 206047 Committed r152387: <http://trac.webkit.org/changeset/152387> 906035 10 commit-queue 2013-07-03 21:32:19 -0700 All reviewed patches have been landed. Closing bug. 205796 2013-07-01 04:15:03 -0700 2013-07-03 19:35:56 -0700 Patch bug-118235-20130701201311.patch text/plain 6900 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTE3YTFjMDNlYTMzYjc2 OTliMWQxZDk0NWRiZjNjY2NhYzJhZTFmYy4uODQyMzlkNzQzOTZlMTg0NGYxMGFjMzNlMWE4ZGZj ZTIzMzg4OGM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTA3LTAxICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KIAorICAgICAgICBBZG9wdCBpcy90b0hU TUxNYXBFbGVtZW50IGZvciBjb2RlIGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODIzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRvIGVuaGFuY2UgcmVhZGFiaWxpdHksIHRoaXMgcGF0Y2gg YWRvcHRzIGlzL3RvSFRNTE1hcEVsZW1lbnQuCisgICAgICAgIFRoaXMgYWxzbyBoZWxwcyBvdXQg dG8gcmVkdWNlIGR1cGxpY2F0ZWQgdXNlIG9mIHN0YXRpY19jYXN0LgorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmdldERvY3VtZW50TGlua3MpOgorICAgICAg ICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWNjZXNzaWJpbGl0eUltYWdl TWFwSGl0VGVzdCk6CisgICAgICAgICogZG9tL0RvY3VtZW50T3JkZXJlZE1hcC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjprZXlNYXRjaGVzTWFwTmFtZSk6CisgICAgICAgIChXZWJDb3JlOjprZXlN YXRjaGVzTG93ZXJjYXNlZE1hcE5hbWUpOgorICAgICAgICAqIGRvbS9UcmVlU2NvcGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6VHJlZVNjb3BlOjpnZXRJbWFnZU1hcCk6CisgICAgICAgICogaHRt bC9IVE1MQXJlYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEFyZWFFbGVtZW50 OjppbWFnZUVsZW1lbnQpOgorICAgICAgICAqIGh0bWwvSFRNTE1hcEVsZW1lbnQuaDoKKyAgICAg ICAgKFdlYkNvcmU6OmlzSFRNTE1hcEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6dG9IVE1M TWFwRWxlbWVudCk6CisKKzIwMTMtMDctMDEgIEthbmdpbCBIYW4gIDxrYW5naWwuaGFuQHNhbXN1 bmcuY29tPgorCiAgICAgICAgIEFkb3B0IHRvSFRNTFRleHRBcmVhRWxlbWVudCBmb3IgY29kZSBj bGVhbnVwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTgyMjYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXggNmUxNjRmMTBhNTVjNTU0ZjI5MGUzOTQ0 MGZiYzQ0Y2Q1MzVmMDQyNC4uMDVmZDIyOWFkNjMyY2IxYTU5MThiYzFlZjU3OTkyODgxYjJlYzA5 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0xNzM1LDExICsxNzM1LDEyIEBAIHZvaWQgQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Z2V0RG9jdW1lbnRMaW5rcyhBY2Nlc3NpYmlsaXR5Q2hp bGRyZW5WZWN0b3ImIHJlCiAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChheG9iaik7CiAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBOb2RlKiBwYXJlbnQgPSBjdXJyLT5wYXJlbnRO b2RlKCk7Ci0gICAgICAgICAgICBpZiAocGFyZW50ICYmIGlzSFRNTEFyZWFFbGVtZW50KGN1cnIp ICYmIHBhcmVudC0+aGFzVGFnTmFtZShtYXBUYWcpKSB7CisgICAgICAgICAgICBpZiAocGFyZW50 ICYmIGlzSFRNTEFyZWFFbGVtZW50KGN1cnIpICYmIGlzSFRNTE1hcEVsZW1lbnQocGFyZW50KSkg ewogICAgICAgICAgICAgICAgIEFjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsqIGFyZWFPYmplY3Qg PSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rKj4oYXhPYmplY3RDYWNoZSgp LT5nZXRPckNyZWF0ZShJbWFnZU1hcExpbmtSb2xlKSk7CisgICAgICAgICAgICAgICAgSFRNTE1h cEVsZW1lbnQqIG1hcCA9IHRvSFRNTE1hcEVsZW1lbnQocGFyZW50KTsKICAgICAgICAgICAgICAg ICBhcmVhT2JqZWN0LT5zZXRIVE1MQXJlYUVsZW1lbnQodG9IVE1MQXJlYUVsZW1lbnQoY3Vycikp OwotICAgICAgICAgICAgICAgIGFyZWFPYmplY3QtPnNldEhUTUxNYXBFbGVtZW50KHN0YXRpY19j YXN0PEhUTUxNYXBFbGVtZW50Kj4ocGFyZW50KSk7Ci0gICAgICAgICAgICAgICAgYXJlYU9iamVj dC0+c2V0UGFyZW50KGFjY2Vzc2liaWxpdHlQYXJlbnRGb3JJbWFnZU1hcChzdGF0aWNfY2FzdDxI VE1MTWFwRWxlbWVudCo+KHBhcmVudCkpKTsKKyAgICAgICAgICAgICAgICBhcmVhT2JqZWN0LT5z ZXRIVE1MTWFwRWxlbWVudChtYXApOworICAgICAgICAgICAgICAgIGFyZWFPYmplY3QtPnNldFBh cmVudChhY2Nlc3NpYmlsaXR5UGFyZW50Rm9ySW1hZ2VNYXAobWFwKSk7CiAKICAgICAgICAgICAg ICAgICByZXN1bHQuYXBwZW5kKGFyZWFPYmplY3QpOwogICAgICAgICAgICAgfQpAQCAtMjE1NCw4 ICsyMTU1LDggQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dDo6YWNjZXNzaWJpbGl0eUltYWdlTWFwSGl0VGVzdChIVE0KIAogICAgIEFjY2Vzc2liaWxpdHlP YmplY3QqIHBhcmVudCA9IDA7CiAgICAgZm9yIChFbGVtZW50KiBtYXBQYXJlbnQgPSBhcmVhLT5w YXJlbnRFbGVtZW50KCk7IG1hcFBhcmVudDsgbWFwUGFyZW50ID0gbWFwUGFyZW50LT5wYXJlbnRF bGVtZW50KCkpIHsKLSAgICAgICAgaWYgKG1hcFBhcmVudC0+aGFzVGFnTmFtZShtYXBUYWcpKSB7 Ci0gICAgICAgICAgICBwYXJlbnQgPSBhY2Nlc3NpYmlsaXR5UGFyZW50Rm9ySW1hZ2VNYXAoc3Rh dGljX2Nhc3Q8SFRNTE1hcEVsZW1lbnQqPihtYXBQYXJlbnQpKTsKKyAgICAgICAgaWYgKGlzSFRN TE1hcEVsZW1lbnQobWFwUGFyZW50KSkgeworICAgICAgICAgICAgcGFyZW50ID0gYWNjZXNzaWJp bGl0eVBhcmVudEZvckltYWdlTWFwKHRvSFRNTE1hcEVsZW1lbnQobWFwUGFyZW50KSk7CiAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudE9yZGVyZWRNYXAuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50T3JkZXJlZE1hcC5jcHAKaW5kZXggNWZhY2E0MGI1NTdjM2ZlZGM2ZTNjZTZiNTg4ZDA4MmFh NzdhM2FhNi4uNzgzYzk5YjA1ZjAzNjM3N2VkZDBkZWViMGFmZGUyNjJkZTJlMTFlMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50T3JkZXJlZE1hcC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50T3JkZXJlZE1hcC5jcHAKQEAgLTU1LDEyICs1NSwxMiBA QCBpbmxpbmUgYm9vbCBrZXlNYXRjaGVzTmFtZShBdG9taWNTdHJpbmdJbXBsKiBrZXksIEVsZW1l bnQqIGVsZW1lbnQpCiAKIGlubGluZSBib29sIGtleU1hdGNoZXNNYXBOYW1lKEF0b21pY1N0cmlu Z0ltcGwqIGtleSwgRWxlbWVudCogZWxlbWVudCkKIHsKLSAgICByZXR1cm4gZWxlbWVudC0+aGFz VGFnTmFtZShtYXBUYWcpICYmIHN0YXRpY19jYXN0PEhUTUxNYXBFbGVtZW50Kj4oZWxlbWVudCkt PmdldE5hbWUoKS5pbXBsKCkgPT0ga2V5OworICAgIHJldHVybiBpc0hUTUxNYXBFbGVtZW50KGVs ZW1lbnQpICYmIHRvSFRNTE1hcEVsZW1lbnQoZWxlbWVudCktPmdldE5hbWUoKS5pbXBsKCkgPT0g a2V5OwogfQogCiBpbmxpbmUgYm9vbCBrZXlNYXRjaGVzTG93ZXJjYXNlZE1hcE5hbWUoQXRvbWlj U3RyaW5nSW1wbCoga2V5LCBFbGVtZW50KiBlbGVtZW50KQogewotICAgIHJldHVybiBlbGVtZW50 LT5oYXNUYWdOYW1lKG1hcFRhZykgJiYgc3RhdGljX2Nhc3Q8SFRNTE1hcEVsZW1lbnQqPihlbGVt ZW50KS0+Z2V0TmFtZSgpLmxvd2VyKCkuaW1wbCgpID09IGtleTsKKyAgICByZXR1cm4gaXNIVE1M TWFwRWxlbWVudChlbGVtZW50KSAmJiB0b0hUTUxNYXBFbGVtZW50KGVsZW1lbnQpLT5nZXROYW1l KCkubG93ZXIoKS5pbXBsKCkgPT0ga2V5OwogfQogCiBpbmxpbmUgYm9vbCBrZXlNYXRjaGVzTGFi ZWxGb3JBdHRyaWJ1dGUoQXRvbWljU3RyaW5nSW1wbCoga2V5LCBFbGVtZW50KiBlbGVtZW50KQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1RyZWVTY29wZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vVHJlZVNjb3BlLmNwcAppbmRleCAyODY1MmVhN2I0M2MwODJkZjY4ZjdlM2NlY2Q3 M2VkZDI1OWU0Mjk1Li5lZjA3MzgxOTVjZGVlY2Q5YWY4M2NkMmI2NmFiOTBiYzgyOTFjOTQ4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vVHJlZVNjb3BlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vVHJlZVNjb3BlLmNwcApAQCAtMjM4LDggKzIzOCw4IEBAIEhUTUxNYXBFbGVt ZW50KiBUcmVlU2NvcGU6OmdldEltYWdlTWFwKGNvbnN0IFN0cmluZyYgdXJsKSBjb25zdAogICAg IHNpemVfdCBoYXNoUG9zID0gdXJsLmZpbmQoJyMnKTsKICAgICBTdHJpbmcgbmFtZSA9IChoYXNo UG9zID09IG5vdEZvdW5kID8gdXJsIDogdXJsLnN1YnN0cmluZyhoYXNoUG9zICsgMSkpLmltcGwo KTsKICAgICBpZiAocm9vdE5vZGUoKS0+ZG9jdW1lbnQoKS0+aXNIVE1MRG9jdW1lbnQoKSkKLSAg ICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxNYXBFbGVtZW50Kj4obV9pbWFnZU1hcHNCeU5h bWUtPmdldEVsZW1lbnRCeUxvd2VyY2FzZWRNYXBOYW1lKEF0b21pY1N0cmluZyhuYW1lLmxvd2Vy KCkpLmltcGwoKSwgdGhpcykpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxIVE1MTWFwRWxlbWVu dCo+KG1faW1hZ2VNYXBzQnlOYW1lLT5nZXRFbGVtZW50QnlNYXBOYW1lKEF0b21pY1N0cmluZyhu YW1lKS5pbXBsKCksIHRoaXMpKTsKKyAgICAgICAgcmV0dXJuIHRvSFRNTE1hcEVsZW1lbnQobV9p bWFnZU1hcHNCeU5hbWUtPmdldEVsZW1lbnRCeUxvd2VyY2FzZWRNYXBOYW1lKEF0b21pY1N0cmlu ZyhuYW1lLmxvd2VyKCkpLmltcGwoKSwgdGhpcykpOworICAgIHJldHVybiB0b0hUTUxNYXBFbGVt ZW50KG1faW1hZ2VNYXBzQnlOYW1lLT5nZXRFbGVtZW50QnlNYXBOYW1lKEF0b21pY1N0cmluZyhu YW1lKS5pbXBsKCksIHRoaXMpKTsKIH0KIAogTm9kZSogbm9kZUZyb21Qb2ludChEb2N1bWVudCog ZG9jdW1lbnQsIGludCB4LCBpbnQgeSwgTGF5b3V0UG9pbnQqIGxvY2FsUG9pbnQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5jcHAKaW5kZXggYmE0MDkxZjllMTk5ZmY2M2RhMTQw MDYyOTkzOTg1MDM4NjBlN2IyMy4uZjg4MmU0MDUwZjQ1Y2JlYzA4Y2I5ZjY4YjFhYzk2ZmI3NmZj YmJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50LmNwcApAQCAtMTg0LDEw ICsxODQsMTAgQEAgUGF0aCBIVE1MQXJlYUVsZW1lbnQ6OmdldFJlZ2lvbihjb25zdCBMYXlvdXRT aXplJiBzaXplKSBjb25zdAogSFRNTEltYWdlRWxlbWVudCogSFRNTEFyZWFFbGVtZW50OjppbWFn ZUVsZW1lbnQoKSBjb25zdAogewogICAgIE5vZGUqIG1hcEVsZW1lbnQgPSBwYXJlbnROb2RlKCk7 Ci0gICAgaWYgKCFtYXBFbGVtZW50IHx8ICFtYXBFbGVtZW50LT5oYXNUYWdOYW1lKG1hcFRhZykp CisgICAgaWYgKCFtYXBFbGVtZW50IHx8ICFpc0hUTUxNYXBFbGVtZW50KG1hcEVsZW1lbnQpKQog ICAgICAgICByZXR1cm4gMDsKICAgICAKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTE1hcEVs ZW1lbnQqPihtYXBFbGVtZW50KS0+aW1hZ2VFbGVtZW50KCk7CisgICAgcmV0dXJuIHRvSFRNTE1h cEVsZW1lbnQobWFwRWxlbWVudCktPmltYWdlRWxlbWVudCgpOwogfQogCiBib29sIEhUTUxBcmVh RWxlbWVudDo6aXNLZXlib2FyZEZvY3VzYWJsZShLZXlib2FyZEV2ZW50KikgY29uc3QKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1hcEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1hcEVsZW1lbnQuaAppbmRleCA0ZGRjZTZhMmZjNmYyYjFkOTlmNjkyNzMy M2U2MzJjYjZkZjhiMjI4Li45NzQ3NTM4YzJmZTBkMGM0ZWMxMTFhOGM3MGU4NGRjZmJlYTQwNWE4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNYXBFbGVtZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWFwRWxlbWVudC5oCkBAIC01NCw2ICs1NCwxNyBAQCBw cml2YXRlOgogICAgIEF0b21pY1N0cmluZyBtX25hbWU7CiB9OwogCitpbmxpbmUgYm9vbCBpc0hU TUxNYXBFbGVtZW50KE5vZGUqIG5vZGUpCit7CisgICAgcmV0dXJuIG5vZGUtPmhhc1RhZ05hbWUo SFRNTE5hbWVzOjptYXBUYWcpOworfQorCitpbmxpbmUgSFRNTE1hcEVsZW1lbnQqIHRvSFRNTE1h cEVsZW1lbnQoTm9kZSogbm9kZSkKK3sKKyAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNB VElPTighbm9kZSB8fCBpc0hUTUxNYXBFbGVtZW50KG5vZGUpKTsKKyAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8SFRNTE1hcEVsZW1lbnQqPihub2RlKTsKK30KKwogfSAvL25hbWVzcGFjZQogCiAjZW5k aWYK 206047 2013-07-03 19:36:03 -0700 2013-07-03 21:32:15 -0700 Patch bug-118235-20130704113410.patch text/plain 6955 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJlMDg4NmEyNzVmYjY0 MTNkY2Q4NDk4MGY0YTFiOGY4ZjIxMDg2Mi4uYjQyMDA5Y2U0YTVlNjI5ODNhMWJmZjkzYTA2ZDYw ZDY0MmVjY2M0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA3LTAzICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBBZG9wdCBpcy90b0hU TUxNYXBFbGVtZW50IGZvciBjb2RlIGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODIzNQorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHJl YXMgS2xpbmcuCisKKyAgICAgICAgVG8gZW5oYW5jZSByZWFkYWJpbGl0eSwgdGhpcyBwYXRjaCBh ZG9wdHMgaXMvdG9IVE1MTWFwRWxlbWVudC4KKyAgICAgICAgVGhpcyBhbHNvIGhlbHBzIG91dCB0 byByZWR1Y2UgZHVwbGljYXRlZCB1c2Ugb2Ygc3RhdGljX2Nhc3QuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Z2V0RG9jdW1lbnRMaW5rcyk6CisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nlc3NpYmlsaXR5SW1hZ2VN YXBIaXRUZXN0KToKKyAgICAgICAgKiBkb20vRG9jdW1lbnRPcmRlcmVkTWFwLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmtleU1hdGNoZXNNYXBOYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OmtleU1h dGNoZXNMb3dlcmNhc2VkTWFwTmFtZSk6CisgICAgICAgICogZG9tL1RyZWVTY29wZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpUcmVlU2NvcGU6OmdldEltYWdlTWFwKToKKyAgICAgICAgKiBodG1s L0hUTUxBcmVhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQXJlYUVsZW1lbnQ6 OmltYWdlRWxlbWVudCk6CisgICAgICAgICogaHRtbC9IVE1MTWFwRWxlbWVudC5oOgorICAgICAg ICAoV2ViQ29yZTo6aXNIVE1MTWFwRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjp0b0hUTUxN YXBFbGVtZW50KToKKwogMjAxMy0wNy0wMyAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxl LmNvbT4KIAogICAgICAgICBbV2luZG93c10gVW5yZXZpZXdlZCBidWlsZCBjb3JyZWN0aW9uIGFm dGVyIHIxNTI4My4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCmluZGV4IDZlMTY0ZjEwYTU1YzU1NGYyOTBl Mzk0NDBmYmM0NGNkNTM1ZjA0MjQuLjA1ZmQyMjlhZDYzMmNiMWE1OTE4YmMxZWY1Nzk5Mjg4MWIy ZWMwOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcApAQCAtMTczNSwxMSArMTczNSwxMiBAQCB2b2lk IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmdldERvY3VtZW50TGlua3MoQWNjZXNzaWJpbGl0 eUNoaWxkcmVuVmVjdG9yJiByZQogICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoYXhvYmop OwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgTm9kZSogcGFyZW50ID0gY3Vyci0+cGFy ZW50Tm9kZSgpOwotICAgICAgICAgICAgaWYgKHBhcmVudCAmJiBpc0hUTUxBcmVhRWxlbWVudChj dXJyKSAmJiBwYXJlbnQtPmhhc1RhZ05hbWUobWFwVGFnKSkgeworICAgICAgICAgICAgaWYgKHBh cmVudCAmJiBpc0hUTUxBcmVhRWxlbWVudChjdXJyKSAmJiBpc0hUTUxNYXBFbGVtZW50KHBhcmVu dCkpIHsKICAgICAgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5rKiBhcmVhT2Jq ZWN0ID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eUltYWdlTWFwTGluayo+KGF4T2JqZWN0Q2Fj aGUoKS0+Z2V0T3JDcmVhdGUoSW1hZ2VNYXBMaW5rUm9sZSkpOworICAgICAgICAgICAgICAgIEhU TUxNYXBFbGVtZW50KiBtYXAgPSB0b0hUTUxNYXBFbGVtZW50KHBhcmVudCk7CiAgICAgICAgICAg ICAgICAgYXJlYU9iamVjdC0+c2V0SFRNTEFyZWFFbGVtZW50KHRvSFRNTEFyZWFFbGVtZW50KGN1 cnIpKTsKLSAgICAgICAgICAgICAgICBhcmVhT2JqZWN0LT5zZXRIVE1MTWFwRWxlbWVudChzdGF0 aWNfY2FzdDxIVE1MTWFwRWxlbWVudCo+KHBhcmVudCkpOwotICAgICAgICAgICAgICAgIGFyZWFP YmplY3QtPnNldFBhcmVudChhY2Nlc3NpYmlsaXR5UGFyZW50Rm9ySW1hZ2VNYXAoc3RhdGljX2Nh c3Q8SFRNTE1hcEVsZW1lbnQqPihwYXJlbnQpKSk7CisgICAgICAgICAgICAgICAgYXJlYU9iamVj dC0+c2V0SFRNTE1hcEVsZW1lbnQobWFwKTsKKyAgICAgICAgICAgICAgICBhcmVhT2JqZWN0LT5z ZXRQYXJlbnQoYWNjZXNzaWJpbGl0eVBhcmVudEZvckltYWdlTWFwKG1hcCkpOwogCiAgICAgICAg ICAgICAgICAgcmVzdWx0LmFwcGVuZChhcmVhT2JqZWN0KTsKICAgICAgICAgICAgIH0KQEAgLTIx NTQsOCArMjE1NSw4IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3Q6OmFjY2Vzc2liaWxpdHlJbWFnZU1hcEhpdFRlc3QoSFRNCiAKICAgICBBY2Nlc3NpYmls aXR5T2JqZWN0KiBwYXJlbnQgPSAwOwogICAgIGZvciAoRWxlbWVudCogbWFwUGFyZW50ID0gYXJl YS0+cGFyZW50RWxlbWVudCgpOyBtYXBQYXJlbnQ7IG1hcFBhcmVudCA9IG1hcFBhcmVudC0+cGFy ZW50RWxlbWVudCgpKSB7Ci0gICAgICAgIGlmIChtYXBQYXJlbnQtPmhhc1RhZ05hbWUobWFwVGFn KSkgewotICAgICAgICAgICAgcGFyZW50ID0gYWNjZXNzaWJpbGl0eVBhcmVudEZvckltYWdlTWFw KHN0YXRpY19jYXN0PEhUTUxNYXBFbGVtZW50Kj4obWFwUGFyZW50KSk7CisgICAgICAgIGlmIChp c0hUTUxNYXBFbGVtZW50KG1hcFBhcmVudCkpIHsKKyAgICAgICAgICAgIHBhcmVudCA9IGFjY2Vz c2liaWxpdHlQYXJlbnRGb3JJbWFnZU1hcCh0b0hUTUxNYXBFbGVtZW50KG1hcFBhcmVudCkpOwog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnRPcmRlcmVkTWFwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudE9yZGVyZWRNYXAuY3BwCmluZGV4IDVmYWNhNDBiNTU3YzNmZWRjNmUzY2U2YjU4OGQw ODJhYTc3YTNhYTYuLjc4M2M5OWIwNWYwMzYzNzdlZGQwZGVlYjBhZmRlMjYyZGUyZTExZTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE9yZGVyZWRNYXAuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE9yZGVyZWRNYXAuY3BwCkBAIC01NSwxMiArNTUs MTIgQEAgaW5saW5lIGJvb2wga2V5TWF0Y2hlc05hbWUoQXRvbWljU3RyaW5nSW1wbCoga2V5LCBF bGVtZW50KiBlbGVtZW50KQogCiBpbmxpbmUgYm9vbCBrZXlNYXRjaGVzTWFwTmFtZShBdG9taWNT dHJpbmdJbXBsKiBrZXksIEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgcmV0dXJuIGVsZW1lbnQt Pmhhc1RhZ05hbWUobWFwVGFnKSAmJiBzdGF0aWNfY2FzdDxIVE1MTWFwRWxlbWVudCo+KGVsZW1l bnQpLT5nZXROYW1lKCkuaW1wbCgpID09IGtleTsKKyAgICByZXR1cm4gaXNIVE1MTWFwRWxlbWVu dChlbGVtZW50KSAmJiB0b0hUTUxNYXBFbGVtZW50KGVsZW1lbnQpLT5nZXROYW1lKCkuaW1wbCgp ID09IGtleTsKIH0KIAogaW5saW5lIGJvb2wga2V5TWF0Y2hlc0xvd2VyY2FzZWRNYXBOYW1lKEF0 b21pY1N0cmluZ0ltcGwqIGtleSwgRWxlbWVudCogZWxlbWVudCkKIHsKLSAgICByZXR1cm4gZWxl bWVudC0+aGFzVGFnTmFtZShtYXBUYWcpICYmIHN0YXRpY19jYXN0PEhUTUxNYXBFbGVtZW50Kj4o ZWxlbWVudCktPmdldE5hbWUoKS5sb3dlcigpLmltcGwoKSA9PSBrZXk7CisgICAgcmV0dXJuIGlz SFRNTE1hcEVsZW1lbnQoZWxlbWVudCkgJiYgdG9IVE1MTWFwRWxlbWVudChlbGVtZW50KS0+Z2V0 TmFtZSgpLmxvd2VyKCkuaW1wbCgpID09IGtleTsKIH0KIAogaW5saW5lIGJvb2wga2V5TWF0Y2hl c0xhYmVsRm9yQXR0cmlidXRlKEF0b21pY1N0cmluZ0ltcGwqIGtleSwgRWxlbWVudCogZWxlbWVu dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9UcmVlU2NvcGUuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL1RyZWVTY29wZS5jcHAKaW5kZXggMjg2NTJlYTdiNDNjMDgyZGY2OGY3ZTNj ZWNkNzNlZGQyNTllNDI5NS4uZWYwNzM4MTk1Y2RlZWNkOWFmODNjZDJiNjZhYjkwYmM4MjkxYzk0 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1RyZWVTY29wZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL1RyZWVTY29wZS5jcHAKQEAgLTIzOCw4ICsyMzgsOCBAQCBIVE1MTWFw RWxlbWVudCogVHJlZVNjb3BlOjpnZXRJbWFnZU1hcChjb25zdCBTdHJpbmcmIHVybCkgY29uc3QK ICAgICBzaXplX3QgaGFzaFBvcyA9IHVybC5maW5kKCcjJyk7CiAgICAgU3RyaW5nIG5hbWUgPSAo aGFzaFBvcyA9PSBub3RGb3VuZCA/IHVybCA6IHVybC5zdWJzdHJpbmcoaGFzaFBvcyArIDEpKS5p bXBsKCk7CiAgICAgaWYgKHJvb3ROb2RlKCktPmRvY3VtZW50KCktPmlzSFRNTERvY3VtZW50KCkp Ci0gICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxIVE1MTWFwRWxlbWVudCo+KG1faW1hZ2VNYXBz QnlOYW1lLT5nZXRFbGVtZW50QnlMb3dlcmNhc2VkTWFwTmFtZShBdG9taWNTdHJpbmcobmFtZS5s b3dlcigpKS5pbXBsKCksIHRoaXMpKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTE1hcEVs ZW1lbnQqPihtX2ltYWdlTWFwc0J5TmFtZS0+Z2V0RWxlbWVudEJ5TWFwTmFtZShBdG9taWNTdHJp bmcobmFtZSkuaW1wbCgpLCB0aGlzKSk7CisgICAgICAgIHJldHVybiB0b0hUTUxNYXBFbGVtZW50 KG1faW1hZ2VNYXBzQnlOYW1lLT5nZXRFbGVtZW50QnlMb3dlcmNhc2VkTWFwTmFtZShBdG9taWNT dHJpbmcobmFtZS5sb3dlcigpKS5pbXBsKCksIHRoaXMpKTsKKyAgICByZXR1cm4gdG9IVE1MTWFw RWxlbWVudChtX2ltYWdlTWFwc0J5TmFtZS0+Z2V0RWxlbWVudEJ5TWFwTmFtZShBdG9taWNTdHJp bmcobmFtZSkuaW1wbCgpLCB0aGlzKSk7CiB9CiAKIE5vZGUqIG5vZGVGcm9tUG9pbnQoRG9jdW1l bnQqIGRvY3VtZW50LCBpbnQgeCwgaW50IHksIExheW91dFBvaW50KiBsb2NhbFBvaW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MQXJlYUVsZW1lbnQuY3BwCmluZGV4IGJhNDA5MWY5ZTE5OWZmNjNk YTE0MDA2Mjk5Mzk4NTAzODYwZTdiMjMuLmY4ODJlNDA1MGY0NWNiZWMwOGNiOWY2OGIxYWM5NmZi NzZmY2JiZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFyZWFFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBcmVhRWxlbWVudC5jcHAKQEAgLTE4 NCwxMCArMTg0LDEwIEBAIFBhdGggSFRNTEFyZWFFbGVtZW50OjpnZXRSZWdpb24oY29uc3QgTGF5 b3V0U2l6ZSYgc2l6ZSkgY29uc3QKIEhUTUxJbWFnZUVsZW1lbnQqIEhUTUxBcmVhRWxlbWVudDo6 aW1hZ2VFbGVtZW50KCkgY29uc3QKIHsKICAgICBOb2RlKiBtYXBFbGVtZW50ID0gcGFyZW50Tm9k ZSgpOwotICAgIGlmICghbWFwRWxlbWVudCB8fCAhbWFwRWxlbWVudC0+aGFzVGFnTmFtZShtYXBU YWcpKQorICAgIGlmICghbWFwRWxlbWVudCB8fCAhaXNIVE1MTWFwRWxlbWVudChtYXBFbGVtZW50 KSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCi0gICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxN YXBFbGVtZW50Kj4obWFwRWxlbWVudCktPmltYWdlRWxlbWVudCgpOworICAgIHJldHVybiB0b0hU TUxNYXBFbGVtZW50KG1hcEVsZW1lbnQpLT5pbWFnZUVsZW1lbnQoKTsKIH0KIAogYm9vbCBIVE1M QXJlYUVsZW1lbnQ6OmlzS2V5Ym9hcmRGb2N1c2FibGUoS2V5Ym9hcmRFdmVudCopIGNvbnN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNYXBFbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNYXBFbGVtZW50LmgKaW5kZXggNGRkY2U2YTJmYzZmMmIxZDk5ZjY5 MjczMjNlNjMyY2I2ZGY4YjIyOC4uMjJiOGI0YTkxNTMwOTdiZGRjZjg3OTRjNjIyNjM3NTdiNzI0 YWVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWFwRWxlbWVudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1hcEVsZW1lbnQuaApAQCAtNTQsNiArNTQsMjIg QEAgcHJpdmF0ZToKICAgICBBdG9taWNTdHJpbmcgbV9uYW1lOwogfTsKIAoraW5saW5lIGJvb2wg aXNIVE1MTWFwRWxlbWVudChOb2RlKiBub2RlKQoreworICAgIHJldHVybiBub2RlLT5oYXNUYWdO YW1lKEhUTUxOYW1lczo6bWFwVGFnKTsKK30KKworaW5saW5lIGJvb2wgaXNIVE1MTWFwRWxlbWVu dChFbGVtZW50KiBlbGVtZW50KQoreworICAgIHJldHVybiBlbGVtZW50LT5oYXNUYWdOYW1lKEhU TUxOYW1lczo6bWFwVGFnKTsKK30KKworaW5saW5lIEhUTUxNYXBFbGVtZW50KiB0b0hUTUxNYXBF bGVtZW50KE5vZGUqIG5vZGUpCit7CisgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJ T04oIW5vZGUgfHwgaXNIVE1MTWFwRWxlbWVudChub2RlKSk7CisgICAgcmV0dXJuIHN0YXRpY19j YXN0PEhUTUxNYXBFbGVtZW50Kj4obm9kZSk7Cit9CisKIH0gLy9uYW1lc3BhY2UKIAogI2VuZGlm Cg==