237047 2022-02-22 11:42:01 -0800 Refactor DOMWindow calls generating console warnings into a single DOMWindow::printWarningMessage method 2022-05-11 09:42:15 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified ASSIGNED InRadar P2 Normal --- 237046 1 ntim darin darin ews-watchlist hi jenner mkwst Morningstar webkit-bug-importer oldest_to_newest 1844811 0 ntim 2022-02-22 11:42:01 -0800 See https://bugs.webkit.org/show_bug.cgi?id=237046#c5 1844841 1 452896 ntim 2022-02-22 13:08:36 -0800 Created attachment 452896 Patch 1844914 2 452896 darin 2022-02-22 15:59:16 -0800 Comment on attachment 452896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452896&action=review > Source/WebCore/page/DOMWindow.h:273 > + void printConsoleMessage(const String&, MessageLevel) const; > void printErrorMessage(const String&) const; > + void printWarningMessage(const String&) const; Can these all be private? Is there any caller using them outside the class? 1845003 3 452937 ntim 2022-02-22 21:58:40 -0800 Created attachment 452937 [fast-cq] Patch 1845004 4 ews-feeder 2022-02-22 22:02:27 -0800 Committed r290348 (247666@main): <https://commits.webkit.org/247666@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452937. 1845005 5 webkit-bug-importer 2022-02-22 22:03:17 -0800 <rdar://problem/89336944> 1845420 6 jenner 2022-02-23 16:39:40 -0800 Reverted r290348 for reason: Broke a test, slowing down EWS. Committed r290399 (247711@trunk): <https://commits.webkit.org/247711@trunk> 1845425 7 Morningstar 2022-02-23 16:49:35 -0800 Robert reverted r290348 for me as I do not have committer status yet. https://bugs.webkit.org/show_bug.cgi?id=237116 Change seems to have broken "lastConsoleMessage" As it no longer sees the warning. 1845470 8 darin 2022-02-23 17:56:45 -0800 Turns out there is a debugging feature, Document::setConsoleMessageListener, used for regression tests, that only works with messages sent to the console client through the document. And there was a test depending on using this mechanism to see the console messages from startListeningForDeviceOrientationIfNecessary and startListeningForDeviceMotionIfNecessary. Outside of the tests, there was nothing wrong with this, but it broke the tests. Sadly this means that we have to replace Document::setConsoleMessageListener with a better testing mechanism or keep these messages flowing through the document. My fault for suggesting that we didn’t need to send the messages through the document. Turns out not to be true for this exotic test-only reason. 1845631 9 darin 2022-02-24 09:12:25 -0800 I’ll do this. 452896 2022-02-22 13:08:36 -0800 2022-02-22 15:59:16 -0800 Patch bug-237047-20220222220834.patch text/plain 5241 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI1NWJlYTg5MWI5ZGU2 OGZlMjA4MmQ4YTZjNDE4OTIwMDQ1MjU5Yi4uNjk1N2YzMzBiMDM4OGVjN2FmNmFmOWEzY2QzNjE1 YzY1YjcxMTdhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIyICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3JlYXRlIGEgRE9NV2luZG93Ojpw cmludFdhcm5pbmdNZXNzYWdlIG1ldGhvZCBhbmQgc3RhcnQgdXNpbmcgaXQgaW4gRE9NV2luZG93 LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3 MDQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw YWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmNsb3NlKToK KyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6d2Via2l0UmVxdWVzdEFuaW1hdGlvbkZyYW1l KToKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6c3RhcnRMaXN0ZW5pbmdGb3JEZXZpY2VP cmllbnRhdGlvbklmTmVjZXNzYXJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6c3Rh cnRMaXN0ZW5pbmdGb3JEZXZpY2VNb3Rpb25JZk5lY2Vzc2FyeSk6CisgICAgICAgIChXZWJDb3Jl OjpET01XaW5kb3c6OnByaW50Q29uc29sZU1lc3NhZ2UgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6RE9NV2luZG93OjpwcmludEVycm9yTWVzc2FnZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpET01XaW5kb3c6OnByaW50V2FybmluZ01lc3NhZ2UgY29uc3QpOgorICAgICAgICAqIHBhZ2Uv RE9NV2luZG93Lmg6CisKIDIwMjItMDItMjIgIFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4K IAogICAgICAgICBSZS1zdHlsZSBQREYuanMgZm9ybSBmaWVsZHMgdG8gbWF0Y2ggUERGS2l0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKaW5kZXggNTE0NzUwN2Q2YTA0YmZjYjJiNThmYTdhNjll ZmYwY2U3MjRjOTFmNS4uZjA0OTY1ZThjYTBmMTU0NjUzM2U4ODU3YWY3ZWU2MmFmNzQzYzgyYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcApAQCAtMTA2Niw3ICsxMDY2LDcgQEAgdm9pZCBE T01XaW5kb3c6OmNsb3NlKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCEocGFnZS0+b3Bl bmVkQnlET00oKSB8fCBwYWdlLT5iYWNrRm9yd2FyZCgpLmNvdW50KCkgPD0gMSkpIHsKLSAgICAg ICAgY29uc29sZSgpLT5hZGRNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OkpTLCBNZXNzYWdlTGV2ZWw6 Oldhcm5pbmcsICJDYW4ndCBjbG9zZSB0aGUgd2luZG93IHNpbmNlIGl0IHdhcyBub3Qgb3BlbmVk IGJ5IEphdmFTY3JpcHQiX3MpOworICAgICAgICBwcmludFdhcm5pbmdNZXNzYWdlKCJDYW4ndCBj bG9zZSB0aGUgd2luZG93IHNpbmNlIGl0IHdhcyBub3Qgb3BlbmVkIGJ5IEphdmFTY3JpcHQiX3Mp OwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xODc0LDggKzE4NzQsOCBAQCBpbnQgRE9N V2luZG93OjpyZXF1ZXN0QW5pbWF0aW9uRnJhbWUoUmVmPFJlcXVlc3RBbmltYXRpb25GcmFtZUNh bGxiYWNrPiYmIGNhbGxiYQogaW50IERPTVdpbmRvdzo6d2Via2l0UmVxdWVzdEFuaW1hdGlvbkZy YW1lKFJlZjxSZXF1ZXN0QW5pbWF0aW9uRnJhbWVDYWxsYmFjaz4mJiBjYWxsYmFjaykKIHsKICAg ICBzdGF0aWMgYm9vbCBmaXJzdFRpbWUgPSB0cnVlOwotICAgIGlmIChmaXJzdFRpbWUgJiYgZG9j dW1lbnQoKSkgewotICAgICAgICBkb2N1bWVudCgpLT5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdl U291cmNlOjpKUywgTWVzc2FnZUxldmVsOjpXYXJuaW5nLCAid2Via2l0UmVxdWVzdEFuaW1hdGlv bkZyYW1lKCkgaXMgZGVwcmVjYXRlZCBhbmQgd2lsbCBiZSByZW1vdmVkLiBQbGVhc2UgdXNlIHJl cXVlc3RBbmltYXRpb25GcmFtZSgpIGluc3RlYWQuIl9zKTsKKyAgICBpZiAoZmlyc3RUaW1lKSB7 CisgICAgICAgIHByaW50V2FybmluZ01lc3NhZ2UoIndlYmtpdFJlcXVlc3RBbmltYXRpb25GcmFt ZSgpIGlzIGRlcHJlY2F0ZWQgYW5kIHdpbGwgYmUgcmVtb3ZlZC4gUGxlYXNlIHVzZSByZXF1ZXN0 QW5pbWF0aW9uRnJhbWUoKSBpbnN0ZWFkLiJfcyk7CiAgICAgICAgIGZpcnN0VGltZSA9IGZhbHNl OwogICAgIH0KICAgICByZXR1cm4gcmVxdWVzdEFuaW1hdGlvbkZyYW1lKFdURk1vdmUoY2FsbGJh Y2spKTsKQEAgLTIxMTAsOCArMjExMCw3IEBAIHZvaWQgRE9NV2luZG93OjpzdGFydExpc3Rlbmlu Z0ZvckRldmljZU9yaWVudGF0aW9uSWZOZWNlc3NhcnkoKQogCiAgICAgU3RyaW5nIGlubmVyTWVz c2FnZTsKICAgICBpZiAoIWlzQWxsb3dlZFRvVXNlRGV2aWNlT3JpZW50YXRpb24oaW5uZXJNZXNz YWdlKSB8fCAhaGFzUGVybWlzc2lvblRvUmVjZWl2ZURldmljZU1vdGlvbk9yT3JpZW50YXRpb25F dmVudHMoaW5uZXJNZXNzYWdlKSkgewotICAgICAgICBpZiAoUmVmUHRyIGRvY3VtZW50ID0gdGhp cy0+ZG9jdW1lbnQoKSkKLSAgICAgICAgICAgIGRvY3VtZW50LT5hZGRDb25zb2xlTWVzc2FnZShN ZXNzYWdlU291cmNlOjpKUywgTWVzc2FnZUxldmVsOjpXYXJuaW5nLCBtYWtlU3RyaW5nKCJObyBk ZXZpY2Ugb3JpZW50YXRpb24gZXZlbnRzIHdpbGwgYmUgZmlyZWQsIHJlYXNvbjogIiwgaW5uZXJN ZXNzYWdlLCAiLiIpKTsKKyAgICAgICAgcHJpbnRXYXJuaW5nTWVzc2FnZShtYWtlU3RyaW5nKCJO byBkZXZpY2Ugb3JpZW50YXRpb24gZXZlbnRzIHdpbGwgYmUgZmlyZWQsIHJlYXNvbjogIiwgaW5u ZXJNZXNzYWdlLCAiLiIpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMjEzOSw4ICsy MTM4LDcgQEAgdm9pZCBET01XaW5kb3c6OnN0YXJ0TGlzdGVuaW5nRm9yRGV2aWNlTW90aW9uSWZO ZWNlc3NhcnkoKQogICAgIFN0cmluZyBpbm5lck1lc3NhZ2U7CiAgICAgaWYgKCFpc0FsbG93ZWRU b1VzZURldmljZU1vdGlvbihpbm5lck1lc3NhZ2UpIHx8ICFoYXNQZXJtaXNzaW9uVG9SZWNlaXZl RGV2aWNlTW90aW9uT3JPcmllbnRhdGlvbkV2ZW50cyhpbm5lck1lc3NhZ2UpKSB7CiAgICAgICAg IGZhaWxlZFRvUmVnaXN0ZXJEZXZpY2VNb3Rpb25FdmVudExpc3RlbmVyKCk7Ci0gICAgICAgIGlm IChSZWZQdHIgZG9jdW1lbnQgPSB0aGlzLT5kb2N1bWVudCgpKQotICAgICAgICAgICAgZG9jdW1l bnQtPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OkpTLCBNZXNzYWdlTGV2ZWw6Oldh cm5pbmcsIG1ha2VTdHJpbmcoIk5vIGRldmljZSBtb3Rpb24gZXZlbnRzIHdpbGwgYmUgZmlyZWQs IHJlYXNvbjogIiwgaW5uZXJNZXNzYWdlLCAiLiIpKTsKKyAgICAgICAgcHJpbnRXYXJuaW5nTWVz c2FnZShtYWtlU3RyaW5nKCJObyBkZXZpY2UgbW90aW9uIGV2ZW50cyB3aWxsIGJlIGZpcmVkLCBy ZWFzb246ICIsIGlubmVyTWVzc2FnZSwgIi4iKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK QEAgLTI0MjgsMTMgKzI0MjYsMjMgQEAgdm9pZCBET01XaW5kb3c6OnNldExvY2F0aW9uKERPTVdp bmRvdyYgYWN0aXZlV2luZG93LCBjb25zdCBVUkwmIGNvbXBsZXRlZFVSTCwgU2UKICAgICAgICAg bG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QpOwogfQogCi12b2lkIERPTVdpbmRvdzo6 cHJpbnRFcnJvck1lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdlKSBjb25zdAordm9pZCBET01X aW5kb3c6OnByaW50Q29uc29sZU1lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCBNZXNzYWdl TGV2ZWwgbGV2ZWwpIGNvbnN0CiB7CiAgICAgaWYgKG1lc3NhZ2UuaXNFbXB0eSgpKQogICAgICAg ICByZXR1cm47CiAKICAgICBpZiAoUGFnZUNvbnNvbGVDbGllbnQqIHBhZ2VDb25zb2xlID0gY29u c29sZSgpKQotICAgICAgICBwYWdlQ29uc29sZS0+YWRkTWVzc2FnZShNZXNzYWdlU291cmNlOjpK UywgTWVzc2FnZUxldmVsOjpFcnJvciwgbWVzc2FnZSk7CisgICAgICAgIHBhZ2VDb25zb2xlLT5h ZGRNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OkpTLCBsZXZlbCwgbWVzc2FnZSk7Cit9CisKK3ZvaWQg RE9NV2luZG93OjpwcmludEVycm9yTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UpIGNvbnN0 Cit7CisgICAgcHJpbnRDb25zb2xlTWVzc2FnZShtZXNzYWdlLCBNZXNzYWdlTGV2ZWw6OkVycm9y KTsKK30KKwordm9pZCBET01XaW5kb3c6OnByaW50V2FybmluZ01lc3NhZ2UoY29uc3QgU3RyaW5n JiBtZXNzYWdlKSBjb25zdAoreworICAgIHByaW50Q29uc29sZU1lc3NhZ2UobWVzc2FnZSwgTWVz c2FnZUxldmVsOjpXYXJuaW5nKTsKIH0KIAogU3RyaW5nIERPTVdpbmRvdzo6Y3Jvc3NEb21haW5B Y2Nlc3NFcnJvck1lc3NhZ2UoY29uc3QgRE9NV2luZG93JiBhY3RpdmVXaW5kb3csIEluY2x1ZGVU YXJnZXRPcmlnaW4gaW5jbHVkZVRhcmdldE9yaWdpbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRE9NV2luZG93LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5oCmlu ZGV4IGZlMWNhMDAxNzEyMjBkMmZlNzY3NTY1NWNiYzFiMTk2OGVkMGVmYmMuLmNiNzk4M2UwZDcz ODRkYTRhYTFiZTA4ZWFmYmZjZTIyMTBkOTQzMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRE9NV2luZG93LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaApA QCAtMjY4LDcgKzI2OCw5IEBAIHB1YmxpYzoKIAogICAgIFBhZ2VDb25zb2xlQ2xpZW50KiBjb25z b2xlKCkgY29uc3Q7CiAKKyAgICB2b2lkIHByaW50Q29uc29sZU1lc3NhZ2UoY29uc3QgU3RyaW5n JiwgTWVzc2FnZUxldmVsKSBjb25zdDsKICAgICB2b2lkIHByaW50RXJyb3JNZXNzYWdlKGNvbnN0 IFN0cmluZyYpIGNvbnN0OworICAgIHZvaWQgcHJpbnRXYXJuaW5nTWVzc2FnZShjb25zdCBTdHJp bmcmKSBjb25zdDsKIAogICAgIFN0cmluZyBjcm9zc0RvbWFpbkFjY2Vzc0Vycm9yTWVzc2FnZShj b25zdCBET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgSW5jbHVkZVRhcmdldE9yaWdpbik7CiAK 452937 2022-02-22 21:58:40 -0800 2022-02-22 22:02:28 -0800 [fast-cq] Patch bug-237047-20220223065839.patch text/plain 5268 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGJjZWUxYTYwMzAwYzMz YzMzMzM1Y2E1N2ZlOTY4ZTQ5Y2MzNGFmNy4uNzJkOGFiYjAzY2Y2ODMwZTAwYmEwOTAwZmQwM2Rj MDgxYWU3NjA5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIyICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3JlYXRlIGEgRE9NV2luZG93Ojpw cmludFdhcm5pbmdNZXNzYWdlIG1ldGhvZCBhbmQgc3RhcnQgdXNpbmcgaXQgaW4gRE9NV2luZG93 LmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3 MDQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBwYWdl L0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmNsb3NlKToKKyAg ICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6d2Via2l0UmVxdWVzdEFuaW1hdGlvbkZyYW1lKToK KyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6c3RhcnRMaXN0ZW5pbmdGb3JEZXZpY2VPcmll bnRhdGlvbklmTmVjZXNzYXJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6c3RhcnRM aXN0ZW5pbmdGb3JEZXZpY2VNb3Rpb25JZk5lY2Vzc2FyeSk6CisgICAgICAgIChXZWJDb3JlOjpE T01XaW5kb3c6OnByaW50Q29uc29sZU1lc3NhZ2UgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 RE9NV2luZG93OjpwcmludEVycm9yTWVzc2FnZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpE T01XaW5kb3c6OnByaW50V2FybmluZ01lc3NhZ2UgY29uc3QpOgorICAgICAgICAqIHBhZ2UvRE9N V2luZG93Lmg6CisKIDIwMjItMDItMjIgIEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5j b20+CiAKICAgICAgICAgbnVsbCBwdHIgZGVyZWYgdmlhIFdlYlhSU3lzdGVtOjpyZXF1ZXN0U2Vz c2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4IDUxNDc1MDdkNmEwNGJmY2IyYjU4 ZmE3YTY5ZWZmMGNlNzI0YzkxZjUuLmYwNDk2NWU4Y2EwZjE1NDY1MzNlODg1N2FmN2VlNjJhZjc0 M2M4MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTEwNjYsNyArMTA2Niw3IEBA IHZvaWQgRE9NV2luZG93OjpjbG9zZSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmICghKHBh Z2UtPm9wZW5lZEJ5RE9NKCkgfHwgcGFnZS0+YmFja0ZvcndhcmQoKS5jb3VudCgpIDw9IDEpKSB7 Ci0gICAgICAgIGNvbnNvbGUoKS0+YWRkTWVzc2FnZShNZXNzYWdlU291cmNlOjpKUywgTWVzc2Fn ZUxldmVsOjpXYXJuaW5nLCAiQ2FuJ3QgY2xvc2UgdGhlIHdpbmRvdyBzaW5jZSBpdCB3YXMgbm90 IG9wZW5lZCBieSBKYXZhU2NyaXB0Il9zKTsKKyAgICAgICAgcHJpbnRXYXJuaW5nTWVzc2FnZSgi Q2FuJ3QgY2xvc2UgdGhlIHdpbmRvdyBzaW5jZSBpdCB3YXMgbm90IG9wZW5lZCBieSBKYXZhU2Ny aXB0Il9zKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTg3NCw4ICsxODc0LDggQEAg aW50IERPTVdpbmRvdzo6cmVxdWVzdEFuaW1hdGlvbkZyYW1lKFJlZjxSZXF1ZXN0QW5pbWF0aW9u RnJhbWVDYWxsYmFjaz4mJiBjYWxsYmEKIGludCBET01XaW5kb3c6OndlYmtpdFJlcXVlc3RBbmlt YXRpb25GcmFtZShSZWY8UmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2s+JiYgY2FsbGJhY2sp CiB7CiAgICAgc3RhdGljIGJvb2wgZmlyc3RUaW1lID0gdHJ1ZTsKLSAgICBpZiAoZmlyc3RUaW1l ICYmIGRvY3VtZW50KCkpIHsKLSAgICAgICAgZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2Uo TWVzc2FnZVNvdXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6V2FybmluZywgIndlYmtpdFJlcXVlc3RB bmltYXRpb25GcmFtZSgpIGlzIGRlcHJlY2F0ZWQgYW5kIHdpbGwgYmUgcmVtb3ZlZC4gUGxlYXNl IHVzZSByZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKSBpbnN0ZWFkLiJfcyk7CisgICAgaWYgKGZpcnN0 VGltZSkgeworICAgICAgICBwcmludFdhcm5pbmdNZXNzYWdlKCJ3ZWJraXRSZXF1ZXN0QW5pbWF0 aW9uRnJhbWUoKSBpcyBkZXByZWNhdGVkIGFuZCB3aWxsIGJlIHJlbW92ZWQuIFBsZWFzZSB1c2Ug cmVxdWVzdEFuaW1hdGlvbkZyYW1lKCkgaW5zdGVhZC4iX3MpOwogICAgICAgICBmaXJzdFRpbWUg PSBmYWxzZTsKICAgICB9CiAgICAgcmV0dXJuIHJlcXVlc3RBbmltYXRpb25GcmFtZShXVEZNb3Zl KGNhbGxiYWNrKSk7CkBAIC0yMTEwLDggKzIxMTAsNyBAQCB2b2lkIERPTVdpbmRvdzo6c3RhcnRM aXN0ZW5pbmdGb3JEZXZpY2VPcmllbnRhdGlvbklmTmVjZXNzYXJ5KCkKIAogICAgIFN0cmluZyBp bm5lck1lc3NhZ2U7CiAgICAgaWYgKCFpc0FsbG93ZWRUb1VzZURldmljZU9yaWVudGF0aW9uKGlu bmVyTWVzc2FnZSkgfHwgIWhhc1Blcm1pc3Npb25Ub1JlY2VpdmVEZXZpY2VNb3Rpb25Pck9yaWVu dGF0aW9uRXZlbnRzKGlubmVyTWVzc2FnZSkpIHsKLSAgICAgICAgaWYgKFJlZlB0ciBkb2N1bWVu dCA9IHRoaXMtPmRvY3VtZW50KCkpCi0gICAgICAgICAgICBkb2N1bWVudC0+YWRkQ29uc29sZU1l c3NhZ2UoTWVzc2FnZVNvdXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6V2FybmluZywgbWFrZVN0cmlu ZygiTm8gZGV2aWNlIG9yaWVudGF0aW9uIGV2ZW50cyB3aWxsIGJlIGZpcmVkLCByZWFzb246ICIs IGlubmVyTWVzc2FnZSwgIi4iKSk7CisgICAgICAgIHByaW50V2FybmluZ01lc3NhZ2UobWFrZVN0 cmluZygiTm8gZGV2aWNlIG9yaWVudGF0aW9uIGV2ZW50cyB3aWxsIGJlIGZpcmVkLCByZWFzb246 ICIsIGlubmVyTWVzc2FnZSwgIi4iKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTIx MzksOCArMjEzOCw3IEBAIHZvaWQgRE9NV2luZG93OjpzdGFydExpc3RlbmluZ0ZvckRldmljZU1v dGlvbklmTmVjZXNzYXJ5KCkKICAgICBTdHJpbmcgaW5uZXJNZXNzYWdlOwogICAgIGlmICghaXNB bGxvd2VkVG9Vc2VEZXZpY2VNb3Rpb24oaW5uZXJNZXNzYWdlKSB8fCAhaGFzUGVybWlzc2lvblRv UmVjZWl2ZURldmljZU1vdGlvbk9yT3JpZW50YXRpb25FdmVudHMoaW5uZXJNZXNzYWdlKSkgewog ICAgICAgICBmYWlsZWRUb1JlZ2lzdGVyRGV2aWNlTW90aW9uRXZlbnRMaXN0ZW5lcigpOwotICAg ICAgICBpZiAoUmVmUHRyIGRvY3VtZW50ID0gdGhpcy0+ZG9jdW1lbnQoKSkKLSAgICAgICAgICAg IGRvY3VtZW50LT5hZGRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpKUywgTWVzc2FnZUxl dmVsOjpXYXJuaW5nLCBtYWtlU3RyaW5nKCJObyBkZXZpY2UgbW90aW9uIGV2ZW50cyB3aWxsIGJl IGZpcmVkLCByZWFzb246ICIsIGlubmVyTWVzc2FnZSwgIi4iKSk7CisgICAgICAgIHByaW50V2Fy bmluZ01lc3NhZ2UobWFrZVN0cmluZygiTm8gZGV2aWNlIG1vdGlvbiBldmVudHMgd2lsbCBiZSBm aXJlZCwgcmVhc29uOiAiLCBpbm5lck1lc3NhZ2UsICIuIikpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC0yNDI4LDEzICsyNDI2LDIzIEBAIHZvaWQgRE9NV2luZG93OjpzZXRMb2NhdGlv bihET01XaW5kb3cmIGFjdGl2ZVdpbmRvdywgY29uc3QgVVJMJiBjb21wbGV0ZWRVUkwsIFNlCiAg ICAgICAgIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0KTsKIH0KIAotdm9pZCBET01X aW5kb3c6OnByaW50RXJyb3JNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkgY29uc3QKK3Zv aWQgRE9NV2luZG93OjpwcmludENvbnNvbGVNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwg TWVzc2FnZUxldmVsIGxldmVsKSBjb25zdAogewogICAgIGlmIChtZXNzYWdlLmlzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKFBhZ2VDb25zb2xlQ2xpZW50KiBwYWdlQ29uc29s ZSA9IGNvbnNvbGUoKSkKLSAgICAgICAgcGFnZUNvbnNvbGUtPmFkZE1lc3NhZ2UoTWVzc2FnZVNv dXJjZTo6SlMsIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIG1lc3NhZ2UpOworICAgICAgICBwYWdlQ29u c29sZS0+YWRkTWVzc2FnZShNZXNzYWdlU291cmNlOjpKUywgbGV2ZWwsIG1lc3NhZ2UpOworfQor Cit2b2lkIERPTVdpbmRvdzo6cHJpbnRFcnJvck1lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdl KSBjb25zdAoreworICAgIHByaW50Q29uc29sZU1lc3NhZ2UobWVzc2FnZSwgTWVzc2FnZUxldmVs OjpFcnJvcik7Cit9CisKK3ZvaWQgRE9NV2luZG93OjpwcmludFdhcm5pbmdNZXNzYWdlKGNvbnN0 IFN0cmluZyYgbWVzc2FnZSkgY29uc3QKK3sKKyAgICBwcmludENvbnNvbGVNZXNzYWdlKG1lc3Nh Z2UsIE1lc3NhZ2VMZXZlbDo6V2FybmluZyk7CiB9CiAKIFN0cmluZyBET01XaW5kb3c6OmNyb3Nz RG9tYWluQWNjZXNzRXJyb3JNZXNzYWdlKGNvbnN0IERPTVdpbmRvdyYgYWN0aXZlV2luZG93LCBJ bmNsdWRlVGFyZ2V0T3JpZ2luIGluY2x1ZGVUYXJnZXRPcmlnaW4pCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5k b3cuaAppbmRleCBmZTFjYTAwMTcxMjIwZDJmZTc2NzU2NTVjYmMxYjE5NjhlZDBlZmJjLi42ZGUz ODE4OWUwMDUwMzcwNWY0NTVmNDMwZjk1NzYxMDA2M2Q5OGIzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2lu ZG93LmgKQEAgLTQ0MCw2ICs0NDAsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgZGVjcmVtZW50R2Ft ZXBhZEV2ZW50TGlzdGVuZXJDb3VudCgpOwogI2VuZGlmCiAKKyAgICB2b2lkIHByaW50Q29uc29s ZU1lc3NhZ2UoY29uc3QgU3RyaW5nJiwgTWVzc2FnZUxldmVsKSBjb25zdDsKKyAgICB2b2lkIHBy aW50V2FybmluZ01lc3NhZ2UoY29uc3QgU3RyaW5nJikgY29uc3Q7CisKICAgICBib29sIG1fc2hv dWxkUHJpbnRXaGVuRmluaXNoZWRMb2FkaW5nIHsgZmFsc2UgfTsKICAgICBib29sIG1fc3VzcGVu ZGVkRm9yRG9jdW1lbnRTdXNwZW5zaW9uIHsgZmFsc2UgfTsKICAgICBib29sIG1faXNTdXNwZW5k aW5nT2JzZXJ2ZXJzIHsgZmFsc2UgfTsK