30039 2009-10-03 01:05:12 -0700 Factor FrameWriter out of FrameLoader 2009-10-14 23:09:07 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 29947 1 abarth webkit-unassigned oldest_to_newest 152060 0 abarth 2009-10-03 01:05:12 -0700 FrameWriter is in charge of the begin / write / end cycle for documents. Essentially, it's the backend for the FrameLoader. 152061 1 40568 abarth 2009-10-03 01:05:47 -0700 Created attachment 40568 work in progress (does not build) 154723 2 abarth 2009-10-14 23:09:07 -0700 I no longer think this is the thing to do. 40568 2009-10-03 01:05:47 -0700 2009-10-03 01:06:30 -0700 work in progress (does not build) bug-30039-20091003010546.patch text/plain 9628 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBkYmZjNjlmLi43YWVhYzIxIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCkBAIC04MTQsMTQgKzgxNCwzNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpzZXRSZXNw b25zZU1JTUVUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKIHsKICAgICBtX3Jlc3BvbnNlTUlNRVR5 cGUgPSB0eXBlOwogfQotICAgIAorCiB2b2lkIEZyYW1lTG9hZGVyOjpiZWdpbigpCiB7CisgICAg bV93cml0ZXItPmJlaWduKCk7Cit9CisKK3ZvaWQgRnJhbWVXcml0ZXI6OmJlZ2luKCkKK3sKICAg ICBiZWdpbihLVVJMKCkpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpiZWdpbihjb25zdCBLVVJM JiB1cmwsIGJvb2wgZGlzcGF0Y2gsIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiB7CisgICAgbV9u ZWVkc0NsZWFyID0gdHJ1ZTsKKyAgICBtX2lzQ29tcGxldGUgPSBmYWxzZTsKKyAgICBtX2RpZENh bGxJbXBsaWNpdENsb3NlID0gZmFsc2U7CisgICAgbV9pc0xvYWRpbmdNYWluUmVzb3VyY2UgPSB0 cnVlOworICAgIG1faXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQgPSBtX2NyZWF0aW5n SW5pdGlhbEVtcHR5RG9jdW1lbnQ7CisKKyAgICBLVVJMIHJlZih1cmwpOworICAgIHJlZi5zZXRV c2VyKFN0cmluZygpKTsKKyAgICByZWYuc2V0UGFzcyhTdHJpbmcoKSk7CisgICAgcmVmLnJlbW92 ZUZyYWdtZW50SWRlbnRpZmllcigpOworICAgIG1fb3V0Z29pbmdSZWZlcnJlciA9IHJlZi5zdHJp bmcoKTsKKyAgICBtX1VSTCA9IHVybDsKKworICAgIG1fd3JpdGVyLT5iZWdpbih1cmwsIGRpc3Bh dGNoLCBvcmlnaW4sIG1fcmVzcG9uc2VNSU1FVHlwZSk7Cit9CisKK3ZvaWQgRnJhbWVXcml0ZXI6 OmJlZ2luKGNvbnN0IEtVUkwmIHVybCwgYm9vbCBkaXNwYXRjaCwgU2VjdXJpdHlPcmlnaW4qIG9y aWdpbiwgU3RyaW5nIHJlc3BvbnNlTUlNRVR5cGUpCit7CiAgICAgLy8gV2UgbmVlZCB0byB0YWtl IGEgcmVmZXJlbmNlIHRvIHRoZSBzZWN1cml0eSBvcmlnaW4gYmVjYXVzZSB8Y2xlYXJ8CiAgICAg Ly8gbWlnaHQgZGVzdHJveSB0aGUgZG9jdW1lbnQgdGhhdCBvd25zIGl0LgogICAgIFJlZlB0cjxT ZWN1cml0eU9yaWdpbj4gZm9yY2VkU2VjdXJpdHlPcmlnaW4gPSBvcmlnaW47CkBAIC04MjksMzEg Kzg1MiwxOCBAQCB2b2lkIEZyYW1lTG9hZGVyOjpiZWdpbihjb25zdCBLVVJMJiB1cmwsIGJvb2wg ZGlzcGF0Y2gsIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiAgICAgUmVmUHRyPERvY3VtZW50PiBk b2N1bWVudDsKIAogICAgIC8vIENyZWF0ZSBhIG5ldyBkb2N1bWVudCBiZWZvcmUgY2xlYXJpbmcg dGhlIGZyYW1lLCBiZWNhdXNlIGl0IG1heSBuZWVkIHRvIGluaGVyaXQgYW4gYWxpYXNlZCBzZWN1 cml0eSBjb250ZXh0LgotICAgIGlmICghbV9pc0Rpc3BsYXlpbmdJbml0aWFsRW1wdHlEb2N1bWVu dCAmJiBtX2NsaWVudC0+c2hvdWxkVXNlUGx1Z2luRG9jdW1lbnQobV9yZXNwb25zZU1JTUVUeXBl KSkKKyAgICBpZiAoIW1faXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQgJiYgbV9jbGll bnQtPnNob3VsZFVzZVBsdWdpbkRvY3VtZW50KHJlc3BvbnNlTUlNRVR5cGUpKQogICAgICAgICBk b2N1bWVudCA9IFBsdWdpbkRvY3VtZW50OjpjcmVhdGUobV9mcmFtZSk7CiAgICAgZWxzZSBpZiAo IW1fY2xpZW50LT5oYXNIVE1MVmlldygpKQogICAgICAgICBkb2N1bWVudCA9IFBsYWNlaG9sZGVy RG9jdW1lbnQ6OmNyZWF0ZShtX2ZyYW1lKTsKICAgICBlbHNlCi0gICAgICAgIGRvY3VtZW50ID0g RE9NSW1wbGVtZW50YXRpb246OmNyZWF0ZURvY3VtZW50KG1fcmVzcG9uc2VNSU1FVHlwZSwgbV9m cmFtZSwgbV9mcmFtZS0+aW5WaWV3U291cmNlTW9kZSgpKTsKKyAgICAgICAgZG9jdW1lbnQgPSBE T01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlRG9jdW1lbnQocmVzcG9uc2VNSU1FVHlwZSwgbV9mcmFt ZSwgbV9mcmFtZS0+aW5WaWV3U291cmNlTW9kZSgpKTsKIAogICAgIGJvb2wgcmVzZXRTY3JpcHRp bmcgPSAhKG1faXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQgJiYgbV9mcmFtZS0+ZG9j dW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aXNTZWN1cmVUcmFuc2l0aW9uVG8odXJsKSk7Ci0g ICAgY2xlYXIocmVzZXRTY3JpcHRpbmcsIHJlc2V0U2NyaXB0aW5nKTsKKyAgICBtX2ZyYW1lLT5s b2FkZXIoKS0+Y2xlYXIocmVzZXRTY3JpcHRpbmcsIHJlc2V0U2NyaXB0aW5nKTsKICAgICBpZiAo cmVzZXRTY3JpcHRpbmcpCiAgICAgICAgIG1fZnJhbWUtPnNjcmlwdCgpLT51cGRhdGVQbGF0Zm9y bVNjcmlwdE9iamVjdHMoKTsKIAotICAgIG1fbmVlZHNDbGVhciA9IHRydWU7Ci0gICAgbV9pc0Nv bXBsZXRlID0gZmFsc2U7Ci0gICAgbV9kaWRDYWxsSW1wbGljaXRDbG9zZSA9IGZhbHNlOwotICAg IG1faXNMb2FkaW5nTWFpblJlc291cmNlID0gdHJ1ZTsKLSAgICBtX2lzRGlzcGxheWluZ0luaXRp YWxFbXB0eURvY3VtZW50ID0gbV9jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50OwotCi0gICAg S1VSTCByZWYodXJsKTsKLSAgICByZWYuc2V0VXNlcihTdHJpbmcoKSk7Ci0gICAgcmVmLnNldFBh c3MoU3RyaW5nKCkpOwotICAgIHJlZi5yZW1vdmVGcmFnbWVudElkZW50aWZpZXIoKTsKLSAgICBt X291dGdvaW5nUmVmZXJyZXIgPSByZWYuc3RyaW5nKCk7Ci0gICAgbV9VUkwgPSB1cmw7Ci0KICAg ICBkb2N1bWVudC0+c2V0VVJMKG1fVVJMKTsKICAgICBtX2ZyYW1lLT5zZXREb2N1bWVudChkb2N1 bWVudCk7CiAKQEAgLTg3NCw3ICs4ODQsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpiZWdpbihjb25z dCBLVVJMJiB1cmwsIGJvb2wgZGlzcGF0Y2gsIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiAgICAg ZG9jdW1lbnQtPmRvY0xvYWRlcigpLT5zZXRBdXRvTG9hZEltYWdlcyhzZXR0aW5ncyAmJiBzZXR0 aW5ncy0+bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KCkpOwogCiAgICAgaWYgKG1fZG9jdW1lbnRM b2FkZXIpIHsKLSAgICAgICAgU3RyaW5nIGRuc1ByZWZldGNoQ29udHJvbCA9IG1fZG9jdW1lbnRM b2FkZXItPnJlc3BvbnNlKCkuaHR0cEhlYWRlckZpZWxkKCJYLUROUy1QcmVmZXRjaC1Db250cm9s Iik7CisgICAgICAgIFN0cmluZyBkbnNQcmVmZXRjaENvbnRyb2wgPSBtX2ZyYW1lLT5sb2FkZXIo KS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKS5odHRwSGVhZGVyRmllbGQoIlgtRE5TLVBy ZWZldGNoLUNvbnRyb2wiKTsKICAgICAgICAgaWYgKCFkbnNQcmVmZXRjaENvbnRyb2wuaXNFbXB0 eSgpKQogICAgICAgICAgICAgZG9jdW1lbnQtPnBhcnNlRE5TUHJlZmV0Y2hDb250cm9sSGVhZGVy KGRuc1ByZWZldGNoQ29udHJvbCk7CiAgICAgfQpAQCAtODg5LDYgKzg5OSwxMSBAQCB2b2lkIEZy YW1lTG9hZGVyOjpiZWdpbihjb25zdCBLVVJMJiB1cmwsIGJvb2wgZGlzcGF0Y2gsIFNlY3VyaXR5 T3JpZ2luKiBvcmlnaW4pCiAKIHZvaWQgRnJhbWVMb2FkZXI6OndyaXRlKGNvbnN0IGNoYXIqIHN0 ciwgaW50IGxlbiwgYm9vbCBmbHVzaCkKIHsKKyAgICBtX3dyaXRlci0+d3JpdGUoc3RyLCBsZW4s IGZsdXNoKTsKK30KKwordm9pZCBGcmFtZVdyaXRlcjo6d3JpdGUoY29uc3QgY2hhciogc3RyLCBp bnQgbGVuLCBib29sIGZsdXNoKQorewogICAgIGlmIChsZW4gPT0gMCAmJiAhZmx1c2gpCiAgICAg ICAgIHJldHVybjsKICAgICAKQEAgLTk1Myw2ICs5NjgsMTEgQEAgdm9pZCBGcmFtZUxvYWRlcjo6 d3JpdGUoY29uc3QgY2hhciogc3RyLCBpbnQgbGVuLCBib29sIGZsdXNoKQogCiB2b2lkIEZyYW1l TG9hZGVyOjp3cml0ZShjb25zdCBTdHJpbmcmIHN0cikKIHsKKyAgICBtX3dyaXRlci0+d3JpdGUo c3RyKTsKK30KKwordm9pZCBGcmFtZVdyaXRlcjo6d3JpdGUoY29uc3QgU3RyaW5nJiBzdHIpCit7 CiAgICAgaWYgKHN0ci5pc051bGwoKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC05NjgsMTIgKzk4 OCwyMiBAQCB2b2lkIEZyYW1lTG9hZGVyOjp3cml0ZShjb25zdCBTdHJpbmcmIHN0cikKIHZvaWQg RnJhbWVMb2FkZXI6OmVuZCgpCiB7CiAgICAgbV9pc0xvYWRpbmdNYWluUmVzb3VyY2UgPSBmYWxz ZTsKKyAgICBtX3dyaXRlci0+ZW5kKCk7Cit9CisKK3ZvaWQgRnJhbWVXcml0ZXI6OmVuZCgpCit7 CiAgICAgZW5kSWZOb3RMb2FkaW5nTWFpblJlc291cmNlKCk7CiB9CiAKIHZvaWQgRnJhbWVMb2Fk ZXI6OmVuZElmTm90TG9hZGluZ01haW5SZXNvdXJjZSgpCiB7Ci0gICAgaWYgKG1faXNMb2FkaW5n TWFpblJlc291cmNlIHx8ICFtX2ZyYW1lLT5wYWdlKCkgfHwgIW1fZnJhbWUtPmRvY3VtZW50KCkp CisgICAgbV93cml0ZXItPmVuZElmTm90TG9hZGluZ01haW5SZXNvdXJjZSgpOworfQorCit2b2lk IEZyYW1lV3JpdGVyOjplbmRJZk5vdExvYWRpbmdNYWluUmVzb3VyY2UoKQoreworICAgIGlmICht X2ZyYW1lLT5sb2FkZXIoKS0+aXNMb2FkaW5nTWFpblJlc291cmNlKCkgfHwgIW1fZnJhbWUtPnBh Z2UoKSB8fCAhbV9mcmFtZS0+ZG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8g aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4NTQKQEAgLTEwODEsMTMg KzExMTEsMTEgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29tbWl0SWNvblVSTFRvSWNvbkRhdGFiYXNl KGNvbnN0IEtVUkwmIGljb24pCiAgICAgaWNvbkRhdGFiYXNlKCktPnNldEljb25VUkxGb3JQYWdl VVJMKGljb24uc3RyaW5nKCksIG9yaWdpbmFsUmVxdWVzdFVSTCgpLnN0cmluZygpKTsKIH0KIAot dm9pZCBGcmFtZUxvYWRlcjo6cmVzdG9yZURvY3VtZW50U3RhdGUoKQordm9pZCBGcmFtZVdyaXRl cjo6cmVzdG9yZURvY3VtZW50U3RhdGUoKQogewotICAgIERvY3VtZW50KiBkb2MgPSBtX2ZyYW1l LT5kb2N1bWVudCgpOwotICAgICAgICAKICAgICBIaXN0b3J5SXRlbSogaXRlbVRvUmVzdG9yZSA9 IDA7CiAgICAgCi0gICAgc3dpdGNoIChsb2FkVHlwZSgpKSB7CisgICAgc3dpdGNoIChtX2ZyYW1l LT5sb2FkZXIoKS0+bG9hZFR5cGUoKSkgewogICAgICAgICBjYXNlIEZyYW1lTG9hZFR5cGVSZWxv YWQ6CiAgICAgICAgIGNhc2UgRnJhbWVMb2FkVHlwZVJlbG9hZEZyb21PcmlnaW46CiAgICAgICAg IGNhc2UgRnJhbWVMb2FkVHlwZVNhbWU6CkBAIC0xMDk5LDE0ICsxMTI3LDE0IEBAIHZvaWQgRnJh bWVMb2FkZXI6OnJlc3RvcmVEb2N1bWVudFN0YXRlKCkKICAgICAgICAgY2FzZSBGcmFtZUxvYWRU eXBlSW5kZXhlZEJhY2tGb3J3YXJkOgogICAgICAgICBjYXNlIEZyYW1lTG9hZFR5cGVSZWRpcmVj dFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3Q6CiAgICAgICAgIGNhc2UgRnJhbWVMb2FkVHlwZVN0 YW5kYXJkOgotICAgICAgICAgICAgaXRlbVRvUmVzdG9yZSA9IG1fY3VycmVudEhpc3RvcnlJdGVt LmdldCgpOyAKKyAgICAgICAgICAgIGl0ZW1Ub1Jlc3RvcmUgPSBtX2ZyYW1lLT5sb2FkZXIoKS0+ Y3VycmVudEhpc3RvcnlJdGVtKCk7IAogICAgIH0KLSAgICAKKwogICAgIGlmICghaXRlbVRvUmVz dG9yZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgTE9HKExvYWRpbmcsICJXZWJDb3JlTG9hZGlu ZyAlczogcmVzdG9yaW5nIGZvcm0gc3RhdGUgZnJvbSAlcCIsIG1fZnJhbWUtPnRyZWUoKS0+bmFt ZSgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCksIGl0ZW1Ub1Jlc3RvcmUpOwotICAgIGRvYy0+c2V0 U3RhdGVGb3JOZXdGb3JtRWxlbWVudHMoaXRlbVRvUmVzdG9yZS0+ZG9jdW1lbnRTdGF0ZSgpKTsK KyAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5zZXRTdGF0ZUZvck5ld0Zvcm1FbGVtZW50cyhpdGVt VG9SZXN0b3JlLT5kb2N1bWVudFN0YXRlKCkpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpnb3Rv QW5jaG9yKCkKQEAgLTE4MDQsMTkgKzE4MzIsMTkgQEAgYm9vbCBGcmFtZUxvYWRlcjo6bG9nQ2Fu Q2FjaGVGcmFtZURlY2lzaW9uKGludCBpbmRlbnRMZXZlbCkKIH0KICNlbmRpZgogCi12b2lkIEZy YW1lTG9hZGVyOjp1cGRhdGVGaXJzdFBhcnR5Rm9yQ29va2llcygpCit2b2lkIEZyYW1lV3JpdGVy Ojp1cGRhdGVGaXJzdFBhcnR5Rm9yQ29va2llcygpCiB7CiAgICAgaWYgKG1fZnJhbWUtPnRyZWUo KS0+cGFyZW50KCkpCiAgICAgICAgIHNldEZpcnN0UGFydHlGb3JDb29raWVzKG1fZnJhbWUtPnRy ZWUoKS0+cGFyZW50KCktPmRvY3VtZW50KCktPmZpcnN0UGFydHlGb3JDb29raWVzKCkpOwogICAg IGVsc2UKLSAgICAgICAgc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMobV9VUkwpOworICAgICAgICBz ZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhtX2ZyYW1lLT5sb2FkZXIoKS0+dXJsKCkpOwogfQogCi12 b2lkIEZyYW1lTG9hZGVyOjpzZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhjb25zdCBLVVJMJiB1cmwp Cit2b2lkIEZyYW1lV3JpdGVyOjpzZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhjb25zdCBLVVJMJiB1 cmwpCiB7CiAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMo dXJsKTsKICAgICBmb3IgKEZyYW1lKiBjaGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGls ZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKQotICAgICAg ICBjaGlsZC0+bG9hZGVyKCktPnNldEZpcnN0UGFydHlGb3JDb29raWVzKHVybCk7CisgICAgICAg IGNoaWxkLT5sb2FkZXIoKS0+d3JpdGVyKCktPnNldEZpcnN0UGFydHlGb3JDb29raWVzKHVybCk7 CiB9CiAKIGNsYXNzIEhhc2hDaGFuZ2VFdmVudFRhc2sgOiBwdWJsaWMgU2NyaXB0RXhlY3V0aW9u Q29udGV4dDo6VGFzayB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o IGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCBlNDc3M2QyLi5kZTBmYzlmIDEw MDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmgKQEAgLTc4LDYgKzc4LDM3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogICAgIGJvb2wgaXNCYWNrRm9yd2FyZExvYWRUeXBlKEZyYW1lTG9hZFR5cGUpOwogCisgICAg Y2xhc3MgRnJhbWVXcml0ZXIgOiBwdWJsaWMgTm9uY29weWFibGUgeworICAgIHB1YmxpYzoKKyAg ICAgICAgRnJhbWVXcml0ZXIoRnJhbWUqKTsKKyAgICAgICAgfkZyYW1lV3JpdGVyKCk7CisKKyAg ICAgICAgdm9pZCBiZWdpbigpOworICAgICAgICB2b2lkIGJlZ2luKGNvbnN0IEtVUkwmLCBib29s IGRpc3BhdGNoV2luZG93T2JqZWN0QXZhaWxhYmxlID0gdHJ1ZSwgU2VjdXJpdHlPcmlnaW4qIGZv cmNlZFNlY3VyaXR5T3JpZ2luID0gMCk7CisKKyAgICAgICAgdm9pZCB3cml0ZShjb25zdCBjaGFy KiBzdHJpbmcsIGludCBsZW5ndGggPSAtMSwgYm9vbCBmbHVzaCA9IGZhbHNlKTsKKyAgICAgICAg dm9pZCB3cml0ZShjb25zdCBTdHJpbmcmKTsKKyAgICAgICAgdm9pZCBlbmQoKTsKKyAgICAgICAg dm9pZCBlbmRJZk5vdExvYWRpbmdNYWluUmVzb3VyY2UoKTsKKworICAgICAgICB2b2lkIHNldEVu Y29kaW5nKGNvbnN0IFN0cmluZyYgZW5jb2RpbmcsIGJvb2wgdXNlckNob3Nlbik7CisgICAgICAg IFN0cmluZyBlbmNvZGluZygpIGNvbnN0OworCisgICAgICAgIHZvaWQgcmVzdG9yZURvY3VtZW50 U3RhdGUoKTsKKyAgICAgICAgdm9pZCBjbGVhcigpOworCisgICAgcHJpdmF0ZToKKyAgICAgICAg dm9pZCB1cGRhdGVGaXJzdFBhcnR5Rm9yQ29va2llcygpOworICAgICAgICB2b2lkIHNldEZpcnN0 UGFydHlGb3JDb29raWVzKGNvbnN0IEtVUkwmKTsKKworICAgICAgICBGcmFtZSogbV9mcmFtZTsK KyAgICAgICAgYm9vbCBtX3JlY2VpdmVkRGF0YTsKKworICAgICAgICBib29sIG1fZW5jb2RpbmdX YXNDaG9zZW5CeVVzZXI7CisgICAgICAgIFN0cmluZyBtX2VuY29kaW5nOworICAgICAgICBSZWZQ dHI8VGV4dFJlc291cmNlRGVjb2Rlcj4gbV9kZWNvZGVyOworICAgIH0KKwogICAgIGNsYXNzIEZy YW1lTG9hZGVyIDogcHVibGljIE5vbmNvcHlhYmxlIHsKICAgICBwdWJsaWM6CiAgICAgICAgIEZy YW1lTG9hZGVyKEZyYW1lKiwgRnJhbWVMb2FkZXJDbGllbnQqKTsKQEAgLTIzOCw2ICsyNjksNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgS1VSTCBiYXNlVVJMKCkgY29uc3Q7CiAK KyAgICAgICAgLy8geHh4CiAgICAgICAgIHZvaWQgYmVnaW4oKTsKICAgICAgICAgdm9pZCBiZWdp bihjb25zdCBLVVJMJiwgYm9vbCBkaXNwYXRjaFdpbmRvd09iamVjdEF2YWlsYWJsZSA9IHRydWUs IFNlY3VyaXR5T3JpZ2luKiBmb3JjZWRTZWN1cml0eU9yaWdpbiA9IDApOwogCkBAIC0yNDgsNiAr MjgwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgc2V0RW5jb2Rpbmco Y29uc3QgU3RyaW5nJiBlbmNvZGluZywgYm9vbCB1c2VyQ2hvc2VuKTsKICAgICAgICAgU3RyaW5n IGVuY29kaW5nKCkgY29uc3Q7CisgICAgICAgIC8vIHl5eQogCiAgICAgICAgIFNjcmlwdFZhbHVl IGV4ZWN1dGVTY3JpcHQoY29uc3QgU2NyaXB0U291cmNlQ29kZSYpOwogICAgICAgICBTY3JpcHRW YWx1ZSBleGVjdXRlU2NyaXB0KGNvbnN0IFN0cmluZyYgc2NyaXB0LCBib29sIGZvcmNlVXNlckdl c3R1cmUgPSBmYWxzZSk7CkBAIC0yNjMsNyArMjk2LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAgICAgICAgIHZvaWQgZGlzcGF0Y2hXaW5kb3dPYmplY3RBdmFpbGFibGUoKTsKICAgICAgICAg dm9pZCBkaXNwYXRjaERvY3VtZW50RWxlbWVudEF2YWlsYWJsZSgpOwotICAgICAgICB2b2lkIHJl c3RvcmVEb2N1bWVudFN0YXRlKCk7CiAKICAgICAgICAgLy8gTWl4ZWQgY29udGVudCByZWxhdGVk IGZ1bmN0aW9ucy4KICAgICAgICAgc3RhdGljIGJvb2wgaXNNaXhlZENvbnRlbnQoU2VjdXJpdHlP cmlnaW4qIGNvbnRleHQsIGNvbnN0IEtVUkwmKTsKQEAgLTM4OSw5ICs0MjEsNiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKICAgICAgICAgdm9pZCByZWNlaXZlZEZpcnN0RGF0YSgpOwogCi0gICAg ICAgIHZvaWQgdXBkYXRlRmlyc3RQYXJ0eUZvckNvb2tpZXMoKTsKLSAgICAgICAgdm9pZCBzZXRG aXJzdFBhcnR5Rm9yQ29va2llcyhjb25zdCBLVVJMJik7Ci0gICAgICAgIAogICAgICAgICB2b2lk IGFkZEV4dHJhRmllbGRzVG9SZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYsIEZyYW1lTG9hZFR5cGUg bG9hZFR5cGUsIGJvb2wgaXNNYWluUmVzb3VyY2UsIGJvb2wgY29va2llUG9saWN5VVJMRnJvbVJl cXVlc3QpOwogCiAgICAgICAgIC8vIEFsc28gbm90IGNvb2wuCkBAIC01NDYsMTEgKzU3NSw2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX2NhbmNlbGxpbmdXaXRoTG9hZElu UHJvZ3Jlc3M7CiAKICAgICAgICAgYm9vbCBtX25lZWRzQ2xlYXI7Ci0gICAgICAgIGJvb2wgbV9y ZWNlaXZlZERhdGE7Ci0KLSAgICAgICAgYm9vbCBtX2VuY29kaW5nV2FzQ2hvc2VuQnlVc2VyOwot ICAgICAgICBTdHJpbmcgbV9lbmNvZGluZzsKLSAgICAgICAgUmVmUHRyPFRleHRSZXNvdXJjZURl Y29kZXI+IG1fZGVjb2RlcjsKIAogICAgICAgICBib29sIG1fY29udGFpbnNQbHVnSW5zOw==