43486 2010-08-04 08:42:24 -0700 Web Inspector: serialize DOM storage items to InspectorValues 2010-08-04 23:00:56 -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 260037 0 yurys 2010-08-04 08:42:24 -0700 Web Inspector: serialize DOM storage items to InspectorValues 260040 1 63452 yurys 2010-08-04 08:47:25 -0700 Created attachment 63452 Patch 260413 2 yurys 2010-08-04 23:00:56 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/Inspector.idl M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorDOMStorageResource.cpp M WebCore/inspector/InspectorDOMStorageResource.h M WebCore/inspector/InspectorFrontend.cpp M WebCore/inspector/InspectorFrontend.h Committed r64713 63452 2010-08-04 08:47:25 -0700 2010-08-04 08:49:51 -0700 Patch bug-43486-20100804194722.patch text/plain 13114 yurys ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTZhN2JmNTIwMGM4MzNlYjUwZWVlZDVhZGMwZTRhMGM1MGI0MGFiZC4uNjk1OTEyZTU1MzhjODY1 MmY0YTAxZWE2ODFjZmJlNTg4ZDFiYzA2OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNiBAQAogMjAxMC0wOC0wNCAgWXVy eSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzZXJpYWxpemUgRE9N IHN0b3JhZ2UgaXRlbXMgdG8gSW5zcGVjdG9yVmFsdWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQ4NgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvci5pZGw6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRP YmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNvbnRyb2xsZXI6OmRpZFVzZURP TVN0b3JhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6c2VsZWN0 RE9NU3RvcmFnZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRE T01TdG9yYWdlRW50cmllcyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVy OjpzZXRET01TdG9yYWdlSXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9s bGVyOjpyZW1vdmVET01TdG9yYWdlSXRlbSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckRPTVN0b3JhZ2VSZXNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01T dG9yYWdlUmVzb3VyY2U6OmJpbmQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01T dG9yYWdlUmVzb3VyY2UuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQu Y3BwOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5oOgorCisyMDEwLTA4 LTA0ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJl dmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogdXNlIElu c3BlY3RvclZhbHVlIHRvIHB1c2ggZGlzcGF0Y2ggcmVzdWx0cyBmcm9tIHRoZSBpbmplY3RlZCBz Y3JpcHQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwgYi9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4IDM3M2RkNTE5MzNmNjMwMjM3MWFkZGZl MmZhMmNjMjdjNTc4MDdkZjMuLjQxOTE3ODBjMjY4NGUyODUyZjhjY2JkNmViNWU5NzMwYjZhZGZl MmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbApAQCAtNTUsNiArNTUsMTEgQEAgbW9kdWxlIGNv cmUgewogICAgICAgICBbbm90aWZ5XSB2b2lkIGFkZERhdGFiYXNlKG91dCBPYmplY3QgZGF0YWJh c2UpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHNlbGVjdERhdGFiYXNlKG91dCBpbnQgZGF0YWJh c2VJZCk7CiAjZW5kaWYKKyNpZiBkZWZpbmVkKEVOQUJMRV9ET01fU1RPUkFHRSkgJiYgRU5BQkxF X0RPTV9TVE9SQUdFCisgICAgICAgIFtub3RpZnldIHZvaWQgYWRkRE9NU3RvcmFnZShvdXQgT2Jq ZWN0IHN0b3JhZ2UpOworICAgICAgICBbbm90aWZ5XSB2b2lkIHVwZGF0ZURPTVN0b3JhZ2Uob3V0 IGludCBzdG9yYWdlSWQpOworICAgICAgICBbbm90aWZ5XSB2b2lkIHNlbGVjdERPTVN0b3JhZ2Uo b3V0IGludCBzdG9yYWdlSWQpOworI2VuZGlmCiAKICAgICAgICAgW2hhbmRsZXI9Q29udHJvbGxl cl0gdm9pZCBzdG9yZUxhc3RBY3RpdmVQYW5lbChpbiBTdHJpbmcgcGFuZWxOYW1lKTsKIApAQCAt MTY0LDkgKzE2OSw5IEBAIG1vZHVsZSBjb3JlIHsKICNlbmRpZgogCiAjaWYgZGVmaW5lZChFTkFC TEVfRE9NX1NUT1JBR0UpICYmIEVOQUJMRV9ET01fU1RPUkFHRQotICAgICAgICBbaGFuZGxlcj1D b250cm9sbGVyXSB2b2lkIGdldERPTVN0b3JhZ2VFbnRyaWVzKGluIGxvbmcgY2FsbElkLCBpbiBs b25nIHN0b3JhZ2VJZCk7Ci0gICAgICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgc2V0RE9N U3RvcmFnZUl0ZW0oaW4gbG9uZyBjYWxsSWQsIGluIGxvbmcgc3RvcmFnZUlkLCBpbiBTdHJpbmcg a2V5LCBpbiBTdHJpbmcgdmFsdWUpOwotICAgICAgICBbaGFuZGxlcj1Db250cm9sbGVyXSB2b2lk IHJlbW92ZURPTVN0b3JhZ2VJdGVtKGluIGxvbmcgY2FsbElkLCBpbiBsb25nIHN0b3JhZ2VJZCwg aW4gU3RyaW5nIGtleSk7CisgICAgICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgZ2V0RE9N U3RvcmFnZUVudHJpZXMoaW4gbG9uZyBjYWxsSWQsIGluIGxvbmcgc3RvcmFnZUlkLCBvdXQgQXJy YXkgZW50cmllcyk7CisgICAgICAgIFtoYW5kbGVyPUNvbnRyb2xsZXJdIHZvaWQgc2V0RE9NU3Rv cmFnZUl0ZW0oaW4gbG9uZyBjYWxsSWQsIGluIGxvbmcgc3RvcmFnZUlkLCBpbiBTdHJpbmcga2V5 LCBpbiBTdHJpbmcgdmFsdWUsIG91dCBib29sZWFuIHN1Y2Nlc3MpOworICAgICAgICBbaGFuZGxl cj1Db250cm9sbGVyXSB2b2lkIHJlbW92ZURPTVN0b3JhZ2VJdGVtKGluIGxvbmcgY2FsbElkLCBp biBsb25nIHN0b3JhZ2VJZCwgaW4gU3RyaW5nIGtleSwgb3V0IGJvb2xlYW4gc3VjY2Vzcyk7CiAj ZW5kaWYKIAogICAgIH07CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JD b250cm9sbGVyLmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw CmluZGV4IGQyYjJkZjFhMTI3Njk2YTA3MmM5M2NlMjE4NGM0M2NjYTdmMGMyZDAuLmNjYjBkZDRh MGI2MGViNWRkNWU5MzFhYjEzOGYwNmFjYTkxOTBhNzEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC02NzYsNyArNjc2LDcgQEAgdm9pZCBJbnNwZWN0b3JD b250cm9sbGVyOjpwb3B1bGF0ZVNjcmlwdE9iamVjdHMoKQogI2lmIEVOQUJMRShET01fU1RPUkFH RSkKICAgICBET01TdG9yYWdlUmVzb3VyY2VzTWFwOjppdGVyYXRvciBkb21TdG9yYWdlRW5kID0g bV9kb21TdG9yYWdlUmVzb3VyY2VzLmVuZCgpOwogICAgIGZvciAoRE9NU3RvcmFnZVJlc291cmNl c01hcDo6aXRlcmF0b3IgaXQgPSBtX2RvbVN0b3JhZ2VSZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0g ZG9tU3RvcmFnZUVuZDsgKytpdCkKLSAgICAgICAgaXQtPnNlY29uZC0+YmluZChtX2Zyb250ZW5k LmdldCgpKTsKKyAgICAgICAgaXQtPnNlY29uZC0+YmluZChtX3JlbW90ZUZyb250ZW5kLmdldCgp KTsKICNlbmRpZgogI2lmIEVOQUJMRShXT1JLRVJTKQogICAgIFdvcmtlcnNNYXA6Oml0ZXJhdG9y IHdvcmtlcnNFbmQgPSBtX3dvcmtlcnMuZW5kKCk7CkBAIC0xMzk2LDE0ICsxMzk2LDE0IEBAIHZv aWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkVXNlRE9NU3RvcmFnZShTdG9yYWdlQXJlYSogc3Rv cmFnZUFyZWEsIGJvb2wgaXNMb2NhCiAgICAgbV9kb21TdG9yYWdlUmVzb3VyY2VzLnNldChyZXNv dXJjZS0+aWQoKSwgcmVzb3VyY2UpOwogCiAgICAgLy8gUmVzb3VyY2VzIGFyZSBvbmx5IGJvdW5k IHdoaWxlIHZpc2libGUuCi0gICAgaWYgKG1fZnJvbnRlbmQpCi0gICAgICAgIHJlc291cmNlLT5i aW5kKG1fZnJvbnRlbmQuZ2V0KCkpOworICAgIGlmIChtX3JlbW90ZUZyb250ZW5kKQorICAgICAg ICByZXNvdXJjZS0+YmluZChtX3JlbW90ZUZyb250ZW5kLmdldCgpKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpzZWxlY3RET01TdG9yYWdlKFN0b3JhZ2UqIHN0b3JhZ2UpCiB7CiAg ICAgQVNTRVJUKHN0b3JhZ2UpOwotICAgIGlmICghbV9mcm9udGVuZCkKKyAgICBpZiAoIW1fcmVt b3RlRnJvbnRlbmQpCiAgICAgICAgIHJldHVybjsKIAogICAgIEZyYW1lKiBmcmFtZSA9IHN0b3Jh Z2UtPmZyYW1lKCk7CkBAIC0xNDE4LDE1ICsxNDE4LDE1IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJv bGxlcjo6c2VsZWN0RE9NU3RvcmFnZShTdG9yYWdlKiBzdG9yYWdlKQogICAgICAgICB9CiAgICAg fQogICAgIGlmIChzdG9yYWdlUmVzb3VyY2VJZCkKLSAgICAgICAgbV9mcm9udGVuZC0+c2VsZWN0 RE9NU3RvcmFnZShzdG9yYWdlUmVzb3VyY2VJZCk7CisgICAgICAgIG1fcmVtb3RlRnJvbnRlbmQt PnNlbGVjdERPTVN0b3JhZ2Uoc3RvcmFnZVJlc291cmNlSWQpOwogfQogCiB2b2lkIEluc3BlY3Rv ckNvbnRyb2xsZXI6OmdldERPTVN0b3JhZ2VFbnRyaWVzKGxvbmcgY2FsbElkLCBsb25nIHN0b3Jh Z2VJZCkKIHsKLSAgICBpZiAoIW1fZnJvbnRlbmQpCisgICAgaWYgKCFtX3JlbW90ZUZyb250ZW5k KQogICAgICAgICByZXR1cm47CiAKLSAgICBTY3JpcHRBcnJheSBqc29uQXJyYXkgPSBtX2Zyb250 ZW5kLT5uZXdTY3JpcHRBcnJheSgpOworICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4ganNvbkFy cmF5ID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOwogICAgIEluc3BlY3RvckRPTVN0b3JhZ2VS ZXNvdXJjZSogc3RvcmFnZVJlc291cmNlID0gZ2V0RE9NU3RvcmFnZVJlc291cmNlRm9ySWQoc3Rv cmFnZUlkKTsKICAgICBpZiAoc3RvcmFnZVJlc291cmNlKSB7CiAgICAgICAgIHN0b3JhZ2VSZXNv dXJjZS0+c3RhcnRSZXBvcnRpbmdDaGFuZ2VzVG9Gcm9udGVuZCgpOwpAQCAtMTQzNCwxOCArMTQz NCwxOCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmdldERPTVN0b3JhZ2VFbnRyaWVzKGxv bmcgY2FsbElkLCBsb25nIHN0b3JhZ2VJZCkKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IGRvbVN0b3JhZ2UtPmxlbmd0aCgpOyArK2kpIHsKICAgICAgICAgICAgIFN0cmluZyBuYW1l KGRvbVN0b3JhZ2UtPmtleShpKSk7CiAgICAgICAgICAgICBTdHJpbmcgdmFsdWUoZG9tU3RvcmFn ZS0+Z2V0SXRlbShuYW1lKSk7Ci0gICAgICAgICAgICBTY3JpcHRBcnJheSBlbnRyeSA9IG1fZnJv bnRlbmQtPm5ld1NjcmlwdEFycmF5KCk7Ci0gICAgICAgICAgICBlbnRyeS5zZXQoMCwgbmFtZSk7 Ci0gICAgICAgICAgICBlbnRyeS5zZXQoMSwgdmFsdWUpOwotICAgICAgICAgICAganNvbkFycmF5 LnNldChpLCBlbnRyeSk7CisgICAgICAgICAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGVudHJ5 ID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOworICAgICAgICAgICAgZW50cnktPnB1c2hTdHJp bmcobmFtZSk7CisgICAgICAgICAgICBlbnRyeS0+cHVzaFN0cmluZyh2YWx1ZSk7CisgICAgICAg ICAgICBqc29uQXJyYXktPnB1c2goZW50cnkpOwogICAgICAgICB9CiAgICAgfQotICAgIG1fZnJv bnRlbmQtPmRpZEdldERPTVN0b3JhZ2VFbnRyaWVzKGNhbGxJZCwganNvbkFycmF5KTsKKyAgICBt X3JlbW90ZUZyb250ZW5kLT5kaWRHZXRET01TdG9yYWdlRW50cmllcyhjYWxsSWQsIGpzb25BcnJh eSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6c2V0RE9NU3RvcmFnZUl0ZW0obG9u ZyBjYWxsSWQsIGxvbmcgc3RvcmFnZUlkLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5n JiB2YWx1ZSkKIHsKLSAgICBpZiAoIW1fZnJvbnRlbmQpCisgICAgaWYgKCFtX3JlbW90ZUZyb250 ZW5kKQogICAgICAgICByZXR1cm47CiAKICAgICBib29sIHN1Y2Nlc3MgPSBmYWxzZTsKQEAgLTE0 NTUsMTIgKzE0NTUsMTIgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpzZXRET01TdG9yYWdl SXRlbShsb25nIGNhbGxJZCwgbG9uZyBzdG9yYWdlSWQsIGNvbnN0IFMKICAgICAgICAgc3RvcmFn ZVJlc291cmNlLT5kb21TdG9yYWdlKCktPnNldEl0ZW0oa2V5LCB2YWx1ZSwgZXhjZXB0aW9uKTsK ICAgICAgICAgc3VjY2VzcyA9ICFleGNlcHRpb247CiAgICAgfQotICAgIG1fZnJvbnRlbmQtPmRp ZFNldERPTVN0b3JhZ2VJdGVtKGNhbGxJZCwgc3VjY2Vzcyk7CisgICAgbV9yZW1vdGVGcm9udGVu ZC0+ZGlkU2V0RE9NU3RvcmFnZUl0ZW0oY2FsbElkLCBzdWNjZXNzKTsKIH0KIAogdm9pZCBJbnNw ZWN0b3JDb250cm9sbGVyOjpyZW1vdmVET01TdG9yYWdlSXRlbShsb25nIGNhbGxJZCwgbG9uZyBz dG9yYWdlSWQsIGNvbnN0IFN0cmluZyYga2V5KQogewotICAgIGlmICghbV9mcm9udGVuZCkKKyAg ICBpZiAoIW1fcmVtb3RlRnJvbnRlbmQpCiAgICAgICAgIHJldHVybjsKIAogICAgIGJvb2wgc3Vj Y2VzcyA9IGZhbHNlOwpAQCAtMTQ2OSw3ICsxNDY5LDcgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9s bGVyOjpyZW1vdmVET01TdG9yYWdlSXRlbShsb25nIGNhbGxJZCwgbG9uZyBzdG9yYWdlSWQsIGNv bnMKICAgICAgICAgc3RvcmFnZVJlc291cmNlLT5kb21TdG9yYWdlKCktPnJlbW92ZUl0ZW0oa2V5 KTsKICAgICAgICAgc3VjY2VzcyA9IHRydWU7CiAgICAgfQotICAgIG1fZnJvbnRlbmQtPmRpZFJl bW92ZURPTVN0b3JhZ2VJdGVtKGNhbGxJZCwgc3VjY2Vzcyk7CisgICAgbV9yZW1vdGVGcm9udGVu ZC0+ZGlkUmVtb3ZlRE9NU3RvcmFnZUl0ZW0oY2FsbElkLCBzdWNjZXNzKTsKIH0KIAogSW5zcGVj dG9yRE9NU3RvcmFnZVJlc291cmNlKiBJbnNwZWN0b3JDb250cm9sbGVyOjpnZXRET01TdG9yYWdl UmVzb3VyY2VGb3JJZChsb25nIHN0b3JhZ2VJZCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZS5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UuY3BwCmluZGV4IGFmMDUzMGEyMjY4NDk4MjZkMmEw NjlhZjQ4NDU4YTgyZjZmYzU2NDEuLjYxMDk1YTA2N2IzZTYxZDJjYmY5OTIyMDk5NDExOTE5YmFm MWFiMDYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VS ZXNvdXJjZS5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZVJl c291cmNlLmNwcApAQCAtMzQsMTIgKzM0LDExIEBACiAKICNpbmNsdWRlICJJbnNwZWN0b3JET01T dG9yYWdlUmVzb3VyY2UuaCIKIAotI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRE9N V2luZG93LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCi0j aW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKLSNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIK KyNpbmNsdWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKKyNpbmNsdWRlICJSZW1vdGVJbnNwZWN0b3JG cm9udGVuZC5oIgogI2luY2x1ZGUgIlN0b3JhZ2UuaCIKICNpbmNsdWRlICJTdG9yYWdlRXZlbnQu aCIKIApAQCAtNjUsMTUgKzY0LDE1IEBAIGJvb2wgSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNl Ojppc1NhbWVIb3N0QW5kVHlwZShGcmFtZSogZnJhbWUsIGJvb2wgaXNMb2NhbFN0CiAgICAgcmV0 dXJuIGVxdWFsSWdub3JpbmdDYXNlKG1fZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2lu KCktPmhvc3QoKSwgZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmhvc3QoKSkg JiYgbV9pc0xvY2FsU3RvcmFnZSA9PSBpc0xvY2FsU3RvcmFnZTsKIH0KIAotdm9pZCBJbnNwZWN0 b3JET01TdG9yYWdlUmVzb3VyY2U6OmJpbmQoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQor dm9pZCBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2U6OmJpbmQoUmVtb3RlSW5zcGVjdG9yRnJv bnRlbmQqIGZyb250ZW5kKQogewogICAgIEFTU0VSVCghbV9mcm9udGVuZCk7CiAgICAgbV9mcm9u dGVuZCA9IGZyb250ZW5kOwogCi0gICAgU2NyaXB0T2JqZWN0IGpzb25PYmplY3QgPSBmcm9udGVu ZC0+bmV3U2NyaXB0T2JqZWN0KCk7Ci0gICAganNvbk9iamVjdC5zZXQoImhvc3QiLCBtX2ZyYW1l LT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5ob3N0KCkpOwotICAgIGpzb25PYmplY3Qu c2V0KCJpc0xvY2FsU3RvcmFnZSIsIG1faXNMb2NhbFN0b3JhZ2UpOwotICAgIGpzb25PYmplY3Qu c2V0KCJpZCIsIG1faWQpOworICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGpzb25PYmplY3Qg PSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOworICAgIGpzb25PYmplY3QtPnNldFN0cmluZygi aG9zdCIsIG1fZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmhvc3QoKSk7Cisg ICAganNvbk9iamVjdC0+c2V0Qm9vbCgiaXNMb2NhbFN0b3JhZ2UiLCBtX2lzTG9jYWxTdG9yYWdl KTsKKyAgICBqc29uT2JqZWN0LT5zZXROdW1iZXIoImlkIiwgbV9pZCk7CiAgICAgZnJvbnRlbmQt PmFkZERPTVN0b3JhZ2UoanNvbk9iamVjdCk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZS5oIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlLmgKaW5kZXggMmIxOGIyNDMxZGUwMjYzOWUyMWFj MTE3NDY1M2IyZDI1ODc4NWM2OC4uYTQ3ZTc0Y2ViNTZjZDM2ZmI3MzIxYTYwNjA4ZGJjNmNlZjA5 YmM3MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZVJl c291cmNlLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291 cmNlLmgKQEAgLTM0LDggKzM0LDYgQEAKICNpZiBFTkFCTEUoRE9NX1NUT1JBR0UpCiAKICNpbmNs dWRlICJFdmVudExpc3RlbmVyLmgiCi0jaW5jbHVkZSAiU2NyaXB0T2JqZWN0LmgiCi0jaW5jbHVk ZSAiU2NyaXB0U3RhdGUuaCIKIAogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVk ZSA8d3RmL1JlZkNvdW50ZWQuaD4KQEAgLTQ1LDcgKzQzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiAgICAgY2xhc3MgU3RvcmFnZTsKICAgICBjbGFzcyBGcmFtZTsKLSAgICBjbGFzcyBJbnNw ZWN0b3JGcm9udGVuZDsKKyAgICBjbGFzcyBSZW1vdGVJbnNwZWN0b3JGcm9udGVuZDsKIAogICAg IGNsYXNzIEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZSA6IHB1YmxpYyBFdmVudExpc3RlbmVy IHsKICAgICBwdWJsaWM6CkBAIC01OCw3ICs1Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgICAgIHJldHVybiBsaXN0ZW5lci0+dHlwZSgpID09IEluc3BlY3RvckRPTVN0b3JhZ2VS ZXNvdXJjZVR5cGUgPyBzdGF0aWNfY2FzdDxjb25zdCBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3Vy Y2UqPihsaXN0ZW5lcikgOiAwOwogICAgICAgICB9CiAKLSAgICAgICAgdm9pZCBiaW5kKEluc3Bl Y3RvckZyb250ZW5kKiBmcm9udGVuZCk7CisgICAgICAgIHZvaWQgYmluZChSZW1vdGVJbnNwZWN0 b3JGcm9udGVuZCogZnJvbnRlbmQpOwogICAgICAgICB2b2lkIHVuYmluZCgpOwogICAgICAgICB2 b2lkIHN0YXJ0UmVwb3J0aW5nQ2hhbmdlc1RvRnJvbnRlbmQoKTsKIApAQCAtNzYsNyArNzQsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFJlZlB0cjxTdG9yYWdlPiBtX2RvbVN0b3Jh Z2U7CiAgICAgICAgIGJvb2wgbV9pc0xvY2FsU3RvcmFnZTsKICAgICAgICAgUmVmUHRyPEZyYW1l PiBtX2ZyYW1lOwotICAgICAgICBJbnNwZWN0b3JGcm9udGVuZCogbV9mcm9udGVuZDsKKyAgICAg ICAgUmVtb3RlSW5zcGVjdG9yRnJvbnRlbmQqIG1fZnJvbnRlbmQ7CiAgICAgICAgIGludCBtX2lk OwogICAgICAgICBib29sIG1fcmVwb3J0aW5nQ2hhbmdlc1RvRnJvbnRlbmQ7CiAKZGlmZiAtLWdp dCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcCBiL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmNwcAppbmRleCA5NGY3ZGI1MTgxOGE5M2JkODg1MWZi YTYxYjdmODQxY2EwMGIzYWVhLi4yZTkyNWMwMjQ3ZWJlNjRmZGM5YjUwNGQyYTg4ZGI2NmEwYWVm Y2I5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZC5jcHAK KysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmQuY3BwCkBAIC0zNTIsNjEg KzM1Miw2IEBAIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmRpZEdldENvb2tpZXMobG9uZyBjYWxs SWQsIGNvbnN0IFNjcmlwdEFycmF5JiBjb29raWVzLCBjCiAgICAgZnVuY3Rpb24uY2FsbCgpOwog fQogCi0jaWYgRU5BQkxFKERPTV9TVE9SQUdFKQotYm9vbCBJbnNwZWN0b3JGcm9udGVuZDo6YWRk RE9NU3RvcmFnZShjb25zdCBTY3JpcHRPYmplY3QmIGRvbVN0b3JhZ2VPYmopCi17Ci0gICAgU2Ny aXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsgCi0g ICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoImFkZERPTVN0b3JhZ2UiKTsKLSAgICBmdW5jdGlv bi5hcHBlbmRBcmd1bWVudChkb21TdG9yYWdlT2JqKTsKLSAgICBib29sIGhhZEV4Y2VwdGlvbiA9 IGZhbHNlOwotICAgIGZ1bmN0aW9uLmNhbGwoaGFkRXhjZXB0aW9uKTsKLSAgICByZXR1cm4gIWhh ZEV4Y2VwdGlvbjsKLX0KLQotdm9pZCBJbnNwZWN0b3JGcm9udGVuZDo6c2VsZWN0RE9NU3RvcmFn ZShsb25nIHN0b3JhZ2VJZCkKLXsKLSAgICBTY3JpcHRGdW5jdGlvbkNhbGwgZnVuY3Rpb24obV93 ZWJJbnNwZWN0b3IsICJkaXNwYXRjaCIpOyAKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudCgi c2VsZWN0RE9NU3RvcmFnZSIpOwotICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KHN0b3JhZ2VJ ZCk7Ci0gICAgZnVuY3Rpb24uY2FsbCgpOwotfQotCi12b2lkIEluc3BlY3RvckZyb250ZW5kOjpk aWRHZXRET01TdG9yYWdlRW50cmllcyhsb25nIGNhbGxJZCwgY29uc3QgU2NyaXB0QXJyYXkmIGVu dHJpZXMpCi17Ci0gICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1fd2ViSW5zcGVjdG9y LCAiZGlzcGF0Y2giKTsgCi0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoImRpZEdldERPTVN0 b3JhZ2VFbnRyaWVzIik7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoY2FsbElkKTsKLSAg ICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudChlbnRyaWVzKTsKLSAgICBmdW5jdGlvbi5jYWxsKCk7 Ci19Ci0KLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmRpZFNldERPTVN0b3JhZ2VJdGVtKGxvbmcg Y2FsbElkLCBib29sIHN1Y2Nlc3MpCi17Ci0gICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9u KG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsgCi0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1l bnQoImRpZFNldERPTVN0b3JhZ2VJdGVtIik7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQo Y2FsbElkKTsKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudChzdWNjZXNzKTsKLSAgICBmdW5j dGlvbi5jYWxsKCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmQ6OmRpZFJlbW92ZURPTVN0 b3JhZ2VJdGVtKGxvbmcgY2FsbElkLCBib29sIHN1Y2Nlc3MpCi17Ci0gICAgU2NyaXB0RnVuY3Rp b25DYWxsIGZ1bmN0aW9uKG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsgCi0gICAgZnVuY3Rp b24uYXBwZW5kQXJndW1lbnQoImRpZFJlbW92ZURPTVN0b3JhZ2VJdGVtIik7Ci0gICAgZnVuY3Rp b24uYXBwZW5kQXJndW1lbnQoY2FsbElkKTsKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudChz dWNjZXNzKTsKLSAgICBmdW5jdGlvbi5jYWxsKCk7Ci19Ci0KLXZvaWQgSW5zcGVjdG9yRnJvbnRl bmQ6OnVwZGF0ZURPTVN0b3JhZ2UobG9uZyBzdG9yYWdlSWQpCi17Ci0gICAgU2NyaXB0RnVuY3Rp b25DYWxsIGZ1bmN0aW9uKG1fd2ViSW5zcGVjdG9yLCAiZGlzcGF0Y2giKTsKLSAgICBmdW5jdGlv bi5hcHBlbmRBcmd1bWVudCgidXBkYXRlRE9NU3RvcmFnZSIpOwotICAgIGZ1bmN0aW9uLmFwcGVu ZEFyZ3VtZW50KHN0b3JhZ2VJZCk7Ci0gICAgZnVuY3Rpb24uY2FsbCgpOwotfQotI2VuZGlmCi0K ICNpZiBFTkFCTEUoT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKQogdm9pZCBJbnNwZWN0b3JGcm9u dGVuZDo6ZGlkR2V0QXBwbGljYXRpb25DYWNoZXMobG9uZyBjYWxsSWQsIGNvbnN0IFNjcmlwdFZh bHVlJiBhcHBsaWNhdGlvbkNhY2hlcykKIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kLmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVu ZC5oCmluZGV4IDYzMGM1ODIxYzcxYWI5ZGRkODVhM2Y4OWVmNzc0MDliZDk3MGQ0N2IuLjYyOWE0 MGIyMzYwNzkxNmY1M2E1MzYzZTgzYzU1NzU2MDcxYmYyMjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmQuaApAQCAtMTAyLDE1ICsxMDIsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIHZvaWQgZGlkR2V0UHJvZmlsZShsb25nIGNhbGxJZCwgY29uc3QgU2NyaXB0VmFs dWUmIHByb2ZpbGUpOwogI2VuZGlmCiAKLSNpZiBFTkFCTEUoRE9NX1NUT1JBR0UpCi0gICAgICAg IGJvb2wgYWRkRE9NU3RvcmFnZShjb25zdCBTY3JpcHRPYmplY3QmIGRvbVN0b3JhZ2VPYmopOwot ICAgICAgICB2b2lkIHNlbGVjdERPTVN0b3JhZ2UobG9uZyBzdG9yYWdlSWQpOwotICAgICAgICB2 b2lkIGRpZEdldERPTVN0b3JhZ2VFbnRyaWVzKGxvbmcgY2FsbElkLCBjb25zdCBTY3JpcHRBcnJh eSYgZW50cmllcyk7Ci0gICAgICAgIHZvaWQgZGlkU2V0RE9NU3RvcmFnZUl0ZW0obG9uZyBjYWxs SWQsIGJvb2wgc3VjY2Vzcyk7Ci0gICAgICAgIHZvaWQgZGlkUmVtb3ZlRE9NU3RvcmFnZUl0ZW0o bG9uZyBjYWxsSWQsIGJvb2wgc3VjY2Vzcyk7Ci0gICAgICAgIHZvaWQgdXBkYXRlRE9NU3RvcmFn ZShsb25nIHN0b3JhZ2VJZCk7Ci0jZW5kaWYKLQogI2lmIEVOQUJMRShPRkZMSU5FX1dFQl9BUFBM SUNBVElPTlMpCiAgICAgICAgIHZvaWQgdXBkYXRlQXBwbGljYXRpb25DYWNoZVN0YXR1cyhpbnQg c3RhdHVzKTsKICAgICAgICAgdm9pZCB1cGRhdGVOZXR3b3JrU3RhdGUoYm9vbCBpc05vd09ubGlu ZSk7Cg==