75382 2011-12-30 02:23:52 -0800 Web Inspector: use typed front-end API in the memory agent 2011-12-30 02:31:20 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 528109 0 yurys 2011-12-30 02:23:52 -0800 Web Inspector: use typed front-end API in the memory agent 528111 1 120789 yurys 2011-12-30 02:25:28 -0800 Created attachment 120789 Patch 528112 2 yurys 2011-12-30 02:31:20 -0800 Committed r103841: <http://trac.webkit.org/changeset/103841> 120789 2011-12-30 02:25:28 -0800 2011-12-30 02:29:20 -0800 Patch bug-75382-20111230142526.patch text/plain 8843 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDRkMDQ3ZTZjODdmMjBh YTFhYjQxY2JjZTc3ZDFhNjQ5MjkxN2U0ZS4uMzFkMzk0NDUxOGZkOTM4OWIwZjE5MTkzZTFjM2M1 NGM0YjRjNjhjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTEyLTMwICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHVzZSB0eXBlZCBmcm9udC1lbmQgQVBJIGluIHRoZSBtZW1vcnkgYWdlbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MzgyCisKKyAgICAgICAg TWVtb3J5IGFnZW50IG5vdyB1c2VzIGdlbmVyYXRlIEMrKyBBUEkgZm9yIGNvbW11bmljYXRpbmcg dG8gdGhlIGZyb250LWVuZC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpET01UcmVlU3RhdGlzdGljczo6Q291bnRlclZpc2l0b3I6OkNvdW50ZXJWaXNp dG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkRPTVRyZWVTdGF0aXN0aWNzOjpDb3VudGVyVmlzaXRv cjo6Y291bnRlcnMpOgorICAgICAgICAoV2ViQ29yZTo6RE9NVHJlZVN0YXRpc3RpY3M6OkNvdW50 ZXJWaXNpdG9yOjp2aXNpdE5vZGUpOgorCiAyMDExLTEyLTI5ICBQYXZlbCBGZWxkbWFuICA8cGZl bGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBlbmFibGUgZG9jay10 by1yaWdodCB2aWV3IChzdGlsbCBuZWVkIGVtYmVkZGVycyB0byBzdXBwb3J0IGl0KS4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCmluZGV4 IDc1OWFlMTFhOWYyZTk0NTFiNGViMDZhNDYyZmJhZDc3NDc5NDI1ZmMuLmY3ZTdiM2E4NTg0MDc4 MTk2N2M1MTFmM2QzOWE3YTNjYTJkNDgxMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1 ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXZlbnRMaXN0ZW5lck1hcC5oIgogI2luY2x1ZGUg IkZyYW1lLmgiCisjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJJbnNw ZWN0b3JTdGF0ZS5oIgogI2luY2x1ZGUgIkluc3BlY3RvclZhbHVlcy5oIgogI2luY2x1ZGUgIklu c3RydW1lbnRpbmdBZ2VudHMuaCIKQEAgLTQ3LDc1ICs0OCw4MyBAQAogI2luY2x1ZGUgPHd0Zi9I YXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgogCit1c2luZyBX ZWJDb3JlOjpUeXBlQnVpbGRlcjo6TWVtb3J5OjpET01Hcm91cDsKK3VzaW5nIFdlYkNvcmU6OlR5 cGVCdWlsZGVyOjpNZW1vcnk6Okxpc3RlbmVyQ291bnQ7Cit1c2luZyBXZWJDb3JlOjpUeXBlQnVp bGRlcjo6TWVtb3J5OjpOb2RlQ291bnQ7CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogbmFtZXNw YWNlIHsKIAotY2xhc3MgQ291bnRlclZpc2l0b3IgOiBwdWJsaWMgRE9NV3JhcHBlclZpc2l0b3Ig ewotcHVibGljOgotICAgIENvdW50ZXJWaXNpdG9yKFBhZ2UqIHBhZ2UpIDogbV9wYWdlKHBhZ2Up LCBtX2NvdW50ZXJzKEluc3BlY3RvckFycmF5OjpjcmVhdGUoKSkgeyB9CitTdHJpbmcgbm9kZU5h bWUoTm9kZSogbm9kZSkKK3sKKyAgICBpZiAobm9kZS0+ZG9jdW1lbnQoKS0+aXNYSFRNTERvY3Vt ZW50KCkpCisgICAgICAgICByZXR1cm4gbm9kZS0+bm9kZU5hbWUoKTsKKyAgICByZXR1cm4gbm9k ZS0+bm9kZU5hbWUoKS5sb3dlcigpOworfQogCi0gICAgSW5zcGVjdG9yQXJyYXkqIGNvdW50ZXJz KCkgeyByZXR1cm4gbV9jb3VudGVycy5nZXQoKTsgfQordHlwZWRlZiBIYXNoU2V0PFN0cmluZ0lt cGwqLCBQdHJIYXNoPFN0cmluZ0ltcGwqPiA+IFN0cmluZ0ltcGxJZGVudGl0eVNldDsKIAotICAg IHZpcnR1YWwgdm9pZCB2aXNpdE5vZGUoTm9kZSogbm9kZSkKK2NsYXNzIERPTVRyZWVTdGF0aXN0 aWNzIHsKK3B1YmxpYzoKKyAgICBET01UcmVlU3RhdGlzdGljcyhOb2RlKiByb290Tm9kZSkgOiBt X3RvdGFsTm9kZUNvdW50KDApCiAgICAgewotICAgICAgICBpZiAobm9kZS0+ZG9jdW1lbnQoKS0+ ZnJhbWUoKSAmJiBtX3BhZ2UgIT0gbm9kZS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgpKQot ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBjb2xsZWN0VHJlZVN0YXRpc3RpY3Mocm9vdE5v ZGUpOworICAgIH0KIAotICAgICAgICBOb2RlKiByb290Tm9kZSA9IG5vZGU7Ci0gICAgICAgIHdo aWxlIChyb290Tm9kZS0+cGFyZW50Tm9kZSgpKQotICAgICAgICAgICAgcm9vdE5vZGUgPSByb290 Tm9kZS0+cGFyZW50Tm9kZSgpOworICAgIGludCB0b3RhbE5vZGVDb3VudCgpIHsgcmV0dXJuIG1f dG90YWxOb2RlQ291bnQ7IH0KIAotICAgICAgICBpZiAobV9yb290cy5jb250YWlucyhyb290Tm9k ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIG1fcm9vdHMuYWRkKHJvb3ROb2RlKTsK KyAgICBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBub2RlQ291bnQoKQorICAgIHsKKyAgICAg ICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBjaGlsZHJlblN0YXRzID0gSW5zcGVjdG9yQXJyYXk6 OmNyZWF0ZSgpOworICAgICAgICBmb3IgKEhhc2hNYXA8U3RyaW5nLCBpbnQ+OjppdGVyYXRvciBp dCA9IG1fbm9kZU5hbWVUb0NvdW50LmJlZ2luKCk7IGl0ICE9IG1fbm9kZU5hbWVUb0NvdW50LmVu ZCgpOyArK2l0KSB7CisgICAgICAgICAgICBSZWZQdHI8Tm9kZUNvdW50PiBub2RlQ291bnQgPSBO b2RlQ291bnQ6OmNyZWF0ZSgpLnNldE5vZGVOYW1lKGl0LT5maXJzdCkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuc2V0Q291bnQo aXQtPnNlY29uZCk7CisgICAgICAgICAgICBjaGlsZHJlblN0YXRzLT5wdXNoT2JqZWN0KG5vZGVD b3VudCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGNoaWxkcmVuU3RhdHMucmVsZWFzZSgp OworICAgIH0KIAotICAgICAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBlbnRyeSA9IEluc3Bl Y3Rvck9iamVjdDo6Y3JlYXRlKCk7Ci0gICAgICAgIGVudHJ5LT5zZXRTdHJpbmcoInRpdGxlIiwg cm9vdE5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RUxFTUVOVF9OT0RFID8gZWxlbWVudFRpdGxl KHN0YXRpY19jYXN0PEVsZW1lbnQqPihyb290Tm9kZSkpIDogcm9vdE5vZGUtPm5vZGVOYW1lKCkp OwotICAgICAgICBpZiAocm9vdE5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RE9DVU1FTlRfTk9E RSkKLSAgICAgICAgICAgIGVudHJ5LT5zZXRTdHJpbmcoImRvY3VtZW50VVJJIiwgc3RhdGljX2Nh c3Q8RG9jdW1lbnQqPihyb290Tm9kZSktPmRvY3VtZW50VVJJKCkpOwotICAgICAgICBjb2xsZWN0 VHJlZVN0YXRpc3RpY3Mocm9vdE5vZGUsIGVudHJ5LmdldCgpKTsKLSAgICAgICAgbV9jb3VudGVy cy0+cHVzaE9iamVjdChlbnRyeSk7CisgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gbGlz dGVuZXJDb3VudCgpCisgICAgeworICAgICAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGxpc3Rl bmVyU3RhdHMgPSBJbnNwZWN0b3JBcnJheTo6Y3JlYXRlKCk7CisgICAgICAgIGZvciAoSGFzaE1h cDxBdG9taWNTdHJpbmcsIGludD46Oml0ZXJhdG9yIGl0ID0gbV9ldmVudFR5cGVUb0NvdW50LmJl Z2luKCk7IGl0ICE9IG1fZXZlbnRUeXBlVG9Db3VudC5lbmQoKTsgKytpdCkgeworICAgICAgICAg ICAgUmVmUHRyPExpc3RlbmVyQ291bnQ+IGxpc3RlbmVyQ291bnQgPSBMaXN0ZW5lckNvdW50Ojpj cmVhdGUoKS5zZXRUeXBlKGl0LT5maXJzdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuc2V0Q291bnQoaXQt PnNlY29uZCk7CisgICAgICAgICAgICBsaXN0ZW5lclN0YXRzLT5wdXNoT2JqZWN0KGxpc3RlbmVy Q291bnQpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBsaXN0ZW5lclN0YXRzLnJlbGVhc2Uo KTsKICAgICB9CiAKIHByaXZhdGU6Ci0gICAgc3RhdGljIHZvaWQgY29sbGVjdFRyZWVTdGF0aXN0 aWNzKE5vZGUqIHJvb3ROb2RlLCBJbnNwZWN0b3JPYmplY3QqIHJlc3VsdCkKKyAgICB2b2lkIGNv bGxlY3RUcmVlU3RhdGlzdGljcyhOb2RlKiByb290Tm9kZSkKICAgICB7Ci0gICAgICAgIHVuc2ln bmVkIGNvdW50ID0gMDsKLSAgICAgICAgSGFzaE1hcDxBdG9taWNTdHJpbmcsIGludD4gZXZlbnRU eXBlVG9Db3VudDsKLSAgICAgICAgSGFzaE1hcDxTdHJpbmcsIGludD4gbmFtZVRvQ291bnQ7CiAg ICAgICAgIE5vZGUqIGN1cnJlbnROb2RlID0gcm9vdE5vZGU7Ci0gICAgICAgIGNvbGxlY3RMaXN0 ZW5lcnNJbmZvKHJvb3ROb2RlLCBldmVudFR5cGVUb0NvdW50KTsKKyAgICAgICAgY29sbGVjdExp c3RlbmVyc0luZm8ocm9vdE5vZGUpOwogICAgICAgICB3aGlsZSAoKGN1cnJlbnROb2RlID0gY3Vy cmVudE5vZGUtPnRyYXZlcnNlTmV4dE5vZGUocm9vdE5vZGUpKSkgewotICAgICAgICAgICAgKytj b3VudDsKLSAgICAgICAgICAgIFN0cmluZyBuYW1lID0gbm9kZU5hbWUoY3VycmVudE5vZGUpOwot ICAgICAgICAgICAgaW50IGN1cnJlbnRDb3VudCA9IG5hbWVUb0NvdW50LmdldChuYW1lKTsKLSAg ICAgICAgICAgIG5hbWVUb0NvdW50LnNldChuYW1lLCBjdXJyZW50Q291bnQgKyAxKTsKLSAgICAg ICAgICAgIGNvbGxlY3RMaXN0ZW5lcnNJbmZvKGN1cnJlbnROb2RlLCBldmVudFR5cGVUb0NvdW50 KTsKLSAgICAgICAgfQotCi0gICAgICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gY2hpbGRyZW5T dGF0cyA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKLSAgICAgICAgZm9yIChIYXNoTWFwPFN0 cmluZywgaW50Pjo6aXRlcmF0b3IgaXQgPSBuYW1lVG9Db3VudC5iZWdpbigpOyBpdCAhPSBuYW1l VG9Db3VudC5lbmQoKTsgKytpdCkgewotICAgICAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVj dD4gbm9kZUNvdW50ID0gSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKTsKLSAgICAgICAgICAgIG5v ZGVDb3VudC0+c2V0U3RyaW5nKCJub2RlTmFtZSIsIGl0LT5maXJzdCk7Ci0gICAgICAgICAgICBu b2RlQ291bnQtPnNldE51bWJlcigiY291bnQiLCBpdC0+c2Vjb25kKTsKLSAgICAgICAgICAgIGNo aWxkcmVuU3RhdHMtPnB1c2hPYmplY3Qobm9kZUNvdW50KTsKLSAgICAgICAgfQotCi0gICAgICAg IFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gbGlzdGVuZXJTdGF0cyA9IEluc3BlY3RvckFycmF5Ojpj cmVhdGUoKTsKLSAgICAgICAgZm9yIChIYXNoTWFwPEF0b21pY1N0cmluZywgaW50Pjo6aXRlcmF0 b3IgaXQgPSBldmVudFR5cGVUb0NvdW50LmJlZ2luKCk7IGl0ICE9IGV2ZW50VHlwZVRvQ291bnQu ZW5kKCk7ICsraXQpIHsKLSAgICAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGV2ZW50 Q291bnQgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgICAgICAgICAgZXZlbnRDb3Vu dC0+c2V0U3RyaW5nKCJ0eXBlIiwgaXQtPmZpcnN0KTsKLSAgICAgICAgICAgIGV2ZW50Q291bnQt PnNldE51bWJlcigiY291bnQiLCBpdC0+c2Vjb25kKTsKLSAgICAgICAgICAgIGxpc3RlbmVyU3Rh dHMtPnB1c2hPYmplY3QoZXZlbnRDb3VudCk7CisgICAgICAgICAgICArK21fdG90YWxOb2RlQ291 bnQ7CisgICAgICAgICAgICBjb2xsZWN0Tm9kZVN0YXRpc3RpY3MoY3VycmVudE5vZGUpOwogICAg ICAgICB9CisgICAgfQorICAgIHZvaWQgY29sbGVjdE5vZGVTdGF0aXN0aWNzKE5vZGUqIG5vZGUp CisgICAgeworICAgICAgICBjb2xsZWN0Q2hhcmFjdGVyRGF0YShub2RlKTsKKyAgICAgICAgY29s bGVjdE5vZGVOYW1lSW5mbyhub2RlKTsKKyAgICAgICAgY29sbGVjdExpc3RlbmVyc0luZm8obm9k ZSk7CisgICAgfQorICAgIAorICAgIHZvaWQgY29sbGVjdENoYXJhY3RlckRhdGEoTm9kZSogbm9k ZSkKKyAgICB7CisgICAgfQogCi0gICAgICAgIHJlc3VsdC0+c2V0TnVtYmVyKCJzaXplIiwgY291 bnQpOwotICAgICAgICByZXN1bHQtPnNldEFycmF5KCJub2RlQ291bnQiLCBjaGlsZHJlblN0YXRz KTsKLSAgICAgICAgcmVzdWx0LT5zZXRBcnJheSgibGlzdGVuZXJDb3VudCIsIGxpc3RlbmVyU3Rh dHMpOworICAgIHZvaWQgY29sbGVjdE5vZGVOYW1lSW5mbyhOb2RlKiBub2RlKQorICAgIHsKKyAg ICAgICAgU3RyaW5nIG5hbWUgPSBub2RlTmFtZShub2RlKTsKKyAgICAgICAgaW50IGN1cnJlbnRD b3VudCA9IG1fbm9kZU5hbWVUb0NvdW50LmdldChuYW1lKTsKKyAgICAgICAgbV9ub2RlTmFtZVRv Q291bnQuc2V0KG5hbWUsIGN1cnJlbnRDb3VudCArIDEpOwogICAgIH0KIAotICAgIHN0YXRpYyB2 b2lkIGNvbGxlY3RMaXN0ZW5lcnNJbmZvKE5vZGUqIG5vZGUsIEhhc2hNYXA8QXRvbWljU3RyaW5n LCBpbnQ+JiByZXN1bHQpCisgICAgdm9pZCBjb2xsZWN0TGlzdGVuZXJzSW5mbyhOb2RlKiBub2Rl KQogICAgIHsKICAgICAgICAgRXZlbnRUYXJnZXREYXRhKiBkID0gbm9kZS0+ZXZlbnRUYXJnZXRE YXRhKCk7CiAgICAgICAgIGlmICghZCkKQEAgLTEzMywxNyArMTQyLDUxIEBAIHByaXZhdGU6CiAg ICAgICAgICAgICAgICAgICAgICsrY291bnQ7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBp ZiAoY291bnQpCi0gICAgICAgICAgICAgICAgcmVzdWx0LnNldChuYW1lLCByZXN1bHQuZ2V0KG5h bWUpICsgY291bnQpOworICAgICAgICAgICAgICAgIG1fZXZlbnRUeXBlVG9Db3VudC5zZXQobmFt ZSwgbV9ldmVudFR5cGVUb0NvdW50LmdldChuYW1lKSArIGNvdW50KTsKICAgICAgICAgfQogICAg IH0KIAotICAgIHN0YXRpYyBTdHJpbmcgbm9kZU5hbWUoTm9kZSogbm9kZSkKKyAgICBpbnQgbV90 b3RhbE5vZGVDb3VudDsKKyAgICBIYXNoTWFwPEF0b21pY1N0cmluZywgaW50PiBtX2V2ZW50VHlw ZVRvQ291bnQ7CisgICAgSGFzaE1hcDxTdHJpbmcsIGludD4gbV9ub2RlTmFtZVRvQ291bnQ7Cisg ICAgU3RyaW5nSW1wbElkZW50aXR5U2V0IG1fZG9tU3RyaW5nSW1wbFNldDsKK307CisKK2NsYXNz IENvdW50ZXJWaXNpdG9yIDogcHVibGljIERPTVdyYXBwZXJWaXNpdG9yIHsKK3B1YmxpYzoKKyAg ICBDb3VudGVyVmlzaXRvcihQYWdlKiBwYWdlKSA6IG1fcGFnZShwYWdlKSwgbV9jb3VudGVycyhJ bnNwZWN0b3JBcnJheTo6Y3JlYXRlKCkpIHsgfQorCisgICAgSW5zcGVjdG9yQXJyYXkqIGNvdW50 ZXJzKCkgeyByZXR1cm4gbV9jb3VudGVycy5nZXQoKTsgfQorCisgICAgdmlydHVhbCB2b2lkIHZp c2l0Tm9kZShOb2RlKiBub2RlKQogICAgIHsKLSAgICAgICAgaWYgKG5vZGUtPmRvY3VtZW50KCkt PmlzWEhUTUxEb2N1bWVudCgpKQotICAgICAgICAgICAgIHJldHVybiBub2RlLT5ub2RlTmFtZSgp OwotICAgICAgICByZXR1cm4gbm9kZS0+bm9kZU5hbWUoKS5sb3dlcigpOworICAgICAgICBpZiAo bm9kZS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSAmJiBtX3BhZ2UgIT0gbm9kZS0+ZG9jdW1lbnQoKS0+ ZnJhbWUoKS0+cGFnZSgpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIE5vZGUqIHJv b3ROb2RlID0gbm9kZTsKKyAgICAgICAgd2hpbGUgKHJvb3ROb2RlLT5wYXJlbnROb2RlKCkpCisg ICAgICAgICAgICByb290Tm9kZSA9IHJvb3ROb2RlLT5wYXJlbnROb2RlKCk7CisKKyAgICAgICAg aWYgKG1fcm9vdHMuY29udGFpbnMocm9vdE5vZGUpKQorICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICBtX3Jvb3RzLmFkZChyb290Tm9kZSk7CisKKyAgICAgICAgUmVmUHRyPEluc3BlY3Rvck9i amVjdD4gZW50cnkgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOworCisgICAgICAgIERPTVRy ZWVTdGF0aXN0aWNzIGRvbVRyZWVTdGF0cyhyb290Tm9kZSk7CisKKyAgICAgICAgUmVmUHRyPERP TUdyb3VwPiBkb21Hcm91cCA9IERPTUdyb3VwOjpjcmVhdGUoKQorICAgICAgICAgICAgLnNldFNp emUoZG9tVHJlZVN0YXRzLnRvdGFsTm9kZUNvdW50KCkpCisgICAgICAgICAgICAuc2V0VGl0bGUo cm9vdE5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RUxFTUVOVF9OT0RFID8gZWxlbWVudFRpdGxl KHN0YXRpY19jYXN0PEVsZW1lbnQqPihyb290Tm9kZSkpIDogcm9vdE5vZGUtPm5vZGVOYW1lKCkp CisgICAgICAgICAgICAuc2V0Tm9kZUNvdW50KGRvbVRyZWVTdGF0cy5ub2RlQ291bnQoKSkKKyAg ICAgICAgICAgIC5zZXRMaXN0ZW5lckNvdW50KGRvbVRyZWVTdGF0cy5saXN0ZW5lckNvdW50KCkp OworICAgICAgICBpZiAocm9vdE5vZGUtPm5vZGVUeXBlKCkgPT0gTm9kZTo6RE9DVU1FTlRfTk9E RSkKKyAgICAgICAgICAgIGRvbUdyb3VwLT5zZXREb2N1bWVudFVSSShzdGF0aWNfY2FzdDxEb2N1 bWVudCo+KHJvb3ROb2RlKS0+ZG9jdW1lbnRVUkkoKSk7CisKKyAgICAgICAgbV9jb3VudGVycy0+ cHVzaE9iamVjdChkb21Hcm91cCk7CiAgICAgfQogCitwcml2YXRlOgogICAgIFN0cmluZyBlbGVt ZW50VGl0bGUoRWxlbWVudCogZWxlbWVudCkKICAgICB7CiAgICAgICAgIFN0cmluZ0J1aWxkZXIg cmVzdWx0Owo=