42516 2010-07-18 09:40:16 -0700 Add dumping of statusbar text to WebKitTestRunner 2010-07-18 10:03:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca mitz webkit.review.bot oldest_to_newest 252962 0 andersca 2010-07-18 09:40:16 -0700 Add dumping of statusbar text to WebKitTestRunner 252963 1 61902 andersca 2010-07-18 09:44:44 -0700 Created attachment 61902 Patch 252965 2 webkit.review.bot 2010-07-18 09:45:30 -0700 Attachment 61902 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h:70: Extra space between WKBundlePageSetStatusbarTextCallback and setStatusbarText [whitespace/declaration] [3] WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h:64: _setStatusbarText is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:202: InjectedBundlePage::_setStatusbarText is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 3 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 252967 3 61902 mitz 2010-07-18 09:51:47 -0700 Comment on attachment 61902 Patch > typedef void (*WKBundlePageAddMessageToConsoleCallback)(WKBundlePageRef page, WKStringRef message, uint32_t lineNumber, const void *clientInfo); Star on the wrong side of the space here. > +typedef void (*WKBundlePageSetStatusbarTextCallback)(WKBundlePageRef page, WKStringRef statusbarText, const void *clientInfo); and here > const void * clientInfo; and here > +void InjectedBundlePage::_setStatusbarText(WKBundlePageRef page, WKStringRef statusbarText, const void *clientInfo) and here > static void _addMessageToConsole(WKBundlePageRef page, WKStringRef message, uint32_t lineNumber, const void *clientInfo); and here > + static void _setStatusbarText(WKBundlePageRef page, WKStringRef statusbarText, const void *clientInfo); and here r=me if you fix the style issues. 252968 4 mitz 2010-07-18 09:59:52 -0700 (In reply to comment #3) > (From update of attachment 61902 [details]) > > typedef void (*WKBundlePageAddMessageToConsoleCallback)(WKBundlePageRef page, WKStringRef message, uint32_t lineNumber, const void *clientInfo); > > Star on the wrong side of the space here. I was wrong. CF-style is that the space comes before the star. r=me then. 252970 5 andersca 2010-07-18 10:03:17 -0700 Committed r63627: <http://trac.webkit.org/changeset/63627> 61902 2010-07-18 09:44:44 -0700 2010-07-18 09:51:46 -0700 Patch bug-42516-20100718094443.patch text/plain 12258 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZTY0Njc5OGFiNjNmZDAxMjkxMTE0N2UyZDc4MDFmZGNmMGUzMjdkZi4uOTRkYTg3MzkzNjQxOWVi ODBlZDFkMjRkZTlmMzZjMGU4NGNhNWJkYyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNy0xOCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBkdW1waW5nIG9mIHN0YXR1c2JhciB0ZXh0 IHRvIFdlYktpdFRlc3RSdW5uZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQyNTE2CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9jL1dLQnVuZGxlUGFnZS5oOgorICAgICAgICBBZGQgc2V0U3RhdHVzYmFyVGV4dCBjYWxs YmFjayB0byBXS0J1bmRsZVBhZ2VVSUNsaWVudC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpJbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudDo6c2V0U3RhdHVzYmFyVGV4dCk6CisgICAg ICAgIENhbGwgc2V0U3RhdHVzYmFyVGV4dC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuaDoKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkNocm9tZUNsaWVudDo6c2V0U3RhdHVzYmFyVGV4dCk6CisgICAgICAgIENhbGwgdGhlIGJ1 bmRsZSBwYWdlIFVJIGNsaWVudC4KKwogMjAxMC0wNy0xNyAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hY2llaiBTdGFjaG93aWFr LgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dL QnVuZGxlUGFnZS5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dL QnVuZGxlUGFnZS5oCmluZGV4IGUwZDM4NTM4NzUwZTNjNzMyMWIwN2Y4MTgwZWQ4NDk2ZTMxZDg0 ZGQuLmIxZjEwN2M5YmMyMDg5Y2U3ZjJiYTkzNDNkYWQyZmZjZTQwNTJmZDcgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaAor KysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdl LmgKQEAgLTYxLDExICs2MSwxMyBAQCB0eXBlZGVmIHN0cnVjdCBXS0J1bmRsZVBhZ2VMb2FkZXJD bGllbnQgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OwogCiAvLyBVSSBDbGllbnQKIHR5cGVkZWYg dm9pZCAoKldLQnVuZGxlUGFnZUFkZE1lc3NhZ2VUb0NvbnNvbGVDYWxsYmFjaykoV0tCdW5kbGVQ YWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIG1lc3NhZ2UsIHVpbnQzMl90IGxpbmVOdW1iZXIsIGNv bnN0IHZvaWQgKmNsaWVudEluZm8pOwordHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlU2V0U3Rh dHVzYmFyVGV4dENhbGxiYWNrKShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgc3Rh dHVzYmFyVGV4dCwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiAKIHN0cnVjdCBXS0J1bmRsZVBh Z2VVSUNsaWVudCB7CiAgICAgaW50ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uOwogICAgIGNvbnN0IHZvaWQgKiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xp ZW50SW5mbzsKICAgICBXS0J1bmRsZVBhZ2VBZGRNZXNzYWdlVG9Db25zb2xlQ2FsbGJhY2sgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGFkZE1lc3NhZ2VUb0NvbnNvbGU7CisgICAgV0tCdW5k bGVQYWdlU2V0U3RhdHVzYmFyVGV4dENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzZXRTdGF0dXNiYXJUZXh0OwogfTsKIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZVVJ Q2xpZW50IFdLQnVuZGxlUGFnZVVJQ2xpZW50OwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3BwIGIvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50 LmNwcAppbmRleCAyZjgyOTA0ZjI3YmMwMWMyYjU4YzM1ZTZjNDY0ODE0YzU5ZDVjNWExLi43MDQz MjJhYjYwMjA1NWEyMTU5N2JlYjRlM2ZmYTg0MWY1MGJkY2EwIDEwMDY0NAotLS0gYS9XZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQuY3Bw CisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBh Z2VVSUNsaWVudC5jcHAKQEAgLTUyLDQgKzUyLDEwIEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdl VUlDbGllbnQ6OmFkZE1lc3NhZ2VUb0NvbnNvbGUoV2ViUGFnZSogcGFnZSwgY29uc3QgU3RyaW5n CiAgICAgICAgIG1fY2xpZW50LmFkZE1lc3NhZ2VUb0NvbnNvbGUodG9SZWYocGFnZSksIHRvUmVm KG1lc3NhZ2UuaW1wbCgpKSwgbGluZU51bWJlciwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAK K3ZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlVUlDbGllbnQ6OnNldFN0YXR1c2JhclRleHQoV2ViUGFn ZSogcGFnZSwgY29uc3QgU3RyaW5nJiBzdGF0dXNiYXJUZXh0KQoreworICAgIGlmIChtX2NsaWVu dC5zZXRTdGF0dXNiYXJUZXh0KQorICAgICAgICBtX2NsaWVudC5zZXRTdGF0dXNiYXJUZXh0KHRv UmVmKHBhZ2UpLCB0b1JlZihzdGF0dXNiYXJUZXh0LmltcGwoKSksIG1fY2xpZW50LmNsaWVudElu Zm8pOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VVSUNsaWVudC5oIGIvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50 LmgKaW5kZXggNDVmNWZmNjY5NjQ1ZmU1OWIwZGVmZjlhYTgzYTExZGRmZDJhMmE0Ni4uZTAwMGQ5 N2Y5MjA2MTljOTFiNjk4Y2UxZGMzZmY5M2YyMjRlMjE2NCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJQ2xpZW50LmgKKysr IGIvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZVVJ Q2xpZW50LmgKQEAgLTQyLDYgKzQyLDcgQEAgcHVibGljOgogICAgIHZvaWQgaW5pdGlhbGl6ZShX S0J1bmRsZVBhZ2VVSUNsaWVudCopOwogCiAgICAgdm9pZCBhZGRNZXNzYWdlVG9Db25zb2xlKFdl YlBhZ2UqLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1lc3NhZ2UsIGludDMyX3QgbGluZU51bWJl cik7CisgICAgdm9pZCBzZXRTdGF0dXNiYXJUZXh0KFdlYlBhZ2UqLCBjb25zdCBXZWJDb3JlOjpT dHJpbmcmKTsKIAogcHJpdmF0ZToKICAgICBXS0J1bmRsZVBhZ2VVSUNsaWVudCBtX2NsaWVudDsK ZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNs aWVudC5jcHAKaW5kZXggMjZhZDAwMDNmNmU3Yzk2NzMyZjYyNWZlZjg4NzI1MzhmNTY0MzAxYi4u ODMyOGE2YTZjZmNjODExNWRkMzg1OTBlYTBhYmM0ZmQ2MDY0ZTM4ZSAxMDA2NDQKLS0tIGEvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKQEAg LTIzMCw4ICsyMzAsMTEgQEAgYm9vbCBXZWJDaHJvbWVDbGllbnQ6OnJ1bkphdmFTY3JpcHRQcm9t cHQoRnJhbWUqLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFMKICAgICByZXR1cm4gZmFs c2U7CiB9CiAKLXZvaWQgV2ViQ2hyb21lQ2xpZW50OjpzZXRTdGF0dXNiYXJUZXh0KGNvbnN0IFN0 cmluZyYpCit2b2lkIFdlYkNocm9tZUNsaWVudDo6c2V0U3RhdHVzYmFyVGV4dChjb25zdCBTdHJp bmcmIHN0YXR1c2JhclRleHQpCiB7CisgICAgLy8gTm90aWZ5IHRoZSBidW5kbGUgY2xpZW50Lgor ICAgIG1fcGFnZS0+aW5qZWN0ZWRCdW5kbGVVSUNsaWVudCgpLnNldFN0YXR1c2JhclRleHQobV9w YWdlLCBzdGF0dXNiYXJUZXh0KTsKKwogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRl eCA3Njg4NTFjZTBkNzY4NTEzNjBiODBkYmFlYWM4NDIyZmFmYjY1NWY0Li4yOGMwODkwMWFmMjkx ZGFmNDhiZDViMmRiZjcwZTZmOTllNGIyZjQxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTAt MDctMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgZHVtcGluZyBvZiBzdGF0 dXNiYXIgdGV4dCB0byBXZWJLaXRUZXN0UnVubmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjUxNgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwOgorICAgICAgICAoV1RSOjpJ bmplY3RlZEJ1bmRsZVBhZ2U6OkluamVjdGVkQnVuZGxlUGFnZSk6CisgICAgICAgIChXVFI6Oklu amVjdGVkQnVuZGxlUGFnZTo6X3NldFN0YXR1c2JhclRleHQpOgorICAgICAgICAoV1RSOjpJbmpl Y3RlZEJ1bmRsZVBhZ2U6OnNldFN0YXR1c2JhclRleHQpOgorICAgICAgICBEdW1wIHRoZSBzdGF0 dXNiYXIgdGV4dC4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv SW5qZWN0ZWRCdW5kbGVQYWdlLmg6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3Rl ZEJ1bmRsZS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OkxheW91dFRl c3RDb250cm9sbGVyOjpMYXlvdXRUZXN0Q29udHJvbGxlcik6CisgICAgICAgIEluaXRpYWxpemUg bV9kdW1wU3RhdHVzQ2FsbGJhY2tzIHRvIGZhbHNlLgorCisgICAgICAgIChXVFI6OmR1bXBTdGF0 dXNDYWxsYmFja3NDYWxsYmFjayk6CisgICAgICAgIEltcGxlbWVudCBKU0MgY2FsbGJhY2suCisK KyAgICAgICAgKFdUUjo6TGF5b3V0VGVzdENvbnRyb2xsZXI6OnN0YXRpY0Z1bmN0aW9ucyk6Cisg ICAgICAgIEFkZCBkdW1wU3RhdHVzQ2FsbGJhY2tzLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oOgorICAgICAgICAoV1RS OjpMYXlvdXRUZXN0Q29udHJvbGxlcjo6ZHVtcFN0YXR1c0NhbGxiYWNrcyk6CisgICAgICAgIChX VFI6OkxheW91dFRlc3RDb250cm9sbGVyOjpzZXREdW1wU3RhdHVzQ2FsbGJhY2tzKToKKyAgICAg ICAgQWRkIHNldHRlciBhbmQgZ2V0dGVyIGZvciBtX2R1bXBTdGF0dXNDYWxsYmFja3MuCisKIDIw MTAtMDctMTcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcCBi L1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGVQYWdlLmNwcAppbmRleCBiMjU0NDA1ODdjMzMxY2UzNDI2ZGUzZDk4NGEzZTA3NDBhZGRhNWM2 Li43NjM1MjM4OTg0YWU2MTBhZWU1ZDdjODZhNzcxOTMyMGM4ZTdhN2NiIDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxl UGFnZS5jcHAKKysrIGIvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCkBAIC01OCw3ICs1OCw4IEBAIEluamVjdGVkQnVuZGxl UGFnZTo6SW5qZWN0ZWRCdW5kbGVQYWdlKFdLQnVuZGxlUGFnZVJlZiBwYWdlKQogICAgIFdLQnVu ZGxlUGFnZVVJQ2xpZW50IHVpQ2xpZW50ID0gewogICAgICAgICAwLAogICAgICAgICB0aGlzLAot ICAgICAgICBfYWRkTWVzc2FnZVRvQ29uc29sZQorICAgICAgICBfYWRkTWVzc2FnZVRvQ29uc29s ZSwKKyAgICAgICAgX3NldFN0YXR1c2JhclRleHQKICAgICB9OwogICAgIFdLQnVuZGxlUGFnZVNl dFVJQ2xpZW50KG1fcGFnZSwgJnVpQ2xpZW50KTsKIApAQCAtMTk4LDYgKzE5OSwxMSBAQCB2b2lk IEluamVjdGVkQnVuZGxlUGFnZTo6X2FkZE1lc3NhZ2VUb0NvbnNvbGUoV0tCdW5kbGVQYWdlUmVm IHBhZ2UsIFdLU3RyaW5nUmVmCiAgICAgc3RhdGljX2Nhc3Q8SW5qZWN0ZWRCdW5kbGVQYWdlKj4o Y29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpLT5hZGRNZXNzYWdlVG9Db25zb2xlKG1lc3Nh Z2UsIGxpbmVOdW1iZXIpOwogfQogCit2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6X3NldFN0YXR1 c2JhclRleHQoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHN0YXR1c2JhclRleHQs IGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCit7CisgICAgc3RhdGljX2Nhc3Q8SW5qZWN0ZWRCdW5k bGVQYWdlKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpLT5zZXRTdGF0dXNiYXJUZXh0 KHN0YXR1c2JhclRleHQpOworfQorCiB2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6YWRkTWVzc2Fn ZVRvQ29uc29sZShXS1N0cmluZ1JlZiBtZXNzYWdlLCB1aW50MzJfdCBsaW5lTnVtYmVyKQogewog ICAgIC8vIEZJWE1FOiBTdHJpcCBmaWxlOiB1cmxzLgpAQCAtMjA1LDQgKzIxMSwxMyBAQCB2b2lk IEluamVjdGVkQnVuZGxlUGFnZTo6YWRkTWVzc2FnZVRvQ29uc29sZShXS1N0cmluZ1JlZiBtZXNz YWdlLCB1aW50MzJfdCBsaW5lTgogICAgIEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5vcygpIDw8 ICJDT05TT0xFIE1FU1NBR0U6IGxpbmUgIiA8PCBsaW5lTnVtYmVyIDw8ICI6ICIgPDwgdXRmOE1l c3NhZ2UtPmRhdGEoKSA8PCAiXG4iOwogfQogCit2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6c2V0 U3RhdHVzYmFyVGV4dChXS1N0cmluZ1JlZiBzdGF0dXNiYXJUZXh0KQoreworICAgIGlmICghSW5q ZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLmxheW91dFRlc3RDb250cm9sbGVyKCktPmR1bXBTdGF0dXND YWxsYmFja3MoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgT3duUHRyPFZlY3RvcjxjaGFyPiA+ IHV0ZjhTdGF0dXNiYXJUZXh0ID0gV0tTdHJpbmdUb1VURjgoc3RhdHVzYmFyVGV4dCk7CisgICAg SW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLm9zKCkgPDwgIlVJIERFTEVHQVRFIFNUQVRVUyBDQUxM QkFDSzogc2V0U3RhdHVzVGV4dDoiIDw8IHV0ZjhTdGF0dXNiYXJUZXh0IDw8ICJcbiI7Cit9CisK IH0gLy8gbmFtZXNwYWNlIFdUUgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuaCBiL1dlYktpdFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmgKaW5kZXgg NzlhZWJiN2IyN2Y0MGE5MjBlOWU1YWU2OGFhMjZkNTA1MWQ4N2FhNS4uMDYyYzhlZjgzODcyYzA0 Nzk1M2Q1ZmU2MzBlYTNhMTlkOWQxMDI3MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuaAorKysgYi9XZWJL aXRUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFn ZS5oCkBAIC02MSw3ICs2MSwxMCBAQCBwcml2YXRlOgogCiAgICAgLy8gVUkgQ2xpZW50CiAgICAg c3RhdGljIHZvaWQgX2FkZE1lc3NhZ2VUb0NvbnNvbGUoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdL U3RyaW5nUmVmIG1lc3NhZ2UsIHVpbnQzMl90IGxpbmVOdW1iZXIsIGNvbnN0IHZvaWQgKmNsaWVu dEluZm8pOworICAgIHN0YXRpYyB2b2lkIF9zZXRTdGF0dXNiYXJUZXh0KFdLQnVuZGxlUGFnZVJl ZiBwYWdlLCBXS1N0cmluZ1JlZiBzdGF0dXNiYXJUZXh0LCBjb25zdCB2b2lkICpjbGllbnRJbmZv KTsKKwogICAgIHZvaWQgYWRkTWVzc2FnZVRvQ29uc29sZShXS1N0cmluZ1JlZiBtZXNzYWdlLCB1 aW50MzJfdCBsaW5lTnVtYmVyKTsKKyAgICB2b2lkIHNldFN0YXR1c2JhclRleHQoV0tTdHJpbmdS ZWYgc3RhdHVzYmFyVGV4dCk7CiAKICAgICBXS0J1bmRsZVBhZ2VSZWYgbV9wYWdlOwogICAgIGJv b2wgbV9pc0xvYWRpbmc7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVy L0luamVjdGVkQnVuZGxlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcCBiL1dlYktpdFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCmlu ZGV4IGZhZGQzOGY2ZmY0NTU0YzQ1Y2Q0NTEzYjA3MDY3ZTQ2M2EwZDMxNzYuLjVjNWQzZDQ1YWRj OWU1MzA5ODM5YjQ3NjA2OGY2ODc4N2RhYTJhNGQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCisr KyBiL1dlYktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVz dENvbnRyb2xsZXIuY3BwCkBAIC00Miw2ICs0Miw3IEBAIFBhc3NSZWZQdHI8TGF5b3V0VGVzdENv bnRyb2xsZXI+IExheW91dFRlc3RDb250cm9sbGVyOjpjcmVhdGUoY29uc3Qgc3RkOjpzdHJpbmcm CiAKIExheW91dFRlc3RDb250cm9sbGVyOjpMYXlvdXRUZXN0Q29udHJvbGxlcihjb25zdCBzdGQ6 OnN0cmluZyYgdGVzdFBhdGhPclVSTCkKICAgICA6IG1fZHVtcEFzVGV4dChmYWxzZSkKKyAgICAs IG1fZHVtcFN0YXR1c0NhbGxiYWNrcyhmYWxzZSkKICAgICAsIG1fd2FpdFRvRHVtcChmYWxzZSkK ICAgICAsIG1fdGVzdFJlcGFpbnQoZmFsc2UpCiAgICAgLCBtX3Rlc3RSZXBhaW50U3dlZXBIb3Jp em9udGFsbHkoZmFsc2UpCkBAIC0xMzMsNiArMTM0LDEzIEBAIHN0YXRpYyBKU1ZhbHVlUmVmIGR1 bXBBc1RleHRDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rp b24sCiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOwogfQogCitzdGF0 aWMgSlNWYWx1ZVJlZiBkdW1wU3RhdHVzQ2FsbGJhY2tzQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNv bnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXpl X3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJl ZiogZXhjZXB0aW9uKQoreworICAgIExheW91dFRlc3RDb250cm9sbGVyKiBjb250cm9sbGVyID0g c3RhdGljX2Nhc3Q8TGF5b3V0VGVzdENvbnRyb2xsZXIqPihKU09iamVjdEdldFByaXZhdGUodGhp c09iamVjdCkpOworICAgIGNvbnRyb2xsZXItPnNldER1bXBTdGF0dXNDYWxsYmFja3ModHJ1ZSk7 CisgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOworfQorCiBzdGF0aWMg SlNWYWx1ZVJlZiB3YWl0VW50aWxEb25lQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpT T2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1l bnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0 aW9uKQogewogICAgIExheW91dFRlc3RDb250cm9sbGVyKiBjb250cm9sbGVyID0gc3RhdGljX2Nh c3Q8TGF5b3V0VGVzdENvbnRyb2xsZXIqPihKU09iamVjdEdldFByaXZhdGUodGhpc09iamVjdCkp OwpAQCAtMjI0LDYgKzIzMiw3IEBAIEpTU3RhdGljRnVuY3Rpb24qIExheW91dFRlc3RDb250cm9s bGVyOjpzdGF0aWNGdW5jdGlvbnMoKQogICAgIHN0YXRpYyBKU1N0YXRpY0Z1bmN0aW9uIHN0YXRp Y0Z1bmN0aW9uc1tdID0gewogICAgICAgICB7ICJkaXNwbGF5IiwgZGlzcGxheUNhbGxiYWNrLCBr SlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVs ZXRlIH0sCiAgICAgICAgIHsgImR1bXBBc1RleHQiLCBkdW1wQXNUZXh0Q2FsbGJhY2ssIGtKU1By b3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUg fSwKKyAgICAgICAgeyAiZHVtcFN0YXR1c0NhbGxiYWNrcyIsIGR1bXBTdGF0dXNDYWxsYmFja3ND YWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmli dXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJub3RpZnlEb25lIiwgbm90aWZ5RG9uZUNhbGxi YWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVE b250RGVsZXRlIH0sCiAgICAgICAgIHsgIm51bWJlck9mQWN0aXZlQW5pbWF0aW9ucyIsIG51bWJl ck9mQWN0aXZlQW5pbWF0aW9uc0NhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5 IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgInBhdXNlQW5p bWF0aW9uQXRUaW1lT25FbGVtZW50V2l0aElkIiwgcGF1c2VBbmltYXRpb25BdFRpbWVPbkVsZW1l bnRXaXRoSWRDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3Bl cnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oIGIvV2ViS2l0 VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9MYXlvdXRUZXN0Q29udHJvbGxl ci5oCmluZGV4IGYwN2NjMDA0NDg4NzZjYWE0MTE2MjU1ODFkMGY4NmMyOWU1MzYxMWIuLmE5ZTlm Zjc5MGQwOWRmNzA5MjA1NTM0MjBlNjZkYmM5NDBmMmU3NTcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIu aAorKysgYi9XZWJLaXRUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0xheW91 dFRlc3RDb250cm9sbGVyLmgKQEAgLTQ0LDYgKzQ0LDkgQEAgcHVibGljOgogICAgIGJvb2wgZHVt cEFzVGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fZHVtcEFzVGV4dDsgfQogICAgIHZvaWQgc2V0RHVt cEFzVGV4dChib29sIGR1bXBBc1RleHQpIHsgbV9kdW1wQXNUZXh0ID0gZHVtcEFzVGV4dDsgfQog CisgICAgYm9vbCBkdW1wU3RhdHVzQ2FsbGJhY2tzKCkgY29uc3QgeyByZXR1cm4gbV9kdW1wU3Rh dHVzQ2FsbGJhY2tzOyB9CisgICAgdm9pZCBzZXREdW1wU3RhdHVzQ2FsbGJhY2tzKGJvb2wgZHVt cFN0YXR1c0NhbGxiYWNrcykgeyBtX2R1bXBTdGF0dXNDYWxsYmFja3MgPSBkdW1wU3RhdHVzQ2Fs bGJhY2tzOyB9CisKICAgICBib29sIHdhaXRUb0R1bXAoKSBjb25zdCB7IHJldHVybiBtX3dhaXRU b0R1bXA7IH0KICAgICB2b2lkIHNldFdhaXRUb0R1bXAoKTsKICAgICB2b2lkIHdhaXRUb0R1bXBX YXRjaGRvZ1RpbWVyRmlyZWQoKTsKQEAgLTYxLDYgKzY0LDcgQEAgcHJpdmF0ZToKICAgICBMYXlv dXRUZXN0Q29udHJvbGxlcihjb25zdCBzdGQ6OnN0cmluZyYgdGVzdFBhdGhPclVSTCk7CiAKICAg ICBib29sIG1fZHVtcEFzVGV4dDsKKyAgICBib29sIG1fZHVtcFN0YXR1c0NhbGxiYWNrczsKICAg ICBib29sIG1fd2FpdFRvRHVtcDsgLy8gVHJ1ZSBpZiB3YWl0VW50aWxEb25lKCkgaGFzIGJlZW4g Y2FsbGVkLCBidXQgbm90aWZ5RG9uZSgpIGhhcyBub3QgeWV0IGJlZW4gY2FsbGVkLgogICAgIGJv b2wgbV90ZXN0UmVwYWludDsKICAgICBib29sIG1fdGVzdFJlcGFpbnRTd2VlcEhvcml6b250YWxs eTsK