59790 2011-04-29 03:45:34 -0700 [GTK] Rename page as pageProxy in WebKitWebViewBase 2011-04-29 05:36:22 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 395201 0 cgarcia 2011-04-29 03:45:34 -0700 To avoid confusion between page client and page proxy. 395202 1 91662 cgarcia 2011-04-29 03:48:46 -0700 Created attachment 91662 Patch It also renames some methods to webkitWebViewBase* for consistency. 395229 2 cgarcia 2011-04-29 05:36:22 -0700 Committed r85318: <http://trac.webkit.org/changeset/85318> 91662 2011-04-29 03:48:46 -0700 2011-04-29 05:22:50 -0700 Patch wk2-page-client.diff text/plain 12064 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkOWFkZGI2Li44ZjU0NzkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzIg QEAKIDIwMTEtMDQtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IFJlbmFtZSBwYWdlIGFzIHBhZ2VQcm94eSBpbiBXZWJLaXRXZWJWaWV3QmFzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk3OTAKKworICAgICAgICBU byBhdm9pZCBjb25zdWZpb24gYmV0d2VlbiBwYWdlIGNsaWVudCBhbmQgcGFnZSBwcm94eS4gQWxz byByZW5hbWUKKyAgICAgICAgc29tZSBtZXRob2RzIHRvIHdlYmtpdFdlYlZpZXdCYXNlKiBmb3Ig Y29uc2lzdGVuY3kuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUZpbmFsaXplKToKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdCYXNlRXhwb3NlKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlRHJh dyk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZSk6CisgICAgICAgICh3 ZWJraXRXZWJWaWV3QmFzZUZvY3VzSW5FdmVudCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFz ZUZvY3VzT3V0RXZlbnQpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VLZXlQcmVzc0V2ZW50 KToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlS2V5UmVsZWFzZUV2ZW50KToKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdCYXNlQnV0dG9uUHJlc3NFdmVudCk6CisgICAgICAgICh3ZWJraXRXZWJW aWV3QmFzZUJ1dHRvblJlbGVhc2VFdmVudCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNj cm9sbEV2ZW50KToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlTW90aW9uTm90aWZ5RXZlbnQp OgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2Jhc2VfY2xhc3NfaW5pdCk6CisgICAgICAgICh3 ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZSk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUdldFBh Z2UpOgorCisyMDExLTA0LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKwogICAgICAgICBVbnJldmlld2VkLiBGaXggYSBjcmFzaCBhZnRlciByODUyMTQuCiAK ICAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFz ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFz ZS5jcHAKaW5kZXggYWVkYmNkNy4uOTNhMzIwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcApAQCAtNDcsNyArNDcs NyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogc3RydWN0IF9XZWJLaXRXZWJWaWV3QmFz ZVByaXZhdGUgewogICAgIE93blB0cjxQYWdlQ2xpZW50SW1wbD4gcGFnZUNsaWVudDsKLSAgICBS ZWZQdHI8V2ViUGFnZVByb3h5PiBwYWdlOworICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IHBhZ2VQ cm94eTsKICAgICBnYm9vbGVhbiBpc1BhZ2VBY3RpdmU7CiAgICAgR3RrSU1Db250ZXh0KiBpbUNv bnRleHQ7CiAgICAgR3RrQ2xpY2tDb3VudGVyIGNsaWNrQ291bnRlcjsKQEAgLTEyNCw3ICsxMjQs NyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUZpbmFsaXplKEdPYmplY3QqIGdvYmpl Y3QpCiAgICAgICAgIHByaXYtPmltQ29udGV4dCA9IDA7CiAgICAgfQogCi0gICAgcHJpdi0+cGFn ZS0+Y2xvc2UoKTsKKyAgICBwcml2LT5wYWdlUHJveHktPmNsb3NlKCk7CiAKICAgICBkZWxldGUg cHJpdjsKICAgICB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdiA9IDA7CkBAIC0xNDYsNyArMTQ2LDcg QEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2Jhc2VfaW5pdChXZWJLaXRXZWJWaWV3QmFz ZSogd2Via2l0V2ViVmlld0Jhc2UpCiB9CiAKICNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgotc3Rh dGljIGdib29sZWFuIHdlYlZpZXdFeHBvc2UoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50RXhw b3NlKiBldmVudCkKK3N0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZUV4cG9zZShHdGtX aWRnZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqIGV2ZW50KQogewogICAgIFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CiAKQEAg LTE1NCwxMiArMTU0LDEyIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RXhwb3NlKEd0a1dpZGdl dCogd2lkZ2V0LCBHZGtFdmVudEV4cG9zZSogZXZlbnQpCiAgICAgZ2RrX3JlZ2lvbl9nZXRfY2xp cGJveChldmVudC0+cmVnaW9uLCAmY2xpcFJlY3QpOwogCiAgICAgUmVmUHRyPGNhaXJvX3Q+IGNy ID0gYWRvcHRSZWYoZ2RrX2NhaXJvX2NyZWF0ZShndGtfd2lkZ2V0X2dldF93aW5kb3cod2lkZ2V0 KSkpOwotICAgIHdlYlZpZXdCYXNlLT5wcml2LT5wYWdlLT5kcmF3aW5nQXJlYSgpLT5wYWludChj bGlwUmVjdCwgY3IuZ2V0KCkpOworICAgIHdlYlZpZXdCYXNlLT5wcml2LT5wYWdlUHJveHktPmRy YXdpbmdBcmVhKCktPnBhaW50KGNsaXBSZWN0LCBjci5nZXQoKSk7CiAKICAgICByZXR1cm4gRkFM U0U7CiB9CiAjZWxzZQotc3RhdGljIGdib29sZWFuIHdlYlZpZXdEcmF3KEd0a1dpZGdldCogd2lk Z2V0LCBjYWlyb190KiBjcikKK3N0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZURyYXco R3RrV2lkZ2V0KiB3aWRnZXQsIGNhaXJvX3QqIGNyKQogewogICAgIFdlYktpdFdlYlZpZXdCYXNl KiB3ZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CiAKQEAgLTE2Nywy MiArMTY3LDIyIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RHJhdyhHdGtXaWRnZXQqIHdpZGdl dCwgY2Fpcm9fdCogY3IpCiAgICAgaWYgKCFnZGtfY2Fpcm9fZ2V0X2NsaXBfcmVjdGFuZ2xlKGNy LCAmY2xpcFJlY3QpKQogICAgICAgICByZXR1cm4gRkFMU0U7CiAKLSAgICB3ZWJWaWV3QmFzZS0+ cHJpdi0+cGFnZS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoY2xpcFJlY3QsIGNyKTsKKyAgICB3ZWJW aWV3QmFzZS0+cHJpdi0+cGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5wYWludChjbGlwUmVjdCwg Y3IpOwogCiAgICAgcmV0dXJuIEZBTFNFOwogfQogI2VuZGlmCiAKLXN0YXRpYyB2b2lkIHdlYlZp ZXdTaXplQWxsb2NhdGUoR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a0FsbG9jYXRpb24qIGFsbG9jYXRp b24pCitzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZShHdGtXaWRnZXQq IHdpZGdldCwgR3RrQWxsb2NhdGlvbiogYWxsb2NhdGlvbikKIHsKICAgICBXZWJLaXRXZWJWaWV3 QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwogICAgIFdl YktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2OwogCiAgICAg R1RLX1dJREdFVF9DTEFTUyh3ZWJraXRfd2ViX3ZpZXdfYmFzZV9wYXJlbnRfY2xhc3MpLT5zaXpl X2FsbG9jYXRlKHdpZGdldCwgYWxsb2NhdGlvbik7Ci0gICAgcHJpdi0+cGFnZS0+ZHJhd2luZ0Fy ZWEoKS0+c2V0U2l6ZShJbnRTaXplKGFsbG9jYXRpb24tPndpZHRoLCBhbGxvY2F0aW9uLT5oZWln aHQpLCBJbnRTaXplKCkpOworICAgIHByaXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+c2V0 U2l6ZShJbnRTaXplKGFsbG9jYXRpb24tPndpZHRoLCBhbGxvY2F0aW9uLT5oZWlnaHQpLCBJbnRT aXplKCkpOwogfQogCi1zdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0ZvY3VzSW5FdmVudChHdGtXaWRn ZXQqIHdpZGdldCwgR2RrRXZlbnRGb2N1cyogZXZlbnQpCitzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0 V2ViVmlld0Jhc2VGb2N1c0luRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50Rm9jdXMq IGV2ZW50KQogewogICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSA9IFdFQktJVF9X RUJfVklFV19CQVNFKHdpZGdldCk7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2 ID0gd2ViVmlld0Jhc2UtPnByaXY7CkBAIC0xOTIsMzcgKzE5MiwzNyBAQCBzdGF0aWMgZ2Jvb2xl YW4gd2ViVmlld0ZvY3VzSW5FdmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRGb2N1cyog ZXZlbnQpCiAgICAgICAgIGd0a19pbV9jb250ZXh0X2ZvY3VzX2luKHByaXYtPmltQ29udGV4dCk7 CiAgICAgICAgIGlmICghcHJpdi0+aXNQYWdlQWN0aXZlKSB7CiAgICAgICAgICAgICBwcml2LT5p c1BhZ2VBY3RpdmUgPSBUUlVFOwotICAgICAgICAgICAgcHJpdi0+cGFnZS0+dmlld1N0YXRlRGlk Q2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmlld1dpbmRvd0lzQWN0aXZlKTsKKyAgICAgICAgICAgIHBy aXYtPnBhZ2VQcm94eS0+dmlld1N0YXRlRGlkQ2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmlld1dpbmRv d0lzQWN0aXZlKTsKICAgICAgICAgfQogICAgIH0KIAogICAgIHJldHVybiBHVEtfV0lER0VUX0NM QVNTKHdlYmtpdF93ZWJfdmlld19iYXNlX3BhcmVudF9jbGFzcyktPmZvY3VzX2luX2V2ZW50KHdp ZGdldCwgZXZlbnQpOwogfQogCi1zdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0ZvY3VzT3V0RXZlbnQo R3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50Rm9jdXMqIGV2ZW50KQorc3RhdGljIGdib29sZWFu IHdlYmtpdFdlYlZpZXdCYXNlRm9jdXNPdXRFdmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZl bnRGb2N1cyogZXZlbnQpCiB7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0g V0VCS0lUX1dFQl9WSUVXX0JBU0Uod2lkZ2V0KTsKICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZh dGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+cHJpdjsKIAogICAgIHByaXYtPmlzUGFnZUFjdGl2ZSA9 IEZBTFNFOwotICAgIHByaXYtPnBhZ2UtPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6 OlZpZXdXaW5kb3dJc0FjdGl2ZSk7CisgICAgcHJpdi0+cGFnZVByb3h5LT52aWV3U3RhdGVEaWRD aGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3V2luZG93SXNBY3RpdmUpOwogICAgIGlmIChwcml2LT5p bUNvbnRleHQpCiAgICAgICAgIGd0a19pbV9jb250ZXh0X2ZvY3VzX291dChwcml2LT5pbUNvbnRl eHQpOwogCiAgICAgcmV0dXJuIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0X3dlYl92aWV3X2Jhc2Vf cGFyZW50X2NsYXNzKS0+Zm9jdXNfb3V0X2V2ZW50KHdpZGdldCwgZXZlbnQpOwogfQogCi1zdGF0 aWMgZ2Jvb2xlYW4gd2ViVmlld0tleVByZXNzRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2 ZW50S2V5KiBldmVudCkKK3N0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZUtleVByZXNz RXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50S2V5KiBldmVudCkKIHsKICAgICBXZWJL aXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQp OwogICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2 OwogCi0gICAgcHJpdi0+cGFnZS0+aGFuZGxlS2V5Ym9hcmRFdmVudChOYXRpdmVXZWJLZXlib2Fy ZEV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQqPihldmVudCkpKTsKKyAgICBwcml2LT5w YWdlUHJveHktPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVudChyZWlu dGVycHJldF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpKSk7CiAKICAgICByZXR1cm4gR1RLX1dJREdF VF9DTEFTUyh3ZWJraXRfd2ViX3ZpZXdfYmFzZV9wYXJlbnRfY2xhc3MpLT5rZXlfcHJlc3NfZXZl bnQod2lkZ2V0LCBldmVudCk7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3S2V5UmVsZWFz ZUV2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEtleSogZXZlbnQpCitzdGF0aWMgZ2Jv b2xlYW4gd2Via2l0V2ViVmlld0Jhc2VLZXlSZWxlYXNlRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQs IEdka0V2ZW50S2V5KiBldmVudCkKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jh c2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwogICAgIFdlYktpdFdlYlZpZXdCYXNl UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2OwpAQCAtMjMwLDEyICsyMzAsMTIgQEAg c3RhdGljIGdib29sZWFuIHdlYlZpZXdLZXlSZWxlYXNlRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQs IEdka0V2ZW50S2V5KiBldmVudCkKICAgICBpZiAoZ3RrX2ltX2NvbnRleHRfZmlsdGVyX2tleXBy ZXNzKHByaXYtPmltQ29udGV4dCwgZXZlbnQpKQogICAgICAgICByZXR1cm4gVFJVRTsKIAotICAg IHByaXYtPnBhZ2UtPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVudChy ZWludGVycHJldF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpKSk7CisgICAgcHJpdi0+cGFnZVByb3h5 LT5oYW5kbGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktleWJvYXJkRXZlbnQocmVpbnRlcnByZXRf Y2FzdDxHZGtFdmVudCo+KGV2ZW50KSkpOwogCiAgICAgcmV0dXJuIEdUS19XSURHRVRfQ0xBU1Mo d2Via2l0X3dlYl92aWV3X2Jhc2VfcGFyZW50X2NsYXNzKS0+a2V5X3JlbGVhc2VfZXZlbnQod2lk Z2V0LCBldmVudCk7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3QnV0dG9uUHJlc3NFdmVu dChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRCdXR0b24qIGJ1dHRvbkV2ZW50KQorc3RhdGlj IGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlQnV0dG9uUHJlc3NFdmVudChHdGtXaWRnZXQqIHdp ZGdldCwgR2RrRXZlbnRCdXR0b24qIGJ1dHRvbkV2ZW50KQogewogICAgIFdlYktpdFdlYlZpZXdC YXNlKiB3ZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CiAgICAgV2Vi S2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2ViVmlld0Jhc2UtPnByaXY7CkBAIC0yNDMs MzggKzI0MywzOCBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0J1dHRvblByZXNzRXZlbnQoR3Rr V2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50QnV0dG9uKiBidXR0bwogCiAgICAgaWYgKCFwcml2LT5j bGlja0NvdW50ZXIuc2hvdWxkUHJvY2Vzc0J1dHRvbkV2ZW50KGJ1dHRvbkV2ZW50KSkKICAgICAg ICAgcmV0dXJuIFRSVUU7Ci0gICAgcHJpdi0+cGFnZS0+aGFuZGxlTW91c2VFdmVudChOYXRpdmVX ZWJNb3VzZUV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQqPihidXR0b25FdmVudCksCisg ICAgcHJpdi0+cGFnZVByb3h5LT5oYW5kbGVNb3VzZUV2ZW50KE5hdGl2ZVdlYk1vdXNlRXZlbnQo cmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGJ1dHRvbkV2ZW50KSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpdi0+Y2xpY2tDb3VudGVy LmNsaWNrQ291bnRGb3JHZGtCdXR0b25FdmVudCh3aWRnZXQsIGJ1dHRvbkV2ZW50KSkpOwogICAg IHJldHVybiBGQUxTRTsKIH0KIAotc3RhdGljIGdib29sZWFuIHdlYlZpZXdCdXR0b25SZWxlYXNl RXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50QnV0dG9uKiBldmVudCkKK3N0YXRpYyBn Ym9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZUJ1dHRvblJlbGVhc2VFdmVudChHdGtXaWRnZXQqIHdp ZGdldCwgR2RrRXZlbnRCdXR0b24qIGV2ZW50KQogewogICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3 ZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CiAgICAgV2ViS2l0V2Vi Vmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2ViVmlld0Jhc2UtPnByaXY7CiAKICAgICBndGtfd2lk Z2V0X2dyYWJfZm9jdXMod2lkZ2V0KTsKLSAgICBwcml2LT5wYWdlLT5oYW5kbGVNb3VzZUV2ZW50 KE5hdGl2ZVdlYk1vdXNlRXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwg MCAvKiBjdXJyZW50Q2xpY2tDb3VudCAqLykpOworICAgIHByaXYtPnBhZ2VQcm94eS0+aGFuZGxl TW91c2VFdmVudChOYXRpdmVXZWJNb3VzZUV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQq PihldmVudCksIDAgLyogY3VycmVudENsaWNrQ291bnQgKi8pKTsKIAogICAgIHJldHVybiBGQUxT RTsKIH0KIAotc3RhdGljIGdib29sZWFuIHdlYlZpZXdTY3JvbGxFdmVudChHdGtXaWRnZXQqIHdp ZGdldCwgR2RrRXZlbnRTY3JvbGwqIGV2ZW50KQorc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZp ZXdCYXNlU2Nyb2xsRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50U2Nyb2xsKiBldmVu dCkKIHsKICAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJ RVdfQkFTRSh3aWRnZXQpOwogICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdl YlZpZXdCYXNlLT5wcml2OwogCi0gICAgcHJpdi0+cGFnZS0+aGFuZGxlV2hlZWxFdmVudChXZWJF dmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoZXZlbnQpKTsKKyAgICBwcml2LT5wYWdl UHJveHktPmhhbmRsZVdoZWVsRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2 ZW50KGV2ZW50KSk7CiAKICAgICByZXR1cm4gRkFMU0U7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbiB3 ZWJWaWV3TW90aW9uTm90aWZ5RXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50TW90aW9u KiBldmVudCkKK3N0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3QmFzZU1vdGlvbk5vdGlmeUV2 ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudE1vdGlvbiogZXZlbnQpCiB7CiAgICAgV2Vi S2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2lkZ2V0 KTsKICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+cHJp djsKIAotICAgIHByaXYtPnBhZ2UtPmhhbmRsZU1vdXNlRXZlbnQoTmF0aXZlV2ViTW91c2VFdmVu dChyZWludGVycHJldF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpLCAwIC8qIGN1cnJlbnRDbGlja0Nv dW50ICovKSk7CisgICAgcHJpdi0+cGFnZVByb3h5LT5oYW5kbGVNb3VzZUV2ZW50KE5hdGl2ZVdl Yk1vdXNlRXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwgMCAvKiBjdXJy ZW50Q2xpY2tDb3VudCAqLykpOwogCiAgICAgcmV0dXJuIEZBTFNFOwogfQpAQCAtMjg0LDE5ICsy ODQsMTkgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2Jhc2VfY2xhc3NfaW5pdChXZWJL aXRXZWJWaWV3QmFzZUNsYXNzKiB3ZWJraXRXZWJWaWUKICAgICBHdGtXaWRnZXRDbGFzcyogd2lk Z2V0Q2xhc3MgPSBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdFdlYlZpZXdCYXNlQ2xhc3MpOwogICAg IHdpZGdldENsYXNzLT5yZWFsaXplID0gd2Via2l0V2ViVmlld0Jhc2VSZWFsaXplOwogI2lmZGVm IEdUS19BUElfVkVSU0lPTl8yCi0gICAgd2lkZ2V0Q2xhc3MtPmV4cG9zZV9ldmVudCA9IHdlYlZp ZXdFeHBvc2U7CisgICAgd2lkZ2V0Q2xhc3MtPmV4cG9zZV9ldmVudCA9IHdlYmtpdFdlYlZpZXdC YXNlRXhwb3NlOwogI2Vsc2UKLSAgICB3aWRnZXRDbGFzcy0+ZHJhdyA9IHdlYlZpZXdEcmF3Owor ICAgIHdpZGdldENsYXNzLT5kcmF3ID0gd2Via2l0V2ViVmlld0Jhc2VEcmF3OwogI2VuZGlmCi0g ICAgd2lkZ2V0Q2xhc3MtPnNpemVfYWxsb2NhdGUgPSB3ZWJWaWV3U2l6ZUFsbG9jYXRlOwotICAg IHdpZGdldENsYXNzLT5mb2N1c19pbl9ldmVudCA9IHdlYlZpZXdGb2N1c0luRXZlbnQ7Ci0gICAg d2lkZ2V0Q2xhc3MtPmZvY3VzX291dF9ldmVudCA9IHdlYlZpZXdGb2N1c091dEV2ZW50OwotICAg IHdpZGdldENsYXNzLT5rZXlfcHJlc3NfZXZlbnQgPSB3ZWJWaWV3S2V5UHJlc3NFdmVudDsKLSAg ICB3aWRnZXRDbGFzcy0+a2V5X3JlbGVhc2VfZXZlbnQgPSB3ZWJWaWV3S2V5UmVsZWFzZUV2ZW50 OwotICAgIHdpZGdldENsYXNzLT5idXR0b25fcHJlc3NfZXZlbnQgPSB3ZWJWaWV3QnV0dG9uUHJl c3NFdmVudDsKLSAgICB3aWRnZXRDbGFzcy0+YnV0dG9uX3JlbGVhc2VfZXZlbnQgPSB3ZWJWaWV3 QnV0dG9uUmVsZWFzZUV2ZW50OwotICAgIHdpZGdldENsYXNzLT5zY3JvbGxfZXZlbnQgPSB3ZWJW aWV3U2Nyb2xsRXZlbnQ7Ci0gICAgd2lkZ2V0Q2xhc3MtPm1vdGlvbl9ub3RpZnlfZXZlbnQgPSB3 ZWJWaWV3TW90aW9uTm90aWZ5RXZlbnQ7CisgICAgd2lkZ2V0Q2xhc3MtPnNpemVfYWxsb2NhdGUg PSB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZTsKKyAgICB3aWRnZXRDbGFzcy0+Zm9jdXNf aW5fZXZlbnQgPSB3ZWJraXRXZWJWaWV3QmFzZUZvY3VzSW5FdmVudDsKKyAgICB3aWRnZXRDbGFz cy0+Zm9jdXNfb3V0X2V2ZW50ID0gd2Via2l0V2ViVmlld0Jhc2VGb2N1c091dEV2ZW50OworICAg IHdpZGdldENsYXNzLT5rZXlfcHJlc3NfZXZlbnQgPSB3ZWJraXRXZWJWaWV3QmFzZUtleVByZXNz RXZlbnQ7CisgICAgd2lkZ2V0Q2xhc3MtPmtleV9yZWxlYXNlX2V2ZW50ID0gd2Via2l0V2ViVmll d0Jhc2VLZXlSZWxlYXNlRXZlbnQ7CisgICAgd2lkZ2V0Q2xhc3MtPmJ1dHRvbl9wcmVzc19ldmVu dCA9IHdlYmtpdFdlYlZpZXdCYXNlQnV0dG9uUHJlc3NFdmVudDsKKyAgICB3aWRnZXRDbGFzcy0+ YnV0dG9uX3JlbGVhc2VfZXZlbnQgPSB3ZWJraXRXZWJWaWV3QmFzZUJ1dHRvblJlbGVhc2VFdmVu dDsKKyAgICB3aWRnZXRDbGFzcy0+c2Nyb2xsX2V2ZW50ID0gd2Via2l0V2ViVmlld0Jhc2VTY3Jv bGxFdmVudDsKKyAgICB3aWRnZXRDbGFzcy0+bW90aW9uX25vdGlmeV9ldmVudCA9IHdlYmtpdFdl YlZpZXdCYXNlTW90aW9uTm90aWZ5RXZlbnQ7CiAKICAgICBHT2JqZWN0Q2xhc3MqIGdvYmplY3RD bGFzcyA9IEdfT0JKRUNUX0NMQVNTKHdlYmtpdFdlYlZpZXdCYXNlQ2xhc3MpOwogICAgIGdvYmpl Y3RDbGFzcy0+ZmluYWxpemUgPSB3ZWJraXRXZWJWaWV3QmFzZUZpbmFsaXplOwpAQCAtMzEwLDgg KzMxMCw4IEBAIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZShXZWJD b250ZXh0KiBjb250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhCiAgICAgV2ViS2l0V2ViVmlld0Jhc2Uq IHdlYmtpdFdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVXX0JBU0UoZ19vYmplY3RfbmV3KFdF QktJVF9UWVBFX1dFQl9WSUVXX0JBU0UsIE5VTEwpKTsKICAgICBXZWJLaXRXZWJWaWV3QmFzZVBy aXZhdGUqIHByaXYgPSB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdjsKIAotICAgIHByaXYtPnBhZ2Ug PSBjb250ZXh0LT5jcmVhdGVXZWJQYWdlKHByaXYtPnBhZ2VDbGllbnQuZ2V0KCksIHBhZ2VHcm91 cCk7Ci0gICAgcHJpdi0+cGFnZS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKyAgICBwcml2LT5wYWdl UHJveHkgPSBjb250ZXh0LT5jcmVhdGVXZWJQYWdlKHByaXYtPnBhZ2VDbGllbnQuZ2V0KCksIHBh Z2VHcm91cCk7CisgICAgcHJpdi0+cGFnZVByb3h5LT5pbml0aWFsaXplV2ViUGFnZSgpOwogCiAg ICAgcmV0dXJuIHdlYmtpdFdlYlZpZXdCYXNlOwogfQpAQCAtMzIzLDUgKzMyMyw1IEBAIEd0a0lN Q29udGV4dCogd2Via2l0V2ViVmlld0Jhc2VHZXRJTUNvbnRleHQoV2ViS2l0V2ViVmlld0Jhc2Uq IHdlYmtpdFdlYlZpZXdCYXNlCiAKIFdlYlBhZ2VQcm94eSogd2Via2l0V2ViVmlld0Jhc2VHZXRQ YWdlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKIHsKLSAgICByZXR1cm4g d2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnBhZ2UuZ2V0KCk7CisgICAgcmV0dXJuIHdlYmtpdFdl YlZpZXdCYXNlLT5wcml2LT5wYWdlUHJveHkuZ2V0KCk7CiB9Cg==