47227 2010-10-05 16:07:08 -0700 [chromium] Minor naming cleanup in WebDragData, part 2 2010-10-07 15:04:37 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dcheng dcheng abarth commit-queue eric tony oldest_to_newest 289955 0 dcheng 2010-10-05 16:07:08 -0700 Now that Chromium uses the new renamed methods, delete the old deprecated methods. 289957 1 69861 dcheng 2010-10-05 16:09:22 -0700 Created attachment 69861 Patch 289959 2 69861 tony 2010-10-05 16:13:50 -0700 Comment on attachment 69861 Patch LGTM, but I will hold off on the r+ cq+ while the EWS bot tries the patch. 290357 3 tony 2010-10-06 09:25:00 -0700 Not sure why the ews bot didn't compile this on cr-linux overnight. Anyway, I'm going to land manually for dcheng. 290358 4 tony 2010-10-06 09:25:56 -0700 Oh, nothing is building on cr-linux: http://webkit-commit-queue.appspot.com/queue-status/chromium-ews 290378 5 tony 2010-10-06 09:46:40 -0700 Meh, the bug reference in the ChangeLog was wrong so bug 46937 got updated instead. http://trac.webkit.org/changeset/69202 290409 6 tony 2010-10-06 10:15:19 -0700 Rolled out in r69207. Reopening. webkit/tools/test_shell/event_sending_controller.cc: In member function ‘void EventSendingController::beginDragWithFiles(const CppArgumentList&, CppVariant*)’: webkit/tools/test_shell/event_sending_controller.cc:815:error: ‘class WebKit::WebDragData’ has no member named ‘appendToFileNames’ make: *** [out/Release/obj.target/test_shell_common/webkit/tools/test_shell/event_sending_controller.o] Error 1 webkit/tools/test_shell/test_webview_delegate.cc: In function ‘void<unnamed>::AddDRTFakeFileToDataObject(WebKit::WebDragData*)’: webkit/tools/test_shell/test_webview_delegate.cc:180:error: ‘class WebKit::WebDragData’ has no member named ‘appendToFileNames’ make: *** [out/Release/obj.target/test_shell_common/webkit/tools/test_shell/test_webview_delegate.o] Error 1 291206 7 70137 dcheng 2010-10-07 12:59:38 -0700 Created attachment 70137 Patch Another patch checked into Chrome, and once again, it built locally. Hopefully it actually works this time. (I updated the bug URL in the ChangeLogs as well) 291279 8 70137 commit-queue 2010-10-07 15:04:32 -0700 Comment on attachment 70137 Patch Clearing flags on attachment: 70137 Committed r69346: <http://trac.webkit.org/changeset/69346> 291280 9 commit-queue 2010-10-07 15:04:37 -0700 All reviewed patches have been landed. Closing bug. 69861 2010-10-05 16:09:22 -0700 2010-10-07 12:59:38 -0700 Patch foo.patch text/plain 5589 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDY4NGEzYzQuLmVjYTA4OGIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDEwLTEwLTA1ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1 bV0gTWlub3IgbmFtaW5nIGNsZWFudXAgaW4gV2ViRHJhZ0RhdGEsIHBhcnQgMgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY5MzcKKworICAgICAgICBD aHJvbWl1bSBubyBsb25nZXIgdXNlcyB0aGUgZGVwcmVjYXRlZCBtZXRob2RzLCBzbyBkZWxldGUg dGhlbS4KKworICAgICAgICAqIERFUFM6CisgICAgICAgICogcHVibGljL1dlYkRyYWdEYXRhLmg6 CisgICAgICAgICogc3JjL1dlYkRyYWdEYXRhLmNwcDoKKwogMjAxMC0xMC0wNSAgS2VubmV0aCBS dXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFu Zy4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9ERVBTIGIvV2ViS2l0L2Nocm9taXVtL0RF UFMKaW5kZXggODYyODkxNi4uMzU0ZWE0NyAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL0RF UFMKKysrIGIvV2ViS2l0L2Nocm9taXVtL0RFUFMKQEAgLTMyLDcgKzMyLDcgQEAKIAogdmFycyA9 IHsKICAgJ2Nocm9taXVtX3N2bic6ICdodHRwOi8vc3JjLmNocm9taXVtLm9yZy9zdm4vdHJ1bmsv c3JjJywKLSAgJ2Nocm9taXVtX3Jldic6ICc2MTIwNicsCisgICdjaHJvbWl1bV9yZXYnOiAnNjE0 NzInLAogfQogCiBkZXBzID0gewpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJEcmFnRGF0YS5oIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEcmFnRGF0YS5oCmluZGV4 IGIxOTg1YzEuLjFkNzA0ZjAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi RHJhZ0RhdGEuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRyYWdEYXRhLmgKQEAg LTc4LDEyICs3OCw2IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBmaWxlRXh0 ZW5zaW9uKCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNldEZpbGVFeHRlbnNpb24oY29u c3QgV2ViU3RyaW5nJik7CiAKLSAgICAvLyBUaGVzZSBtZXRob2RzIGFyZSBkZXByZWNhdGVkIGlu IGZhdm9yIG9mIHRoZSBvbmVzIGluIHRoZSBuZXh0IGJsb2NrLgotICAgIFdFQktJVF9BUEkgYm9v bCBoYXNGaWxlTmFtZXMoKSBjb25zdDsKLSAgICBXRUJLSVRfQVBJIHZvaWQgZmlsZU5hbWVzKFdl YlZlY3RvcjxXZWJTdHJpbmc+JikgY29uc3Q7Ci0gICAgV0VCS0lUX0FQSSB2b2lkIHNldEZpbGVO YW1lcyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYpOwotICAgIFdFQktJVF9BUEkgdm9pZCBh cHBlbmRUb0ZpbGVOYW1lcyhjb25zdCBXZWJTdHJpbmcmKTsKLQogICAgIFdFQktJVF9BUEkgYm9v bCBjb250YWluc0ZpbGVuYW1lcygpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBmaWxlbmFt ZXMoV2ViVmVjdG9yPFdlYlN0cmluZz4mKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0 RmlsZW5hbWVzKGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+Jik7CkBAIC05OCwxMCArOTIsNiBA QCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBXZWJVUkwgaHRtbEJhc2VVUkwoKSBjb25zdDsKICAg ICBXRUJLSVRfQVBJIHZvaWQgc2V0SFRNTEJhc2VVUkwoY29uc3QgV2ViVVJMJik7CiAKLSAgICAv LyBUaGVzZSBtZXRob2RzIGFyZSBkZXByZWNhdGVkIGluIGZhdm9yIG9mIHRoZSBvbmVzIGluIHRo ZSBuZXh0IGJsb2NrLgotICAgIFdFQktJVF9BUEkgV2ViU3RyaW5nIGZpbGVDb250ZW50RmlsZU5h bWUoKSBjb25zdDsKLSAgICBXRUJLSVRfQVBJIHZvaWQgc2V0RmlsZUNvbnRlbnRGaWxlTmFtZShj b25zdCBXZWJTdHJpbmcmKTsKLQogICAgIFdFQktJVF9BUEkgV2ViU3RyaW5nIGZpbGVDb250ZW50 RmlsZW5hbWUoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0RmlsZUNvbnRlbnRGaWxl bmFtZShjb25zdCBXZWJTdHJpbmcmKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJEcmFnRGF0YS5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcApp bmRleCAxYjE5OTQwLi5mMjY0MzY5IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkRyYWdEYXRhLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRyYWdEYXRhLmNwcApA QCAtMTE1LDI2ICsxMTUsNiBAQCB2b2lkIFdlYkRyYWdEYXRhOjpzZXRGaWxlRXh0ZW5zaW9uKGNv bnN0IFdlYlN0cmluZyYgZmlsZUV4dGVuc2lvbikKICAgICBtX3ByaXZhdGUtPnNldEZpbGVFeHRl bnNpb24oZmlsZUV4dGVuc2lvbik7CiB9CiAKLWJvb2wgV2ViRHJhZ0RhdGE6Omhhc0ZpbGVOYW1l cygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGNvbnRhaW5zRmlsZW5hbWVzKCk7Ci19Ci0KLXZvaWQg V2ViRHJhZ0RhdGE6OmZpbGVOYW1lcyhXZWJWZWN0b3I8V2ViU3RyaW5nPiYgZmlsZU5hbWVzKSBj b25zdAotewotICAgIGZpbGVuYW1lcyhmaWxlTmFtZXMpOwotfQotCi12b2lkIFdlYkRyYWdEYXRh OjpzZXRGaWxlTmFtZXMoY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGZpbGVOYW1lcykKLXsK LSAgICByZXR1cm4gc2V0RmlsZW5hbWVzKGZpbGVOYW1lcyk7Ci19Ci0KLXZvaWQgV2ViRHJhZ0Rh dGE6OmFwcGVuZFRvRmlsZU5hbWVzKGNvbnN0IFdlYlN0cmluZyYgZmlsZU5hbWUpCi17Ci0gICAg cmV0dXJuIGFwcGVuZFRvRmlsZW5hbWVzKGZpbGVOYW1lKTsKLX0KLQogYm9vbCBXZWJEcmFnRGF0 YTo6Y29udGFpbnNGaWxlbmFtZXMoKSBjb25zdAogewogICAgIEFTU0VSVCghaXNOdWxsKCkpOwpA QCAtMjAxLDE2ICsxODEsNiBAQCB2b2lkIFdlYkRyYWdEYXRhOjpzZXRIVE1MQmFzZVVSTChjb25z dCBXZWJVUkwmIGh0bWxCYXNlVVJMKQogICAgIG1fcHJpdmF0ZS0+c2V0SHRtbEJhc2VVcmwoaHRt bEJhc2VVUkwpOwogfQogCi1XZWJTdHJpbmcgV2ViRHJhZ0RhdGE6OmZpbGVDb250ZW50RmlsZU5h bWUoKSBjb25zdAotewotICAgIHJldHVybiBmaWxlQ29udGVudEZpbGVuYW1lKCk7Ci19Ci0KLXZv aWQgV2ViRHJhZ0RhdGE6OnNldEZpbGVDb250ZW50RmlsZU5hbWUoY29uc3QgV2ViU3RyaW5nJiBm aWxlTmFtZSkKLXsKLSAgICByZXR1cm4gc2V0RmlsZUNvbnRlbnRGaWxlbmFtZShmaWxlTmFtZSk7 Ci19Ci0KIFdlYlN0cmluZyBXZWJEcmFnRGF0YTo6ZmlsZUNvbnRlbnRGaWxlbmFtZSgpIGNvbnN0 CiB7CiAgICAgQVNTRVJUKCFpc051bGwoKSk7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFu Z2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggZjViNThkMi4uMTg5NTM0YiAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDEwLTEwLTA1ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtjaHJvbWl1bV0gTWlub3IgbmFtaW5nIGNsZWFudXAgaW4gV2ViRHJhZ0RhdGEsIHBhcnQg MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY5MzcK KworICAgICAgICBVcGRhdGUgRFJUIHRvIHVzZSB0aGUgcmVuYW1lZCBtZXRob2RzLgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuY3BwOgorICAgICAgICAo RXZlbnRTZW5kZXI6OmJlZ2luRHJhZ1dpdGhGaWxlcyk6CisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwOgorICAgICAgICAoYWRkRFJURmFrZUZpbGVUb0Rh dGFPYmplY3QpOgorCiAyMDEwLTEwLTA1ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuY3BwIGIvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuY3BwCmluZGV4IDVmNTE1NTMu LjA3NGQ0ZTcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVt L0V2ZW50U2VuZGVyLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9FdmVudFNlbmRlci5jcHAKQEAgLTc3OSw3ICs3NzksNyBAQCB2b2lkIEV2ZW50U2VuZGVyOjpi ZWdpbkRyYWdXaXRoRmlsZXMoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1bWVudHMsIENwcFZh cmlhbgogICAgIGN1cnJlbnREcmFnRGF0YS5pbml0aWFsaXplKCk7CiAgICAgVmVjdG9yPHN0cmlu Zz4gZmlsZXMgPSBhcmd1bWVudHNbMF0udG9TdHJpbmdWZWN0b3IoKTsKICAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IGZpbGVzLnNpemUoKTsgKytpKQotICAgICAgICBjdXJyZW50RHJhZ0RhdGEu YXBwZW5kVG9GaWxlTmFtZXMod2Via2l0X3N1cHBvcnQ6OkdldEFic29sdXRlV2ViU3RyaW5nRnJv bVVURjhQYXRoKGZpbGVzW2ldKSk7CisgICAgICAgIGN1cnJlbnREcmFnRGF0YS5hcHBlbmRUb0Zp bGVuYW1lcyh3ZWJraXRfc3VwcG9ydDo6R2V0QWJzb2x1dGVXZWJTdHJpbmdGcm9tVVRGOFBhdGgo ZmlsZXNbaV0pKTsKICAgICBjdXJyZW50RHJhZ0VmZmVjdHNBbGxvd2VkID0gV2ViS2l0OjpXZWJE cmFnT3BlcmF0aW9uQ29weTsKIAogICAgIC8vIFByb3ZpZGUgYSBkcmFnIHNvdXJjZS4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNw cCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcApp bmRleCBlM2NhODVkLi45Nzc3MzRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vV2ViVmlld0hvc3QuY3BwCkBAIC0xMjQsNyArMTI0LDcgQEAgc3RhdGlj IHN0cmluZyBkZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdChjb25zdCBzdHJpbmcmIHVy bCkKIC8vIGRyYWdnaW5nIGEgZmlsZS4KIHN0YXRpYyB2b2lkIGFkZERSVEZha2VGaWxlVG9EYXRh T2JqZWN0KFdlYkRyYWdEYXRhKiBkcmFnRGF0YSkKIHsKLSAgICBkcmFnRGF0YS0+YXBwZW5kVG9G aWxlTmFtZXMoV2ViU3RyaW5nOjpmcm9tVVRGOCgiRFJURmFrZUZpbGUiKSk7CisgICAgZHJhZ0Rh dGEtPmFwcGVuZFRvRmlsZW5hbWVzKFdlYlN0cmluZzo6ZnJvbVVURjgoIkRSVEZha2VGaWxlIikp OwogfQogCiAvLyBHZXQgYSBkZWJ1Z2dpbmcgc3RyaW5nIGZyb20gYSBXZWJOYXZpZ2F0aW9uVHlw ZS4K 70137 2010-10-07 12:59:38 -0700 2010-10-07 15:04:31 -0700 Patch foo.patch text/plain 5603 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGZmYTdjMGIuLjBjOWVkYzUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDEwLTEwLTA1ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1 bV0gTWlub3IgbmFtaW5nIGNsZWFudXAgaW4gV2ViRHJhZ0RhdGEsIHBhcnQgMgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcyMjcKKworICAgICAgICBD aHJvbWl1bSBubyBsb25nZXIgdXNlcyB0aGUgZGVwcmVjYXRlZCBtZXRob2RzLCBzbyBkZWxldGUg dGhlbS4KKworICAgICAgICAqIERFUFM6CisgICAgICAgICogcHVibGljL1dlYkRyYWdEYXRhLmg6 CisgICAgICAgICogc3JjL1dlYkRyYWdEYXRhLmNwcDoKKwogMjAxMC0xMC0wNyAgRGF2ZSBNb29y ZSAgPGRhdmVtb29yZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBU YW11cmEuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vREVQUyBiL1dlYktpdC9jaHJvbWl1 bS9ERVBTCmluZGV4IDg2Mjg5MTYuLjZhYjljZDMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1 bS9ERVBTCisrKyBiL1dlYktpdC9jaHJvbWl1bS9ERVBTCkBAIC0zMiw3ICszMiw3IEBACiAKIHZh cnMgPSB7CiAgICdjaHJvbWl1bV9zdm4nOiAnaHR0cDovL3NyYy5jaHJvbWl1bS5vcmcvc3ZuL3Ry dW5rL3NyYycsCi0gICdjaHJvbWl1bV9yZXYnOiAnNjEyMDYnLAorICAnY2hyb21pdW1fcmV2Jzog JzYxODA2JywKIH0KIAogZGVwcyA9IHsKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRHJhZ0RhdGEuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRHJhZ0RhdGEuaApp bmRleCBiMTk4NWMxLi4xZDcwNGYwIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYkRyYWdEYXRhLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEcmFnRGF0YS5o CkBAIC03OCwxMiArNzgsNiBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgZmls ZUV4dGVuc2lvbigpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRGaWxlRXh0ZW5zaW9u KGNvbnN0IFdlYlN0cmluZyYpOwogCi0gICAgLy8gVGhlc2UgbWV0aG9kcyBhcmUgZGVwcmVjYXRl ZCBpbiBmYXZvciBvZiB0aGUgb25lcyBpbiB0aGUgbmV4dCBibG9jay4KLSAgICBXRUJLSVRfQVBJ IGJvb2wgaGFzRmlsZU5hbWVzKCkgY29uc3Q7Ci0gICAgV0VCS0lUX0FQSSB2b2lkIGZpbGVOYW1l cyhXZWJWZWN0b3I8V2ViU3RyaW5nPiYpIGNvbnN0OwotICAgIFdFQktJVF9BUEkgdm9pZCBzZXRG aWxlTmFtZXMoY29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mKTsKLSAgICBXRUJLSVRfQVBJIHZv aWQgYXBwZW5kVG9GaWxlTmFtZXMoY29uc3QgV2ViU3RyaW5nJik7Ci0KICAgICBXRUJLSVRfQVBJ IGJvb2wgY29udGFpbnNGaWxlbmFtZXMoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgZmls ZW5hbWVzKFdlYlZlY3RvcjxXZWJTdHJpbmc+JikgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lk IHNldEZpbGVuYW1lcyhjb25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYpOwpAQCAtOTgsMTAgKzky LDYgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgV2ViVVJMIGh0bWxCYXNlVVJMKCkgY29uc3Q7 CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNldEhUTUxCYXNlVVJMKGNvbnN0IFdlYlVSTCYpOwogCi0g ICAgLy8gVGhlc2UgbWV0aG9kcyBhcmUgZGVwcmVjYXRlZCBpbiBmYXZvciBvZiB0aGUgb25lcyBp biB0aGUgbmV4dCBibG9jay4KLSAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBmaWxlQ29udGVudEZp bGVOYW1lKCkgY29uc3Q7Ci0gICAgV0VCS0lUX0FQSSB2b2lkIHNldEZpbGVDb250ZW50RmlsZU5h bWUoY29uc3QgV2ViU3RyaW5nJik7Ci0KICAgICBXRUJLSVRfQVBJIFdlYlN0cmluZyBmaWxlQ29u dGVudEZpbGVuYW1lKCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNldEZpbGVDb250ZW50 RmlsZW5hbWUoY29uc3QgV2ViU3RyaW5nJik7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRHJhZ0RhdGEuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5j cHAKaW5kZXggMWIxOTk0MC4uZjI2NDM2OSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJEcmFnRGF0YS5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEcmFnRGF0YS5j cHAKQEAgLTExNSwyNiArMTE1LDYgQEAgdm9pZCBXZWJEcmFnRGF0YTo6c2V0RmlsZUV4dGVuc2lv bihjb25zdCBXZWJTdHJpbmcmIGZpbGVFeHRlbnNpb24pCiAgICAgbV9wcml2YXRlLT5zZXRGaWxl RXh0ZW5zaW9uKGZpbGVFeHRlbnNpb24pOwogfQogCi1ib29sIFdlYkRyYWdEYXRhOjpoYXNGaWxl TmFtZXMoKSBjb25zdAotewotICAgIHJldHVybiBjb250YWluc0ZpbGVuYW1lcygpOwotfQotCi12 b2lkIFdlYkRyYWdEYXRhOjpmaWxlTmFtZXMoV2ViVmVjdG9yPFdlYlN0cmluZz4mIGZpbGVOYW1l cykgY29uc3QKLXsKLSAgICBmaWxlbmFtZXMoZmlsZU5hbWVzKTsKLX0KLQotdm9pZCBXZWJEcmFn RGF0YTo6c2V0RmlsZU5hbWVzKGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBmaWxlTmFtZXMp Ci17Ci0gICAgcmV0dXJuIHNldEZpbGVuYW1lcyhmaWxlTmFtZXMpOwotfQotCi12b2lkIFdlYkRy YWdEYXRhOjphcHBlbmRUb0ZpbGVOYW1lcyhjb25zdCBXZWJTdHJpbmcmIGZpbGVOYW1lKQotewot ICAgIHJldHVybiBhcHBlbmRUb0ZpbGVuYW1lcyhmaWxlTmFtZSk7Ci19Ci0KIGJvb2wgV2ViRHJh Z0RhdGE6OmNvbnRhaW5zRmlsZW5hbWVzKCkgY29uc3QKIHsKICAgICBBU1NFUlQoIWlzTnVsbCgp KTsKQEAgLTIwMSwxNiArMTgxLDYgQEAgdm9pZCBXZWJEcmFnRGF0YTo6c2V0SFRNTEJhc2VVUkwo Y29uc3QgV2ViVVJMJiBodG1sQmFzZVVSTCkKICAgICBtX3ByaXZhdGUtPnNldEh0bWxCYXNlVXJs KGh0bWxCYXNlVVJMKTsKIH0KIAotV2ViU3RyaW5nIFdlYkRyYWdEYXRhOjpmaWxlQ29udGVudEZp bGVOYW1lKCkgY29uc3QKLXsKLSAgICByZXR1cm4gZmlsZUNvbnRlbnRGaWxlbmFtZSgpOwotfQot Ci12b2lkIFdlYkRyYWdEYXRhOjpzZXRGaWxlQ29udGVudEZpbGVOYW1lKGNvbnN0IFdlYlN0cmlu ZyYgZmlsZU5hbWUpCi17Ci0gICAgcmV0dXJuIHNldEZpbGVDb250ZW50RmlsZW5hbWUoZmlsZU5h bWUpOwotfQotCiBXZWJTdHJpbmcgV2ViRHJhZ0RhdGE6OmZpbGVDb250ZW50RmlsZW5hbWUoKSBj b25zdAogewogICAgIEFTU0VSVCghaXNOdWxsKCkpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQxODgyMDQuLjU2MDYxZjkg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMC0wNSAgRGFuaWVsIENoZW5nICA8ZGNoZW5n QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbY2hyb21pdW1dIE1pbm9yIG5hbWluZyBjbGVhbnVwIGluIFdlYkRyYWdEYXRhLCBw YXJ0IDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3 MjI3CisKKyAgICAgICAgVXBkYXRlIERSVCB0byB1c2UgdGhlIHJlbmFtZWQgbWV0aG9kcy4KKwor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAg ICAgKEV2ZW50U2VuZGVyOjpiZWdpbkRyYWdXaXRoRmlsZXMpOgorICAgICAgICAqIER1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcDoKKyAgICAgICAgKGFkZERSVEZha2VGaWxl VG9EYXRhT2JqZWN0KToKKwogMjAxMC0wOS0yMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29u QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9FdmVudFNlbmRlci5j cHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9FdmVudFNlbmRlci5jcHAK aW5kZXggNWY1MTU1My4uMDc0ZDRlNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0V2ZW50U2VuZGVyLmNwcApAQCAtNzc5LDcgKzc3OSw3IEBAIHZvaWQg RXZlbnRTZW5kZXI6OmJlZ2luRHJhZ1dpdGhGaWxlcyhjb25zdCBDcHBBcmd1bWVudExpc3QmIGFy Z3VtZW50cywgQ3BwVmFyaWFuCiAgICAgY3VycmVudERyYWdEYXRhLmluaXRpYWxpemUoKTsKICAg ICBWZWN0b3I8c3RyaW5nPiBmaWxlcyA9IGFyZ3VtZW50c1swXS50b1N0cmluZ1ZlY3RvcigpOwog ICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZmlsZXMuc2l6ZSgpOyArK2kpCi0gICAgICAgIGN1 cnJlbnREcmFnRGF0YS5hcHBlbmRUb0ZpbGVOYW1lcyh3ZWJraXRfc3VwcG9ydDo6R2V0QWJzb2x1 dGVXZWJTdHJpbmdGcm9tVVRGOFBhdGgoZmlsZXNbaV0pKTsKKyAgICAgICAgY3VycmVudERyYWdE YXRhLmFwcGVuZFRvRmlsZW5hbWVzKHdlYmtpdF9zdXBwb3J0OjpHZXRBYnNvbHV0ZVdlYlN0cmlu Z0Zyb21VVEY4UGF0aChmaWxlc1tpXSkpOwogICAgIGN1cnJlbnREcmFnRWZmZWN0c0FsbG93ZWQg PSBXZWJLaXQ6OldlYkRyYWdPcGVyYXRpb25Db3B5OwogCiAgICAgLy8gUHJvdmlkZSBhIGRyYWcg c291cmNlLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0v V2ViVmlld0hvc3QuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2Vi Vmlld0hvc3QuY3BwCmluZGV4IDM5Y2I5ZmUuLmNiMTQzOTMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlZpZXdIb3N0LmNwcAorKysgYi9XZWJLaXRU b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJWaWV3SG9zdC5jcHAKQEAgLTEyNCw3ICsx MjQsNyBAQCBzdGF0aWMgc3RyaW5nIGRlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KGNv bnN0IHN0cmluZyYgdXJsKQogLy8gZHJhZ2dpbmcgYSBmaWxlLgogc3RhdGljIHZvaWQgYWRkRFJU RmFrZUZpbGVUb0RhdGFPYmplY3QoV2ViRHJhZ0RhdGEqIGRyYWdEYXRhKQogewotICAgIGRyYWdE YXRhLT5hcHBlbmRUb0ZpbGVOYW1lcyhXZWJTdHJpbmc6OmZyb21VVEY4KCJEUlRGYWtlRmlsZSIp KTsKKyAgICBkcmFnRGF0YS0+YXBwZW5kVG9GaWxlbmFtZXMoV2ViU3RyaW5nOjpmcm9tVVRGOCgi RFJURmFrZUZpbGUiKSk7CiB9CiAKIC8vIEdldCBhIGRlYnVnZ2luZyBzdHJpbmcgZnJvbSBhIFdl Yk5hdmlnYXRpb25UeXBlLgo=