102684 2012-11-19 06:35:18 -0800 [EFL][WK2] Use consistent class names in the clients 2012-11-21 18:07:24 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jinwoo7.song jinwoo7.song cdumez gyuyoung.kim ljaehun.lim lucas.de.marchi mikhail.pozdnyakov rakuco webkit.review.bot oldest_to_newest 770676 0 jinwoo7.song 2012-11-19 06:35:18 -0800 WebKit EFL classes do not use '_' since r135117 but '_' is still used in the clients. 770688 1 174969 jinwoo7.song 2012-11-19 06:45:02 -0800 Created attachment 174969 Patch 771647 2 174969 mikhail.pozdnyakov 2012-11-20 00:44:17 -0800 Comment on attachment 174969 Patch OK 772507 3 174969 cdumez 2012-11-20 23:30:59 -0800 Comment on attachment 174969 Patch LGTM. 773306 4 175524 ljaehun.lim 2012-11-21 14:39:44 -0800 Created attachment 175524 Patch 773310 5 ljaehun.lim 2012-11-21 14:44:20 -0800 Oops, I'm sorry. I entered wrong bug ID. Please ignore my patch. 773341 6 175524 ljaehun.lim 2012-11-21 15:17:44 -0800 Comment on attachment 175524 Patch I'm sorry. Mark "obsolete" my wrong patch. 773448 7 174969 gyuyoung.kim 2012-11-21 17:50:05 -0800 Comment on attachment 174969 Patch r=me 773458 8 174969 webkit.review.bot 2012-11-21 18:07:19 -0800 Comment on attachment 174969 Patch Clearing flags on attachment: 174969 Committed r135461: <http://trac.webkit.org/changeset/135461> 773459 9 webkit.review.bot 2012-11-21 18:07:24 -0800 All reviewed patches have been landed. Closing bug. 174969 2012-11-19 06:45:02 -0800 2012-11-21 18:07:19 -0800 Patch bug-102684-20121119234246.patch text/plain 18070 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzc0MGQ0NzgzYzlhZWQ1 MDBiZDMyYWQ1NjY4MDJhMGVkZjEwMjU5Mi4uODUzYzA4NjQ3ZjY3ZDEyOGQwN2QxOGViOTZiYTVl ZjViYWU1MTNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDEyLTExLTE5ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IFVzZSBjb25zaXN0ZW50IGNsYXNzIG5hbWVzIGluIHRoZSBjbGllbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI2ODQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQgRUZMIGNsYXNzZXMgZG8g bm90IHVzZSAnXycgc2luY2UgcjEzNTExNyBidXQgJ18nIGlzIHN0aWxsIHJlbWFpbmVkCisgICAg ICAgIGluIHNvbWUgY2xpZW50cyBjbGFzc2VzLiBUaGlzIHBhdGNoIHJlbW92ZWQgdGhlICdfJyB0 byBtYWtlIGNsYXNzIG5hbWVzCisgICAgICAgIHRvIGJlIGNvbnNpc3RlbnQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvZWZsL0NvbnRleHRIaXN0b3J5Q2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6Q29udGV4dEhpc3RvcnlDbGllbnRFZmw6OmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25E YXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL0Rvd25sb2FkTWFuYWdlckVmbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkRvd25sb2FkTWFuYWdlckVmbDo6ZGlkRmFpbCk6CisgICAgICAgICog VUlQcm9jZXNzL2VmbC9Gb3JtQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Rm9ybUNs aWVudEVmbDo6d2lsbFN1Ym1pdEZvcm0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvUGFnZUxv YWRDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZENsaWVudEVmbDo6ZGlk UmVjZWl2ZUludGVudEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UGFnZUxvYWRDbGllbnRF Zmw6OnJlZ2lzdGVySW50ZW50U2VydmljZUZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UGFn ZUxvYWRDbGllbnRFZmw6OmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOgorICAgICAgICAo V2ViS2l0OjpQYWdlTG9hZENsaWVudEVmbDo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJv ckZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6UGFnZUxvYWRDbGllbnRFZmw6OmRpZFJlY2Vp dmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9l ZmwvUGFnZVBvbGljeUNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VQb2xpY3lD bGllbnRFZmw6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24pOgorICAgICAgICAoV2Vi S2l0OjpQYWdlUG9saWN5Q2xpZW50RWZsOjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24p OgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6UGFnZVVJQ2xpZW50RWZsOjpydW5PcGVuUGFuZWwpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9lZmwvUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpF d2tVcmxTY2hlbWVIYW5kbGVyOjpFd2tVcmxTY2hlbWVIYW5kbGVyKToKKyAgICAgICAgKFdlYktp dDo6UmVxdWVzdE1hbmFnZXJDbGllbnRFZmw6OmRpZFJlY2VpdmVVUklSZXF1ZXN0KToKKyAgICAg ICAgKFdlYktpdDo6UmVxdWVzdE1hbmFnZXJDbGllbnRFZmw6OnJlZ2lzdGVyVVJMU2NoZW1lSGFu ZGxlcik6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9SZXF1ZXN0TWFuYWdlckNsaWVudEVmbC5o OgorICAgICAgICAoUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwpOgorICAgICAgICAqIFVJUHJvY2Vz cy9lZmwvUmVzb3VyY2VMb2FkQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVzb3Vy Y2VMb2FkQ2xpZW50RWZsOjpkaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZSk6CisgICAgICAgIChX ZWJLaXQ6OlJlc291cmNlTG9hZENsaWVudEVmbDo6ZGlkU2VuZFJlcXVlc3RGb3JSZXNvdXJjZSk6 CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9hZENsaWVudEVmbDo6ZGlkUmVjZWl2ZVJlc3Bv bnNlRm9yUmVzb3VyY2UpOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZUxvYWRDbGllbnRFZmw6 OmRpZEZpbmlzaExvYWRGb3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJLaXQ6OlJlc291cmNlTG9h ZENsaWVudEVmbDo6ZGlkRmFpbExvYWRGb3JSZXNvdXJjZSk6CisgICAgICAgICogVUlQcm9jZXNz L2VmbC9SZXNvdXJjZUxvYWRDbGllbnRFZmwuaDoKKyAgICAgICAgKFJlc291cmNlTG9hZENsaWVu dEVmbCk6CisKIDIwMTItMTEtMTkgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGRmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRIaXN0b3J5Q2xpZW50RWZsLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4dEhpc3RvcnlDbGllbnRFZmwuY3BwCmluZGV4IDUz ZGM2ODIzOTM3MGMyOWY4ZmEyODJhOWRiNTQ0M2FiMWVkZThiYjUuLjVmMjBjMTc1Yjk4MzU2OTc1 ZGMwYmM2MWZkM2NkZjU2ZDFmYzY5MGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvQ29udGV4dEhpc3RvcnlDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvQ29udGV4dEhpc3RvcnlDbGllbnRFZmwuY3BwCkBAIC01Myw3ICs1Myw3 IEBAIHZvaWQgQ29udGV4dEhpc3RvcnlDbGllbnRFZmw6OmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRp b25EYXRhKFdLQ29udGV4dFJlZiwgV0tQYWdlCiAgICAgaWYgKCFoaXN0b3J5Q2xpZW50LT5tX25h dmlnYXRlKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQdHI8RXdrX05hdmlnYXRpb25fRGF0 YT4gbmF2aWdhdGlvbkRhdGFFd2sgPSBFd2tOYXZpZ2F0aW9uRGF0YTo6Y3JlYXRlKG5hdmlnYXRp b25EYXRhKTsKKyAgICBSZWZQdHI8RXdrTmF2aWdhdGlvbkRhdGE+IG5hdmlnYXRpb25EYXRhRXdr ID0gRXdrTmF2aWdhdGlvbkRhdGE6OmNyZWF0ZShuYXZpZ2F0aW9uRGF0YSk7CiAgICAgaGlzdG9y eUNsaWVudC0+bV9uYXZpZ2F0ZShFd2tWaWV3SW1wbDo6dmlld0Zyb21QYWdlVmlld01hcChwYWdl KSwgbmF2aWdhdGlvbkRhdGFFd2suZ2V0KCksIGhpc3RvcnlDbGllbnQtPm1fdXNlckRhdGEpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0Rvd25sb2FkTWFu YWdlckVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0Rvd25sb2FkTWFuYWdl ckVmbC5jcHAKaW5kZXggNWU5MmU1N2YyNGE1NjNlZmJjNDQzZmE5ZDRjY2U4NTZmMDM2N2VjYy4u ZGZmNjZhNjMwNWM4NTczNDVjMjNjNjlmMzk0OTEzYWM5Y2MxOWFiOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Eb3dubG9hZE1hbmFnZXJFZmwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRG93bmxvYWRNYW5hZ2VyRWZsLmNwcApAQCAtODks NyArODksNyBAQCB2b2lkIERvd25sb2FkTWFuYWdlckVmbDo6ZGlkRmFpbChXS0NvbnRleHRSZWYs IFdLRG93bmxvYWRSZWYgd2tEb3dubG9hZCwgV0tFcnJvcgogICAgIEV3a0Rvd25sb2FkSm9iKiBk b3dubG9hZCA9IGRvd25sb2FkTWFuYWdlci0+ZG93bmxvYWRKb2IoZG93bmxvYWRJZCk7CiAgICAg QVNTRVJUKGRvd25sb2FkKTsKIAotICAgIE93blB0cjxFd2tfRXJyb3I+IGV3a0Vycm9yID0gRXdr X0Vycm9yOjpjcmVhdGUoZXJyb3IpOworICAgIE93blB0cjxFd2tFcnJvcj4gZXdrRXJyb3IgPSBF d2tFcnJvcjo6Y3JlYXRlKGVycm9yKTsKICAgICBkb3dubG9hZC0+c2V0U3RhdGUoRVdLX0RPV05M T0FEX0pPQl9TVEFURV9GQUlMRUQpOwogICAgIEV3a19Eb3dubG9hZF9Kb2JfRXJyb3IgZG93bmxv YWRFcnJvciA9IHsgZG93bmxvYWQsIGV3a0Vycm9yLmdldCgpIH07CiAgICAgZG93bmxvYWQtPnZp ZXdJbXBsKCktPnNtYXJ0Q2FsbGJhY2s8RG93bmxvYWRKb2JGYWlsZWQ+KCkuY2FsbCgmZG93bmxv YWRFcnJvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0Zvcm1D bGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Gb3JtQ2xpZW50RWZs LmNwcAppbmRleCBhNmU1OWQxMTM2YTVlNzA5MTg2OWJhNGNiMzM0NWJkMWZjZDRiMzE1Li4wMDFi YmE0NjZmOWU5MjdlMGU1ZmI1ZDVkYzFkNzc2ZTA5N2MxZWY3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0Zvcm1DbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9lZmwvRm9ybUNsaWVudEVmbC5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgdm9p ZCBGb3JtQ2xpZW50RWZsOjp3aWxsU3VibWl0Rm9ybShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYgLypm cmFtZSovLCBXS0ZyYW1lUmVmIC8KIHsKICAgICBGb3JtQ2xpZW50RWZsKiBmb3JtQ2xpZW50ID0g dG9Gb3JtQ2xpZW50RWZsKGNsaWVudEluZm8pOwogCi0gICAgUmVmUHRyPEV3a19Gb3JtX1N1Ym1p c3Npb25fUmVxdWVzdD4gcmVxdWVzdCA9IEV3a0Zvcm1TdWJtaXNzaW9uUmVxdWVzdDo6Y3JlYXRl KHZhbHVlcywgbGlzdGVuZXIpOworICAgIFJlZlB0cjxFd2tGb3JtU3VibWlzc2lvblJlcXVlc3Q+ IHJlcXVlc3QgPSBFd2tGb3JtU3VibWlzc2lvblJlcXVlc3Q6OmNyZWF0ZSh2YWx1ZXMsIGxpc3Rl bmVyKTsKICAgICBmb3JtQ2xpZW50LT5tX3ZpZXdJbXBsLT5zbWFydENhbGxiYWNrPE5ld0Zvcm1T dWJtaXNzaW9uUmVxdWVzdD4oKS5jYWxsKHJlcXVlc3QuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VMb2FkQ2xpZW50RWZsLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwCmluZGV4IDZk MTYwMGM1OWFmZmIxMTY1NTk3YTczZTM1YmZjOWNiYzcxY2I3YjkuLjk3ZWU1NjI1ZjZmOGQ3YjBh ODkzNGRjMDg3ZTRhYjI4MDEzMWE0NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwCkBAIC01OSw3ICs1OSw3IEBAIHZvaWQgUGFn ZUxvYWRDbGllbnRFZmw6OmRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdLUGFnZVJlZiwgV0tTdHJp bmdSZWYgdGl0bGUsIFdLCiB2b2lkIFBhZ2VMb2FkQ2xpZW50RWZsOjpkaWRSZWNlaXZlSW50ZW50 Rm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS0ludGVudERhdGFSZWYgaW50ZW50LCBX S1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgRXdrVmlld0ltcGwqIHZp ZXdJbXBsID0gdG9QYWdlTG9hZENsaWVudEVmbChjbGllbnRJbmZvKS0+dmlld0ltcGwoKTsKLSAg ICBSZWZQdHI8RXdrX0ludGVudD4gZXdrSW50ZW50ID0gRXdrSW50ZW50OjpjcmVhdGUoaW50ZW50 KTsKKyAgICBSZWZQdHI8RXdrSW50ZW50PiBld2tJbnRlbnQgPSBFd2tJbnRlbnQ6OmNyZWF0ZShp bnRlbnQpOwogICAgIHZpZXdJbXBsLT5zbWFydENhbGxiYWNrPEludGVudFJlcXVlc3Q+KCkuY2Fs bChld2tJbnRlbnQuZ2V0KCkpOwogfQogI2VuZGlmCkBAIC02OCw3ICs2OCw3IEBAIHZvaWQgUGFn ZUxvYWRDbGllbnRFZmw6OmRpZFJlY2VpdmVJbnRlbnRGb3JGcmFtZShXS1BhZ2VSZWYsIFdLRnJh bWVSZWYsIFdLSW50ZW50CiB2b2lkIFBhZ2VMb2FkQ2xpZW50RWZsOjpyZWdpc3RlckludGVudFNl cnZpY2VGb3JGcmFtZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLSW50ZW50U2VydmljZUluZm9S ZWYgc2VydmljZUluZm8sIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAg ICBFd2tWaWV3SW1wbCogdmlld0ltcGwgPSB0b1BhZ2VMb2FkQ2xpZW50RWZsKGNsaWVudEluZm8p LT52aWV3SW1wbCgpOwotICAgIFJlZlB0cjxFd2tfSW50ZW50X1NlcnZpY2U+IGV3a0ludGVudFNl cnZpY2UgPSBFd2tJbnRlbnRTZXJ2aWNlOjpjcmVhdGUoc2VydmljZUluZm8pOworICAgIFJlZlB0 cjxFd2tJbnRlbnRTZXJ2aWNlPiBld2tJbnRlbnRTZXJ2aWNlID0gRXdrSW50ZW50U2VydmljZTo6 Y3JlYXRlKHNlcnZpY2VJbmZvKTsKICAgICB2aWV3SW1wbC0+c21hcnRDYWxsYmFjazxJbnRlbnRT ZXJ2aWNlUmVnaXN0cmF0aW9uPigpLmNhbGwoZXdrSW50ZW50U2VydmljZS5nZXQoKSk7CiB9CiAj ZW5kaWYKQEAgLTk1LDcgKzk1LDcgQEAgdm9pZCBQYWdlTG9hZENsaWVudEVmbDo6ZGlkRmFpbExv YWRXaXRoRXJyb3JGb3JGcmFtZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYgZnJhbWUKICAgICAgICAg cmV0dXJuOwogCiAgICAgRXdrVmlld0ltcGwqIHZpZXdJbXBsID0gdG9QYWdlTG9hZENsaWVudEVm bChjbGllbnRJbmZvKS0+dmlld0ltcGwoKTsKLSAgICBPd25QdHI8RXdrX0Vycm9yPiBld2tFcnJv ciA9IEV3a19FcnJvcjo6Y3JlYXRlKGVycm9yKTsKKyAgICBPd25QdHI8RXdrRXJyb3I+IGV3a0Vy cm9yID0gRXdrRXJyb3I6OmNyZWF0ZShlcnJvcik7CiAgICAgdmlld0ltcGwtPnNtYXJ0Q2FsbGJh Y2s8TG9hZEVycm9yPigpLmNhbGwoZXdrRXJyb3IuZ2V0KCkpOwogICAgIHZpZXdJbXBsLT5zbWFy dENhbGxiYWNrPExvYWRGaW5pc2hlZD4oKS5jYWxsKCk7CiB9CkBAIC0xMjYsNyArMTI2LDcgQEAg dm9pZCBQYWdlTG9hZENsaWVudEVmbDo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZv ckZyYW1lKFdLUGFnZVJlZiwgV0tGcmEKICAgICAgICAgcmV0dXJuOwogCiAgICAgRXdrVmlld0lt cGwqIHZpZXdJbXBsID0gdG9QYWdlTG9hZENsaWVudEVmbChjbGllbnRJbmZvKS0+dmlld0ltcGwo KTsKLSAgICBPd25QdHI8RXdrX0Vycm9yPiBld2tFcnJvciA9IEV3a19FcnJvcjo6Y3JlYXRlKGVy cm9yKTsKKyAgICBPd25QdHI8RXdrRXJyb3I+IGV3a0Vycm9yID0gRXdrRXJyb3I6OmNyZWF0ZShl cnJvcik7CiAgICAgdmlld0ltcGwtPnNtYXJ0Q2FsbGJhY2s8UHJvdmlzaW9uYWxMb2FkRmFpbGVk PigpLmNhbGwoZXdrRXJyb3IuZ2V0KCkpOwogfQogCkBAIC0xNjYsNyArMTY2LDcgQEAgdm9pZCBQ YWdlTG9hZENsaWVudEVmbDo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlSW5GcmFt ZShXS1BhZ2VSZWYsIFdLRnIKIHsKICAgICBFd2tWaWV3SW1wbCogdmlld0ltcGwgPSB0b1BhZ2VM b2FkQ2xpZW50RWZsKGNsaWVudEluZm8pLT52aWV3SW1wbCgpOwogCi0gICAgUmVmUHRyPEV3a19B dXRoX1JlcXVlc3Q+IGF1dGhlbnRpY2F0aW9uUmVxdWVzdCA9IEV3a0F1dGhSZXF1ZXN0OjpjcmVh dGUodG9JbXBsKGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKSk7CisgICAgUmVmUHRyPEV3a0F1dGhS ZXF1ZXN0PiBhdXRoZW50aWNhdGlvblJlcXVlc3QgPSBFd2tBdXRoUmVxdWVzdDo6Y3JlYXRlKHRv SW1wbChhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkpOwogICAgIHZpZXdJbXBsLT5zbWFydENhbGxi YWNrPEF1dGhlbnRpY2F0aW9uUmVxdWVzdD4oKS5jYWxsKGF1dGhlbnRpY2F0aW9uUmVxdWVzdC5n ZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFn ZVBvbGljeUNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VQ b2xpY3lDbGllbnRFZmwuY3BwCmluZGV4IDhmYjYwYzI3MDdhZTE1ZTEyM2NlNjNhOWE2MDU3ZGMy NzQ0MDk0NDYuLjAyNTNmYWE0ZjYwMDVmMTFiMDY0NjdmZTE2NmY5YWFlYTBhY2Q2ZWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVBvbGljeUNsaWVudEVmbC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlUG9saWN5Q2xpZW50RWZs LmNwcApAQCAtNDgsNyArNDgsNyBAQCB2b2lkIFBhZ2VQb2xpY3lDbGllbnRFZmw6OmRlY2lkZVBv bGljeUZvck5hdmlnYXRpb25BY3Rpb24oV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLAogewogICAgIFBh Z2VQb2xpY3lDbGllbnRFZmwqIHBvbGljeUNsaWVudCA9IHRvUGFnZVBvbGljeUNsaWVudEVmbChj bGllbnRJbmZvKTsKIAotICAgIFJlZlB0cjxFd2tfTmF2aWdhdGlvbl9Qb2xpY3lfRGVjaXNpb24+ IGRlY2lzaW9uID0gRXdrTmF2aWdhdGlvblBvbGljeURlY2lzaW9uOjpjcmVhdGUobmF2aWdhdGlv blR5cGUsIG1vdXNlQnV0dG9uLCBtb2RpZmllcnMsIHJlcXVlc3QsIDAsIGxpc3RlbmVyKTsKKyAg ICBSZWZQdHI8RXdrTmF2aWdhdGlvblBvbGljeURlY2lzaW9uPiBkZWNpc2lvbiA9IEV3a05hdmln YXRpb25Qb2xpY3lEZWNpc2lvbjo6Y3JlYXRlKG5hdmlnYXRpb25UeXBlLCBtb3VzZUJ1dHRvbiwg bW9kaWZpZXJzLCByZXF1ZXN0LCAwLCBsaXN0ZW5lcik7CiAgICAgcG9saWN5Q2xpZW50LT5tX3Zp ZXdJbXBsLT5zbWFydENhbGxiYWNrPE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbj4oKS5jYWxsKGRl Y2lzaW9uLmdldCgpKTsKIH0KIApAQCAtNTYsNyArNTYsNyBAQCB2b2lkIFBhZ2VQb2xpY3lDbGll bnRFZmw6OmRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbihXS1BhZ2VSZWYsIFdLRnJhbWVS ZWYsCiB7CiAgICAgUGFnZVBvbGljeUNsaWVudEVmbCogcG9saWN5Q2xpZW50ID0gdG9QYWdlUG9s aWN5Q2xpZW50RWZsKGNsaWVudEluZm8pOwogCi0gICAgUmVmUHRyPEV3a19OYXZpZ2F0aW9uX1Bv bGljeV9EZWNpc2lvbj4gZGVjaXNpb24gPSBFd2tOYXZpZ2F0aW9uUG9saWN5RGVjaXNpb246OmNy ZWF0ZShuYXZpZ2F0aW9uVHlwZSwgbW91c2VCdXR0b24sIG1vZGlmaWVycywgcmVxdWVzdCwgdG9J bXBsKGZyYW1lTmFtZSktPnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIGxpc3RlbmVyKTsKKyAgICBS ZWZQdHI8RXdrTmF2aWdhdGlvblBvbGljeURlY2lzaW9uPiBkZWNpc2lvbiA9IEV3a05hdmlnYXRp b25Qb2xpY3lEZWNpc2lvbjo6Y3JlYXRlKG5hdmlnYXRpb25UeXBlLCBtb3VzZUJ1dHRvbiwgbW9k aWZpZXJzLCByZXF1ZXN0LCB0b0ltcGwoZnJhbWVOYW1lKS0+c3RyaW5nKCkudXRmOCgpLmRhdGEo KSwgbGlzdGVuZXIpOwogICAgIHBvbGljeUNsaWVudC0+bV92aWV3SW1wbC0+c21hcnRDYWxsYmFj azxOZXdXaW5kb3dQb2xpY3lEZWNpc2lvbj4oKS5jYWxsKGRlY2lzaW9uLmdldCgpKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwuY3BwCmlu ZGV4IDJiNzUwNzEwZjlkZTRhN2NlNGY4OWVkMDc2OWY2ZTU3NDUxODg1NTkuLmMyZWE4MjQ2NjNi ZTMzOWM4NWMyNzI1OGUwZDMyZGE4MDdkZDAyZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVmbC5jcHAKQEAgLTEyMiw3ICsxMjIsNyBAQCB2b2lk IFBhZ2VVSUNsaWVudEVmbDo6c2V0V2luZG93RnJhbWUoV0tQYWdlUmVmLCBXS1JlY3QgZnJhbWUs IGNvbnN0IHZvaWQqIGNsaWVudAogdm9pZCBQYWdlVUlDbGllbnRFZmw6OnJ1bk9wZW5QYW5lbChX S1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLT3BlblBhbmVsUGFyYW1ldGVyc1JlZiBwYXJhbWV0ZXJz LCBXS09wZW5QYW5lbFJlc3VsdExpc3RlbmVyUmVmIGxpc3RlbmVyLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKQogewogICAgIEV3a1ZpZXdJbXBsKiB2aWV3SW1wbCA9IHRvUGFnZVVJQ2xpZW50RWZs KGNsaWVudEluZm8pLT5tX3ZpZXdJbXBsOwotICAgIFJlZlB0cjxFd2tfRmlsZV9DaG9vc2VyX1Jl cXVlc3Q+IGZpbGVDaG9vc2VyUmVxdWVzdCA9IEV3a0ZpbGVDaG9vc2VyUmVxdWVzdDo6Y3JlYXRl KHRvSW1wbChwYXJhbWV0ZXJzKSwgdG9JbXBsKGxpc3RlbmVyKSk7CisgICAgUmVmUHRyPEV3a0Zp bGVDaG9vc2VyUmVxdWVzdD4gZmlsZUNob29zZXJSZXF1ZXN0ID0gRXdrRmlsZUNob29zZXJSZXF1 ZXN0OjpjcmVhdGUodG9JbXBsKHBhcmFtZXRlcnMpLCB0b0ltcGwobGlzdGVuZXIpKTsKICAgICB2 aWV3SW1wbC0+c21hcnRDYWxsYmFjazxGaWxlQ2hvb3NlclJlcXVlc3Q+KCkuY2FsbChmaWxlQ2hv b3NlclJlcXVlc3QuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL1JlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuY3BwCmluZGV4IDc2N2E2YzAzMWU2 MDYxNTRhNThiNTcyNTMxN2RjMWFlZWNkMWRmMmIuLmUyMWQ2OTk1NDE4ZTc4NDc3ZThhZGZhOTNm ZjcxMzI1NzE5OGFjMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv UmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuY3BwCkBAIC0zNCwxNiArMzQsMTYgQEAKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKLXN0cnVjdCBFd2tfVXJsX1NjaGVtZV9IYW5kbGVyIHsKK3N0 cnVjdCBFd2tVcmxTY2hlbWVIYW5kbGVyIHsKICAgICBFd2tfVXJsX1NjaGVtZV9SZXF1ZXN0X0Ni IGNhbGxiYWNrOwogICAgIHZvaWQqIHVzZXJEYXRhOwogCi0gICAgRXdrX1VybF9TY2hlbWVfSGFu ZGxlcigpCisgICAgRXdrVXJsU2NoZW1lSGFuZGxlcigpCiAgICAgICAgIDogY2FsbGJhY2soMCkK ICAgICAgICAgLCB1c2VyRGF0YSgwKQogICAgIHsgfQogCi0gICAgRXdrX1VybF9TY2hlbWVfSGFu ZGxlcihFd2tfVXJsX1NjaGVtZV9SZXF1ZXN0X0NiIGNhbGxiYWNrLCB2b2lkKiB1c2VyRGF0YSkK KyAgICBFd2tVcmxTY2hlbWVIYW5kbGVyKEV3a19VcmxfU2NoZW1lX1JlcXVlc3RfQ2IgY2FsbGJh Y2ssIHZvaWQqIHVzZXJEYXRhKQogICAgICAgICA6IGNhbGxiYWNrKGNhbGxiYWNrKQogICAgICAg ICAsIHVzZXJEYXRhKHVzZXJEYXRhKQogICAgIHsgfQpAQCAtNTksNyArNTksNyBAQCB2b2lkIFJl cXVlc3RNYW5hZ2VyQ2xpZW50RWZsOjpkaWRSZWNlaXZlVVJJUmVxdWVzdChXS1NvdXBSZXF1ZXN0 TWFuYWdlclJlZiBzb3VwUgogICAgIFJlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsKiByZXF1ZXN0TWFu YWdlciA9IHRvUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwoY2xpZW50SW5mbyk7CiAKICAgICBSZWZQ dHI8RXdrVXJsU2NoZW1lUmVxdWVzdD4gc2NoZW1lUmVxdWVzdCA9IEV3a1VybFNjaGVtZVJlcXVl c3Q6OmNyZWF0ZShzb3VwUmVxdWVzdE1hbmFnZXJSZWYsIHVybFJlZiwgcmVxdWVzdElEKTsKLSAg ICBFd2tfVXJsX1NjaGVtZV9IYW5kbGVyIGhhbmRsZXIgPSByZXF1ZXN0TWFuYWdlci0+bV91cmxT Y2hlbWVIYW5kbGVycy5nZXQoc2NoZW1lUmVxdWVzdC0+c2NoZW1lKCkpOworICAgIEV3a1VybFNj aGVtZUhhbmRsZXIgaGFuZGxlciA9IHJlcXVlc3RNYW5hZ2VyLT5tX3VybFNjaGVtZUhhbmRsZXJz LmdldChzY2hlbWVSZXF1ZXN0LT5zY2hlbWUoKSk7CiAgICAgaWYgKCFoYW5kbGVyLmNhbGxiYWNr KQogICAgICAgICByZXR1cm47CiAKQEAgLTg5LDcgKzg5LDcgQEAgdm9pZCBSZXF1ZXN0TWFuYWdl ckNsaWVudEVmbDo6cmVnaXN0ZXJVUkxTY2hlbWVIYW5kbGVyKGNvbnN0IFN0cmluZyYgc2NoZW1l LCBFd2sKIHsKICAgICBBU1NFUlQoY2FsbGJhY2spOwogCi0gICAgbV91cmxTY2hlbWVIYW5kbGVy cy5zZXQoc2NoZW1lLCBFd2tfVXJsX1NjaGVtZV9IYW5kbGVyKGNhbGxiYWNrLCB1c2VyRGF0YSkp OworICAgIG1fdXJsU2NoZW1lSGFuZGxlcnMuc2V0KHNjaGVtZSwgRXdrVXJsU2NoZW1lSGFuZGxl cihjYWxsYmFjaywgdXNlckRhdGEpKTsKICAgICB0b0ltcGwobV9zb3VwUmVxdWVzdE1hbmFnZXIu Z2V0KCkpLT5yZWdpc3RlclVSSVNjaGVtZShzY2hlbWUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1JlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1JlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsLmgKaW5kZXgg NzFhYWVkZjdjNTg5NDBjN2E4YzBiMDQyZTUwMjE2MDNiOTM5MWU5Yy4uMzUzYmMyNTE2MDIzMjBk NzcyZjVjNDZmNmQ5MTRiODhkYWU2YjgyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9SZXF1ZXN0TWFuYWdlckNsaWVudEVmbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuaApAQCAtNTEsNyArNTEsNyBA QCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVVUklSZXF1ZXN0KFdLU291cFJl cXVlc3RNYW5hZ2VyUmVmLCBXS1VSTFJlZiwgV0tQYWdlUmVmLCB1aW50NjRfdCByZXF1ZXN0SUQs IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogCiAgICAgV0tSZXRhaW5QdHI8V0tTb3VwUmVxdWVz dE1hbmFnZXJSZWY+IG1fc291cFJlcXVlc3RNYW5hZ2VyOwotICAgIEhhc2hNYXA8U3RyaW5nLCBj bGFzcyBFd2tfVXJsX1NjaGVtZV9IYW5kbGVyPiBtX3VybFNjaGVtZUhhbmRsZXJzOworICAgIEhh c2hNYXA8U3RyaW5nLCBjbGFzcyBFd2tVcmxTY2hlbWVIYW5kbGVyPiBtX3VybFNjaGVtZUhhbmRs ZXJzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL1Jlc291cmNlTG9hZENsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL1Jlc291cmNlTG9hZENsaWVudEVmbC5jcHAKaW5kZXggMWY2YTlj Mjg1Y2FjZjk5YWRkNzhiOGMyN2Q0YTViNTUxN2FhMDJjYi4uZjFhNzAwYzU2ZWUzODRhNzM5ZjQ1 MDBmNTZkNTRlODRlNTI1ODBlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9SZXNvdXJjZUxvYWRDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9lZmwvUmVzb3VyY2VMb2FkQ2xpZW50RWZsLmNwcApAQCAtNTIsMTIgKzUyLDEyIEBAIHZv aWQgUmVzb3VyY2VMb2FkQ2xpZW50RWZsOjpkaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJjZShXS1Bh Z2VSZWYsIFdLRnJhbWVSZWYgd2tGCiAgICAgYm9vbCBpc01haW5SZXNvdXJjZSA9IChXS0ZyYW1l SXNNYWluRnJhbWUod2tGcmFtZSkgJiYgcGFnZUlzUHJvdmlzaW9uYWxseUxvYWRpbmcpOwogICAg IFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a1VybChBZG9wdFdLLCBXS1VSTFJlcXVlc3RDb3B5VVJM KHdrUmVxdWVzdCkpOwogCi0gICAgUmVmUHRyPEV3a19SZXNvdXJjZT4gcmVzb3VyY2UgPSBFd2tS ZXNvdXJjZTo6Y3JlYXRlKHdrVXJsLmdldCgpLCBpc01haW5SZXNvdXJjZSk7CisgICAgUmVmUHRy PEV3a1Jlc291cmNlPiByZXNvdXJjZSA9IEV3a1Jlc291cmNlOjpjcmVhdGUod2tVcmwuZ2V0KCks IGlzTWFpblJlc291cmNlKTsKIAogICAgIC8vIEtlZXAgdGhlIHJlc291cmNlIGludGVybmFsbHkg dG8gcmV1c2UgaXQgbGF0ZXIuCiAgICAgcmVzb3VyY2VMb2FkQ2xpZW50LT5tX2xvYWRpbmdSZXNv dXJjZXNNYXAuYWRkKHJlc291cmNlSWRlbnRpZmllciwgcmVzb3VyY2UpOwogCi0gICAgUmVmUHRy PEV3a19VcmxfUmVxdWVzdD4gcmVxdWVzdCA9IEV3a1VybFJlcXVlc3Q6OmNyZWF0ZSh3a1JlcXVl c3QpOworICAgIFJlZlB0cjxFd2tVcmxSZXF1ZXN0PiByZXF1ZXN0ID0gRXdrVXJsUmVxdWVzdDo6 Y3JlYXRlKHdrUmVxdWVzdCk7CiAgICAgRXdrX1Jlc291cmNlX1JlcXVlc3QgcmVzb3VyY2VSZXF1 ZXN0ID0ge3Jlc291cmNlLmdldCgpLCByZXF1ZXN0LmdldCgpLCAwfTsKICAgICByZXNvdXJjZUxv YWRDbGllbnQtPm1fdmlld0ltcGwtPnNtYXJ0Q2FsbGJhY2s8UmVzb3VyY2VMb2FkU3RhcnRlZD4o KS5jYWxsKCZyZXNvdXJjZVJlcXVlc3QpOwogfQpAQCAtNjYsMTMgKzY2LDEzIEBAIHZvaWQgUmVz b3VyY2VMb2FkQ2xpZW50RWZsOjpkaWRTZW5kUmVxdWVzdEZvclJlc291cmNlKFdLUGFnZVJlZiwg V0tGcmFtZVJlZiwgdWluCiB7CiAgICAgUmVzb3VyY2VMb2FkQ2xpZW50RWZsKiByZXNvdXJjZUxv YWRDbGllbnQgPSB0b1Jlc291cmNlTG9hZENsaWVudEVmbChjbGllbnRJbmZvKTsKIAotICAgIFJl ZlB0cjxFd2tfUmVzb3VyY2U+IHJlc291cmNlID0gcmVzb3VyY2VMb2FkQ2xpZW50LT5tX2xvYWRp bmdSZXNvdXJjZXNNYXAuZ2V0KHJlc291cmNlSWRlbnRpZmllcik7CisgICAgUmVmUHRyPEV3a1Jl c291cmNlPiByZXNvdXJjZSA9IHJlc291cmNlTG9hZENsaWVudC0+bV9sb2FkaW5nUmVzb3VyY2Vz TWFwLmdldChyZXNvdXJjZUlkZW50aWZpZXIpOwogICAgIC8vIE9ubHkgcHJvY2VzcyBpZiB3ZSBr bm93IGFib3V0IHRoaXMgcmVzb3VyY2UuCiAgICAgaWYgKCFyZXNvdXJjZSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgUmVmUHRyPEV3a19VcmxfUmVxdWVzdD4gcmVxdWVzdCA9IEV3a1VybFJlcXVl c3Q6OmNyZWF0ZSh3a1JlcXVlc3QpOwotICAgIFJlZlB0cjxFd2tfVXJsX1Jlc3BvbnNlPiByZWRp cmVjdFJlc3BvbnNlID0gRXdrVXJsUmVzcG9uc2U6OmNyZWF0ZSh3a1JlZGlyZWN0UmVzcG9uc2Up OworICAgIFJlZlB0cjxFd2tVcmxSZXF1ZXN0PiByZXF1ZXN0ID0gRXdrVXJsUmVxdWVzdDo6Y3Jl YXRlKHdrUmVxdWVzdCk7CisgICAgUmVmUHRyPEV3a1VybFJlc3BvbnNlPiByZWRpcmVjdFJlc3Bv bnNlID0gRXdrVXJsUmVzcG9uc2U6OmNyZWF0ZSh3a1JlZGlyZWN0UmVzcG9uc2UpOwogICAgIEV3 a19SZXNvdXJjZV9SZXF1ZXN0IHJlc291cmNlUmVxdWVzdCA9IHtyZXNvdXJjZS5nZXQoKSwgcmVx dWVzdC5nZXQoKSwgcmVkaXJlY3RSZXNwb25zZS5nZXQoKX07CiAgICAgcmVzb3VyY2VMb2FkQ2xp ZW50LT5tX3ZpZXdJbXBsLT5zbWFydENhbGxiYWNrPFJlc291cmNlUmVxdWVzdFNlbnQ+KCkuY2Fs bCgmcmVzb3VyY2VSZXF1ZXN0KTsKIH0KQEAgLTgxLDEyICs4MSwxMiBAQCB2b2lkIFJlc291cmNl TG9hZENsaWVudEVmbDo6ZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UoV0tQYWdlUmVmLCBX S0ZyYW1lUmVmLAogewogICAgIFJlc291cmNlTG9hZENsaWVudEVmbCogcmVzb3VyY2VMb2FkQ2xp ZW50ID0gdG9SZXNvdXJjZUxvYWRDbGllbnRFZmwoY2xpZW50SW5mbyk7CiAKLSAgICBSZWZQdHI8 RXdrX1Jlc291cmNlPiByZXNvdXJjZSA9IHJlc291cmNlTG9hZENsaWVudC0+bV9sb2FkaW5nUmVz b3VyY2VzTWFwLmdldChyZXNvdXJjZUlkZW50aWZpZXIpOworICAgIFJlZlB0cjxFd2tSZXNvdXJj ZT4gcmVzb3VyY2UgPSByZXNvdXJjZUxvYWRDbGllbnQtPm1fbG9hZGluZ1Jlc291cmNlc01hcC5n ZXQocmVzb3VyY2VJZGVudGlmaWVyKTsKICAgICAvLyBPbmx5IHByb2Nlc3MgaWYgd2Uga25vdyBh Ym91dCB0aGlzIHJlc291cmNlLgogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsK IAotICAgIFJlZlB0cjxFd2tfVXJsX1Jlc3BvbnNlPiByZXNwb25zZSA9IEV3a1VybFJlc3BvbnNl OjpjcmVhdGUod2tSZXNwb25zZSk7CisgICAgUmVmUHRyPEV3a1VybFJlc3BvbnNlPiByZXNwb25z ZSA9IEV3a1VybFJlc3BvbnNlOjpjcmVhdGUod2tSZXNwb25zZSk7CiAgICAgRXdrX1Jlc291cmNl X0xvYWRfUmVzcG9uc2UgcmVzb3VyY2VMb2FkUmVzcG9uc2UgPSB7cmVzb3VyY2UuZ2V0KCksIHJl c3BvbnNlLmdldCgpfTsKICAgICByZXNvdXJjZUxvYWRDbGllbnQtPm1fdmlld0ltcGwtPnNtYXJ0 Q2FsbGJhY2s8UmVzb3VyY2VMb2FkUmVzcG9uc2U+KCkuY2FsbCgmcmVzb3VyY2VMb2FkUmVzcG9u c2UpOwogfQpAQCAtOTUsNyArOTUsNyBAQCB2b2lkIFJlc291cmNlTG9hZENsaWVudEVmbDo6ZGlk RmluaXNoTG9hZEZvclJlc291cmNlKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgdWludAogewogICAg IFJlc291cmNlTG9hZENsaWVudEVmbCogcmVzb3VyY2VMb2FkQ2xpZW50ID0gdG9SZXNvdXJjZUxv YWRDbGllbnRFZmwoY2xpZW50SW5mbyk7CiAKLSAgICBSZWZQdHI8RXdrX1Jlc291cmNlPiByZXNv dXJjZSA9IHJlc291cmNlTG9hZENsaWVudC0+bV9sb2FkaW5nUmVzb3VyY2VzTWFwLmdldChyZXNv dXJjZUlkZW50aWZpZXIpOworICAgIFJlZlB0cjxFd2tSZXNvdXJjZT4gcmVzb3VyY2UgPSByZXNv dXJjZUxvYWRDbGllbnQtPm1fbG9hZGluZ1Jlc291cmNlc01hcC5nZXQocmVzb3VyY2VJZGVudGlm aWVyKTsKICAgICAvLyBPbmx5IHByb2Nlc3MgaWYgd2Uga25vdyBhYm91dCB0aGlzIHJlc291cmNl LgogICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgIHJldHVybjsKQEAgLTEwNywxMiArMTA3LDEy IEBAIHZvaWQgUmVzb3VyY2VMb2FkQ2xpZW50RWZsOjpkaWRGYWlsTG9hZEZvclJlc291cmNlKFdL UGFnZVJlZiwgV0tGcmFtZVJlZiwgdWludDY0CiB7CiAgICAgUmVzb3VyY2VMb2FkQ2xpZW50RWZs KiByZXNvdXJjZUxvYWRDbGllbnQgPSB0b1Jlc291cmNlTG9hZENsaWVudEVmbChjbGllbnRJbmZv KTsKIAotICAgIFJlZlB0cjxFd2tfUmVzb3VyY2U+IHJlc291cmNlID0gcmVzb3VyY2VMb2FkQ2xp ZW50LT5tX2xvYWRpbmdSZXNvdXJjZXNNYXAudGFrZShyZXNvdXJjZUlkZW50aWZpZXIpOworICAg IFJlZlB0cjxFd2tSZXNvdXJjZT4gcmVzb3VyY2UgPSByZXNvdXJjZUxvYWRDbGllbnQtPm1fbG9h ZGluZ1Jlc291cmNlc01hcC50YWtlKHJlc291cmNlSWRlbnRpZmllcik7CiAgICAgLy8gT25seSBw cm9jZXNzIGlmIHdlIGtub3cgYWJvdXQgdGhpcyByZXNvdXJjZS4KICAgICBpZiAoIXJlc291cmNl KQogICAgICAgICByZXR1cm47CiAKLSAgICBPd25QdHI8RXdrX0Vycm9yPiBld2tFcnJvciA9IEV3 a19FcnJvcjo6Y3JlYXRlKHdrRXJyb3IpOworICAgIE93blB0cjxFd2tFcnJvcj4gZXdrRXJyb3Ig PSBFd2tFcnJvcjo6Y3JlYXRlKHdrRXJyb3IpOwogICAgIEV3a19SZXNvdXJjZV9Mb2FkX0Vycm9y IHJlc291cmNlTG9hZEVycm9yID0ge3Jlc291cmNlLmdldCgpLCBld2tFcnJvci5nZXQoKX07CiAg ICAgcmVzb3VyY2VMb2FkQ2xpZW50LT5tX3ZpZXdJbXBsLT5zbWFydENhbGxiYWNrPFJlc291cmNl TG9hZEZhaWxlZD4oKS5jYWxsKCZyZXNvdXJjZUxvYWRFcnJvcik7CiAgICAgcmVzb3VyY2VMb2Fk Q2xpZW50LT5tX3ZpZXdJbXBsLT5zbWFydENhbGxiYWNrPFJlc291cmNlTG9hZEZpbmlzaGVkPigp LmNhbGwocmVzb3VyY2UuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9SZXNvdXJjZUxvYWRDbGllbnRFZmwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvUmVzb3VyY2VMb2FkQ2xpZW50RWZsLmgKaW5kZXggYjUzOWY5NmQzMGFiOGZlM2NkMDM3 OTM5OThmOGYxZWY5MDRkZDY3Ny4uN2VmZTVhMjJhOTE0YjQ0YTkxNzIyZjM5NjE4YTYzMzkzOTlj YjhlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9SZXNvdXJjZUxv YWRDbGllbnRFZmwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Jlc291cmNl TG9hZENsaWVudEVmbC5oCkBAIC01Niw3ICs1Niw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZv aWQgb25WaWV3UHJvdmlzaW9uYWxMb2FkU3RhcnRlZCh2b2lkKiB1c2VyRGF0YSwgRXZhc19PYmpl Y3QqIHZpZXcsIHZvaWQqIGNsaWVudEluZm8pOwogCiAgICAgRXdrVmlld0ltcGwqIG1fdmlld0lt cGw7Ci0gICAgSGFzaE1hcDwgdWludDY0X3QsIFJlZlB0cjxFd2tfUmVzb3VyY2U+ID4gbV9sb2Fk aW5nUmVzb3VyY2VzTWFwOworICAgIEhhc2hNYXA8IHVpbnQ2NF90LCBSZWZQdHI8RXdrUmVzb3Vy Y2U+ID4gbV9sb2FkaW5nUmVzb3VyY2VzTWFwOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 Cg== 175524 2012-11-21 14:39:44 -0800 2012-11-21 15:17:44 -0800 Patch bug-102684-20121122073730.patch text/plain 1357 ljaehun.lim U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDVkY2MzMzcxN2M4Njhm YmUzNzFmODU3ZTMxOTg5MmJmNjFhNTE0OC4uYjhmYTYwNmQ5N2JjYWE2ZDIzNzEyYjdhYjExZTRk OTEzYjJmZjE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTExLTIxICBKYWVo dW4gTGltICA8bGphZWh1bi5saW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBS ZW1vdmUgI2luY2x1ZGUgImV3a192aWV3X3ByaXZhdGUuaCIgaW4gUGFnZVZpZXdwb3J0Q29udHJv bGxlckNsaWVudEVmbC5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMjc3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwIGRvZXNuJ3QgbmVl ZCB0byBpbmNsdWRlIGV3a192aWV3X3ByaXZhdGUuaC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9l ZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5jcHA6CisKIDIwMTItMTEtMjEgIEh1 YW5nIERvbmdzdW5nICA8bHV4dGVsbGFAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgUkVHUkVT U0lPTihyMTM1MjEyKTogRml4IGNyYXNoIGR1ZSB0byBhbiBpbmZpbml0ZSByZWN0LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbC5jcHAKaW5kZXggYmE4OWUzY2RkN2E0NTExNmYyMTdkY2VhNzZh ZTBhNGVmMTIxOGMwMS4uY2RkNTY1MDA4NWY5MjgxOTg5MjBhOThjYzZjMzM1ZWY5MjIwYjFjMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCkBAIC0zMyw3ICszMyw2IEBACiAjaW5j bHVkZSAiTGF5ZXJUcmVlUmVuZGVyZXIuaCIKICNpbmNsdWRlICJQYWdlVmlld3BvcnRDb250cm9s bGVyLmgiCiAjaW5jbHVkZSAiVHJhbnNmb3JtYXRpb25NYXRyaXguaCIKLSNpbmNsdWRlICJld2tf dmlld19wcml2YXRlLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCg==