108004 2013-01-26 00:08:49 -0800 [chromium] WebConsoleMessage is missing LevelDebug (chromium bug 172416) 2013-01-30 01:40:22 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 108123 0 kevinday webkit-unassigned abarth dglazkov fishd jamesr jochen mkwst mkwst+watchlist pfeldman tkent+wkapi webkit.review.bot oldest_to_newest 817150 0 kevinday 2013-01-26 00:08:49 -0800 http://code.google.com/p/chromium/issues/detail?id=172416 console.debug() causes a NOTREACHED() assert in content::RenderViewImpl::didAddMessageToConsole. WebCore::Console:debug calls Webcore::internalAddMessage with a MessageLevel of DebugMessageLevel. This makes it through to Webkit::ChromeClientImpl::addMessageToConsole, which casts it from WebCore::MessageLevel to WebConsoleMessage::Level. WebCore::MessageLevel (third_party/WebKit/Source/WebCore/page/ConsoleTypes.h) is an enum of 5 levels: enum MessageLevel { TipMessageLevel, LogMessageLevel, WarningMessageLevel, ErrorMessageLevel, DebugMessageLevel }; WebConsoleMessage::Level (third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h) is an enum of only 4 levels: enum Level { LevelTip, LevelLog, LevelWarning, LevelError }; 817153 1 184858 kevinday 2013-01-26 00:17:34 -0800 Created attachment 184858 Patch 817155 2 webkit.review.bot 2013-01-26 00:23:55 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 817156 3 184858 abarth 2013-01-26 00:26:24 -0800 Comment on attachment 184858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184858&action=review > Source/WebKit/chromium/public/WebConsoleMessage.h:44 > - LevelError > + LevelError, > + LevelDebug Do we have entries in AssertMachingEnums for these? 817158 4 mkwst 2013-01-26 00:42:43 -0800 We do not. We should. Kevin, would you mind adding the necessary assertions to Source/WebKit/chromium/src/AssertMatchingEnums.cpp (and, if you're feeling generous, the other ports as well?) as part of this patch? 817159 5 kevinday 2013-01-26 00:44:01 -0800 (In reply to comment #3) > (From update of attachment 184858 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=184858&action=review > > > Source/WebKit/chromium/public/WebConsoleMessage.h:44 > > - LevelError > > + LevelError, > > + LevelDebug > > Do we have entries in AssertMachingEnums for these? Source/WebKit/chromium/src/AssertMatchingEnums.cpp makes no mention of message levels, or anything to do with the console. It's also probably safe to add to this enum without ensuring it matches, since out-of-bounds enum values are already getting passed into the console renderer every time console.debug is being called. Without debug assertions it's getting silently converted to logging::LOG_VERBOSE, so this ends up being a no-op and just documenting better what's actually happening. I'm happy to add a test if you guys want though? 817160 6 kevinday 2013-01-26 00:45:17 -0800 (In reply to comment #4) > We do not. We should. > > Kevin, would you mind adding the necessary assertions to Source/WebKit/chromium/src/AssertMatchingEnums.cpp (and, if you're feeling generous, the other ports as well?) as part of this patch? Sure thing, I will update the patch in the morning after I have a chance to test it. 817161 7 mkwst 2013-01-26 00:53:25 -0800 (In reply to comment #6) > (In reply to comment #4) > > We do not. We should. > > > > Kevin, would you mind adding the necessary assertions to Source/WebKit/chromium/src/AssertMatchingEnums.cpp (and, if you're feeling generous, the other ports as well?) as part of this patch? > > Sure thing, I will update the patch in the morning after I have a chance to test it. If dealing with the other ports ends up being more work than you signed up for (especially if they also don't have the debug-level enum), I'll take care of them. I do think that adding asserts to the Chromium port should be part of this patch, however, so I appreciate you looking into it. Thank you! 817217 8 184872 kevinday 2013-01-26 10:52:52 -0800 Created attachment 184872 Patch 817218 9 kevinday 2013-01-26 10:54:30 -0800 I checked for similar problems in other platforms: blackberry: The only place MessageLevel is referenced is in ChromeClientBlackBerry::addMessageToConsole, where that parameter is completely ignored. There is no blackberry specific enum for message levels. Blackberry also doesn't have an AssertMatchingEnums. chromium: Updated AssertMatchingEnums.cpp to test these enums. efl: The only place MessageLevel is referenced is in ChromeClientEfl::addMessageToConsole, where that parameter is completely ignored. There is no efl specific enum for message levels. efl does have an AssertMatchingEnums, but there is no webkit levels enum to add to it. gtk: exactly the same as efl mac: The only place MessageLevel is referenced is in WebChromeClient::addMessageToConsole. It is actually used here, but there is no matching enum - the only thing that's done with it is to call stringForMessageLevel. qt: exactly the same as efl, except that it has no AssertMatchingEnums win: exactly the same as efl, except that it has no AssertMatchingEnums wince: exactly the same as efl, except that it has no AssertMatchingEnums wx: MessageLevel is used in ChromeClientWx::addMessageToConsole, and is cast to static_cast<WebViewConsoleMessageLevel>(level) similar to how Chromium handles this. WebViewConsoleMessageLevel is also missing a DebugMessageLevel, which is an easy fix. I don't have a wx development environment set up though, so I'm not sure if anything higher up would need to be patched to allow for this. Nothing in WebKit/wx actually ever uses the level. It's stuffed into an m_level variable inside WebViewConsoleMessageEvent, but nothing inside WebKit uses that. I don't know if this is safe to change or not. TL;DR: Everything except wx looks okay, but I don't have enough familiarity with wx to know if it's safe to change. I updated my patch to include an AssertMatchingEnums test for chromium. 817401 10 184872 jochen 2013-01-27 12:41:10 -0800 Comment on attachment 184872 Patch do you have a chromium patch ready as well? 817403 11 jochen 2013-01-27 12:42:01 -0800 *** Bug 108039 has been marked as a duplicate of this bug. *** 817404 12 jochen 2013-01-27 12:42:41 -0800 (In reply to comment #10) > (From update of attachment 184872 [details]) > do you have a chromium patch ready as well? (if not, I have https://codereview.chromium.org/12091015) 817405 13 184872 abarth 2013-01-27 12:44:22 -0800 Comment on attachment 184872 Patch API change LGTM 817414 14 kevinday 2013-01-27 13:48:49 -0800 (In reply to comment #12) > (In reply to comment #10) > > (From update of attachment 184872 [details] [details]) > > do you have a chromium patch ready as well? > > (if not, I have https://codereview.chromium.org/12091015) That is basically identical to my unsubmitted patch, so feel free to use that. 818067 15 184872 webkit.review.bot 2013-01-28 13:49:15 -0800 Comment on attachment 184872 Patch Clearing flags on attachment: 184872 Committed r141006: <http://trac.webkit.org/changeset/141006> 818068 16 webkit.review.bot 2013-01-28 13:49:19 -0800 All reviewed patches have been landed. Closing bug. 818196 17 webkit.review.bot 2013-01-28 15:38:57 -0800 Re-opened since this is blocked by bug 108123 819954 18 jochen 2013-01-30 01:40:22 -0800 http://trac.webkit.org/changeset/141234 184858 2013-01-26 00:17:34 -0800 2013-01-26 10:52:42 -0800 Patch bug-108004-20130126021424.patch text/plain 2518 kevinday U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwOTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDAwNGExMzBkY2ZkNjI3MDI3YzhhY2I4YWZkNTUzZTg2OWU0MzQxNmQuLmJjYmY4NWQ5ODQ4Njhm ZDA3YTA1ZTM1NWNjNTczNjhiMWI4OGRhMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTMtMDEtMjYgIEtldmluIERheSAgPGtldmluZGF5QGdtYWlsLmNv bT4KKworICAgICAgICBbY2hyb21pdW1dIFdlYkNvbnNvbGVNZXNzYWdlIGlzIG1pc3NpbmcgTGV2 ZWxEZWJ1ZyAoY2hyb21pdW0gYnVnIDE3MjQxNikKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODAwNAorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUu Y29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD0xNzI0MTYKKworICAgICAgICBjb25zb2xl LmRlYnVnIHRyaWdnZXJzIGEgTk9UUkVBQ0hFRCgpIGFzc2VydGF0aW9uIGluIENocm9taXVtLiBU aGlzCisgICAgICAgIGlzIGJlY2F1c2UgV2ViQ29yZTo6TWVzc2FnZUxldmVsIGNvbnRhaW5zIDUg bGV2ZWxzLCBpbmNsdWRpbmcgZGVidWcsCisgICAgICAgIHdoZXJlIFdlYkNvbnNvbGVNZXNzYWdl OjpMZXZlbCBpcyBtaXNzaW5nIGEgImRlYnVnIiBsZXZlbC4gQWRkIGEKKyAgICAgICAgV2ViQ29u c29sZU1lc3NhZ2U6OkxldmVsRGVidWcgc28gdGhhdCBpdCBjYW4gZ2V0IHBhc3NlZCB1cCB0byB0 aGUKKyAgICAgICAgcmVuZGVyZXIgZXZlbiBpZiBpdCBkb2Vzbid0IG1ha2UgdXNlIG9mIHRoYXQg bm93LiAKKworICAgICAgICBSZXF1aXJlcyBhbm90aGVyIHBhdGNoIHRvIGNocm9taXVtIGl0c2Vs ZiB0byBmaXggY2hyb21pdW0gYnVnIDE3MjQxNgorICAgICAgICBidXQgdGhpcyBpcyBhIHByZXJl cXVpc2l0ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHB1YmxpYy9XZWJDb25zb2xlTWVzc2FnZS5oOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUlt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OmFkZE1lc3NhZ2VUb0NvbnNv bGUpOgorCiAyMDEzLTAxLTI1ICBBbGV4YW5kcmUgRWxpYXMgIDxhZWxpYXNAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIENhbGwgRnJhbWVWaWV3Ojpjb250ZW50c1Jlc2l6ZWQoKSB3aGVuIHNldHRp bmcgZml4ZWQgbGF5b3V0IHNpemUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkNvbnNvbGVNZXNzYWdlLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJDb25zb2xlTWVzc2FnZS5oCmluZGV4IDY5MzgxNGMwZWJmOGQzM2M4MzBiZjliMzA4MDA0 YjNkNjU5NThiYTQuLjBiMWY1YTBlODk5ZDk4NTczZDhhN2ZlNjMzN2MwYzRmZjMzYmFhOGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnNvbGVNZXNzYWdl LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ29uc29sZU1lc3NhZ2Uu aApAQCAtNDAsNyArNDAsOCBAQCBzdHJ1Y3QgV2ViQ29uc29sZU1lc3NhZ2UgewogICAgICAgICBM ZXZlbFRpcCwKICAgICAgICAgTGV2ZWxMb2csCiAgICAgICAgIExldmVsV2FybmluZywKLSAgICAg ICAgTGV2ZWxFcnJvcgorICAgICAgICBMZXZlbEVycm9yLAorICAgICAgICBMZXZlbERlYnVnCiAg ICAgfTsKIAogICAgIExldmVsIGxldmVsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAKaW5kZXggNjBjMmUwZjQ2Mjc4MjdiYzE4ZDllNjZlOGZhYzRlYzE3OGQ0 ZDM3ZS4uNWJhZjA4ZWMyNzdkZmYxZGRiZDBmNWVhMmUxNGVkYmJiNzY3ZTY0YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC04MzcsNiArODM3LDkg QEAgdm9pZCBXZWJGcmFtZUltcGw6OmFkZE1lc3NhZ2VUb0NvbnNvbGUoY29uc3QgV2ViQ29uc29s ZU1lc3NhZ2UmIG1lc3NhZ2UpCiAgICAgY2FzZSBXZWJDb25zb2xlTWVzc2FnZTo6TGV2ZWxFcnJv cjoKICAgICAgICAgd2ViQ29yZU1lc3NhZ2VMZXZlbCA9IEVycm9yTWVzc2FnZUxldmVsOwogICAg ICAgICBicmVhazsKKyAgICBjYXNlIFdlYkNvbnNvbGVNZXNzYWdlOjpMZXZlbERlYnVnOgorICAg ICAgICB3ZWJDb3JlTWVzc2FnZUxldmVsID0gRGVidWdNZXNzYWdlTGV2ZWw7CisgICAgICAgIGJy ZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAg ICByZXR1cm47Cg== 184872 2013-01-26 10:52:52 -0800 2013-01-28 13:49:15 -0800 Patch bug-108004-20130126124940.patch text/plain 4002 kevinday U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwOTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDU1NWIyZGU1NDcyMTJhNjhiMjRkNTY5OWVhMmU0MjA3Zjg3Y2U1YWEuLjgyYjJiYTc1M2QxM2Zi YzBhYzJjZWYyZWRhMTYyMTljYjE0NTE0ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTMtMDEtMjYgIEtldmluIERheSAgPGtldmluZGF5QGdtYWlsLmNv bT4KKworICAgICAgICBbY2hyb21pdW1dIFdlYkNvbnNvbGVNZXNzYWdlIGlzIG1pc3NpbmcgTGV2 ZWxEZWJ1ZyAoY2hyb21pdW0gYnVnIDE3MjQxNikKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODAwNAorICAgICAgICBodHRwOi8vY29kZS5nb29nbGUu Y29tL3AvY2hyb21pdW0vaXNzdWVzL2RldGFpbD9pZD0xNzI0MTYKKworICAgICAgICBjb25zb2xl LmRlYnVnIHRyaWdnZXJzIGEgTk9UUkVBQ0hFRCgpIGFzc2VydGF0aW9uIGluIENocm9taXVtLiBU aGlzCisgICAgICAgIGlzIGJlY2F1c2UgV2ViQ29yZTo6TWVzc2FnZUxldmVsIGNvbnRhaW5zIDUg bGV2ZWxzLCBpbmNsdWRpbmcgZGVidWcsCisgICAgICAgIHdoZXJlIFdlYkNvbnNvbGVNZXNzYWdl OjpMZXZlbCBpcyBtaXNzaW5nIGEgImRlYnVnIiBsZXZlbC4gQWRkIGEKKyAgICAgICAgV2ViQ29u c29sZU1lc3NhZ2U6OkxldmVsRGVidWcgc28gdGhhdCBpdCBjYW4gZ2V0IHBhc3NlZCB1cCB0byB0 aGUKKyAgICAgICAgcmVuZGVyZXIgZXZlbiBpZiBpdCBkb2Vzbid0IG1ha2UgdXNlIG9mIHRoYXQg bm93LgorCisgICAgICAgIFJlcXVpcmVzIGFub3RoZXIgcGF0Y2ggdG8gY2hyb21pdW0gaXRzZWxm IHRvIGZpeCBjaHJvbWl1bSBidWcgMTcyNDE2CisgICAgICAgIGJ1dCB0aGlzIGlzIGEgcHJlcmVx dWlzaXRlLgorCisgICAgICAgIEFsc28gYWRkIGFuIGVudW0gY29tcGlsZSB0aW1lIGNoZWNrIHRv IEFzc2VydE1hdGNoaW5nRW51bXMuY3BwLAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkNvbnNvbGVNZXNzYWdlLmg6CisgICAgICAg ICogc3JjL0Fzc2VydE1hdGNoaW5nRW51bXMuY3BwOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUlt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OmFkZE1lc3NhZ2VUb0NvbnNv bGUpOgorCiAyMDEzLTAxLTI2ICBKYW1lcyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBbY2hyb21pdW1dIEV4cG9ydCBSZXNvdXJjZVJlcXVlc3QncyBwcmlvcml0 eSB0aHJvdWdoIFdlYlVSTFJlcXVlc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkNvbnNvbGVNZXNzYWdlLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJDb25zb2xlTWVzc2FnZS5oCmluZGV4IDY5MzgxNGMwZWJmOGQzM2M4MzBiZjliMzA4 MDA0YjNkNjU5NThiYTQuLjBiMWY1YTBlODk5ZDk4NTczZDhhN2ZlNjMzN2MwYzRmZjMzYmFhOGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbnNvbGVNZXNz YWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ29uc29sZU1lc3Nh Z2UuaApAQCAtNDAsNyArNDAsOCBAQCBzdHJ1Y3QgV2ViQ29uc29sZU1lc3NhZ2UgewogICAgICAg ICBMZXZlbFRpcCwKICAgICAgICAgTGV2ZWxMb2csCiAgICAgICAgIExldmVsV2FybmluZywKLSAg ICAgICAgTGV2ZWxFcnJvcgorICAgICAgICBMZXZlbEVycm9yLAorICAgICAgICBMZXZlbERlYnVn CiAgICAgfTsKIAogICAgIExldmVsIGxldmVsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAppbmRleCBmOTgyMDUzOWY3NWRhZjg4NDk2 Nzk3NGYyZmY3ZTViNTk4NmFkY2ZiLi5lM2M5OGQ2NTc2MTIzNGJjMjBiZWYwZGIyOWIyNzU5MTBh NmQ2ZWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRj aGluZ0VudW1zLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRj aGluZ0VudW1zLmNwcApAQCAtMTE1LDYgKzExNSw3IEBACiAjaW5jbHVkZSAiV2ViVGV4dENoZWNr aW5nVHlwZS5oIgogI2luY2x1ZGUgIldlYlZpZXcuaCIKICNpbmNsdWRlIDxwdWJsaWMvV2ViQ2xp cGJvYXJkLmg+CisjaW5jbHVkZSA8cHVibGljL1dlYkNvbnNvbGVNZXNzYWdlLmg+CiAjaW5jbHVk ZSA8cHVibGljL1dlYkZpbGVTeXN0ZW0uaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViRmlsdGVyT3Bl cmF0aW9uLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYk1lZGlhU3RyZWFtU291cmNlLmg+CkBAIC02 MzIsMyArNjMzLDkgQEAgQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJVUkxSZXF1ZXN0 OjpQcmlvcml0eUxvdywgUmVzb3VyY2VMb2FkUHJpb3JpdHlMb3cKIENPTVBJTEVfQVNTRVJUX01B VENISU5HX0VOVU0oV2ViVVJMUmVxdWVzdDo6UHJpb3JpdHlNZWRpdW0sIFJlc291cmNlTG9hZFBy aW9yaXR5TWVkaXVtKTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViVVJMUmVxdWVz dDo6UHJpb3JpdHlIaWdoLCBSZXNvdXJjZUxvYWRQcmlvcml0eUhpZ2gpOwogQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShXZWJVUkxSZXF1ZXN0OjpQcmlvcml0eVZlcnlIaWdoLCBSZXNvdXJj ZUxvYWRQcmlvcml0eVZlcnlIaWdoKTsKKworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShX ZWJDb25zb2xlTWVzc2FnZTo6TGV2ZWxUaXAsIFRpcE1lc3NhZ2VMZXZlbCk7CitDT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdlYkNvbnNvbGVNZXNzYWdlOjpMZXZlbExvZywgTG9nTWVzc2Fn ZUxldmVsKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQ29uc29sZU1lc3NhZ2U6 OkxldmVsV2FybmluZywgV2FybmluZ01lc3NhZ2VMZXZlbCk7CitDT01QSUxFX0FTU0VSVF9NQVRD SElOR19FTlVNKFdlYkNvbnNvbGVNZXNzYWdlOjpMZXZlbEVycm9yLCBFcnJvck1lc3NhZ2VMZXZl bCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYkNvbnNvbGVNZXNzYWdlOjpMZXZl bERlYnVnLCBEZWJ1Z01lc3NhZ2VMZXZlbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViRnJhbWVJbXBsLmNwcAppbmRleCA2MGMyZTBmNDYyNzgyN2JjMThkOWU2NmU4ZmFjNGVjMTc4 ZDRkMzdlLi41YmFmMDhlYzI3N2RmZjFkZGJkMGY1ZWEyZTE0ZWRiYmI3NjdlNjRjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTgzNyw2ICs4Mzcs OSBAQCB2b2lkIFdlYkZyYW1lSW1wbDo6YWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBXZWJDb25z b2xlTWVzc2FnZSYgbWVzc2FnZSkKICAgICBjYXNlIFdlYkNvbnNvbGVNZXNzYWdlOjpMZXZlbEVy cm9yOgogICAgICAgICB3ZWJDb3JlTWVzc2FnZUxldmVsID0gRXJyb3JNZXNzYWdlTGV2ZWw7CiAg ICAgICAgIGJyZWFrOworICAgIGNhc2UgV2ViQ29uc29sZU1lc3NhZ2U6OkxldmVsRGVidWc6Cisg ICAgICAgIHdlYkNvcmVNZXNzYWdlTGV2ZWwgPSBEZWJ1Z01lc3NhZ2VMZXZlbDsKKyAgICAgICAg YnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg ICAgIHJldHVybjsK