118286 2013-07-02 01:32:13 -0700 is/toHTMLStyleElement should use Element* for its argument 2013-07-02 06:48:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kangil.han kangil.han commit-queue esprehn+autocc glenn kling koivisto macpherson menard oldest_to_newest 905289 0 kangil.han 2013-07-02 01:32:13 -0700 is/toHTMLStyleElement should use Element* for its argument 905290 1 205878 kangil.han 2013-07-02 01:35:14 -0700 Created attachment 205878 Patch 905291 2 kangil.han 2013-07-02 01:37:55 -0700 I would prefer gradual change of argument not to break bot. :) 905293 3 kangil.han 2013-07-02 01:42:32 -0700 For the record, this is a follow up patch for https://bugs.webkit.org/show_bug.cgi?id=118235#c2 905326 4 205878 kling 2013-07-02 04:22:32 -0700 Comment on attachment 205878 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205878&action=review > Source/WebCore/css/CSSStyleSheet.cpp:68 > - || isHTMLStyleElement(parentNode) > + || isHTMLStyleElement(toElement(parentNode)) Are we sure that 'parentNode' is always an Element at this point? > Source/WebCore/dom/Node.cpp:2536 > for (Node* child = firstChild(); child; child = child->nextSibling()) { > - if (isHTMLStyleElement(child) && toHTMLStyleElement(child)->isRegisteredAsScoped()) > + if (isHTMLStyleElement(toElement(child)) && toHTMLStyleElement(toElement(child))->isRegisteredAsScoped()) > count++; > } This looks wrong; you're calling toElement() on every child node, wouldn't this assert? Maybe we could rewrite this loop using ElementTraversal instead? Then you wouldn't need to worry about Nodes at all. 905345 5 205893 kangil.han 2013-07-02 05:04:17 -0700 Created attachment 205893 Patch 905347 6 kangil.han 2013-07-02 05:05:46 -0700 (In reply to comment #4) > > Source/WebCore/css/CSSStyleSheet.cpp:68 > > - || isHTMLStyleElement(parentNode) > > + || isHTMLStyleElement(toElement(parentNode)) > > Are we sure that 'parentNode' is always an Element at this point? > Done. > > Source/WebCore/dom/Node.cpp:2536 > > for (Node* child = firstChild(); child; child = child->nextSibling()) { > > - if (isHTMLStyleElement(child) && toHTMLStyleElement(child)->isRegisteredAsScoped()) > > + if (isHTMLStyleElement(toElement(child)) && toHTMLStyleElement(toElement(child))->isRegisteredAsScoped()) > > count++; > > } > > This looks wrong; you're calling toElement() on every child node, wouldn't this assert? > Maybe we could rewrite this loop using ElementTraversal instead? Then you wouldn't need to worry about Nodes at all. Done. Thx! :) 905349 7 205893 kling 2013-07-02 05:10:06 -0700 Comment on attachment 205893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205893&action=review r=me, but... > Source/WebCore/dom/Node.cpp:2539 > for (Node* child = firstChild(); child; child = child->nextSibling()) { > - if (isHTMLStyleElement(child) && toHTMLStyleElement(child)->isRegisteredAsScoped()) > - count++; > + if (child->isElementNode()) { > + Element* element = toElement(child); > + if (isHTMLStyleElement(element) && toHTMLStyleElement(element)->isRegisteredAsScoped()) > + count++; > + } > } You can simplify this loop by using ElementTraversal: for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::next(element, this)) { if (isHTMLStyleElement(element) && toHTMLStyleElement(element)->isRegisteredAsScoped()) count++; } 905354 8 kangil.han 2013-07-02 05:18:49 -0700 (In reply to comment #7) > > Source/WebCore/dom/Node.cpp:2539 > > for (Node* child = firstChild(); child; child = child->nextSibling()) { > > - if (isHTMLStyleElement(child) && toHTMLStyleElement(child)->isRegisteredAsScoped()) > > - count++; > > + if (child->isElementNode()) { > > + Element* element = toElement(child); > > + if (isHTMLStyleElement(element) && toHTMLStyleElement(element)->isRegisteredAsScoped()) > > + count++; > > + } > > } > > You can simplify this loop by using ElementTraversal: > > for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::next(element, this)) { > if (isHTMLStyleElement(element) && toHTMLStyleElement(element)->isRegisteredAsScoped()) > count++; > } Cool! I will try this! :) 905362 9 205896 kangil.han 2013-07-02 05:29:48 -0700 Created attachment 205896 Patch 905364 10 kangil.han 2013-07-02 05:31:45 -0700 (In reply to comment #7) > You can simplify this loop by using ElementTraversal: > > for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::next(element, this)) { > if (isHTMLStyleElement(element) && toHTMLStyleElement(element)->isRegisteredAsScoped()) > count++; > } Done! :) 905403 11 205896 commit-queue 2013-07-02 06:48:56 -0700 Comment on attachment 205896 Patch Clearing flags on attachment: 205896 Committed r152290: <http://trac.webkit.org/changeset/152290> 905404 12 commit-queue 2013-07-02 06:48:58 -0700 All reviewed patches have been landed. Closing bug. 205878 2013-07-02 01:35:14 -0700 2013-07-02 05:04:09 -0700 Patch bug-118286-20130702173321.patch text/plain 7210 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJmMDE1YjkxODQ4MGQ2 YmYzOWRlODM0ZDNmMTI3MGRiZDQ4M2QwNC4uODhkMzI1ODRlM2M1MTUyOWRlODc4Y2JmNTdjOGVm NGE2MzY1MjJhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA3LTAyICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBpcy90b0hUTUxTdHls ZUVsZW1lbnQgc2hvdWxkIHVzZSBFbGVtZW50KiBmb3IgaXRzIGFyZ3VtZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgyODYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyByZWR1Y2UgdW5uZWNlc3Nh cnkgY2FsbCBvZiBpc0VsZW1lbnROb2RlKCksIHRoaXMgcGF0Y2ggcmVwbGFjZXMgYXJndW1lbnQK KyAgICAgICAgb2YgaXMvdG9IVE1MU3R5bGVFbGVtZW50IGZyb20gTm9kZSogdG8gRWxlbWVudCou IFBsdXMsIHVzZSBFbGVtZW50OjpoYXNUYWdOYW1lCisgICAgICAgIGluIGNvbGxlY3RBY3RpdmVT dHlsZVNoZWV0cyBmdW5jdGlvbiBmb3IgbWlub3IgY29kZSByZWZhY3RvcmluZyBzaW5jZQorICAg ICAgICBpdHMgY29zdCBpcyBjaGVhcGVyIHRoYW4gTm9kZTo6aGFzVGFnTmFtZS4KKworICAgICAg ICAqIGNzcy9DU1NTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzQWNjZXB0YWJs ZUNTU1N0eWxlU2hlZXRQYXJlbnQpOgorICAgICAgICAqIGNzcy9TdHlsZVNjb3BlUmVzb2x2ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTY29wZVJlc29sdmVyOjpzY29wZUZvcik6Cisg ICAgICAgICogZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6Y29sbGVjdEFjdGl2ZVN0eWxl U2hlZXRzKToKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2Rl OjpudW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuKToKKyAgICAgICAgKiBodG1sL0hUTUxT dHlsZUVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OmlzSFRNTFN0eWxlRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjp0b0hUTUxTdHlsZUVsZW1lbnQpOgorCiAyMDEzLTA3LTAyICBDYXRh bGluIEJhZGVhICA8YmFkZWFAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1MtUmVnaW9uc10gT3Zl cnJpZGVMb2dpY2FsSGVpZ2h0IHVzZWQgYnkgYm90aCByZWdpb25zIGFuZCBmbGV4Ym94CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAKaW5kZXggODgxMWUzNzE2N2Q2NmEyYzk5MjhiZmFj MDQ5ODhkMGZhODZiZjhkZi4uMjg1Zjg5ZjM5ZTNiZDA0N2E0YjQ1MzgyYzdlY2Y0ODNmZmQxZjMz OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNoZWV0LmNwcApAQCAtNjUsNyArNjUsNyBAQCBz dGF0aWMgYm9vbCBpc0FjY2VwdGFibGVDU1NTdHlsZVNoZWV0UGFyZW50KE5vZGUqIHBhcmVudE5v ZGUpCiAgICAgcmV0dXJuICFwYXJlbnROb2RlCiAgICAgICAgIHx8IHBhcmVudE5vZGUtPmlzRG9j dW1lbnROb2RlKCkKICAgICAgICAgfHwgcGFyZW50Tm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6 OmxpbmtUYWcpCi0gICAgICAgIHx8IGlzSFRNTFN0eWxlRWxlbWVudChwYXJlbnROb2RlKQorICAg ICAgICB8fCBpc0hUTUxTdHlsZUVsZW1lbnQodG9FbGVtZW50KHBhcmVudE5vZGUpKQogI2lmIEVO QUJMRShTVkcpCiAgICAgICAgIHx8IHBhcmVudE5vZGUtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OnN0 eWxlVGFnKQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTY29w ZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNjb3BlUmVzb2x2ZXIuY3Bw CmluZGV4IGUzMjIxNTI0OTRjYzBhMjkwZTMzYzJiYTk0NmVjZTNlNDY4M2RiOGYuLjkwMzg4NTgy YzJmOWNlY2VkZDEwOTJhNWZhMjM4Njc4ODQ4MWExYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVNjb3BlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZVNjb3BlUmVzb2x2ZXIuY3BwCkBAIC02MCwxMCArNjAsMTAgQEAgY29uc3QgQ29udGFpbmVy Tm9kZSogU3R5bGVTY29wZVJlc29sdmVyOjpzY29wZUZvcihjb25zdCBDU1NTdHlsZVNoZWV0KiBz aGVldCkKICAgICBpZiAoIWRvY3VtZW50KQogICAgICAgICByZXR1cm4gMDsKICAgICBOb2RlKiBv d25lck5vZGUgPSBzaGVldC0+b3duZXJOb2RlKCk7Ci0gICAgaWYgKCFvd25lck5vZGUgfHwgIW93 bmVyTm9kZS0+aXNIVE1MRWxlbWVudCgpIHx8ICFpc0hUTUxTdHlsZUVsZW1lbnQob3duZXJOb2Rl KSkKKyAgICBpZiAoIW93bmVyTm9kZSB8fCAhb3duZXJOb2RlLT5pc0hUTUxFbGVtZW50KCkgfHwg IWlzSFRNTFN0eWxlRWxlbWVudCh0b0VsZW1lbnQob3duZXJOb2RlKSkpCiAgICAgICAgIHJldHVy biAwOwogCi0gICAgSFRNTFN0eWxlRWxlbWVudCogc3R5bGVFbGVtZW50ID0gdG9IVE1MU3R5bGVF bGVtZW50KG93bmVyTm9kZSk7CisgICAgSFRNTFN0eWxlRWxlbWVudCogc3R5bGVFbGVtZW50ID0g dG9IVE1MU3R5bGVFbGVtZW50KHRvRWxlbWVudChvd25lck5vZGUpKTsKICAgICBpZiAoIXN0eWxl RWxlbWVudC0+c2NvcGVkKCkpCiAgICAgICAgIHJldHVybiBzdHlsZUVsZW1lbnQtPmlzSW5TaGFk b3dUcmVlKCkgPyBzdHlsZUVsZW1lbnQtPmNvbnRhaW5pbmdTaGFkb3dSb290KCkgOiAwOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlv bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbi5j cHAKaW5kZXggNzY5OGZhNDQxZWM5MWUxMzBhNGE3ZDk2MTM1OGY0MGNmYTcxODliNi4uM2Y2NmIz NDI5NDkwY2FkNWM3ODRjN2YzZTliMmVjNDI0YTFmMDQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcApAQCAtMjk5LDcgKzI5 OSw3IEBAIHZvaWQgRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6Y29sbGVjdEFjdGl2ZVN0 eWxlU2hlZXRzKFZlY3RvcjxSZWZQdHI8U3R5bGVTCiAgICAgICAgICAgICBFbGVtZW50KiBlID0g dG9FbGVtZW50KG4pOwogICAgICAgICAgICAgQXRvbWljU3RyaW5nIHRpdGxlID0gZS0+Z2V0QXR0 cmlidXRlKHRpdGxlQXR0cik7CiAgICAgICAgICAgICBib29sIGVuYWJsZWRWaWFTY3JpcHQgPSBm YWxzZTsKLSAgICAgICAgICAgIGlmIChlLT5oYXNMb2NhbE5hbWUobGlua1RhZykpIHsKKyAgICAg ICAgICAgIGlmIChlLT5oYXNUYWdOYW1lKGxpbmtUYWcpKSB7CiAgICAgICAgICAgICAgICAgLy8g PExJTks+IGVsZW1lbnQKICAgICAgICAgICAgICAgICBIVE1MTGlua0VsZW1lbnQqIGxpbmtFbGVt ZW50ID0gc3RhdGljX2Nhc3Q8SFRNTExpbmtFbGVtZW50Kj4obik7CiAgICAgICAgICAgICAgICAg aWYgKGxpbmtFbGVtZW50LT5pc0Rpc2FibGVkKCkpCkBAIC0zMjIsMTUgKzMyMiwxNyBAQCB2b2lk IERvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb246OmNvbGxlY3RBY3RpdmVTdHlsZVNoZWV0cyhW ZWN0b3I8UmVmUHRyPFN0eWxlUwogICAgICAgICAgICAgLy8gR2V0IHRoZSBjdXJyZW50IHByZWZl cnJlZCBzdHlsZXNldC4gVGhpcyBpcyB0aGUKICAgICAgICAgICAgIC8vIHNldCBvZiBzaGVldHMg dGhhdCB3aWxsIGJlIGVuYWJsZWQuCiAjaWYgRU5BQkxFKFNWRykKLSAgICAgICAgICAgIGlmIChu LT5pc1NWR0VsZW1lbnQoKSAmJiBuLT5oYXNUYWdOYW1lKFNWR05hbWVzOjpzdHlsZVRhZykpCisg ICAgICAgICAgICBpZiAoZS0+aGFzVGFnTmFtZShTVkdOYW1lczo6c3R5bGVUYWcpKQogICAgICAg ICAgICAgICAgIHNoZWV0ID0gc3RhdGljX2Nhc3Q8U1ZHU3R5bGVFbGVtZW50Kj4obiktPnNoZWV0 KCk7CiAgICAgICAgICAgICBlbHNlCiAjZW5kaWYKLSAgICAgICAgICAgIGlmIChlLT5oYXNMb2Nh bE5hbWUobGlua1RhZykpCi0gICAgICAgICAgICAgICAgc2hlZXQgPSBzdGF0aWNfY2FzdDxIVE1M TGlua0VsZW1lbnQqPihuKS0+c2hlZXQoKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAg ICAgICAvLyA8U1RZTEU+IGVsZW1lbnQKLSAgICAgICAgICAgICAgICBzaGVldCA9IHRvSFRNTFN0 eWxlRWxlbWVudChuKS0+c2hlZXQoKTsKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBp ZiAoZS0+aGFzVGFnTmFtZShsaW5rVGFnKSkKKyAgICAgICAgICAgICAgICAgICAgc2hlZXQgPSBz dGF0aWNfY2FzdDxIVE1MTGlua0VsZW1lbnQqPihuKS0+c2hlZXQoKTsKKyAgICAgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgICAgIC8vIDxTVFlMRT4gZWxlbWVudAorICAgICAgICAg ICAgICAgICAgICBzaGVldCA9IHRvSFRNTFN0eWxlRWxlbWVudChlKS0+c2hlZXQoKTsKKyAgICAg ICAgICAgIH0KICAgICAgICAgICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGlzIHNoZWV0IGJlbG9u Z3MgdG8gYSBzdHlsZXNldAogICAgICAgICAgICAgLy8gKHRodXMgbWFraW5nIGl0IFBSRUZFUlJF RCBvciBBTFRFUk5BVEUgcmF0aGVyIHRoYW4KICAgICAgICAgICAgIC8vIFBFUlNJU1RFTlQpLgpA QCAtMzQyLDcgKzM0NCw3IEBAIHZvaWQgRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6Y29s bGVjdEFjdGl2ZVN0eWxlU2hlZXRzKFZlY3RvcjxSZWZQdHI8U3R5bGVTCiAgICAgICAgICAgICAg ICAgICAgIC8vIHdlIGFyZSBOT1QgYW4gYWx0ZXJuYXRlIHNoZWV0LCB0aGVuIGVzdGFibGlzaAog ICAgICAgICAgICAgICAgICAgICAvLyB1cyBhcyB0aGUgcHJlZmVycmVkIHNldC4gT3RoZXJ3aXNl LCBqdXN0IGlnbm9yZQogICAgICAgICAgICAgICAgICAgICAvLyB0aGlzIHNoZWV0LgotICAgICAg ICAgICAgICAgICAgICBpZiAoZS0+aGFzTG9jYWxOYW1lKHN0eWxlVGFnKSB8fCAhcmVsLmNvbnRh aW5zKCJhbHRlcm5hdGUiKSkKKyAgICAgICAgICAgICAgICAgICAgaWYgKGUtPmhhc1RhZ05hbWUo c3R5bGVUYWcpIHx8ICFyZWwuY29udGFpbnMoImFsdGVybmF0ZSIpKQogICAgICAgICAgICAgICAg ICAgICAgICAgbV9wcmVmZXJyZWRTdHlsZXNoZWV0U2V0TmFtZSA9IG1fc2VsZWN0ZWRTdHlsZXNo ZWV0U2V0TmFtZSA9IHRpdGxlOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBp ZiAodGl0bGUgIT0gbV9wcmVmZXJyZWRTdHlsZXNoZWV0U2V0TmFtZSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApp bmRleCA1YmU1ZDk2ZTdhNDRlMDhjOGExZTk1YTM5NDRjM2Q4YjRlZjNiYjIzLi4xY2M2Mzc2NWZk MGFiYmYzNTlmNjIwNDNlMTU1YWNmMjJhMjgzZWQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0yNTMx LDcgKzI1MzEsNyBAQCBzaXplX3QgTm9kZTo6bnVtYmVyT2ZTY29wZWRIVE1MU3R5bGVDaGlsZHJl bigpIGNvbnN0CiB7CiAgICAgc2l6ZV90IGNvdW50ID0gMDsKICAgICBmb3IgKE5vZGUqIGNoaWxk ID0gZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkgewot ICAgICAgICBpZiAoaXNIVE1MU3R5bGVFbGVtZW50KGNoaWxkKSAmJiB0b0hUTUxTdHlsZUVsZW1l bnQoY2hpbGQpLT5pc1JlZ2lzdGVyZWRBc1Njb3BlZCgpKQorICAgICAgICBpZiAoaXNIVE1MU3R5 bGVFbGVtZW50KHRvRWxlbWVudChjaGlsZCkpICYmIHRvSFRNTFN0eWxlRWxlbWVudCh0b0VsZW1l bnQoY2hpbGQpKS0+aXNSZWdpc3RlcmVkQXNTY29wZWQoKSkKICAgICAgICAgICAgIGNvdW50Kys7 CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1l bnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVudC5oCmluZGV4IDRjZmM4 NGVkYjIzY2VmZDA4ZWRjODIzZTAwYzM2YzcyZTBjMGUzNDkuLjE2NDg3ZDUyOTc5YTU0MzAyMGYw MjIzMWI3MzMwMjYyNmM0OWE5MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFN0eWxlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFN0eWxlRWxlbWVu dC5oCkBAIC05NywxNSArOTcsMTUgQEAgcHJpdmF0ZToKICAgICBTY29wZWRTdHlsZVJlZ2lzdHJh dGlvblN0YXRlIG1fc2NvcGVkU3R5bGVSZWdpc3RyYXRpb25TdGF0ZTsKIH07CiAKLWlubGluZSBi b29sIGlzSFRNTFN0eWxlRWxlbWVudChOb2RlKiBub2RlKQoraW5saW5lIGJvb2wgaXNIVE1MU3R5 bGVFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgcmV0dXJuIG5vZGUtPmhhc1RhZ05h bWUoSFRNTE5hbWVzOjpzdHlsZVRhZyk7CisgICAgcmV0dXJuIGVsZW1lbnQtPmhhc1RhZ05hbWUo SFRNTE5hbWVzOjpzdHlsZVRhZyk7CiB9CiAKLWlubGluZSBIVE1MU3R5bGVFbGVtZW50KiB0b0hU TUxTdHlsZUVsZW1lbnQoTm9kZSogbm9kZSkKK2lubGluZSBIVE1MU3R5bGVFbGVtZW50KiB0b0hU TUxTdHlsZUVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkKIHsKLSAgICBBU1NFUlRfV0lUSF9TRUNV UklUWV9JTVBMSUNBVElPTighbm9kZSB8fCBpc0hUTUxTdHlsZUVsZW1lbnQobm9kZSkpOwotICAg IHJldHVybiBzdGF0aWNfY2FzdDxIVE1MU3R5bGVFbGVtZW50Kj4obm9kZSk7CisgICAgQVNTRVJU X1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIWVsZW1lbnQgfHwgaXNIVE1MU3R5bGVFbGVtZW50 KGVsZW1lbnQpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTFN0eWxlRWxlbWVudCo+KGVs ZW1lbnQpOwogfQogCiB9IC8vbmFtZXNwYWNlCg== 205893 2013-07-02 05:04:17 -0700 2013-07-02 05:29:41 -0700 Patch bug-118286-20130702210224.patch text/plain 7391 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q1ZWQ2Y2M3NjMxMDA4 NGQ4ZTNjZTllYmNjOTJiZmZlODQzMDU1MS4uMjk0NzA2ZmUwNjZhNGM2NjkzNmFlNDBkNzJhYjQ0 M2JiNzZmMGU3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA3LTAyICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBpcy90b0hUTUxTdHls ZUVsZW1lbnQgc2hvdWxkIHVzZSBFbGVtZW50KiBmb3IgaXRzIGFyZ3VtZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgyODYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyByZWR1Y2UgdW5uZWNlc3Nh cnkgY2FsbCBvZiBpc0VsZW1lbnROb2RlKCksIHRoaXMgcGF0Y2ggcmVwbGFjZXMgYXJndW1lbnQK KyAgICAgICAgb2YgaXMvdG9IVE1MU3R5bGVFbGVtZW50IGZyb20gTm9kZSogdG8gRWxlbWVudCou IFBsdXMsIHVzZSBFbGVtZW50OjpoYXNUYWdOYW1lCisgICAgICAgIGluIGNvbGxlY3RBY3RpdmVT dHlsZVNoZWV0cyBmdW5jdGlvbiBmb3IgbWlub3IgY29kZSByZWZhY3RvcmluZyBzaW5jZQorICAg ICAgICBpdHMgY29zdCBpcyBjaGVhcGVyIHRoYW4gTm9kZTo6aGFzVGFnTmFtZS4KKworICAgICAg ICAqIGNzcy9DU1NTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzQWNjZXB0YWJs ZUNTU1N0eWxlU2hlZXRQYXJlbnQpOgorICAgICAgICAqIGNzcy9TdHlsZVNjb3BlUmVzb2x2ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTY29wZVJlc29sdmVyOjpzY29wZUZvcik6Cisg ICAgICAgICogZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6Y29sbGVjdEFjdGl2ZVN0eWxl U2hlZXRzKToKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2Rl OjpudW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuKToKKyAgICAgICAgKiBodG1sL0hUTUxT dHlsZUVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OmlzSFRNTFN0eWxlRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjp0b0hUTUxTdHlsZUVsZW1lbnQpOgorCiAyMDEzLTA3LTAyICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IGNhc3QtYWxp Z24gd2FybmluZ3MgaW4gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckdMLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuY3BwCmluZGV4IDg4MTFlMzcx NjdkNjZhMmM5OTI4YmZhYzA0OTg4ZDBmYTg2YmY4ZGYuLjExMGZmOGJjMDMyMTU1Y2MyNTgyZDUy NzZjNTVmNjM3NzU4YzZjNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAKQEAg LTY1LDcgKzY1LDcgQEAgc3RhdGljIGJvb2wgaXNBY2NlcHRhYmxlQ1NTU3R5bGVTaGVldFBhcmVu dChOb2RlKiBwYXJlbnROb2RlKQogICAgIHJldHVybiAhcGFyZW50Tm9kZQogICAgICAgICB8fCBw YXJlbnROb2RlLT5pc0RvY3VtZW50Tm9kZSgpCiAgICAgICAgIHx8IHBhcmVudE5vZGUtPmhhc1Rh Z05hbWUoSFRNTE5hbWVzOjpsaW5rVGFnKQotICAgICAgICB8fCBpc0hUTUxTdHlsZUVsZW1lbnQo cGFyZW50Tm9kZSkKKyAgICAgICAgfHwgKHBhcmVudE5vZGUtPmlzRWxlbWVudE5vZGUoKSAmJiBp c0hUTUxTdHlsZUVsZW1lbnQodG9FbGVtZW50KHBhcmVudE5vZGUpKSkKICNpZiBFTkFCTEUoU1ZH KQogICAgICAgICB8fCBwYXJlbnROb2RlLT5oYXNUYWdOYW1lKFNWR05hbWVzOjpzdHlsZVRhZykK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2NvcGVSZXNvbHZl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTY29wZVJlc29sdmVyLmNwcAppbmRleCBl MzIyMTUyNDk0Y2MwYTI5MGUzM2MyYmE5NDZlY2UzZTQ2ODNkYjhmLi45MDM4ODU4MmMyZjljZWNl ZGQxMDkyYTVmYTIzODY3ODg0ODFhMWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVTY29wZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTY29w ZVJlc29sdmVyLmNwcApAQCAtNjAsMTAgKzYwLDEwIEBAIGNvbnN0IENvbnRhaW5lck5vZGUqIFN0 eWxlU2NvcGVSZXNvbHZlcjo6c2NvcGVGb3IoY29uc3QgQ1NTU3R5bGVTaGVldCogc2hlZXQpCiAg ICAgaWYgKCFkb2N1bWVudCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgTm9kZSogb3duZXJOb2Rl ID0gc2hlZXQtPm93bmVyTm9kZSgpOwotICAgIGlmICghb3duZXJOb2RlIHx8ICFvd25lck5vZGUt PmlzSFRNTEVsZW1lbnQoKSB8fCAhaXNIVE1MU3R5bGVFbGVtZW50KG93bmVyTm9kZSkpCisgICAg aWYgKCFvd25lck5vZGUgfHwgIW93bmVyTm9kZS0+aXNIVE1MRWxlbWVudCgpIHx8ICFpc0hUTUxT dHlsZUVsZW1lbnQodG9FbGVtZW50KG93bmVyTm9kZSkpKQogICAgICAgICByZXR1cm4gMDsKIAot ICAgIEhUTUxTdHlsZUVsZW1lbnQqIHN0eWxlRWxlbWVudCA9IHRvSFRNTFN0eWxlRWxlbWVudChv d25lck5vZGUpOworICAgIEhUTUxTdHlsZUVsZW1lbnQqIHN0eWxlRWxlbWVudCA9IHRvSFRNTFN0 eWxlRWxlbWVudCh0b0VsZW1lbnQob3duZXJOb2RlKSk7CiAgICAgaWYgKCFzdHlsZUVsZW1lbnQt PnNjb3BlZCgpKQogICAgICAgICByZXR1cm4gc3R5bGVFbGVtZW50LT5pc0luU2hhZG93VHJlZSgp ID8gc3R5bGVFbGVtZW50LT5jb250YWluaW5nU2hhZG93Um9vdCgpIDogMDsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwCmluZGV4 IDc2OThmYTQ0MWVjOTFlMTMwYTRhN2Q5NjEzNThmNDBjZmE3MTg5YjYuLjNmNjZiMzQyOTQ5MGNh ZDVjNzg0YzdmM2U5YjJlYzQyNGExZjA0NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbi5jcHAKQEAgLTI5OSw3ICsyOTksNyBAQCB2 b2lkIERvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb246OmNvbGxlY3RBY3RpdmVTdHlsZVNoZWV0 cyhWZWN0b3I8UmVmUHRyPFN0eWxlUwogICAgICAgICAgICAgRWxlbWVudCogZSA9IHRvRWxlbWVu dChuKTsKICAgICAgICAgICAgIEF0b21pY1N0cmluZyB0aXRsZSA9IGUtPmdldEF0dHJpYnV0ZSh0 aXRsZUF0dHIpOwogICAgICAgICAgICAgYm9vbCBlbmFibGVkVmlhU2NyaXB0ID0gZmFsc2U7Ci0g ICAgICAgICAgICBpZiAoZS0+aGFzTG9jYWxOYW1lKGxpbmtUYWcpKSB7CisgICAgICAgICAgICBp ZiAoZS0+aGFzVGFnTmFtZShsaW5rVGFnKSkgewogICAgICAgICAgICAgICAgIC8vIDxMSU5LPiBl bGVtZW50CiAgICAgICAgICAgICAgICAgSFRNTExpbmtFbGVtZW50KiBsaW5rRWxlbWVudCA9IHN0 YXRpY19jYXN0PEhUTUxMaW5rRWxlbWVudCo+KG4pOwogICAgICAgICAgICAgICAgIGlmIChsaW5r RWxlbWVudC0+aXNEaXNhYmxlZCgpKQpAQCAtMzIyLDE1ICszMjIsMTcgQEAgdm9pZCBEb2N1bWVu dFN0eWxlU2hlZXRDb2xsZWN0aW9uOjpjb2xsZWN0QWN0aXZlU3R5bGVTaGVldHMoVmVjdG9yPFJl ZlB0cjxTdHlsZVMKICAgICAgICAgICAgIC8vIEdldCB0aGUgY3VycmVudCBwcmVmZXJyZWQgc3R5 bGVzZXQuIFRoaXMgaXMgdGhlCiAgICAgICAgICAgICAvLyBzZXQgb2Ygc2hlZXRzIHRoYXQgd2ls bCBiZSBlbmFibGVkLgogI2lmIEVOQUJMRShTVkcpCi0gICAgICAgICAgICBpZiAobi0+aXNTVkdF bGVtZW50KCkgJiYgbi0+aGFzVGFnTmFtZShTVkdOYW1lczo6c3R5bGVUYWcpKQorICAgICAgICAg ICAgaWYgKGUtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OnN0eWxlVGFnKSkKICAgICAgICAgICAgICAg ICBzaGVldCA9IHN0YXRpY19jYXN0PFNWR1N0eWxlRWxlbWVudCo+KG4pLT5zaGVldCgpOwogICAg ICAgICAgICAgZWxzZQogI2VuZGlmCi0gICAgICAgICAgICBpZiAoZS0+aGFzTG9jYWxOYW1lKGxp bmtUYWcpKQotICAgICAgICAgICAgICAgIHNoZWV0ID0gc3RhdGljX2Nhc3Q8SFRNTExpbmtFbGVt ZW50Kj4obiktPnNoZWV0KCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgLy8g PFNUWUxFPiBlbGVtZW50Ci0gICAgICAgICAgICAgICAgc2hlZXQgPSB0b0hUTUxTdHlsZUVsZW1l bnQobiktPnNoZWV0KCk7CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKGUtPmhh c1RhZ05hbWUobGlua1RhZykpCisgICAgICAgICAgICAgICAgICAgIHNoZWV0ID0gc3RhdGljX2Nh c3Q8SFRNTExpbmtFbGVtZW50Kj4obiktPnNoZWV0KCk7CisgICAgICAgICAgICAgICAgZWxzZQor ICAgICAgICAgICAgICAgICAgICAvLyA8U1RZTEU+IGVsZW1lbnQKKyAgICAgICAgICAgICAgICAg ICAgc2hlZXQgPSB0b0hUTUxTdHlsZUVsZW1lbnQoZSktPnNoZWV0KCk7CisgICAgICAgICAgICB9 CiAgICAgICAgICAgICAvLyBDaGVjayB0byBzZWUgaWYgdGhpcyBzaGVldCBiZWxvbmdzIHRvIGEg c3R5bGVzZXQKICAgICAgICAgICAgIC8vICh0aHVzIG1ha2luZyBpdCBQUkVGRVJSRUQgb3IgQUxU RVJOQVRFIHJhdGhlciB0aGFuCiAgICAgICAgICAgICAvLyBQRVJTSVNURU5UKS4KQEAgLTM0Miw3 ICszNDQsNyBAQCB2b2lkIERvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb246OmNvbGxlY3RBY3Rp dmVTdHlsZVNoZWV0cyhWZWN0b3I8UmVmUHRyPFN0eWxlUwogICAgICAgICAgICAgICAgICAgICAv LyB3ZSBhcmUgTk9UIGFuIGFsdGVybmF0ZSBzaGVldCwgdGhlbiBlc3RhYmxpc2gKICAgICAgICAg ICAgICAgICAgICAgLy8gdXMgYXMgdGhlIHByZWZlcnJlZCBzZXQuIE90aGVyd2lzZSwganVzdCBp Z25vcmUKICAgICAgICAgICAgICAgICAgICAgLy8gdGhpcyBzaGVldC4KLSAgICAgICAgICAgICAg ICAgICAgaWYgKGUtPmhhc0xvY2FsTmFtZShzdHlsZVRhZykgfHwgIXJlbC5jb250YWlucygiYWx0 ZXJuYXRlIikpCisgICAgICAgICAgICAgICAgICAgIGlmIChlLT5oYXNUYWdOYW1lKHN0eWxlVGFn KSB8fCAhcmVsLmNvbnRhaW5zKCJhbHRlcm5hdGUiKSkKICAgICAgICAgICAgICAgICAgICAgICAg IG1fcHJlZmVycmVkU3R5bGVzaGVldFNldE5hbWUgPSBtX3NlbGVjdGVkU3R5bGVzaGVldFNldE5h bWUgPSB0aXRsZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKHRpdGxl ICE9IG1fcHJlZmVycmVkU3R5bGVzaGVldFNldE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggNWJl NWQ5NmU3YTQ0ZTA4YzhhMWU5NWEzOTQ0YzNkOGI0ZWYzYmIyMy4uZjBlZjFkMmI5NWQyYzhjMWIy NTI3YzEyY2U4NTc5ZDM2ZDkzMmU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMjUzMSw4ICsyNTMx LDExIEBAIHNpemVfdCBOb2RlOjpudW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuKCkgY29u c3QKIHsKICAgICBzaXplX3QgY291bnQgPSAwOwogICAgIGZvciAoTm9kZSogY2hpbGQgPSBmaXJz dENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAg IGlmIChpc0hUTUxTdHlsZUVsZW1lbnQoY2hpbGQpICYmIHRvSFRNTFN0eWxlRWxlbWVudChjaGls ZCktPmlzUmVnaXN0ZXJlZEFzU2NvcGVkKCkpCi0gICAgICAgICAgICBjb3VudCsrOworICAgICAg ICBpZiAoY2hpbGQtPmlzRWxlbWVudE5vZGUoKSkgeworICAgICAgICAgICAgRWxlbWVudCogZWxl bWVudCA9IHRvRWxlbWVudChjaGlsZCk7CisgICAgICAgICAgICBpZiAoaXNIVE1MU3R5bGVFbGVt ZW50KGVsZW1lbnQpICYmIHRvSFRNTFN0eWxlRWxlbWVudChlbGVtZW50KS0+aXNSZWdpc3RlcmVk QXNTY29wZWQoKSkKKyAgICAgICAgICAgICAgICBjb3VudCsrOworICAgICAgICB9CiAgICAgfQog CiAgICAgcmV0dXJuIGNvdW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M U3R5bGVFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaApp bmRleCA0Y2ZjODRlZGIyM2NlZmQwOGVkYzgyM2UwMGMzNmM3MmUwYzBlMzQ5Li4xNjQ4N2Q1Mjk3 OWE1NDMwMjBmMDIyMzFiNzMzMDI2MjZjNDlhOTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxT dHlsZUVsZW1lbnQuaApAQCAtOTcsMTUgKzk3LDE1IEBAIHByaXZhdGU6CiAgICAgU2NvcGVkU3R5 bGVSZWdpc3RyYXRpb25TdGF0ZSBtX3Njb3BlZFN0eWxlUmVnaXN0cmF0aW9uU3RhdGU7CiB9Owog Ci1pbmxpbmUgYm9vbCBpc0hUTUxTdHlsZUVsZW1lbnQoTm9kZSogbm9kZSkKK2lubGluZSBib29s IGlzSFRNTFN0eWxlRWxlbWVudChFbGVtZW50KiBlbGVtZW50KQogewotICAgIHJldHVybiBub2Rl LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6c3R5bGVUYWcpOworICAgIHJldHVybiBlbGVtZW50LT5o YXNUYWdOYW1lKEhUTUxOYW1lczo6c3R5bGVUYWcpOwogfQogCi1pbmxpbmUgSFRNTFN0eWxlRWxl bWVudCogdG9IVE1MU3R5bGVFbGVtZW50KE5vZGUqIG5vZGUpCitpbmxpbmUgSFRNTFN0eWxlRWxl bWVudCogdG9IVE1MU3R5bGVFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgQVNTRVJU X1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIW5vZGUgfHwgaXNIVE1MU3R5bGVFbGVtZW50KG5v ZGUpKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTFN0eWxlRWxlbWVudCo+KG5vZGUpOwor ICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFlbGVtZW50IHx8IGlzSFRNTFN0 eWxlRWxlbWVudChlbGVtZW50KSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEhUTUxTdHlsZUVs ZW1lbnQqPihlbGVtZW50KTsKIH0KIAogfSAvL25hbWVzcGFjZQo= 205896 2013-07-02 05:29:48 -0700 2013-07-02 06:48:56 -0700 Patch bug-118286-20130702212755.patch text/plain 7412 kangil.han U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q1ZWQ2Y2M3NjMxMDA4 NGQ4ZTNjZTllYmNjOTJiZmZlODQzMDU1MS4uMjk0NzA2ZmUwNjZhNGM2NjkzNmFlNDBkNzJhYjQ0 M2JiNzZmMGU3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA3LTAyICBLYW5n aWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNvbT4KKworICAgICAgICBpcy90b0hUTUxTdHls ZUVsZW1lbnQgc2hvdWxkIHVzZSBFbGVtZW50KiBmb3IgaXRzIGFyZ3VtZW50CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgyODYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyByZWR1Y2UgdW5uZWNlc3Nh cnkgY2FsbCBvZiBpc0VsZW1lbnROb2RlKCksIHRoaXMgcGF0Y2ggcmVwbGFjZXMgYXJndW1lbnQK KyAgICAgICAgb2YgaXMvdG9IVE1MU3R5bGVFbGVtZW50IGZyb20gTm9kZSogdG8gRWxlbWVudCou IFBsdXMsIHVzZSBFbGVtZW50OjpoYXNUYWdOYW1lCisgICAgICAgIGluIGNvbGxlY3RBY3RpdmVT dHlsZVNoZWV0cyBmdW5jdGlvbiBmb3IgbWlub3IgY29kZSByZWZhY3RvcmluZyBzaW5jZQorICAg ICAgICBpdHMgY29zdCBpcyBjaGVhcGVyIHRoYW4gTm9kZTo6aGFzVGFnTmFtZS4KKworICAgICAg ICAqIGNzcy9DU1NTdHlsZVNoZWV0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzQWNjZXB0YWJs ZUNTU1N0eWxlU2hlZXRQYXJlbnQpOgorICAgICAgICAqIGNzcy9TdHlsZVNjb3BlUmVzb2x2ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTY29wZVJlc29sdmVyOjpzY29wZUZvcik6Cisg ICAgICAgICogZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6Y29sbGVjdEFjdGl2ZVN0eWxl U2hlZXRzKToKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2Rl OjpudW1iZXJPZlNjb3BlZEhUTUxTdHlsZUNoaWxkcmVuKToKKyAgICAgICAgKiBodG1sL0hUTUxT dHlsZUVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OmlzSFRNTFN0eWxlRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjp0b0hUTUxTdHlsZUVsZW1lbnQpOgorCiAyMDEzLTA3LTAyICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IGNhc3QtYWxp Z24gd2FybmluZ3MgaW4gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckdMLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2hlZXQuY3BwCmluZGV4IDg4MTFlMzcx NjdkNjZhMmM5OTI4YmZhYzA0OTg4ZDBmYTg2YmY4ZGYuLjExMGZmOGJjMDMyMTU1Y2MyNTgyZDUy NzZjNTVmNjM3NzU4YzZjNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNoZWV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTaGVldC5jcHAKQEAg LTY1LDcgKzY1LDcgQEAgc3RhdGljIGJvb2wgaXNBY2NlcHRhYmxlQ1NTU3R5bGVTaGVldFBhcmVu dChOb2RlKiBwYXJlbnROb2RlKQogICAgIHJldHVybiAhcGFyZW50Tm9kZQogICAgICAgICB8fCBw YXJlbnROb2RlLT5pc0RvY3VtZW50Tm9kZSgpCiAgICAgICAgIHx8IHBhcmVudE5vZGUtPmhhc1Rh Z05hbWUoSFRNTE5hbWVzOjpsaW5rVGFnKQotICAgICAgICB8fCBpc0hUTUxTdHlsZUVsZW1lbnQo cGFyZW50Tm9kZSkKKyAgICAgICAgfHwgKHBhcmVudE5vZGUtPmlzRWxlbWVudE5vZGUoKSAmJiBp c0hUTUxTdHlsZUVsZW1lbnQodG9FbGVtZW50KHBhcmVudE5vZGUpKSkKICNpZiBFTkFCTEUoU1ZH KQogICAgICAgICB8fCBwYXJlbnROb2RlLT5oYXNUYWdOYW1lKFNWR05hbWVzOjpzdHlsZVRhZykK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2NvcGVSZXNvbHZl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTY29wZVJlc29sdmVyLmNwcAppbmRleCBl MzIyMTUyNDk0Y2MwYTI5MGUzM2MyYmE5NDZlY2UzZTQ2ODNkYjhmLi45MDM4ODU4MmMyZjljZWNl ZGQxMDkyYTVmYTIzODY3ODg0ODFhMWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVTY29wZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTY29w ZVJlc29sdmVyLmNwcApAQCAtNjAsMTAgKzYwLDEwIEBAIGNvbnN0IENvbnRhaW5lck5vZGUqIFN0 eWxlU2NvcGVSZXNvbHZlcjo6c2NvcGVGb3IoY29uc3QgQ1NTU3R5bGVTaGVldCogc2hlZXQpCiAg ICAgaWYgKCFkb2N1bWVudCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgTm9kZSogb3duZXJOb2Rl ID0gc2hlZXQtPm93bmVyTm9kZSgpOwotICAgIGlmICghb3duZXJOb2RlIHx8ICFvd25lck5vZGUt PmlzSFRNTEVsZW1lbnQoKSB8fCAhaXNIVE1MU3R5bGVFbGVtZW50KG93bmVyTm9kZSkpCisgICAg aWYgKCFvd25lck5vZGUgfHwgIW93bmVyTm9kZS0+aXNIVE1MRWxlbWVudCgpIHx8ICFpc0hUTUxT dHlsZUVsZW1lbnQodG9FbGVtZW50KG93bmVyTm9kZSkpKQogICAgICAgICByZXR1cm4gMDsKIAot ICAgIEhUTUxTdHlsZUVsZW1lbnQqIHN0eWxlRWxlbWVudCA9IHRvSFRNTFN0eWxlRWxlbWVudChv d25lck5vZGUpOworICAgIEhUTUxTdHlsZUVsZW1lbnQqIHN0eWxlRWxlbWVudCA9IHRvSFRNTFN0 eWxlRWxlbWVudCh0b0VsZW1lbnQob3duZXJOb2RlKSk7CiAgICAgaWYgKCFzdHlsZUVsZW1lbnQt PnNjb3BlZCgpKQogICAgICAgICByZXR1cm4gc3R5bGVFbGVtZW50LT5pc0luU2hhZG93VHJlZSgp ID8gc3R5bGVFbGVtZW50LT5jb250YWluaW5nU2hhZG93Um9vdCgpIDogMDsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwCmluZGV4 IDc2OThmYTQ0MWVjOTFlMTMwYTRhN2Q5NjEzNThmNDBjZmE3MTg5YjYuLjNmNjZiMzQyOTQ5MGNh ZDVjNzg0YzdmM2U5YjJlYzQyNGExZjA0NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbi5jcHAKQEAgLTI5OSw3ICsyOTksNyBAQCB2 b2lkIERvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb246OmNvbGxlY3RBY3RpdmVTdHlsZVNoZWV0 cyhWZWN0b3I8UmVmUHRyPFN0eWxlUwogICAgICAgICAgICAgRWxlbWVudCogZSA9IHRvRWxlbWVu dChuKTsKICAgICAgICAgICAgIEF0b21pY1N0cmluZyB0aXRsZSA9IGUtPmdldEF0dHJpYnV0ZSh0 aXRsZUF0dHIpOwogICAgICAgICAgICAgYm9vbCBlbmFibGVkVmlhU2NyaXB0ID0gZmFsc2U7Ci0g ICAgICAgICAgICBpZiAoZS0+aGFzTG9jYWxOYW1lKGxpbmtUYWcpKSB7CisgICAgICAgICAgICBp ZiAoZS0+aGFzVGFnTmFtZShsaW5rVGFnKSkgewogICAgICAgICAgICAgICAgIC8vIDxMSU5LPiBl bGVtZW50CiAgICAgICAgICAgICAgICAgSFRNTExpbmtFbGVtZW50KiBsaW5rRWxlbWVudCA9IHN0 YXRpY19jYXN0PEhUTUxMaW5rRWxlbWVudCo+KG4pOwogICAgICAgICAgICAgICAgIGlmIChsaW5r RWxlbWVudC0+aXNEaXNhYmxlZCgpKQpAQCAtMzIyLDE1ICszMjIsMTcgQEAgdm9pZCBEb2N1bWVu dFN0eWxlU2hlZXRDb2xsZWN0aW9uOjpjb2xsZWN0QWN0aXZlU3R5bGVTaGVldHMoVmVjdG9yPFJl ZlB0cjxTdHlsZVMKICAgICAgICAgICAgIC8vIEdldCB0aGUgY3VycmVudCBwcmVmZXJyZWQgc3R5 bGVzZXQuIFRoaXMgaXMgdGhlCiAgICAgICAgICAgICAvLyBzZXQgb2Ygc2hlZXRzIHRoYXQgd2ls bCBiZSBlbmFibGVkLgogI2lmIEVOQUJMRShTVkcpCi0gICAgICAgICAgICBpZiAobi0+aXNTVkdF bGVtZW50KCkgJiYgbi0+aGFzVGFnTmFtZShTVkdOYW1lczo6c3R5bGVUYWcpKQorICAgICAgICAg ICAgaWYgKGUtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OnN0eWxlVGFnKSkKICAgICAgICAgICAgICAg ICBzaGVldCA9IHN0YXRpY19jYXN0PFNWR1N0eWxlRWxlbWVudCo+KG4pLT5zaGVldCgpOwogICAg ICAgICAgICAgZWxzZQogI2VuZGlmCi0gICAgICAgICAgICBpZiAoZS0+aGFzTG9jYWxOYW1lKGxp bmtUYWcpKQotICAgICAgICAgICAgICAgIHNoZWV0ID0gc3RhdGljX2Nhc3Q8SFRNTExpbmtFbGVt ZW50Kj4obiktPnNoZWV0KCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgLy8g PFNUWUxFPiBlbGVtZW50Ci0gICAgICAgICAgICAgICAgc2hlZXQgPSB0b0hUTUxTdHlsZUVsZW1l bnQobiktPnNoZWV0KCk7CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKGUtPmhh c1RhZ05hbWUobGlua1RhZykpCisgICAgICAgICAgICAgICAgICAgIHNoZWV0ID0gc3RhdGljX2Nh c3Q8SFRNTExpbmtFbGVtZW50Kj4obiktPnNoZWV0KCk7CisgICAgICAgICAgICAgICAgZWxzZQor ICAgICAgICAgICAgICAgICAgICAvLyA8U1RZTEU+IGVsZW1lbnQKKyAgICAgICAgICAgICAgICAg ICAgc2hlZXQgPSB0b0hUTUxTdHlsZUVsZW1lbnQoZSktPnNoZWV0KCk7CisgICAgICAgICAgICB9 CiAgICAgICAgICAgICAvLyBDaGVjayB0byBzZWUgaWYgdGhpcyBzaGVldCBiZWxvbmdzIHRvIGEg c3R5bGVzZXQKICAgICAgICAgICAgIC8vICh0aHVzIG1ha2luZyBpdCBQUkVGRVJSRUQgb3IgQUxU RVJOQVRFIHJhdGhlciB0aGFuCiAgICAgICAgICAgICAvLyBQRVJTSVNURU5UKS4KQEAgLTM0Miw3 ICszNDQsNyBAQCB2b2lkIERvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb246OmNvbGxlY3RBY3Rp dmVTdHlsZVNoZWV0cyhWZWN0b3I8UmVmUHRyPFN0eWxlUwogICAgICAgICAgICAgICAgICAgICAv LyB3ZSBhcmUgTk9UIGFuIGFsdGVybmF0ZSBzaGVldCwgdGhlbiBlc3RhYmxpc2gKICAgICAgICAg ICAgICAgICAgICAgLy8gdXMgYXMgdGhlIHByZWZlcnJlZCBzZXQuIE90aGVyd2lzZSwganVzdCBp Z25vcmUKICAgICAgICAgICAgICAgICAgICAgLy8gdGhpcyBzaGVldC4KLSAgICAgICAgICAgICAg ICAgICAgaWYgKGUtPmhhc0xvY2FsTmFtZShzdHlsZVRhZykgfHwgIXJlbC5jb250YWlucygiYWx0 ZXJuYXRlIikpCisgICAgICAgICAgICAgICAgICAgIGlmIChlLT5oYXNUYWdOYW1lKHN0eWxlVGFn KSB8fCAhcmVsLmNvbnRhaW5zKCJhbHRlcm5hdGUiKSkKICAgICAgICAgICAgICAgICAgICAgICAg IG1fcHJlZmVycmVkU3R5bGVzaGVldFNldE5hbWUgPSBtX3NlbGVjdGVkU3R5bGVzaGVldFNldE5h bWUgPSB0aXRsZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgaWYgKHRpdGxl ICE9IG1fcHJlZmVycmVkU3R5bGVzaGVldFNldE5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggNWJl NWQ5NmU3YTQ0ZTA4YzhhMWU5NWEzOTQ0YzNkOGI0ZWYzYmIyMy4uNTNlMWJiZDY5M2ZiMzA1MTVi ZDQ0YjEyZjA3OWYzYTk2NDQ5YmI5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMjUzMCw4ICsyNTMw LDggQEAgdm9pZCBOb2RlOjp1bnJlZ2lzdGVyU2NvcGVkSFRNTFN0eWxlQ2hpbGQoKQogc2l6ZV90 IE5vZGU6Om51bWJlck9mU2NvcGVkSFRNTFN0eWxlQ2hpbGRyZW4oKSBjb25zdAogewogICAgIHNp emVfdCBjb3VudCA9IDA7Ci0gICAgZm9yIChOb2RlKiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hp bGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgaWYgKGlzSFRNTFN0 eWxlRWxlbWVudChjaGlsZCkgJiYgdG9IVE1MU3R5bGVFbGVtZW50KGNoaWxkKS0+aXNSZWdpc3Rl cmVkQXNTY29wZWQoKSkKKyAgICBmb3IgKEVsZW1lbnQqIGVsZW1lbnQgPSBFbGVtZW50VHJhdmVy c2FsOjpmaXJzdFdpdGhpbih0aGlzKTsgZWxlbWVudDsgZWxlbWVudCA9IEVsZW1lbnRUcmF2ZXJz YWw6Om5leHQoZWxlbWVudCwgdGhpcykpIHsKKyAgICAgICAgaWYgKGlzSFRNTFN0eWxlRWxlbWVu dChlbGVtZW50KSAmJiB0b0hUTUxTdHlsZUVsZW1lbnQoZWxlbWVudCktPmlzUmVnaXN0ZXJlZEFz U2NvcGVkKCkpCiAgICAgICAgICAgICBjb3VudCsrOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MU3R5bGVFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxTdHlsZUVsZW1lbnQuaAppbmRleCA0Y2ZjODRlZGIyM2NlZmQwOGVkYzgyM2UwMGMzNmM3 MmUwYzBlMzQ5Li4xNjQ4N2Q1Mjk3OWE1NDMwMjBmMDIyMzFiNzMzMDI2MjZjNDlhOTJkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxTdHlsZUVsZW1lbnQuaApAQCAtOTcsMTUgKzk3LDE1IEBAIHBy aXZhdGU6CiAgICAgU2NvcGVkU3R5bGVSZWdpc3RyYXRpb25TdGF0ZSBtX3Njb3BlZFN0eWxlUmVn aXN0cmF0aW9uU3RhdGU7CiB9OwogCi1pbmxpbmUgYm9vbCBpc0hUTUxTdHlsZUVsZW1lbnQoTm9k ZSogbm9kZSkKK2lubGluZSBib29sIGlzSFRNTFN0eWxlRWxlbWVudChFbGVtZW50KiBlbGVtZW50 KQogewotICAgIHJldHVybiBub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6c3R5bGVUYWcpOwor ICAgIHJldHVybiBlbGVtZW50LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6c3R5bGVUYWcpOwogfQog Ci1pbmxpbmUgSFRNTFN0eWxlRWxlbWVudCogdG9IVE1MU3R5bGVFbGVtZW50KE5vZGUqIG5vZGUp CitpbmxpbmUgSFRNTFN0eWxlRWxlbWVudCogdG9IVE1MU3R5bGVFbGVtZW50KEVsZW1lbnQqIGVs ZW1lbnQpCiB7Ci0gICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIW5vZGUgfHwg aXNIVE1MU3R5bGVFbGVtZW50KG5vZGUpKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SFRNTFN0 eWxlRWxlbWVudCo+KG5vZGUpOworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9O KCFlbGVtZW50IHx8IGlzSFRNTFN0eWxlRWxlbWVudChlbGVtZW50KSk7CisgICAgcmV0dXJuIHN0 YXRpY19jYXN0PEhUTUxTdHlsZUVsZW1lbnQqPihlbGVtZW50KTsKIH0KIAogfSAvL25hbWVzcGFj ZQo=