193029 2018-12-24 22:28:00 -0800 [Win][Clang] Fix compilation warnings of MiniBrowser 2019-01-08 20:29:10 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 171618 1 fujii fujii achristensen bfulgham don.olmstead lforschler pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1490755 0 fujii 2018-12-24 22:28:00 -0800 [Win][Clang] Fix compilation warnings of MiniBrowser clang-cl reports the following warnings: > ..\..\Tools\MiniBrowser\win/MiniBrowserReplace.h(32,13): warning: unused function 'processCrashReport' [-Wunused-function] > ..\..\Tools\MiniBrowser\win/MiniBrowserWebHost.h(37,11): warning: field 'm_client' will be initialized after field 'm_hURLBarWnd' [-Wreorder] > ..\..\Tools\MiniBrowser\win/MiniBrowserWebHost.h(81,13): warning: private field 'm_URLBarFont' is not used [-Wunused-private-field] > ..\..\Tools\MiniBrowser\win/MiniBrowserWebHost.h(82,13): warning: private field 'm_oldFont' is not used [-Wunused-private-field] > ..\..\Tools\MiniBrowser\win/PageLoadTestClient.h(149,14): warning: private field 'm_currentURLIndex' is not used [-Wunused-private-field] > ..\..\Tools\MiniBrowser\win\MiniBrowserWebHost.cpp(170,38): warning: ISO C++11 does not allow conversion from string literal to 'BSTR' (aka 'wchar_t *') [-Wwritable-strings] > ..\..\Tools\MiniBrowser\win\MiniBrowserWebHost.cpp(178,35): warning: ISO C++11 does not allow conversion from string literal to 'BSTR' (aka 'wchar_t *') [-Wwritable-strings] > ..\..\Tools\MiniBrowser\win\MiniBrowserWebHost.cpp(178,70): warning: ISO C++11 does not allow conversion from string literal to 'LPWSTR' (aka 'wchar_t *') [-Wwritable-strings] > ..\..\Tools\MiniBrowser\win\PageLoadTestClient.cpp(40,7): warning: field 'm_repetitions' will be initialized after field 'm_waitForLoadToReallyEnd' [-Wreorder] > ..\..\Tools\MiniBrowser\win\WebKitBrowserWindow.cpp(107,61): warning: missing field 'decidePolicyForNavigationAction' initializer [-Wmissing-field-initializers] > ..\..\Tools\MiniBrowser\win\WebKitLegacyBrowserWindow.cpp(649,24): warning: ISO C++11 does not allow conversion from string literal to 'TCHAR *' (aka 'wchar_t *') [-Wwritable-strings] > ..\..\Tools\MiniBrowser\win\WebKitLegacyBrowserWindow.cpp(71,7): warning: field 'm_useLayeredWebView' will be initialized after field 'm_pageLoadTestClient' [-Wreorder] 1490763 1 358059 fujii 2018-12-25 00:14:50 -0800 Created attachment 358059 Patch 1490765 2 fujii 2018-12-25 01:18:35 -0800 PageLoadTestClient::pageLoadStartedAtTime and PageLoadTestClient::pageLoadEndedAtTime have been introduced in Bug 137673. They has been virtual since the beginning. But, nothing overrides. 1490825 3 358059 ross.kirsling 2018-12-26 12:07:27 -0800 Comment on attachment 358059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358059&action=review > ..\..\Tools\MiniBrowser\win/MiniBrowserReplace.h(32,13): warning: unused function 'processCrashReport' [-Wunused-function] Did this one get addressed? I'm not noticing a related code change here. But then it seems like this function is used in Common.cpp so I'm not certain why this warning occurs... > Tools/ChangeLog:15 > + * MiniBrowser/win/MiniBrowserWebHost.h: Removed unused m_oldFont > + and m_URLBarFont. Reoder member variables to fix -Wreorder > + warning. > + * MiniBrowser/win/PageLoadTestClient.cpp: > + (PageLoadTestClient::PageLoadTestClient): Reoder the member initializer list. Nit: "Reorder" x2 > Tools/ChangeLog:23 > + (initDocStruct): Changed the arugment type docname to const. Nit: "argument" > Tools/MiniBrowser/win/MiniBrowserWebHost.cpp:178 > - hr = target->addEventListener(L"click", new SimpleEventListener (L"webkit logo click"), FALSE); > + hr = target->addEventListener(const_cast<wchar_t*>(L"click"), new SimpleEventListener (const_cast<wchar_t*>(L"webkit logo click")), FALSE); It feels unfortunate to have to cast away const on all of these literals. Does BSTR imply that there's no other way? 1490870 4 358059 fujii 2018-12-26 19:31:11 -0800 Comment on attachment 358059 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358059&action=review >> Tools/MiniBrowser/win/MiniBrowserWebHost.cpp:178 >> + hr = target->addEventListener(const_cast<wchar_t*>(L"click"), new SimpleEventListener (const_cast<wchar_t*>(L"webkit logo click")), FALSE); > > It feels unfortunate to have to cast away const on all of these literals. Does BSTR imply that there's no other way? Good catch. I should change IDL files with "const BSTR". 1490871 5 fujii 2018-12-26 19:35:08 -0800 (In reply to Ross Kirsling from comment #3) > > ..\..\Tools\MiniBrowser\win/MiniBrowserReplace.h(32,13): warning: unused function 'processCrashReport' [-Wunused-function] > > Did this one get addressed? I'm not noticing a related code change here. > But then it seems like this function is used in Common.cpp so I'm not > certain why this warning occurs... Yeah, I haven't fixed it yet because I don't know how to fix it. MainWindow.cpp is including MiniBrowserReplace.h. > In file included from ..\..\Tools\MiniBrowser\win\WinMain.cpp:34: > ..\..\Tools\MiniBrowser\win/MiniBrowserReplace.h(32,13): warning: unused function 'processCrashReport' [-Wunused-function] > static void processCrashReport(const wchar_t* fileName) { ::MessageBox(0, fileName, L"Crash Report", MB_OK); } > ^ 1490872 6 fujii 2018-12-26 19:49:37 -0800 (In reply to Fujii Hironori from comment #4) > Comment on attachment 358059 [details] > >> Tools/MiniBrowser/win/MiniBrowserWebHost.cpp:178 > >> + hr = target->addEventListener(const_cast<wchar_t*>(L"click"), new SimpleEventListener (const_cast<wchar_t*>(L"webkit logo click")), FALSE); > > > > It feels unfortunate to have to cast away const on all of these literals. Does BSTR imply that there's no other way? > > Good catch. I should change IDL files with "const BSTR". There are too many BSTR in IDL files which can be prefixed with 'const'. I will do it in another bug ticket. 1490873 7 358095 fujii 2018-12-26 19:52:38 -0800 Created attachment 358095 Patch 1490908 8 358095 ross.kirsling 2018-12-27 13:27:19 -0800 Comment on attachment 358095 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358095&action=review r=me with a final question. > Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:619 > -static void initDocStruct(DOCINFO* di, TCHAR* docname) > +static void initDocStruct(DOCINFO* di, const wchar_t* docname) > { > memset(di, 0, sizeof(DOCINFO)); > di->cbSize = sizeof(DOCINFO); > - di->lpszDocName = docname; > + di->lpszDocName = const_cast<wchar_t*>(docname); According to MSDN, it seems that lpszDocName should be LPCSTR: https://docs.microsoft.com/en-us/windows/desktop/api/wingdi/ns-wingdi-_docinfoa If so, isn't it okay for docname to be const? 1492182 9 358095 fujii 2019-01-06 19:16:37 -0800 Comment on attachment 358095 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358095&action=review >> Tools/MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:619 >> + di->lpszDocName = const_cast<wchar_t*>(docname); > > According to MSDN, it seems that lpszDocName should be LPCSTR: > https://docs.microsoft.com/en-us/windows/desktop/api/wingdi/ns-wingdi-_docinfoa > > If so, isn't it okay for docname to be const? Good catch! Thank you. 1492183 10 358474 fujii 2019-01-06 19:18:51 -0800 Created attachment 358474 Patch for landing 1492184 11 358474 fujii 2019-01-06 19:28:20 -0800 Comment on attachment 358474 Patch for landing Clearing flags on attachment: 358474 Committed r239666: <https://trac.webkit.org/changeset/239666> 1492185 12 fujii 2019-01-06 19:28:23 -0800 All reviewed patches have been landed. Closing bug. 1492186 13 webkit-bug-importer 2019-01-06 19:29:32 -0800 <rdar://problem/47074949> 1492852 14 fujii 2019-01-08 20:29:10 -0800 (In reply to Fujii Hironori from comment #6) > There are too many BSTR in IDL files which can be prefixed with 'const'. I > will do it in another bug ticket. Filed: Bug 193271 – [Win][WebKitLegacy] wchar_t strings shouldn't be treated as BSTR 358059 2018-12-25 00:14:50 -0800 2018-12-26 19:52:04 -0800 Patch bug-193029-20181225171449.patch text/plain 7364 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTUxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGRjZWUxZTUyNzAwZmFlMGE3MzdjNTAwOGQ1YTg1ZjBm MWE4ZjA2MC4uZTExYTczMTE4YTk1ZDNkYWUzMGJjZWQ0ZTBlOTc2NGQyYTFjMGU0NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE4LTEyLTI0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW0NsYW5nXSBGaXggY29tcGlsYXRpb24gd2FybmluZ3Mgb2YgTWlu aUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzAyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5jcHA6CisgICAgICAgIChNaW5p QnJvd3NlcldlYkhvc3Q6OmRpZEZpbmlzaExvYWRGb3JGcmFtZSk6IEFwcGxpZWQgY29uc3RfY2Fz dCB0bworICAgICAgICBzdHJpbmcgbGl0ZXJhbHMuCisgICAgICAgICogTWluaUJyb3dzZXIvd2lu L01pbmlCcm93c2VyV2ViSG9zdC5oOiBSZW1vdmVkIHVudXNlZCBtX29sZEZvbnQKKyAgICAgICAg YW5kIG1fVVJMQmFyRm9udC4gUmVvZGVyIG1lbWJlciB2YXJpYWJsZXMgdG8gZml4IC1XcmVvcmRl cgorICAgICAgICB3YXJuaW5nLgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRl c3RDbGllbnQuY3BwOgorICAgICAgICAoUGFnZUxvYWRUZXN0Q2xpZW50OjpQYWdlTG9hZFRlc3RD bGllbnQpOiBSZW9kZXIgdGhlIG1lbWJlciBpbml0aWFsaXplciBsaXN0LgorICAgICAgICAqIE1p bmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuaDogUmVtb3ZlZCAndmlydHVhbCcgb2YK KyAgICAgICAgcGFnZUxvYWRTdGFydGVkQXRUaW1lIGFuZCBwYWdlTG9hZEVuZGVkQXRUaW1lLiBS ZW1vdmVkIHVudXNlZAorICAgICAgICBtX2N1cnJlbnRVUkxJbmRleC4KKyAgICAgICAgKiBNaW5p QnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHA6CisgICAgICAgIChXZWJLaXRCcm93 c2VyV2luZG93OjpXZWJLaXRCcm93c2VyV2luZG93KTogSW5pdGlhbGl6ZQorICAgICAgICBuYXZp Z2F0aW9uQ2xpZW50IHdpdGggJ3sgfScgdG8gZml4IHRoZSBtaXNzaW5nIGZpZWxkIHdhcm5pbmcu CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3Bw OgorICAgICAgICAoaW5pdERvY1N0cnVjdCk6IENoYW5nZWQgdGhlIGFydWdtZW50IHR5cGUgZG9j bmFtZSB0byBjb25zdC4KKyAgICAgICAgQXBwbGllZCBjb25zdF9jYXN0IHRvIGRvY25hbWUuCisK IDIwMTgtMTItMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgog CiAgICAgICAgIFdlYkRyaXZlcjogd2FybiBhYm91dCBub24gZXhpc3RpbmcgdGVzdHMgd2hlbiBw YXJzaW5nIGV4cGVjdGF0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01p bmlCcm93c2VyV2ViSG9zdC5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJX ZWJIb3N0LmNwcAppbmRleCA3ZmU3MzI0Njc0NWVmOWZjM2M3NGE3ZDY0NTA1M2YyYWQ5NDFmN2Vi Li5kN2MxN2E5ZDJkZTljNTQwOWZiNWEzZTg2YzNlYjk5ZTA5MDQ2OTZiIDEwMDY0NAotLS0gYS9U b29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmNwcAorKysgYi9Ub29scy9N aW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmNwcApAQCAtMTY3LDcgKzE2Nyw3IEBA IEhSRVNVTFQgTWluaUJyb3dzZXJXZWJIb3N0OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUoX0luX29w dF8gSVdlYlZpZXcqIHdlYlZpZXcsIF9JCiAgICAgICAgIG1fY2xpZW50LT5zaG93TGFzdFZpc2l0 ZWRTaXRlcygqd2ViVmlldyk7CiAKICAgICAvLyBUaGUgZm9sbG93aW5nIGlzIGZvciB0aGUgdGVz dCBwYWdlOgotICAgIEhSRVNVTFQgaHIgPSBkb2MtPmdldEVsZW1lbnRCeUlkKEwid2Via2l0IGxv Z28iLCAmZWxlbWVudC5HZXRJbnRlcmZhY2VQdHIoKSk7CisgICAgSFJFU1VMVCBociA9IGRvYy0+ Z2V0RWxlbWVudEJ5SWQoY29uc3RfY2FzdDx3Y2hhcl90Kj4oTCJ3ZWJraXQgbG9nbyIpLCAmZWxl bWVudC5HZXRJbnRlcmZhY2VQdHIoKSk7CiAgICAgaWYgKCFTVUNDRUVERUQoaHIpKQogICAgICAg ICByZXR1cm4gaHI7CiAKQEAgLTE3NSw3ICsxNzUsNyBAQCBIUkVTVUxUIE1pbmlCcm93c2VyV2Vi SG9zdDo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKF9Jbl9vcHRfIElXZWJWaWV3KiB3ZWJWaWV3LCBf SQogICAgIGlmICghU1VDQ0VFREVEKGhyKSkKICAgICAgICAgcmV0dXJuIGhyOwogCi0gICAgaHIg PSB0YXJnZXQtPmFkZEV2ZW50TGlzdGVuZXIoTCJjbGljayIsIG5ldyBTaW1wbGVFdmVudExpc3Rl bmVyIChMIndlYmtpdCBsb2dvIGNsaWNrIiksIEZBTFNFKTsKKyAgICBociA9IHRhcmdldC0+YWRk RXZlbnRMaXN0ZW5lcihjb25zdF9jYXN0PHdjaGFyX3QqPihMImNsaWNrIiksIG5ldyBTaW1wbGVF dmVudExpc3RlbmVyIChjb25zdF9jYXN0PHdjaGFyX3QqPihMIndlYmtpdCBsb2dvIGNsaWNrIikp LCBGQUxTRSk7CiAgICAgaWYgKCFTVUNDRUVERUQoaHIpKQogICAgICAgICByZXR1cm4gaHI7CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaCBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaAppbmRleCA4MGI5OTM1 NzY2NjhjYzA2YjdiNTZlMWM4MWZlZDUwNmZlNWNiMTk1Li42MWQxNzNkNmIzNTY0Yjc2M2YxYTJj MjIzMDY1MzFlNmZmNjk4YjY1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWlu aUJyb3dzZXJXZWJIb3N0LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2Vy V2ViSG9zdC5oCkBAIC03Nyw4ICs3Nyw2IEBAIHByb3RlY3RlZDoKICAgICBIUkVTVUxUIHVwZGF0 ZUFkZHJlc3NCYXIoSVdlYlZpZXcmKTsKIAogcHJpdmF0ZToKLSAgICBIV05EIG1faFVSTEJhcldu ZCB7IDAgfTsKLSAgICBIR0RJT0JKIG1fVVJMQmFyRm9udCB7IDAgfTsKLSAgICBIR0RJT0JKIG1f b2xkRm9udCB7IDAgfTsKICAgICBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KiBtX2NsaWVudCB7 IG51bGxwdHIgfTsKKyAgICBIV05EIG1faFVSTEJhclduZCB7IDAgfTsKIH07CmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci93aW4vUGFnZUxvYWRUZXN0Q2xpZW50LmNwcCBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuY3BwCmluZGV4IDMxOTQzMzI0ZDhkYTYw ZTNlZDgyZjQ5ODg3MjgzNmI2OWFlYjIyNzcuLjUxYmY0ZTIyMDhkNmNiNTdhNzhmYzVkMGQyYzg3 OTU5OWEzMjFjZTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRl c3RDbGllbnQuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGll bnQuY3BwCkBAIC0zNyw4ICszNyw4IEBAIHN0YXRpYyBjb25zdCBDRlRpbWVJbnRlcnZhbCB3YWl0 Rm9yTmV3UmVzb3VyY2VMb2FkRHVyYXRpb24gPSAwLjE7CiAKIFBhZ2VMb2FkVGVzdENsaWVudDo6 UGFnZUxvYWRUZXN0Q2xpZW50KFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cqIGhvc3QsIGJvb2wg cGFnZUxvYWRUZXN0aW5nKQogICAgIDogbV9ob3N0KGhvc3QpCi0gICAgLCBtX3JlcGV0aXRpb25z KHBhZ2VMb2FkVGVzdGluZyA/IDIwIDogMSkKICAgICAsIG1fd2FpdEZvckxvYWRUb1JlYWxseUVu ZCh0aGlzLCAmUGFnZUxvYWRUZXN0Q2xpZW50OjplbmRQYWdlTG9hZCkKKyAgICAsIG1fcmVwZXRp dGlvbnMocGFnZUxvYWRUZXN0aW5nID8gMjAgOiAxKQogICAgICwgbV9wYWdlTG9hZFRlc3Rpbmco cGFnZUxvYWRUZXN0aW5nKQogewogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L1BhZ2VMb2FkVGVzdENsaWVudC5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1BhZ2VMb2FkVGVz dENsaWVudC5oCmluZGV4IDBkZjBhYThhYTk5ZDQwOTEzMDVkMzFiMzBlZGMyMDQyZTBjZTFiNmIu Ljc1MTEyNDNmYTc0N2E1NDg5YTk1NWM5YjgwODIwYzJjY2QyNmMyNzUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuaAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci93aW4vUGFnZUxvYWRUZXN0Q2xpZW50LmgKQEAgLTEyNyw4ICsxMjcsOCBAQCBwcml2 YXRlOgogICAgIHZvaWQgY2xlYXJQYWdlTG9hZFN0YXRlKCk7CiAgICAgYm9vbCBzaG91bGRDb25z aWRlclBhZ2VMb2FkRW5kZWQoKSBjb25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBwYWdlTG9hZFN0 YXJ0ZWRBdFRpbWUoQ0ZBYnNvbHV0ZVRpbWUpOwotICAgIHZpcnR1YWwgdm9pZCBwYWdlTG9hZEVu ZGVkQXRUaW1lKENGQWJzb2x1dGVUaW1lKTsKKyAgICB2b2lkIHBhZ2VMb2FkU3RhcnRlZEF0VGlt ZShDRkFic29sdXRlVGltZSk7CisgICAgdm9pZCBwYWdlTG9hZEVuZGVkQXRUaW1lKENGQWJzb2x1 dGVUaW1lKTsKICAgICB2b2lkIGR1bXBSdW5TdGF0aXN0aWNzKCk7CiAKICAgICBXZWJLaXRMZWdh Y3lCcm93c2VyV2luZG93KiBtX2hvc3Q7CkBAIC0xNDYsNyArMTQ2LDYgQEAgcHJpdmF0ZToKICAg ICBkb3VibGUgbV9nZW9tZXRyaWNNZWFuUHJvZHVjdFN1bSB7IDEuMCB9OwogICAgIHVuc2lnbmVk IG1fZnJhbWVzIHsgMCB9OwogICAgIHVuc2lnbmVkIG1fb25Mb2FkRXZlbnRzIHsgMCB9OwotICAg IHVuc2lnbmVkIG1fY3VycmVudFVSTEluZGV4IHsgMCB9OwogICAgIHVuc2lnbmVkIG1fY3VycmVu dFJlcGV0aXRpb24geyAwIH07CiAgICAgdW5zaWduZWQgbV9wYWdlc1RpbWVkIHsgMCB9OwogICAg IHVuc2lnbmVkIG1fcmVwZXRpdGlvbnM7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93 aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0 QnJvd3NlcldpbmRvdy5jcHAKaW5kZXggYTgzODYwNjU2ZjVmMzI5Mjg3YTEwNzNhNWIyYTdjYTEy NjFkZjliYS4uZmRiMWFkZDkwNmU2Y2Q3ZTIxNmIxMmZlN2RmNWNkNzQ5NWM4MGFjMSAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcApAQCAtMTA0LDcg KzEwNCw5IEBAIFdlYktpdEJyb3dzZXJXaW5kb3c6OldlYktpdEJyb3dzZXJXaW5kb3coSFdORCBt YWluV25kLCBIV05EIHVybEJhclduZCkKICAgICBtX3ZpZXcgPSBhZG9wdFdLKFdLVmlld0NyZWF0 ZShyZWN0LCBjb25mLmdldCgpLCBtYWluV25kKSk7CiAgICAgYXV0byBwYWdlID0gV0tWaWV3R2V0 UGFnZShtX3ZpZXcuZ2V0KCkpOwogCi0gICAgV0tQYWdlTmF2aWdhdGlvbkNsaWVudFYwIG5hdmln YXRpb25DbGllbnQgPSB7eyAwLCB0aGlzIH19OworICAgIFdLUGFnZU5hdmlnYXRpb25DbGllbnRW MCBuYXZpZ2F0aW9uQ2xpZW50ID0geyB9OworICAgIG5hdmlnYXRpb25DbGllbnQuYmFzZS52ZXJz aW9uID0gMDsKKyAgICBuYXZpZ2F0aW9uQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7CiAg ICAgbmF2aWdhdGlvbkNsaWVudC5kaWRGaW5pc2hOYXZpZ2F0aW9uID0gZGlkRmluaXNoTmF2aWdh dGlvbjsKICAgICBuYXZpZ2F0aW9uQ2xpZW50LmRpZENvbW1pdE5hdmlnYXRpb24gPSBkaWRDb21t aXROYXZpZ2F0aW9uOwogICAgIG5hdmlnYXRpb25DbGllbnQuZGlkUmVjZWl2ZUF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlID0gZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOwpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3Bw IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwCmlu ZGV4IGQ2NDMwYjQ0MDIxZjIxNzVjMWNmYzgyNjljZTQ5MDU0YWM5YWYxNmIuLjhiY2ZlNTdiNzZj ZjQ3ZWM2NjUzNDJiMDBlMjFmODI1NmIzN2QyMTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5pQnJv d3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5jcHAKQEAgLTYxMiwxMSArNjEyLDEx IEBAIHN0YXRpYyBIREMgZ2V0UHJpbnRlckRDKCkKICAgICByZXR1cm4gcGRsZy5oREM7CiB9CiAK LXN0YXRpYyB2b2lkIGluaXREb2NTdHJ1Y3QoRE9DSU5GTyogZGksIFRDSEFSKiBkb2NuYW1lKQor c3RhdGljIHZvaWQgaW5pdERvY1N0cnVjdChET0NJTkZPKiBkaSwgY29uc3Qgd2NoYXJfdCogZG9j bmFtZSkKIHsKICAgICBtZW1zZXQoZGksIDAsIHNpemVvZihET0NJTkZPKSk7CiAgICAgZGktPmNi U2l6ZSA9IHNpemVvZihET0NJTkZPKTsKLSAgICBkaS0+bHBzekRvY05hbWUgPSBkb2NuYW1lOwor ICAgIGRpLT5scHN6RG9jTmFtZSA9IGNvbnN0X2Nhc3Q8d2NoYXJfdCo+KGRvY25hbWUpOwogfQog CiB2b2lkIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnByaW50KCkKZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmggYi9Ub29scy9N aW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5oCmluZGV4IGVjZTRlYWYy NDA5YmRjOTgwNmYwMDQyZTE3ZDRjMzRjNDRjYTk5NjQuLmVhNDk2NDVmZTMzODFiNzJhMDBhNzAy NzA5MGZlNDg3YzQ5MjI4OWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJL aXRMZWdhY3lCcm93c2VyV2luZG93LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktp dExlZ2FjeUJyb3dzZXJXaW5kb3cuaApAQCAtMTIwLDggKzEyMCw2IEBAIHByaXZhdGU6CiAKICAg ICBzdGQ6OnZlY3RvcjxJV2ViSGlzdG9yeUl0ZW1QdHI+IG1faGlzdG9yeUl0ZW1zOwogCi0gICAg c3RkOjp1bmlxdWVfcHRyPFBhZ2VMb2FkVGVzdENsaWVudD4gbV9wYWdlTG9hZFRlc3RDbGllbnQ7 Ci0KICAgICBJV2ViVmlld1B0ciBtX3dlYlZpZXc7CiAgICAgSVdlYlZpZXdQcml2YXRlUHRyIG1f d2ViVmlld1ByaXZhdGU7CiAKQEAgLTE0NCw0ICsxNDIsNiBAQCBwcml2YXRlOgogICAgIEhXTkQg bV92aWV3V25kIHsgbnVsbHB0ciB9OwogCiAgICAgYm9vbCBtX3VzZUxheWVyZWRXZWJWaWV3Owor CisgICAgc3RkOjp1bmlxdWVfcHRyPFBhZ2VMb2FkVGVzdENsaWVudD4gbV9wYWdlTG9hZFRlc3RD bGllbnQ7CiB9Owo= 358095 2018-12-26 19:52:38 -0800 2019-01-06 19:18:17 -0800 Patch bug-193029-20181227125237.patch text/plain 6014 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTU0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWNlNjRlZjVmYjY0MGU5NGY2MGY4OWRlODc1YjU1YmY3 ZjFlYWJmNi4uOTk2OWM1MDU4NDFmY2ZhYTdkNmNlM2RkNGY5ZjE3MTQ2ZWZhZjA4OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE4LTEyLTI2ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW0NsYW5nXSBGaXggY29tcGlsYXRpb24gd2FybmluZ3Mgb2YgTWlu aUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzAyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5oOiBSZW1vdmVkIHVudXNlZCBt X29sZEZvbnQKKyAgICAgICAgYW5kIG1fVVJMQmFyRm9udC4gUmVvcmRlciBtZW1iZXIgdmFyaWFi bGVzIHRvIGZpeCAtV3Jlb3JkZXIKKyAgICAgICAgd2FybmluZy4KKyAgICAgICAgKiBNaW5pQnJv d3Nlci93aW4vUGFnZUxvYWRUZXN0Q2xpZW50LmNwcDoKKyAgICAgICAgKFBhZ2VMb2FkVGVzdENs aWVudDo6UGFnZUxvYWRUZXN0Q2xpZW50KTogUmVvcmRlciB0aGUgbWVtYmVyIGluaXRpYWxpemVy IGxpc3QuCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1BhZ2VMb2FkVGVzdENsaWVudC5oOiBS ZW1vdmVkICd2aXJ0dWFsJyBvZgorICAgICAgICBwYWdlTG9hZFN0YXJ0ZWRBdFRpbWUgYW5kIHBh Z2VMb2FkRW5kZWRBdFRpbWUuIFJlbW92ZWQgdW51c2VkCisgICAgICAgIG1fY3VycmVudFVSTElu ZGV4LgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcDoK KyAgICAgICAgKFdlYktpdEJyb3dzZXJXaW5kb3c6OldlYktpdEJyb3dzZXJXaW5kb3cpOiBJbml0 aWFsaXplCisgICAgICAgIG5hdmlnYXRpb25DbGllbnQgd2l0aCAneyB9JyB0byBmaXggdGhlIG1p c3NpbmcgZmllbGQgd2FybmluZy4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVn YWN5QnJvd3NlcldpbmRvdy5jcHA6CisgICAgICAgIChpbml0RG9jU3RydWN0KTogQ2hhbmdlZCB0 aGUgYXJndW1lbnQgdHlwZSBkb2NuYW1lIHRvIGNvbnN0LgorICAgICAgICBBcHBsaWVkIGNvbnN0 X2Nhc3QgdG8gZG9jbmFtZS4KKwogMjAxOC0xMi0yNiAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAg PGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtUb29sc10gUmVtb3ZlIHJlZmVyZW5jZXMg dG8gQmlzb24gYW5kIEZsZXgKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5p QnJvd3NlcldlYkhvc3QuaCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhv c3QuaAppbmRleCA4MGI5OTM1NzY2NjhjYzA2YjdiNTZlMWM4MWZlZDUwNmZlNWNiMTk1Li42MWQx NzNkNmIzNTY0Yjc2M2YxYTJjMjIzMDY1MzFlNmZmNjk4YjY1IDEwMDY0NAotLS0gYS9Ub29scy9N aW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0LmgKKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5oCkBAIC03Nyw4ICs3Nyw2IEBAIHByb3RlY3RlZDoK ICAgICBIUkVTVUxUIHVwZGF0ZUFkZHJlc3NCYXIoSVdlYlZpZXcmKTsKIAogcHJpdmF0ZToKLSAg ICBIV05EIG1faFVSTEJhclduZCB7IDAgfTsKLSAgICBIR0RJT0JKIG1fVVJMQmFyRm9udCB7IDAg fTsKLSAgICBIR0RJT0JKIG1fb2xkRm9udCB7IDAgfTsKICAgICBXZWJLaXRMZWdhY3lCcm93c2Vy V2luZG93KiBtX2NsaWVudCB7IG51bGxwdHIgfTsKKyAgICBIV05EIG1faFVSTEJhclduZCB7IDAg fTsKIH07CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vUGFnZUxvYWRUZXN0Q2xp ZW50LmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuY3BwCmlu ZGV4IDMxOTQzMzI0ZDhkYTYwZTNlZDgyZjQ5ODg3MjgzNmI2OWFlYjIyNzcuLjUxYmY0ZTIyMDhk NmNiNTdhNzhmYzVkMGQyYzg3OTU5OWEzMjFjZTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dp bi9QYWdlTG9hZFRlc3RDbGllbnQuY3BwCkBAIC0zNyw4ICszNyw4IEBAIHN0YXRpYyBjb25zdCBD RlRpbWVJbnRlcnZhbCB3YWl0Rm9yTmV3UmVzb3VyY2VMb2FkRHVyYXRpb24gPSAwLjE7CiAKIFBh Z2VMb2FkVGVzdENsaWVudDo6UGFnZUxvYWRUZXN0Q2xpZW50KFdlYktpdExlZ2FjeUJyb3dzZXJX aW5kb3cqIGhvc3QsIGJvb2wgcGFnZUxvYWRUZXN0aW5nKQogICAgIDogbV9ob3N0KGhvc3QpCi0g ICAgLCBtX3JlcGV0aXRpb25zKHBhZ2VMb2FkVGVzdGluZyA/IDIwIDogMSkKICAgICAsIG1fd2Fp dEZvckxvYWRUb1JlYWxseUVuZCh0aGlzLCAmUGFnZUxvYWRUZXN0Q2xpZW50OjplbmRQYWdlTG9h ZCkKKyAgICAsIG1fcmVwZXRpdGlvbnMocGFnZUxvYWRUZXN0aW5nID8gMjAgOiAxKQogICAgICwg bV9wYWdlTG9hZFRlc3RpbmcocGFnZUxvYWRUZXN0aW5nKQogewogfQpkaWZmIC0tZ2l0IGEvVG9v bHMvTWluaUJyb3dzZXIvd2luL1BhZ2VMb2FkVGVzdENsaWVudC5oIGIvVG9vbHMvTWluaUJyb3dz ZXIvd2luL1BhZ2VMb2FkVGVzdENsaWVudC5oCmluZGV4IDBkZjBhYThhYTk5ZDQwOTEzMDVkMzFi MzBlZGMyMDQyZTBjZTFiNmIuLjc1MTEyNDNmYTc0N2E1NDg5YTk1NWM5YjgwODIwYzJjY2QyNmMy NzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQu aAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vUGFnZUxvYWRUZXN0Q2xpZW50LmgKQEAgLTEy Nyw4ICsxMjcsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgY2xlYXJQYWdlTG9hZFN0YXRlKCk7CiAg ICAgYm9vbCBzaG91bGRDb25zaWRlclBhZ2VMb2FkRW5kZWQoKSBjb25zdDsKIAotICAgIHZpcnR1 YWwgdm9pZCBwYWdlTG9hZFN0YXJ0ZWRBdFRpbWUoQ0ZBYnNvbHV0ZVRpbWUpOwotICAgIHZpcnR1 YWwgdm9pZCBwYWdlTG9hZEVuZGVkQXRUaW1lKENGQWJzb2x1dGVUaW1lKTsKKyAgICB2b2lkIHBh Z2VMb2FkU3RhcnRlZEF0VGltZShDRkFic29sdXRlVGltZSk7CisgICAgdm9pZCBwYWdlTG9hZEVu ZGVkQXRUaW1lKENGQWJzb2x1dGVUaW1lKTsKICAgICB2b2lkIGR1bXBSdW5TdGF0aXN0aWNzKCk7 CiAKICAgICBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KiBtX2hvc3Q7CkBAIC0xNDYsNyArMTQ2 LDYgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9nZW9tZXRyaWNNZWFuUHJvZHVjdFN1bSB7IDEu MCB9OwogICAgIHVuc2lnbmVkIG1fZnJhbWVzIHsgMCB9OwogICAgIHVuc2lnbmVkIG1fb25Mb2Fk RXZlbnRzIHsgMCB9OwotICAgIHVuc2lnbmVkIG1fY3VycmVudFVSTEluZGV4IHsgMCB9OwogICAg IHVuc2lnbmVkIG1fY3VycmVudFJlcGV0aXRpb24geyAwIH07CiAgICAgdW5zaWduZWQgbV9wYWdl c1RpbWVkIHsgMCB9OwogICAgIHVuc2lnbmVkIG1fcmVwZXRpdGlvbnM7CmRpZmYgLS1naXQgYS9U b29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAgYi9Ub29scy9NaW5p QnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAKaW5kZXggYTgzODYwNjU2ZjVmMzI5 Mjg3YTEwNzNhNWIyYTdjYTEyNjFkZjliYS4uZmRiMWFkZDkwNmU2Y2Q3ZTIxNmIxMmZlN2RmNWNk NzQ5NWM4MGFjMSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dz ZXJXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2lu ZG93LmNwcApAQCAtMTA0LDcgKzEwNCw5IEBAIFdlYktpdEJyb3dzZXJXaW5kb3c6OldlYktpdEJy b3dzZXJXaW5kb3coSFdORCBtYWluV25kLCBIV05EIHVybEJhclduZCkKICAgICBtX3ZpZXcgPSBh ZG9wdFdLKFdLVmlld0NyZWF0ZShyZWN0LCBjb25mLmdldCgpLCBtYWluV25kKSk7CiAgICAgYXV0 byBwYWdlID0gV0tWaWV3R2V0UGFnZShtX3ZpZXcuZ2V0KCkpOwogCi0gICAgV0tQYWdlTmF2aWdh dGlvbkNsaWVudFYwIG5hdmlnYXRpb25DbGllbnQgPSB7eyAwLCB0aGlzIH19OworICAgIFdLUGFn ZU5hdmlnYXRpb25DbGllbnRWMCBuYXZpZ2F0aW9uQ2xpZW50ID0geyB9OworICAgIG5hdmlnYXRp b25DbGllbnQuYmFzZS52ZXJzaW9uID0gMDsKKyAgICBuYXZpZ2F0aW9uQ2xpZW50LmJhc2UuY2xp ZW50SW5mbyA9IHRoaXM7CiAgICAgbmF2aWdhdGlvbkNsaWVudC5kaWRGaW5pc2hOYXZpZ2F0aW9u ID0gZGlkRmluaXNoTmF2aWdhdGlvbjsKICAgICBuYXZpZ2F0aW9uQ2xpZW50LmRpZENvbW1pdE5h dmlnYXRpb24gPSBkaWRDb21taXROYXZpZ2F0aW9uOwogICAgIG5hdmlnYXRpb25DbGllbnQuZGlk UmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlID0gZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2Fj eUJyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJy b3dzZXJXaW5kb3cuY3BwCmluZGV4IGQ2NDMwYjQ0MDIxZjIxNzVjMWNmYzgyNjljZTQ5MDU0YWM5 YWYxNmIuLjhiY2ZlNTdiNzZjZjQ3ZWM2NjUzNDJiMDBlMjFmODI1NmIzN2QyMTcgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmNwcAor KysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5jcHAK QEAgLTYxMiwxMSArNjEyLDExIEBAIHN0YXRpYyBIREMgZ2V0UHJpbnRlckRDKCkKICAgICByZXR1 cm4gcGRsZy5oREM7CiB9CiAKLXN0YXRpYyB2b2lkIGluaXREb2NTdHJ1Y3QoRE9DSU5GTyogZGks IFRDSEFSKiBkb2NuYW1lKQorc3RhdGljIHZvaWQgaW5pdERvY1N0cnVjdChET0NJTkZPKiBkaSwg Y29uc3Qgd2NoYXJfdCogZG9jbmFtZSkKIHsKICAgICBtZW1zZXQoZGksIDAsIHNpemVvZihET0NJ TkZPKSk7CiAgICAgZGktPmNiU2l6ZSA9IHNpemVvZihET0NJTkZPKTsKLSAgICBkaS0+bHBzekRv Y05hbWUgPSBkb2NuYW1lOworICAgIGRpLT5scHN6RG9jTmFtZSA9IGNvbnN0X2Nhc3Q8d2NoYXJf dCo+KGRvY25hbWUpOwogfQogCiB2b2lkIFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3c6OnByaW50 KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2Vy V2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRv dy5oCmluZGV4IGVjZTRlYWYyNDA5YmRjOTgwNmYwMDQyZTE3ZDRjMzRjNDRjYTk5NjQuLmVhNDk2 NDVmZTMzODFiNzJhMDBhNzAyNzA5MGZlNDg3YzQ5MjI4OWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgKKysrIGIvVG9vbHMvTWlu aUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuaApAQCAtMTIwLDggKzEyMCw2 IEBAIHByaXZhdGU6CiAKICAgICBzdGQ6OnZlY3RvcjxJV2ViSGlzdG9yeUl0ZW1QdHI+IG1faGlz dG9yeUl0ZW1zOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPFBhZ2VMb2FkVGVzdENsaWVudD4gbV9w YWdlTG9hZFRlc3RDbGllbnQ7Ci0KICAgICBJV2ViVmlld1B0ciBtX3dlYlZpZXc7CiAgICAgSVdl YlZpZXdQcml2YXRlUHRyIG1fd2ViVmlld1ByaXZhdGU7CiAKQEAgLTE0NCw0ICsxNDIsNiBAQCBw cml2YXRlOgogICAgIEhXTkQgbV92aWV3V25kIHsgbnVsbHB0ciB9OwogCiAgICAgYm9vbCBtX3Vz ZUxheWVyZWRXZWJWaWV3OworCisgICAgc3RkOjp1bmlxdWVfcHRyPFBhZ2VMb2FkVGVzdENsaWVu dD4gbV9wYWdlTG9hZFRlc3RDbGllbnQ7CiB9Owo= 358474 2019-01-06 19:18:51 -0800 2019-01-06 19:18:51 -0800 Patch for landing bug-193029-20190107121850.patch text/plain 5850 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NjY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGE5MjY5NzU0NjVhMjYzYTgwNjg4Y2U0MjY5NTUwY2M3 MzA0ZDBkMy4uM2U2OGYwNzZjMWUzZmZjNmQ4ZTk3NjMyMTg3ZjliYTk3ZTNhOGRmMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE5LTAxLTA2ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW0NsYW5nXSBGaXggY29tcGlsYXRpb24gd2FybmluZ3Mgb2YgTWlu aUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzAyOQorCisgICAgICAgIFJldmlld2VkIGJ5IFJvc3MgS2lyc2xpbmcuCisKKyAgICAgICAg KiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJIb3N0Lmg6IFJlbW92ZWQgdW51c2VkIG1f b2xkRm9udAorICAgICAgICBhbmQgbV9VUkxCYXJGb250LiBSZW9yZGVyIG1lbWJlciB2YXJpYWJs ZXMgdG8gZml4IC1XcmVvcmRlcgorICAgICAgICB3YXJuaW5nLgorICAgICAgICAqIE1pbmlCcm93 c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuY3BwOgorICAgICAgICAoUGFnZUxvYWRUZXN0Q2xp ZW50OjpQYWdlTG9hZFRlc3RDbGllbnQpOiBSZW9yZGVyIHRoZSBtZW1iZXIgaW5pdGlhbGl6ZXIg bGlzdC4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vUGFnZUxvYWRUZXN0Q2xpZW50Lmg6IFJl bW92ZWQgJ3ZpcnR1YWwnIG9mCisgICAgICAgIHBhZ2VMb2FkU3RhcnRlZEF0VGltZSBhbmQgcGFn ZUxvYWRFbmRlZEF0VGltZS4gUmVtb3ZlZCB1bnVzZWQKKyAgICAgICAgbV9jdXJyZW50VVJMSW5k ZXguCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwOgor ICAgICAgICAoV2ViS2l0QnJvd3NlcldpbmRvdzo6V2ViS2l0QnJvd3NlcldpbmRvdyk6IEluaXRp YWxpemUKKyAgICAgICAgbmF2aWdhdGlvbkNsaWVudCB3aXRoICd7IH0nIHRvIGZpeCB0aGUgbWlz c2luZyBmaWVsZCB3YXJuaW5nLgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdh Y3lCcm93c2VyV2luZG93LmNwcDoKKyAgICAgICAgKGluaXREb2NTdHJ1Y3QpOiBDaGFuZ2VkIHRo ZSBhcmd1bWVudCB0eXBlIGRvY25hbWUgdG8gY29uc3QuCisKIDIwMTktMDEtMDYgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aE5dIEltcG9ydCBV MkYgY29tbWFuZC9yZXNwb25zZSBjb252ZXJ0ZXJzIGZyb20gQ2hyb21pdW0KZGlmZiAtLWdpdCBh L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaCBiL1Rvb2xzL01pbmlC cm93c2VyL3dpbi9NaW5pQnJvd3NlcldlYkhvc3QuaAppbmRleCA4MGI5OTM1NzY2NjhjYzA2Yjdi NTZlMWM4MWZlZDUwNmZlNWNiMTk1Li42MWQxNzNkNmIzNTY0Yjc2M2YxYTJjMjIzMDY1MzFlNmZm Njk4YjY1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXJXZWJI b3N0LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlCcm93c2VyV2ViSG9zdC5oCkBA IC03Nyw4ICs3Nyw2IEBAIHByb3RlY3RlZDoKICAgICBIUkVTVUxUIHVwZGF0ZUFkZHJlc3NCYXIo SVdlYlZpZXcmKTsKIAogcHJpdmF0ZToKLSAgICBIV05EIG1faFVSTEJhclduZCB7IDAgfTsKLSAg ICBIR0RJT0JKIG1fVVJMQmFyRm9udCB7IDAgfTsKLSAgICBIR0RJT0JKIG1fb2xkRm9udCB7IDAg fTsKICAgICBXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93KiBtX2NsaWVudCB7IG51bGxwdHIgfTsK KyAgICBIV05EIG1faFVSTEJhclduZCB7IDAgfTsKIH07CmRpZmYgLS1naXQgYS9Ub29scy9NaW5p QnJvd3Nlci93aW4vUGFnZUxvYWRUZXN0Q2xpZW50LmNwcCBiL1Rvb2xzL01pbmlCcm93c2VyL3dp bi9QYWdlTG9hZFRlc3RDbGllbnQuY3BwCmluZGV4IDMxOTQzMzI0ZDhkYTYwZTNlZDgyZjQ5ODg3 MjgzNmI2OWFlYjIyNzcuLjUxYmY0ZTIyMDhkNmNiNTdhNzhmYzVkMGQyYzg3OTU5OWEzMjFjZTMg MTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuY3Bw CisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuY3BwCkBAIC0z Nyw4ICszNyw4IEBAIHN0YXRpYyBjb25zdCBDRlRpbWVJbnRlcnZhbCB3YWl0Rm9yTmV3UmVzb3Vy Y2VMb2FkRHVyYXRpb24gPSAwLjE7CiAKIFBhZ2VMb2FkVGVzdENsaWVudDo6UGFnZUxvYWRUZXN0 Q2xpZW50KFdlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cqIGhvc3QsIGJvb2wgcGFnZUxvYWRUZXN0 aW5nKQogICAgIDogbV9ob3N0KGhvc3QpCi0gICAgLCBtX3JlcGV0aXRpb25zKHBhZ2VMb2FkVGVz dGluZyA/IDIwIDogMSkKICAgICAsIG1fd2FpdEZvckxvYWRUb1JlYWxseUVuZCh0aGlzLCAmUGFn ZUxvYWRUZXN0Q2xpZW50OjplbmRQYWdlTG9hZCkKKyAgICAsIG1fcmVwZXRpdGlvbnMocGFnZUxv YWRUZXN0aW5nID8gMjAgOiAxKQogICAgICwgbV9wYWdlTG9hZFRlc3RpbmcocGFnZUxvYWRUZXN0 aW5nKQogewogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1BhZ2VMb2FkVGVz dENsaWVudC5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1BhZ2VMb2FkVGVzdENsaWVudC5oCmlu ZGV4IDBkZjBhYThhYTk5ZDQwOTEzMDVkMzFiMzBlZGMyMDQyZTBjZTFiNmIuLjc1MTEyNDNmYTc0 N2E1NDg5YTk1NWM5YjgwODIwYzJjY2QyNmMyNzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9QYWdlTG9hZFRlc3RDbGllbnQuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4v UGFnZUxvYWRUZXN0Q2xpZW50LmgKQEAgLTEyNyw4ICsxMjcsOCBAQCBwcml2YXRlOgogICAgIHZv aWQgY2xlYXJQYWdlTG9hZFN0YXRlKCk7CiAgICAgYm9vbCBzaG91bGRDb25zaWRlclBhZ2VMb2Fk RW5kZWQoKSBjb25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBwYWdlTG9hZFN0YXJ0ZWRBdFRpbWUo Q0ZBYnNvbHV0ZVRpbWUpOwotICAgIHZpcnR1YWwgdm9pZCBwYWdlTG9hZEVuZGVkQXRUaW1lKENG QWJzb2x1dGVUaW1lKTsKKyAgICB2b2lkIHBhZ2VMb2FkU3RhcnRlZEF0VGltZShDRkFic29sdXRl VGltZSk7CisgICAgdm9pZCBwYWdlTG9hZEVuZGVkQXRUaW1lKENGQWJzb2x1dGVUaW1lKTsKICAg ICB2b2lkIGR1bXBSdW5TdGF0aXN0aWNzKCk7CiAKICAgICBXZWJLaXRMZWdhY3lCcm93c2VyV2lu ZG93KiBtX2hvc3Q7CkBAIC0xNDYsNyArMTQ2LDYgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9n ZW9tZXRyaWNNZWFuUHJvZHVjdFN1bSB7IDEuMCB9OwogICAgIHVuc2lnbmVkIG1fZnJhbWVzIHsg MCB9OwogICAgIHVuc2lnbmVkIG1fb25Mb2FkRXZlbnRzIHsgMCB9OwotICAgIHVuc2lnbmVkIG1f Y3VycmVudFVSTEluZGV4IHsgMCB9OwogICAgIHVuc2lnbmVkIG1fY3VycmVudFJlcGV0aXRpb24g eyAwIH07CiAgICAgdW5zaWduZWQgbV9wYWdlc1RpbWVkIHsgMCB9OwogICAgIHVuc2lnbmVkIG1f cmVwZXRpdGlvbnM7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJv d3NlcldpbmRvdy5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0QnJvd3NlcldpbmRv dy5jcHAKaW5kZXggOTllZTA0NDBiYWMwYTgwOWI0OWY0ZTg2NzdkNjc1YjEzYzI0MmMwMi4uNWE1 MzI2OGY2Yjc2OGZmY2FhOWY2MjQ2ZTIyYTMzYjM1NzgwNTdkOSAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvd2luL1dlYktpdEJyb3dzZXJXaW5kb3cuY3BwCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL3dpbi9XZWJLaXRCcm93c2VyV2luZG93LmNwcApAQCAtMTA0LDcgKzEwNCw5IEBAIFdl YktpdEJyb3dzZXJXaW5kb3c6OldlYktpdEJyb3dzZXJXaW5kb3coSFdORCBtYWluV25kLCBIV05E IHVybEJhclduZCkKICAgICBtX3ZpZXcgPSBhZG9wdFdLKFdLVmlld0NyZWF0ZShyZWN0LCBjb25m LmdldCgpLCBtYWluV25kKSk7CiAgICAgYXV0byBwYWdlID0gV0tWaWV3R2V0UGFnZShtX3ZpZXcu Z2V0KCkpOwogCi0gICAgV0tQYWdlTmF2aWdhdGlvbkNsaWVudFYwIG5hdmlnYXRpb25DbGllbnQg PSB7eyAwLCB0aGlzIH19OworICAgIFdLUGFnZU5hdmlnYXRpb25DbGllbnRWMCBuYXZpZ2F0aW9u Q2xpZW50ID0geyB9OworICAgIG5hdmlnYXRpb25DbGllbnQuYmFzZS52ZXJzaW9uID0gMDsKKyAg ICBuYXZpZ2F0aW9uQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7CiAgICAgbmF2aWdhdGlv bkNsaWVudC5kaWRGaW5pc2hOYXZpZ2F0aW9uID0gZGlkRmluaXNoTmF2aWdhdGlvbjsKICAgICBu YXZpZ2F0aW9uQ2xpZW50LmRpZENvbW1pdE5hdmlnYXRpb24gPSBkaWRDb21taXROYXZpZ2F0aW9u OwogICAgIG5hdmlnYXRpb25DbGllbnQuZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl ID0gZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOwpkaWZmIC0tZ2l0IGEvVG9vbHMv TWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWlu aUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cuY3BwCmluZGV4IGQ2NDMwYjQ0 MDIxZjIxNzVjMWNmYzgyNjljZTQ5MDU0YWM5YWYxNmIuLjNkZTlmZTU1YzEyNmNjMzVjMmJmNmEz Mjc2NDU4Yjc3NTYyNGJjZWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XZWJL aXRMZWdhY3lCcm93c2VyV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2Vi S2l0TGVnYWN5QnJvd3NlcldpbmRvdy5jcHAKQEAgLTYxMiw3ICs2MTIsNyBAQCBzdGF0aWMgSERD IGdldFByaW50ZXJEQygpCiAgICAgcmV0dXJuIHBkbGcuaERDOwogfQogCi1zdGF0aWMgdm9pZCBp bml0RG9jU3RydWN0KERPQ0lORk8qIGRpLCBUQ0hBUiogZG9jbmFtZSkKK3N0YXRpYyB2b2lkIGlu aXREb2NTdHJ1Y3QoRE9DSU5GTyogZGksIGNvbnN0IHdjaGFyX3QqIGRvY25hbWUpCiB7CiAgICAg bWVtc2V0KGRpLCAwLCBzaXplb2YoRE9DSU5GTykpOwogICAgIGRpLT5jYlNpemUgPSBzaXplb2Yo RE9DSU5GTyk7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5 QnJvd3NlcldpbmRvdy5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dlYktpdExlZ2FjeUJyb3dz ZXJXaW5kb3cuaAppbmRleCBlY2U0ZWFmMjQwOWJkYzk4MDZmMDA0MmUxN2Q0YzM0YzQ0Y2E5OTY0 Li5lYTQ5NjQ1ZmUzMzgxYjcyYTAwYTcwMjcwOTBmZTQ4N2M0OTIyODlkIDEwMDY0NAotLS0gYS9U b29scy9NaW5pQnJvd3Nlci93aW4vV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5oCisrKyBiL1Rv b2xzL01pbmlCcm93c2VyL3dpbi9XZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgKQEAgLTEyMCw4 ICsxMjAsNiBAQCBwcml2YXRlOgogCiAgICAgc3RkOjp2ZWN0b3I8SVdlYkhpc3RvcnlJdGVtUHRy PiBtX2hpc3RvcnlJdGVtczsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxQYWdlTG9hZFRlc3RDbGll bnQ+IG1fcGFnZUxvYWRUZXN0Q2xpZW50OwotCiAgICAgSVdlYlZpZXdQdHIgbV93ZWJWaWV3Owog ICAgIElXZWJWaWV3UHJpdmF0ZVB0ciBtX3dlYlZpZXdQcml2YXRlOwogCkBAIC0xNDQsNCArMTQy LDYgQEAgcHJpdmF0ZToKICAgICBIV05EIG1fdmlld1duZCB7IG51bGxwdHIgfTsKIAogICAgIGJv b2wgbV91c2VMYXllcmVkV2ViVmlldzsKKworICAgIHN0ZDo6dW5pcXVlX3B0cjxQYWdlTG9hZFRl c3RDbGllbnQ+IG1fcGFnZUxvYWRUZXN0Q2xpZW50OwogfTsK