143984 2015-04-21 02:16:44 -0700 Rename hasOverride{Height,Width}() to hasOverrideLogicalContent{Height,Width}() 2015-04-22 03:32:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rego rego benjamin commit-queue darin esprehn+autocc glenn hyatt kondapallykalyan svillar oldest_to_newest 1087018 0 rego 2015-04-21 02:16:44 -0700 Rename hasOverride{Height,Width}() to hasOverrideLogicalContent{Height,Width}() 1087019 1 251225 rego 2015-04-21 02:23:04 -0700 Created attachment 251225 Patch 1087030 2 rego 2015-04-21 03:10:17 -0700 Adding some reviewers on CC, this is a simple refactoring. 1087054 3 251225 darin 2015-04-21 08:49:47 -0700 Comment on attachment 251225 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251225&action=review > Source/WebCore/WebCore.order:6853 > -__ZNK7WebCore9RenderBox17hasOverrideHeightEv > +__ZNK7WebCore9RenderBox17hasOverrideLogicalContentHeightEv No need to ever hand-edit order files; they have to be regenerated by actually running tests with WebKit. If editing this file was needed, this is wrong because the 17 is no longer correct. 1087342 4 251307 rego 2015-04-22 02:02:23 -0700 Created attachment 251307 Patch for landing 1087343 5 rego 2015-04-22 02:03:38 -0700 Thanks for the review! (In reply to comment #3) > Comment on attachment 251225 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=251225&action=review > > > Source/WebCore/WebCore.order:6853 > > -__ZNK7WebCore9RenderBox17hasOverrideHeightEv > > +__ZNK7WebCore9RenderBox17hasOverrideLogicalContentHeightEv > > No need to ever hand-edit order files; they have to be regenerated by > actually running tests with WebKit. If editing this file was needed, this is > wrong because the 17 is no longer correct. Yeah, it was manually modified. I only checked that the Mac build worked after the modification, but it also works without any change, so I'm removing this change. 1087347 6 251307 commit-queue 2015-04-22 03:32:33 -0700 Comment on attachment 251307 Patch for landing Clearing flags on attachment: 251307 Committed r183100: <http://trac.webkit.org/changeset/183100> 1087348 7 commit-queue 2015-04-22 03:32:39 -0700 All reviewed patches have been landed. Closing bug. 251225 2015-04-21 02:23:04 -0700 2015-04-22 02:02:16 -0700 Patch bug-143984-20150421112200.patch text/plain 14037 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWY2NDg3MTQ5ZjkwOTM0 ZGJhYjdlMjc4ZjZkYzE1ZGNkOTViNjU0ZS4uMGMwOGRlYTlhNGMyMDQxNzUyNjFlMDRjY2M5Y2Mz NmU4MDFlMTA3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE1LTA0LTIxICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmFtZSBo YXNPdmVycmlkZXtIZWlnaHQsV2lkdGh9KCkgdG8gaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudHtI ZWlnaHQsV2lkdGh9KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0Mzk4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgcGF0Y2ggaXMgcmVuYW1pbmcgdGhlc2UgTGF5b3V0Qm94IG1ldGhvZHMsIGJl Y2F1c2Ugb2YgdGhlaXIgbmFtZXMKKyAgICAgICAgZG9uJ3QgbWF0Y2ggd2l0aCB0aGUgZ2V0dGVy cyBhbmQgc2V0dGVycywgd2hpY2ggaXMgY29uZnVzaW5nLiBTcGVjaWFsbHkKKyAgICAgICAgbm93 IHRoYXQgd2UgYWxzbyBoYXZlIGhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbHtIZWln aHQsV2lkdGh9KCkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzICh0aGlzIGlzIGp1c3QgYSByZWZh Y3RvcmluZykuCisKKyAgICAgICAgKiBXZWJDb3JlLm9yZGVyOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93 OjpmaXRCb3JkZXJUb0xpbmVzSWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC bG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93Ojp1 cGRhdGVSdWJ5Rm9ySnVzdGlmaWVkVGV4dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJv eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc092ZXJyaWRlTG9naWNhbENv bnRlbnRIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpoYXNPdmVycmlkZUxv Z2ljYWxDb250ZW50V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpvdmVycmlk ZUxvZ2ljYWxDb250ZW50V2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpvdmVy cmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 cGVycGVuZGljdWxhckNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxIZWlnaHQpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb24pOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdodCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCb3g6OmF2YWlsYWJsZUxvZ2ljYWxIZWlnaHRVc2luZyk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJE ZXByZWNhdGVkRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udGVudFdpZHRo Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6Y29udGVudEhlaWdodEZvckNoaWxkKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OnByZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckNo aWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUnVieUJhc2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyUnVieUJhc2U6OmFkanVzdElubGluZURpcmVjdGlvbkxpbmVCb3VuZHMp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGFibGVTZWN0aW9uOjpjYWxjUm93TG9naWNhbEhlaWdodCk6CisKIDIw MTUtMDQtMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAg ICAgUkVHUkVTU0lPTiAocjE3NzQ5NCk6IC13ZWJraXQtbWFzay1pbWFnZTogd2l0aCBkYXRhIFVS SSBmYWlscyBvbiBub24tbG9jYWwgZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUub3JkZXIgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVyCmluZGV4IDU3OTVkMGVi OGViYzUzZGY3Y2ZkMDY1OGI5ZWNjMjdiYjVkYmM0MmIuLjJjOGZmMzI2N2IzNWRjMzhjM2U3ZDU2 MWYyYjkyYjc0MGVhZDAxMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3Jk ZXIKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlcgpAQCAtNjg1MCw3ICs2ODUwLDcg QEAgX19aTjdXZWJDb3JlMTVSZW5kZXJUYWJsZUNlbGwxOHVwZGF0ZUxvZ2ljYWxXaWR0aEV2CiBf X1pOSzdXZWJDb3JlMTVSZW5kZXJUYWJsZUNlbGwxMnBhZGRpbmdBZnRlckV2CiBfX1pOSzdXZWJD b3JlMTVSZW5kZXJUYWJsZUNlbGwxMWJvcmRlckFmdGVyRXYKIF9fWk43V2ViQ29yZTE4UmVuZGVy VGFibGVTZWN0aW9uMjBjYWxjUm93TG9naWNhbEhlaWdodEV2Ci1fX1pOSzdXZWJDb3JlOVJlbmRl ckJveDE3aGFzT3ZlcnJpZGVIZWlnaHRFdgorX19aTks3V2ViQ29yZTlSZW5kZXJCb3gxN2hhc092 ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHRFdgogX19aTks3V2ViQ29yZTE1UmVuZGVyVGFibGVD ZWxsMjVsb2dpY2FsSGVpZ2h0Rm9yUm93U2l6aW5nRXYKIF9fWk43V2ViQ29yZTExUmVuZGVyVGFi bGU0MWNvbnZlcnRTdHlsZUxvZ2ljYWxIZWlnaHRUb0NvbXB1dGVkSGVpZ2h0RVJLTlNfNkxlbmd0 aEUKIF9fWk43V2ViQ29yZTE4UmVuZGVyVGFibGVTZWN0aW9uMTBsYXlvdXRSb3dzRXYKQEAgLTc1 MzcsNyArNzUzNyw3IEBAIF9fWk43V2ViQ29yZTExUmVuZGVySW1hZ2UxMmltYWdlQ2hhbmdlZEVQ dlBLTlNfN0ludFJlY3RFCiBfX1pOSzdXZWJDb3JlMTlSZW5kZXJJbWFnZVJlc291cmNlOGltYWdl UHRyRXYKIF9fWk5LN1dlYkNvcmUxOVJlbmRlckltYWdlUmVzb3VyY2U5aW1hZ2VTaXplRWYKIF9f Wk43V2ViQ29yZTExUmVuZGVySW1hZ2UyMmltYWdlRGltZW5zaW9uc0NoYW5nZWRFYlBLTlNfN0lu dFJlY3RFCi1fX1pOSzdXZWJDb3JlOVJlbmRlckJveDE2aGFzT3ZlcnJpZGVXaWR0aEV2CitfX1pO SzdXZWJDb3JlOVJlbmRlckJveDE2aGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoRXYKIF9f Wk5LN1dlYkNvcmU5UmVuZGVyQm94Mjhjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0RXYKIF9f Wk5LN1dlYkNvcmU5UmVuZGVyQm94Mjdjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhFTlNfMjJT aG91bGRDb21wdXRlUHJlZmVycmVkRQogX19aTks3V2ViQ29yZTEyUmVuZGVySW5saW5lMjFjb21w dXRlUmVjdEZvclJlcGFpbnRFUEtOU18yMlJlbmRlckxheWVyTW9kZWxPYmplY3RFUk5TXzEwTGF5 b3V0UmVjdEViCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3Bw CmluZGV4IGE0NmEzNzBjMWQ4NjhhMWRlODEwNmZhNDQ5MzdmZmVmZDI2ZmIwMmMuLmU4MzIwMzg2 NDcyN2M1MTkxZjczYTliODViNjI2NTQwY2JjYTEwNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0yOTM4LDcgKzI5MzgsNyBAQCB2b2lkIFJl bmRlckJsb2NrRmxvdzo6YWRqdXN0Rm9yQm9yZGVyRml0KExheW91dFVuaXQgeCwgTGF5b3V0VW5p dCYgbGVmdCwgTGF5b3V0VQogCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Zml0Qm9yZGVyVG9MaW5l c0lmTmVlZGVkKCkKIHsKLSAgICBpZiAoc3R5bGUoKS5ib3JkZXJGaXQoKSA9PSBCb3JkZXJGaXRC b3JkZXIgfHwgaGFzT3ZlcnJpZGVXaWR0aCgpKQorICAgIGlmIChzdHlsZSgpLmJvcmRlckZpdCgp ID09IEJvcmRlckZpdEJvcmRlciB8fCBoYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gV2FsayBhbnkgbm9ybWFsIGZsb3cgbGluZXMgdG8g c251Z2x5IGZpdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0xpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr TGluZUxheW91dC5jcHAKaW5kZXggMDRiYWNkODg0OWU1NmRlMzY4ZmNjZjJhYjQzNjNlZjhjYmQ3 MzNmZC4uYzdmOTkyYzQ5YTIxNmI2Zjc0MzViODdjMjU4YjQ2NGY0MWU0OWE1ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAg LTU2OSw3ICs1NjksNyBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6dXBkYXRlUnVieUZvckp1c3Rp ZmllZFRleHQoUmVuZGVyUnVieVJ1biYgcnVieVJ1biwgQmlkaVJ1bgogICAgICAgICB0b3RhbE9w cG9ydHVuaXRpZXNJblJ1biArPSBvcHBvcnR1bml0aWVzSW5SdW47CiAgICAgfQogCi0gICAgQVNT RVJUKCFydWJ5UnVuLmhhc092ZXJyaWRlV2lkdGgoKSk7CisgICAgQVNTRVJUKCFydWJ5UnVuLmhh c092ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aCgpKTsKICAgICBmbG9hdCBuZXdCYXNlV2lkdGgg PSBydWJ5UnVuLmxvZ2ljYWxXaWR0aCgpICsgdG90YWxFeHBhbnNpb24gKyBtYXJnaW5TdGFydEZv ckNoaWxkKHJ1YnlSdW4pICsgbWFyZ2luRW5kRm9yQ2hpbGQocnVieVJ1bik7CiAgICAgZmxvYXQg bmV3UnVieVJ1bldpZHRoID0gcnVieVJ1bi5sb2dpY2FsV2lkdGgoKSArIHRvdGFsRXhwYW5zaW9u OwogICAgIHJ1YnlCYXNlLnNldEluaXRpYWxPZmZzZXQoKG5ld1J1YnlSdW5XaWR0aCAtIG5ld0Jh c2VXaWR0aCkgLyAyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXgg MWUxNjllNjYyMjQ4ODY5OTZhZWZkZGY5ZDQzODk5MDBjZGZmN2MxOC4uNzAzOGQ3MGU4ZTExODli NzNkYzMxNmYyMDMxMGE4ZGY5OTU0YmQxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKQEAgLTEwMjYsMTIgKzEwMjYsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6Om1h eFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoOwogfQogCi1ib29sIFJlbmRlckJveDo6aGFzT3ZlcnJpZGVIZWlnaHQoKSBj b25zdAorYm9vbCBSZW5kZXJCb3g6Omhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKSBj b25zdAogewogICAgIHJldHVybiBnT3ZlcnJpZGVIZWlnaHRNYXAgJiYgZ092ZXJyaWRlSGVpZ2h0 TWFwLT5jb250YWlucyh0aGlzKTsKIH0KIAotYm9vbCBSZW5kZXJCb3g6Omhhc092ZXJyaWRlV2lk dGgoKSBjb25zdAorYm9vbCBSZW5kZXJCb3g6Omhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0 aCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGdPdmVycmlkZVdpZHRoTWFwICYmIGdPdmVycmlkZVdp ZHRoTWFwLT5jb250YWlucyh0aGlzKTsKIH0KQEAgLTEwNzAsMTMgKzEwNzAsMTMgQEAgdm9pZCBS ZW5kZXJCb3g6OmNsZWFyT3ZlcnJpZGVTaXplKCkKIAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6Om92 ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aCgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGhhc092ZXJy aWRlV2lkdGgoKSk7CisgICAgQVNTRVJUKGhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aCgp KTsKICAgICByZXR1cm4gZ092ZXJyaWRlV2lkdGhNYXAtPmdldCh0aGlzKTsKIH0KIAogTGF5b3V0 VW5pdCBSZW5kZXJCb3g6Om92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKSBjb25zdAogewot ICAgIEFTU0VSVChoYXNPdmVycmlkZUhlaWdodCgpKTsKKyAgICBBU1NFUlQoaGFzT3ZlcnJpZGVM b2dpY2FsQ29udGVudEhlaWdodCgpKTsKICAgICByZXR1cm4gZ092ZXJyaWRlSGVpZ2h0TWFwLT5n ZXQodGhpcyk7CiB9CiAKQEAgLTE5MDcsNyArMTkwNyw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94 OjpwZXJwZW5kaWN1bGFyQ29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodCgpIGNvbnN0CiAjZW5k aWYKIAogICAgIFJlbmRlckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9jaygpOwotICAgIGlmIChj Yi0+aGFzT3ZlcnJpZGVIZWlnaHQoKSkKKyAgICBpZiAoY2ItPmhhc092ZXJyaWRlTG9naWNhbENv bnRlbnRIZWlnaHQoKSkKICAgICAgICAgcmV0dXJuIGNiLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50 SGVpZ2h0KCk7CiAKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgY29udGFpbmluZ0Jsb2NrU3R5bGUg PSBjYi0+c3R5bGUoKTsKQEAgLTIzMTIsNyArMjMxMiw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21w dXRlTG9naWNhbFdpZHRoSW5SZWdpb24oTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21w dXRlCiAgICAgLy8gd2lkdGguICBVc2UgdGhlIHdpZHRoIGZyb20gdGhlIHN0eWxlIGNvbnRleHQu CiAgICAgLy8gRklYTUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGlibGUgYm94ZXMu CiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDE4Ci0g ICAgaWYgKGhhc092ZXJyaWRlV2lkdGgoKSAmJiAoaXNSdWJ5UnVuKCkgfHwgc3R5bGUoKS5ib3Jk ZXJGaXQoKSA9PSBCb3JkZXJGaXRMaW5lcyB8fCBwYXJlbnQoKS0+aXNGbGV4aWJsZUJveEluY2x1 ZGluZ0RlcHJlY2F0ZWQoKSkpIHsKKyAgICBpZiAoaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudFdp ZHRoKCkgJiYgKGlzUnVieVJ1bigpIHx8IHN0eWxlKCkuYm9yZGVyRml0KCkgPT0gQm9yZGVyRml0 TGluZXMgfHwgcGFyZW50KCktPmlzRmxleGlibGVCb3hJbmNsdWRpbmdEZXByZWNhdGVkKCkpKSB7 CiAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID0gb3ZlcnJpZGVMb2dpY2FsQ29udGVu dFdpZHRoKCkgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CkBAIC0yNzEyLDcgKzI3MTIsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUxv Z2ljYWxIZWlnaHQoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBMYXlvdXRVbml0IGxvZ2ljYQog ICAgICAgICAvLyBncmFiIG91ciBjYWNoZWQgZmxleGlibGUgaGVpZ2h0LgogICAgICAgICAvLyBG SVhNRTogQWNjb3VudCBmb3IgYmxvY2stZmxvdyBpbiBmbGV4aWJsZSBib3hlcy4KICAgICAgICAg Ly8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDE4Ci0gICAgICAg IGlmIChoYXNPdmVycmlkZUhlaWdodCgpICYmIHBhcmVudCgpLT5pc0ZsZXhpYmxlQm94SW5jbHVk aW5nRGVwcmVjYXRlZCgpKQorICAgICAgICBpZiAoaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudEhl aWdodCgpICYmIHBhcmVudCgpLT5pc0ZsZXhpYmxlQm94SW5jbHVkaW5nRGVwcmVjYXRlZCgpKQog ICAgICAgICAgICAgaCA9IExlbmd0aChvdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCksIEZp eGVkKTsKICAgICAgICAgZWxzZSBpZiAodHJlYXRBc1JlcGxhY2VkKQogICAgICAgICAgICAgaCA9 IExlbmd0aChjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KCksIEZpeGVkKTsKQEAgLTI4NDgs NyArMjg0OCw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUGVyY2VudGFnZUxvZ2lj YWxIZWlnaHQoY29uc3QgTGVuZ3RoJiBoZWlnaHQpIGNvbnN0CiAgICAgICAgICAgICAvLyBUYWJs ZSBjZWxscyB2aW9sYXRlIHdoYXQgdGhlIENTUyBzcGVjIHNheXMgdG8gZG8gd2l0aCBoZWlnaHRz LiBCYXNpY2FsbHkgd2UKICAgICAgICAgICAgIC8vIGRvbid0IGNhcmUgaWYgdGhlIGNlbGwgc3Bl Y2lmaWVkIGEgaGVpZ2h0IG9yIG5vdC4gV2UganVzdCBhbHdheXMgbWFrZSBvdXJzZWx2ZXMKICAg ICAgICAgICAgIC8vIGJlIGEgcGVyY2VudGFnZSBvZiB0aGUgY2VsbCdzIGN1cnJlbnQgY29udGVu dCBoZWlnaHQuCi0gICAgICAgICAgICBpZiAoIWNiLT5oYXNPdmVycmlkZUhlaWdodCgpKSB7Cisg ICAgICAgICAgICBpZiAoIWNiLT5oYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkpIHsK ICAgICAgICAgICAgICAgICAvLyBOb3JtYWxseSB3ZSB3b3VsZCBsZXQgdGhlIGNlbGwgc2l6ZSBp bnRyaW5zaWNhbGx5LCBidXQgc2Nyb2xsaW5nIG92ZXJmbG93IGhhcyB0byBiZQogICAgICAgICAg ICAgICAgIC8vIHRyZWF0ZWQgZGlmZmVyZW50bHksIHNpbmNlIFdpbklFIGxldHMgc2Nyb2xsZWQg b3ZlcmZsb3cgcmVnaW9ucyBzaHJpbmsgYXMgbmVlZGVkLgogICAgICAgICAgICAgICAgIC8vIFdo aWxlIHdlIGNhbid0IGdldCBhbGwgY2FzZXMgcmlnaHQsIHdlIGNhbiBhdCBsZWFzdCBkZXRlY3Qg d2hlbiB0aGUgY2VsbCBoYXMgYSBzcGVjaWZpZWQKQEAgLTMwMzcsNyArMzAzNyw3IEBAIExheW91 dFVuaXQgUmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNpbmcoY29uc3QgTGVuZ3Ro JiBoLCBBdmFpbGFibGVMb2dpCiAgICAgLy8gYXJ0aWZpY2lhbGx5LiAgV2UncmUgZ29pbmcgdG8g cmVseSBvbiB0aGlzIGNlbGwgZ2V0dGluZyBleHBhbmRlZCB0byBzb21lIG5ldwogICAgIC8vIGhl aWdodCwgYW5kIHRoZW4gd2hlbiB3ZSBsYXkgb3V0IGFnYWluIHdlJ2xsIHVzZSB0aGUgY2FsY3Vs YXRpb24gYmVsb3cuCiAgICAgaWYgKGlzVGFibGVDZWxsKCkgJiYgKGguaXNBdXRvKCkgfHwgaC5p c1BlcmNlbnQoKSkpIHsKLSAgICAgICAgaWYgKGhhc092ZXJyaWRlSGVpZ2h0KCkpCisgICAgICAg IGlmIChoYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkpCiAgICAgICAgICAgICByZXR1 cm4gb3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpOwogICAgICAgICByZXR1cm4gbG9naWNh bEhlaWdodCgpIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggMzRjOWY2YmFjYzQ5ZThiYzdiMGExNTI4 MmFiZjU5MjAzNjA3MjhlNy4uZTkxM2I2ZDFjYThmNDg1MmM1ZDhhOTM2ZDQ4OGEwYmVmMTBmYTQ5 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtMzE5LDggKzMxOSw4IEBA IHB1YmxpYzoKICAgICAvLyBpbmNsdWRlIHRoZSBzY3JvbGxiYXIgaGVpZ2h0L3dpZHRoLgogICAg IExheW91dFVuaXQgb3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgY29uc3Q7CiAgICAgTGF5 b3V0VW5pdCBvdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkgY29uc3Q7Ci0gICAgYm9vbCBo YXNPdmVycmlkZUhlaWdodCgpIGNvbnN0OwotICAgIGJvb2wgaGFzT3ZlcnJpZGVXaWR0aCgpIGNv bnN0OworICAgIGJvb2wgaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpIGNvbnN0Owor ICAgIGJvb2wgaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgY29uc3Q7CiAgICAgdm9p ZCBzZXRPdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KExheW91dFVuaXQpOwogICAgIHZvaWQg c2V0T3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKExheW91dFVuaXQpOwogICAgIHZvaWQgY2xl YXJPdmVycmlkZVNpemUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggYjlkN2U1OWJlMDc1NjVjYzdk MTYxYzNhZWE4YmU1MzgzN2JkM2ZkYS4uNTJiNGEzZjU1NjI3YjFiY2NlZjIxZDUxZTIxMzI2ZDRj YTkyZTJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTE1MSwxNCArMTUxLDE0IEBAIHN0YXRpYyBi b29sIGNoaWxkRG9lc05vdEFmZmVjdFdpZHRoT3JGbGV4aW5nKFJlbmRlck9iamVjdCogY2hpbGQp CiAKIHN0YXRpYyBMYXlvdXRVbml0IGNvbnRlbnRXaWR0aEZvckNoaWxkKFJlbmRlckJveCogY2hp bGQpCiB7Ci0gICAgaWYgKGNoaWxkLT5oYXNPdmVycmlkZVdpZHRoKCkpCisgICAgaWYgKGNoaWxk LT5oYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKSkKICAgICAgICAgcmV0dXJuIGNoaWxk LT5vdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKTsKICAgICByZXR1cm4gY2hpbGQtPmxvZ2lj YWxXaWR0aCgpIC0gY2hpbGQtPmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKIH0KIAog c3RhdGljIExheW91dFVuaXQgY29udGVudEhlaWdodEZvckNoaWxkKFJlbmRlckJveCogY2hpbGQp CiB7Ci0gICAgaWYgKGNoaWxkLT5oYXNPdmVycmlkZUhlaWdodCgpKQorICAgIGlmIChjaGlsZC0+ aGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpKQogICAgICAgICByZXR1cm4gY2hpbGQt Pm92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKTsKICAgICByZXR1cm4gY2hpbGQtPmxvZ2lj YWxIZWlnaHQoKSAtIGNoaWxkLT5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXgg YjkzM2FlODYzMjJlMTMyMDc4OWNjYzY2NWNjNWEzMjQxNTEwZjRmZC4uMTY1MGE5YzhmZDI3NjI4 MmVlNTU1ZWE4MjVmOWNlZDhmNjUzZWI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC02NTIsNyArNjUyLDcgQEAgTGF5b3V0VW5pdCBS ZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNTY3JvbGxiYXJFeHRlbnRGb3JDaGlsZChSZW5kZXJC b3gmIGNoaWxkKQogCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpwcmVmZXJyZWRNYWlu QXhpc0NvbnRlbnRFeHRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBib29sIGhhc0luZmlu aXRlTGluZUxlbmd0aCkKIHsKLSAgICBib29sIGhhc092ZXJyaWRlU2l6ZSA9IGNoaWxkLmhhc092 ZXJyaWRlV2lkdGgoKSB8fCBjaGlsZC5oYXNPdmVycmlkZUhlaWdodCgpOworICAgIGJvb2wgaGFz T3ZlcnJpZGVTaXplID0gY2hpbGQuaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgfHwg Y2hpbGQuaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpOwogICAgIGlmIChoYXNPdmVy cmlkZVNpemUpCiAgICAgICAgIGNoaWxkLmNsZWFyT3ZlcnJpZGVTaXplKCk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5QmFzZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieUJhc2UuY3BwCmluZGV4IDdhYWUxZDNjNzhjOTBl YmEwYTUxOTRmNzNlMmU2MTE1YzE1M2M0NmEuLjk4MjM2M2U4ZGQ0Mzk2YzQ3NmYzMmY5OTNlZWVm MTkwMTJlNjQ4OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS dWJ5QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNl LmNwcApAQCAtMTQzLDEzICsxNDMsMTMgQEAgRVRleHRBbGlnbiBSZW5kZXJSdWJ5QmFzZTo6dGV4 dEFsaWdubWVudEZvckxpbmUoYm9vbCAvKiBlbmRzV2l0aFNvZnRCcmVhayAqLykgY28KIAogdm9p ZCBSZW5kZXJSdWJ5QmFzZTo6YWRqdXN0SW5saW5lRGlyZWN0aW9uTGluZUJvdW5kcyhpbnQgZXhw YW5zaW9uT3Bwb3J0dW5pdHlDb3VudCwgZmxvYXQmIGxvZ2ljYWxMZWZ0LCBmbG9hdCYgbG9naWNh bFdpZHRoKSBjb25zdAogewotICAgIGlmIChydWJ5UnVuKCktPmhhc092ZXJyaWRlV2lkdGgoKSAm JiBmaXJzdFJvb3RCb3goKSAmJiAhZmlyc3RSb290Qm94KCktPm5leHRSb290Qm94KCkpIHsKKyAg ICBpZiAocnVieVJ1bigpLT5oYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKSAmJiBmaXJz dFJvb3RCb3goKSAmJiAhZmlyc3RSb290Qm94KCktPm5leHRSb290Qm94KCkpIHsKICAgICAgICAg bG9naWNhbExlZnQgKz0gbV9pbml0aWFsT2Zmc2V0OwogICAgICAgICBsb2dpY2FsV2lkdGggLT0g MiAqIG1faW5pdGlhbE9mZnNldDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIExheW91 dFVuaXQgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gcnVieVJ1bigpICYmIHJ1YnlSdW4oKS0+ aGFzT3ZlcnJpZGVXaWR0aCgpID8gcnVieVJ1bigpLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50V2lk dGgoKSA6IHRoaXMtPm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOworICAgIExheW91dFVuaXQg bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gcnVieVJ1bigpICYmIHJ1YnlSdW4oKS0+aGFzT3Zl cnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgPyBydWJ5UnVuKCktPm92ZXJyaWRlTG9naWNhbENv bnRlbnRXaWR0aCgpIDogdGhpcy0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCk7CiAgICAgaWYg KG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA+PSBsb2dpY2FsV2lkdGgpCiAgICAgICAgIHJldHVy bjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2Vj dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNw cAppbmRleCAwMTk1ZGY3MGZkN2FjOGRlMTg0ZWVkYjBlMDM5Njg4MTY3ZTFkMWQ4Li5iMzA5MzMw ZWI4NWEyM2FjZjA5MjU3NTllNGY0ZDFhYzcwNjgwOWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcApAQCAtMzE2LDcgKzMxNiw3IEBAIGlu dCBSZW5kZXJUYWJsZVNlY3Rpb246OmNhbGNSb3dMb2dpY2FsSGVpZ2h0KCkKICAgICAgICAgICAg ICAgICAvLyBGb3Igcm93IHNwYW5uaW5nIGNlbGxzLCB8cnwgaXMgdGhlIGxhc3Qgcm93IGluIHRo ZSBzcGFuLgogICAgICAgICAgICAgICAgIHVuc2lnbmVkIGNlbGxTdGFydFJvdyA9IGNlbGwtPnJv d0luZGV4KCk7CiAKLSAgICAgICAgICAgICAgICBpZiAoY2VsbC0+aGFzT3ZlcnJpZGVIZWlnaHQo KSkgeworICAgICAgICAgICAgICAgIGlmIChjZWxsLT5oYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50 SGVpZ2h0KCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFzdGF0ZVB1c2hlci5kaWRQdXNo KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIFRlY2huaWNhbGx5LCB3ZSBzaG91bGQg YWxzbyBwdXNoIHN0YXRlIGZvciB0aGUgcm93LCBidXQgc2luY2UKICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIHJvd3MgZG9uJ3QgcHVzaCBhIGNvb3JkaW5hdGUgdHJhbnNmb3JtLCB0aGF0J3Mg bm90IG5lY2Vzc2FyeS4K 251307 2015-04-22 02:02:23 -0700 2015-04-22 03:32:33 -0700 Patch for landing bug-143984-20150422110118.patch text/plain 12657 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzIwODc2OTUzMGZhYjM0 MjdmZjlhNTU5MDRjNWVkMzlkMzkyYTAxNi4uNmI5N2M3YTZiYzVkMDdmYzFhYzI4MmNiYWYxODEz NzQxZDc5MzhiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE1LTA0LTIxICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbmFtZSBo YXNPdmVycmlkZXtIZWlnaHQsV2lkdGh9KCkgdG8gaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudHtI ZWlnaHQsV2lkdGh9KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0Mzk4NAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggaXMgcmVuYW1pbmcgdGhlc2UgTGF5b3V0Qm94IG1ldGhvZHMsIGJlY2F1 c2Ugb2YgdGhlaXIgbmFtZXMKKyAgICAgICAgZG9uJ3QgbWF0Y2ggd2l0aCB0aGUgZ2V0dGVycyBh bmQgc2V0dGVycywgd2hpY2ggaXMgY29uZnVzaW5nLiBTcGVjaWFsbHkKKyAgICAgICAgbm93IHRo YXQgd2UgYWxzbyBoYXZlIGhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbHtIZWlnaHQs V2lkdGh9KCkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzICh0aGlzIGlzIGp1c3QgYSByZWZhY3Rv cmluZykuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Zml0Qm9yZGVyVG9MaW5lc0lmTmVlZGVkKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6dXBkYXRlUnVieUZvckp1c3RpZmllZFRleHQpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQm94OjpoYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveDo6aGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6b3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveDo6b3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnBlcnBlbmRpY3VsYXJDb250YWluaW5nQmxvY2tM b2dpY2FsSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2lj YWxXaWR0aEluUmVnaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxv Z2ljYWxIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUGVyY2Vu dGFnZUxvZ2ljYWxIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjphdmFpbGFi bGVMb2dpY2FsSGVpZ2h0VXNpbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmNvbnRlbnRXaWR0aEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6 OmNvbnRlbnRIZWlnaHRGb3JDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpwcmVmZXJy ZWRNYWluQXhpc0NvbnRlbnRFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclJ1YnlCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJ1YnlCYXNlOjphZGp1 c3RJbmxpbmVEaXJlY3Rpb25MaW5lQm91bmRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGFibGVTZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6 Y2FsY1Jvd0xvZ2ljYWxIZWlnaHQpOgorCiAyMDE1LTA0LTIxICBKZXIgTm9ibGUgIDxqZXIubm9i bGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdW01lZGlhU291cmNlXSBDcmFzaCB3aGVuIFNv dXJjZUJ1ZmZlcjo6cHJvdmlkZU1lZGlhRGF0YSgpIGlzIGNhbGxlZCByZS1lbnRyYW50bHkuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IGE0NmEz NzBjMWQ4NjhhMWRlODEwNmZhNDQ5MzdmZmVmZDI2ZmIwMmMuLmU4MzIwMzg2NDcyN2M1MTkxZjcz YTliODViNjI2NTQwY2JjYTEwNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9ja0Zsb3cuY3BwCkBAIC0yOTM4LDcgKzI5MzgsNyBAQCB2b2lkIFJlbmRlckJsb2NrRmxv dzo6YWRqdXN0Rm9yQm9yZGVyRml0KExheW91dFVuaXQgeCwgTGF5b3V0VW5pdCYgbGVmdCwgTGF5 b3V0VQogCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Zml0Qm9yZGVyVG9MaW5lc0lmTmVlZGVkKCkK IHsKLSAgICBpZiAoc3R5bGUoKS5ib3JkZXJGaXQoKSA9PSBCb3JkZXJGaXRCb3JkZXIgfHwgaGFz T3ZlcnJpZGVXaWR0aCgpKQorICAgIGlmIChzdHlsZSgpLmJvcmRlckZpdCgpID09IEJvcmRlckZp dEJvcmRlciB8fCBoYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgLy8gV2FsayBhbnkgbm9ybWFsIGZsb3cgbGluZXMgdG8gc251Z2x5IGZpdC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlv dXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAKaW5kZXggMDRiYWNkODg0OWU1NmRlMzY4ZmNjZjJhYjQzNjNlZjhjYmQ3MzNmZC4uYzdmOTky YzQ5YTIxNmI2Zjc0MzViODdjMjU4YjQ2NGY0MWU0OWE1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAgLTU2OSw3ICs1Njks NyBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6dXBkYXRlUnVieUZvckp1c3RpZmllZFRleHQoUmVu ZGVyUnVieVJ1biYgcnVieVJ1biwgQmlkaVJ1bgogICAgICAgICB0b3RhbE9wcG9ydHVuaXRpZXNJ blJ1biArPSBvcHBvcnR1bml0aWVzSW5SdW47CiAgICAgfQogCi0gICAgQVNTRVJUKCFydWJ5UnVu Lmhhc092ZXJyaWRlV2lkdGgoKSk7CisgICAgQVNTRVJUKCFydWJ5UnVuLmhhc092ZXJyaWRlTG9n aWNhbENvbnRlbnRXaWR0aCgpKTsKICAgICBmbG9hdCBuZXdCYXNlV2lkdGggPSBydWJ5UnVuLmxv Z2ljYWxXaWR0aCgpICsgdG90YWxFeHBhbnNpb24gKyBtYXJnaW5TdGFydEZvckNoaWxkKHJ1YnlS dW4pICsgbWFyZ2luRW5kRm9yQ2hpbGQocnVieVJ1bik7CiAgICAgZmxvYXQgbmV3UnVieVJ1bldp ZHRoID0gcnVieVJ1bi5sb2dpY2FsV2lkdGgoKSArIHRvdGFsRXhwYW5zaW9uOwogICAgIHJ1YnlC YXNlLnNldEluaXRpYWxPZmZzZXQoKG5ld1J1YnlSdW5XaWR0aCAtIG5ld0Jhc2VXaWR0aCkgLyAy KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggMWUxNjllNjYyMjQ4 ODY5OTZhZWZkZGY5ZDQzODk5MDBjZGZmN2MxOC4uNzAzOGQ3MGU4ZTExODliNzNkYzMxNmYyMDMx MGE4ZGY5OTU0YmQxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAg LTEwMjYsMTIgKzEwMjYsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6Om1heFByZWZlcnJlZExv Z2ljYWxXaWR0aCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo OwogfQogCi1ib29sIFJlbmRlckJveDo6aGFzT3ZlcnJpZGVIZWlnaHQoKSBjb25zdAorYm9vbCBS ZW5kZXJCb3g6Omhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKSBjb25zdAogewogICAg IHJldHVybiBnT3ZlcnJpZGVIZWlnaHRNYXAgJiYgZ092ZXJyaWRlSGVpZ2h0TWFwLT5jb250YWlu cyh0aGlzKTsKIH0KIAotYm9vbCBSZW5kZXJCb3g6Omhhc092ZXJyaWRlV2lkdGgoKSBjb25zdAor Ym9vbCBSZW5kZXJCb3g6Omhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aCgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuIGdPdmVycmlkZVdpZHRoTWFwICYmIGdPdmVycmlkZVdpZHRoTWFwLT5jb250 YWlucyh0aGlzKTsKIH0KQEAgLTEwNzAsMTMgKzEwNzAsMTMgQEAgdm9pZCBSZW5kZXJCb3g6OmNs ZWFyT3ZlcnJpZGVTaXplKCkKIAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6Om92ZXJyaWRlTG9naWNh bENvbnRlbnRXaWR0aCgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKGhhc092ZXJyaWRlV2lkdGgoKSk7 CisgICAgQVNTRVJUKGhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aCgpKTsKICAgICByZXR1 cm4gZ092ZXJyaWRlV2lkdGhNYXAtPmdldCh0aGlzKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJC b3g6Om92ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKSBjb25zdAogewotICAgIEFTU0VSVCho YXNPdmVycmlkZUhlaWdodCgpKTsKKyAgICBBU1NFUlQoaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVu dEhlaWdodCgpKTsKICAgICByZXR1cm4gZ092ZXJyaWRlSGVpZ2h0TWFwLT5nZXQodGhpcyk7CiB9 CiAKQEAgLTE5MDcsNyArMTkwNyw3IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjpwZXJwZW5kaWN1 bGFyQ29udGFpbmluZ0Jsb2NrTG9naWNhbEhlaWdodCgpIGNvbnN0CiAjZW5kaWYKIAogICAgIFJl bmRlckJsb2NrKiBjYiA9IGNvbnRhaW5pbmdCbG9jaygpOwotICAgIGlmIChjYi0+aGFzT3ZlcnJp ZGVIZWlnaHQoKSkKKyAgICBpZiAoY2ItPmhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQo KSkKICAgICAgICAgcmV0dXJuIGNiLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCk7CiAK ICAgICBjb25zdCBSZW5kZXJTdHlsZSYgY29udGFpbmluZ0Jsb2NrU3R5bGUgPSBjYi0+c3R5bGUo KTsKQEAgLTIzMTIsNyArMjMxMiw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdp ZHRoSW5SZWdpb24oTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlCiAgICAgLy8g d2lkdGguICBVc2UgdGhlIHdpZHRoIGZyb20gdGhlIHN0eWxlIGNvbnRleHQuCiAgICAgLy8gRklY TUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGlibGUgYm94ZXMuCiAgICAgLy8gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDE4Ci0gICAgaWYgKGhhc092 ZXJyaWRlV2lkdGgoKSAmJiAoaXNSdWJ5UnVuKCkgfHwgc3R5bGUoKS5ib3JkZXJGaXQoKSA9PSBC b3JkZXJGaXRMaW5lcyB8fCBwYXJlbnQoKS0+aXNGbGV4aWJsZUJveEluY2x1ZGluZ0RlcHJlY2F0 ZWQoKSkpIHsKKyAgICBpZiAoaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgJiYgKGlz UnVieVJ1bigpIHx8IHN0eWxlKCkuYm9yZGVyRml0KCkgPT0gQm9yZGVyRml0TGluZXMgfHwgcGFy ZW50KCktPmlzRmxleGlibGVCb3hJbmNsdWRpbmdEZXByZWNhdGVkKCkpKSB7CiAgICAgICAgIGNv bXB1dGVkVmFsdWVzLm1fZXh0ZW50ID0gb3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgKyBi b3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC0yNzEyLDcgKzI3MTIsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQo TGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBMYXlvdXRVbml0IGxvZ2ljYQogICAgICAgICAvLyBn cmFiIG91ciBjYWNoZWQgZmxleGlibGUgaGVpZ2h0LgogICAgICAgICAvLyBGSVhNRTogQWNjb3Vu dCBmb3IgYmxvY2stZmxvdyBpbiBmbGV4aWJsZSBib3hlcy4KICAgICAgICAgLy8gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NDE4Ci0gICAgICAgIGlmIChoYXNPdmVy cmlkZUhlaWdodCgpICYmIHBhcmVudCgpLT5pc0ZsZXhpYmxlQm94SW5jbHVkaW5nRGVwcmVjYXRl ZCgpKQorICAgICAgICBpZiAoaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpICYmIHBh cmVudCgpLT5pc0ZsZXhpYmxlQm94SW5jbHVkaW5nRGVwcmVjYXRlZCgpKQogICAgICAgICAgICAg aCA9IExlbmd0aChvdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCksIEZpeGVkKTsKICAgICAg ICAgZWxzZSBpZiAodHJlYXRBc1JlcGxhY2VkKQogICAgICAgICAgICAgaCA9IExlbmd0aChjb21w dXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KCksIEZpeGVkKTsKQEAgLTI4NDgsNyArMjg0OCw3IEBA IExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY29u c3QgTGVuZ3RoJiBoZWlnaHQpIGNvbnN0CiAgICAgICAgICAgICAvLyBUYWJsZSBjZWxscyB2aW9s YXRlIHdoYXQgdGhlIENTUyBzcGVjIHNheXMgdG8gZG8gd2l0aCBoZWlnaHRzLiBCYXNpY2FsbHkg d2UKICAgICAgICAgICAgIC8vIGRvbid0IGNhcmUgaWYgdGhlIGNlbGwgc3BlY2lmaWVkIGEgaGVp Z2h0IG9yIG5vdC4gV2UganVzdCBhbHdheXMgbWFrZSBvdXJzZWx2ZXMKICAgICAgICAgICAgIC8v IGJlIGEgcGVyY2VudGFnZSBvZiB0aGUgY2VsbCdzIGN1cnJlbnQgY29udGVudCBoZWlnaHQuCi0g ICAgICAgICAgICBpZiAoIWNiLT5oYXNPdmVycmlkZUhlaWdodCgpKSB7CisgICAgICAgICAgICBp ZiAoIWNiLT5oYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkpIHsKICAgICAgICAgICAg ICAgICAvLyBOb3JtYWxseSB3ZSB3b3VsZCBsZXQgdGhlIGNlbGwgc2l6ZSBpbnRyaW5zaWNhbGx5 LCBidXQgc2Nyb2xsaW5nIG92ZXJmbG93IGhhcyB0byBiZQogICAgICAgICAgICAgICAgIC8vIHRy ZWF0ZWQgZGlmZmVyZW50bHksIHNpbmNlIFdpbklFIGxldHMgc2Nyb2xsZWQgb3ZlcmZsb3cgcmVn aW9ucyBzaHJpbmsgYXMgbmVlZGVkLgogICAgICAgICAgICAgICAgIC8vIFdoaWxlIHdlIGNhbid0 IGdldCBhbGwgY2FzZXMgcmlnaHQsIHdlIGNhbiBhdCBsZWFzdCBkZXRlY3Qgd2hlbiB0aGUgY2Vs bCBoYXMgYSBzcGVjaWZpZWQKQEAgLTMwMzcsNyArMzAzNyw3IEBAIExheW91dFVuaXQgUmVuZGVy Qm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNpbmcoY29uc3QgTGVuZ3RoJiBoLCBBdmFpbGFi bGVMb2dpCiAgICAgLy8gYXJ0aWZpY2lhbGx5LiAgV2UncmUgZ29pbmcgdG8gcmVseSBvbiB0aGlz IGNlbGwgZ2V0dGluZyBleHBhbmRlZCB0byBzb21lIG5ldwogICAgIC8vIGhlaWdodCwgYW5kIHRo ZW4gd2hlbiB3ZSBsYXkgb3V0IGFnYWluIHdlJ2xsIHVzZSB0aGUgY2FsY3VsYXRpb24gYmVsb3cu CiAgICAgaWYgKGlzVGFibGVDZWxsKCkgJiYgKGguaXNBdXRvKCkgfHwgaC5pc1BlcmNlbnQoKSkp IHsKLSAgICAgICAgaWYgKGhhc092ZXJyaWRlSGVpZ2h0KCkpCisgICAgICAgIGlmIChoYXNPdmVy cmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkpCiAgICAgICAgICAgICByZXR1cm4gb3ZlcnJpZGVM b2dpY2FsQ29udGVudEhlaWdodCgpOwogICAgICAgICByZXR1cm4gbG9naWNhbEhlaWdodCgpIC0g Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmgKaW5kZXggMzRjOWY2YmFjYzQ5ZThiYzdiMGExNTI4MmFiZjU5MjAzNjA3 MjhlNy4uZTkxM2I2ZDFjYThmNDg1MmM1ZDhhOTM2ZDQ4OGEwYmVmMTBmYTQ5YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtMzE5LDggKzMxOSw4IEBAIHB1YmxpYzoKICAg ICAvLyBpbmNsdWRlIHRoZSBzY3JvbGxiYXIgaGVpZ2h0L3dpZHRoLgogICAgIExheW91dFVuaXQg b3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBvdmVy cmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkgY29uc3Q7Ci0gICAgYm9vbCBoYXNPdmVycmlkZUhl aWdodCgpIGNvbnN0OwotICAgIGJvb2wgaGFzT3ZlcnJpZGVXaWR0aCgpIGNvbnN0OworICAgIGJv b2wgaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpIGNvbnN0OworICAgIGJvb2wgaGFz T3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRPdmVycmlk ZUxvZ2ljYWxDb250ZW50SGVpZ2h0KExheW91dFVuaXQpOwogICAgIHZvaWQgc2V0T3ZlcnJpZGVM b2dpY2FsQ29udGVudFdpZHRoKExheW91dFVuaXQpOwogICAgIHZvaWQgY2xlYXJPdmVycmlkZVNp emUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNh dGVkRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5kZXggYjlkN2U1OWJlMDc1NjVjYzdkMTYxYzNhZWE4YmU1 MzgzN2JkM2ZkYS4uNTJiNGEzZjU1NjI3YjFiY2NlZjIxZDUxZTIxMzI2ZDRjYTkyZTJkMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRG bGV4aWJsZUJveC5jcHAKQEAgLTE1MSwxNCArMTUxLDE0IEBAIHN0YXRpYyBib29sIGNoaWxkRG9l c05vdEFmZmVjdFdpZHRoT3JGbGV4aW5nKFJlbmRlck9iamVjdCogY2hpbGQpCiAKIHN0YXRpYyBM YXlvdXRVbml0IGNvbnRlbnRXaWR0aEZvckNoaWxkKFJlbmRlckJveCogY2hpbGQpCiB7Ci0gICAg aWYgKGNoaWxkLT5oYXNPdmVycmlkZVdpZHRoKCkpCisgICAgaWYgKGNoaWxkLT5oYXNPdmVycmlk ZUxvZ2ljYWxDb250ZW50V2lkdGgoKSkKICAgICAgICAgcmV0dXJuIGNoaWxkLT5vdmVycmlkZUxv Z2ljYWxDb250ZW50V2lkdGgoKTsKICAgICByZXR1cm4gY2hpbGQtPmxvZ2ljYWxXaWR0aCgpIC0g Y2hpbGQtPmJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKIH0KIAogc3RhdGljIExheW91 dFVuaXQgY29udGVudEhlaWdodEZvckNoaWxkKFJlbmRlckJveCogY2hpbGQpCiB7Ci0gICAgaWYg KGNoaWxkLT5oYXNPdmVycmlkZUhlaWdodCgpKQorICAgIGlmIChjaGlsZC0+aGFzT3ZlcnJpZGVM b2dpY2FsQ29udGVudEhlaWdodCgpKQogICAgICAgICByZXR1cm4gY2hpbGQtPm92ZXJyaWRlTG9n aWNhbENvbnRlbnRIZWlnaHQoKTsKICAgICByZXR1cm4gY2hpbGQtPmxvZ2ljYWxIZWlnaHQoKSAt IGNoaWxkLT5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggYjkzM2FlODYzMjJl MTMyMDc4OWNjYzY2NWNjNWEzMjQxNTEwZjRmZC4uMTY1MGE5YzhmZDI3NjI4MmVlNTU1ZWE4MjVm OWNlZDhmNjUzZWI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCkBAIC02NTIsNyArNjUyLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJs ZUJveDo6bWFpbkF4aXNTY3JvbGxiYXJFeHRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkKQog CiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjpwcmVmZXJyZWRNYWluQXhpc0NvbnRlbnRF eHRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBib29sIGhhc0luZmluaXRlTGluZUxlbmd0 aCkKIHsKLSAgICBib29sIGhhc092ZXJyaWRlU2l6ZSA9IGNoaWxkLmhhc092ZXJyaWRlV2lkdGgo KSB8fCBjaGlsZC5oYXNPdmVycmlkZUhlaWdodCgpOworICAgIGJvb2wgaGFzT3ZlcnJpZGVTaXpl ID0gY2hpbGQuaGFzT3ZlcnJpZGVMb2dpY2FsQ29udGVudFdpZHRoKCkgfHwgY2hpbGQuaGFzT3Zl cnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpOwogICAgIGlmIChoYXNPdmVycmlkZVNpemUpCiAg ICAgICAgIGNoaWxkLmNsZWFyT3ZlcnJpZGVTaXplKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5QmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUnVieUJhc2UuY3BwCmluZGV4IDdhYWUxZDNjNzhjOTBlYmEwYTUxOTRmNzNl MmU2MTE1YzE1M2M0NmEuLjk4MjM2M2U4ZGQ0Mzk2YzQ3NmYzMmY5OTNlZWVmMTkwMTJlNjQ4OTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5QmFzZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1YnlCYXNlLmNwcApAQCAtMTQz LDEzICsxNDMsMTMgQEAgRVRleHRBbGlnbiBSZW5kZXJSdWJ5QmFzZTo6dGV4dEFsaWdubWVudEZv ckxpbmUoYm9vbCAvKiBlbmRzV2l0aFNvZnRCcmVhayAqLykgY28KIAogdm9pZCBSZW5kZXJSdWJ5 QmFzZTo6YWRqdXN0SW5saW5lRGlyZWN0aW9uTGluZUJvdW5kcyhpbnQgZXhwYW5zaW9uT3Bwb3J0 dW5pdHlDb3VudCwgZmxvYXQmIGxvZ2ljYWxMZWZ0LCBmbG9hdCYgbG9naWNhbFdpZHRoKSBjb25z dAogewotICAgIGlmIChydWJ5UnVuKCktPmhhc092ZXJyaWRlV2lkdGgoKSAmJiBmaXJzdFJvb3RC b3goKSAmJiAhZmlyc3RSb290Qm94KCktPm5leHRSb290Qm94KCkpIHsKKyAgICBpZiAocnVieVJ1 bigpLT5oYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKSAmJiBmaXJzdFJvb3RCb3goKSAm JiAhZmlyc3RSb290Qm94KCktPm5leHRSb290Qm94KCkpIHsKICAgICAgICAgbG9naWNhbExlZnQg Kz0gbV9pbml0aWFsT2Zmc2V0OwogICAgICAgICBsb2dpY2FsV2lkdGggLT0gMiAqIG1faW5pdGlh bE9mZnNldDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIExheW91dFVuaXQgbWF4UHJl ZmVycmVkTG9naWNhbFdpZHRoID0gcnVieVJ1bigpICYmIHJ1YnlSdW4oKS0+aGFzT3ZlcnJpZGVX aWR0aCgpID8gcnVieVJ1bigpLT5vdmVycmlkZUxvZ2ljYWxDb250ZW50V2lkdGgoKSA6IHRoaXMt Pm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpOworICAgIExheW91dFVuaXQgbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoID0gcnVieVJ1bigpICYmIHJ1YnlSdW4oKS0+aGFzT3ZlcnJpZGVMb2dpY2Fs Q29udGVudFdpZHRoKCkgPyBydWJ5UnVuKCktPm92ZXJyaWRlTG9naWNhbENvbnRlbnRXaWR0aCgp IDogdGhpcy0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCk7CiAgICAgaWYgKG1heFByZWZlcnJl ZExvZ2ljYWxXaWR0aCA+PSBsb2dpY2FsV2lkdGgpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAppbmRleCAwMTk1 ZGY3MGZkN2FjOGRlMTg0ZWVkYjBlMDM5Njg4MTY3ZTFkMWQ4Li5iMzA5MzMwZWI4NWEyM2FjZjA5 MjU3NTllNGY0ZDFhYzcwNjgwOWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVTZWN0aW9uLmNwcApAQCAtMzE2LDcgKzMxNiw3IEBAIGludCBSZW5kZXJUYWJs ZVNlY3Rpb246OmNhbGNSb3dMb2dpY2FsSGVpZ2h0KCkKICAgICAgICAgICAgICAgICAvLyBGb3Ig cm93IHNwYW5uaW5nIGNlbGxzLCB8cnwgaXMgdGhlIGxhc3Qgcm93IGluIHRoZSBzcGFuLgogICAg ICAgICAgICAgICAgIHVuc2lnbmVkIGNlbGxTdGFydFJvdyA9IGNlbGwtPnJvd0luZGV4KCk7CiAK LSAgICAgICAgICAgICAgICBpZiAoY2VsbC0+aGFzT3ZlcnJpZGVIZWlnaHQoKSkgeworICAgICAg ICAgICAgICAgIGlmIChjZWxsLT5oYXNPdmVycmlkZUxvZ2ljYWxDb250ZW50SGVpZ2h0KCkpIHsK ICAgICAgICAgICAgICAgICAgICAgaWYgKCFzdGF0ZVB1c2hlci5kaWRQdXNoKCkpIHsKICAgICAg ICAgICAgICAgICAgICAgICAgIC8vIFRlY2huaWNhbGx5LCB3ZSBzaG91bGQgYWxzbyBwdXNoIHN0 YXRlIGZvciB0aGUgcm93LCBidXQgc2luY2UKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHJv d3MgZG9uJ3QgcHVzaCBhIGNvb3JkaW5hdGUgdHJhbnNmb3JtLCB0aGF0J3Mgbm90IG5lY2Vzc2Fy eS4K