103243 2012-11-26 04:50:59 -0800 [EFL][WK2] Don't use the C API internally in ewk_cookie_manager 2012-12-05 18:39:22 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jinwoo7.song jinwoo7.song gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 775362 0 jinwoo7.song 2012-11-26 04:50:59 -0800 Used the C++ classes directly instead of the C API wrappers to avoid a lot of toImpl/toAPI casts. 775365 1 175972 jinwoo7.song 2012-11-26 04:54:22 -0800 Created attachment 175972 Patch 783204 2 175972 gyuyoung.kim 2012-12-04 18:06:44 -0800 Comment on attachment 175972 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175972&action=review > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h:78 > + PassRefPtr<WebKit::WebCookieManagerProxy> m_cookieManager; Why do you use PassRefPtr instead of RefPtr ? If m_cookieManager based on PassRefPtr is assigned by other variables, m_cookieManager will be null. Beside WebKit recommends to use PassRefPtr only for function argument and result types, copying arguments into RefPtr local variables. http://www.webkit.org/coding/RefPtr.html 783434 3 175972 mikhail.pozdnyakov 2012-12-04 23:32:13 -0800 Comment on attachment 175972 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175972&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:137 > + m_cookieManager = Ewk_Cookie_Manager::create(m_context.get()->cookieManagerProxy()); just m_context->cookieManagerProxy() > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:43 > + : m_cookieManager(cookieManager.get()) .get not needed > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:56 > + m_cookieManager.get()->stopObservingCookieChanges(); .get() not needed > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:63 > + m_cookieManager.get()->stopObservingCookieChanges(); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:68 > + m_cookieManager.get()->startObservingCookieChanges(); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:73 > + m_cookieManager.get()->setHTTPCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy)); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:78 > + m_cookieManager.get()->deleteCookiesForHostname(hostname); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:83 > + m_cookieManager.get()->deleteAllCookies(); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:91 > + m_cookieManager.get()->startObservingCookieChanges(); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:93 > + m_cookieManager.get()->stopObservingCookieChanges(); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:103 > + m_cookieManager.get()->getHostnamesWithCookies(ArrayCallback::create(userData, callback)); ditto > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:108 > + m_cookieManager.get()->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyCallback::create(userData, callback)); ditto >> Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h:78 >> + PassRefPtr<WebKit::WebCookieManagerProxy> m_cookieManager; > > Why do you use PassRefPtr instead of RefPtr ? If m_cookieManager based on PassRefPtr is assigned by other variables, m_cookieManager will be null. Beside WebKit recommends to use PassRefPtr only for function argument and result types, copying arguments into RefPtr local variables. > > http://www.webkit.org/coding/RefPtr.html Exactly! you must use RefPtr here! 783526 4 175972 jinwoo7.song 2012-12-05 01:45:09 -0800 Comment on attachment 175972 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175972&action=review >>> Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager_private.h:78 >>> + PassRefPtr<WebKit::WebCookieManagerProxy> m_cookieManager; >> >> Why do you use PassRefPtr instead of RefPtr ? If m_cookieManager based on PassRefPtr is assigned by other variables, m_cookieManager will be null. Beside WebKit recommends to use PassRefPtr only for function argument and result types, copying arguments into RefPtr local variables. >> >> http://www.webkit.org/coding/RefPtr.html > > Exactly! you must use RefPtr here! Yes, it's my mistake and I'll fix it. Thanks for review, Gyuyoung and Mikhail! 783578 5 177709 jinwoo7.song 2012-12-05 02:53:44 -0800 Created attachment 177709 Patch 783585 6 177709 mikhail.pozdnyakov 2012-12-05 03:13:45 -0800 Comment on attachment 177709 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177709&action=review looks OK > Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp:43 > + : m_cookieManager(cookieManager) nit: maybe assertion for m_cookieManager? 783591 7 177709 cdumez 2012-12-05 03:25:09 -0800 Comment on attachment 177709 Patch LGTM (although addressing comment from Mikhail would be a plus). 783635 8 177725 jinwoo7.song 2012-12-05 04:14:45 -0800 Created attachment 177725 Added assertion for m_cookieManager 784433 9 177725 gyuyoung.kim 2012-12-05 18:24:58 -0800 Comment on attachment 177725 Added assertion for m_cookieManager r=me 784453 10 177725 webkit.review.bot 2012-12-05 18:39:17 -0800 Comment on attachment 177725 Added assertion for m_cookieManager Clearing flags on attachment: 177725 Committed r136787: <http://trac.webkit.org/changeset/136787> 784454 11 webkit.review.bot 2012-12-05 18:39:22 -0800 All reviewed patches have been landed. Closing bug. 175972 2012-11-26 04:54:22 -0800 2012-12-05 02:53:38 -0800 Patch bug-103243-20121126215156.patch text/plain 7702 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzFhMjViYmZlODViNWI0 YjQ0ZWU5YzE4ZTcxNGJkZTAxYTM1NmQyMC4uMzg5OWE4MGRiZDY3NGQ5YjljNjRkNzQ1ZTM5OGQ1 NjM5NTdhMGUxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTExLTI2ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBld2tfY29va2llX21hbmFnZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzI0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZWQgdGhlIEMr KyBjbGFzc2VzIGRpcmVjdGx5IGluc3RlYWQgb2YgdGhlIEMgQVBJIHdyYXBwZXJzCisgICAgICAg IHRvIGF2b2lkIGEgbG90IG9mIHRvSW1wbC90b0FQSSBjYXN0cy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcDoKKyAgICAgICAgKEV3a0NvbnRleHQ6OmNvb2tp ZU1hbmFnZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdl ci5jcHA6CisgICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpFd2tDb29raWVNYW5hZ2VyKToKKyAg ICAgICAgKEV3a0Nvb2tpZU1hbmFnZXI6On5Fd2tDb29raWVNYW5hZ2VyKToKKyAgICAgICAgKEV3 a0Nvb2tpZU1hbmFnZXI6OnNldFBlcnNpc3RlbnRTdG9yYWdlKToKKyAgICAgICAgKEV3a0Nvb2tp ZU1hbmFnZXI6OnNldEhUVFBBY2NlcHRQb2xpY3kpOgorICAgICAgICAoRXdrQ29va2llTWFuYWdl cjo6Y2xlYXJIb3N0bmFtZUNvb2tpZXMpOgorICAgICAgICAoRXdrQ29va2llTWFuYWdlcjo6Y2xl YXJBbGxDb29raWVzKToKKyAgICAgICAgKEV3a0Nvb2tpZU1hbmFnZXI6OndhdGNoQ2hhbmdlcyk6 CisgICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpnZXRIb3N0TmFtZXNXaXRoQ29va2llcyk6Cisg ICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpnZXRIVFRQQWNjZXB0UG9saWN5KToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oOgorICAgICAg ICAoRXdrQ29va2llTWFuYWdlcjo6Y3JlYXRlKToKKyAgICAgICAgKEV3a0Nvb2tpZU1hbmFnZXIp OgorCiAyMDEyLTExLTI1ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZA aW50ZWwuY29tPgogCiAgICAgICAgIFtXSzJdIFRpbGVkQmFja2luZ1N0b3JlOiBwYWdlIGNvbnRl bnRzIGlzIHNjYWxlZCB3cm9uZ2x5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dC5jcHAKaW5kZXggMTM1MzQ5ODhhMGM1ZWY1NTkxMWM5OWVkODY1Njdk MjEwZDc0ODQyYy4uMzhmOTE4MDliNmVmZDI3ZjRlMmY3ZGJiNDcwZWY1MzIxNWRiMjBiNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcApA QCAtMTM0LDcgKzEzNCw3IEBAIFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gRXdrQ29udGV4dDo6ZGVm YXVsdENvbnRleHQoKQogRXdrX0Nvb2tpZV9NYW5hZ2VyKiBFd2tDb250ZXh0Ojpjb29raWVNYW5h Z2VyKCkKIHsKICAgICBpZiAoIW1fY29va2llTWFuYWdlcikKLSAgICAgICAgbV9jb29raWVNYW5h Z2VyID0gRXdrX0Nvb2tpZV9NYW5hZ2VyOjpjcmVhdGUoV0tDb250ZXh0R2V0Q29va2llTWFuYWdl cih0b0FQSShtX2NvbnRleHQuZ2V0KCkpKSk7CisgICAgICAgIG1fY29va2llTWFuYWdlciA9IEV3 a19Db29raWVfTWFuYWdlcjo6Y3JlYXRlKG1fY29udGV4dC5nZXQoKS0+Y29va2llTWFuYWdlclBy b3h5KCkpOwogCiAgICAgcmV0dXJuIG1fY29va2llTWFuYWdlci5nZXQoKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXIu Y3BwCmluZGV4IDgzMWQzYmIwMTVhYmQzZTE3NmVhOGNmMWU5N2I1Y2QzMmVlNzRkODQuLmU5NDVi YTM1YWQwZDU2NDRkNmQxOThkNThiODAzNDlmNDViZGVkNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcApAQCAt MzksNDggKzM5LDQ4IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLUV3a0Nvb2tpZU1h bmFnZXI6OkV3a0Nvb2tpZU1hbmFnZXIoV0tDb29raWVNYW5hZ2VyUmVmIGNvb2tpZU1hbmFnZXJS ZWYpCi0gICAgOiBtX3drQ29va2llTWFuYWdlcihjb29raWVNYW5hZ2VyUmVmKQorRXdrQ29va2ll TWFuYWdlcjo6RXdrQ29va2llTWFuYWdlcihQYXNzUmVmUHRyPFdlYkNvb2tpZU1hbmFnZXJQcm94 eT4gY29va2llTWFuYWdlcikKKyAgICA6IG1fY29va2llTWFuYWdlcihjb29raWVNYW5hZ2VyLmdl dCgpKQogewogICAgIFdLQ29va2llTWFuYWdlckNsaWVudCB3a0Nvb2tpZU1hbmFnZXJDbGllbnQg PSB7CiAgICAgICAgIGtXS0Nvb2tpZU1hbmFnZXJDbGllbnRDdXJyZW50VmVyc2lvbiwKICAgICAg ICAgdGhpcywgLy8gY2xpZW50SW5mbwogICAgICAgICBjb29raWVzRGlkQ2hhbmdlCiAgICAgfTsK LSAgICBXS0Nvb2tpZU1hbmFnZXJTZXRDbGllbnQobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCksICZ3 a0Nvb2tpZU1hbmFnZXJDbGllbnQpOworICAgIFdLQ29va2llTWFuYWdlclNldENsaWVudCh0b0FQ SShtX2Nvb2tpZU1hbmFnZXIuZ2V0KCkpLCAmd2tDb29raWVNYW5hZ2VyQ2xpZW50KTsKIH0KIAog RXdrQ29va2llTWFuYWdlcjo6fkV3a0Nvb2tpZU1hbmFnZXIoKQogewogICAgIGlmIChpc1dhdGNo aW5nRm9yQ2hhbmdlcygpKQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29v a2llQ2hhbmdlcyhtX3drQ29va2llTWFuYWdlci5nZXQoKSk7CisgICAgICAgIG1fY29va2llTWFu YWdlci5nZXQoKS0+c3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMoKTsKIH0KIAogdm9pZCBFd2tD b29raWVNYW5hZ2VyOjpzZXRQZXJzaXN0ZW50U3RvcmFnZShjb25zdCBTdHJpbmcmIGZpbGVuYW1l LCBTb3VwQ29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlIHN0b3JhZ2UpCiB7CiAgICAgYm9vbCBp c1dhdGNoaW5nQ2hhbmdlcyA9IGlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCk7CiAgICAgaWYgKGlzV2F0 Y2hpbmdDaGFuZ2VzKQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29va2ll Q2hhbmdlcyhtX3drQ29va2llTWFuYWdlci5nZXQoKSk7CisgICAgICAgIG1fY29va2llTWFuYWdl ci5nZXQoKS0+c3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMoKTsKIAotICAgIHRvSW1wbChtX3dr Q29va2llTWFuYWdlci5nZXQoKSktPnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKGZpbGVuYW1l LCBzdG9yYWdlKTsKKyAgICBtX2Nvb2tpZU1hbmFnZXIuZ2V0KCktPnNldENvb2tpZVBlcnNpc3Rl bnRTdG9yYWdlKGZpbGVuYW1lLCBzdG9yYWdlKTsKIAogICAgIGlmIChpc1dhdGNoaW5nQ2hhbmdl cykKLSAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1f d2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKyAgICAgICAgbV9jb29raWVNYW5hZ2VyLmdldCgpLT5z dGFydE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMoKTsKIH0KIAogdm9pZCBFd2tDb29raWVNYW5hZ2Vy OjpzZXRIVFRQQWNjZXB0UG9saWN5KFdLSFRUUENvb2tpZUFjY2VwdFBvbGljeSBwb2xpY3kpCiB7 Ci0gICAgV0tDb29raWVNYW5hZ2VyU2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShtX3drQ29va2ll TWFuYWdlci5nZXQoKSwgcG9saWN5KTsKKyAgICBtX2Nvb2tpZU1hbmFnZXIuZ2V0KCktPnNldEhU VFBDb29raWVBY2NlcHRQb2xpY3kodG9IVFRQQ29va2llQWNjZXB0UG9saWN5KHBvbGljeSkpOwog fQogCiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OmNsZWFySG9zdG5hbWVDb29raWVzKGNvbnN0IFN0 cmluZyYgaG9zdG5hbWUpCiB7Ci0gICAgdG9JbXBsKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKS0+ ZGVsZXRlQ29va2llc0Zvckhvc3RuYW1lKGhvc3RuYW1lKTsKKyAgICBtX2Nvb2tpZU1hbmFnZXIu Z2V0KCktPmRlbGV0ZUNvb2tpZXNGb3JIb3N0bmFtZShob3N0bmFtZSk7CiB9CiAKIHZvaWQgRXdr Q29va2llTWFuYWdlcjo6Y2xlYXJBbGxDb29raWVzKCkKIHsKLSAgICBXS0Nvb2tpZU1hbmFnZXJE ZWxldGVBbGxDb29raWVzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKyAgICBtX2Nvb2tpZU1h bmFnZXIuZ2V0KCktPmRlbGV0ZUFsbENvb2tpZXMoKTsKIH0KIAogdm9pZCBFd2tDb29raWVNYW5h Z2VyOjp3YXRjaENoYW5nZXMoY29uc3QgQ29va2llX0NoYW5nZV9IYW5kbGVyJiBjaGFuZ2VIYW5k bGVyKQpAQCAtODgsOSArODgsOSBAQCB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OndhdGNoQ2hhbmdl cyhjb25zdCBDb29raWVfQ2hhbmdlX0hhbmRsZXImIGNoYW5nZUhhbmRsZXIpCiAgICAgbV9jaGFu Z2VIYW5kbGVyID0gY2hhbmdlSGFuZGxlcjsKIAogICAgIGlmIChjaGFuZ2VIYW5kbGVyLmNhbGxi YWNrKQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMo bV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgICAgICBtX2Nvb2tpZU1hbmFnZXIuZ2V0KCkt PnN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogICAgIGVsc2UKLSAgICAgICAgV0tDb29r aWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMobV93a0Nvb2tpZU1hbmFnZXIuZ2V0 KCkpOworICAgICAgICBtX2Nvb2tpZU1hbmFnZXIuZ2V0KCktPnN0b3BPYnNlcnZpbmdDb29raWVD aGFuZ2VzKCk7CiB9CiAKIGJvb2wgRXdrQ29va2llTWFuYWdlcjo6aXNXYXRjaGluZ0ZvckNoYW5n ZXMoKSBjb25zdApAQCAtMTAwLDEyICsxMDAsMTIgQEAgYm9vbCBFd2tDb29raWVNYW5hZ2VyOjpp c1dhdGNoaW5nRm9yQ2hhbmdlcygpIGNvbnN0CiAKIHZvaWQgRXdrQ29va2llTWFuYWdlcjo6Z2V0 SG9zdE5hbWVzV2l0aENvb2tpZXMoV0tDb29raWVNYW5hZ2VyR2V0Q29va2llSG9zdG5hbWVzRnVu Y3Rpb24gY2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhKSBjb25zdAogewotICAgIFdLQ29va2llTWFu YWdlckdldEhvc3RuYW1lc1dpdGhDb29raWVzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpLCB1c2Vy RGF0YSwgY2FsbGJhY2spOworICAgIG1fY29va2llTWFuYWdlci5nZXQoKS0+Z2V0SG9zdG5hbWVz V2l0aENvb2tpZXMoQXJyYXlDYWxsYmFjazo6Y3JlYXRlKHVzZXJEYXRhLCBjYWxsYmFjaykpOwog fQogCiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OmdldEhUVFBBY2NlcHRQb2xpY3koV0tDb29raWVN YW5hZ2VyR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeUZ1bmN0aW9uIGNhbGxiYWNrLCB2b2lkKiB1 c2VyRGF0YSkgY29uc3QKIHsKLSAgICBXS0Nvb2tpZU1hbmFnZXJHZXRIVFRQQ29va2llQWNjZXB0 UG9saWN5KG1fd2tDb29raWVNYW5hZ2VyLmdldCgpLCB1c2VyRGF0YSwgY2FsbGJhY2spOworICAg IG1fY29va2llTWFuYWdlci5nZXQoKS0+Z2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShIVFRQQ29v a2llQWNjZXB0UG9saWN5Q2FsbGJhY2s6OmNyZWF0ZSh1c2VyRGF0YSwgY2FsbGJhY2spKTsKIH0K IAogdm9pZCBFd2tDb29raWVNYW5hZ2VyOjpjb29raWVzRGlkQ2hhbmdlKFdLQ29va2llTWFuYWdl clJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlcl9wcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oCmlu ZGV4IDVkZTMwNjA2YjM2NDdmODMzYTBjYzBmMDI1MjcyMzVjZjAzNzAyNTYuLjA4NzUzOTQwYjgx OTNiMjQxZTQyYzU4NzUxNWQwNDM2MjlhM2U3NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlcl9wcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUu aApAQCAtMjgsNyArMjgsNyBAQAogCiAjaW5jbHVkZSAiU291cENvb2tpZVBlcnNpc3RlbnRTdG9y YWdlVHlwZS5oIgogI2luY2x1ZGUgIldLQ29va2llTWFuYWdlci5oIgotI2luY2x1ZGUgIldLUmV0 YWluUHRyLmgiCisjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdlclByb3h5LmgiCiAjaW5jbHVkZSAi ZXdrX2Nvb2tpZV9tYW5hZ2VyLmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KICNpbmNs dWRlIDx3dGYvUGFzc093blB0ci5oPgpAQCAtNTAsOSArNTAsOSBAQCBzdHJ1Y3QgQ29va2llX0No YW5nZV9IYW5kbGVyIHsKIAogY2xhc3MgRXdrQ29va2llTWFuYWdlciB7CiBwdWJsaWM6Ci0gICAg c3RhdGljIFBhc3NPd25QdHI8RXdrQ29va2llTWFuYWdlcj4gY3JlYXRlKFdLQ29va2llTWFuYWdl clJlZiBjb29raWVNYW5hZ2VyUmVmKQorICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0Nvb2tpZU1h bmFnZXI+IGNyZWF0ZShQYXNzUmVmUHRyPFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5PiBj b29raWVNYW5hZ2VyKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tfQ29v a2llX01hbmFnZXIoY29va2llTWFuYWdlclJlZikpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIo bmV3IEV3a0Nvb2tpZU1hbmFnZXIoY29va2llTWFuYWdlcikpOwogICAgIH0KIAogICAgIH5Fd2tD b29raWVNYW5hZ2VyKCk7CkBAIC02OSwxMyArNjksMTMgQEAgcHVibGljOgogICAgIHZvaWQgd2F0 Y2hDaGFuZ2VzKGNvbnN0IENvb2tpZV9DaGFuZ2VfSGFuZGxlciYgY2hhbmdlSGFuZGxlcik7CiAK IHByaXZhdGU6Ci0gICAgZXhwbGljaXQgRXdrQ29va2llTWFuYWdlcihXS0Nvb2tpZU1hbmFnZXJS ZWYgY29va2llTWFuYWdlclJlZik7CisgICAgZXhwbGljaXQgRXdrQ29va2llTWFuYWdlcihQYXNz UmVmUHRyPFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5PiBjb29raWVNYW5hZ2VyKTsKIAog ICAgIGJvb2wgaXNXYXRjaGluZ0ZvckNoYW5nZXMoKSBjb25zdDsKIAogICAgIHN0YXRpYyB2b2lk IGNvb2tpZXNEaWRDaGFuZ2UoV0tDb29raWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJ bmZvKTsKIAotICAgIFdLUmV0YWluUHRyPFdLQ29va2llTWFuYWdlclJlZj4gbV93a0Nvb2tpZU1h bmFnZXI7CisgICAgUGFzc1JlZlB0cjxXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94eT4gbV9j b29raWVNYW5hZ2VyOwogICAgIENvb2tpZV9DaGFuZ2VfSGFuZGxlciBtX2NoYW5nZUhhbmRsZXI7 CiB9OwogCg== 177709 2012-12-05 02:53:44 -0800 2012-12-05 04:14:38 -0800 Patch bug-103243-20121205195108.patch text/plain 7590 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjQyNGNkMGE5ZmQ4Mjc2 NGI2MjRmZGIwZTBmOGQ5MTY1ZmMwZjMxZC4uMGU4ODU2OTU0ZDMxMGFhMmVmNTEyYjcxNTJlMDFi Yzg0YWU2NmM0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEyLTA1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBld2tfY29va2llX21hbmFnZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzI0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZWQgdGhlIEMr KyBjbGFzc2VzIGRpcmVjdGx5IGluc3RlYWQgb2YgdGhlIEMgQVBJIHdyYXBwZXJzCisgICAgICAg IHRvIGF2b2lkIGEgbG90IG9mIHRvSW1wbC90b0FQSSBjYXN0cy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcDoKKyAgICAgICAgKEV3a0NvbnRleHQ6OmNvb2tp ZU1hbmFnZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdl ci5jcHA6CisgICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpFd2tDb29raWVNYW5hZ2VyKToKKyAg ICAgICAgKEV3a0Nvb2tpZU1hbmFnZXI6On5Fd2tDb29raWVNYW5hZ2VyKToKKyAgICAgICAgKEV3 a0Nvb2tpZU1hbmFnZXI6OnNldFBlcnNpc3RlbnRTdG9yYWdlKToKKyAgICAgICAgKEV3a0Nvb2tp ZU1hbmFnZXI6OnNldEhUVFBBY2NlcHRQb2xpY3kpOgorICAgICAgICAoRXdrQ29va2llTWFuYWdl cjo6Y2xlYXJIb3N0bmFtZUNvb2tpZXMpOgorICAgICAgICAoRXdrQ29va2llTWFuYWdlcjo6Y2xl YXJBbGxDb29raWVzKToKKyAgICAgICAgKEV3a0Nvb2tpZU1hbmFnZXI6OndhdGNoQ2hhbmdlcyk6 CisgICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpnZXRIb3N0TmFtZXNXaXRoQ29va2llcyk6Cisg ICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpnZXRIVFRQQWNjZXB0UG9saWN5KToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oOgorICAgICAg ICAoRXdrQ29va2llTWFuYWdlcjo6Y3JlYXRlKToKKyAgICAgICAgKEV3a0Nvb2tpZU1hbmFnZXIp OgorCiAyMDEyLTEyLTA1ICBZdW5pIEplb25nICA8eWhuZXQuanVuZ0BzYW1zdW5nLmNvbT4KIAog ICAgICAgICBbRUZMXVtXSzJdIEFkZCBBUElzIHRvIGdldC9zZXQgcHJpdmF0ZSBicm93c2luZy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcApp bmRleCAyYTIyMjExOThkMzdiMjdlN2U4MGU2OWZhMTYzODlkOTVmYTRmMmIyLi40OWM2MjE3ZGNk ZmZmMjBmOTNlYjA0YjI1ZTFkYjJiNzk0YmIwMjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0xMzQsNyArMTM0LDcgQEAgUGFz c1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpCiBFd2tDb29r aWVNYW5hZ2VyKiBFd2tDb250ZXh0Ojpjb29raWVNYW5hZ2VyKCkKIHsKICAgICBpZiAoIW1fY29v a2llTWFuYWdlcikKLSAgICAgICAgbV9jb29raWVNYW5hZ2VyID0gRXdrQ29va2llTWFuYWdlcjo6 Y3JlYXRlKFdLQ29udGV4dEdldENvb2tpZU1hbmFnZXIodG9BUEkobV9jb250ZXh0LmdldCgpKSkp OworICAgICAgICBtX2Nvb2tpZU1hbmFnZXIgPSBFd2tDb29raWVNYW5hZ2VyOjpjcmVhdGUobV9j b250ZXh0LT5jb29raWVNYW5hZ2VyUHJveHkoKSk7CiAKICAgICByZXR1cm4gbV9jb29raWVNYW5h Z2VyLmdldCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAKaW5kZXggMTA1NTgyNTM4NDJmMGY4Y2MyODFhOWQ0 ZDkxYTk1NzRjZjg4NzU4My4uYzEwZTdjMjVmOWM3MTkyN2MwMGVlZWY2MWNkYTg0MDgzYmI3MjFj NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tp ZV9tYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf Y29va2llX21hbmFnZXIuY3BwCkBAIC0zOSw0OCArMzksNDggQEAKIAogdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKIAotRXdrQ29va2llTWFuYWdlcjo6RXdrQ29va2llTWFuYWdlcihXS0Nvb2tpZU1h bmFnZXJSZWYgY29va2llTWFuYWdlclJlZikKLSAgICA6IG1fd2tDb29raWVNYW5hZ2VyKGNvb2tp ZU1hbmFnZXJSZWYpCitFd2tDb29raWVNYW5hZ2VyOjpFd2tDb29raWVNYW5hZ2VyKFBhc3NSZWZQ dHI8V2ViQ29va2llTWFuYWdlclByb3h5PiBjb29raWVNYW5hZ2VyKQorICAgIDogbV9jb29raWVN YW5hZ2VyKGNvb2tpZU1hbmFnZXIpCiB7CiAgICAgV0tDb29raWVNYW5hZ2VyQ2xpZW50IHdrQ29v a2llTWFuYWdlckNsaWVudCA9IHsKICAgICAgICAga1dLQ29va2llTWFuYWdlckNsaWVudEN1cnJl bnRWZXJzaW9uLAogICAgICAgICB0aGlzLCAvLyBjbGllbnRJbmZvCiAgICAgICAgIGNvb2tpZXNE aWRDaGFuZ2UKICAgICB9OwotICAgIFdLQ29va2llTWFuYWdlclNldENsaWVudChtX3drQ29va2ll TWFuYWdlci5nZXQoKSwgJndrQ29va2llTWFuYWdlckNsaWVudCk7CisgICAgV0tDb29raWVNYW5h Z2VyU2V0Q2xpZW50KHRvQVBJKG1fY29va2llTWFuYWdlci5nZXQoKSksICZ3a0Nvb2tpZU1hbmFn ZXJDbGllbnQpOwogfQogCiBFd2tDb29raWVNYW5hZ2VyOjp+RXdrQ29va2llTWFuYWdlcigpCiB7 CiAgICAgaWYgKGlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkpCi0gICAgICAgIFdLQ29va2llTWFuYWdl clN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKyAg ICAgICAgbV9jb29raWVNYW5hZ2VyLT5zdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogfQog CiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OnNldFBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmlu ZyYgZmlsZW5hbWUsIFNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUgc3RvcmFnZSkKIHsK ICAgICBib29sIGlzV2F0Y2hpbmdDaGFuZ2VzID0gaXNXYXRjaGluZ0ZvckNoYW5nZXMoKTsKICAg ICBpZiAoaXNXYXRjaGluZ0NoYW5nZXMpCi0gICAgICAgIFdLQ29va2llTWFuYWdlclN0b3BPYnNl cnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKyAgICAgICAgbV9j b29raWVNYW5hZ2VyLT5zdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogCi0gICAgdG9JbXBs KG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKS0+c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoZmls ZW5hbWUsIHN0b3JhZ2UpOworICAgIG1fY29va2llTWFuYWdlci0+c2V0Q29va2llUGVyc2lzdGVu dFN0b3JhZ2UoZmlsZW5hbWUsIHN0b3JhZ2UpOwogCiAgICAgaWYgKGlzV2F0Y2hpbmdDaGFuZ2Vz KQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdGFydE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMobV93 a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgICAgICBtX2Nvb2tpZU1hbmFnZXItPnN0YXJ0T2Jz ZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogfQogCiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OnNldEhU VFBBY2NlcHRQb2xpY3koV0tIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkKIHsKLSAgICBX S0Nvb2tpZU1hbmFnZXJTZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KG1fd2tDb29raWVNYW5hZ2Vy LmdldCgpLCBwb2xpY3kpOworICAgIG1fY29va2llTWFuYWdlci0+c2V0SFRUUENvb2tpZUFjY2Vw dFBvbGljeSh0b0hUVFBDb29raWVBY2NlcHRQb2xpY3kocG9saWN5KSk7CiB9CiAKIHZvaWQgRXdr Q29va2llTWFuYWdlcjo6Y2xlYXJIb3N0bmFtZUNvb2tpZXMoY29uc3QgU3RyaW5nJiBob3N0bmFt ZSkKIHsKLSAgICB0b0ltcGwobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpLT5kZWxldGVDb29raWVz Rm9ySG9zdG5hbWUoaG9zdG5hbWUpOworICAgIG1fY29va2llTWFuYWdlci0+ZGVsZXRlQ29va2ll c0Zvckhvc3RuYW1lKGhvc3RuYW1lKTsKIH0KIAogdm9pZCBFd2tDb29raWVNYW5hZ2VyOjpjbGVh ckFsbENvb2tpZXMoKQogewotICAgIFdLQ29va2llTWFuYWdlckRlbGV0ZUFsbENvb2tpZXMobV93 a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgIG1fY29va2llTWFuYWdlci0+ZGVsZXRlQWxsQ29v a2llcygpOwogfQogCiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OndhdGNoQ2hhbmdlcyhjb25zdCBD b29raWVfQ2hhbmdlX0hhbmRsZXImIGNoYW5nZUhhbmRsZXIpCkBAIC04OCw5ICs4OCw5IEBAIHZv aWQgRXdrQ29va2llTWFuYWdlcjo6d2F0Y2hDaGFuZ2VzKGNvbnN0IENvb2tpZV9DaGFuZ2VfSGFu ZGxlciYgY2hhbmdlSGFuZGxlcikKICAgICBtX2NoYW5nZUhhbmRsZXIgPSBjaGFuZ2VIYW5kbGVy OwogCiAgICAgaWYgKGNoYW5nZUhhbmRsZXIuY2FsbGJhY2spCi0gICAgICAgIFdLQ29va2llTWFu YWdlclN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hhbmdlcyhtX3drQ29va2llTWFuYWdlci5nZXQoKSk7 CisgICAgICAgIG1fY29va2llTWFuYWdlci0+c3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKCk7 CiAgICAgZWxzZQotICAgICAgICBXS0Nvb2tpZU1hbmFnZXJTdG9wT2JzZXJ2aW5nQ29va2llQ2hh bmdlcyhtX3drQ29va2llTWFuYWdlci5nZXQoKSk7CisgICAgICAgIG1fY29va2llTWFuYWdlci0+ c3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMoKTsKIH0KIAogYm9vbCBFd2tDb29raWVNYW5hZ2Vy Ojppc1dhdGNoaW5nRm9yQ2hhbmdlcygpIGNvbnN0CkBAIC0xMDAsMTIgKzEwMCwxMiBAQCBib29s IEV3a0Nvb2tpZU1hbmFnZXI6OmlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkgY29uc3QKIAogdm9pZCBF d2tDb29raWVNYW5hZ2VyOjpnZXRIb3N0TmFtZXNXaXRoQ29va2llcyhXS0Nvb2tpZU1hbmFnZXJH ZXRDb29raWVIb3N0bmFtZXNGdW5jdGlvbiBjYWxsYmFjaywgdm9pZCogdXNlckRhdGEpIGNvbnN0 CiB7Ci0gICAgV0tDb29raWVNYW5hZ2VyR2V0SG9zdG5hbWVzV2l0aENvb2tpZXMobV93a0Nvb2tp ZU1hbmFnZXIuZ2V0KCksIHVzZXJEYXRhLCBjYWxsYmFjayk7CisgICAgbV9jb29raWVNYW5hZ2Vy LT5nZXRIb3N0bmFtZXNXaXRoQ29va2llcyhBcnJheUNhbGxiYWNrOjpjcmVhdGUodXNlckRhdGEs IGNhbGxiYWNrKSk7CiB9CiAKIHZvaWQgRXdrQ29va2llTWFuYWdlcjo6Z2V0SFRUUEFjY2VwdFBv bGljeShXS0Nvb2tpZU1hbmFnZXJHZXRIVFRQQ29va2llQWNjZXB0UG9saWN5RnVuY3Rpb24gY2Fs bGJhY2ssIHZvaWQqIHVzZXJEYXRhKSBjb25zdAogewotICAgIFdLQ29va2llTWFuYWdlckdldEhU VFBDb29raWVBY2NlcHRQb2xpY3kobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCksIHVzZXJEYXRhLCBj YWxsYmFjayk7CisgICAgbV9jb29raWVNYW5hZ2VyLT5nZXRIVFRQQ29va2llQWNjZXB0UG9saWN5 KEhUVFBDb29raWVBY2NlcHRQb2xpY3lDYWxsYmFjazo6Y3JlYXRlKHVzZXJEYXRhLCBjYWxsYmFj aykpOwogfQogCiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OmNvb2tpZXNEaWRDaGFuZ2UoV0tDb29r aWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlcl9wcml2 YXRlLmgKaW5kZXggNjI0YWIwOTZmYjliMDFhNTczMjA4M2I0N2VhNWE2MDZkN2I4MzJkMS4uOWRh ZjE3YWIzNWFlZTdlNjI2N2YxNzFjMTg0MDY4NWJiYWYzZDRjMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJf cHJpdmF0ZS5oCkBAIC0yOCw3ICsyOCw3IEBACiAKICNpbmNsdWRlICJTb3VwQ29va2llUGVyc2lz dGVudFN0b3JhZ2VUeXBlLmgiCiAjaW5jbHVkZSAiV0tDb29raWVNYW5hZ2VyLmgiCi0jaW5jbHVk ZSAiV0tSZXRhaW5QdHIuaCIKKyNpbmNsdWRlICJXZWJDb29raWVNYW5hZ2VyUHJveHkuaCIKICNp bmNsdWRlICJld2tfY29va2llX21hbmFnZXIuaCIKICNpbmNsdWRlIDxXZWJLaXQyL1dLQmFzZS5o PgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CkBAIC01MCw5ICs1MCw5IEBAIHN0cnVjdCBD b29raWVfQ2hhbmdlX0hhbmRsZXIgewogCiBjbGFzcyBFd2tDb29raWVNYW5hZ2VyIHsKIHB1Ymxp YzoKLSAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb29raWVNYW5hZ2VyPiBjcmVhdGUoV0tDb29r aWVNYW5hZ2VyUmVmIGNvb2tpZU1hbmFnZXJSZWYpCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdr Q29va2llTWFuYWdlcj4gY3JlYXRlKFBhc3NSZWZQdHI8V2ViS2l0OjpXZWJDb29raWVNYW5hZ2Vy UHJveHk+IGNvb2tpZU1hbmFnZXIpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3 IEV3a0Nvb2tpZU1hbmFnZXIoY29va2llTWFuYWdlclJlZikpOworICAgICAgICByZXR1cm4gYWRv cHRQdHIobmV3IEV3a0Nvb2tpZU1hbmFnZXIoY29va2llTWFuYWdlcikpOwogICAgIH0KIAogICAg IH5Fd2tDb29raWVNYW5hZ2VyKCk7CkBAIC02OSwxMyArNjksMTMgQEAgcHVibGljOgogICAgIHZv aWQgd2F0Y2hDaGFuZ2VzKGNvbnN0IENvb2tpZV9DaGFuZ2VfSGFuZGxlciYgY2hhbmdlSGFuZGxl cik7CiAKIHByaXZhdGU6Ci0gICAgZXhwbGljaXQgRXdrQ29va2llTWFuYWdlcihXS0Nvb2tpZU1h bmFnZXJSZWYgY29va2llTWFuYWdlclJlZik7CisgICAgZXhwbGljaXQgRXdrQ29va2llTWFuYWdl cihQYXNzUmVmUHRyPFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5PiBjb29raWVNYW5hZ2Vy KTsKIAogICAgIGJvb2wgaXNXYXRjaGluZ0ZvckNoYW5nZXMoKSBjb25zdDsKIAogICAgIHN0YXRp YyB2b2lkIGNvb2tpZXNEaWRDaGFuZ2UoV0tDb29raWVNYW5hZ2VyUmVmLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKTsKIAotICAgIFdLUmV0YWluUHRyPFdLQ29va2llTWFuYWdlclJlZj4gbV93a0Nv b2tpZU1hbmFnZXI7CisgICAgUmVmUHRyPFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5PiBt X2Nvb2tpZU1hbmFnZXI7CiAgICAgQ29va2llX0NoYW5nZV9IYW5kbGVyIG1fY2hhbmdlSGFuZGxl cjsKIH07CiAK 177725 2012-12-05 04:14:45 -0800 2012-12-05 18:39:17 -0800 Added assertion for m_cookieManager bug-103243-20121205211208.patch text/plain 7622 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjQyNGNkMGE5ZmQ4Mjc2 NGI2MjRmZGIwZTBmOGQ5MTY1ZmMwZjMxZC4uMGU4ODU2OTU0ZDMxMGFhMmVmNTEyYjcxNTJlMDFi Yzg0YWU2NmM0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTEyLTA1ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBld2tfY29va2llX21hbmFnZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzI0MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZWQgdGhlIEMr KyBjbGFzc2VzIGRpcmVjdGx5IGluc3RlYWQgb2YgdGhlIEMgQVBJIHdyYXBwZXJzCisgICAgICAg IHRvIGF2b2lkIGEgbG90IG9mIHRvSW1wbC90b0FQSSBjYXN0cy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcDoKKyAgICAgICAgKEV3a0NvbnRleHQ6OmNvb2tp ZU1hbmFnZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdl ci5jcHA6CisgICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpFd2tDb29raWVNYW5hZ2VyKToKKyAg ICAgICAgKEV3a0Nvb2tpZU1hbmFnZXI6On5Fd2tDb29raWVNYW5hZ2VyKToKKyAgICAgICAgKEV3 a0Nvb2tpZU1hbmFnZXI6OnNldFBlcnNpc3RlbnRTdG9yYWdlKToKKyAgICAgICAgKEV3a0Nvb2tp ZU1hbmFnZXI6OnNldEhUVFBBY2NlcHRQb2xpY3kpOgorICAgICAgICAoRXdrQ29va2llTWFuYWdl cjo6Y2xlYXJIb3N0bmFtZUNvb2tpZXMpOgorICAgICAgICAoRXdrQ29va2llTWFuYWdlcjo6Y2xl YXJBbGxDb29raWVzKToKKyAgICAgICAgKEV3a0Nvb2tpZU1hbmFnZXI6OndhdGNoQ2hhbmdlcyk6 CisgICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpnZXRIb3N0TmFtZXNXaXRoQ29va2llcyk6Cisg ICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpnZXRIVFRQQWNjZXB0UG9saWN5KToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oOgorICAgICAg ICAoRXdrQ29va2llTWFuYWdlcjo6Y3JlYXRlKToKKyAgICAgICAgKEV3a0Nvb2tpZU1hbmFnZXIp OgorCiAyMDEyLTEyLTA1ICBZdW5pIEplb25nICA8eWhuZXQuanVuZ0BzYW1zdW5nLmNvbT4KIAog ICAgICAgICBbRUZMXVtXSzJdIEFkZCBBUElzIHRvIGdldC9zZXQgcHJpdmF0ZSBicm93c2luZy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcApp bmRleCAyYTIyMjExOThkMzdiMjdlN2U4MGU2OWZhMTYzODlkOTVmYTRmMmIyLi40OWM2MjE3ZGNk ZmZmMjBmOTNlYjA0YjI1ZTFkYjJiNzk0YmIwMjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0xMzQsNyArMTM0LDcgQEAgUGFz c1JlZlB0cjxFd2tDb250ZXh0PiBFd2tDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpCiBFd2tDb29r aWVNYW5hZ2VyKiBFd2tDb250ZXh0Ojpjb29raWVNYW5hZ2VyKCkKIHsKICAgICBpZiAoIW1fY29v a2llTWFuYWdlcikKLSAgICAgICAgbV9jb29raWVNYW5hZ2VyID0gRXdrQ29va2llTWFuYWdlcjo6 Y3JlYXRlKFdLQ29udGV4dEdldENvb2tpZU1hbmFnZXIodG9BUEkobV9jb250ZXh0LmdldCgpKSkp OworICAgICAgICBtX2Nvb2tpZU1hbmFnZXIgPSBFd2tDb29raWVNYW5hZ2VyOjpjcmVhdGUobV9j b250ZXh0LT5jb29raWVNYW5hZ2VyUHJveHkoKSk7CiAKICAgICByZXR1cm4gbV9jb29raWVNYW5h Z2VyLmdldCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHAKaW5kZXggMTA1NTgyNTM4NDJmMGY4Y2MyODFhOWQ0 ZDkxYTk1NzRjZjg4NzU4My4uMGVjZDNiZGI3NmIyMmZlMTUwODZlODNiMzc5NzNjNjYyZmRmY2M2 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tp ZV9tYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf Y29va2llX21hbmFnZXIuY3BwCkBAIC0zOSw0OCArMzksNTAgQEAKIAogdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKIAotRXdrQ29va2llTWFuYWdlcjo6RXdrQ29va2llTWFuYWdlcihXS0Nvb2tpZU1h bmFnZXJSZWYgY29va2llTWFuYWdlclJlZikKLSAgICA6IG1fd2tDb29raWVNYW5hZ2VyKGNvb2tp ZU1hbmFnZXJSZWYpCitFd2tDb29raWVNYW5hZ2VyOjpFd2tDb29raWVNYW5hZ2VyKFBhc3NSZWZQ dHI8V2ViQ29va2llTWFuYWdlclByb3h5PiBjb29raWVNYW5hZ2VyKQorICAgIDogbV9jb29raWVN YW5hZ2VyKGNvb2tpZU1hbmFnZXIpCiB7CisgICAgQVNTRVJUKG1fY29va2llTWFuYWdlcik7CisK ICAgICBXS0Nvb2tpZU1hbmFnZXJDbGllbnQgd2tDb29raWVNYW5hZ2VyQ2xpZW50ID0gewogICAg ICAgICBrV0tDb29raWVNYW5hZ2VyQ2xpZW50Q3VycmVudFZlcnNpb24sCiAgICAgICAgIHRoaXMs IC8vIGNsaWVudEluZm8KICAgICAgICAgY29va2llc0RpZENoYW5nZQogICAgIH07Ci0gICAgV0tD b29raWVNYW5hZ2VyU2V0Q2xpZW50KG1fd2tDb29raWVNYW5hZ2VyLmdldCgpLCAmd2tDb29raWVN YW5hZ2VyQ2xpZW50KTsKKyAgICBXS0Nvb2tpZU1hbmFnZXJTZXRDbGllbnQodG9BUEkobV9jb29r aWVNYW5hZ2VyLmdldCgpKSwgJndrQ29va2llTWFuYWdlckNsaWVudCk7CiB9CiAKIEV3a0Nvb2tp ZU1hbmFnZXI6On5Fd2tDb29raWVNYW5hZ2VyKCkKIHsKICAgICBpZiAoaXNXYXRjaGluZ0ZvckNo YW5nZXMoKSkKLSAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5n ZXMobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkpOworICAgICAgICBtX2Nvb2tpZU1hbmFnZXItPnN0 b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKCk7CiB9CiAKIHZvaWQgRXdrQ29va2llTWFuYWdlcjo6 c2V0UGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgU291cENvb2tpZVBl cnNpc3RlbnRTdG9yYWdlVHlwZSBzdG9yYWdlKQogewogICAgIGJvb2wgaXNXYXRjaGluZ0NoYW5n ZXMgPSBpc1dhdGNoaW5nRm9yQ2hhbmdlcygpOwogICAgIGlmIChpc1dhdGNoaW5nQ2hhbmdlcykK LSAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RvcE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMobV93a0Nv b2tpZU1hbmFnZXIuZ2V0KCkpOworICAgICAgICBtX2Nvb2tpZU1hbmFnZXItPnN0b3BPYnNlcnZp bmdDb29raWVDaGFuZ2VzKCk7CiAKLSAgICB0b0ltcGwobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCkp LT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShmaWxlbmFtZSwgc3RvcmFnZSk7CisgICAgbV9j b29raWVNYW5hZ2VyLT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShmaWxlbmFtZSwgc3RvcmFn ZSk7CiAKICAgICBpZiAoaXNXYXRjaGluZ0NoYW5nZXMpCi0gICAgICAgIFdLQ29va2llTWFuYWdl clN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hhbmdlcyhtX3drQ29va2llTWFuYWdlci5nZXQoKSk7Cisg ICAgICAgIG1fY29va2llTWFuYWdlci0+c3RhcnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKCk7CiB9 CiAKIHZvaWQgRXdrQ29va2llTWFuYWdlcjo6c2V0SFRUUEFjY2VwdFBvbGljeShXS0hUVFBDb29r aWVBY2NlcHRQb2xpY3kgcG9saWN5KQogewotICAgIFdLQ29va2llTWFuYWdlclNldEhUVFBDb29r aWVBY2NlcHRQb2xpY3kobV93a0Nvb2tpZU1hbmFnZXIuZ2V0KCksIHBvbGljeSk7CisgICAgbV9j b29raWVNYW5hZ2VyLT5zZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KHRvSFRUUENvb2tpZUFjY2Vw dFBvbGljeShwb2xpY3kpKTsKIH0KIAogdm9pZCBFd2tDb29raWVNYW5hZ2VyOjpjbGVhckhvc3Ru YW1lQ29va2llcyhjb25zdCBTdHJpbmcmIGhvc3RuYW1lKQogewotICAgIHRvSW1wbChtX3drQ29v a2llTWFuYWdlci5nZXQoKSktPmRlbGV0ZUNvb2tpZXNGb3JIb3N0bmFtZShob3N0bmFtZSk7Cisg ICAgbV9jb29raWVNYW5hZ2VyLT5kZWxldGVDb29raWVzRm9ySG9zdG5hbWUoaG9zdG5hbWUpOwog fQogCiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OmNsZWFyQWxsQ29va2llcygpCiB7Ci0gICAgV0tD b29raWVNYW5hZ2VyRGVsZXRlQWxsQ29va2llcyhtX3drQ29va2llTWFuYWdlci5nZXQoKSk7Cisg ICAgbV9jb29raWVNYW5hZ2VyLT5kZWxldGVBbGxDb29raWVzKCk7CiB9CiAKIHZvaWQgRXdrQ29v a2llTWFuYWdlcjo6d2F0Y2hDaGFuZ2VzKGNvbnN0IENvb2tpZV9DaGFuZ2VfSGFuZGxlciYgY2hh bmdlSGFuZGxlcikKQEAgLTg4LDkgKzkwLDkgQEAgdm9pZCBFd2tDb29raWVNYW5hZ2VyOjp3YXRj aENoYW5nZXMoY29uc3QgQ29va2llX0NoYW5nZV9IYW5kbGVyJiBjaGFuZ2VIYW5kbGVyKQogICAg IG1fY2hhbmdlSGFuZGxlciA9IGNoYW5nZUhhbmRsZXI7CiAKICAgICBpZiAoY2hhbmdlSGFuZGxl ci5jYWxsYmFjaykKLSAgICAgICAgV0tDb29raWVNYW5hZ2VyU3RhcnRPYnNlcnZpbmdDb29raWVD aGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdldCgpKTsKKyAgICAgICAgbV9jb29raWVNYW5hZ2Vy LT5zdGFydE9ic2VydmluZ0Nvb2tpZUNoYW5nZXMoKTsKICAgICBlbHNlCi0gICAgICAgIFdLQ29v a2llTWFuYWdlclN0b3BPYnNlcnZpbmdDb29raWVDaGFuZ2VzKG1fd2tDb29raWVNYW5hZ2VyLmdl dCgpKTsKKyAgICAgICAgbV9jb29raWVNYW5hZ2VyLT5zdG9wT2JzZXJ2aW5nQ29va2llQ2hhbmdl cygpOwogfQogCiBib29sIEV3a0Nvb2tpZU1hbmFnZXI6OmlzV2F0Y2hpbmdGb3JDaGFuZ2VzKCkg Y29uc3QKQEAgLTEwMCwxMiArMTAyLDEyIEBAIGJvb2wgRXdrQ29va2llTWFuYWdlcjo6aXNXYXRj aGluZ0ZvckNoYW5nZXMoKSBjb25zdAogCiB2b2lkIEV3a0Nvb2tpZU1hbmFnZXI6OmdldEhvc3RO YW1lc1dpdGhDb29raWVzKFdLQ29va2llTWFuYWdlckdldENvb2tpZUhvc3RuYW1lc0Z1bmN0aW9u IGNhbGxiYWNrLCB2b2lkKiB1c2VyRGF0YSkgY29uc3QKIHsKLSAgICBXS0Nvb2tpZU1hbmFnZXJH ZXRIb3N0bmFtZXNXaXRoQ29va2llcyhtX3drQ29va2llTWFuYWdlci5nZXQoKSwgdXNlckRhdGEs IGNhbGxiYWNrKTsKKyAgICBtX2Nvb2tpZU1hbmFnZXItPmdldEhvc3RuYW1lc1dpdGhDb29raWVz KEFycmF5Q2FsbGJhY2s6OmNyZWF0ZSh1c2VyRGF0YSwgY2FsbGJhY2spKTsKIH0KIAogdm9pZCBF d2tDb29raWVNYW5hZ2VyOjpnZXRIVFRQQWNjZXB0UG9saWN5KFdLQ29va2llTWFuYWdlckdldEhU VFBDb29raWVBY2NlcHRQb2xpY3lGdW5jdGlvbiBjYWxsYmFjaywgdm9pZCogdXNlckRhdGEpIGNv bnN0CiB7Ci0gICAgV0tDb29raWVNYW5hZ2VyR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeShtX3dr Q29va2llTWFuYWdlci5nZXQoKSwgdXNlckRhdGEsIGNhbGxiYWNrKTsKKyAgICBtX2Nvb2tpZU1h bmFnZXItPmdldEhUVFBDb29raWVBY2NlcHRQb2xpY3koSFRUUENvb2tpZUFjY2VwdFBvbGljeUNh bGxiYWNrOjpjcmVhdGUodXNlckRhdGEsIGNhbGxiYWNrKSk7CiB9CiAKIHZvaWQgRXdrQ29va2ll TWFuYWdlcjo6Y29va2llc0RpZENoYW5nZShXS0Nvb2tpZU1hbmFnZXJSZWYsIGNvbnN0IHZvaWQq IGNsaWVudEluZm8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5hZ2VyX3ByaXZhdGUuaAppbmRleCA2MjRhYjA5NmZiOWIw MWE1NzMyMDgzYjQ3ZWE1YTYwNmQ3YjgzMmQxLi45ZGFmMTdhYjM1YWVlN2U2MjY3ZjE3MWMxODQw Njg1YmJhZjNkNGMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29va2llX21hbmFnZXJfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlcl9wcml2YXRlLmgKQEAgLTI4LDcgKzI4LDcg QEAKIAogI2luY2x1ZGUgIlNvdXBDb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUuaCIKICNpbmNs dWRlICJXS0Nvb2tpZU1hbmFnZXIuaCIKLSNpbmNsdWRlICJXS1JldGFpblB0ci5oIgorI2luY2x1 ZGUgIldlYkNvb2tpZU1hbmFnZXJQcm94eS5oIgogI2luY2x1ZGUgImV3a19jb29raWVfbWFuYWdl ci5oIgogI2luY2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25Q dHIuaD4KQEAgLTUwLDkgKzUwLDkgQEAgc3RydWN0IENvb2tpZV9DaGFuZ2VfSGFuZGxlciB7CiAK IGNsYXNzIEV3a0Nvb2tpZU1hbmFnZXIgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRy PEV3a0Nvb2tpZU1hbmFnZXI+IGNyZWF0ZShXS0Nvb2tpZU1hbmFnZXJSZWYgY29va2llTWFuYWdl clJlZikKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb29raWVNYW5hZ2VyPiBjcmVhdGUoUGFz c1JlZlB0cjxXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94eT4gY29va2llTWFuYWdlcikKICAg ICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29va2llTWFuYWdlcihjb29raWVN YW5hZ2VyUmVmKSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29va2llTWFuYWdl cihjb29raWVNYW5hZ2VyKSk7CiAgICAgfQogCiAgICAgfkV3a0Nvb2tpZU1hbmFnZXIoKTsKQEAg LTY5LDEzICs2OSwxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCB3YXRjaENoYW5nZXMoY29uc3QgQ29v a2llX0NoYW5nZV9IYW5kbGVyJiBjaGFuZ2VIYW5kbGVyKTsKIAogcHJpdmF0ZToKLSAgICBleHBs aWNpdCBFd2tDb29raWVNYW5hZ2VyKFdLQ29va2llTWFuYWdlclJlZiBjb29raWVNYW5hZ2VyUmVm KTsKKyAgICBleHBsaWNpdCBFd2tDb29raWVNYW5hZ2VyKFBhc3NSZWZQdHI8V2ViS2l0OjpXZWJD b29raWVNYW5hZ2VyUHJveHk+IGNvb2tpZU1hbmFnZXIpOwogCiAgICAgYm9vbCBpc1dhdGNoaW5n Rm9yQ2hhbmdlcygpIGNvbnN0OwogCiAgICAgc3RhdGljIHZvaWQgY29va2llc0RpZENoYW5nZShX S0Nvb2tpZU1hbmFnZXJSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogCi0gICAgV0tSZXRh aW5QdHI8V0tDb29raWVNYW5hZ2VyUmVmPiBtX3drQ29va2llTWFuYWdlcjsKKyAgICBSZWZQdHI8 V2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyUHJveHk+IG1fY29va2llTWFuYWdlcjsKICAgICBDb29r aWVfQ2hhbmdlX0hhbmRsZXIgbV9jaGFuZ2VIYW5kbGVyOwogfTsKIAo=