61417 2011-05-24 21:24:13 -0700 [Chromium] WebDatabase::closeDatabaseImmediately fails sometimes. 2011-05-26 14:33:50 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 michaeln michaeln commit-queue dglazkov webkit.review.bot oldest_to_newest 409440 0 michaeln 2011-05-24 21:24:13 -0700 See the chromium bug for details. http://code.google.com/p/chromium/issues/detail?id=83487 409444 1 94741 michaeln 2011-05-24 21:28:30 -0700 Created attachment 94741 SimplerStringKey 409451 2 94741 webkit.review.bot 2011-05-24 21:38:14 -0700 Comment on attachment 94741 SimplerStringKey Attachment 94741 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/8733453 409480 3 michaeln 2011-05-24 23:09:26 -0700 Looks like the DEPs roll in the other direction hasn't happened yet (pulling a newer set of webkit_support stuff from chrome-land) The callsite causing the compile error was altered to no longer use the deprecated method in r86537 (ealier today). http://src.chromium.org/viewvc/chrome?view=rev&revision=86537 409483 4 94741 webkit.review.bot 2011-05-24 23:19:44 -0700 Comment on attachment 94741 SimplerStringKey Attachment 94741 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/8726968 409862 5 94841 michaeln 2011-05-25 12:50:52 -0700 Created attachment 94841 SimplerStringKey leaving the deprecated method in for a little longer 409870 6 94841 fishd 2011-05-25 13:03:27 -0700 Comment on attachment 94841 SimplerStringKey View in context: https://bugs.webkit.org/attachment.cgi?id=94841&action=review > Source/WebCore/storage/DatabaseTracker.h:181 > + typedef HashMap<String, DatabaseNameMap*> DatabaseOriginMap; I guess duplicating the above typedefs and the definition of m_openDatabaseMapGuard is helpful since the type of DatabaseOriginMap is different now? This way you can keep all of these together? Another approach would be to #ifdef just the definition of DatabaseOriginMap. Then, the rest of the code duplication would not need to exist. 409877 7 michaeln 2011-05-25 13:17:03 -0700 (In reply to comment #6) > (From update of attachment 94841 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=94841&action=review > > > Source/WebCore/storage/DatabaseTracker.h:181 > > + typedef HashMap<String, DatabaseNameMap*> DatabaseOriginMap; > > I guess duplicating the above typedefs and the definition of m_openDatabaseMapGuard > is helpful since the type of DatabaseOriginMap is different now? This way you can > keep all of these together? Another approach would be to #ifdef just the definition > of DatabaseOriginMap. Then, the rest of the code duplication would not need to exist. I chose to keep the typedefs and datamembers together for the sake of readability, but I'd be willing to chop it up differently. Aside from the .h file hygiene, wdyt? 410158 8 commit-queue 2011-05-25 20:44:57 -0700 The commit-queue encountered the following flaky tests while processing attachment 94841: http/tests/xmlhttprequest/cross-origin-no-authorization.html bug 33357 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 410160 9 94841 commit-queue 2011-05-25 20:46:15 -0700 Comment on attachment 94841 SimplerStringKey Rejecting attachment 94841 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'land-a..." exit_code: 1 Last 500 characters of output: erListBox.cpp r87352 = 802dc9d1e34c714064594dc4bd0624b23fc04c8c (refs/remotes/trunk) M ChangeLog M Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp M Source/WebKit/chromium/public/WebGraphicsContext3D.h M Source/WebCore/platform/graphics/GraphicsContext3D.h M Source/WebCore/html/canvas/WebGLRenderingContext.cpp r87353 = d0ac4bc7d41d88e8327c241a7200d3286d031cda (refs/remotes/trunk) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/trunk. Full output: http://queues.webkit.org/results/8734624 410712 10 michaeln 2011-05-26 12:06:13 -0700 bah... got up to the point of being committed (built tests ran the whole deal) only to be rejected because the change log was missing a Reviewed By line :) will land manually 410741 11 michaeln 2011-05-26 12:44:39 -0700 Committed r87419: <http://trac.webkit.org/changeset/87419> 94741 2011-05-24 21:28:30 -0700 2011-05-25 12:50:52 -0700 SimplerStringKey delete.txt text/plain 10054 michaeln SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MjYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMjQgIE1pY2hhZWwg Tm9yZG1hbiAgPG1pY2hhZWxuQGdvb2dsZS5jb20+CisKKyAgICAgICAgW0Nocm9taXVtXSBVc2Ug U2VjdXJpdHlPcmlnaW4gcHJvZHVjZWQgZGF0YWJhc2VJZGVudGlmaWVyIHN0cmluZ3MsIGluc3Rl YWQgb2YKKyAgICAgICAgU2VjdXJpdHlPcmlnaW4gUmVmUHRycywgYXMgdGhlIHRvcCBsZXZlbCBr ZXkgaW50byB0aGUgRGF0YWJhc2VUcmFja2VyJ3MKKyAgICAgICAgY29sbGVjdGlvbiBvZiBvcGVu IGRhdGFiYXNlcy4gT3RoZXJ3aXNlIHdlIGNhbiBmYWlsIHRvIGxvb2t1cCBkYXRhYmFzZXMgd2hl bgorICAgICAgICB0cnlpbmcgdG8gZm9yY2VhYmx5IGNsb3NlIHRoZW0gdmlhICBXZWJEYXRhYmFz ZTo6Y2xvc2VEYXRhYmFzZUltbWVkaWF0ZWx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE0MTcKKworICAgICAgICBOZXcgbmV3IGZ1bmN0aW9uYWxp dHksIG5vIHRlc3RzLgorCisgICAgICAgICogc3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIuaDoKKyAg ICAgICAgKiBzdG9yYWdlL2Nocm9taXVtL0RhdGFiYXNlVHJhY2tlckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6YWRkT3BlbkRhdGFiYXNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6cmVtb3ZlT3BlbkRhdGFiYXNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6Z2V0T3BlbkRhdGFiYXNlcyk6CisgICAgICAg IChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmludGVycnVwdEFsbERhdGFiYXNlc0ZvckNvbnRl eHQpOgorCiAyMDExLTA1LTI0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdG9y YWdlL0RhdGFiYXNlVHJhY2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvRGF0YWJhc2VUcmFja2VyLmgJKHJldmlzaW9uIDg3MjU5KQorKysgU291cmNlL1dlYkNvcmUv c3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIuaAkod29ya2luZyBjb3B5KQpAQCAtODQsMTMgKzg0LDYg QEAgcHVibGljOgogcHJpdmF0ZToKICAgICBEYXRhYmFzZVRyYWNrZXIoY29uc3QgU3RyaW5nJiBk YXRhYmFzZVBhdGgpOwogCi0gICAgdHlwZWRlZiBIYXNoU2V0PEFic3RyYWN0RGF0YWJhc2UqPiBE YXRhYmFzZVNldDsKLSAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBEYXRhYmFzZVNldCo+IERh dGFiYXNlTmFtZU1hcDsKLSAgICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiwgRGF0YWJhc2VOYW1lTWFwKiwgU2VjdXJpdHlPcmlnaW5IYXNoPiBEYXRhYmFzZU9yaWdpbk1h cDsKLQotICAgIE11dGV4IG1fb3BlbkRhdGFiYXNlTWFwR3VhcmQ7Ci0gICAgbXV0YWJsZSBPd25Q dHI8RGF0YWJhc2VPcmlnaW5NYXA+IG1fb3BlbkRhdGFiYXNlTWFwOwotCiAjaWYgIVBMQVRGT1JN KENIUk9NSVVNKQogcHVibGljOgogICAgIHZvaWQgc2V0RGF0YWJhc2VEaXJlY3RvcnlQYXRoKGNv bnN0IFN0cmluZyYpOwpAQCAtMTM2LDYgKzEyOSwxMyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBk ZWxldGVEYXRhYmFzZUZpbGUoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBTdHJpbmcmIG5hbWUpOwog CisgICAgdHlwZWRlZiBIYXNoU2V0PEFic3RyYWN0RGF0YWJhc2UqPiBEYXRhYmFzZVNldDsKKyAg ICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBEYXRhYmFzZVNldCo+IERhdGFiYXNlTmFtZU1hcDsK KyAgICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPiwgRGF0YWJhc2VOYW1l TWFwKiwgU2VjdXJpdHlPcmlnaW5IYXNoPiBEYXRhYmFzZU9yaWdpbk1hcDsKKworICAgIE11dGV4 IG1fb3BlbkRhdGFiYXNlTWFwR3VhcmQ7CisgICAgbXV0YWJsZSBPd25QdHI8RGF0YWJhc2VPcmln aW5NYXA+IG1fb3BlbkRhdGFiYXNlTWFwOworCiAgICAgLy8gVGhpcyBsb2NrIHByb3RlY3RzIG1f ZGF0YWJhc2UsIG1fcXVvdGFNYXAsIG1fcHJvcG9zZWREYXRhYmFzZXMsIG1fZGF0YWJhc2VEaXJl Y3RvcnlQYXRoLCBtX29yaWdpbnNCZWluZ0RlbGV0ZWQsIG1fYmVpbmdDcmVhdGVkLCBhbmQgbV9i ZWluZ0RlbGV0ZWQuCiAgICAgTXV0ZXggbV9kYXRhYmFzZUd1YXJkOwogICAgIFNRTGl0ZURhdGFi YXNlIG1fZGF0YWJhc2U7CkBAIC0xNzEsNiArMTcxLDE3IEBAIHByaXZhdGU6CiAKICAgICBzdGF0 aWMgdm9pZCBzY2hlZHVsZUZvck5vdGlmaWNhdGlvbigpOwogICAgIHN0YXRpYyB2b2lkIG5vdGlm eURhdGFiYXNlc0NoYW5nZWQodm9pZCopOworI2Vsc2UKK3B1YmxpYzoKKyAgICB2b2lkIGdldE9w ZW5EYXRhYmFzZXMoU3RyaW5nIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgbmFtZSwg SGFzaFNldDxSZWZQdHI8QWJzdHJhY3REYXRhYmFzZT4gPiogZGF0YWJhc2VzKTsKKworcHJpdmF0 ZToKKyAgICB0eXBlZGVmIEhhc2hTZXQ8QWJzdHJhY3REYXRhYmFzZSo+IERhdGFiYXNlU2V0Owor ICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIERhdGFiYXNlU2V0Kj4gRGF0YWJhc2VOYW1lTWFw OworICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIERhdGFiYXNlTmFtZU1hcCo+IERhdGFiYXNl T3JpZ2luTWFwOworCisgICAgTXV0ZXggbV9vcGVuRGF0YWJhc2VNYXBHdWFyZDsKKyAgICBtdXRh YmxlIE93blB0cjxEYXRhYmFzZU9yaWdpbk1hcD4gbV9vcGVuRGF0YWJhc2VNYXA7CiAjZW5kaWYg Ly8gIVBMQVRGT1JNKENIUk9NSVVNKQogfTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9jaHJvbWl1bS9EYXRhYmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAJ KHJldmlzaW9uIDg3MjU5KQorKysgU291cmNlL1dlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRh YmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc2LDEyICs3NiwxMyBA QCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6YWRkT3BlbkRhdGFiYXNlKEFiCiAgICAgQVNTRVJUKGRh dGFiYXNlLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmlzQ29udGV4dFRocmVhZCgpKTsKICAg ICBNdXRleExvY2tlciBvcGVuRGF0YWJhc2VNYXBMb2NrKG1fb3BlbkRhdGFiYXNlTWFwR3VhcmQp OwogICAgIGlmICghbV9vcGVuRGF0YWJhc2VNYXApCi0gICAgICAgIG1fb3BlbkRhdGFiYXNlTWFw ID0gYWRvcHRQdHIobmV3IERhdGFiYXNlT3JpZ2luTWFwKCkpOworICAgICAgICBtX29wZW5EYXRh YmFzZU1hcCA9IGFkb3B0UHRyKG5ldyBEYXRhYmFzZU9yaWdpbk1hcCk7CiAKLSAgICBEYXRhYmFz ZU5hbWVNYXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KGRhdGFiYXNlLT5zZWN1 cml0eU9yaWdpbigpKTsKKyAgICBTdHJpbmcgb3JpZ2luSWRlbnRpZmllciA9IGRhdGFiYXNlLT5z ZWN1cml0eU9yaWdpbigpLT5kYXRhYmFzZUlkZW50aWZpZXIoKTsKKyAgICBEYXRhYmFzZU5hbWVN YXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KG9yaWdpbklkZW50aWZpZXIpOwog ICAgIGlmICghbmFtZU1hcCkgewogICAgICAgICBuYW1lTWFwID0gbmV3IERhdGFiYXNlTmFtZU1h cCgpOwotICAgICAgICBtX29wZW5EYXRhYmFzZU1hcC0+c2V0KGRhdGFiYXNlLT5zZWN1cml0eU9y aWdpbigpLCBuYW1lTWFwKTsKKyAgICAgICAgbV9vcGVuRGF0YWJhc2VNYXAtPnNldChvcmlnaW5J ZGVudGlmaWVyLCBuYW1lTWFwKTsKICAgICB9CiAKICAgICBTdHJpbmcgbmFtZShkYXRhYmFzZS0+ c3RyaW5nSWRlbnRpZmllcigpKTsKQEAgLTEyNCw5ICsxMjUsMTAgQEAgdm9pZCBEYXRhYmFzZVRy YWNrZXI6OnJlbW92ZU9wZW5EYXRhYmFzZQogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAg U3RyaW5nIG9yaWdpbklkZW50aWZpZXIgPSBkYXRhYmFzZS0+c2VjdXJpdHlPcmlnaW4oKS0+ZGF0 YWJhc2VJZGVudGlmaWVyKCk7CiAgICAgTXV0ZXhMb2NrZXIgb3BlbkRhdGFiYXNlTWFwTG9jayht X29wZW5EYXRhYmFzZU1hcEd1YXJkKTsKICAgICBBU1NFUlQobV9vcGVuRGF0YWJhc2VNYXApOwot ICAgIERhdGFiYXNlTmFtZU1hcCogbmFtZU1hcCA9IG1fb3BlbkRhdGFiYXNlTWFwLT5nZXQoZGF0 YWJhc2UtPnNlY3VyaXR5T3JpZ2luKCkpOworICAgIERhdGFiYXNlTmFtZU1hcCogbmFtZU1hcCA9 IG1fb3BlbkRhdGFiYXNlTWFwLT5nZXQob3JpZ2luSWRlbnRpZmllcik7CiAgICAgQVNTRVJUKG5h bWVNYXApOwogICAgIFN0cmluZyBuYW1lKGRhdGFiYXNlLT5zdHJpbmdJZGVudGlmaWVyKCkpOwog ICAgIERhdGFiYXNlU2V0KiBkYXRhYmFzZVNldCA9IG5hbWVNYXAtPmdldChuYW1lKTsKQEAgLTEz Nyw3ICsxMzksNyBAQCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6cmVtb3ZlT3BlbkRhdGFiYXNlCiAg ICAgICAgIG5hbWVNYXAtPnJlbW92ZShuYW1lKTsKICAgICAgICAgZGVsZXRlIGRhdGFiYXNlU2V0 OwogICAgICAgICBpZiAobmFtZU1hcC0+aXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBtX29wZW5E YXRhYmFzZU1hcC0+cmVtb3ZlKGRhdGFiYXNlLT5zZWN1cml0eU9yaWdpbigpKTsKKyAgICAgICAg ICAgIG1fb3BlbkRhdGFiYXNlTWFwLT5yZW1vdmUob3JpZ2luSWRlbnRpZmllcik7CiAgICAgICAg ICAgICBkZWxldGUgbmFtZU1hcDsKICAgICAgICAgfQogICAgIH0KQEAgLTE0NSwxNCArMTQ3LDE4 IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpyZW1vdmVPcGVuRGF0YWJhc2UKICAgICBEYXRhYmFz ZU9ic2VydmVyOjpkYXRhYmFzZUNsb3NlZChkYXRhYmFzZSk7CiB9CiAKLQogdm9pZCBEYXRhYmFz ZVRyYWNrZXI6OmdldE9wZW5EYXRhYmFzZXMoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3Qg U3RyaW5nJiBuYW1lLCBIYXNoU2V0PFJlZlB0cjxBYnN0cmFjdERhdGFiYXNlPiA+KiBkYXRhYmFz ZXMpCiB7CisgICAgZ2V0T3BlbkRhdGFiYXNlcyhvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigp LCBuYW1lLCBkYXRhYmFzZXMpOworfQorCit2b2lkIERhdGFiYXNlVHJhY2tlcjo6Z2V0T3BlbkRh dGFiYXNlcyhTdHJpbmcgb3JpZ2luSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBuYW1lLCBIYXNo U2V0PFJlZlB0cjxBYnN0cmFjdERhdGFiYXNlPiA+KiBkYXRhYmFzZXMpCit7CiAgICAgTXV0ZXhM b2NrZXIgb3BlbkRhdGFiYXNlTWFwTG9jayhtX29wZW5EYXRhYmFzZU1hcEd1YXJkKTsKICAgICBp ZiAoIW1fb3BlbkRhdGFiYXNlTWFwKQogICAgICAgICByZXR1cm47CiAKLSAgICBEYXRhYmFzZU5h bWVNYXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KG9yaWdpbik7CisgICAgRGF0 YWJhc2VOYW1lTWFwKiBuYW1lTWFwID0gbV9vcGVuRGF0YWJhc2VNYXAtPmdldChvcmlnaW5JZGVu dGlmaWVyKTsKICAgICBpZiAoIW5hbWVNYXApCiAgICAgICAgIHJldHVybjsKIApAQCAtMTgzLDcg KzE4OSw3IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjppbnRlcnJ1cHRBbGxEYXRhYmEKICAgICAg ICAgaWYgKCFtX29wZW5EYXRhYmFzZU1hcCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAg ICBEYXRhYmFzZU5hbWVNYXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KGNvbnRl eHQtPnNlY3VyaXR5T3JpZ2luKCkpOworICAgICAgICBEYXRhYmFzZU5hbWVNYXAqIG5hbWVNYXAg PSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KGNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCktPmRhdGFi YXNlSWRlbnRpZmllcigpKTsKICAgICAgICAgaWYgKCFuYW1lTWFwKQogICAgICAgICAgICAgcmV0 dXJuOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gODcyNjMpCisr KyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDExLTA1LTI0ICBNaWNoYWVsIE5vcmRtYW4gIDxtaWNoYWVsbkBnb29nbGUu Y29tPgorCisgICAgICAgIFtDaHJvbWl1bV0gVXNlIFNlY3VyaXR5T3JpZ2luIHByb2R1Y2VkIGRh dGFiYXNlSWRlbnRpZmllciBzdHJpbmdzLCBpbnN0ZWFkIG9mCisgICAgICAgIFNlY3VyaXR5T3Jp Z2luIFJlZlB0cnMsIGFzIHRoZSB0b3AgbGV2ZWwga2V5IGludG8gdGhlIERhdGFiYXNlVHJhY2tl cidzCisgICAgICAgIGNvbGxlY3Rpb24gb2Ygb3BlbiBkYXRhYmFzZXMuIE90aGVyd2lzZSB3ZSBj YW4gZmFpbCB0byBsb29rdXAgZGF0YWJhc2VzIHdoZW4KKyAgICAgICAgdHJ5aW5nIHRvIGZvcmNl YWJseSBjbG9zZSB0aGVtIHZpYSAgV2ViRGF0YWJhc2U6OmNsb3NlRGF0YWJhc2VJbW1lZGlhdGVs eS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNDE3 CisKKyAgICAgICAgKiBwdWJsaWMvV2ViRGF0YWJhc2UuaDoKKyAgICAgICAgKiBzcmMvV2ViRGF0 YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZTo6dXBkYXRlRGF0YWJhc2VT aXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2U6OnVwZGF0ZVNwYWNlQXZhaWxhYmxl KToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2U6OnJlc2V0U3BhY2VBdmFpbGFibGUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZTo6Y2xvc2VEYXRhYmFzZUltbWVkaWF0ZWx5KToK KwogMjAxMS0wNS0yNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRGF0YWJhc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJEYXRhYmFzZS5oCShyZXZpc2lvbiA4NzI1OSkKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkRhdGFiYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDExICs2 MSw2IEBAIHB1YmxpYzoKICAgICBXRUJLSVRfQVBJIHN0YXRpYyB2b2lkIGNsb3NlRGF0YWJhc2VJ bW1lZGlhdGVseSgKICAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyLCBj b25zdCBXZWJTdHJpbmcmIGRhdGFiYXNlTmFtZSk7CiAKLSAgICAvLyBERVBSRUNBVEVEIC0gdG8g YmUgcmVtb3ZlZCBzb29uCi0gICAgV0VCS0lUX0FQSSBzdGF0aWMgdm9pZCB1cGRhdGVEYXRhYmFz ZVNpemUoCi0gICAgICAgIGNvbnN0IFdlYlN0cmluZyYgb3JpZ2luSWRlbnRpZmllciwgY29uc3Qg V2ViU3RyaW5nJiBkYXRhYmFzZU5hbWUsCi0gICAgICAgIGxvbmcgbG9uZyBkYXRhYmFzZVNpemUs IGxvbmcgbG9uZyBzcGFjZUF2YWlsYWJsZSk7Ci0KICNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04K ICAgICBXZWJEYXRhYmFzZShjb25zdCBXZWJDb3JlOjpBYnN0cmFjdERhdGFiYXNlKik7CiAjZW5k aWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRhdGFiYXNlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhYmFzZS5jcHAJKHJl dmlzaW9uIDg3MjU5KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGF0YWJhc2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Niw0MyArOTYsMzEgQEAgdm9pZCBXZWJEYXRhYmFzZTo6 dXBkYXRlRGF0YWJhc2VTaXplKGNvbgogewogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICBRdW90 YVRyYWNrZXI6Omluc3RhbmNlKCkudXBkYXRlRGF0YWJhc2VTaXplKG9yaWdpbklkZW50aWZpZXIs IG5hbWUsIHNpemUpOwotI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkKKyNlbmRpZgogfQogCiB2 b2lkIFdlYkRhdGFiYXNlOjp1cGRhdGVTcGFjZUF2YWlsYWJsZShjb25zdCBXZWJTdHJpbmcmIG9y aWdpbklkZW50aWZpZXIsIGxvbmcgbG9uZyBzcGFjZUF2YWlsYWJsZSkKIHsKICNpZiBFTkFCTEUo REFUQUJBU0UpCiAgICAgUXVvdGFUcmFja2VyOjppbnN0YW5jZSgpLnVwZGF0ZVNwYWNlQXZhaWxh YmxlVG9PcmlnaW4ob3JpZ2luSWRlbnRpZmllciwgc3BhY2VBdmFpbGFibGUpOwotI2VuZGlmIC8v IEVOQUJMRShEQVRBQkFTRSkKKyNlbmRpZgogfQogCiB2b2lkIFdlYkRhdGFiYXNlOjpyZXNldFNw YWNlQXZhaWxhYmxlKGNvbnN0IFdlYlN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikKIHsKICNpZiBF TkFCTEUoREFUQUJBU0UpCiAgICAgUXVvdGFUcmFja2VyOjppbnN0YW5jZSgpLnJlc2V0U3BhY2VB dmFpbGFibGVUb09yaWdpbihvcmlnaW5JZGVudGlmaWVyKTsKLSNlbmRpZiAvLyBFTkFCTEUoREFU QUJBU0UpCi19Ci0KLS8vIEZJWE1FOiBUaGlzIGlzIGRlcHJlY2F0ZWQsIGRlbGV0ZSBhZnRlciBy b2xsaW5nIERFUHMgYW5kIGNocm9tZSBpcyB1c2luZyB0aGUgbmV3IG1ldGhvZHMuCi12b2lkIFdl YkRhdGFiYXNlOjp1cGRhdGVEYXRhYmFzZVNpemUoCi0gICAgY29uc3QgV2ViU3RyaW5nJiBvcmln aW5JZGVudGlmaWVyLCBjb25zdCBXZWJTdHJpbmcmIGRhdGFiYXNlTmFtZSwKLSAgICBsb25nIGxv bmcgZGF0YWJhc2VTaXplLCBsb25nIGxvbmcgc3BhY2VBdmFpbGFibGUpCi17Ci0jaWYgRU5BQkxF KERBVEFCQVNFKQotICAgIHVwZGF0ZURhdGFiYXNlU2l6ZShvcmlnaW5JZGVudGlmaWVyLCBkYXRh YmFzZU5hbWUsIGRhdGFiYXNlU2l6ZSk7Ci0gICAgdXBkYXRlU3BhY2VBdmFpbGFibGUob3JpZ2lu SWRlbnRpZmllciwgc3BhY2VBdmFpbGFibGUpOwotI2VuZGlmIC8vIEVOQUJMRShEQVRBQkFTRSkK KyNlbmRpZgogfQogCiB2b2lkIFdlYkRhdGFiYXNlOjpjbG9zZURhdGFiYXNlSW1tZWRpYXRlbHko Y29uc3QgV2ViU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyLCBjb25zdCBXZWJTdHJpbmcmIGRhdGFi YXNlTmFtZSkKIHsKICNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgSGFzaFNldDxSZWZQdHI8QWJz dHJhY3REYXRhYmFzZT4gPiBkYXRhYmFzZUhhbmRsZXM7Ci0gICAgUmVmUHRyPFNlY3VyaXR5T3Jp Z2luPiBvcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRlbnRpZmll cihvcmlnaW5JZGVudGlmaWVyKTsKLSAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5nZXRP cGVuRGF0YWJhc2VzKG9yaWdpbi5nZXQoKSwgZGF0YWJhc2VOYW1lLCAmZGF0YWJhc2VIYW5kbGVz KTsKKyAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5nZXRPcGVuRGF0YWJhc2VzKG9yaWdp bklkZW50aWZpZXIsIGRhdGFiYXNlTmFtZSwgJmRhdGFiYXNlSGFuZGxlcyk7CiAgICAgZm9yIChI YXNoU2V0PFJlZlB0cjxBYnN0cmFjdERhdGFiYXNlPiA+OjppdGVyYXRvciBpdCA9IGRhdGFiYXNl SGFuZGxlcy5iZWdpbigpOyBpdCAhPSBkYXRhYmFzZUhhbmRsZXMuZW5kKCk7ICsraXQpCiAgICAg ICAgIGl0LT5nZXQoKS0+Y2xvc2VJbW1lZGlhdGVseSgpOwotI2VuZGlmIC8vIEVOQUJMRShEQVRB QkFTRSkKKyNlbmRpZgogfQogCiBXZWJEYXRhYmFzZTo6V2ViRGF0YWJhc2UoY29uc3QgQWJzdHJh Y3REYXRhYmFzZSogZGF0YWJhc2UpCg== 94841 2011-05-25 12:50:52 -0700 2011-05-26 14:33:50 -0700 SimplerStringKey delete2.txt text/plain 9044 michaeln SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MjYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMjQgIE1pY2hhZWwg Tm9yZG1hbiAgPG1pY2hhZWxuQGdvb2dsZS5jb20+CisKKyAgICAgICAgW0Nocm9taXVtXSBVc2Ug U2VjdXJpdHlPcmlnaW4gcHJvZHVjZWQgZGF0YWJhc2VJZGVudGlmaWVyIHN0cmluZ3MsIGluc3Rl YWQgb2YKKyAgICAgICAgU2VjdXJpdHlPcmlnaW4gUmVmUHRycywgYXMgdGhlIHRvcCBsZXZlbCBr ZXkgaW50byB0aGUgRGF0YWJhc2VUcmFja2VyJ3MKKyAgICAgICAgY29sbGVjdGlvbiBvZiBvcGVu IGRhdGFiYXNlcy4gT3RoZXJ3aXNlIHdlIGNhbiBmYWlsIHRvIGxvb2t1cCBkYXRhYmFzZXMgd2hl bgorICAgICAgICB0cnlpbmcgdG8gZm9yY2VhYmx5IGNsb3NlIHRoZW0gdmlhICBXZWJEYXRhYmFz ZTo6Y2xvc2VEYXRhYmFzZUltbWVkaWF0ZWx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE0MTcKKworICAgICAgICBOZXcgbmV3IGZ1bmN0aW9uYWxp dHksIG5vIHRlc3RzLgorCisgICAgICAgICogc3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIuaDoKKyAg ICAgICAgKiBzdG9yYWdlL2Nocm9taXVtL0RhdGFiYXNlVHJhY2tlckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6YWRkT3BlbkRhdGFiYXNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6cmVtb3ZlT3BlbkRhdGFiYXNlKToKKyAgICAg ICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6Z2V0T3BlbkRhdGFiYXNlcyk6CisgICAgICAg IChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmludGVycnVwdEFsbERhdGFiYXNlc0ZvckNvbnRl eHQpOgorCiAyMDExLTA1LTI0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdG9y YWdlL0RhdGFiYXNlVHJhY2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvRGF0YWJhc2VUcmFja2VyLmgJKHJldmlzaW9uIDg3MjU5KQorKysgU291cmNlL1dlYkNvcmUv c3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIuaAkod29ya2luZyBjb3B5KQpAQCAtODQsMTMgKzg0LDYg QEAgcHVibGljOgogcHJpdmF0ZToKICAgICBEYXRhYmFzZVRyYWNrZXIoY29uc3QgU3RyaW5nJiBk YXRhYmFzZVBhdGgpOwogCi0gICAgdHlwZWRlZiBIYXNoU2V0PEFic3RyYWN0RGF0YWJhc2UqPiBE YXRhYmFzZVNldDsKLSAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBEYXRhYmFzZVNldCo+IERh dGFiYXNlTmFtZU1hcDsKLSAgICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiwgRGF0YWJhc2VOYW1lTWFwKiwgU2VjdXJpdHlPcmlnaW5IYXNoPiBEYXRhYmFzZU9yaWdpbk1h cDsKLQotICAgIE11dGV4IG1fb3BlbkRhdGFiYXNlTWFwR3VhcmQ7Ci0gICAgbXV0YWJsZSBPd25Q dHI8RGF0YWJhc2VPcmlnaW5NYXA+IG1fb3BlbkRhdGFiYXNlTWFwOwotCiAjaWYgIVBMQVRGT1JN KENIUk9NSVVNKQogcHVibGljOgogICAgIHZvaWQgc2V0RGF0YWJhc2VEaXJlY3RvcnlQYXRoKGNv bnN0IFN0cmluZyYpOwpAQCAtMTM2LDYgKzEyOSwxMyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBk ZWxldGVEYXRhYmFzZUZpbGUoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBTdHJpbmcmIG5hbWUpOwog CisgICAgdHlwZWRlZiBIYXNoU2V0PEFic3RyYWN0RGF0YWJhc2UqPiBEYXRhYmFzZVNldDsKKyAg ICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBEYXRhYmFzZVNldCo+IERhdGFiYXNlTmFtZU1hcDsK KyAgICB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPiwgRGF0YWJhc2VOYW1l TWFwKiwgU2VjdXJpdHlPcmlnaW5IYXNoPiBEYXRhYmFzZU9yaWdpbk1hcDsKKworICAgIE11dGV4 IG1fb3BlbkRhdGFiYXNlTWFwR3VhcmQ7CisgICAgbXV0YWJsZSBPd25QdHI8RGF0YWJhc2VPcmln aW5NYXA+IG1fb3BlbkRhdGFiYXNlTWFwOworCiAgICAgLy8gVGhpcyBsb2NrIHByb3RlY3RzIG1f ZGF0YWJhc2UsIG1fcXVvdGFNYXAsIG1fcHJvcG9zZWREYXRhYmFzZXMsIG1fZGF0YWJhc2VEaXJl Y3RvcnlQYXRoLCBtX29yaWdpbnNCZWluZ0RlbGV0ZWQsIG1fYmVpbmdDcmVhdGVkLCBhbmQgbV9i ZWluZ0RlbGV0ZWQuCiAgICAgTXV0ZXggbV9kYXRhYmFzZUd1YXJkOwogICAgIFNRTGl0ZURhdGFi YXNlIG1fZGF0YWJhc2U7CkBAIC0xNzEsNiArMTcxLDE3IEBAIHByaXZhdGU6CiAKICAgICBzdGF0 aWMgdm9pZCBzY2hlZHVsZUZvck5vdGlmaWNhdGlvbigpOwogICAgIHN0YXRpYyB2b2lkIG5vdGlm eURhdGFiYXNlc0NoYW5nZWQodm9pZCopOworI2Vsc2UKK3B1YmxpYzoKKyAgICB2b2lkIGdldE9w ZW5EYXRhYmFzZXMoU3RyaW5nIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgbmFtZSwg SGFzaFNldDxSZWZQdHI8QWJzdHJhY3REYXRhYmFzZT4gPiogZGF0YWJhc2VzKTsKKworcHJpdmF0 ZToKKyAgICB0eXBlZGVmIEhhc2hTZXQ8QWJzdHJhY3REYXRhYmFzZSo+IERhdGFiYXNlU2V0Owor ICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIERhdGFiYXNlU2V0Kj4gRGF0YWJhc2VOYW1lTWFw OworICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIERhdGFiYXNlTmFtZU1hcCo+IERhdGFiYXNl T3JpZ2luTWFwOworCisgICAgTXV0ZXggbV9vcGVuRGF0YWJhc2VNYXBHdWFyZDsKKyAgICBtdXRh YmxlIE93blB0cjxEYXRhYmFzZU9yaWdpbk1hcD4gbV9vcGVuRGF0YWJhc2VNYXA7CiAjZW5kaWYg Ly8gIVBMQVRGT1JNKENIUk9NSVVNKQogfTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvc3RvcmFn ZS9jaHJvbWl1bS9EYXRhYmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRhYmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAJ KHJldmlzaW9uIDg3MjU5KQorKysgU291cmNlL1dlYkNvcmUvc3RvcmFnZS9jaHJvbWl1bS9EYXRh YmFzZVRyYWNrZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc2LDEyICs3NiwxMyBA QCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6YWRkT3BlbkRhdGFiYXNlKEFiCiAgICAgQVNTRVJUKGRh dGFiYXNlLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmlzQ29udGV4dFRocmVhZCgpKTsKICAg ICBNdXRleExvY2tlciBvcGVuRGF0YWJhc2VNYXBMb2NrKG1fb3BlbkRhdGFiYXNlTWFwR3VhcmQp OwogICAgIGlmICghbV9vcGVuRGF0YWJhc2VNYXApCi0gICAgICAgIG1fb3BlbkRhdGFiYXNlTWFw ID0gYWRvcHRQdHIobmV3IERhdGFiYXNlT3JpZ2luTWFwKCkpOworICAgICAgICBtX29wZW5EYXRh YmFzZU1hcCA9IGFkb3B0UHRyKG5ldyBEYXRhYmFzZU9yaWdpbk1hcCk7CiAKLSAgICBEYXRhYmFz ZU5hbWVNYXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KGRhdGFiYXNlLT5zZWN1 cml0eU9yaWdpbigpKTsKKyAgICBTdHJpbmcgb3JpZ2luSWRlbnRpZmllciA9IGRhdGFiYXNlLT5z ZWN1cml0eU9yaWdpbigpLT5kYXRhYmFzZUlkZW50aWZpZXIoKTsKKyAgICBEYXRhYmFzZU5hbWVN YXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KG9yaWdpbklkZW50aWZpZXIpOwog ICAgIGlmICghbmFtZU1hcCkgewogICAgICAgICBuYW1lTWFwID0gbmV3IERhdGFiYXNlTmFtZU1h cCgpOwotICAgICAgICBtX29wZW5EYXRhYmFzZU1hcC0+c2V0KGRhdGFiYXNlLT5zZWN1cml0eU9y aWdpbigpLCBuYW1lTWFwKTsKKyAgICAgICAgbV9vcGVuRGF0YWJhc2VNYXAtPnNldChvcmlnaW5J ZGVudGlmaWVyLCBuYW1lTWFwKTsKICAgICB9CiAKICAgICBTdHJpbmcgbmFtZShkYXRhYmFzZS0+ c3RyaW5nSWRlbnRpZmllcigpKTsKQEAgLTEyNCw5ICsxMjUsMTAgQEAgdm9pZCBEYXRhYmFzZVRy YWNrZXI6OnJlbW92ZU9wZW5EYXRhYmFzZQogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAg U3RyaW5nIG9yaWdpbklkZW50aWZpZXIgPSBkYXRhYmFzZS0+c2VjdXJpdHlPcmlnaW4oKS0+ZGF0 YWJhc2VJZGVudGlmaWVyKCk7CiAgICAgTXV0ZXhMb2NrZXIgb3BlbkRhdGFiYXNlTWFwTG9jayht X29wZW5EYXRhYmFzZU1hcEd1YXJkKTsKICAgICBBU1NFUlQobV9vcGVuRGF0YWJhc2VNYXApOwot ICAgIERhdGFiYXNlTmFtZU1hcCogbmFtZU1hcCA9IG1fb3BlbkRhdGFiYXNlTWFwLT5nZXQoZGF0 YWJhc2UtPnNlY3VyaXR5T3JpZ2luKCkpOworICAgIERhdGFiYXNlTmFtZU1hcCogbmFtZU1hcCA9 IG1fb3BlbkRhdGFiYXNlTWFwLT5nZXQob3JpZ2luSWRlbnRpZmllcik7CiAgICAgQVNTRVJUKG5h bWVNYXApOwogICAgIFN0cmluZyBuYW1lKGRhdGFiYXNlLT5zdHJpbmdJZGVudGlmaWVyKCkpOwog ICAgIERhdGFiYXNlU2V0KiBkYXRhYmFzZVNldCA9IG5hbWVNYXAtPmdldChuYW1lKTsKQEAgLTEz Nyw3ICsxMzksNyBAQCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6cmVtb3ZlT3BlbkRhdGFiYXNlCiAg ICAgICAgIG5hbWVNYXAtPnJlbW92ZShuYW1lKTsKICAgICAgICAgZGVsZXRlIGRhdGFiYXNlU2V0 OwogICAgICAgICBpZiAobmFtZU1hcC0+aXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBtX29wZW5E YXRhYmFzZU1hcC0+cmVtb3ZlKGRhdGFiYXNlLT5zZWN1cml0eU9yaWdpbigpKTsKKyAgICAgICAg ICAgIG1fb3BlbkRhdGFiYXNlTWFwLT5yZW1vdmUob3JpZ2luSWRlbnRpZmllcik7CiAgICAgICAg ICAgICBkZWxldGUgbmFtZU1hcDsKICAgICAgICAgfQogICAgIH0KQEAgLTE0NSwxNCArMTQ3LDE4 IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpyZW1vdmVPcGVuRGF0YWJhc2UKICAgICBEYXRhYmFz ZU9ic2VydmVyOjpkYXRhYmFzZUNsb3NlZChkYXRhYmFzZSk7CiB9CiAKLQogdm9pZCBEYXRhYmFz ZVRyYWNrZXI6OmdldE9wZW5EYXRhYmFzZXMoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3Qg U3RyaW5nJiBuYW1lLCBIYXNoU2V0PFJlZlB0cjxBYnN0cmFjdERhdGFiYXNlPiA+KiBkYXRhYmFz ZXMpCiB7CisgICAgZ2V0T3BlbkRhdGFiYXNlcyhvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigp LCBuYW1lLCBkYXRhYmFzZXMpOworfQorCit2b2lkIERhdGFiYXNlVHJhY2tlcjo6Z2V0T3BlbkRh dGFiYXNlcyhTdHJpbmcgb3JpZ2luSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBuYW1lLCBIYXNo U2V0PFJlZlB0cjxBYnN0cmFjdERhdGFiYXNlPiA+KiBkYXRhYmFzZXMpCit7CiAgICAgTXV0ZXhM b2NrZXIgb3BlbkRhdGFiYXNlTWFwTG9jayhtX29wZW5EYXRhYmFzZU1hcEd1YXJkKTsKICAgICBp ZiAoIW1fb3BlbkRhdGFiYXNlTWFwKQogICAgICAgICByZXR1cm47CiAKLSAgICBEYXRhYmFzZU5h bWVNYXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KG9yaWdpbik7CisgICAgRGF0 YWJhc2VOYW1lTWFwKiBuYW1lTWFwID0gbV9vcGVuRGF0YWJhc2VNYXAtPmdldChvcmlnaW5JZGVu dGlmaWVyKTsKICAgICBpZiAoIW5hbWVNYXApCiAgICAgICAgIHJldHVybjsKIApAQCAtMTgzLDcg KzE4OSw3IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjppbnRlcnJ1cHRBbGxEYXRhYmEKICAgICAg ICAgaWYgKCFtX29wZW5EYXRhYmFzZU1hcCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAg ICBEYXRhYmFzZU5hbWVNYXAqIG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KGNvbnRl eHQtPnNlY3VyaXR5T3JpZ2luKCkpOworICAgICAgICBEYXRhYmFzZU5hbWVNYXAqIG5hbWVNYXAg PSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KGNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCktPmRhdGFi YXNlSWRlbnRpZmllcigpKTsKICAgICAgICAgaWYgKCFuYW1lTWFwKQogICAgICAgICAgICAgcmV0 dXJuOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gODcyNjMpCisr KyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDExLTA1LTI0ICBNaWNoYWVsIE5vcmRtYW4gIDxtaWNoYWVsbkBnb29nbGUu Y29tPgorCisgICAgICAgIFtDaHJvbWl1bV0gVXNlIFNlY3VyaXR5T3JpZ2luIHByb2R1Y2VkIGRh dGFiYXNlSWRlbnRpZmllciBzdHJpbmdzLCBpbnN0ZWFkIG9mCisgICAgICAgIFNlY3VyaXR5T3Jp Z2luIFJlZlB0cnMsIGFzIHRoZSB0b3AgbGV2ZWwga2V5IGludG8gdGhlIERhdGFiYXNlVHJhY2tl cidzCisgICAgICAgIGNvbGxlY3Rpb24gb2Ygb3BlbiBkYXRhYmFzZXMuIE90aGVyd2lzZSB3ZSBj YW4gZmFpbCB0byBsb29rdXAgZGF0YWJhc2VzIHdoZW4KKyAgICAgICAgdHJ5aW5nIHRvIGZvcmNl YWJseSBjbG9zZSB0aGVtIHZpYSAgV2ViRGF0YWJhc2U6OmNsb3NlRGF0YWJhc2VJbW1lZGlhdGVs eS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNDE3 CisKKyAgICAgICAgKiBzcmMvV2ViRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJE YXRhYmFzZTo6Y2xvc2VEYXRhYmFzZUltbWVkaWF0ZWx5KToKKwogMjAxMS0wNS0yNCAgQWRhbSBC YXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRGF0YWJhc2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkRhdGFiYXNlLmNwcAko cmV2aXNpb24gODcyNTkpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJEYXRhYmFz ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk2LDIxICs5NiwyMSBAQCB2b2lkIFdlYkRhdGFiYXNl Ojp1cGRhdGVEYXRhYmFzZVNpemUoY29uCiB7CiAjaWYgRU5BQkxFKERBVEFCQVNFKQogICAgIFF1 b3RhVHJhY2tlcjo6aW5zdGFuY2UoKS51cGRhdGVEYXRhYmFzZVNpemUob3JpZ2luSWRlbnRpZmll ciwgbmFtZSwgc2l6ZSk7Ci0jZW5kaWYgLy8gRU5BQkxFKERBVEFCQVNFKQorI2VuZGlmCiB9CiAK IHZvaWQgV2ViRGF0YWJhc2U6OnVwZGF0ZVNwYWNlQXZhaWxhYmxlKGNvbnN0IFdlYlN0cmluZyYg b3JpZ2luSWRlbnRpZmllciwgbG9uZyBsb25nIHNwYWNlQXZhaWxhYmxlKQogewogI2lmIEVOQUJM RShEQVRBQkFTRSkKICAgICBRdW90YVRyYWNrZXI6Omluc3RhbmNlKCkudXBkYXRlU3BhY2VBdmFp bGFibGVUb09yaWdpbihvcmlnaW5JZGVudGlmaWVyLCBzcGFjZUF2YWlsYWJsZSk7Ci0jZW5kaWYg Ly8gRU5BQkxFKERBVEFCQVNFKQorI2VuZGlmCiB9CiAKIHZvaWQgV2ViRGF0YWJhc2U6OnJlc2V0 U3BhY2VBdmFpbGFibGUoY29uc3QgV2ViU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKQogewogI2lm IEVOQUJMRShEQVRBQkFTRSkKICAgICBRdW90YVRyYWNrZXI6Omluc3RhbmNlKCkucmVzZXRTcGFj ZUF2YWlsYWJsZVRvT3JpZ2luKG9yaWdpbklkZW50aWZpZXIpOwotI2VuZGlmIC8vIEVOQUJMRShE QVRBQkFTRSkKKyNlbmRpZgogfQogCiAvLyBGSVhNRTogVGhpcyBpcyBkZXByZWNhdGVkLCBkZWxl dGUgYWZ0ZXIgcm9sbGluZyBERVBzIGFuZCBjaHJvbWUgaXMgdXNpbmcgdGhlIG5ldyBtZXRob2Rz LgpAQCAtMTIxLDE4ICsxMjEsMTcgQEAgdm9pZCBXZWJEYXRhYmFzZTo6dXBkYXRlRGF0YWJhc2VT aXplKAogI2lmIEVOQUJMRShEQVRBQkFTRSkKICAgICB1cGRhdGVEYXRhYmFzZVNpemUob3JpZ2lu SWRlbnRpZmllciwgZGF0YWJhc2VOYW1lLCBkYXRhYmFzZVNpemUpOwogICAgIHVwZGF0ZVNwYWNl QXZhaWxhYmxlKG9yaWdpbklkZW50aWZpZXIsIHNwYWNlQXZhaWxhYmxlKTsKLSNlbmRpZiAvLyBF TkFCTEUoREFUQUJBU0UpCisjZW5kaWYKIH0KIAogdm9pZCBXZWJEYXRhYmFzZTo6Y2xvc2VEYXRh YmFzZUltbWVkaWF0ZWx5KGNvbnN0IFdlYlN0cmluZyYgb3JpZ2luSWRlbnRpZmllciwgY29uc3Qg V2ViU3RyaW5nJiBkYXRhYmFzZU5hbWUpCiB7CiAjaWYgRU5BQkxFKERBVEFCQVNFKQogICAgIEhh c2hTZXQ8UmVmUHRyPEFic3RyYWN0RGF0YWJhc2U+ID4gZGF0YWJhc2VIYW5kbGVzOwotICAgIFJl ZlB0cjxTZWN1cml0eU9yaWdpbj4gb3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21E YXRhYmFzZUlkZW50aWZpZXIob3JpZ2luSWRlbnRpZmllcik7Ci0gICAgRGF0YWJhc2VUcmFja2Vy Ojp0cmFja2VyKCkuZ2V0T3BlbkRhdGFiYXNlcyhvcmlnaW4uZ2V0KCksIGRhdGFiYXNlTmFtZSwg JmRhdGFiYXNlSGFuZGxlcyk7CisgICAgRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZ2V0T3Bl bkRhdGFiYXNlcyhvcmlnaW5JZGVudGlmaWVyLCBkYXRhYmFzZU5hbWUsICZkYXRhYmFzZUhhbmRs ZXMpOwogICAgIGZvciAoSGFzaFNldDxSZWZQdHI8QWJzdHJhY3REYXRhYmFzZT4gPjo6aXRlcmF0 b3IgaXQgPSBkYXRhYmFzZUhhbmRsZXMuYmVnaW4oKTsgaXQgIT0gZGF0YWJhc2VIYW5kbGVzLmVu ZCgpOyArK2l0KQogICAgICAgICBpdC0+Z2V0KCktPmNsb3NlSW1tZWRpYXRlbHkoKTsKLSNlbmRp ZiAvLyBFTkFCTEUoREFUQUJBU0UpCisjZW5kaWYKIH0KIAogV2ViRGF0YWJhc2U6OldlYkRhdGFi YXNlKGNvbnN0IEFic3RyYWN0RGF0YWJhc2UqIGRhdGFiYXNlKQo=