43482 2010-08-04 06:22:57 -0700 Web Inspector: serialize database resources to InspectorValues 2010-08-11 09:46:53 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 259995 0 yurys 2010-08-04 06:22:57 -0700 Web Inspector: serialize database resources to InspectorValues 260000 1 63447 yurys 2010-08-04 06:33:02 -0700 Created attachment 63447 Patch 260011 2 63447 pfeldman 2010-08-04 07:25:44 -0700 Comment on attachment 63447 Patch WebCore/inspector/InspectorDatabaseResource.cpp:41 + int nextUnusedId = 1; static ? 260013 3 yurys 2010-08-04 07:27:31 -0700 (In reply to comment #2) > (From update of attachment 63447 [details]) > WebCore/inspector/InspectorDatabaseResource.cpp:41 > + int nextUnusedId = 1; > static ? Done. 260021 4 yurys 2010-08-04 07:43:51 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/Inspector.idl M WebCore/inspector/InspectorBackend.cpp M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/InspectorDatabaseResource.cpp M WebCore/inspector/InspectorDatabaseResource.h M WebCore/inspector/InspectorFrontend.cpp M WebCore/inspector/InspectorFrontend.h M WebCore/storage/Database.cpp Committed r64650 263304 5 joepeck 2010-08-11 09:46:53 -0700 *** Bug 41805 has been marked as a duplicate of this bug. *** 63447 2010-08-04 06:33:02 -0700 2010-08-04 07:25:44 -0700 Patch bug-43482-20100804173259.patch text/plain 14137 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzJkMDhlMmI5YzUzZmU3NjYwZWQ5MTkzODU2YjYxMjEwOWQyZGY0MS4uMGM1Nzg5NjcwZjBlODRj ZjA2NjZhNzY5ODU1Y2YwYTNjOTY3OGU1OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMCBAQAogMjAxMC0wOC0wNCAgWXVy eSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzZXJpYWxpemUgZGF0 YWJhc2UgcmVzb3VyY2VzIHRvIEluc3BlY3RvclZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM0ODIKKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3IuaWRsOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckJhY2tlbmQ6OmdldERhdGFiYXNlVGFibGVOYW1l cyk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OnNlbGVjdERhdGFiYXNlKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZE9wZW5EYXRhYmFzZSk6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZTo6SW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZSk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlOjpiaW5kKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZS5oOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kLmg6CisgICAgICAgICogc3RvcmFnZS9EYXRhYmFzZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpEYXRhYmFzZTo6b3BlbkRhdGFiYXNlKToKKworMjAxMC0wOC0wNCAgWXVyeSBT ZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBQ YXZlbCBGZWxkbWFuLgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNlcmlhbGl6ZSBDUFUgcHJv ZmlsZXMgdG8gSW5zcGVjdG9yVmFsdWVzIGluc3RlYWQgb2YKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5pZGwgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRs CmluZGV4IGRlYTFjZDBhYzE5YjFmYWE5NDdmNTg0YzhmOWVlOWZiZjFmMjNlMmIuLjcwMjg2ZjA2 YzhkMTdjNGM5NmIxNGI3Nzk5OGMyNmQ0MzlkNjY4ZjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlk bApAQCAtNTEsNiArNTEsMTAgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICBbbm90aWZ5XSB2b2lk IHJlc3VtZWRTY3JpcHQoKTsKICAgICAgICAgW25vdGlmeV0gdm9pZCBhZGRQcm9maWxlSGVhZGVy KG91dCBPYmplY3QgaGVhZGVyKTsKICNlbmRpZgorI2lmIGRlZmluZWQoRU5BQkxFX0RBVEFCQVNF KSAmJiBFTkFCTEVfREFUQUJBU0UKKyAgICAgICAgW25vdGlmeV0gdm9pZCBhZGREYXRhYmFzZShv dXQgT2JqZWN0IGRhdGFiYXNlKTsKKyAgICAgICAgW25vdGlmeV0gdm9pZCBzZWxlY3REYXRhYmFz ZShvdXQgaW50IGRhdGFiYXNlSWQpOworI2VuZGlmCiAKICAgICAgICAgW2hhbmRsZXI9Q29udHJv bGxlcl0gdm9pZCBzdG9yZUxhc3RBY3RpdmVQYW5lbChpbiBTdHJpbmcgcGFuZWxOYW1lKTsKIApA QCAtMTU3LDcgKzE2MSw3IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAgW2hhbmRsZXI9Q29udHJv bGxlcl0gdm9pZCBkaWRFdmFsdWF0ZUZvclRlc3RJbkZyb250ZW5kKGluIGxvbmcgY2FsbElkLCBp biBTdHJpbmcganNvblJlc3VsdCk7CiAKICNpZiBkZWZpbmVkKEVOQUJMRV9EQVRBQkFTRSkgJiYg RU5BQkxFX0RBVEFCQVNFCi0gICAgICAgIFtoYW5kbGVyPUJhY2tlbmRdIHZvaWQgZ2V0RGF0YWJh c2VUYWJsZU5hbWVzKGluIGxvbmcgY2FsbElkLCBpbiBsb25nIGRhdGFiYXNlSWQpOworICAgICAg ICBbaGFuZGxlcj1CYWNrZW5kXSB2b2lkIGdldERhdGFiYXNlVGFibGVOYW1lcyhpbiBsb25nIGNh bGxJZCwgaW4gbG9uZyBkYXRhYmFzZUlkLCBvdXQgQXJyYXkgdGFibGVOYW1lcyk7CiAjZW5kaWYK IAogI2lmIGRlZmluZWQoRU5BQkxFX0RPTV9TVE9SQUdFKSAmJiBFTkFCTEVfRE9NX1NUT1JBR0UK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmQuY3BwIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKaW5kZXggYTQ1MTMyOWNhNTljZTVk Nzc0OTQ5ZDM1MzNhYjA5ZDc3NGNlYzk3ZS4uOWE3ZjQzYmZmMmYyOWVmMTBjMzZkNDdjMDYxYzI1 NDg1MDBjNWE1OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2Vu ZC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZC5jcHAKQEAgLTEz NCwxNCArMTM0LDE0IEBAIHZvaWQgSW5zcGVjdG9yQmFja2VuZDo6cmVsZWFzZVdyYXBwZXJPYmpl Y3RHcm91cChsb25nIGluamVjdGVkU2NyaXB0SWQsIGNvbnN0IFN0CiAjaWYgRU5BQkxFKERBVEFC QVNFKQogdm9pZCBJbnNwZWN0b3JCYWNrZW5kOjpnZXREYXRhYmFzZVRhYmxlTmFtZXMobG9uZyBj YWxsSWQsIGxvbmcgZGF0YWJhc2VJZCkKIHsKLSAgICBpZiAoSW5zcGVjdG9yRnJvbnRlbmQqIGZy b250ZW5kID0gaW5zcGVjdG9yRnJvbnRlbmQoKSkgewotICAgICAgICBTY3JpcHRBcnJheSByZXN1 bHQgPSBmcm9udGVuZC0+bmV3U2NyaXB0QXJyYXkoKTsKKyAgICBpZiAoUmVtb3RlSW5zcGVjdG9y RnJvbnRlbmQqIGZyb250ZW5kID0gcmVtb3RlRnJvbnRlbmQoKSkgeworICAgICAgICBSZWZQdHI8 SW5zcGVjdG9yQXJyYXk+IHJlc3VsdCA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKICAgICAg ICAgRGF0YWJhc2UqIGRhdGFiYXNlID0gbV9pbnNwZWN0b3JDb250cm9sbGVyLT5kYXRhYmFzZUZv cklkKGRhdGFiYXNlSWQpOwogICAgICAgICBpZiAoZGF0YWJhc2UpIHsKICAgICAgICAgICAgIFZl Y3RvcjxTdHJpbmc+IHRhYmxlTmFtZXMgPSBkYXRhYmFzZS0+dGFibGVOYW1lcygpOwogICAgICAg ICAgICAgdW5zaWduZWQgbGVuZ3RoID0gdGFibGVOYW1lcy5zaXplKCk7CiAgICAgICAgICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCi0gICAgICAgICAgICAgICAgcmVz dWx0LnNldChpLCB0YWJsZU5hbWVzW2ldKTsKKyAgICAgICAgICAgICAgICByZXN1bHQtPnB1c2hT dHJpbmcodGFibGVOYW1lc1tpXSk7CiAgICAgICAgIH0KICAgICAgICAgZnJvbnRlbmQtPmRpZEdl dERhdGFiYXNlVGFibGVOYW1lcyhjYWxsSWQsIHJlc3VsdCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRleCAwZWFjZjI4ZmU4OTJhNjAxYWI1ZjBl MWFjNGZlMmM2M2Y0MTNmMmIyLi5kYTg5MDAwODJhYzBhOTQzNzJmYzcwZTM0NGM1ZDFjMDk0NmJi MTQ1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcApAQCAtNjcx LDcgKzY3MSw3IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmpl Y3RzKCkKICNpZiBFTkFCTEUoREFUQUJBU0UpCiAgICAgRGF0YWJhc2VSZXNvdXJjZXNNYXA6Oml0 ZXJhdG9yIGRhdGFiYXNlc0VuZCA9IG1fZGF0YWJhc2VSZXNvdXJjZXMuZW5kKCk7CiAgICAgZm9y IChEYXRhYmFzZVJlc291cmNlc01hcDo6aXRlcmF0b3IgaXQgPSBtX2RhdGFiYXNlUmVzb3VyY2Vz LmJlZ2luKCk7IGl0ICE9IGRhdGFiYXNlc0VuZDsgKytpdCkKLSAgICAgICAgaXQtPnNlY29uZC0+ YmluZChtX2Zyb250ZW5kLmdldCgpKTsKKyAgICAgICAgaXQtPnNlY29uZC0+YmluZChtX3JlbW90 ZUZyb250ZW5kLmdldCgpKTsKICNlbmRpZgogI2lmIEVOQUJMRShET01fU1RPUkFHRSkKICAgICBE T01TdG9yYWdlUmVzb3VyY2VzTWFwOjppdGVyYXRvciBkb21TdG9yYWdlRW5kID0gbV9kb21TdG9y YWdlUmVzb3VyY2VzLmVuZCgpOwpAQCAtMTI2NCwxMiArMTI2NCwxMiBAQCB2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmRpZERlc3Ryb3lXb3JrZXIoaW50cHRyX3QgaWQpCiAjaWYgRU5BQkxFKERB VEFCQVNFKQogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzZWxlY3REYXRhYmFzZShEYXRhYmFz ZSogZGF0YWJhc2UpCiB7Ci0gICAgaWYgKCFtX2Zyb250ZW5kKQorICAgIGlmICghbV9yZW1vdGVG cm9udGVuZCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZm9yIChEYXRhYmFzZVJlc291cmNlc01h cDo6aXRlcmF0b3IgaXQgPSBtX2RhdGFiYXNlUmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IG1fZGF0 YWJhc2VSZXNvdXJjZXMuZW5kKCk7ICsraXQpIHsKICAgICAgICAgaWYgKGl0LT5zZWNvbmQtPmRh dGFiYXNlKCkgPT0gZGF0YWJhc2UpIHsKLSAgICAgICAgICAgIG1fZnJvbnRlbmQtPnNlbGVjdERh dGFiYXNlKGl0LT5maXJzdCk7CisgICAgICAgICAgICBtX3JlbW90ZUZyb250ZW5kLT5zZWxlY3RE YXRhYmFzZShpdC0+Zmlyc3QpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9 CkBAIC0xMjgzLDcgKzEyODMsNyBAQCBEYXRhYmFzZSogSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGF0 YWJhc2VGb3JJZChsb25nIGRhdGFiYXNlSWQpCiAgICAgcmV0dXJuIGl0LT5zZWNvbmQtPmRhdGFi YXNlKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkT3BlbkRhdGFiYXNlKERh dGFiYXNlKiBkYXRhYmFzZSwgY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYgbmFt ZSwgY29uc3QgU3RyaW5nJiB2ZXJzaW9uKQordm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRP cGVuRGF0YWJhc2UoUGFzc1JlZlB0cjxEYXRhYmFzZT4gZGF0YWJhc2UsIGNvbnN0IFN0cmluZyYg ZG9tYWluLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmVyc2lvbikKIHsKICAg ICBpZiAoIWVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMTI5Myw4ICsxMjkzLDggQEAg dm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRPcGVuRGF0YWJhc2UoRGF0YWJhc2UqIGRhdGFi YXNlLCBjb25zdCBTdHJpbmcmIGRvbWEKICAgICBtX2RhdGFiYXNlUmVzb3VyY2VzLnNldChyZXNv dXJjZS0+aWQoKSwgcmVzb3VyY2UpOwogCiAgICAgLy8gUmVzb3VyY2VzIGFyZSBvbmx5IGJvdW5k IHdoaWxlIHZpc2libGUuCi0gICAgaWYgKG1fZnJvbnRlbmQpCi0gICAgICAgIHJlc291cmNlLT5i aW5kKG1fZnJvbnRlbmQuZ2V0KCkpOworICAgIGlmIChtX3JlbW90ZUZyb250ZW5kKQorICAgICAg ICByZXNvdXJjZS0+YmluZChtX3JlbW90ZUZyb250ZW5kLmdldCgpKTsKIH0KICNlbmRpZgogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmggYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKaW5kZXggZWFlNWQxNmNiZjQwZTdm ZjczMWFhYWQwZTJlZDM2NTEzYmMyNWU4YS4uNjI2NWFkMjVhYTBiZjBjNGY1NThiODk0ZDFlYjk1 NzAzZWNjOWJlNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApAQCAt MjEzLDcgKzIxMyw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiAjaWYgRU5BQkxFKERBVEFCQVNFKQot ICAgIHZvaWQgZGlkT3BlbkRhdGFiYXNlKERhdGFiYXNlKiwgY29uc3QgU3RyaW5nJiBkb21haW4s IGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2ZXJzaW9uKTsKKyAgICB2b2lkIGRp ZE9wZW5EYXRhYmFzZShQYXNzUmVmUHRyPERhdGFiYXNlPiwgY29uc3QgU3RyaW5nJiBkb21haW4s IGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2ZXJzaW9uKTsKICNlbmRpZgogI2lm IEVOQUJMRShET01fU1RPUkFHRSkKICAgICB2b2lkIGRpZFVzZURPTVN0b3JhZ2UoU3RvcmFnZUFy ZWEqIHN0b3JhZ2VBcmVhLCBib29sIGlzTG9jYWxTdG9yYWdlLCBGcmFtZSogZnJhbWUpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZS5jcHAg Yi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlLmNwcAppbmRleCBj ZWMwZTI4MGFjM2MyNGFhNzNlOGMyNjE0MTMxYzg3NTZlN2I0MDBmLi5kNjgwZTIyMTAwYTc5NGNm Yzk2YjM0ZTA5MjA0ODlmOGFmNTEwZjllIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JEYXRhYmFzZVJlc291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JEYXRhYmFzZVJlc291cmNlLmNwcApAQCAtMzMsMTggKzMzLDIxIEBACiAKICNpZiBFTkFC TEUoREFUQUJBU0UpICYmIEVOQUJMRShJTlNQRUNUT1IpCiAjaW5jbHVkZSAiRGF0YWJhc2UuaCIK LSNpbmNsdWRlICJEb2N1bWVudC5oIgotI2luY2x1ZGUgIkZyYW1lLmgiCi0jaW5jbHVkZSAiSW5z cGVjdG9yRnJvbnRlbmQuaCIKLSNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIKKyNpbmNsdWRlICJJ bnNwZWN0b3JWYWx1ZXMuaCIKKyNpbmNsdWRlICJSZW1vdGVJbnNwZWN0b3JGcm9udGVuZC5oIgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWludCBJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlOjpz X25leHRVbnVzZWRJZCA9IDE7CitpbnQgbmV4dFVudXNlZElkID0gMTsKIAotSW5zcGVjdG9yRGF0 YWJhc2VSZXNvdXJjZTo6SW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZShEYXRhYmFzZSogZGF0YWJh c2UsIGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmlu ZyYgdmVyc2lvbikKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZT4gSW5zcGVj dG9yRGF0YWJhc2VSZXNvdXJjZTo6Y3JlYXRlKFBhc3NSZWZQdHI8RGF0YWJhc2U+IGRhdGFiYXNl LCBjb25zdCBTdHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcm IHZlcnNpb24pCit7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBJbnNwZWN0b3JEYXRhYmFzZVJl c291cmNlKGRhdGFiYXNlLCBkb21haW4sIG5hbWUsIHZlcnNpb24pKTsKK30KKworSW5zcGVjdG9y RGF0YWJhc2VSZXNvdXJjZTo6SW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZShQYXNzUmVmUHRyPERh dGFiYXNlPiBkYXRhYmFzZSwgY29uc3QgU3RyaW5nJiBkb21haW4sIGNvbnN0IFN0cmluZyYgbmFt ZSwgY29uc3QgU3RyaW5nJiB2ZXJzaW9uKQogICAgIDogbV9kYXRhYmFzZShkYXRhYmFzZSkKLSAg ICAsIG1faWQoc19uZXh0VW51c2VkSWQrKykKKyAgICAsIG1faWQobmV4dFVudXNlZElkKyspCiAg ICAgLCBtX2RvbWFpbihkb21haW4pCiAgICAgLCBtX25hbWUobmFtZSkKICAgICAsIG1fdmVyc2lv bih2ZXJzaW9uKQpAQCAtNTIsMTggKzU1LDE5IEBAIEluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2U6 Okluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2UoRGF0YWJhc2UqIGRhdGFiYXNlLCBjb25zdCBTCiB7 CiB9CiAKLXZvaWQgSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZTo6YmluZChJbnNwZWN0b3JGcm9u dGVuZCogZnJvbnRlbmQpCit2b2lkIEluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2U6OmJpbmQoUmVt b3RlSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogewogICAgIGlmIChtX3NjcmlwdE9iamVj dENyZWF0ZWQpCiAgICAgICAgIHJldHVybjsKIAotICAgIFNjcmlwdE9iamVjdCBqc29uT2JqZWN0 ID0gZnJvbnRlbmQtPm5ld1NjcmlwdE9iamVjdCgpOwotICAgIGpzb25PYmplY3Quc2V0KCJpZCIs IG1faWQpOwotICAgIGpzb25PYmplY3Quc2V0KCJkb21haW4iLCBtX2RvbWFpbik7Ci0gICAganNv bk9iamVjdC5zZXQoIm5hbWUiLCBtX25hbWUpOwotICAgIGpzb25PYmplY3Quc2V0KCJ2ZXJzaW9u IiwgbV92ZXJzaW9uKTsKLSAgICBpZiAoZnJvbnRlbmQtPmFkZERhdGFiYXNlKGpzb25PYmplY3Qp KQotICAgICAgICBtX3NjcmlwdE9iamVjdENyZWF0ZWQgPSB0cnVlOworICAgIFJlZlB0cjxJbnNw ZWN0b3JPYmplY3Q+IGpzb25PYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOworICAg IGpzb25PYmplY3QtPnNldE51bWJlcigiaWQiLCBtX2lkKTsKKyAgICBqc29uT2JqZWN0LT5zZXRT dHJpbmcoImRvbWFpbiIsIG1fZG9tYWluKTsKKyAgICBqc29uT2JqZWN0LT5zZXRTdHJpbmcoIm5h bWUiLCBtX25hbWUpOworICAgIGpzb25PYmplY3QtPnNldFN0cmluZygidmVyc2lvbiIsIG1fdmVy c2lvbik7CisKKyAgICBmcm9udGVuZC0+YWRkRGF0YWJhc2UoanNvbk9iamVjdCk7CisgICAgbV9z Y3JpcHRPYmplY3RDcmVhdGVkID0gdHJ1ZTsKIH0KIAogdm9pZCBJbnNwZWN0b3JEYXRhYmFzZVJl c291cmNlOjp1bmJpbmQoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RGF0YWJhc2VSZXNvdXJjZS5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VS ZXNvdXJjZS5oCmluZGV4IGY4MmQ4OThkMGZjMDRjZWMxNGZmZWYyMjQ4MTVlZTlhNzQwOWJiNzUu LjhlMGUxYjNiMTFmODc1ZDczOTdlZTgwMmUzNmU3NGE4Y2EyYmRlZjkgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRhdGFiYXNlUmVzb3VyY2UuaAorKysgYi9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlLmgKQEAgLTMyLDQxICszMiwzMyBA QAogI2RlZmluZSBJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlX2gKIAogI2lmIEVOQUJMRShEQVRB QkFTRSkKLQotI2luY2x1ZGUgIkRhdGFiYXNlLmgiCi0jaW5jbHVkZSAiU2NyaXB0T2JqZWN0Lmgi Ci0jaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKLQorI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgi CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewotICAgIGNs YXNzIEluc3BlY3RvckZyb250ZW5kOwotICAgIAotICAgIGNsYXNzIEluc3BlY3RvckRhdGFiYXNl UmVzb3VyY2UgOiBwdWJsaWMgUmVmQ291bnRlZDxJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlPiB7 Ci0gICAgcHVibGljOgotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JEYXRhYmFz ZVJlc291cmNlPiBjcmVhdGUoRGF0YWJhc2UqIGRhdGFiYXNlLCBjb25zdCBTdHJpbmcmIGRvbWFp biwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZlcnNpb24pCi0gICAgICAgIHsK LSAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJj ZShkYXRhYmFzZSwgZG9tYWluLCBuYW1lLCB2ZXJzaW9uKSk7Ci0gICAgICAgIH0KK2NsYXNzIERh dGFiYXNlOworY2xhc3MgUmVtb3RlSW5zcGVjdG9yRnJvbnRlbmQ7CisKK2NsYXNzIEluc3BlY3Rv ckRhdGFiYXNlUmVzb3VyY2UgOiBwdWJsaWMgUmVmQ291bnRlZDxJbnNwZWN0b3JEYXRhYmFzZVJl c291cmNlPiB7CitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yRGF0YWJh c2VSZXNvdXJjZT4gY3JlYXRlKFBhc3NSZWZQdHI8RGF0YWJhc2U+IGRhdGFiYXNlLCBjb25zdCBT dHJpbmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZlcnNpb24p OwogCi0gICAgICAgIHZvaWQgYmluZChJbnNwZWN0b3JGcm9udGVuZCogZnJvbnRlbmQpOwotICAg ICAgICB2b2lkIHVuYmluZCgpOwotICAgICAgICBEYXRhYmFzZSogZGF0YWJhc2UoKSB7IHJldHVy biBtX2RhdGFiYXNlLmdldCgpOyB9Ci0gICAgICAgIGxvbmcgaWQoKSBjb25zdCB7IHJldHVybiBt X2lkOyB9Ci0gICAgcHJpdmF0ZToKLSAgICAgICAgSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZShE YXRhYmFzZSosIGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0 IFN0cmluZyYgdmVyc2lvbik7Ci0gICAgICAgIAotICAgICAgICBSZWZQdHI8RGF0YWJhc2U+IG1f ZGF0YWJhc2U7Ci0gICAgICAgIGludCBtX2lkOwotICAgICAgICBTdHJpbmcgbV9kb21haW47Ci0g ICAgICAgIFN0cmluZyBtX25hbWU7Ci0gICAgICAgIFN0cmluZyBtX3ZlcnNpb247Ci0gICAgICAg IGJvb2wgbV9zY3JpcHRPYmplY3RDcmVhdGVkOworICAgIHZvaWQgYmluZChSZW1vdGVJbnNwZWN0 b3JGcm9udGVuZCogZnJvbnRlbmQpOworICAgIHZvaWQgdW5iaW5kKCk7CisgICAgRGF0YWJhc2Uq IGRhdGFiYXNlKCkgeyByZXR1cm4gbV9kYXRhYmFzZS5nZXQoKTsgfQorICAgIGxvbmcgaWQoKSBj b25zdCB7IHJldHVybiBtX2lkOyB9Citwcml2YXRlOgorICAgIEluc3BlY3RvckRhdGFiYXNlUmVz b3VyY2UoUGFzc1JlZlB0cjxEYXRhYmFzZT4sIGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBT dHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmVyc2lvbik7CiAKLSAgICAgICAgc3RhdGljIGlu dCBzX25leHRVbnVzZWRJZDsKLSAgICB9OworICAgIFJlZlB0cjxEYXRhYmFzZT4gbV9kYXRhYmFz ZTsKKyAgICBpbnQgbV9pZDsKKyAgICBTdHJpbmcgbV9kb21haW47CisgICAgU3RyaW5nIG1fbmFt ZTsKKyAgICBTdHJpbmcgbV92ZXJzaW9uOworICAgIGJvb2wgbV9zY3JpcHRPYmplY3RDcmVhdGVk OworfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZC5jcHAKaW5kZXggNjhlYmU3ZDY4NzBhZjAyYmVjYjE4NjIzMmRhZTFlZTdhYzJk YTJiNi4uY2NjMjZjM2JlZDgwOThiMDA3YzkzZTJjMDgxYzg3MjJjYjI0ZWQ0OSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCisrKyBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcApAQCAtMzgyLDM1ICszODIsNiBAQCB2b2lk IEluc3BlY3RvckZyb250ZW5kOjpkaWREaXNwYXRjaE9uSW5qZWN0ZWRTY3JpcHQobG9uZyBjYWxs SWQsIFNlcmlhbGl6ZWRTY3JpcAogICAgIGZ1bmN0aW9uLmNhbGwoKTsKIH0KIAotI2lmIEVOQUJM RShEQVRBQkFTRSkKLWJvb2wgSW5zcGVjdG9yRnJvbnRlbmQ6OmFkZERhdGFiYXNlKGNvbnN0IFNj cmlwdE9iamVjdCYgZGJPYmplY3QpCi17Ci0gICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9u KG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsgCi0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1l bnQoImFkZERhdGFiYXNlIik7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoZGJPYmplY3Qp OwotICAgIGJvb2wgaGFkRXhjZXB0aW9uID0gZmFsc2U7Ci0gICAgZnVuY3Rpb24uY2FsbChoYWRF eGNlcHRpb24pOwotICAgIHJldHVybiAhaGFkRXhjZXB0aW9uOwotfQotCi12b2lkIEluc3BlY3Rv ckZyb250ZW5kOjpzZWxlY3REYXRhYmFzZShpbnQgZGF0YWJhc2VJZCkKLXsKLSAgICBTY3JpcHRG dW5jdGlvbkNhbGwgZnVuY3Rpb24obV93ZWJJbnNwZWN0b3IsICJkaXNwYXRjaCIpOyAKLSAgICBm dW5jdGlvbi5hcHBlbmRBcmd1bWVudCgic2VsZWN0RGF0YWJhc2UiKTsKLSAgICBmdW5jdGlvbi5h cHBlbmRBcmd1bWVudChkYXRhYmFzZUlkKTsKLSAgICBmdW5jdGlvbi5jYWxsKCk7Ci19Ci0KLXZv aWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmRpZEdldERhdGFiYXNlVGFibGVOYW1lcyhsb25nIGNhbGxJ ZCwgY29uc3QgU2NyaXB0QXJyYXkmIHRhYmxlTmFtZXMpCi17Ci0gICAgU2NyaXB0RnVuY3Rpb25D YWxsIGZ1bmN0aW9uKG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsgCi0gICAgZnVuY3Rpb24u YXBwZW5kQXJndW1lbnQoImRpZEdldERhdGFiYXNlVGFibGVOYW1lcyIpOwotICAgIGZ1bmN0aW9u LmFwcGVuZEFyZ3VtZW50KGNhbGxJZCk7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQodGFi bGVOYW1lcyk7Ci0gICAgZnVuY3Rpb24uY2FsbCgpOwotfQotI2VuZGlmCi0KICNpZiBFTkFCTEUo RE9NX1NUT1JBR0UpCiBib29sIEluc3BlY3RvckZyb250ZW5kOjphZGRET01TdG9yYWdlKGNvbnN0 IFNjcmlwdE9iamVjdCYgZG9tU3RvcmFnZU9iaikKIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JG cm9udGVuZC5oCmluZGV4IDJhYjVhMWUxYjYwYjczNmNmNGY2ZTAwZWIxY2VlZTJjYmQwMGRhZWMu LjhkOTg0YTM3MzJmNjhhZTllNjc1ZGE3YWRmZTU3NzhiZjk2NzMwOGEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmQuaApAQCAtMTA2LDEyICsxMDYsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIHZvaWQgZGlkR2V0UHJvZmlsZShsb25nIGNhbGxJZCwgY29uc3QgU2Ny aXB0VmFsdWUmIHByb2ZpbGUpOwogI2VuZGlmCiAKLSNpZiBFTkFCTEUoREFUQUJBU0UpCi0gICAg ICAgIGJvb2wgYWRkRGF0YWJhc2UoY29uc3QgU2NyaXB0T2JqZWN0JiBkYk9iaik7Ci0gICAgICAg IHZvaWQgc2VsZWN0RGF0YWJhc2UoaW50IGRhdGFiYXNlSWQpOwotICAgICAgICB2b2lkIGRpZEdl dERhdGFiYXNlVGFibGVOYW1lcyhsb25nIGNhbGxJZCwgY29uc3QgU2NyaXB0QXJyYXkmIHRhYmxl TmFtZXMpOwotI2VuZGlmCi0KICNpZiBFTkFCTEUoRE9NX1NUT1JBR0UpCiAgICAgICAgIGJvb2wg YWRkRE9NU3RvcmFnZShjb25zdCBTY3JpcHRPYmplY3QmIGRvbVN0b3JhZ2VPYmopOwogICAgICAg ICB2b2lkIHNlbGVjdERPTVN0b3JhZ2UobG9uZyBzdG9yYWdlSWQpOwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9zdG9yYWdlL0RhdGFiYXNlLmNwcCBiL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFzZS5jcHAK aW5kZXggZmY1OWRlZThhYzMzNjQzYTE2ZTkyMDZjOWE3NjRiOWIyNzkwNmIzMi4uMmQ2MGFjYjdm YTk1MWQzZDY1NTQ1MjY3ZTE3YzI3YjU4YzJjMjZiNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9zdG9y YWdlL0RhdGFiYXNlLmNwcAorKysgYi9XZWJDb3JlL3N0b3JhZ2UvRGF0YWJhc2UuY3BwCkBAIC0x MDksNyArMTA5LDcgQEAgUGFzc1JlZlB0cjxEYXRhYmFzZT4gRGF0YWJhc2U6Om9wZW5EYXRhYmFz ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBjb24KICAgICBpZiAoY29udGV4dC0+ aXNEb2N1bWVudCgpKSB7CiAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0 PERvY3VtZW50Kj4oY29udGV4dCk7CiAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQt PnBhZ2UoKSkKLSAgICAgICAgICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+ZGlkT3Bl bkRhdGFiYXNlKGRhdGFiYXNlLmdldCgpLCBjb250ZXh0LT5zZWN1cml0eU9yaWdpbigpLT5ob3N0 KCksIG5hbWUsIGV4cGVjdGVkVmVyc2lvbik7CisgICAgICAgICAgICBwYWdlLT5pbnNwZWN0b3JD b250cm9sbGVyKCktPmRpZE9wZW5EYXRhYmFzZShkYXRhYmFzZSwgY29udGV4dC0+c2VjdXJpdHlP cmlnaW4oKS0+aG9zdCgpLCBuYW1lLCBleHBlY3RlZFZlcnNpb24pOwogICAgIH0KICNlbmRpZgog Cg==