186633 2018-06-14 14:25:36 -0700 [Win][MiniBrowser] Change to use WebKit by default if it's available 2018-06-14 17:24:21 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174003 1 basuke basuke achristensen basuke commit-queue ews-feeder lforschler pvollan webkit-bug-importer youennf oldest_to_newest 1433113 0 basuke 2018-06-14 14:25:36 -0700 Add command line switch for WebKit 1433124 1 basuke 2018-06-14 14:43:36 -0700 Add command line switch to use WebKit or WebKitLegacy 1433128 2 342763 basuke 2018-06-14 14:45:22 -0700 Created attachment 342763 PATCH 1433139 3 342763 youennf 2018-06-14 15:30:58 -0700 Comment on attachment 342763 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=342763&action=review > Tools/MiniBrowser/win/Common.cpp:168 > +void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& pageLoadTesting, MainWindow::BrowserWindowType& windowType, _bstr_t& requestedURL) Maybe it should return a struct of all parameters. > Tools/MiniBrowser/win/WinMain.cpp:56 > + MainWindow::BrowserWindowType windowType = MainWindow::BrowserWindowType::WebKitLegacy; Why is it legacy here? If parseCommandLine was returning a struct, there would be no need for setting these default values. > Tools/MiniBrowser/win/WinMain.cpp:109 > +extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow) Isn't it already defined in Tools/MiniBrowser/win/Common.cpp? 1433141 4 342763 basuke 2018-06-14 15:34:40 -0700 Comment on attachment 342763 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=342763&action=review >> Tools/MiniBrowser/win/Common.cpp:168 >> +void parseCommandLine(bool& usesLayeredWebView, bool& useFullDesktop, bool& pageLoadTesting, MainWindow::BrowserWindowType& windowType, _bstr_t& requestedURL) > > Maybe it should return a struct of all parameters. Make sense. >> Tools/MiniBrowser/win/WinMain.cpp:56 >> + MainWindow::BrowserWindowType windowType = MainWindow::BrowserWindowType::WebKitLegacy; > > Why is it legacy here? > If parseCommandLine was returning a struct, there would be no need for setting these default values. Got it. >> Tools/MiniBrowser/win/WinMain.cpp:109 >> +extern "C" __declspec(dllexport) int WINAPI dllLauncherEntryPoint(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCmdLine, int nCmdShow) > > Isn't it already defined in Tools/MiniBrowser/win/Common.cpp? Moved from Common.cpp. Common.cpp was originally included from WinMain.cpp and it is now separate code to be compiled. It is more natural to put entry point to the same source file. 1433150 5 342770 basuke 2018-06-14 15:52:10 -0700 Created attachment 342770 FIX Thanks youenn for r+. 1433151 6 342770 ews-feeder 2018-06-14 15:52:17 -0700 Comment on attachment 342770 FIX Rejecting attachment 342770 from commit-queue. Basuke.Suzuki@sony.com does not have committer permissions according to https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 1433152 7 342770 youennf 2018-06-14 15:53:59 -0700 Comment on attachment 342770 FIX View in context: https://bugs.webkit.org/attachment.cgi?id=342770&action=review > Tools/MiniBrowser/win/Common.h:36 > + MainWindow::BrowserWindowType windowType; You could probably initialise its value there too so that you do not need the constructor. 1433161 8 342770 basuke 2018-06-14 16:18:39 -0700 Comment on attachment 342770 FIX View in context: https://bugs.webkit.org/attachment.cgi?id=342770&action=review >> Tools/MiniBrowser/win/Common.h:36 >> + MainWindow::BrowserWindowType windowType; > > You could probably initialise its value there too so that you do not need the constructor. But the default value is conditional. I tried to put them here with #if block, but it seems so unnatural. I saw many examples of constructors with conditional initialization, so it comfortable for me. What do you think? 1433172 9 youennf 2018-06-14 16:42:15 -0700 (In reply to Basuke Suzuki from comment #8) > Comment on attachment 342770 [details] > FIX > > View in context: > https://bugs.webkit.org/attachment.cgi?id=342770&action=review > > >> Tools/MiniBrowser/win/Common.h:36 > >> + MainWindow::BrowserWindowType windowType; > > > > You could probably initialise its value there too so that you do not need the constructor. > > But the default value is conditional. I tried to put them here with #if > block, but it seems so unnatural. I saw many examples of constructors with > conditional initialization, so it comfortable for me. What do you think? I guess you could use a macro but the constructor is fine too. 1433180 10 basuke 2018-06-14 16:56:13 -0700 Thanks. I go with constructor now. 1433192 11 342770 commit-queue 2018-06-14 17:23:09 -0700 Comment on attachment 342770 FIX Clearing flags on attachment: 342770 Committed r232862: <https://trac.webkit.org/changeset/232862> 1433193 12 commit-queue 2018-06-14 17:23:11 -0700 All reviewed patches have been landed. Closing bug. 1433194 13 webkit-bug-importer 2018-06-14 17:24:21 -0700 <rdar://problem/41145521> 342763 2018-06-14 14:45:22 -0700 2018-06-14 15:52:10 -0700 PATCH 186633.diff text/plain 4830 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmMGRm MDc4NTg0ZC4uZWFhNzVlZGYyMTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxOC0wNi0xNCAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl1bTWluaUJyb3dzZXJd IENoYW5nZSB0byB1c2UgV2ViS2l0IGJ5IGRlZmF1bHQgaWYgaXQncyBhdmFpbGFibGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjYzMworCisgICAg ICAgIFdoZW4gTWluaUJyb3dzZXIgaXMgYnVpbHQgd2l0aCBXZWJLaXQsIHVzZSBpdCBieSBkZWZh dWx0LiBBbHNvIGFkZCBjb21tYW5kCisgICAgICAgIGxpbmUgc3dpdGNoIGZvciBXZWJLaXRMZWdh Y3kuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBN aW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcDoKKyAgICAgICAgKHBhcnNlQ29tbWFuZExpbmUpOgor ICAgICAgICAoZGxsTGF1bmNoZXJFbnRyeVBvaW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBNaW5p QnJvd3Nlci93aW4vQ29tbW9uLmg6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1dpbk1haW4u Y3BwOgorICAgICAgICAod1dpbk1haW4pOgorICAgICAgICAoZGxsTGF1bmNoZXJFbnRyeVBvaW50 KToKKwogMjAxOC0wNi0xNCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBFbmFibGUgdGVzdHMgb24gdGhlIEdUSyBFV1MgcXVl dWUKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uY3BwIGIvVG9vbHMv TWluaUJyb3dzZXIvd2luL0NvbW1vbi5jcHAKaW5kZXggZmEyNWY1NDJkMzUuLjZlYjkxMGI5YTFk IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcAorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcApAQCAtMTY1LDEyICsxNjUsMTYgQEAgSFJFU1VM VCBkaXNwbGF5QXV0aERpYWxvZyhIV05EIGh3bmQsIHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0 ZDo6d3N0cmluZyYgcGFzc3cKICAgICByZXR1cm4gcmVzdWx0ID4gMCA/IFNfT0sgOiBFX0ZBSUw7 CiB9CiAKLXZvaWQgcGFyc2VDb21tYW5kTGluZShib29sJiB1c2VzTGF5ZXJlZFdlYlZpZXcsIGJv b2wmIHVzZUZ1bGxEZXNrdG9wLCBib29sJiBwYWdlTG9hZFRlc3RpbmcsIF9ic3RyX3QmIHJlcXVl c3RlZFVSTCkKK3ZvaWQgcGFyc2VDb21tYW5kTGluZShib29sJiB1c2VzTGF5ZXJlZFdlYlZpZXcs IGJvb2wmIHVzZUZ1bGxEZXNrdG9wLCBib29sJiBwYWdlTG9hZFRlc3RpbmcsIE1haW5XaW5kb3c6 OkJyb3dzZXJXaW5kb3dUeXBlJiB3aW5kb3dUeXBlLCBfYnN0cl90JiByZXF1ZXN0ZWRVUkwpCiB7 CiAgICAgdXNlc0xheWVyZWRXZWJWaWV3ID0gZmFsc2U7CiAgICAgdXNlRnVsbERlc2t0b3AgPSBm YWxzZTsKICAgICBwYWdlTG9hZFRlc3RpbmcgPSBmYWxzZTsKIAorI2lmIEVOQUJMRShXRUJLSVQp CisgICAgd2luZG93VHlwZSA9IE1haW5XaW5kb3c6OkJyb3dzZXJXaW5kb3dUeXBlOjpXZWJLaXQ7 CisjZW5kaWYKKwogICAgIGludCBhcmdjID0gMDsKICAgICBXQ0hBUioqIGFyZ3YgPSBDb21tYW5k TGluZVRvQXJndlcoR2V0Q29tbWFuZExpbmVXKCksICZhcmdjKTsKICAgICBmb3IgKGludCBpID0g MTsgaSA8IGFyZ2M7ICsraSkgewpAQCAtMTgyLDEyICsxODYsMTMgQEAgdm9pZCBwYXJzZUNvbW1h bmRMaW5lKGJvb2wmIHVzZXNMYXllcmVkV2ViVmlldywgYm9vbCYgdXNlRnVsbERlc2t0b3AsIGJv b2wmIHBhZ2UKICAgICAgICAgICAgIHBhZ2VMb2FkVGVzdGluZyA9IHRydWU7CiAgICAgICAgIGVs c2UgaWYgKCF3Y3NpY21wKGFyZ3ZbaV0sIEwiLS1oaWdoRFBJIikpCiAgICAgICAgICAgICBjb250 aW51ZTsgLy8gaWdub3JlCisgICAgICAgIGVsc2UgaWYgKCF3Y3NpY21wKGFyZ3ZbaV0sIEwiLS13 azEiKSB8fCAhd2NzaWNtcChhcmd2W2ldLCBMIi0tbGVnYWN5IikpCisgICAgICAgICAgICB3aW5k b3dUeXBlID0gTWFpbldpbmRvdzo6QnJvd3NlcldpbmRvd1R5cGU6OldlYktpdExlZ2FjeTsKKyNp ZiBFTkFCTEUoV0VCS0lUKQorICAgICAgICBlbHNlIGlmICghd2NzaWNtcChhcmd2W2ldLCBMIi0t d2syIikgfHwgIXdjc2ljbXAoYXJndltpXSwgTCItLXdlYmtpdCIpKQorICAgICAgICAgICAgd2lu ZG93VHlwZSA9IE1haW5XaW5kb3c6OkJyb3dzZXJXaW5kb3dUeXBlOjpXZWJLaXQ7CisjZW5kaWYK ICAgICAgICAgZWxzZSBpZiAoIXJlcXVlc3RlZFVSTCkKICAgICAgICAgICAgIHJlcXVlc3RlZFVS TCA9IGFyZ3ZbaV07CiAgICAgfQogfQotCi1leHRlcm4gIkMiIF9fZGVjbHNwZWMoZGxsZXhwb3J0 KSBpbnQgV0lOQVBJIGRsbExhdW5jaGVyRW50cnlQb2ludChISU5TVEFOQ0UgaEluc3RhbmNlLCBI SU5TVEFOQ0UgaFByZXZJbnN0YW5jZSwgTFBXU1RSIGxwc3RyQ21kTGluZSwgaW50IG5DbWRTaG93 KQotewotICAgIHJldHVybiB3V2luTWFpbihoSW5zdGFuY2UsIGhQcmV2SW5zdGFuY2UsIGxwc3Ry Q21kTGluZSwgbkNtZFNob3cpOwotfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L0NvbW1vbi5oIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5oCmluZGV4IDk4NWZlNzc0 NGMzLi41YmViNDk1ZGVmYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1v bi5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uaApAQCAtMzEsNyArMzEsNyBA QAogCiB2b2lkIGNvbXB1dGVGdWxsRGVza3RvcEZyYW1lKCk7CiBib29sIGdldEFwcERhdGFGb2xk ZXIoX2JzdHJfdCYgZGlyZWN0b3J5KTsKLXZvaWQgcGFyc2VDb21tYW5kTGluZShib29sJiB1c2Vz TGF5ZXJlZFdlYlZpZXcsIGJvb2wmIHVzZUZ1bGxEZXNrdG9wLCBib29sJiBwYWdlTG9hZFRlc3Rp bmcsIF9ic3RyX3QmIHJlcXVlc3RlZFVSTCk7Cit2b2lkIHBhcnNlQ29tbWFuZExpbmUoYm9vbCYg dXNlc0xheWVyZWRXZWJWaWV3LCBib29sJiB1c2VGdWxsRGVza3RvcCwgYm9vbCYgcGFnZUxvYWRU ZXN0aW5nLCBNYWluV2luZG93OjpCcm93c2VyV2luZG93VHlwZSYsIF9ic3RyX3QmIHJlcXVlc3Rl ZFVSTCk7CiB2b2lkIGNyZWF0ZUNyYXNoUmVwb3J0KEVYQ0VQVElPTl9QT0lOVEVSUyopOwogSFJF U1VMVCBkaXNwbGF5QXV0aERpYWxvZyhIV05ELCBzdGQ6OndzdHJpbmcmIHVzZXJuYW1lLCBzdGQ6 OndzdHJpbmcmIHBhc3N3b3JkKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L1dpbk1haW4uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dpbk1haW4uY3BwCmluZGV4IGM5 NmE2NzdjNzRmLi5jZmFlMjBkMGUxOSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L1dpbk1haW4uY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcApAQCAt NTMsOSArNTMsMTAgQEAgaW50IFdJTkFQSSB3V2luTWFpbihfSW5fIEhJTlNUQU5DRSBoSW5zdGFu Y2UsIF9Jbl9vcHRfIEhJTlNUQU5DRSBoUHJldkluc3RhbmNlLAogICAgIGJvb2wgdXNlc0xheWVy ZWRXZWJWaWV3ID0gZmFsc2U7CiAgICAgYm9vbCB1c2VGdWxsRGVza3RvcCA9IGZhbHNlOwogICAg IGJvb2wgcGFnZUxvYWRUZXN0aW5nID0gZmFsc2U7CisgICAgTWFpbldpbmRvdzo6QnJvd3Nlcldp bmRvd1R5cGUgd2luZG93VHlwZSA9IE1haW5XaW5kb3c6OkJyb3dzZXJXaW5kb3dUeXBlOjpXZWJL aXRMZWdhY3k7CiAgICAgX2JzdHJfdCByZXF1ZXN0ZWRVUkw7CiAKLSAgICBwYXJzZUNvbW1hbmRM aW5lKHVzZXNMYXllcmVkV2ViVmlldywgdXNlRnVsbERlc2t0b3AsIHBhZ2VMb2FkVGVzdGluZywg cmVxdWVzdGVkVVJMKTsKKyAgICBwYXJzZUNvbW1hbmRMaW5lKHVzZXNMYXllcmVkV2ViVmlldywg dXNlRnVsbERlc2t0b3AsIHBhZ2VMb2FkVGVzdGluZywgd2luZG93VHlwZSwgcmVxdWVzdGVkVVJM KTsKIAogICAgIGlmICh1c2VGdWxsRGVza3RvcCkKICAgICAgICAgY29tcHV0ZUZ1bGxEZXNrdG9w RnJhbWUoKTsKQEAgLTY1LDcgKzY2LDcgQEAgaW50IFdJTkFQSSB3V2luTWFpbihfSW5fIEhJTlNU QU5DRSBoSW5zdGFuY2UsIF9Jbl9vcHRfIEhJTlNUQU5DRSBoUHJldkluc3RhbmNlLAogCiAgICAg OjpTZXRQcm9jZXNzRFBJQXdhcmUoKTsKIAotICAgIGF1dG8mIG1haW5XaW5kb3cgPSBNYWluV2lu ZG93OjpjcmVhdGUoTWFpbldpbmRvdzo6QnJvd3NlcldpbmRvd1R5cGU6OldlYktpdExlZ2FjeSku bGVha1JlZigpOworICAgIGF1dG8mIG1haW5XaW5kb3cgPSBNYWluV2luZG93OjpjcmVhdGUod2lu ZG93VHlwZSkubGVha1JlZigpOwogICAgIEhSRVNVTFQgaHIgPSBtYWluV2luZG93LmluaXQoaElu c3QsIHVzZXNMYXllcmVkV2ViVmlldywgcGFnZUxvYWRUZXN0aW5nKTsKICAgICBpZiAoRkFJTEVE KGhyKSkKICAgICAgICAgZ290byBleGl0OwpAQCAtMTA0LDMgKzEwNSw4IEBAIGV4aXQ6CiAKICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8aW50Pihtc2cud1BhcmFtKTsKIH0KKworZXh0ZXJuICJDIiBf X2RlY2xzcGVjKGRsbGV4cG9ydCkgaW50IFdJTkFQSSBkbGxMYXVuY2hlckVudHJ5UG9pbnQoSElO U1RBTkNFIGhJbnN0YW5jZSwgSElOU1RBTkNFIGhQcmV2SW5zdGFuY2UsIExQV1NUUiBscHN0ckNt ZExpbmUsIGludCBuQ21kU2hvdykKK3sKKyAgICByZXR1cm4gd1dpbk1haW4oaEluc3RhbmNlLCBo UHJldkluc3RhbmNlLCBscHN0ckNtZExpbmUsIG5DbWRTaG93KTsKK30K 342770 2018-06-14 15:52:10 -0700 2018-06-14 17:23:09 -0700 FIX 186633.diff text/plain 5976 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmMGRm MDc4NTg0ZC4uN2VjNTA2ZDhkNWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxOC0wNi0xNCAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW1dpbl1bTWluaUJyb3dzZXJd IENoYW5nZSB0byB1c2UgV2ViS2l0IGJ5IGRlZmF1bHQgaWYgaXQncyBhdmFpbGFibGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjYzMworCisgICAg ICAgIFdoZW4gTWluaUJyb3dzZXIgaXMgYnVpbHQgd2l0aCBXZWJLaXQsIHVzZSBpdCBieSBkZWZh dWx0LiBBbHNvIGFkZCBjb21tYW5kCisgICAgICAgIGxpbmUgc3dpdGNoIGZvciBXZWJLaXRMZWdh Y3kuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICAqIE1p bmlCcm93c2VyL3dpbi9Db21tb24uY3BwOgorICAgICAgICAocGFyc2VDb21tYW5kTGluZSk6Cisg ICAgICAgIChkbGxMYXVuY2hlckVudHJ5UG9pbnQpOiBEZWxldGVkLgorICAgICAgICAqIE1pbmlC cm93c2VyL3dpbi9Db21tb24uaDoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2luTWFpbi5j cHA6CisgICAgICAgICh3V2luTWFpbik6CisgICAgICAgIChkbGxMYXVuY2hlckVudHJ5UG9pbnQp OgorCiAyMDE4LTA2LTE0ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdIEVuYWJsZSB0ZXN0cyBvbiB0aGUgR1RLIEVXUyBxdWV1 ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5jcHAgYi9Ub29scy9N aW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcAppbmRleCBmYTI1ZjU0MmQzNS4uMzU4OGZjNDNiM2Yg MTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uY3BwCisrKyBiL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9Db21tb24uY3BwCkBAIC0xNjUsMjkgKzE2NSwzMCBAQCBIUkVTVUxU IGRpc3BsYXlBdXRoRGlhbG9nKEhXTkQgaHduZCwgc3RkOjp3c3RyaW5nJiB1c2VybmFtZSwgc3Rk Ojp3c3RyaW5nJiBwYXNzdwogICAgIHJldHVybiByZXN1bHQgPiAwID8gU19PSyA6IEVfRkFJTDsK IH0KIAotdm9pZCBwYXJzZUNvbW1hbmRMaW5lKGJvb2wmIHVzZXNMYXllcmVkV2ViVmlldywgYm9v bCYgdXNlRnVsbERlc2t0b3AsIGJvb2wmIHBhZ2VMb2FkVGVzdGluZywgX2JzdHJfdCYgcmVxdWVz dGVkVVJMKQorQ29tbWFuZExpbmVPcHRpb25zIHBhcnNlQ29tbWFuZExpbmUoKQogewotICAgIHVz ZXNMYXllcmVkV2ViVmlldyA9IGZhbHNlOwotICAgIHVzZUZ1bGxEZXNrdG9wID0gZmFsc2U7Ci0g ICAgcGFnZUxvYWRUZXN0aW5nID0gZmFsc2U7CisgICAgQ29tbWFuZExpbmVPcHRpb25zIG9wdGlv bnM7CiAKICAgICBpbnQgYXJnYyA9IDA7CiAgICAgV0NIQVIqKiBhcmd2ID0gQ29tbWFuZExpbmVU b0FyZ3ZXKEdldENvbW1hbmRMaW5lVygpLCAmYXJnYyk7CiAgICAgZm9yIChpbnQgaSA9IDE7IGkg PCBhcmdjOyArK2kpIHsKICAgICAgICAgaWYgKCF3Y3NpY21wKGFyZ3ZbaV0sIEwiLS10cmFuc3Bh cmVudCIpKQotICAgICAgICAgICAgdXNlc0xheWVyZWRXZWJWaWV3ID0gdHJ1ZTsKKyAgICAgICAg ICAgIG9wdGlvbnMudXNlc0xheWVyZWRXZWJWaWV3ID0gdHJ1ZTsKICAgICAgICAgZWxzZSBpZiAo IXdjc2ljbXAoYXJndltpXSwgTCItLWRlc2t0b3AiKSkKLSAgICAgICAgICAgIHVzZUZ1bGxEZXNr dG9wID0gdHJ1ZTsKKyAgICAgICAgICAgIG9wdGlvbnMudXNlRnVsbERlc2t0b3AgPSB0cnVlOwog ICAgICAgICBlbHNlIGlmICghd2NzaWNtcChhcmd2W2ldLCBMIi0tcGVyZm9ybWFuY2UiKSkKLSAg ICAgICAgICAgIHBhZ2VMb2FkVGVzdGluZyA9IHRydWU7CisgICAgICAgICAgICBvcHRpb25zLnBh Z2VMb2FkVGVzdGluZyA9IHRydWU7CiAgICAgICAgIGVsc2UgaWYgKCF3Y3NpY21wKGFyZ3ZbaV0s IEwiLS1oaWdoRFBJIikpCiAgICAgICAgICAgICBjb250aW51ZTsgLy8gaWdub3JlCi0gICAgICAg IGVsc2UgaWYgKCFyZXF1ZXN0ZWRVUkwpCi0gICAgICAgICAgICByZXF1ZXN0ZWRVUkwgPSBhcmd2 W2ldOworICAgICAgICBlbHNlIGlmICghd2NzaWNtcChhcmd2W2ldLCBMIi0td2sxIikgfHwgIXdj c2ljbXAoYXJndltpXSwgTCItLWxlZ2FjeSIpKQorICAgICAgICAgICAgb3B0aW9ucy53aW5kb3dU eXBlID0gTWFpbldpbmRvdzo6QnJvd3NlcldpbmRvd1R5cGU6OldlYktpdExlZ2FjeTsKKyNpZiBF TkFCTEUoV0VCS0lUKQorICAgICAgICBlbHNlIGlmICghd2NzaWNtcChhcmd2W2ldLCBMIi0td2sy IikgfHwgIXdjc2ljbXAoYXJndltpXSwgTCItLXdlYmtpdCIpKQorICAgICAgICAgICAgb3B0aW9u cy53aW5kb3dUeXBlID0gTWFpbldpbmRvdzo6QnJvd3NlcldpbmRvd1R5cGU6OldlYktpdDsKKyNl bmRpZgorICAgICAgICBlbHNlIGlmICghb3B0aW9ucy5yZXF1ZXN0ZWRVUkwpCisgICAgICAgICAg ICBvcHRpb25zLnJlcXVlc3RlZFVSTCA9IGFyZ3ZbaV07CiAgICAgfQotfQogCi1leHRlcm4gIkMi IF9fZGVjbHNwZWMoZGxsZXhwb3J0KSBpbnQgV0lOQVBJIGRsbExhdW5jaGVyRW50cnlQb2ludChI SU5TVEFOQ0UgaEluc3RhbmNlLCBISU5TVEFOQ0UgaFByZXZJbnN0YW5jZSwgTFBXU1RSIGxwc3Ry Q21kTGluZSwgaW50IG5DbWRTaG93KQotewotICAgIHJldHVybiB3V2luTWFpbihoSW5zdGFuY2Us IGhQcmV2SW5zdGFuY2UsIGxwc3RyQ21kTGluZSwgbkNtZFNob3cpOworICAgIHJldHVybiBvcHRp b25zOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5oIGIvVG9v bHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5oCmluZGV4IDk4NWZlNzc0NGMzLi4wODVhMzEzMDFj YSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5oCisrKyBiL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9Db21tb24uaApAQCAtMjksOSArMjksMjYgQEAKICNpbmNsdWRlICJN YWluV2luZG93LmgiCiAjaW5jbHVkZSAiV2ViS2l0TGVnYWN5QnJvd3NlcldpbmRvdy5oIgogCitz dHJ1Y3QgQ29tbWFuZExpbmVPcHRpb25zIHsKKyAgICBib29sIHVzZXNMYXllcmVkV2ViVmlldyB7 IH07CisgICAgYm9vbCB1c2VGdWxsRGVza3RvcCB7IH07CisgICAgYm9vbCBwYWdlTG9hZFRlc3Rp bmcgeyB9OworICAgIE1haW5XaW5kb3c6OkJyb3dzZXJXaW5kb3dUeXBlIHdpbmRvd1R5cGU7Cisg ICAgX2JzdHJfdCByZXF1ZXN0ZWRVUkw7CisKKyAgICBDb21tYW5kTGluZU9wdGlvbnMoKQorI2lm IEVOQUJMRShXRUJLSVQpCisgICAgICAgIDogd2luZG93VHlwZShNYWluV2luZG93OjpCcm93c2Vy V2luZG93VHlwZTo6V2ViS2l0KQorI2Vsc2UKKyAgICAgICAgOiB3aW5kb3dUeXBlKE1haW5XaW5k b3c6OkJyb3dzZXJXaW5kb3dUeXBlOjpXZWJLaXRMZWdhY3kpCisjZW5kaWYKKyAgICB7CisgICAg fQorfTsKKwogdm9pZCBjb21wdXRlRnVsbERlc2t0b3BGcmFtZSgpOwogYm9vbCBnZXRBcHBEYXRh Rm9sZGVyKF9ic3RyX3QmIGRpcmVjdG9yeSk7Ci12b2lkIHBhcnNlQ29tbWFuZExpbmUoYm9vbCYg dXNlc0xheWVyZWRXZWJWaWV3LCBib29sJiB1c2VGdWxsRGVza3RvcCwgYm9vbCYgcGFnZUxvYWRU ZXN0aW5nLCBfYnN0cl90JiByZXF1ZXN0ZWRVUkwpOworQ29tbWFuZExpbmVPcHRpb25zIHBhcnNl Q29tbWFuZExpbmUoKTsKIHZvaWQgY3JlYXRlQ3Jhc2hSZXBvcnQoRVhDRVBUSU9OX1BPSU5URVJT Kik7CiBIUkVTVUxUIGRpc3BsYXlBdXRoRGlhbG9nKEhXTkQsIHN0ZDo6d3N0cmluZyYgdXNlcm5h bWUsIHN0ZDo6d3N0cmluZyYgcGFzc3dvcmQpOwogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci93aW4vV2luTWFpbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAK aW5kZXggYzk2YTY3N2M3NGYuLjQyNmEwOWViMGU2IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJv d3Nlci93aW4vV2luTWFpbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dpbk1haW4u Y3BwCkBAIC01MCwxNCArNTAsOSBAQCBpbnQgV0lOQVBJIHdXaW5NYWluKF9Jbl8gSElOU1RBTkNF IGhJbnN0YW5jZSwgX0luX29wdF8gSElOU1RBTkNFIGhQcmV2SW5zdGFuY2UsCiAgICAgSW5pdEN0 cmxFeC5kd0lDQyAgPSAweDAwMDA0MDAwOyAvLyBJQ0NfU1RBTkRBUkRfQ0xBU1NFUzsKICAgICBJ bml0Q29tbW9uQ29udHJvbHNFeCgmSW5pdEN0cmxFeCk7CiAKLSAgICBib29sIHVzZXNMYXllcmVk V2ViVmlldyA9IGZhbHNlOwotICAgIGJvb2wgdXNlRnVsbERlc2t0b3AgPSBmYWxzZTsKLSAgICBi b29sIHBhZ2VMb2FkVGVzdGluZyA9IGZhbHNlOwotICAgIF9ic3RyX3QgcmVxdWVzdGVkVVJMOwor ICAgIGF1dG8gb3B0aW9ucyA9IHBhcnNlQ29tbWFuZExpbmUoKTsKIAotICAgIHBhcnNlQ29tbWFu ZExpbmUodXNlc0xheWVyZWRXZWJWaWV3LCB1c2VGdWxsRGVza3RvcCwgcGFnZUxvYWRUZXN0aW5n LCByZXF1ZXN0ZWRVUkwpOwotCi0gICAgaWYgKHVzZUZ1bGxEZXNrdG9wKQorICAgIGlmIChvcHRp b25zLnVzZUZ1bGxEZXNrdG9wKQogICAgICAgICBjb21wdXRlRnVsbERlc2t0b3BGcmFtZSgpOwog CiAgICAgLy8gSW5pdCBDT00KQEAgLTY1LDggKzYwLDggQEAgaW50IFdJTkFQSSB3V2luTWFpbihf SW5fIEhJTlNUQU5DRSBoSW5zdGFuY2UsIF9Jbl9vcHRfIEhJTlNUQU5DRSBoUHJldkluc3RhbmNl LAogCiAgICAgOjpTZXRQcm9jZXNzRFBJQXdhcmUoKTsKIAotICAgIGF1dG8mIG1haW5XaW5kb3cg PSBNYWluV2luZG93OjpjcmVhdGUoTWFpbldpbmRvdzo6QnJvd3NlcldpbmRvd1R5cGU6OldlYktp dExlZ2FjeSkubGVha1JlZigpOwotICAgIEhSRVNVTFQgaHIgPSBtYWluV2luZG93LmluaXQoaElu c3QsIHVzZXNMYXllcmVkV2ViVmlldywgcGFnZUxvYWRUZXN0aW5nKTsKKyAgICBhdXRvJiBtYWlu V2luZG93ID0gTWFpbldpbmRvdzo6Y3JlYXRlKG9wdGlvbnMud2luZG93VHlwZSkubGVha1JlZigp OworICAgIEhSRVNVTFQgaHIgPSBtYWluV2luZG93LmluaXQoaEluc3QsIG9wdGlvbnMudXNlc0xh eWVyZWRXZWJWaWV3LCBvcHRpb25zLnBhZ2VMb2FkVGVzdGluZyk7CiAgICAgaWYgKEZBSUxFRCho cikpCiAgICAgICAgIGdvdG8gZXhpdDsKIApAQCAtNzQsOCArNjksOCBAQCBpbnQgV0lOQVBJIHdX aW5NYWluKF9Jbl8gSElOU1RBTkNFIGhJbnN0YW5jZSwgX0luX29wdF8gSElOU1RBTkNFIGhQcmV2 SW5zdGFuY2UsCiAKICAgICBoQWNjZWxUYWJsZSA9IExvYWRBY2NlbGVyYXRvcnMoaEluc3QsIE1B S0VJTlRSRVNPVVJDRShJRENfTUlOSUJST1dTRVIpKTsKIAotICAgIGlmIChyZXF1ZXN0ZWRVUkwu bGVuZ3RoKCkpCi0gICAgICAgIG1haW5XaW5kb3cubG9hZFVSTChyZXF1ZXN0ZWRVUkwuR2V0QlNU UigpKTsKKyAgICBpZiAob3B0aW9ucy5yZXF1ZXN0ZWRVUkwubGVuZ3RoKCkpCisgICAgICAgIG1h aW5XaW5kb3cubG9hZFVSTChvcHRpb25zLnJlcXVlc3RlZFVSTC5HZXRCU1RSKCkpOwogICAgIGVs c2UKICAgICAgICAgbWFpbldpbmRvdy5icm93c2VyV2luZG93KCktPmxvYWRIVE1MU3RyaW5nKF9i c3RyX3QoZGVmYXVsdEhUTUwpLkdldEJTVFIoKSk7CiAKQEAgLTEwNCwzICs5OSw4IEBAIGV4aXQ6 CiAKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8aW50Pihtc2cud1BhcmFtKTsKIH0KKworZXh0ZXJu ICJDIiBfX2RlY2xzcGVjKGRsbGV4cG9ydCkgaW50IFdJTkFQSSBkbGxMYXVuY2hlckVudHJ5UG9p bnQoSElOU1RBTkNFIGhJbnN0YW5jZSwgSElOU1RBTkNFIGhQcmV2SW5zdGFuY2UsIExQV1NUUiBs cHN0ckNtZExpbmUsIGludCBuQ21kU2hvdykKK3sKKyAgICByZXR1cm4gd1dpbk1haW4oaEluc3Rh bmNlLCBoUHJldkluc3RhbmNlLCBscHN0ckNtZExpbmUsIG5DbWRTaG93KTsKK30K