112700 2013-03-19 08:11:42 -0700 [GTK] Fix WebKit2 builds after r146193 2013-03-19 08:49:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan cgarcia gustavo mrobinson thorton oldest_to_newest 858299 0 zan 2013-03-19 08:11:42 -0700 [GTK] Fix WebKit2 builds after r146193 858303 1 193834 zan 2013-03-19 08:16:35 -0700 Created attachment 193834 Patch 858320 2 193834 zan 2013-03-19 08:49:30 -0700 Comment on attachment 193834 Patch Clearing flags on attachment: 193834 Committed r146207: <http://trac.webkit.org/changeset/146207> 858321 3 zan 2013-03-19 08:49:38 -0700 All reviewed patches have been landed. Closing bug. 193834 2013-03-19 08:16:35 -0700 2013-03-19 08:49:29 -0700 Patch bug-112700-20130319161226.patch text/plain 10803 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmVlYWM5YjJhMTY1ZDRh MjJiNWVmZmQ3NjVkMjAxNTViZDY0OTcyYi4uZjllZGYwNWM0MzZkY2U0MWEwM2M5NTczNGE5MzMx MzcxNTc2NzYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAzLTE5ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBGaXggV2Vi S2l0MiBidWlsZHMgYWZ0ZXIgcjE0NjE5MworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNzAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQXBwbHkgY2hhbmdlcyB0byB0aGUgTGF5ZXJUcmVlSG9zdEd0ayBj bGFzcyB0aGF0IGFyZSBhbmFsb2dvdXMgdG8gY2hhbmdlcyBtYWRlIGluIHIxNDYxOTMKKyAgICAg ICAgdG8gdGhlIExheWVyVHJlZUhvc3RNYWMgY2xhc3MsIG5hbWVseSBpbnRyb2R1Y2luZyBhIFBh Z2VPdmVybGF5TGF5ZXJzTWFwIGFuZCB1c2luZyB0aGF0IGFzCisgICAgICAgIHRoZSBzb3VyY2Ug b2YgR3JhcGhpY3NMYXllciBvYmplY3RzIHRoYXQgc2hvdWxkIGJlIG9wZXJhdGVkIG9uLCBtYWtp bmcgaXQgcG9zc2libGUgdG8KKyAgICAgICAgc3VwcG9ydCBtdWx0aXBsZSBwYWdlIG92ZXJsYXlz LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmNw cDoKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0azo6aW5pdGlhbGl6ZSk6CisgICAg ICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OmludmFsaWRhdGUpOgorICAgICAgICAoV2Vi S2l0OjpMYXllclRyZWVIb3N0R3RrOjpzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxh eSk6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6OnNldE5vbkNvbXBvc2l0ZWRD b250ZW50c05lZWREaXNwbGF5SW5SZWN0KToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9z dEd0azo6c2l6ZURpZENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6 OmRpZEluc3RhbGxQYWdlT3ZlcmxheSk6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RH dGs6OmRpZFVuaW5zdGFsbFBhZ2VPdmVybGF5KToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVl SG9zdEd0azo6c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkpOgorICAgICAgICAoV2ViS2l0OjpM YXllclRyZWVIb3N0R3RrOjpwYWludENvbnRlbnRzKToKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJU cmVlSG9zdEd0azo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKToKKyAgICAgICAgKFdlYktpdDo6 TGF5ZXJUcmVlSG9zdEd0azo6Y3JlYXRlUGFnZU92ZXJsYXlMYXllcik6CisgICAgICAgIChXZWJL aXQ6OkxheWVyVHJlZUhvc3RHdGs6OmRlc3Ryb3lQYWdlT3ZlcmxheUxheWVyKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaDoKKyAgICAgICAgKExh eWVyVHJlZUhvc3RHdGspOgorCiAyMDEzLTAzLTE5ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0 b25AYXBwbGUuY29tPgogCiAgICAgICAgIFt3azJdIFNob3VsZCBzdXBwb3J0IG11bHRpcGxlIHBh Z2Ugb3ZlcmxheXMsIGxpa2UgdGhlIEFQSSBzdWdnZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAKaW5k ZXggMDE3Y2QwYTQ5YTk5YmMyMzMwMDY5Mzc3ZTY1ODA5NWVlOGU1M2YwMy4uZjdlNTg1MDE3ZThh MGMwNzI4ZjVlZDc2NjI4MWMxYzkwMTE1NWYzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCkBAIC0x MjAsOCArMTIwLDEyIEBAIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6aW5pdGlhbGl6ZSgpCiAgICAg c3RhdGljX2Nhc3Q8VGV4dHVyZU1hcHBlckdMKj4obV90ZXh0dXJlTWFwcGVyLmdldCgpKS0+c2V0 RW5hYmxlRWRnZURpc3RhbmNlQW50aWFsaWFzaW5nKHRydWUpOwogICAgIHRvVGV4dHVyZU1hcHBl ckxheWVyKG1fcm9vdExheWVyLmdldCgpKS0+c2V0VGV4dHVyZU1hcHBlcihtX3RleHR1cmVNYXBw ZXIuZ2V0KCkpOwogCi0gICAgaWYgKG1fd2ViUGFnZS0+aGFzUGFnZU92ZXJsYXkoKSkKLSAgICAg ICAgY3JlYXRlUGFnZU92ZXJsYXlMYXllcigpOworICAgIGlmIChtX3dlYlBhZ2UtPmhhc1BhZ2VP dmVybGF5KCkpIHsKKyAgICAgICAgUGFnZU92ZXJsYXlMaXN0JiBwYWdlT3ZlcmxheXMgPSBtX3dl YlBhZ2UtPnBhZ2VPdmVybGF5cygpOworICAgICAgICBQYWdlT3ZlcmxheUxpc3Q6Oml0ZXJhdG9y IGVuZCA9IHBhZ2VPdmVybGF5cy5lbmQoKTsKKyAgICAgICAgZm9yIChQYWdlT3ZlcmxheUxpc3Q6 Oml0ZXJhdG9yIGl0ID0gcGFnZU92ZXJsYXlzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAg ICAgICAgICAgIGNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIoaXQtPmdldCgpKTsKKyAgICB9CiAKICAg ICBzY2hlZHVsZUxheWVyRmx1c2goKTsKIH0KQEAgLTE2MSw3ICsxNjUsNiBAQCB2b2lkIExheWVy VHJlZUhvc3RHdGs6OmludmFsaWRhdGUoKQogICAgIGNhbmNlbFBlbmRpbmdMYXllckZsdXNoKCk7 CiAgICAgbV9yb290TGF5ZXIgPSBudWxscHRyOwogICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRM YXllciA9IG51bGxwdHI7Ci0gICAgbV9wYWdlT3ZlcmxheUxheWVyID0gbnVsbHB0cjsKICAgICBt X3RleHR1cmVNYXBwZXIgPSBudWxscHRyOwogCiAgICAgbV9jb250ZXh0ID0gbnVsbHB0cjsKQEAg LTE3MSw4ICsxNzQsMTAgQEAgdm9pZCBMYXllclRyZWVIb3N0R3RrOjppbnZhbGlkYXRlKCkKIHZv aWQgTGF5ZXJUcmVlSG9zdEd0azo6c2V0Tm9uQ29tcG9zaXRlZENvbnRlbnRzTmVlZERpc3BsYXko KQogewogICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7 Ci0gICAgaWYgKG1fcGFnZU92ZXJsYXlMYXllcikKLSAgICAgICAgbV9wYWdlT3ZlcmxheUxheWVy LT5zZXROZWVkc0Rpc3BsYXkoKTsKKworICAgIFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9y IGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7CisgICAgZm9yIChQYWdlT3ZlcmxheUxh eWVyTWFwOjppdGVyYXRvciBpdCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuYmVnaW4oKTsgaXQgIT0g ZW5kOyArK2l0KQorICAgICAgICBpdC0+dmFsdWUtPnNldE5lZWRzRGlzcGxheSgpOwogCiAgICAg c2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CkBAIC0xODAsOCArMTg1LDEwIEBAIHZvaWQgTGF5ZXJU cmVlSG9zdEd0azo6c2V0Tm9uQ29tcG9zaXRlZENvbnRlbnRzTmVlZERpc3BsYXkoKQogdm9pZCBM YXllclRyZWVIb3N0R3RrOjpzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheUluUmVj dChjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXll ci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KHJlY3QpOwotICAgIGlmIChtX3BhZ2VPdmVybGF5TGF5 ZXIpCi0gICAgICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KHJl Y3QpOworCisgICAgUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgZW5kID0gbV9wYWdlT3Zl cmxheUxheWVycy5lbmQoKTsKKyAgICBmb3IgKFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9y IGl0ID0gbV9wYWdlT3ZlcmxheUxheWVycy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCisgICAg ICAgIGl0LT52YWx1ZS0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KHJlY3QpOwogCiAgICAgc2NoZWR1 bGVMYXllckZsdXNoKCk7CiB9CkBAIC0yMTEsOCArMjE4LDkgQEAgdm9pZCBMYXllclRyZWVIb3N0 R3RrOjpzaXplRGlkQ2hhbmdlKGNvbnN0IEludFNpemUmIG5ld1NpemUpCiAgICAgICAgIG1fbm9u Q29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5SZWN0KEZsb2F0UmVjdCgw LCBvbGRTaXplLmhlaWdodCgpLCBuZXdTaXplLndpZHRoKCksIG5ld1NpemUuaGVpZ2h0KCkgLSBv bGRTaXplLmhlaWdodCgpKSk7CiAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXRO ZWVkc0Rpc3BsYXkoKTsKIAotICAgIGlmIChtX3BhZ2VPdmVybGF5TGF5ZXIpCi0gICAgICAgIG1f cGFnZU92ZXJsYXlMYXllci0+c2V0U2l6ZShuZXdTaXplKTsKKyAgICBQYWdlT3ZlcmxheUxheWVy TWFwOjppdGVyYXRvciBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOworICAgIGZvciAo UGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJl Z2luKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAgICAgaXQtPnZhbHVlLT5zZXRTaXplKG5ld1Np emUpOwogCiAgICAgY29tcG9zaXRlTGF5ZXJzVG9Db250ZXh0KEZvclJlc2l6ZSk7CiB9CkBAIC0y MjgsMjIgKzIzNiwyNSBAQCB2b2lkIExheWVyVHJlZUhvc3RHdGs6OmZvcmNlUmVwYWludCgpCiAg ICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKLXZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6ZGlk SW5zdGFsbFBhZ2VPdmVybGF5KCkKK3ZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6ZGlkSW5zdGFsbFBh Z2VPdmVybGF5KFBhZ2VPdmVybGF5KiBwYWdlT3ZlcmxheSkKIHsKLSAgICBjcmVhdGVQYWdlT3Zl cmxheUxheWVyKCk7CisgICAgY3JlYXRlUGFnZU92ZXJsYXlMYXllcihwYWdlT3ZlcmxheSk7CiAg ICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKLXZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6ZGlk VW5pbnN0YWxsUGFnZU92ZXJsYXkoKQordm9pZCBMYXllclRyZWVIb3N0R3RrOjpkaWRVbmluc3Rh bGxQYWdlT3ZlcmxheShQYWdlT3ZlcmxheSogcGFnZU92ZXJsYXkpCiB7Ci0gICAgZGVzdHJveVBh Z2VPdmVybGF5TGF5ZXIoKTsKKyAgICBkZXN0cm95UGFnZU92ZXJsYXlMYXllcihwYWdlT3Zlcmxh eSk7CiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKLXZvaWQgTGF5ZXJUcmVlSG9zdEd0 azo6c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoY29uc3QgSW50UmVjdCYgcmVjdCkKK3ZvaWQg TGF5ZXJUcmVlSG9zdEd0azo6c2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkq IHBhZ2VPdmVybGF5LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIEFTU0VSVChtX3BhZ2VP dmVybGF5TGF5ZXIpOwotICAgIG1fcGFnZU92ZXJsYXlMYXllci0+c2V0TmVlZHNEaXNwbGF5SW5S ZWN0KHJlY3QpOworICAgIEdyYXBoaWNzTGF5ZXIqIGxheWVyID0gbV9wYWdlT3ZlcmxheUxheWVy cy5nZXQocGFnZU92ZXJsYXkpOworICAgIGlmICghbGF5ZXIpCisgICAgICAgIHJldHVybjsKKwor ICAgIGxheWVyLT5zZXROZWVkc0Rpc3BsYXlJblJlY3QocmVjdCk7CiAgICAgc2NoZWR1bGVMYXll ckZsdXNoKCk7CiB9CiAKQEAgLTI2Miw5ICsyNzMsMTIgQEAgdm9pZCBMYXllclRyZWVIb3N0R3Rr OjpwYWludENvbnRlbnRzKGNvbnN0IEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIsIEdyYXBo aWMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChncmFwaGljc0xheWVyID09IG1f cGFnZU92ZXJsYXlMYXllcikgewotICAgICAgICBtX3dlYlBhZ2UtPmRyYXdQYWdlT3ZlcmxheShn cmFwaGljc0NvbnRleHQsIGNsaXBSZWN0KTsKLSAgICAgICAgcmV0dXJuOworICAgIFBhZ2VPdmVy bGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7Cisg ICAgZm9yIChQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBpdCA9IG1fcGFnZU92ZXJsYXlM YXllcnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgIGlmIChpdC0+dmFsdWUg PT0gZ3JhcGhpY3NMYXllcikgeworICAgICAgICAgICAgbV93ZWJQYWdlLT5kcmF3UGFnZU92ZXJs YXkoaXQtPmtleSwgZ3JhcGhpY3NDb250ZXh0LCBjbGlwUmVjdCk7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgfQogICAgIH0KIH0KIApAQCAtMjg5LDggKzMwMywxMCBAQCBib29sIExheWVy VHJlZUhvc3RHdGs6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcygpCiB7CiAgICAgbV9yb290TGF5 ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsKICAgICBtX25vbkNv bXBvc2l0ZWRDb250ZW50TGF5ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9u bHkoKTsKLSAgICBpZiAobV9wYWdlT3ZlcmxheUxheWVyKQotICAgICAgICBtX3BhZ2VPdmVybGF5 TGF5ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsKKworICAgIFBh Z2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5k KCk7CisgICAgZm9yIChQYWdlT3ZlcmxheUxheWVyTWFwOjppdGVyYXRvciBpdCA9IG1fcGFnZU92 ZXJsYXlMYXllcnMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQorICAgICAgICBpdC0+dmFsdWUt PmZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKTsKIAogICAgIHJldHVybiBt X3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCktPmZsdXNoQ29tcG9zaXRp bmdTdGF0ZUluY2x1ZGluZ1N1YmZyYW1lcygpOwogfQpAQCAtMzQ2LDI2ICszNjIsMjkgQEAgdm9p ZCBMYXllclRyZWVIb3N0R3RrOjpmbHVzaEFuZFJlbmRlckxheWVycygpCiAgICAgfQogfQogCi12 b2lkIExheWVyVHJlZUhvc3RHdGs6OmNyZWF0ZVBhZ2VPdmVybGF5TGF5ZXIoKQordm9pZCBMYXll clRyZWVIb3N0R3RrOjpjcmVhdGVQYWdlT3ZlcmxheUxheWVyKFBhZ2VPdmVybGF5KiBwYWdlT3Zl cmxheSkKIHsKLSAgICBBU1NFUlQoIW1fcGFnZU92ZXJsYXlMYXllcik7Ci0KLSAgICBtX3BhZ2VP dmVybGF5TGF5ZXIgPSBHcmFwaGljc0xheWVyOjpjcmVhdGUoZ3JhcGhpY3NMYXllckZhY3Rvcnko KSwgdGhpcyk7CisgICAgT3duUHRyPEdyYXBoaWNzTGF5ZXI+IGxheWVyID0gR3JhcGhpY3NMYXll cjo6Y3JlYXRlKGdyYXBoaWNzTGF5ZXJGYWN0b3J5KCksIHRoaXMpOwogI2lmbmRlZiBOREVCVUcK LSAgICBtX3BhZ2VPdmVybGF5TGF5ZXItPnNldE5hbWUoIkxheWVyVHJlZUhvc3QgcGFnZSBvdmVy bGF5IGNvbnRlbnQiKTsKKyAgICBsYXllci0+c2V0TmFtZSgiTGF5ZXJUcmVlSG9zdCBwYWdlIG92 ZXJsYXkgY29udGVudCIpOwogI2VuZGlmCiAKLSAgICBtX3BhZ2VPdmVybGF5TGF5ZXItPnNldERy YXdzQ29udGVudCh0cnVlKTsKLSAgICBtX3BhZ2VPdmVybGF5TGF5ZXItPnNldFNpemUobV93ZWJQ YWdlLT5zaXplKCkpOworICAgIGxheWVyLT5zZXRBY2NlbGVyYXRlc0RyYXdpbmcobV93ZWJQYWdl LT5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLT5hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKCkpOwor ICAgIGxheWVyLT5zZXREcmF3c0NvbnRlbnQodHJ1ZSk7CisgICAgbGF5ZXItPnNldFNpemUobV93 ZWJQYWdlLT5zaXplKCkpOworICAgIGxheWVyLT5zZXRTaG93RGVidWdCb3JkZXIobV93ZWJQYWdl LT5jb3JlUGFnZSgpLT5zZXR0aW5ncygpLT5zaG93RGVidWdCb3JkZXJzKCkpOworICAgIGxheWVy LT5zZXRTaG93UmVwYWludENvdW50ZXIobV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5zZXR0aW5ncygp LT5zaG93UmVwYWludENvdW50ZXIoKSk7CiAKLSAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobV9w YWdlT3ZlcmxheUxheWVyLmdldCgpKTsKKyAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobGF5ZXIu Z2V0KCkpOworICAgIG1fcGFnZU92ZXJsYXlMYXllcnMuYWRkKHBhZ2VPdmVybGF5LCBsYXllci5y ZWxlYXNlKCkpOwogfQogCi12b2lkIExheWVyVHJlZUhvc3RHdGs6OmRlc3Ryb3lQYWdlT3Zlcmxh eUxheWVyKCkKK3ZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6ZGVzdHJveVBhZ2VPdmVybGF5TGF5ZXIo UGFnZU92ZXJsYXkqIHBhZ2VPdmVybGF5KQogewotICAgIEFTU0VSVChtX3BhZ2VPdmVybGF5TGF5 ZXIpOwotICAgIG1fcGFnZU92ZXJsYXlMYXllci0+cmVtb3ZlRnJvbVBhcmVudCgpOwotICAgIG1f cGFnZU92ZXJsYXlMYXllciA9IG51bGxwdHI7CisgICAgT3duUHRyPEdyYXBoaWNzTGF5ZXI+IGxh eWVyID0gbV9wYWdlT3ZlcmxheUxheWVycy50YWtlKHBhZ2VPdmVybGF5KTsKKyAgICBBU1NFUlQo bGF5ZXIpOworCisgICAgbGF5ZXItPnJlbW92ZUZyb21QYXJlbnQoKTsKIH0KIAogdm9pZCBMYXll clRyZWVIb3N0R3RrOjpzY2hlZHVsZUxheWVyRmx1c2goKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmggYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaAppbmRleCAx OTU1NjM0NTY1OWY5NTM1MmMxMjUzMDUyNmFjNjkyODE1ZTY5YTM3Li5lYTQ2ODI4YWFmNWMxYTM3 NjdhZmYyZWM1ZDQxODEzYjVkODFiY2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaApAQCAtMzQsNiArMzQs NyBAQAogI2luY2x1ZGUgIlRleHR1cmVNYXBwZXJMYXllci5oIgogI2luY2x1ZGUgPFdlYkNvcmUv R0xDb250ZXh0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HcmFwaGljc0xheWVyQ2xpZW50Lmg+Cisj aW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CiAKIG5hbWVz cGFjZSBXZWJLaXQgewpAQCAtNjgsOSArNjksOSBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBzZXROb25Db21wb3NpdGVkQ29udGVudHNOZWVkRGlzcGxheUluUmVjdChjb25zdCBXZWJDb3Jl OjpJbnRSZWN0JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbE5vbkNvbXBvc2l0 ZWRDb250ZW50cyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBzY3JvbGxSZWN0KTsKIAotICAgIHZp cnR1YWwgdm9pZCBkaWRJbnN0YWxsUGFnZU92ZXJsYXkoKTsKLSAgICB2aXJ0dWFsIHZvaWQgZGlk VW5pbnN0YWxsUGFnZU92ZXJsYXkoKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlO ZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOworICAgIHZpcnR1YWwgdm9pZCBk aWRJbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKSBPVkVSUklERTsKKyAgICB2aXJ0dWFs IHZvaWQgZGlkVW5pbnN0YWxsUGFnZU92ZXJsYXkoUGFnZU92ZXJsYXkqKSBPVkVSUklERTsKKyAg ICB2aXJ0dWFsIHZvaWQgc2V0UGFnZU92ZXJsYXlOZWVkc0Rpc3BsYXkoUGFnZU92ZXJsYXkqLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0JikgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFsIGJvb2wgZmx1 c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCk7CiAKQEAgLTgwLDggKzgxLDggQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50cyhjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVy KiwgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiwgV2ViQ29yZTo6R3JhcGhpY3NMYXllclBhaW50 aW5nUGhhc2UsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGNsaXBSZWN0KTsKICAgICB2aXJ0dWFs IHZvaWQgZGlkQ29tbWl0Q2hhbmdlc0ZvckxheWVyKGNvbnN0IFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXIqKSBjb25zdCB7IH0KIAotICAgIHZvaWQgY3JlYXRlUGFnZU92ZXJsYXlMYXllcigpOwotICAg IHZvaWQgZGVzdHJveVBhZ2VPdmVybGF5TGF5ZXIoKTsKKyAgICB2b2lkIGNyZWF0ZVBhZ2VPdmVy bGF5TGF5ZXIoUGFnZU92ZXJsYXkqKTsKKyAgICB2b2lkIGRlc3Ryb3lQYWdlT3ZlcmxheUxheWVy KFBhZ2VPdmVybGF5Kik7CiAKICAgICBlbnVtIENvbXBvc2l0ZVB1cnBvc2UgeyBGb3JSZXNpemUs IE5vdEZvclJlc2l6ZSB9OwogICAgIHZvaWQgY29tcG9zaXRlTGF5ZXJzVG9Db250ZXh0KENvbXBv c2l0ZVB1cnBvc2UgPSBOb3RGb3JSZXNpemUpOwpAQCAtOTksNyArMTAwLDggQEAgcHJpdmF0ZToK ICAgICBib29sIG1fbm90aWZ5QWZ0ZXJTY2hlZHVsZWRMYXllckZsdXNoOwogICAgIE93blB0cjxX ZWJDb3JlOjpHcmFwaGljc0xheWVyPiBtX3Jvb3RMYXllcjsKICAgICBPd25QdHI8V2ViQ29yZTo6 R3JhcGhpY3NMYXllcj4gbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyOwotICAgIE93blB0cjxX ZWJDb3JlOjpHcmFwaGljc0xheWVyPiBtX3BhZ2VPdmVybGF5TGF5ZXI7CisgICAgdHlwZWRlZiBI YXNoTWFwPFBhZ2VPdmVybGF5KiwgT3duUHRyPFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI+ID4gUGFn ZU92ZXJsYXlMYXllck1hcDsKKyAgICBQYWdlT3ZlcmxheUxheWVyTWFwIG1fcGFnZU92ZXJsYXlM YXllcnM7CiAgICAgT3duUHRyPFdlYkNvcmU6OlRleHR1cmVNYXBwZXI+IG1fdGV4dHVyZU1hcHBl cjsKICAgICBPd25QdHI8V2ViQ29yZTo6R0xDb250ZXh0PiBtX2NvbnRleHQ7CiAgICAgYm9vbCBt X2xheWVyRmx1c2hTY2hlZHVsaW5nRW5hYmxlZDsK