186421 2018-06-07 20:09:37 -0700 [Win][MiniBrowser] Add a new BrowserWindow interface to abstract WK1 and WK2 BrowserWindow 2018-06-08 15:08:09 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184770 1 fujii fujii achristensen bfulgham darin lforschler pvollan rniwa webkit-bug-importer oldest_to_newest 1431116 0 fujii 2018-06-07 20:09:37 -0700 [Win][MiniBrowser] Add a new BrowserWindow interface to abstract WK1 and WK2 BrowserWindow This is the core patch to make MiniBrowser to support WK1 and WK2 windows (Bug 184770). I will rename MiniBrowser class to WK1BrowserWindow in a follow-up patch (Bug 184770 Comment 12). 1431121 1 342233 fujii 2018-06-07 20:20:50 -0700 Created attachment 342233 Patch 1431131 2 342233 rniwa 2018-06-07 21:15:18 -0700 Comment on attachment 342233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342233&action=review > Tools/MiniBrowser/win/PrintWebUIDelegate.cpp:74 > + MiniBrowser* newBrowserWindow = static_cast<MiniBrowser*>(newWindow.browserWindow()); Can we use MiniBrowser& or auto& instead? 1431132 3 342233 fujii 2018-06-07 21:17:41 -0700 Comment on attachment 342233 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342233&action=review Thank you for the review. >> Tools/MiniBrowser/win/PrintWebUIDelegate.cpp:74 >> + MiniBrowser* newBrowserWindow = static_cast<MiniBrowser*>(newWindow.browserWindow()); > > Can we use MiniBrowser& or auto& instead? Agreed. Will fix with auto&. 1431147 4 342241 fujii 2018-06-07 22:05:34 -0700 Created attachment 342241 Patch 1431148 5 fujii 2018-06-07 22:14:31 -0700 Committed r232616: <https://trac.webkit.org/changeset/232616> 1431149 6 webkit-bug-importer 2018-06-07 22:15:21 -0700 <rdar://problem/40924038> 1431254 7 darin 2018-06-08 09:32:31 -0700 (In reply to Fujii Hironori from comment #0) > I will rename MiniBrowser class to WK1BrowserWindow in a follow-up patch > (Bug 184770 Comment 12). I don’t think you should do that. The older WebKit programming model is no longer referred to as "WebKit 1" but rather "legacy WebKit" or "WebKitLegacy". 1431441 8 fujii 2018-06-08 15:08:09 -0700 (In reply to Darin Adler from comment #7) > (In reply to Fujii Hironori from comment #0) > > I will rename MiniBrowser class to WK1BrowserWindow in a follow-up patch > > (Bug 184770 Comment 12). > > I don’t think you should do that. The older WebKit programming model is no > longer referred to as "WebKit 1" but rather "legacy WebKit" or > "WebKitLegacy". Thank you for the feedback. We are discussing it in Bug 186427. 342233 2018-06-07 20:20:50 -0700 2018-06-07 22:05:31 -0700 Patch bug-186421-20180608122049.patch text/plain 11198 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNjA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWYyOWU4MmRjYjUxNDg3ZWI5YjExMjEyMTcxMzYzZGU4 ZmVlMTNiMC4uNTM5MDg2ZGRlODQ1ZDAyNWQ4NmE5ZGM1MjVlZjQ3MmVmZmFlYjViYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDE4LTA2LTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBBZGQgYSBuZXcgQnJvd3NlcldpbmRvdyBp bnRlcmZhY2UgdG8gYWJzdHJhY3QgV0sxIGFuZCBXSzIgQnJvd3NlcldpbmRvdworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2NDIxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyB0aGUgY29yZSBw YXRjaCB0byBtYWtlIE1pbmlCcm93c2VyIHRvIHN1cHBvcnQgV0sxIGFuZCBXSzIKKyAgICAgICAg d2luZG93cyAoQnVnIDE4NDc3MCkuCisKKyAgICAgICAgSSB3aWxsIHJlbmFtZSBNaW5pQnJvd3Nl ciBjbGFzcyB0byBXSzFCcm93c2VyV2luZG93IGluIGEgZm9sbG93LXVwCisgICAgICAgIHBhdGNo IChCdWcgMTg0NzcwIENvbW1lbnQgMTIpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL0Jy b3dzZXJXaW5kb3cuaDogQWRkZWQuCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL01haW5XaW5k b3cuY3BwOgorICAgICAgICAoTWFpbldpbmRvdzo6V25kUHJvYyk6CisgICAgICAgICogTWluaUJy b3dzZXIvd2luL01haW5XaW5kb3cuaDoKKyAgICAgICAgKE1haW5XaW5kb3c6OmJyb3dzZXJXaW5k b3cgY29uc3QpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHA6Cisg ICAgICAgIChNaW5pQnJvd3Nlcjo6Y3JlYXRlKToKKyAgICAgICAgKE1pbmlCcm93c2VyOjpuYXZp Z2F0ZUZvcndhcmRPckJhY2t3YXJkKTogUmVtb3ZlZCB0aGUgdW5zZWQgZmlyc3QgYXJndW1lbnQg aFduZC4KKyAgICAgICAgKE1pbmlCcm93c2VyOjpuYXZpZ2F0ZVRvSGlzdG9yeSk6IERpdHRvLgor ICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5oOiBJbmhlcml0IEJyb3dzZXJX aW5kb3cgaW50ZXJmYWNlLgorICAgICAgICBNYWtlIGFsbCBvdGhlciBtZXRob2RzIHByaXZhdGUg YW5kIG1ha2UgZGVsZWdhdGVzIGNsYXNzZXMgZnJpZW5kcy4KKyAgICAgICAgKiBNaW5pQnJvd3Nl ci93aW4vUHJpbnRXZWJVSURlbGVnYXRlLmNwcDoKKyAgICAgICAgKFByaW50V2ViVUlEZWxlZ2F0 ZTo6Y3JlYXRlV2ViVmlld1dpdGhSZXF1ZXN0KToKKwogMjAxOC0wNi0wNyAgRnVqaWkgSGlyb25v cmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXVtNaW5pQnJvd3Nl cl0gTWluaUJyb3dzZXI6OnVwZGF0ZURldmljZVNjYWxlRmFjdG9yIHNob3VsZCBiZSBhIE1haW5X aW5kb3cncyBtZXRob2QKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Ccm93c2Vy V2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlcldpbmRvdy5oCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjlhZWFlYzRkMDlmZTNhMWJkOTRmNzJlNGFlOGM0YThhODY2NWZjMjcKLS0tIC9kZXYvbnVs bAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3NlcldpbmRvdy5oCkBAIC0wLDAgKzEs NTggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTggU29ueSBJbnRlcmFjdGl2ZSBFbnRlcnRh aW5tZW50IEluYy4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoK KyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRo ZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIK KyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMu IE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJP RklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor I3ByYWdtYSBvbmNlCisKKyNpbmNsdWRlIDx3aW5kb3dzLmg+CisjaW5jbHVkZSA8d3RmL1JlZkNv dW50ZWQuaD4KKworY2xhc3MgQnJvd3NlcldpbmRvdyA6IHB1YmxpYyBSZWZDb3VudGVkPEJyb3dz ZXJXaW5kb3c+IHsKK3B1YmxpYzoKKyAgICB2aXJ0dWFsIH5Ccm93c2VyV2luZG93KCkgeyB9Owor CisgICAgdmlydHVhbCBIUkVTVUxUIGluaXQoKSA9IDA7CisgICAgdmlydHVhbCBIV05EIGh3bmQo KSA9IDA7CisKKyAgICB2aXJ0dWFsIEhSRVNVTFQgbG9hZEhUTUxTdHJpbmcoY29uc3QgQlNUUiYp ID0gMDsKKyAgICB2aXJ0dWFsIEhSRVNVTFQgbG9hZFVSTChjb25zdCBCU1RSJiBwYXNzZWRVUkwp ID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgbmF2aWdhdGVGb3J3YXJkT3JCYWNrd2FyZChVSU5UIG1l bnVJRCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBuYXZpZ2F0ZVRvSGlzdG9yeShVSU5UIG1lbnVJ RCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRQcmVmZXJlbmNlKFVJTlQgbWVudUlELCBib29s IGVuYWJsZSkgPSAwOworICAgIHZpcnR1YWwgYm9vbCB1c2VzTGF5ZXJlZFdlYlZpZXcoKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQorCisgICAgdmlydHVhbCB2b2lkIHByaW50KCkgPSAwOworICAg IHZpcnR1YWwgdm9pZCBsYXVuY2hJbnNwZWN0b3IoKSA9IDA7CisKKyAgICB2aXJ0dWFsIF9ic3Ry X3QgdXNlckFnZW50KCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRVc2VyQWdlbnQoVUlOVCBt ZW51SUQpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0VXNlckFnZW50KF9ic3RyX3QmIGN1c3Rv bVVBU3RyaW5nKSA9IDA7CisKKyAgICB2aXJ0dWFsIHZvaWQgc2hvd0xheWVyVHJlZSgpID0gMDsK KyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU3RhdGlzdGljcyhIV05EIGRpYWxvZykgPSAwOworCisg ICAgdmlydHVhbCB2b2lkIHJlc2V0Wm9vbSgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgem9vbUlu KCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCB6b29tT3V0KCkgPSAwOworfTsKZGlmZiAtLWdpdCBh L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcCBiL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9NYWluV2luZG93LmNwcAppbmRleCBiOWFhYzdmYmNiNjk1NjMyMGUxMDllMjAxNWVjYTlh ZmFlODRhYTE2Li41ZWQyM2NmODZkZjM2OThkYWQ1MjdiZmVjN2YxYWYxZmRkYzhkNDIzIDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKKysrIGIvVG9vbHMv TWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCkBAIC0xNjMsNyArMTYzLDcgQEAgTFJFU1VM VCBDQUxMQkFDSyBNYWluV2luZG93OjpXbmRQcm9jKEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLCBX UEFSQU0gd1BhcmFtLCBMUEEKICAgICAgICAgICAgIHJldHVybiBEZWZXaW5kb3dQcm9jKGhXbmQs IG1lc3NhZ2UsIHdQYXJhbSwgbFBhcmFtKTsKICAgICAgICAgfQogICAgICAgICBpZiAod21JZCA+ PSBJRE1fSElTVE9SWV9MSU5LMCAmJiB3bUlkIDw9IElETV9ISVNUT1JZX0xJTks5KSB7Ci0gICAg ICAgICAgICB0aGlzV2luZG93LT5icm93c2VyV2luZG93KCktPm5hdmlnYXRlVG9IaXN0b3J5KGhX bmQsIHdtSWQpOworICAgICAgICAgICAgdGhpc1dpbmRvdy0+YnJvd3NlcldpbmRvdygpLT5uYXZp Z2F0ZVRvSGlzdG9yeSh3bUlkKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAg ICAgIC8vIFBhcnNlIHRoZSBtZW51IHNlbGVjdGlvbnM6CkBAIC0xOTEsNyArMTkxLDcgQEAgTFJF U1VMVCBDQUxMQkFDSyBNYWluV2luZG93OjpXbmRQcm9jKEhXTkQgaFduZCwgVUlOVCBtZXNzYWdl LCBXUEFSQU0gd1BhcmFtLCBMUEEKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIElE TV9ISVNUT1JZX0JBQ0tXQVJEOgogICAgICAgICBjYXNlIElETV9ISVNUT1JZX0ZPUldBUkQ6Ci0g ICAgICAgICAgICB0aGlzV2luZG93LT5icm93c2VyV2luZG93KCktPm5hdmlnYXRlRm9yd2FyZE9y QmFja3dhcmQoaFduZCwgd21JZCk7CisgICAgICAgICAgICB0aGlzV2luZG93LT5icm93c2VyV2lu ZG93KCktPm5hdmlnYXRlRm9yd2FyZE9yQmFja3dhcmQod21JZCk7CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgY2FzZSBJRE1fVUFfT1RIRVI6CiAgICAgICAgICAgICBEaWFsb2dCb3hQYXJh bShoSW5zdCwgTUFLRUlOVFJFU09VUkNFKElERF9VU0VSX0FHRU5UKSwgaFduZCwgY3VzdG9tVXNl ckFnZW50RGlhbG9nUHJvYywgcmVpbnRlcnByZXRfY2FzdDxMUEFSQU0+KHRoaXNXaW5kb3cuZ2V0 KCkpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmggYi9U b29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCmluZGV4IDJkZTRiNDc3NTZjNTgzOTVk YzcwMzI5OGRhMjYzYmE3ZWRmODYwNjQuLjQ0MDRkMWNkZGVlNzUzODE5YWU5MTNlMTcyMzhjYWFk YTlhNmE5MDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmgK KysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaApAQCAtMzksNyArMzksNyBA QCBwdWJsaWM6CiAKICAgICB2b2lkIHJlc2l6ZVN1YlZpZXdzKCk7CiAgICAgSFdORCBod25kKCkg Y29uc3QgeyByZXR1cm4gbV9oTWFpblduZDsgfQotICAgIE1pbmlCcm93c2VyKiBicm93c2VyV2lu ZG93KCkgY29uc3QgeyByZXR1cm4gbV9icm93c2VyV2luZG93LmdldCgpOyB9CisgICAgQnJvd3Nl cldpbmRvdyogYnJvd3NlcldpbmRvdygpIGNvbnN0IHsgcmV0dXJuIG1fYnJvd3NlcldpbmRvdy5n ZXQoKTsgfQogCiAgICAgdm9pZCBsb2FkVVJMKEJTVFIgdXJsKTsKICAgICAKQEAgLTYyLDUgKzYy LDUgQEAgcHJpdmF0ZToKICAgICBIV05EIG1faEZvcndhcmRCdXR0b25XbmQgeyBudWxscHRyIH07 CiAgICAgSFdORCBtX2hDYWNoZVduZCB7IG51bGxwdHIgfTsKICAgICBIR0RJT0JKIG1faFVSTEJh ckZvbnQgeyBudWxscHRyIH07Ci0gICAgUmVmUHRyPE1pbmlCcm93c2VyPiBtX2Jyb3dzZXJXaW5k b3c7CisgICAgUmVmUHRyPEJyb3dzZXJXaW5kb3c+IG1fYnJvd3NlcldpbmRvdzsKIH07CmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuY3BwIGIvVG9vbHMvTWlu aUJyb3dzZXIvd2luL01pbmlCcm93c2VyLmNwcAppbmRleCA2MDJhZDZmZDAzMmNiNDI1MGNlNWRm OTM1Nzg4NWFkNTIzOTM3NzUyLi5lOTY3Mjk3N2UwYTZiOTU3NDU2OWU5MjhkMmMwNzE4NmM2MTUw MTI3IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuY3BwCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHAKQEAgLTYwLDcgKzYwLDcg QEAgc3RhdGljIGNvbnN0IGludCBtYXhIaXN0b3J5U2l6ZSA9IDEwOwogCiB0eXBlZGVmIF9jb21f cHRyX3Q8X2NvbV9JSUlEPElXZWJNdXRhYmxlVVJMUmVxdWVzdCwgJl9fdXVpZG9mKElXZWJNdXRh YmxlVVJMUmVxdWVzdCk+PiBJV2ViTXV0YWJsZVVSTFJlcXVlc3RQdHI7CiAKLVJlZjxNaW5pQnJv d3Nlcj4gTWluaUJyb3dzZXI6OmNyZWF0ZShIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBi b29sIHVzZUxheWVyZWRXZWJWaWV3LCBib29sIHBhZ2VMb2FkVGVzdGluZykKK1JlZjxCcm93c2Vy V2luZG93PiBNaW5pQnJvd3Nlcjo6Y3JlYXRlKEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQs IGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcsIGJvb2wgcGFnZUxvYWRUZXN0aW5nKQogewogICAgIHJl dHVybiBhZG9wdFJlZigqbmV3IE1pbmlCcm93c2VyKG1haW5XbmQsIHVybEJhclduZCwgdXNlTGF5 ZXJlZFdlYlZpZXcsIHBhZ2VMb2FkVGVzdGluZykpOwogfQpAQCAtNDMwLDcgKzQzMCw3IEBAIHZv aWQgTWluaUJyb3dzZXI6OmxhdW5jaEluc3BlY3RvcigpCiAgICAgbV9pbnNwZWN0b3ItPnNob3co KTsKIH0KIAotdm9pZCBNaW5pQnJvd3Nlcjo6bmF2aWdhdGVGb3J3YXJkT3JCYWNrd2FyZChIV05E IGhXbmQsIFVJTlQgbWVudUlEKQordm9pZCBNaW5pQnJvd3Nlcjo6bmF2aWdhdGVGb3J3YXJkT3JC YWNrd2FyZChVSU5UIG1lbnVJRCkKIHsKICAgICBpZiAoIW1fd2ViVmlldykKICAgICAgICAgcmV0 dXJuOwpAQCAtNDQyLDcgKzQ0Miw3IEBAIHZvaWQgTWluaUJyb3dzZXI6Om5hdmlnYXRlRm9yd2Fy ZE9yQmFja3dhcmQoSFdORCBoV25kLCBVSU5UIG1lbnVJRCkKICAgICAgICAgbV93ZWJWaWV3LT5n b0JhY2soJndlbnRCYWNrT3JGb3J3YXJkKTsKIH0KIAotdm9pZCBNaW5pQnJvd3Nlcjo6bmF2aWdh dGVUb0hpc3RvcnkoSFdORCBoV25kLCBVSU5UIG1lbnVJRCkKK3ZvaWQgTWluaUJyb3dzZXI6Om5h dmlnYXRlVG9IaXN0b3J5KFVJTlQgbWVudUlEKQogewogICAgIGlmICghbV93ZWJWaWV3KQogICAg ICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dz ZXIuaCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5oCmluZGV4IGVjNTQyOGM1 YWJmZmFkYjM2MTE1NjY5ODc4MGZkYzU3ODlmMTU4NWMuLjM2MzNiMjhhMjIxOTk4OWExMzEwYzY2 YmJiN2Q5ZWE3ZDJjMjAxMDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5p QnJvd3Nlci5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5oCkBAIC0y NCwxMiArMjQsMTIgQEAKICAqLwogCiAjcHJhZ21hIG9uY2UKKyNpbmNsdWRlICJCcm93c2VyV2lu ZG93LmgiCiAjaW5jbHVkZSAiUGFnZUxvYWRUZXN0Q2xpZW50LmgiCiAjaW5jbHVkZSA8V2ViS2l0 TGVnYWN5L1dlYktpdC5oPgogI2luY2x1ZGUgPGNvbWlwLmg+CiAjaW5jbHVkZSA8bWVtb3J5Pgog I2luY2x1ZGUgPHZlY3Rvcj4KLSNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogCiB0eXBlZGVm IF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJGcmFtZSwgJl9fdXVpZG9mKElXZWJGcmFtZSk+PiBJ V2ViRnJhbWVQdHI7CiB0eXBlZGVmIF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJWaWV3LCAmX191 dWlkb2YoSVdlYlZpZXcpPj4gSVdlYlZpZXdQdHI7CkBAIC00OCw5ICs0OCwxNyBAQCB0eXBlZGVm IF9jb21fcHRyX3Q8X2NvbV9JSUlEPElXZWJSZXNvdXJjZUxvYWREZWxlZ2F0ZSwgJl9fdXVpZG9m KElXZWJSZXNvdXJjZUxvYQogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRG93bmxv YWREZWxlZ2F0ZSwgJl9fdXVpZG9mKElXZWJEb3dubG9hZERlbGVnYXRlKT4+IElXZWJEb3dubG9h ZERlbGVnYXRlUHRyOwogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViRnJhbWVQcml2 YXRlLCAmX191dWlkb2YoSVdlYkZyYW1lUHJpdmF0ZSk+PiBJV2ViRnJhbWVQcml2YXRlUHRyOwog Ci1jbGFzcyBNaW5pQnJvd3NlciA6IHB1YmxpYyBSZWZDb3VudGVkPE1pbmlCcm93c2VyPiB7Citj bGFzcyBNaW5pQnJvd3NlciA6IHB1YmxpYyBCcm93c2VyV2luZG93IHsKIHB1YmxpYzoKLSAgICBz dGF0aWMgUmVmPE1pbmlCcm93c2VyPiBjcmVhdGUoSFdORCBtYWluV25kLCBIV05EIHVybEJhcldu ZCwgYm9vbCB1c2VMYXllcmVkV2ViVmlldyA9IGZhbHNlLCBib29sIHBhZ2VMb2FkVGVzdGluZyA9 IGZhbHNlKTsKKyAgICBzdGF0aWMgUmVmPEJyb3dzZXJXaW5kb3c+IGNyZWF0ZShIV05EIG1haW5X bmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRXZWJWaWV3ID0gZmFsc2UsIGJvb2wg cGFnZUxvYWRUZXN0aW5nID0gZmFsc2UpOworCitwcml2YXRlOgorICAgIGZyaWVuZCBjbGFzcyBB Y2Nlc3NpYmlsaXR5RGVsZWdhdGU7CisgICAgZnJpZW5kIGNsYXNzIE1pbmlCcm93c2VyV2ViSG9z dDsKKyAgICBmcmllbmQgY2xhc3MgUHJpbnRXZWJVSURlbGVnYXRlOworICAgIGZyaWVuZCBjbGFz cyBXZWJEb3dubG9hZERlbGVnYXRlOworICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZUxvYWREZWxl Z2F0ZTsKKyAgICBmcmllbmQgY2xhc3MgUGFnZUxvYWRUZXN0Q2xpZW50OwogCiAgICAgVUxPTkcg QWRkUmVmKCk7CiAgICAgVUxPTkcgUmVsZWFzZSgpOwpAQCAtNjMsOCArNzEsOCBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIHNob3dMYXN0VmlzaXRlZFNpdGVzKElXZWJWaWV3Jik7CiAgICAgdm9pZCBs YXVuY2hJbnNwZWN0b3IoKTsKLSAgICB2b2lkIG5hdmlnYXRlRm9yd2FyZE9yQmFja3dhcmQoSFdO RCBoV25kLCBVSU5UIG1lbnVJRCk7Ci0gICAgdm9pZCBuYXZpZ2F0ZVRvSGlzdG9yeShIV05EIGhX bmQsIFVJTlQgbWVudUlEKTsKKyAgICB2b2lkIG5hdmlnYXRlRm9yd2FyZE9yQmFja3dhcmQoVUlO VCBtZW51SUQpOworICAgIHZvaWQgbmF2aWdhdGVUb0hpc3RvcnkoVUlOVCBtZW51SUQpOwogICAg IHZvaWQgZXhpdFByb2dyYW0oKTsKICAgICBib29sIHNlZWRJbml0aWFsRGVmYXVsdFByZWZlcmVu Y2VzKCk7CiAgICAgYm9vbCBzZXRUb0RlZmF1bHRQcmVmZXJlbmNlcygpOwpAQCAtMTA2LDcgKzEx NCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHVwZGF0ZVN0YXRpc3RpY3MoSFdORCBkaWFsb2cpOwog ICAgIHZvaWQgc2V0UHJlZmVyZW5jZShVSU5UIG1lbnVJRCwgYm9vbCBlbmFibGUpOwogCi1wcml2 YXRlOgogICAgIE1pbmlCcm93c2VyKEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wg dXNlTGF5ZXJlZFdlYlZpZXcsIGJvb2wgcGFnZUxvYWRUZXN0aW5nKTsKICAgICB2b2lkIHN1YmNs YXNzRm9yTGF5ZXJlZFdpbmRvdygpOwogICAgIGJvb2wgc2V0Q2FjaGVGb2xkZXIoKTsKZGlmZiAt LWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QcmludFdlYlVJRGVsZWdhdGUuY3BwIGIvVG9v bHMvTWluaUJyb3dzZXIvd2luL1ByaW50V2ViVUlEZWxlZ2F0ZS5jcHAKaW5kZXggYzdlNmRkZDg1 MjRiNDM3OWE4ZmQzM2ZmODExNGUwNDZiNjllZWU0Ni4uNDU4MGY2NjdhMTNiN2IyM2UwNjRjZGRk MWI0MTAzOGVjZTI3Mzk2NSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1ByaW50 V2ViVUlEZWxlZ2F0ZS5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1ByaW50V2ViVUlE ZWxlZ2F0ZS5jcHAKQEAgLTI5LDkgKzI5LDcgQEAKIAogI2luY2x1ZGUgIkNvbW1vbi5oIgogI2lu Y2x1ZGUgIk1haW5XaW5kb3cuaCIKLSNpZiBVU0UoQ0YpCi0jaW5jbHVkZSA8Q29yZUZvdW5kYXRp b24vQ29yZUZvdW5kYXRpb24uaD4KLSNlbmRpZgorI2luY2x1ZGUgIk1pbmlCcm93c2VyLmgiCiAj aW5jbHVkZSA8V2ViQ29yZS9DT01QdHIuaD4KICNpbmNsdWRlIDxXZWJLaXRMZWdhY3kvV2ViS2l0 Q09NQVBJLmg+CiAjaW5jbHVkZSA8Y29taXAuaD4KQEAgLTQxLDYgKzM5LDEwIEBACiAjaW5jbHVk ZSA8c2hsd2FwaS5oPgogI2luY2x1ZGUgPHdpbmluZXQuaD4KIAorI2lmIFVTRShDRikKKyNpbmNs dWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgorI2VuZGlmCisKIHN0YXRpYyBj b25zdCBpbnQgTUFSR0lOID0gMjA7CiAKIEhSRVNVTFQgUHJpbnRXZWJVSURlbGVnYXRlOjpydW5K YXZhU2NyaXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdlKF9Jbl9vcHRfIElXZWJWaWV3KiwgX0luXyBC U1RSIG1lc3NhZ2UpCkBAIC02OSw3ICs3MSw4IEBAIEhSRVNVTFQgUHJpbnRXZWJVSURlbGVnYXRl OjpjcmVhdGVXZWJWaWV3V2l0aFJlcXVlc3QoX0luX29wdF8gSVdlYlZpZXcqLCBfSW5fb3B0CiAg ICAgICAgIHJldHVybiBFX0ZBSUw7CiAgICAgU2hvd1dpbmRvdyhuZXdXaW5kb3cuaHduZCgpLCBT V19TSE9XKTsKIAotICAgICpuZXdXZWJWaWV3ID0gbmV3V2luZG93LmJyb3dzZXJXaW5kb3coKS0+ d2ViVmlldygpOworICAgIE1pbmlCcm93c2VyKiBuZXdCcm93c2VyV2luZG93ID0gc3RhdGljX2Nh c3Q8TWluaUJyb3dzZXIqPihuZXdXaW5kb3cuYnJvd3NlcldpbmRvdygpKTsKKyAgICAqbmV3V2Vi VmlldyA9IG5ld0Jyb3dzZXJXaW5kb3ctPndlYlZpZXcoKTsKICAgICBJV2ViRnJhbWVQdHIgZnJh bWU7CiAgICAgSFJFU1VMVCBocjsKICAgICBociA9ICgqbmV3V2ViVmlldyktPm1haW5GcmFtZSgm ZnJhbWUuR2V0SW50ZXJmYWNlUHRyKCkpOwo= 342241 2018-06-07 22:05:34 -0700 2018-06-07 22:05:34 -0700 Patch bug-186421-20180608140533.patch text/plain 11189 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNjE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWYyOWU4MmRjYjUxNDg3ZWI5YjExMjEyMTcxMzYzZGU4 ZmVlMTNiMC4uMTg1YjQwYWE4OTMzZjNkYzg2MzIzZjQ4ODRhMWZjZTkzZGM0Y2NjZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDE4LTA2LTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBBZGQgYSBuZXcgQnJvd3NlcldpbmRvdyBp bnRlcmZhY2UgdG8gYWJzdHJhY3QgV0sxIGFuZCBXSzIgQnJvd3NlcldpbmRvdworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2NDIxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIFRoaXMgaXMgdGhlIGNvcmUgcGF0 Y2ggdG8gbWFrZSBNaW5pQnJvd3NlciB0byBzdXBwb3J0IFdLMSBhbmQgV0syCisgICAgICAgIHdp bmRvd3MgKEJ1ZyAxODQ3NzApLgorCisgICAgICAgIEkgd2lsbCByZW5hbWUgTWluaUJyb3dzZXIg Y2xhc3MgdG8gV0sxQnJvd3NlcldpbmRvdyBpbiBhIGZvbGxvdy11cAorICAgICAgICBwYXRjaCAo QnVnIDE4NDc3MCBDb21tZW50IDEyKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9Ccm93 c2VyV2luZG93Lmg6IEFkZGVkLgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NYWluV2luZG93 LmNwcDoKKyAgICAgICAgKE1haW5XaW5kb3c6OlduZFByb2MpOgorICAgICAgICAqIE1pbmlCcm93 c2VyL3dpbi9NYWluV2luZG93Lmg6CisgICAgICAgIChNYWluV2luZG93Ojpicm93c2VyV2luZG93 IGNvbnN0KToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuY3BwOgorICAg ICAgICAoTWluaUJyb3dzZXI6OmNyZWF0ZSk6CisgICAgICAgIChNaW5pQnJvd3Nlcjo6bmF2aWdh dGVGb3J3YXJkT3JCYWNrd2FyZCk6IFJlbW92ZWQgdGhlIHVuc2VkIGZpcnN0IGFyZ3VtZW50IGhX bmQuCisgICAgICAgIChNaW5pQnJvd3Nlcjo6bmF2aWdhdGVUb0hpc3RvcnkpOiBEaXR0by4KKyAg ICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuaDogSW5oZXJpdCBCcm93c2VyV2lu ZG93IGludGVyZmFjZS4KKyAgICAgICAgTWFrZSBhbGwgb3RoZXIgbWV0aG9kcyBwcml2YXRlIGFu ZCBtYWtlIGRlbGVnYXRlcyBjbGFzc2VzIGZyaWVuZHMuCisgICAgICAgICogTWluaUJyb3dzZXIv d2luL1ByaW50V2ViVUlEZWxlZ2F0ZS5jcHA6CisgICAgICAgIChQcmludFdlYlVJRGVsZWdhdGU6 OmNyZWF0ZVdlYlZpZXdXaXRoUmVxdWVzdCk6CisKIDIwMTgtMDYtMDcgIEZ1amlpIEhpcm9ub3Jp ICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW1dpbl1bTWluaUJyb3dzZXJd IE1pbmlCcm93c2VyOjp1cGRhdGVEZXZpY2VTY2FsZUZhY3RvciBzaG91bGQgYmUgYSBNYWluV2lu ZG93J3MgbWV0aG9kCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vQnJvd3Nlcldp bmRvdy5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL0Jyb3dzZXJXaW5kb3cuaApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li45YWVhZWM0ZDA5ZmUzYTFiZDk0ZjcyZTRhZThjNGE4YTg2NjVmYzI3Ci0tLSAvZGV2L251bGwK KysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL0Jyb3dzZXJXaW5kb3cuaApAQCAtMCwwICsxLDU4 IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE4IFNvbnkgSW50ZXJhY3RpdmUgRW50ZXJ0YWlu bWVudCBJbmMuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6Cisg KiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUK KyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB UFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisg KiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElO Q0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJ VFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBU SEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJ TElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNw cmFnbWEgb25jZQorCisjaW5jbHVkZSA8d2luZG93cy5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3Vu dGVkLmg+CisKK2NsYXNzIEJyb3dzZXJXaW5kb3cgOiBwdWJsaWMgUmVmQ291bnRlZDxCcm93c2Vy V2luZG93PiB7CitwdWJsaWM6CisgICAgdmlydHVhbCB+QnJvd3NlcldpbmRvdygpIHsgfTsKKwor ICAgIHZpcnR1YWwgSFJFU1VMVCBpbml0KCkgPSAwOworICAgIHZpcnR1YWwgSFdORCBod25kKCkg PSAwOworCisgICAgdmlydHVhbCBIUkVTVUxUIGxvYWRIVE1MU3RyaW5nKGNvbnN0IEJTVFImKSA9 IDA7CisgICAgdmlydHVhbCBIUkVTVUxUIGxvYWRVUkwoY29uc3QgQlNUUiYgcGFzc2VkVVJMKSA9 IDA7CisgICAgdmlydHVhbCB2b2lkIG5hdmlnYXRlRm9yd2FyZE9yQmFja3dhcmQoVUlOVCBtZW51 SUQpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgbmF2aWdhdGVUb0hpc3RvcnkoVUlOVCBtZW51SUQp ID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0UHJlZmVyZW5jZShVSU5UIG1lbnVJRCwgYm9vbCBl bmFibGUpID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgdXNlc0xheWVyZWRXZWJWaWV3KCkgY29uc3Qg eyByZXR1cm4gZmFsc2U7IH0KKworICAgIHZpcnR1YWwgdm9pZCBwcmludCgpID0gMDsKKyAgICB2 aXJ0dWFsIHZvaWQgbGF1bmNoSW5zcGVjdG9yKCkgPSAwOworCisgICAgdmlydHVhbCBfYnN0cl90 IHVzZXJBZ2VudCgpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0VXNlckFnZW50KFVJTlQgbWVu dUlEKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldFVzZXJBZ2VudChfYnN0cl90JiBjdXN0b21V QVN0cmluZykgPSAwOworCisgICAgdmlydHVhbCB2b2lkIHNob3dMYXllclRyZWUoKSA9IDA7Cisg ICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRpc3RpY3MoSFdORCBkaWFsb2cpID0gMDsKKworICAg IHZpcnR1YWwgdm9pZCByZXNldFpvb20oKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHpvb21Jbigp ID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgem9vbU91dCgpID0gMDsKK307CmRpZmYgLS1naXQgYS9U b29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93 aW4vTWFpbldpbmRvdy5jcHAKaW5kZXggYjlhYWM3ZmJjYjY5NTYzMjBlMTA5ZTIwMTVlY2E5YWZh ZTg0YWExNi4uNWVkMjNjZjg2ZGYzNjk4ZGFkNTI3YmZlYzdmMWFmMWZkZGM4ZDQyMyAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcApAQCAtMTYzLDcgKzE2Myw3IEBAIExSRVNVTFQg Q0FMTEJBQ0sgTWFpbldpbmRvdzo6V25kUHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwgV1BB UkFNIHdQYXJhbSwgTFBBCiAgICAgICAgICAgICByZXR1cm4gRGVmV2luZG93UHJvYyhoV25kLCBt ZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHdtSWQgPj0g SURNX0hJU1RPUllfTElOSzAgJiYgd21JZCA8PSBJRE1fSElTVE9SWV9MSU5LOSkgewotICAgICAg ICAgICAgdGhpc1dpbmRvdy0+YnJvd3NlcldpbmRvdygpLT5uYXZpZ2F0ZVRvSGlzdG9yeShoV25k LCB3bUlkKTsKKyAgICAgICAgICAgIHRoaXNXaW5kb3ctPmJyb3dzZXJXaW5kb3coKS0+bmF2aWdh dGVUb0hpc3Rvcnkod21JZCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAg ICAvLyBQYXJzZSB0aGUgbWVudSBzZWxlY3Rpb25zOgpAQCAtMTkxLDcgKzE5MSw3IEBAIExSRVNV TFQgQ0FMTEJBQ0sgTWFpbldpbmRvdzo6V25kUHJvYyhIV05EIGhXbmQsIFVJTlQgbWVzc2FnZSwg V1BBUkFNIHdQYXJhbSwgTFBBCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBJRE1f SElTVE9SWV9CQUNLV0FSRDoKICAgICAgICAgY2FzZSBJRE1fSElTVE9SWV9GT1JXQVJEOgotICAg ICAgICAgICAgdGhpc1dpbmRvdy0+YnJvd3NlcldpbmRvdygpLT5uYXZpZ2F0ZUZvcndhcmRPckJh Y2t3YXJkKGhXbmQsIHdtSWQpOworICAgICAgICAgICAgdGhpc1dpbmRvdy0+YnJvd3NlcldpbmRv dygpLT5uYXZpZ2F0ZUZvcndhcmRPckJhY2t3YXJkKHdtSWQpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIGNhc2UgSURNX1VBX09USEVSOgogICAgICAgICAgICAgRGlhbG9nQm94UGFyYW0o aEluc3QsIE1BS0VJTlRSRVNPVVJDRShJRERfVVNFUl9BR0VOVCksIGhXbmQsIGN1c3RvbVVzZXJB Z2VudERpYWxvZ1Byb2MsIHJlaW50ZXJwcmV0X2Nhc3Q8TFBBUkFNPih0aGlzV2luZG93LmdldCgp KSk7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oIGIvVG9v bHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaAppbmRleCAyZGU0YjQ3NzU2YzU4Mzk1ZGM3 MDMyOThkYTI2M2JhN2VkZjg2MDY0Li40NDA0ZDFjZGRlZTc1MzgxOWFlOTEzZTE3MjM4Y2FhZGE5 YTZhOTAzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmgKQEAgLTM5LDcgKzM5LDcgQEAg cHVibGljOgogCiAgICAgdm9pZCByZXNpemVTdWJWaWV3cygpOwogICAgIEhXTkQgaHduZCgpIGNv bnN0IHsgcmV0dXJuIG1faE1haW5XbmQ7IH0KLSAgICBNaW5pQnJvd3NlciogYnJvd3NlcldpbmRv dygpIGNvbnN0IHsgcmV0dXJuIG1fYnJvd3NlcldpbmRvdy5nZXQoKTsgfQorICAgIEJyb3dzZXJX aW5kb3cqIGJyb3dzZXJXaW5kb3coKSBjb25zdCB7IHJldHVybiBtX2Jyb3dzZXJXaW5kb3cuZ2V0 KCk7IH0KIAogICAgIHZvaWQgbG9hZFVSTChCU1RSIHVybCk7CiAgICAgCkBAIC02Miw1ICs2Miw1 IEBAIHByaXZhdGU6CiAgICAgSFdORCBtX2hGb3J3YXJkQnV0dG9uV25kIHsgbnVsbHB0ciB9Owog ICAgIEhXTkQgbV9oQ2FjaGVXbmQgeyBudWxscHRyIH07CiAgICAgSEdESU9CSiBtX2hVUkxCYXJG b250IHsgbnVsbHB0ciB9OwotICAgIFJlZlB0cjxNaW5pQnJvd3Nlcj4gbV9icm93c2VyV2luZG93 OworICAgIFJlZlB0cjxCcm93c2VyV2luZG93PiBtX2Jyb3dzZXJXaW5kb3c7CiB9OwpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyLmNwcCBiL1Rvb2xzL01pbmlC cm93c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHAKaW5kZXggNjAyYWQ2ZmQwMzJjYjQyNTBjZTVkZjkz NTc4ODVhZDUyMzkzNzc1Mi4uZTk2NzI5NzdlMGE2Yjk1NzQ1NjllOTI4ZDJjMDcxODZjNjE1MDEy NyAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyLmNwcAorKysg Yi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuY3BwCkBAIC02MCw3ICs2MCw3IEBA IHN0YXRpYyBjb25zdCBpbnQgbWF4SGlzdG9yeVNpemUgPSAxMDsKIAogdHlwZWRlZiBfY29tX3B0 cl90PF9jb21fSUlJRDxJV2ViTXV0YWJsZVVSTFJlcXVlc3QsICZfX3V1aWRvZihJV2ViTXV0YWJs ZVVSTFJlcXVlc3QpPj4gSVdlYk11dGFibGVVUkxSZXF1ZXN0UHRyOwogCi1SZWY8TWluaUJyb3dz ZXI+IE1pbmlCcm93c2VyOjpjcmVhdGUoSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCwgYm9v bCB1c2VMYXllcmVkV2ViVmlldywgYm9vbCBwYWdlTG9hZFRlc3RpbmcpCitSZWY8QnJvd3Nlcldp bmRvdz4gTWluaUJyb3dzZXI6OmNyZWF0ZShIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBi b29sIHVzZUxheWVyZWRXZWJWaWV3LCBib29sIHBhZ2VMb2FkVGVzdGluZykKIHsKICAgICByZXR1 cm4gYWRvcHRSZWYoKm5ldyBNaW5pQnJvd3NlcihtYWluV25kLCB1cmxCYXJXbmQsIHVzZUxheWVy ZWRXZWJWaWV3LCBwYWdlTG9hZFRlc3RpbmcpKTsKIH0KQEAgLTQzMCw3ICs0MzAsNyBAQCB2b2lk IE1pbmlCcm93c2VyOjpsYXVuY2hJbnNwZWN0b3IoKQogICAgIG1faW5zcGVjdG9yLT5zaG93KCk7 CiB9CiAKLXZvaWQgTWluaUJyb3dzZXI6Om5hdmlnYXRlRm9yd2FyZE9yQmFja3dhcmQoSFdORCBo V25kLCBVSU5UIG1lbnVJRCkKK3ZvaWQgTWluaUJyb3dzZXI6Om5hdmlnYXRlRm9yd2FyZE9yQmFj a3dhcmQoVUlOVCBtZW51SUQpCiB7CiAgICAgaWYgKCFtX3dlYlZpZXcpCiAgICAgICAgIHJldHVy bjsKQEAgLTQ0Miw3ICs0NDIsNyBAQCB2b2lkIE1pbmlCcm93c2VyOjpuYXZpZ2F0ZUZvcndhcmRP ckJhY2t3YXJkKEhXTkQgaFduZCwgVUlOVCBtZW51SUQpCiAgICAgICAgIG1fd2ViVmlldy0+Z29C YWNrKCZ3ZW50QmFja09yRm9yd2FyZCk7CiB9CiAKLXZvaWQgTWluaUJyb3dzZXI6Om5hdmlnYXRl VG9IaXN0b3J5KEhXTkQgaFduZCwgVUlOVCBtZW51SUQpCit2b2lkIE1pbmlCcm93c2VyOjpuYXZp Z2F0ZVRvSGlzdG9yeShVSU5UIG1lbnVJRCkKIHsKICAgICBpZiAoIW1fd2ViVmlldykKICAgICAg ICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2Vy LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuaAppbmRleCBlYzU0MjhjNWFi ZmZhZGIzNjExNTY2OTg3ODBmZGM1Nzg5ZjE1ODVjLi4zNjMzYjI4YTIyMTk5ODlhMTMxMGM2NmJi YjdkOWVhN2QyYzIwMTAxIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJy b3dzZXIuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuaApAQCAtMjQs MTIgKzI0LDEyIEBACiAgKi8KIAogI3ByYWdtYSBvbmNlCisjaW5jbHVkZSAiQnJvd3NlcldpbmRv dy5oIgogI2luY2x1ZGUgIlBhZ2VMb2FkVGVzdENsaWVudC5oIgogI2luY2x1ZGUgPFdlYktpdExl Z2FjeS9XZWJLaXQuaD4KICNpbmNsdWRlIDxjb21pcC5oPgogI2luY2x1ZGUgPG1lbW9yeT4KICNp bmNsdWRlIDx2ZWN0b3I+Ci0jaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KIAogdHlwZWRlZiBf Y29tX3B0cl90PF9jb21fSUlJRDxJV2ViRnJhbWUsICZfX3V1aWRvZihJV2ViRnJhbWUpPj4gSVdl YkZyYW1lUHRyOwogdHlwZWRlZiBfY29tX3B0cl90PF9jb21fSUlJRDxJV2ViVmlldywgJl9fdXVp ZG9mKElXZWJWaWV3KT4+IElXZWJWaWV3UHRyOwpAQCAtNDgsOSArNDgsMTcgQEAgdHlwZWRlZiBf Y29tX3B0cl90PF9jb21fSUlJRDxJV2ViUmVzb3VyY2VMb2FkRGVsZWdhdGUsICZfX3V1aWRvZihJ V2ViUmVzb3VyY2VMb2EKIHR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYkRvd25sb2Fk RGVsZWdhdGUsICZfX3V1aWRvZihJV2ViRG93bmxvYWREZWxlZ2F0ZSk+PiBJV2ViRG93bmxvYWRE ZWxlZ2F0ZVB0cjsKIHR5cGVkZWYgX2NvbV9wdHJfdDxfY29tX0lJSUQ8SVdlYkZyYW1lUHJpdmF0 ZSwgJl9fdXVpZG9mKElXZWJGcmFtZVByaXZhdGUpPj4gSVdlYkZyYW1lUHJpdmF0ZVB0cjsKIAot Y2xhc3MgTWluaUJyb3dzZXIgOiBwdWJsaWMgUmVmQ291bnRlZDxNaW5pQnJvd3Nlcj4geworY2xh c3MgTWluaUJyb3dzZXIgOiBwdWJsaWMgQnJvd3NlcldpbmRvdyB7CiBwdWJsaWM6Ci0gICAgc3Rh dGljIFJlZjxNaW5pQnJvd3Nlcj4gY3JlYXRlKEhXTkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQs IGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcgPSBmYWxzZSwgYm9vbCBwYWdlTG9hZFRlc3RpbmcgPSBm YWxzZSk7CisgICAgc3RhdGljIFJlZjxCcm93c2VyV2luZG93PiBjcmVhdGUoSFdORCBtYWluV25k LCBIV05EIHVybEJhclduZCwgYm9vbCB1c2VMYXllcmVkV2ViVmlldyA9IGZhbHNlLCBib29sIHBh Z2VMb2FkVGVzdGluZyA9IGZhbHNlKTsKKworcHJpdmF0ZToKKyAgICBmcmllbmQgY2xhc3MgQWNj ZXNzaWJpbGl0eURlbGVnYXRlOworICAgIGZyaWVuZCBjbGFzcyBNaW5pQnJvd3NlcldlYkhvc3Q7 CisgICAgZnJpZW5kIGNsYXNzIFByaW50V2ViVUlEZWxlZ2F0ZTsKKyAgICBmcmllbmQgY2xhc3Mg V2ViRG93bmxvYWREZWxlZ2F0ZTsKKyAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VMb2FkRGVsZWdh dGU7CisgICAgZnJpZW5kIGNsYXNzIFBhZ2VMb2FkVGVzdENsaWVudDsKIAogICAgIFVMT05HIEFk ZFJlZigpOwogICAgIFVMT05HIFJlbGVhc2UoKTsKQEAgLTYzLDggKzcxLDggQEAgcHVibGljOgog CiAgICAgdm9pZCBzaG93TGFzdFZpc2l0ZWRTaXRlcyhJV2ViVmlldyYpOwogICAgIHZvaWQgbGF1 bmNoSW5zcGVjdG9yKCk7Ci0gICAgdm9pZCBuYXZpZ2F0ZUZvcndhcmRPckJhY2t3YXJkKEhXTkQg aFduZCwgVUlOVCBtZW51SUQpOwotICAgIHZvaWQgbmF2aWdhdGVUb0hpc3RvcnkoSFdORCBoV25k LCBVSU5UIG1lbnVJRCk7CisgICAgdm9pZCBuYXZpZ2F0ZUZvcndhcmRPckJhY2t3YXJkKFVJTlQg bWVudUlEKTsKKyAgICB2b2lkIG5hdmlnYXRlVG9IaXN0b3J5KFVJTlQgbWVudUlEKTsKICAgICB2 b2lkIGV4aXRQcm9ncmFtKCk7CiAgICAgYm9vbCBzZWVkSW5pdGlhbERlZmF1bHRQcmVmZXJlbmNl cygpOwogICAgIGJvb2wgc2V0VG9EZWZhdWx0UHJlZmVyZW5jZXMoKTsKQEAgLTEwNiw3ICsxMTQs NiBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVTdGF0aXN0aWNzKEhXTkQgZGlhbG9nKTsKICAg ICB2b2lkIHNldFByZWZlcmVuY2UoVUlOVCBtZW51SUQsIGJvb2wgZW5hYmxlKTsKIAotcHJpdmF0 ZToKICAgICBNaW5pQnJvd3NlcihIV05EIG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVz ZUxheWVyZWRXZWJWaWV3LCBib29sIHBhZ2VMb2FkVGVzdGluZyk7CiAgICAgdm9pZCBzdWJjbGFz c0ZvckxheWVyZWRXaW5kb3coKTsKICAgICBib29sIHNldENhY2hlRm9sZGVyKCk7CmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vUHJpbnRXZWJVSURlbGVnYXRlLmNwcCBiL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9QcmludFdlYlVJRGVsZWdhdGUuY3BwCmluZGV4IGM3ZTZkZGQ4NTI0 YjQzNzlhOGZkMzNmZjgxMTRlMDQ2YjY5ZWVlNDYuLmY0ZGI0ZDI0N2E0OGRjZWNlYzZiYzlkYTVk MmJhZmFjYzkwYjRmNmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QcmludFdl YlVJRGVsZWdhdGUuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QcmludFdlYlVJRGVs ZWdhdGUuY3BwCkBAIC0yOSw5ICsyOSw3IEBACiAKICNpbmNsdWRlICJDb21tb24uaCIKICNpbmNs dWRlICJNYWluV2luZG93LmgiCi0jaWYgVVNFKENGKQotI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9u L0NvcmVGb3VuZGF0aW9uLmg+Ci0jZW5kaWYKKyNpbmNsdWRlICJNaW5pQnJvd3Nlci5oIgogI2lu Y2x1ZGUgPFdlYkNvcmUvQ09NUHRyLmg+CiAjaW5jbHVkZSA8V2ViS2l0TGVnYWN5L1dlYktpdENP TUFQSS5oPgogI2luY2x1ZGUgPGNvbWlwLmg+CkBAIC00MSw2ICszOSwxMCBAQAogI2luY2x1ZGUg PHNobHdhcGkuaD4KICNpbmNsdWRlIDx3aW5pbmV0Lmg+CiAKKyNpZiBVU0UoQ0YpCisjaW5jbHVk ZSA8Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5kYXRpb24uaD4KKyNlbmRpZgorCiBzdGF0aWMgY29u c3QgaW50IE1BUkdJTiA9IDIwOwogCiBIUkVTVUxUIFByaW50V2ViVUlEZWxlZ2F0ZTo6cnVuSmF2 YVNjcmlwdEFsZXJ0UGFuZWxXaXRoTWVzc2FnZShfSW5fb3B0XyBJV2ViVmlldyosIF9Jbl8gQlNU UiBtZXNzYWdlKQpAQCAtNjksNyArNzEsOCBAQCBIUkVTVUxUIFByaW50V2ViVUlEZWxlZ2F0ZTo6 Y3JlYXRlV2ViVmlld1dpdGhSZXF1ZXN0KF9Jbl9vcHRfIElXZWJWaWV3KiwgX0luX29wdAogICAg ICAgICByZXR1cm4gRV9GQUlMOwogICAgIFNob3dXaW5kb3cobmV3V2luZG93Lmh3bmQoKSwgU1df U0hPVyk7CiAKLSAgICAqbmV3V2ViVmlldyA9IG5ld1dpbmRvdy5icm93c2VyV2luZG93KCktPndl YlZpZXcoKTsKKyAgICBhdXRvJiBuZXdCcm93c2VyV2luZG93ID0gKnN0YXRpY19jYXN0PE1pbmlC cm93c2VyKj4obmV3V2luZG93LmJyb3dzZXJXaW5kb3coKSk7CisgICAgKm5ld1dlYlZpZXcgPSBu ZXdCcm93c2VyV2luZG93LndlYlZpZXcoKTsKICAgICBJV2ViRnJhbWVQdHIgZnJhbWU7CiAgICAg SFJFU1VMVCBocjsKICAgICBociA9ICgqbmV3V2ViVmlldyktPm1haW5GcmFtZSgmZnJhbWUuR2V0 SW50ZXJmYWNlUHRyKCkpOwo=