59683 2011-04-28 03:22:40 -0700 [GTK] Use the WebPage object in WebKitWebViewBase 2011-04-28 09:44:54 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 394331 0 cgarcia 2011-04-28 03:22:40 -0700 Instead of getting it from the page client. It simplifies the implementation of the event callbacks. 394333 1 91459 cgarcia 2011-04-28 03:26:46 -0700 Created attachment 91459 Patch 394489 2 cgarcia 2011-04-28 09:44:54 -0700 Committed r85197: <http://trac.webkit.org/changeset/85197> 91459 2011-04-28 03:26:46 -0700 2011-04-28 08:53:10 -0700 Patch wk2-view-widget-page.diff text/plain 14920 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0N2Q4NTBhLi5lMmEwMDY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTEtMDQtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IFVzZSB0aGUgV2ViUGFnZSBvYmplY3QgaW4gV2ViS2l0V2ViVmlld0Jhc2UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU5NjgzCisKKyAgICAgICAgSXQg c2ltcGxpZmllcyB0aGUgaW1wbGVtZW50YXRpb24gb2YgdGhlIGV2ZW50IGNhbGxiYWNrcy4gUmVt b3ZlCisgICAgICAgIGFsc28gYWxsIHRoZSBtZXRob2RzIGZyb20gdGhlIHBhZ2UgY2xpZW50IHRo YXQgYXJlIG5vIGxvbmdlcgorICAgICAgICBuZWVkZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFz ZUluaXQpOgorICAgICAgICAod2ViVmlld0V4cG9zZSk6CisgICAgICAgICh3ZWJWaWV3RHJhdyk6 CisgICAgICAgICh3ZWJWaWV3U2l6ZUFsbG9jYXRlKToKKyAgICAgICAgKHdlYlZpZXdGb2N1c0lu RXZlbnQpOgorICAgICAgICAod2ViVmlld0ZvY3VzT3V0RXZlbnQpOgorICAgICAgICAod2ViVmll d0tleVByZXNzRXZlbnQpOgorICAgICAgICAod2ViVmlld0tleVJlbGVhc2VFdmVudCk6CisgICAg ICAgICh3ZWJWaWV3QnV0dG9uUHJlc3NFdmVudCk6CisgICAgICAgICh3ZWJWaWV3QnV0dG9uUmVs ZWFzZUV2ZW50KToKKyAgICAgICAgKHdlYlZpZXdTY3JvbGxFdmVudCk6CisgICAgICAgICh3ZWJW aWV3TW90aW9uTm90aWZ5RXZlbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlZpZXdCYXNlLmg6CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9XZWJWaWV3LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6V2ViVmlldyk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXc6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2Vi Vmlldy5oOgorCiAyMDExLTA0LTI3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCAzNjFhMTJlLi4x ODk3YzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC0zMCw5ICszMCwxMiBAQAogCiAjaW5jbHVkZSAiR093 blB0ckd0ay5oIgogI2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIKKyNpbmNsdWRlICJOYXRpdmVX ZWJLZXlib2FyZEV2ZW50LmgiCisjaW5jbHVkZSAiTmF0aXZlV2ViTW91c2VFdmVudC5oIgogI2lu Y2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5jbHVkZSAiUmVmUHRyQ2Fpcm8uaCIKICNpbmNs dWRlICJXZWJDb250ZXh0LmgiCisjaW5jbHVkZSAiV2ViRXZlbnRGYWN0b3J5LmgiCiAjaW5jbHVk ZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0NvbnRleHQuaD4KIApAQCAt NDQsNiArNDcsNyBAQCBzdGF0aWMgZ3BvaW50ZXIgd2Via2l0V2ViVmlld0Jhc2VQYXJlbnRDbGFz cyA9IDA7CiBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSB7CiAgICAgT3duUHRyPFdl YlZpZXc+IHdlYlZpZXdJbnN0YW5jZTsKICAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBwYWdlOwor ICAgIGdib29sZWFuIGlzUGFnZUFjdGl2ZTsKICAgICBHdGtJTUNvbnRleHQqIGltQ29udGV4dDsK ICAgICBnaW50IGN1cnJlbnRDbGlja0NvdW50OwogICAgIEludFBvaW50IHByZXZpb3VzQ2xpY2tQ b2ludDsKQEAgLTEzMyw2ICsxMzcsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUlu aXQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlKQogICAgIFdlYktpdFdlYlZp ZXdCYXNlUHJpdmF0ZSogcHJpdiA9IG5ldyBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUoKTsKICAg ICB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdiA9IHByaXY7CiAKKyAgICBwcml2LT5pc1BhZ2VBY3Rp dmUgPSBUUlVFOworCiAgICAgZ3RrX3dpZGdldF9zZXRfY2FuX2ZvY3VzKEdUS19XSURHRVQod2Vi a2l0V2ViVmlld0Jhc2UpLCBUUlVFKTsKICAgICBwcml2LT5pbUNvbnRleHQgPSBndGtfaW1fbXVs dGljb250ZXh0X25ldygpOwogCkBAIC0xNDYsMjcgKzE1MiwyOSBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUluaXQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlKQog I2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCiBzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0V4cG9zZShH dGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqIGV2ZW50KQogewotICAgIFdlYlZpZXcq IHdlYlZpZXcgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5jZShXRUJLSVRfV0VC X1ZJRVdfQkFTRSh3aWRnZXQpKTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2Ug PSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOworICAgIFdlYktpdFdlYlZpZXdCYXNlUHJp dmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2OwogICAgIEdka1JlY3RhbmdsZSBjbGlwUmVj dDsKICAgICBnZGtfcmVnaW9uX2dldF9jbGlwYm94KGV2ZW50LT5yZWdpb24sICZjbGlwUmVjdCk7 CiAKICAgICBHZGtXaW5kb3cqIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3dpbmRvdyh3aWRnZXQp OwogICAgIFJlZlB0cjxjYWlyb190PiBjciA9IGFkb3B0UmVmKGdka19jYWlyb19jcmVhdGUod2lu ZG93KSk7CiAKLSAgICB3ZWJWaWV3LT5wYWludCh3aWRnZXQsIGNsaXBSZWN0LCBjci5nZXQoKSk7 CisgICAgcHJpdi0+cGFnZS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoY2xpcFJlY3QsIGNyKTsKIAog ICAgIHJldHVybiBGQUxTRTsKIH0KICNlbHNlCiBzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0RyYXco R3RrV2lkZ2V0KiB3aWRnZXQsIGNhaXJvX3QqIGNyKQogewotICAgIFdlYlZpZXcqIHdlYlZpZXcg PSB3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5jZShXRUJLSVRfV0VCX1ZJRVdfQkFT RSh3aWRnZXQpKTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRf V0VCX1ZJRVdfQkFTRSh3aWRnZXQpOworICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJp diA9IHdlYlZpZXdCYXNlLT5wcml2OwogICAgIEdka1JlY3RhbmdsZSBjbGlwUmVjdDsKIAogICAg IGlmICghZ2RrX2NhaXJvX2dldF9jbGlwX3JlY3RhbmdsZShjciwgJmNsaXBSZWN0KSkKICAgICAg ICAgcmV0dXJuIEZBTFNFOwogCi0gICAgd2ViVmlldy0+cGFpbnQod2lkZ2V0LCBjbGlwUmVjdCwg Y3IpOworICAgIHByaXYtPnBhZ2UtPmRyYXdpbmdBcmVhKCktPnBhaW50KGNsaXBSZWN0LCBjcik7 CiAKICAgICByZXR1cm4gRkFMU0U7CiB9CkBAIC0xNzQsMjAgKzE4MiwyNSBAQCBzdGF0aWMgZ2Jv b2xlYW4gd2ViVmlld0RyYXcoR3RrV2lkZ2V0KiB3aWRnZXQsIGNhaXJvX3QqIGNyKQogCiBzdGF0 aWMgdm9pZCB3ZWJWaWV3U2l6ZUFsbG9jYXRlKEd0a1dpZGdldCogd2lkZ2V0LCBHdGtBbGxvY2F0 aW9uKiBhbGxvY2F0aW9uKQogewotICAgIFdlYlZpZXcqIHdlYlZpZXcgPSB3ZWJraXRXZWJWaWV3 QmFzZUdldFdlYlZpZXdJbnN0YW5jZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpKTsKKyAg ICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3 aWRnZXQpOworICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNl LT5wcml2OworCiAgICAgR1RLX1dJREdFVF9DTEFTUyh3ZWJraXRXZWJWaWV3QmFzZVBhcmVudENs YXNzKS0+c2l6ZV9hbGxvY2F0ZSh3aWRnZXQsIGFsbG9jYXRpb24pOwotICAgIHdlYlZpZXctPnNl dFNpemUod2lkZ2V0LCBJbnRTaXplKGFsbG9jYXRpb24tPndpZHRoLCBhbGxvY2F0aW9uLT5oZWln aHQpKTsKKyAgICBwcml2LT5wYWdlLT5kcmF3aW5nQXJlYSgpLT5zZXRTaXplKEludFNpemUoYWxs b2NhdGlvbi0+d2lkdGgsIGFsbG9jYXRpb24tPmhlaWdodCksIEludFNpemUoKSk7CiB9CiAKIHN0 YXRpYyBnYm9vbGVhbiB3ZWJWaWV3Rm9jdXNJbkV2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtF dmVudEZvY3VzKiBldmVudCkKIHsKLSAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmll d0Jhc2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwotICAgIFdlYlZpZXcqIHdlYlZp ZXcgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5jZSh3ZWJraXRXZWJWaWV3QmFz ZSk7CisgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVX X0JBU0Uod2lkZ2V0KTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJW aWV3QmFzZS0+cHJpdjsKIAogICAgIEd0a1dpZGdldCogdG9wbGV2ZWwgPSBndGtfd2lkZ2V0X2dl dF90b3BsZXZlbCh3aWRnZXQpOwogICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcGxl dmVsKSAmJiBndGtfd2luZG93X2hhc190b3BsZXZlbF9mb2N1cyhHVEtfV0lORE9XKHRvcGxldmVs KSkpIHsKLSAgICAgICAgZ3RrX2ltX2NvbnRleHRfZm9jdXNfaW4od2Via2l0V2ViVmlld0Jhc2VH ZXRJTUNvbnRleHQod2Via2l0V2ViVmlld0Jhc2UpKTsKLSAgICAgICAgd2ViVmlldy0+aGFuZGxl Rm9jdXNJbkV2ZW50KHdpZGdldCk7CisgICAgICAgIGd0a19pbV9jb250ZXh0X2ZvY3VzX2luKHBy aXYtPmltQ29udGV4dCk7CisgICAgICAgIGlmICghcHJpdi0+aXNQYWdlQWN0aXZlKSB7CisgICAg ICAgICAgICBwcml2LT5pc1BhZ2VBY3RpdmUgPSBUUlVFOworICAgICAgICAgICAgcHJpdi0+cGFn ZS0+dmlld1N0YXRlRGlkQ2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmlld1dpbmRvd0lzQWN0aXZlKTsK KyAgICAgICAgfQogICAgIH0KIAogICAgIHJldHVybiBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdFdl YlZpZXdCYXNlUGFyZW50Q2xhc3MpLT5mb2N1c19pbl9ldmVudCh3aWRnZXQsIGV2ZW50KTsKQEAg LTE5NSwzNCArMjA4LDM2IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3Rm9jdXNJbkV2ZW50KEd0 a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEZvY3VzKiBldmVudCkKIAogc3RhdGljIGdib29sZWFu IHdlYlZpZXdGb2N1c091dEV2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEZvY3VzKiBl dmVudCkKIHsKLSAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UgPSBXRUJL SVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwotICAgIFdlYlZpZXcqIHdlYlZpZXcgPSB3ZWJraXRX ZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5jZSh3ZWJraXRXZWJWaWV3QmFzZSk7CisgICAgV2Vi S2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2lkZ2V0 KTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+cHJp djsKIAotICAgIHdlYlZpZXctPmhhbmRsZUZvY3VzT3V0RXZlbnQod2lkZ2V0KTsKLSAgICBHdGtJ TUNvbnRleHQqIGltQ29udGV4dCA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0SU1Db250ZXh0KHdlYmtp dFdlYlZpZXdCYXNlKTsKLSAgICBpZiAoaW1Db250ZXh0KQotICAgICAgICBndGtfaW1fY29udGV4 dF9mb2N1c19vdXQoaW1Db250ZXh0KTsKKyAgICBwcml2LT5pc1BhZ2VBY3RpdmUgPSBGQUxTRTsK KyAgICBwcml2LT5wYWdlLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3V2lu ZG93SXNBY3RpdmUpOworICAgIGlmIChwcml2LT5pbUNvbnRleHQpCisgICAgICAgIGd0a19pbV9j b250ZXh0X2ZvY3VzX291dChwcml2LT5pbUNvbnRleHQpOwogCiAgICAgcmV0dXJuIEdUS19XSURH RVRfQ0xBU1Mod2Via2l0V2ViVmlld0Jhc2VQYXJlbnRDbGFzcyktPmZvY3VzX291dF9ldmVudCh3 aWRnZXQsIGV2ZW50KTsKIH0KIAogc3RhdGljIGdib29sZWFuIHdlYlZpZXdLZXlQcmVzc0V2ZW50 KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEtleSogZXZlbnQpCiB7Ci0gICAgV2ViVmlldyog d2ViVmlldyA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0V2ViVmlld0luc3RhbmNlKFdFQktJVF9XRUJf VklFV19CQVNFKHdpZGdldCkpOwotICAgIHdlYlZpZXctPmhhbmRsZUtleWJvYXJkRXZlbnQoZXZl bnQpOworICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklF V19CQVNFKHdpZGdldCk7CisgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2Vi Vmlld0Jhc2UtPnByaXY7CisKKyAgICBwcml2LT5wYWdlLT5oYW5kbGVLZXlib2FyZEV2ZW50KE5h dGl2ZVdlYktleWJvYXJkRXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSkp OwogCiAgICAgcmV0dXJuIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0V2ViVmlld0Jhc2VQYXJlbnRD bGFzcyktPmtleV9wcmVzc19ldmVudCh3aWRnZXQsIGV2ZW50KTsKIH0KIAogc3RhdGljIGdib29s ZWFuIHdlYlZpZXdLZXlSZWxlYXNlRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50S2V5 KiBldmVudCkKIHsKLSAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UgPSBX RUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOwotICAgIFdlYlZpZXcqIHdlYlZpZXcgPSB3ZWJr aXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5jZSh3ZWJraXRXZWJWaWV3QmFzZSk7CisgICAg V2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2lk Z2V0KTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+ cHJpdjsKIAotICAgIGlmIChndGtfaW1fY29udGV4dF9maWx0ZXJfa2V5cHJlc3Mod2Via2l0V2Vi Vmlld0Jhc2VHZXRJTUNvbnRleHQod2Via2l0V2ViVmlld0Jhc2UpLCBldmVudCkpCisgICAgaWYg KGd0a19pbV9jb250ZXh0X2ZpbHRlcl9rZXlwcmVzcyhwcml2LT5pbUNvbnRleHQsIGV2ZW50KSkK ICAgICAgICAgcmV0dXJuIFRSVUU7CiAKLSAgICB3ZWJWaWV3LT5oYW5kbGVLZXlib2FyZEV2ZW50 KGV2ZW50KTsKKyAgICBwcml2LT5wYWdlLT5oYW5kbGVLZXlib2FyZEV2ZW50KE5hdGl2ZVdlYktl eWJvYXJkRXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSkpOwogCiAgICAg cmV0dXJuIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0V2ViVmlld0Jhc2VQYXJlbnRDbGFzcyktPmtl eV9yZWxlYXNlX2V2ZW50KHdpZGdldCwgZXZlbnQpOwogfQpAQCAtMjg2LDggKzMwMSw3IEBAIHN0 YXRpYyBnYm9vbGVhbiB3ZWJWaWV3QnV0dG9uUHJlc3NFdmVudChHdGtXaWRnZXQqIHdpZGdldCwg R2RrRXZlbnRCdXR0b24qIGJ1dHRvCiAgICAgZWxzZQogICAgICAgICBwcml2LT5jdXJyZW50Q2xp Y2tDb3VudCA9IDE7CiAKLSAgICBXZWJWaWV3KiB3ZWJWaWV3ID0gd2Via2l0V2ViVmlld0Jhc2VH ZXRXZWJWaWV3SW5zdGFuY2Uod2Via2l0V2ViVmlld0Jhc2UpOwotICAgIHdlYlZpZXctPmhhbmRs ZU1vdXNlRXZlbnQoZXZlbnQsIHByaXYtPmN1cnJlbnRDbGlja0NvdW50KTsKKyAgICBwcml2LT5w YWdlLT5oYW5kbGVNb3VzZUV2ZW50KE5hdGl2ZVdlYk1vdXNlRXZlbnQoZXZlbnQsIHByaXYtPmN1 cnJlbnRDbGlja0NvdW50KSk7CiAKICAgICBnZG91YmxlIHgsIHk7CiAgICAgZ2RrX2V2ZW50X2dl dF9jb29yZHMoZXZlbnQsICZ4LCAmeSk7CkBAIC0zMDAsMjUgKzMxNCwzMSBAQCBzdGF0aWMgZ2Jv b2xlYW4gd2ViVmlld0J1dHRvblByZXNzRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50 QnV0dG9uKiBidXR0bwogCiBzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0J1dHRvblJlbGVhc2VFdmVu dChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRCdXR0b24qIGV2ZW50KQogewotICAgIFdlYlZp ZXcqIHdlYlZpZXcgPSB3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5jZShXRUJLSVRf V0VCX1ZJRVdfQkFTRSh3aWRnZXQpKTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jh c2UgPSBXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpOworICAgIFdlYktpdFdlYlZpZXdCYXNl UHJpdmF0ZSogcHJpdiA9IHdlYlZpZXdCYXNlLT5wcml2OworCiAgICAgZ3RrX3dpZGdldF9ncmFi X2ZvY3VzKHdpZGdldCk7Ci0gICAgd2ViVmlldy0+aGFuZGxlTW91c2VFdmVudChyZWludGVycHJl dF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpLCAwIC8qIGN1cnJlbnRDbGlja0NvdW50ICovKTsKKyAg ICBwcml2LT5wYWdlLT5oYW5kbGVNb3VzZUV2ZW50KE5hdGl2ZVdlYk1vdXNlRXZlbnQocmVpbnRl cnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwgMCAvKiBjdXJyZW50Q2xpY2tDb3VudCAqLykp OwogCiAgICAgcmV0dXJuIEZBTFNFOwogfQogCiBzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld1Njcm9s bEV2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudFNjcm9sbCogZXZlbnQpCiB7Ci0gICAg V2ViVmlldyogd2ViVmlldyA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0V2ViVmlld0luc3RhbmNlKFdF QktJVF9XRUJfVklFV19CQVNFKHdpZGdldCkpOwotICAgIHdlYlZpZXctPmhhbmRsZVdoZWVsRXZl bnQoZXZlbnQpOworICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSA9IFdFQktJVF9X RUJfVklFV19CQVNFKHdpZGdldCk7CisgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2 ID0gd2ViVmlld0Jhc2UtPnByaXY7CisKKyAgICBwcml2LT5wYWdlLT5oYW5kbGVXaGVlbEV2ZW50 KFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVudChldmVudCkpOwogCiAgICAgcmV0 dXJuIEZBTFNFOwogfQogCiBzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld01vdGlvbk5vdGlmeUV2ZW50 KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudE1vdGlvbiogZXZlbnQpCiB7Ci0gICAgV2ViVmll dyogd2ViVmlldyA9IHdlYmtpdFdlYlZpZXdCYXNlR2V0V2ViVmlld0luc3RhbmNlKFdFQktJVF9X RUJfVklFV19CQVNFKHdpZGdldCkpOwotICAgIHdlYlZpZXctPmhhbmRsZU1vdXNlRXZlbnQocmVp bnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwgMCAvKiBjdXJyZW50Q2xpY2tDb3VudCAq Lyk7CisgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVX X0JBU0Uod2lkZ2V0KTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJW aWV3QmFzZS0+cHJpdjsKKworICAgIHByaXYtPnBhZ2UtPmhhbmRsZU1vdXNlRXZlbnQoTmF0aXZl V2ViTW91c2VFdmVudChyZWludGVycHJldF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpLCAwIC8qIGN1 cnJlbnRDbGlja0NvdW50ICovKSk7CiAKICAgICByZXR1cm4gRkFMU0U7CiB9CkBAIC0zODEsMTEg KzQwMSw2IEBAIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZShXZWJD b250ZXh0KiBjb250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhCiAgICAgcmV0dXJuIHdlYmtpdFdlYlZp ZXdCYXNlOwogfQogCi1XZWJWaWV3KiB3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5j ZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UpCi17Ci0gICAgcmV0dXJuIHdl YmtpdFdlYlZpZXdCYXNlLT5wcml2LT53ZWJWaWV3SW5zdGFuY2UuZ2V0KCk7Ci19Ci0KIEd0a0lN Q29udGV4dCogd2Via2l0V2ViVmlld0Jhc2VHZXRJTUNvbnRleHQoV2ViS2l0V2ViVmlld0Jhc2Uq IHdlYmtpdFdlYlZpZXdCYXNlKQogewogICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFzZS0+cHJp di0+aW1Db250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlld0Jhc2UuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXdCYXNlLmgKaW5kZXggNTFlNDRhMy4uMWEyMWU2ZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5oCkBA IC02MSw4ICs2MSw2IEBAIEdUeXBlIHdlYmtpdFdlYlZpZXdCYXNlR2V0VHlwZSgpOwogCiBXZWJL aXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2VDcmVhdGUoV2ViQ29udGV4dCosIFdlYlBh Z2VHcm91cCopOwogCi1XZWJWaWV3KiB3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5j ZShXZWJLaXRXZWJWaWV3QmFzZSopOwotCiBHdGtJTUNvbnRleHQqIHdlYmtpdFdlYlZpZXdCYXNl R2V0SU1Db250ZXh0KFdlYktpdFdlYlZpZXdCYXNlKik7CiAKIFdlYlBhZ2VQcm94eSogd2Via2l0 V2ViVmlld0Jhc2VHZXRQYWdlKFdlYktpdFdlYlZpZXdCYXNlKik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2d0ay9XZWJWaWV3LmNwcAppbmRleCA4Njc3NmFlLi5hZWU3NjA4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViVmlldy5jcHAKQEAgLTQ1LDI4ICs0NSw2IEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViUGFnZVByb3h5 KiBXZWJWaWV3OjpwYWdlKCkgY29uc3QKLXsKLSAgICByZXR1cm4gd2Via2l0V2ViVmlld0Jhc2VH ZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKG1fdmlld1dpZGdldCkpOwotfQotCi12b2lkIFdl YlZpZXc6OmhhbmRsZUZvY3VzSW5FdmVudChHdGtXaWRnZXQqIHdpZGdldCkKLXsKLSAgICBpZiAo IShtX2lzUGFnZUFjdGl2ZSkpIHsKLSAgICAgICAgbV9pc1BhZ2VBY3RpdmUgPSB0cnVlOwotICAg ICAgICBwYWdlKCktPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdXaW5kb3dJ c0FjdGl2ZSk7Ci0gICAgfQotCi0gICAgcGFnZSgpLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFn ZVByb3h5OjpWaWV3SXNGb2N1c2VkKTsKLX0KLQotdm9pZCBXZWJWaWV3OjpoYW5kbGVGb2N1c091 dEV2ZW50KEd0a1dpZGdldCogd2lkZ2V0KQotewotICAgIG1faXNQYWdlQWN0aXZlID0gZmFsc2U7 Ci0gICAgcGFnZSgpLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3V2luZG93 SXNBY3RpdmUpOwotfQotCi0KIHN0YXRpYyB2b2lkIGJhY2tzcGFjZUNhbGxiYWNrKEd0a1dpZGdl dCogd2lkZ2V0LCBXZWJWaWV3KiBjbGllbnQpCiB7CiAgICAgZ19zaWduYWxfc3RvcF9lbWlzc2lv bl9ieV9uYW1lKHdpZGdldCwgImJhY2tzcGFjZSIpOwpAQCAtMjQ0LDcgKzIyMiw2IEBAIHN0YXRp YyBjb25zdCBLZXlQcmVzc0VudHJ5IGtleVByZXNzRW50cmllc1tdID0gewogCiBXZWJWaWV3OjpX ZWJWaWV3KEd0a1dpZGdldCogdmlld1dpZGdldCkKICAgICA6IG1fdmlld1dpZGdldCh2aWV3V2lk Z2V0KQotICAgICwgbV9pc1BhZ2VBY3RpdmUodHJ1ZSkKICAgICAsIG1fbmF0aXZlV2lkZ2V0KGd0 a190ZXh0X3ZpZXdfbmV3KCkpCiB7CiAgICAgZ19zaWduYWxfY29ubmVjdChtX25hdGl2ZVdpZGdl dC5nZXQoKSwgImJhY2tzcGFjZSIsIEdfQ0FMTEJBQ0soYmFja3NwYWNlQ2FsbGJhY2spLCB0aGlz KTsKQEAgLTI2MywzMSArMjQwLDYgQEAgV2ViVmlldzo6fldlYlZpZXcoKQogewogfQogCi12b2lk IFdlYlZpZXc6OnBhaW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtSZWN0YW5nbGUgcmVjdCwgY2Fp cm9fdCogY3IpCi17Ci0gICAgcGFnZSgpLT5kcmF3aW5nQXJlYSgpLT5wYWludChJbnRSZWN0KHJl Y3QpLCBjcik7Ci19Ci0KLXZvaWQgV2ViVmlldzo6c2V0U2l6ZShHdGtXaWRnZXQqLCBJbnRTaXpl IHdpbmRvd1NpemUpCi17Ci0gICAgcGFnZSgpLT5kcmF3aW5nQXJlYSgpLT5zZXRTaXplKHdpbmRv d1NpemUsIEludFNpemUoKSk7Ci19Ci0KLXZvaWQgV2ViVmlldzo6aGFuZGxlS2V5Ym9hcmRFdmVu dChHZGtFdmVudEtleSogZXZlbnQpCi17Ci0gICAgcGFnZSgpLT5oYW5kbGVLZXlib2FyZEV2ZW50 KE5hdGl2ZVdlYktleWJvYXJkRXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50 KSkpOwotfQotCi12b2lkIFdlYlZpZXc6OmhhbmRsZU1vdXNlRXZlbnQoR2RrRXZlbnQqIGV2ZW50 LCBpbnQgY3VycmVudENsaWNrQ291bnQpCi17Ci0gICAgcGFnZSgpLT5oYW5kbGVNb3VzZUV2ZW50 KE5hdGl2ZVdlYk1vdXNlRXZlbnQoZXZlbnQsIGN1cnJlbnRDbGlja0NvdW50KSk7Ci19Ci0KLXZv aWQgV2ViVmlldzo6aGFuZGxlV2hlZWxFdmVudChHZGtFdmVudFNjcm9sbCogZXZlbnQpCi17Ci0g ICAgcGFnZSgpLT5oYW5kbGVXaGVlbEV2ZW50KFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hl ZWxFdmVudChldmVudCkpOwotfQotCiB2b2lkIFdlYlZpZXc6OmdldEVkaXRvckNvbW1hbmRzRm9y S2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYgZXZlbnQsIFZlY3RvcjxXVEY6 OlN0cmluZz4mIGNvbW1hbmRMaXN0KQogewogICAgIG1fcGVuZGluZ0VkaXRvckNvbW1hbmRzLmNs ZWFyKCk7CkBAIC0zMzQsMjAgKzI4NiwxMSBAQCB2b2lkIFdlYlZpZXc6OmdldEVkaXRvckNvbW1h bmRzRm9yS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYgZXZlbnQsCiAgICAg Y29tbWFuZExpc3QuYXBwZW5kKG1fcGVuZGluZ0VkaXRvckNvbW1hbmRzKTsKIH0KIAotYm9vbCBX ZWJWaWV3Ojppc0FjdGl2ZSgpCi17Ci0gICAgcmV0dXJuIG1faXNQYWdlQWN0aXZlOwotfQotCi12 b2lkIFdlYlZpZXc6OmNsb3NlKCkKLXsKLSAgICBwYWdlKCktPmNsb3NlKCk7Ci19Ci0KIC8vIFBh Z2VDbGllbnQncyBwdXJlIHZpcnR1YWwgZnVuY3Rpb25zCiBQYXNzT3duUHRyPERyYXdpbmdBcmVh UHJveHk+IFdlYlZpZXc6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQogewotICAgIHJldHVybiBD aHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKFdFQktJVF9XRUJfVklFV19CQVNF KG1fdmlld1dpZGdldCksIHBhZ2UoKSk7CisgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHZpZXcgPSBX RUJLSVRfV0VCX1ZJRVdfQkFTRShtX3ZpZXdXaWRnZXQpOworICAgIHJldHVybiBDaHVua2VkVXBk YXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKHZpZXcsIHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFn ZSh2aWV3KSk7CiB9CiAKIHZvaWQgV2ViVmlldzo6c2V0Vmlld05lZWRzRGlzcGxheShjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9n dGsvV2ViVmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJWaWV3LmgKaW5k ZXggYjQ1OTJlNy4uYzg5MjZmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2d0ay9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJWaWV3 LmgKQEAgLTQ3LDI1ICs0NywxMSBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBhZG9wdFB0cihu ZXcgV2ViVmlldyh2aWV3V2lkZ2V0KSk7CiAgICAgfQogCi0gICAgV2ViUGFnZVByb3h5KiBwYWdl KCkgY29uc3Q7Ci0KLSAgICB2b2lkIGhhbmRsZUZvY3VzSW5FdmVudChHdGtXaWRnZXQqKTsKLSAg ICB2b2lkIGhhbmRsZUZvY3VzT3V0RXZlbnQoR3RrV2lkZ2V0Kik7Ci0KLSAgICB2b2lkIHBhaW50 KEd0a1dpZGdldCosIEdka1JlY3RhbmdsZSwgY2Fpcm9fdCopOwotICAgIHZvaWQgc2V0U2l6ZShH dGtXaWRnZXQqLCBXZWJDb3JlOjpJbnRTaXplKTsKLSAgICB2b2lkIGhhbmRsZUtleWJvYXJkRXZl bnQoR2RrRXZlbnRLZXkqKTsKLSAgICB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoR2RrRXZlbnRTY3Jv bGwqKTsKLSAgICB2b2lkIGhhbmRsZU1vdXNlRXZlbnQoR2RrRXZlbnQqLCBpbnQpOwotCiAgICAg dm9pZCBhZGRQZW5kaW5nRWRpdG9yQ29tbWFuZChjb25zdCBjaGFyKiBjb21tYW5kKSB7IG1fcGVu ZGluZ0VkaXRvckNvbW1hbmRzLmFwcGVuZChXVEY6OlN0cmluZyhjb21tYW5kKSk7IH0KIAogcHJp dmF0ZToKICAgICBXZWJWaWV3KEd0a1dpZGdldCopOwogCi0gICAgYm9vbCBpc0FjdGl2ZSgpOwot ICAgIHZvaWQgY2xvc2UoKTsKLQogICAgIC8vIFBhZ2VDbGllbnQKICAgICB2aXJ0dWFsIFBhc3NP d25QdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOwogICAgIHZp cnR1YWwgdm9pZCBzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsK QEAgLTExNCw3ICsxMDAsNiBAQCBwcml2YXRlOgogCiAgICAgLy8gTWVtYmVycyBvZiBXZWJWaWV3 IGNsYXNzCiAgICAgR3RrV2lkZ2V0KiBtX3ZpZXdXaWRnZXQ7Ci0gICAgYm9vbCBtX2lzUGFnZUFj dGl2ZTsKICAgICBWZWN0b3I8V1RGOjpTdHJpbmc+IG1fcGVuZGluZ0VkaXRvckNvbW1hbmRzOwog ICAgIEdSZWZQdHI8R3RrV2lkZ2V0PiBtX25hdGl2ZVdpZGdldDsKIH07Cg==