59679 2011-04-28 01:59:21 -0700 [GTK] Create the page client in the view widget 2011-04-28 09:40:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned oldest_to_newest 394309 0 cgarcia 2011-04-28 01:59:21 -0700 Instead of the opposite, it looks more natural to me and simplifies WKView code. 394313 1 91451 cgarcia 2011-04-28 02:07:49 -0700 Created attachment 91451 Patch 394326 2 91455 cgarcia 2011-04-28 03:12:22 -0700 Created attachment 91455 Updated patch I forgot to use new for the private struct, instead of GObject mechanism, so that page client and web page objecs are correctly released. 394449 3 91455 mrobinson 2011-04-28 08:47:17 -0700 Comment on attachment 91455 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=91455&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:379 > + priv->page->initializeWebPage(); Where is this method defined? > Source/WebKit2/UIProcess/gtk/WebView.h:50 > + WebPageProxy* page() const; Please call this one pageProxy, just to be clear. 394452 4 91455 mrobinson 2011-04-28 08:52:36 -0700 Comment on attachment 91455 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=91455&action=review >> Source/WebKit2/UIProcess/gtk/WebView.h:50 >> + WebPageProxy* page() const; > > Please call this one pageProxy, just to be clear. Carlos reminded me that we are about to remove this. 394486 5 cgarcia 2011-04-28 09:39:41 -0700 Committed r85196: <http://trac.webkit.org/changeset/85196> 91451 2011-04-28 02:07:49 -0700 2011-04-28 03:12:22 -0700 Patch wk2-view-widget-page-client.diff text/plain 11438 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0N2Q4NTBhLi4yNzg0MjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcg QEAKKzIwMTEtMDQtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IENyZWF0ZSB0aGUgcGFnZSBjbGllbnQgaW4gdGhlIHZpZXcgd2lkZ2V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTY3OQorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL2d0ay9XS1ZpZXcuY3BwOgorICAgICAgICAoV0tWaWV3Q3JlYXRlKTogU2lt cGx5IGNyZWF0ZSBhIG5ldyB2aWV3IHdpZGdldCBhbmQgcmV0dXJuIGl0LgorICAgICAgICAoV0tW aWV3R2V0UGFnZSk6IFVzZSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoKS4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRX ZWJWaWV3QmFzZUluaXQpOiBDcmVhdGUgdGhlIHBhZ2UgY2xpZW50LgorICAgICAgICAod2Via2l0 V2ViVmlld0Jhc2VDcmVhdGUpOiBOZXcgbWV0aG9kIHRvIGNyZWF0ZSBhCisgICAgICAgIFdlYktp dFdlYlZpZXdCYXNlIGZvciBhIGdpdmVuIGNvbnRleHQgYW5kIHBhZ2UgZ3JvdXAuCisgICAgICAg ICh3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0YW5jZSk6CisgICAgICAgICh3ZWJraXRX ZWJWaWV3QmFzZUdldFBhZ2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXdCYXNlLmg6CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9XZWJWaWV3LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlldzo6cGFnZSk6IEdldCB0aGUgcGFnZSBmcm9tIHRoZSB2aWV3IHdp ZGdldC4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6aGFuZGxlRm9jdXNJbkV2ZW50KTogRGl0 dG8uCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmhhbmRsZUZvY3VzT3V0RXZlbnQpOiBEaXR0 by4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6V2ViVmlldyk6IFBhZ2UgY2xpZW50IGlzIG5v dyBjcmVhdGVkIHdpdGggYSB2aWV3IHdpZGdldC4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6 cGFpbnQpOiBHZXQgdGhlIHBhZ2UgZnJvbSB0aGUgdmlldyB3aWRnZXQuCisgICAgICAgIChXZWJL aXQ6OldlYlZpZXc6OnNldFNpemUpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6 aGFuZGxlS2V5Ym9hcmRFdmVudCk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojpo YW5kbGVNb3VzZUV2ZW50KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmhhbmRs ZVdoZWVsRXZlbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6Y2xvc2UpOiBE aXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSk6 IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViVmlldy5oOgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3OjpjcmVhdGUpOiBUaGUgcGFnZSBjbGllbnQgd2lsbCBiZSBjcmVhdGVkIGFz CisgICAgICAgIHByaXZhdGUgYnkgdGhlIHZpZXcgd2lkZ2V0LCBzbyBpdCBkb2Vzbid0IG5lZWQg dG8gYmUgcmVmIGNvdW50ZWQsCisgICAgICAgIHVzZSBQYXNzT3duUHRyIGluc3RlYWQgb2YgUGFz c1JlZlB0ci4KKwogMjAxMS0wNC0yNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvZ3RrL1dLVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvZ3RrL1dLVmlldy5jcHAKaW5kZXggNjM1YzU2MC4uMDc5Mzg1YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL2d0ay9XS1ZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9ndGsvV0tWaWV3LmNwcApAQCAtNDAsMTMgKzQw LDEyIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBXS1ZpZXdSZWYgV0tWaWV3Q3JlYXRl KFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYpCiB7 Ci0gICAgUmVmUHRyPFdlYlZpZXc+IHZpZXcgPSBXZWJWaWV3OjpjcmVhdGUodG9JbXBsKGNvbnRl eHRSZWYpLCB0b0ltcGwocGFnZUdyb3VwUmVmKSk7Ci0gICAgcmV0dXJuIHRvQVBJKFdFQktJVF9X RUJfVklFV19CQVNFKHZpZXcucmVsZWFzZSgpLmxlYWtSZWYoKS0+d2luZG93KCkpKTsKKyAgICBy ZXR1cm4gdG9BUEkod2Via2l0V2ViVmlld0Jhc2VDcmVhdGUodG9JbXBsKGNvbnRleHRSZWYpLCB0 b0ltcGwocGFnZUdyb3VwUmVmKSkpOwogfQogCiBXS1BhZ2VSZWYgV0tWaWV3R2V0UGFnZShXS1Zp ZXdSZWYgdmlld1JlZikKIHsKLSAgICByZXR1cm4gdG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRX ZWJWaWV3SW5zdGFuY2UodG9JbXBsKHZpZXdSZWYpKS0+cGFnZSgpKTsKKyAgICByZXR1cm4gdG9B UEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKHRvSW1wbCh2aWV3UmVmKSkpOwogfQogCiBXS1VS TFJlZiBXS1VSTENyZWF0ZVdpdGhVUkwoY29uc3QgY2hhciogdXJsKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCmluZGV4 IDdiZGI5MjYuLjA5NGIzMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTMyLDYgKzMyLDkgQEAKICNpbmNs dWRlICJHdGtWZXJzaW9uaW5nLmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNs dWRlICJSZWZQdHJDYWlyby5oIgorI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKKyNpbmNsdWRlICJX ZWJQYWdlUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJLaXQyL1dLQ29udGV4dC5oPgogCiB1c2luZyBu YW1lc3BhY2UgV2ViS2l0OwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0zOSw3ICs0Miw4 IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogc3RhdGljIGdwb2ludGVyIHdlYmtpdFdlYlZp ZXdCYXNlUGFyZW50Q2xhc3MgPSAwOwogCiBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0 ZSB7Ci0gICAgV2ViVmlldyogd2ViVmlld0luc3RhbmNlOworICAgIE93blB0cjxXZWJWaWV3PiB3 ZWJWaWV3SW5zdGFuY2U7CisgICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4gcGFnZTsKICAgICBHdGtJ TUNvbnRleHQqIGltQ29udGV4dDsKICAgICBnaW50IGN1cnJlbnRDbGlja0NvdW50OwogICAgIElu dFBvaW50IHByZXZpb3VzQ2xpY2tQb2ludDsKQEAgLTEzMCw2ICsxMzQsOCBAQCBzdGF0aWMgdm9p ZCB3ZWJraXRXZWJWaWV3QmFzZUluaXQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdC YXNlKQogICAgIHByaXYtPmN1cnJlbnRDbGlja0NvdW50ID0gMDsKICAgICBwcml2LT5wcmV2aW91 c0NsaWNrQnV0dG9uID0gMDsKICAgICBwcml2LT5wcmV2aW91c0NsaWNrVGltZSA9IDA7CisKKyAg ICBwcml2LT53ZWJWaWV3SW5zdGFuY2UgPSBXZWJWaWV3OjpjcmVhdGUoR1RLX1dJREdFVCh3ZWJr aXRXZWJWaWV3QmFzZSkpOwogfQogCiAjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKQEAgLTM2MSwx NCArMzY3LDIwIEBAIEdUeXBlIHdlYmtpdFdlYlZpZXdCYXNlR2V0VHlwZSgpCiAgICAgcmV0dXJu IGdEZWZpbmVUeXBlSWRWb2xhdGlsZTsKIH0KIAotV2ViVmlldyogd2Via2l0V2ViVmlld0Jhc2VH ZXRXZWJWaWV3SW5zdGFuY2UoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlKQor V2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlKFdlYkNvbnRleHQqIGNv bnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwKQogewotICAgIHJldHVybiB3ZWJraXRXZWJW aWV3QmFzZS0+cHJpdi0+d2ViVmlld0luc3RhbmNlOworICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3 ZWJraXRXZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklFV19CQVNFKGdfb2JqZWN0X25ldyhXRUJL SVRfVFlQRV9XRUJfVklFV19CQVNFLCBOVUxMKSk7CisgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2 YXRlKiBwcml2ID0gd2Via2l0V2ViVmlld0Jhc2UtPnByaXY7CisKKyAgICBwcml2LT5wYWdlID0g Y29udGV4dC0+Y3JlYXRlV2ViUGFnZShwcml2LT53ZWJWaWV3SW5zdGFuY2UuZ2V0KCksIHBhZ2VH cm91cCk7CisgICAgcHJpdi0+cGFnZS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKworICAgIHJldHVy biB3ZWJraXRXZWJWaWV3QmFzZTsKIH0KIAotdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNldFdlYlZp ZXdJbnN0YW5jZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UsIFdlYlZpZXcq IHdlYlZpZXdJbnN0YW5jZSkKK1dlYlZpZXcqIHdlYmtpdFdlYlZpZXdCYXNlR2V0V2ViVmlld0lu c3RhbmNlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKIHsKLSAgICB3ZWJr aXRXZWJWaWV3QmFzZS0+cHJpdi0+d2ViVmlld0luc3RhbmNlID0gd2ViVmlld0luc3RhbmNlOwor ICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdi0+d2ViVmlld0luc3RhbmNlLmdldCgp OwogfQogCiBHdGtJTUNvbnRleHQqIHdlYmtpdFdlYlZpZXdCYXNlR2V0SU1Db250ZXh0KFdlYktp dFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKQEAgLTM3OCw1ICszOTAsNSBAQCBHdGtJ TUNvbnRleHQqIHdlYmtpdFdlYlZpZXdCYXNlR2V0SU1Db250ZXh0KFdlYktpdFdlYlZpZXdCYXNl KiB3ZWJraXRXZWJWaWV3QmFzZQogCiBXZWJQYWdlUHJveHkqIHdlYmtpdFdlYlZpZXdCYXNlR2V0 UGFnZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UpCiB7Ci0gICAgcmV0dXJu IHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT53ZWJWaWV3SW5zdGFuY2UtPnBhZ2UoKTsKKyAgICBy ZXR1cm4gd2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnBhZ2UuZ2V0KCk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuaAppbmRl eCA2ZmE4NWVhLi41MWU0NGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmgKQEAgLTU5LDkgKzU5LDkgQEAgc3RydWN0IF9X ZWJLaXRXZWJWaWV3QmFzZUNsYXNzIHsKIAogR1R5cGUgd2Via2l0V2ViVmlld0Jhc2VHZXRUeXBl KCk7CiAKLVdlYlZpZXcqIHdlYmtpdFdlYlZpZXdCYXNlR2V0V2ViVmlld0luc3RhbmNlKFdlYktp dFdlYlZpZXdCYXNlKik7CitXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2VDcmVh dGUoV2ViQ29udGV4dCosIFdlYlBhZ2VHcm91cCopOwogCi12b2lkIHdlYmtpdFdlYlZpZXdCYXNl U2V0V2ViVmlld0luc3RhbmNlKFdlYktpdFdlYlZpZXdCYXNlKiwgV2ViVmlldyopOworV2ViVmll dyogd2Via2l0V2ViVmlld0Jhc2VHZXRXZWJWaWV3SW5zdGFuY2UoV2ViS2l0V2ViVmlld0Jhc2Uq KTsKIAogR3RrSU1Db250ZXh0KiB3ZWJraXRXZWJWaWV3QmFzZUdldElNQ29udGV4dChXZWJLaXRX ZWJWaWV3QmFzZSopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3Rr L1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJWaWV3LmNwcApp bmRleCA4MjRhMTE4Li44Njc3NmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZ3RrL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2Vi Vmlldy5jcHAKQEAgLTQ1LDIwICs0NSwyNSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKK1dlYlBhZ2VQcm94eSogV2ViVmlldzo6cGFnZSgpIGNvbnN0 Cit7CisgICAgcmV0dXJuIHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdf QkFTRShtX3ZpZXdXaWRnZXQpKTsKK30KKwogdm9pZCBXZWJWaWV3OjpoYW5kbGVGb2N1c0luRXZl bnQoR3RrV2lkZ2V0KiB3aWRnZXQpCiB7CiAgICAgaWYgKCEobV9pc1BhZ2VBY3RpdmUpKSB7CiAg ICAgICAgIG1faXNQYWdlQWN0aXZlID0gdHJ1ZTsKLSAgICAgICAgbV9wYWdlLT52aWV3U3RhdGVE aWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3V2luZG93SXNBY3RpdmUpOworICAgICAgICBwYWdl KCktPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdXaW5kb3dJc0FjdGl2ZSk7 CiAgICAgfQogCi0gICAgbV9wYWdlLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpW aWV3SXNGb2N1c2VkKTsKKyAgICBwYWdlKCktPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJv eHk6OlZpZXdJc0ZvY3VzZWQpOwogfQogCiB2b2lkIFdlYlZpZXc6OmhhbmRsZUZvY3VzT3V0RXZl bnQoR3RrV2lkZ2V0KiB3aWRnZXQpCiB7CiAgICAgbV9pc1BhZ2VBY3RpdmUgPSBmYWxzZTsKLSAg ICBtX3BhZ2UtPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdXaW5kb3dJc0Fj dGl2ZSk7CisgICAgcGFnZSgpLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3 V2luZG93SXNBY3RpdmUpOwogfQogCiAKQEAgLTIzNywyMCArMjQyLDExIEBAIHN0YXRpYyBjb25z dCBLZXlQcmVzc0VudHJ5IGtleVByZXNzRW50cmllc1tdID0gewogICAgIHsgJ1xyJywgICBBbHRL ZXkgfCBTaGlmdEtleSwgICJJbnNlcnROZXdsaW5lIiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9LAogfTsKIAotV2ViVmlldzo6V2ViVmlldyhXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJQ YWdlR3JvdXAqIHBhZ2VHcm91cCkKLSAgICA6IG1faXNQYWdlQWN0aXZlKHRydWUpCitXZWJWaWV3 OjpXZWJWaWV3KEd0a1dpZGdldCogdmlld1dpZGdldCkKKyAgICA6IG1fdmlld1dpZGdldCh2aWV3 V2lkZ2V0KQorICAgICwgbV9pc1BhZ2VBY3RpdmUodHJ1ZSkKICAgICAsIG1fbmF0aXZlV2lkZ2V0 KGd0a190ZXh0X3ZpZXdfbmV3KCkpCiB7Ci0gICAgbV9wYWdlID0gY29udGV4dC0+Y3JlYXRlV2Vi UGFnZSh0aGlzLCBwYWdlR3JvdXApOwotCi0gICAgbV92aWV3V2lkZ2V0ID0gc3RhdGljX2Nhc3Q8 R3RrV2lkZ2V0Kj4oZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dFQl9WSUVXX0JBU0UsIE5VTEwp KTsKLSAgICBBU1NFUlQobV92aWV3V2lkZ2V0KTsKLQotICAgIG1fcGFnZS0+aW5pdGlhbGl6ZVdl YlBhZ2UoKTsKLQotICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3V2lkZ2V0ID0gV0VCS0lU X1dFQl9WSUVXX0JBU0UobV92aWV3V2lkZ2V0KTsKLSAgICB3ZWJraXRXZWJWaWV3QmFzZVNldFdl YlZpZXdJbnN0YW5jZSh3ZWJWaWV3V2lkZ2V0LCB0aGlzKTsKLQogICAgIGdfc2lnbmFsX2Nvbm5l Y3QobV9uYXRpdmVXaWRnZXQuZ2V0KCksICJiYWNrc3BhY2UiLCBHX0NBTExCQUNLKGJhY2tzcGFj ZUNhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChtX25hdGl2ZVdpZGdldC5n ZXQoKSwgImN1dC1jbGlwYm9hcmQiLCBHX0NBTExCQUNLKGN1dENsaXBib2FyZENhbGxiYWNrKSwg dGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChtX25hdGl2ZVdpZGdldC5nZXQoKSwgImNvcHkt Y2xpcGJvYXJkIiwgR19DQUxMQkFDSyhjb3B5Q2xpcGJvYXJkQ2FsbGJhY2spLCB0aGlzKTsKQEAg LTI2OSwyNyArMjY1LDI3IEBAIFdlYlZpZXc6On5XZWJWaWV3KCkKIAogdm9pZCBXZWJWaWV3Ojpw YWludChHdGtXaWRnZXQqIHdpZGdldCwgR2RrUmVjdGFuZ2xlIHJlY3QsIGNhaXJvX3QqIGNyKQog ewotICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoSW50UmVjdChyZWN0KSwgY3IpOwor ICAgIHBhZ2UoKS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoSW50UmVjdChyZWN0KSwgY3IpOwogfQog CiB2b2lkIFdlYlZpZXc6OnNldFNpemUoR3RrV2lkZ2V0KiwgSW50U2l6ZSB3aW5kb3dTaXplKQog ewotICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZSh3aW5kb3dTaXplLCBJbnRTaXpl KCkpOworICAgIHBhZ2UoKS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZSh3aW5kb3dTaXplLCBJbnRT aXplKCkpOwogfQogCiB2b2lkIFdlYlZpZXc6OmhhbmRsZUtleWJvYXJkRXZlbnQoR2RrRXZlbnRL ZXkqIGV2ZW50KQogewotICAgIG1fcGFnZS0+aGFuZGxlS2V5Ym9hcmRFdmVudChOYXRpdmVXZWJL ZXlib2FyZEV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQqPihldmVudCkpKTsKKyAgICBw YWdlKCktPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVudChyZWludGVy cHJldF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpKSk7CiB9CiAKIHZvaWQgV2ViVmlldzo6aGFuZGxl TW91c2VFdmVudChHZGtFdmVudCogZXZlbnQsIGludCBjdXJyZW50Q2xpY2tDb3VudCkKIHsKLSAg ICBtX3BhZ2UtPmhhbmRsZU1vdXNlRXZlbnQoTmF0aXZlV2ViTW91c2VFdmVudChldmVudCwgY3Vy cmVudENsaWNrQ291bnQpKTsKKyAgICBwYWdlKCktPmhhbmRsZU1vdXNlRXZlbnQoTmF0aXZlV2Vi TW91c2VFdmVudChldmVudCwgY3VycmVudENsaWNrQ291bnQpKTsKIH0KIAogdm9pZCBXZWJWaWV3 OjpoYW5kbGVXaGVlbEV2ZW50KEdka0V2ZW50U2Nyb2xsKiBldmVudCkKIHsKLSAgICBtX3BhZ2Ut PmhhbmRsZVdoZWVsRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KGV2 ZW50KSk7CisgICAgcGFnZSgpLT5oYW5kbGVXaGVlbEV2ZW50KFdlYkV2ZW50RmFjdG9yeTo6Y3Jl YXRlV2ViV2hlZWxFdmVudChldmVudCkpOwogfQogCiB2b2lkIFdlYlZpZXc6OmdldEVkaXRvckNv bW1hbmRzRm9yS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYgZXZlbnQsIFZl Y3RvcjxXVEY6OlN0cmluZz4mIGNvbW1hbmRMaXN0KQpAQCAtMzQ1LDEzICszNDEsMTMgQEAgYm9v bCBXZWJWaWV3Ojppc0FjdGl2ZSgpCiAKIHZvaWQgV2ViVmlldzo6Y2xvc2UoKQogewotICAgIG1f cGFnZS0+Y2xvc2UoKTsKKyAgICBwYWdlKCktPmNsb3NlKCk7CiB9CiAKIC8vIFBhZ2VDbGllbnQn cyBwdXJlIHZpcnR1YWwgZnVuY3Rpb25zCiBQYXNzT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IFdl YlZpZXc6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQogewotICAgIHJldHVybiBDaHVua2VkVXBk YXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKFdFQktJVF9XRUJfVklFV19CQVNFKG1fdmlld1dp ZGdldCksIG1fcGFnZS5nZXQoKSk7CisgICAgcmV0dXJuIENodW5rZWRVcGRhdGVEcmF3aW5nQXJl YVByb3h5OjpjcmVhdGUoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV92aWV3V2lkZ2V0KSwgcGFnZSgp KTsKIH0KIAogdm9pZCBXZWJWaWV3OjpzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNvcmU6 OkludFJlY3QmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJW aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZpZXcuaAppbmRleCA2Njg3 ZDkwLi5iNDU5MmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dl YlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZpZXcuaApAQCAt MzMsMjYgKzMzLDIxIEBACiAjaW5jbHVkZSAiV2luZG93c0tleWJvYXJkQ29kZXMuaCIKICNpbmNs dWRlIDxXZWJDb3JlL0ludFNpemUuaD4KICNpbmNsdWRlIDxndGsvZ3RrLmg+Ci0jaW5jbHVkZSA8 d3RmL1Bhc3NSZWZQdHIuaD4KLSNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgotI2luY2x1ZGUg PHd0Zi9SZWZQdHIuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIERyYXdpbmdBcmVh UHJveHk7CiBjbGFzcyBXZWJQYWdlTmFtZXNwYWNlOwogCi1jbGFzcyBXZWJWaWV3IDogcHVibGlj IFJlZkNvdW50ZWQ8V2ViVmlldz4sIHB1YmxpYyBQYWdlQ2xpZW50IHsKK2NsYXNzIFdlYlZpZXcg OiBwdWJsaWMgUGFnZUNsaWVudCB7CiBwdWJsaWM6CiAgICAgfldlYlZpZXcoKTsKLSAgICBzdGF0 aWMgUGFzc1JlZlB0cjxXZWJWaWV3PiBjcmVhdGUoV2ViQ29udGV4dCogY29udGV4dCwgV2ViUGFn ZUdyb3VwKiBwYWdlR3JvdXApCisgICAgc3RhdGljIFBhc3NPd25QdHI8V2ViVmlldz4gY3JlYXRl KEd0a1dpZGdldCogdmlld1dpZGdldCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihu ZXcgV2ViVmlldyhjb250ZXh0LCBwYWdlR3JvdXApKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRy KG5ldyBXZWJWaWV3KHZpZXdXaWRnZXQpKTsKICAgICB9CiAKLSAgICBHdGtXaWRnZXQqIHdpbmRv dygpIGNvbnN0IHsgcmV0dXJuIG1fdmlld1dpZGdldDsgfQotCi0gICAgV2ViUGFnZVByb3h5KiBw YWdlKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlLmdldCgpOyB9CisgICAgV2ViUGFnZVByb3h5KiBw YWdlKCkgY29uc3Q7CiAKICAgICB2b2lkIGhhbmRsZUZvY3VzSW5FdmVudChHdGtXaWRnZXQqKTsK ICAgICB2b2lkIGhhbmRsZUZvY3VzT3V0RXZlbnQoR3RrV2lkZ2V0Kik7CkBAIC02Niw3ICs2MSw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZFBlbmRpbmdFZGl0b3JDb21tYW5kKGNvbnN0IGNoYXIq IGNvbW1hbmQpIHsgbV9wZW5kaW5nRWRpdG9yQ29tbWFuZHMuYXBwZW5kKFdURjo6U3RyaW5nKGNv bW1hbmQpKTsgfQogCiBwcml2YXRlOgotICAgIFdlYlZpZXcoV2ViQ29udGV4dCosIFdlYlBhZ2VH cm91cCopOworICAgIFdlYlZpZXcoR3RrV2lkZ2V0Kik7CiAKICAgICBib29sIGlzQWN0aXZlKCk7 CiAgICAgdm9pZCBjbG9zZSgpOwpAQCAtMTIwLDcgKzExNSw2IEBAIHByaXZhdGU6CiAgICAgLy8g TWVtYmVycyBvZiBXZWJWaWV3IGNsYXNzCiAgICAgR3RrV2lkZ2V0KiBtX3ZpZXdXaWRnZXQ7CiAg ICAgYm9vbCBtX2lzUGFnZUFjdGl2ZTsKLSAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBtX3BhZ2U7 CiAgICAgVmVjdG9yPFdURjo6U3RyaW5nPiBtX3BlbmRpbmdFZGl0b3JDb21tYW5kczsKICAgICBH UmVmUHRyPEd0a1dpZGdldD4gbV9uYXRpdmVXaWRnZXQ7CiB9Owo= 91455 2011-04-28 03:12:22 -0700 2011-04-28 09:40:25 -0700 Updated patch wk2-view-widget-page-client2.diff text/plain 13442 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0N2Q4NTBhLi45NzI3ODE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTEtMDQtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IENyZWF0ZSB0aGUgcGFnZSBjbGllbnQgaW4gdGhlIHZpZXcgd2lkZ2V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTY3OQorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL2d0ay9XS1ZpZXcuY3BwOgorICAgICAgICAoV0tWaWV3Q3JlYXRlKTogU2lt cGx5IGNyZWF0ZSBhIG5ldyB2aWV3IHdpZGdldCBhbmQgcmV0dXJuIGl0LgorICAgICAgICAoV0tW aWV3R2V0UGFnZSk6IFVzZSB3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoKS4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisJKHdlYmtpdFdlYlZpZXdC YXNlRmluYWxpemUpOiBVc2UgZmluYWxpemUgaW5zdGVhZCBvZiBkaXNwb3NlIHRvCisJbWFrZSBz dXJlIGl0J3MgY2FsbGVkIG9ubHkgb25jZSwgYW5kIHJlbGVhc2UgdGhlIHByaXZhdGUgc3RydWN0 IHRvby4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlSW5pdCk6IENyZWF0ZSB0aGUgcGFnZSBj bGllbnQuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUNsYXNzSW5pdCk6IERvbid0IHVzZSBH T2JqZWN0IHByaXZhdGUgZGF0YSBzdHJ1Y3R1cmUuCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFz ZUNyZWF0ZSk6IE5ldyBtZXRob2QgdG8gY3JlYXRlIGEKKyAgICAgICAgV2ViS2l0V2ViVmlld0Jh c2UgZm9yIGEgZ2l2ZW4gY29udGV4dCBhbmQgcGFnZSBncm91cC4KKyAgICAgICAgKHdlYmtpdFdl YlZpZXdCYXNlR2V0V2ViVmlld0luc3RhbmNlKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNl R2V0UGFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2Uu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3OjpwYWdlKTogR2V0IHRoZSBwYWdlIGZyb20gdGhlIHZpZXcgd2lkZ2V0LgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3OjpoYW5kbGVGb2N1c0luRXZlbnQpOiBEaXR0by4KKyAgICAg ICAgKFdlYktpdDo6V2ViVmlldzo6aGFuZGxlRm9jdXNPdXRFdmVudCk6IERpdHRvLgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3OjpXZWJWaWV3KTogUGFnZSBjbGllbnQgaXMgbm93IGNyZWF0ZWQg d2l0aCBhIHZpZXcgd2lkZ2V0LgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpwYWludCk6IEdl dCB0aGUgcGFnZSBmcm9tIHRoZSB2aWV3IHdpZGdldC4KKyAgICAgICAgKFdlYktpdDo6V2ViVmll dzo6c2V0U2l6ZSk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpoYW5kbGVLZXli b2FyZEV2ZW50KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYlZpZXc6OmhhbmRsZU1vdXNl RXZlbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6aGFuZGxlV2hlZWxFdmVu dCk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpjbG9zZSk6IERpdHRvLgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KTogRGl0dG8uCisg ICAgICAgICogVUlQcm9jZXNzL2d0ay9XZWJWaWV3Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXc6OmNyZWF0ZSk6IFRoZSBwYWdlIGNsaWVudCB3aWxsIGJlIGNyZWF0ZWQgYXMKKyAgICAgICAg cHJpdmF0ZSBieSB0aGUgdmlldyB3aWRnZXQsIHNvIGl0IGRvZXNuJ3QgbmVlZCB0byBiZSByZWYg Y291bnRlZCwKKyAgICAgICAgdXNlIFBhc3NPd25QdHIgaW5zdGVhZCBvZiBQYXNzUmVmUHRyLgor CiAyMDExLTA0LTI3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQy9ndGsvV0tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9n dGsvV0tWaWV3LmNwcAppbmRleCA2MzVjNTYwLi4wNzkzODVjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvZ3RrL1dLVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL2d0ay9XS1ZpZXcuY3BwCkBAIC00MCwxMyArNDAsMTIgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIFdLVmlld1JlZiBXS1ZpZXdDcmVhdGUoV0tDb250ZXh0 UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZikKIHsKLSAgICBSZWZQ dHI8V2ViVmlldz4gdmlldyA9IFdlYlZpZXc6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIHRv SW1wbChwYWdlR3JvdXBSZWYpKTsKLSAgICByZXR1cm4gdG9BUEkoV0VCS0lUX1dFQl9WSUVXX0JB U0Uodmlldy5yZWxlYXNlKCkubGVha1JlZigpLT53aW5kb3coKSkpOworICAgIHJldHVybiB0b0FQ SSh3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIHRvSW1wbChwYWdl R3JvdXBSZWYpKSk7CiB9CiAKIFdLUGFnZVJlZiBXS1ZpZXdHZXRQYWdlKFdLVmlld1JlZiB2aWV3 UmVmKQogewotICAgIHJldHVybiB0b0FQSSh3ZWJraXRXZWJWaWV3QmFzZUdldFdlYlZpZXdJbnN0 YW5jZSh0b0ltcGwodmlld1JlZikpLT5wYWdlKCkpOworICAgIHJldHVybiB0b0FQSSh3ZWJraXRX ZWJWaWV3QmFzZUdldFBhZ2UodG9JbXBsKHZpZXdSZWYpKSk7CiB9CiAKIFdLVVJMUmVmIFdLVVJM Q3JlYXRlV2l0aFVSTChjb25zdCBjaGFyKiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXggN2JkYjkyNi4u MzYxYTEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlld0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXdCYXNlLmNwcApAQCAtMzIsNiArMzIsOSBAQAogI2luY2x1ZGUgIkd0a1Zl cnNpb25pbmcuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlJlZlB0 ckNhaXJvLmgiCisjaW5jbHVkZSAiV2ViQ29udGV4dC5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94 eS5oIgorI2luY2x1ZGUgPFdlYktpdDIvV0tDb250ZXh0Lmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBX ZWJLaXQ7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTM5LDcgKzQyLDggQEAgdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiBzdGF0aWMgZ3BvaW50ZXIgd2Via2l0V2ViVmlld0Jhc2VQYXJl bnRDbGFzcyA9IDA7CiAKIHN0cnVjdCBfV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlIHsKLSAgICBX ZWJWaWV3KiB3ZWJWaWV3SW5zdGFuY2U7CisgICAgT3duUHRyPFdlYlZpZXc+IHdlYlZpZXdJbnN0 YW5jZTsKKyAgICBSZWZQdHI8V2ViUGFnZVByb3h5PiBwYWdlOwogICAgIEd0a0lNQ29udGV4dCog aW1Db250ZXh0OwogICAgIGdpbnQgY3VycmVudENsaWNrQ291bnQ7CiAgICAgSW50UG9pbnQgcHJl dmlvdXNDbGlja1BvaW50OwpAQCAtMTA2LDcgKzExMCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdl YlZpZXdCYXNlQ29udGFpbmVyQWRkKEd0a0NvbnRhaW5lciogY29udGFpbmVyLCBHdGtXaWRnZXQq IHdpCiAgICAgZ3RrX3dpZGdldF9zZXRfcGFyZW50KHdpZGdldCwgR1RLX1dJREdFVChjb250YWlu ZXIpKTsKIH0KIAotc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VEaXNwb3NlKEdPYmplY3Qq IGdvYmplY3QpCitzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUZpbmFsaXplKEdPYmplY3Qq IGdvYmplY3QpCiB7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlID0g V0VCS0lUX1dFQl9WSUVXX0JBU0UoZ29iamVjdCk7CiAgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2 YXRlKiBwcml2ID0gd2Via2l0V2ViVmlld0Jhc2UtPnByaXY7CkBAIC0xMTYsMTIgKzEyMCwxNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZURpc3Bvc2UoR09iamVjdCogZ29iamVjdCkK ICAgICAgICAgcHJpdi0+aW1Db250ZXh0ID0gMDsKICAgICB9CiAKLSAgICBHX09CSkVDVF9DTEFT Uyh3ZWJraXRXZWJWaWV3QmFzZVBhcmVudENsYXNzKS0+ZGlzcG9zZShnb2JqZWN0KTsKKyAgICBw cml2LT5wYWdlLT5jbG9zZSgpOworCisgICAgZGVsZXRlIHByaXY7CisgICAgd2Via2l0V2ViVmll d0Jhc2UtPnByaXYgPSAwOworCisgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0V2ViVmlld0Jhc2VQ YXJlbnRDbGFzcyktPmZpbmFsaXplKGdvYmplY3QpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRX ZWJWaWV3QmFzZUluaXQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlKQogewot ICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IEdfVFlQRV9JTlNUQU5DRV9HRVRf UFJJVkFURSh3ZWJraXRXZWJWaWV3QmFzZSwgV0VCS0lUX1RZUEVfV0VCX1ZJRVdfQkFTRSwgV2Vi S2l0V2ViVmlld0Jhc2VQcml2YXRlKTsKKyAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHBy aXYgPSBuZXcgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKCk7CiAgICAgd2Via2l0V2ViVmlld0Jh c2UtPnByaXYgPSBwcml2OwogCiAgICAgZ3RrX3dpZGdldF9zZXRfY2FuX2ZvY3VzKEdUS19XSURH RVQod2Via2l0V2ViVmlld0Jhc2UpLCBUUlVFKTsKQEAgLTEzMCw2ICsxMzksOCBAQCBzdGF0aWMg dm9pZCB3ZWJraXRXZWJWaWV3QmFzZUluaXQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZp ZXdCYXNlKQogICAgIHByaXYtPmN1cnJlbnRDbGlja0NvdW50ID0gMDsKICAgICBwcml2LT5wcmV2 aW91c0NsaWNrQnV0dG9uID0gMDsKICAgICBwcml2LT5wcmV2aW91c0NsaWNrVGltZSA9IDA7CisK KyAgICBwcml2LT53ZWJWaWV3SW5zdGFuY2UgPSBXZWJWaWV3OjpjcmVhdGUoR1RLX1dJREdFVCh3 ZWJraXRXZWJWaWV3QmFzZSkpOwogfQogCiAjaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKQEAgLTMz NCwxMiArMzQ1LDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlQ2xhc3NJbml0KFdl YktpdFdlYlZpZXdCYXNlQ2xhc3MqIHdlYmtpdFdlYlZpZXdCYXNlCiAgICAgd2lkZ2V0Q2xhc3Mt Pm1vdGlvbl9ub3RpZnlfZXZlbnQgPSB3ZWJWaWV3TW90aW9uTm90aWZ5RXZlbnQ7CiAKICAgICBH T2JqZWN0Q2xhc3MqIGdvYmplY3RDbGFzcyA9IEdfT0JKRUNUX0NMQVNTKHdlYmtpdFdlYlZpZXdC YXNlQ2xhc3MpOwotICAgIGdvYmplY3RDbGFzcy0+ZGlzcG9zZSA9IHdlYmtpdFdlYlZpZXdCYXNl RGlzcG9zZTsKKyAgICBnb2JqZWN0Q2xhc3MtPmZpbmFsaXplID0gd2Via2l0V2ViVmlld0Jhc2VG aW5hbGl6ZTsKIAogICAgIEd0a0NvbnRhaW5lckNsYXNzKiBjb250YWluZXJDbGFzcyA9IEdUS19D T05UQUlORVJfQ0xBU1Mod2Via2l0V2ViVmlld0Jhc2VDbGFzcyk7CiAgICAgY29udGFpbmVyQ2xh c3MtPmFkZCA9IHdlYmtpdFdlYlZpZXdCYXNlQ29udGFpbmVyQWRkOwotCi0gICAgZ190eXBlX2Ns YXNzX2FkZF9wcml2YXRlKHdlYmtpdFdlYlZpZXdCYXNlQ2xhc3MsIHNpemVvZihXZWJLaXRXZWJW aWV3QmFzZVByaXZhdGUpKTsKIH0KIAogR1R5cGUgd2Via2l0V2ViVmlld0Jhc2VHZXRUeXBlKCkK QEAgLTM2MSwxNCArMzcwLDIwIEBAIEdUeXBlIHdlYmtpdFdlYlZpZXdCYXNlR2V0VHlwZSgpCiAg ICAgcmV0dXJuIGdEZWZpbmVUeXBlSWRWb2xhdGlsZTsKIH0KIAotV2ViVmlldyogd2Via2l0V2Vi Vmlld0Jhc2VHZXRXZWJWaWV3SW5zdGFuY2UoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZp ZXdCYXNlKQorV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlQ3JlYXRlKFdlYkNv bnRleHQqIGNvbnRleHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwKQogewotICAgIHJldHVybiB3 ZWJraXRXZWJWaWV3QmFzZS0+cHJpdi0+d2ViVmlld0luc3RhbmNlOworICAgIFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSA9IFdFQktJVF9XRUJfVklFV19CQVNFKGdfb2JqZWN0 X25ldyhXRUJLSVRfVFlQRV9XRUJfVklFV19CQVNFLCBOVUxMKSk7CisgICAgV2ViS2l0V2ViVmll d0Jhc2VQcml2YXRlKiBwcml2ID0gd2Via2l0V2ViVmlld0Jhc2UtPnByaXY7CisKKyAgICBwcml2 LT5wYWdlID0gY29udGV4dC0+Y3JlYXRlV2ViUGFnZShwcml2LT53ZWJWaWV3SW5zdGFuY2UuZ2V0 KCksIHBhZ2VHcm91cCk7CisgICAgcHJpdi0+cGFnZS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKKwor ICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFzZTsKIH0KIAotdm9pZCB3ZWJraXRXZWJWaWV3QmFz ZVNldFdlYlZpZXdJbnN0YW5jZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2Us IFdlYlZpZXcqIHdlYlZpZXdJbnN0YW5jZSkKK1dlYlZpZXcqIHdlYmtpdFdlYlZpZXdCYXNlR2V0 V2ViVmlld0luc3RhbmNlKFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKIHsK LSAgICB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdi0+d2ViVmlld0luc3RhbmNlID0gd2ViVmlld0lu c3RhbmNlOworICAgIHJldHVybiB3ZWJraXRXZWJWaWV3QmFzZS0+cHJpdi0+d2ViVmlld0luc3Rh bmNlLmdldCgpOwogfQogCiBHdGtJTUNvbnRleHQqIHdlYmtpdFdlYlZpZXdCYXNlR2V0SU1Db250 ZXh0KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZSkKQEAgLTM3OCw1ICszOTMs NSBAQCBHdGtJTUNvbnRleHQqIHdlYmtpdFdlYlZpZXdCYXNlR2V0SU1Db250ZXh0KFdlYktpdFdl YlZpZXdCYXNlKiB3ZWJraXRXZWJWaWV3QmFzZQogCiBXZWJQYWdlUHJveHkqIHdlYmtpdFdlYlZp ZXdCYXNlR2V0UGFnZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2UpCiB7Ci0g ICAgcmV0dXJuIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT53ZWJWaWV3SW5zdGFuY2UtPnBhZ2Uo KTsKKyAgICByZXR1cm4gd2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnBhZ2UuZ2V0KCk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3 QmFzZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jh c2UuaAppbmRleCA2ZmE4NWVhLi41MWU0NGEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmgKQEAgLTU5LDkgKzU5LDkgQEAg c3RydWN0IF9XZWJLaXRXZWJWaWV3QmFzZUNsYXNzIHsKIAogR1R5cGUgd2Via2l0V2ViVmlld0Jh c2VHZXRUeXBlKCk7CiAKLVdlYlZpZXcqIHdlYmtpdFdlYlZpZXdCYXNlR2V0V2ViVmlld0luc3Rh bmNlKFdlYktpdFdlYlZpZXdCYXNlKik7CitXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmll d0Jhc2VDcmVhdGUoV2ViQ29udGV4dCosIFdlYlBhZ2VHcm91cCopOwogCi12b2lkIHdlYmtpdFdl YlZpZXdCYXNlU2V0V2ViVmlld0luc3RhbmNlKFdlYktpdFdlYlZpZXdCYXNlKiwgV2ViVmlldyop OworV2ViVmlldyogd2Via2l0V2ViVmlld0Jhc2VHZXRXZWJWaWV3SW5zdGFuY2UoV2ViS2l0V2Vi Vmlld0Jhc2UqKTsKIAogR3RrSU1Db250ZXh0KiB3ZWJraXRXZWJWaWV3QmFzZUdldElNQ29udGV4 dChXZWJLaXRXZWJWaWV3QmFzZSopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZ3RrL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJW aWV3LmNwcAppbmRleCA4MjRhMTE4Li44Njc3NmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9ndGsvV2ViVmlldy5jcHAKQEAgLTQ1LDIwICs0NSwyNSBAQCB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKK1dlYlBhZ2VQcm94eSogV2ViVmlldzo6cGFn ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRf V0VCX1ZJRVdfQkFTRShtX3ZpZXdXaWRnZXQpKTsKK30KKwogdm9pZCBXZWJWaWV3OjpoYW5kbGVG b2N1c0luRXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQpCiB7CiAgICAgaWYgKCEobV9pc1BhZ2VBY3Rp dmUpKSB7CiAgICAgICAgIG1faXNQYWdlQWN0aXZlID0gdHJ1ZTsKLSAgICAgICAgbV9wYWdlLT52 aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5OjpWaWV3V2luZG93SXNBY3RpdmUpOworICAg ICAgICBwYWdlKCktPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdXaW5kb3dJ c0FjdGl2ZSk7CiAgICAgfQogCi0gICAgbV9wYWdlLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFn ZVByb3h5OjpWaWV3SXNGb2N1c2VkKTsKKyAgICBwYWdlKCktPnZpZXdTdGF0ZURpZENoYW5nZShX ZWJQYWdlUHJveHk6OlZpZXdJc0ZvY3VzZWQpOwogfQogCiB2b2lkIFdlYlZpZXc6OmhhbmRsZUZv Y3VzT3V0RXZlbnQoR3RrV2lkZ2V0KiB3aWRnZXQpCiB7CiAgICAgbV9pc1BhZ2VBY3RpdmUgPSBm YWxzZTsKLSAgICBtX3BhZ2UtPnZpZXdTdGF0ZURpZENoYW5nZShXZWJQYWdlUHJveHk6OlZpZXdX aW5kb3dJc0FjdGl2ZSk7CisgICAgcGFnZSgpLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVBy b3h5OjpWaWV3V2luZG93SXNBY3RpdmUpOwogfQogCiAKQEAgLTIzNywyMCArMjQyLDExIEBAIHN0 YXRpYyBjb25zdCBLZXlQcmVzc0VudHJ5IGtleVByZXNzRW50cmllc1tdID0gewogICAgIHsgJ1xy JywgICBBbHRLZXkgfCBTaGlmdEtleSwgICJJbnNlcnROZXdsaW5lIiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9LAogfTsKIAotV2ViVmlldzo6V2ViVmlldyhXZWJDb250ZXh0KiBjb250 ZXh0LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCkKLSAgICA6IG1faXNQYWdlQWN0aXZlKHRydWUp CitXZWJWaWV3OjpXZWJWaWV3KEd0a1dpZGdldCogdmlld1dpZGdldCkKKyAgICA6IG1fdmlld1dp ZGdldCh2aWV3V2lkZ2V0KQorICAgICwgbV9pc1BhZ2VBY3RpdmUodHJ1ZSkKICAgICAsIG1fbmF0 aXZlV2lkZ2V0KGd0a190ZXh0X3ZpZXdfbmV3KCkpCiB7Ci0gICAgbV9wYWdlID0gY29udGV4dC0+ Y3JlYXRlV2ViUGFnZSh0aGlzLCBwYWdlR3JvdXApOwotCi0gICAgbV92aWV3V2lkZ2V0ID0gc3Rh dGljX2Nhc3Q8R3RrV2lkZ2V0Kj4oZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dFQl9WSUVXX0JB U0UsIE5VTEwpKTsKLSAgICBBU1NFUlQobV92aWV3V2lkZ2V0KTsKLQotICAgIG1fcGFnZS0+aW5p dGlhbGl6ZVdlYlBhZ2UoKTsKLQotICAgIFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3V2lkZ2V0 ID0gV0VCS0lUX1dFQl9WSUVXX0JBU0UobV92aWV3V2lkZ2V0KTsKLSAgICB3ZWJraXRXZWJWaWV3 QmFzZVNldFdlYlZpZXdJbnN0YW5jZSh3ZWJWaWV3V2lkZ2V0LCB0aGlzKTsKLQogICAgIGdfc2ln bmFsX2Nvbm5lY3QobV9uYXRpdmVXaWRnZXQuZ2V0KCksICJiYWNrc3BhY2UiLCBHX0NBTExCQUNL KGJhY2tzcGFjZUNhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChtX25hdGl2 ZVdpZGdldC5nZXQoKSwgImN1dC1jbGlwYm9hcmQiLCBHX0NBTExCQUNLKGN1dENsaXBib2FyZENh bGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChtX25hdGl2ZVdpZGdldC5nZXQo KSwgImNvcHktY2xpcGJvYXJkIiwgR19DQUxMQkFDSyhjb3B5Q2xpcGJvYXJkQ2FsbGJhY2spLCB0 aGlzKTsKQEAgLTI2OSwyNyArMjY1LDI3IEBAIFdlYlZpZXc6On5XZWJWaWV3KCkKIAogdm9pZCBX ZWJWaWV3OjpwYWludChHdGtXaWRnZXQqIHdpZGdldCwgR2RrUmVjdGFuZ2xlIHJlY3QsIGNhaXJv X3QqIGNyKQogewotICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoSW50UmVjdChyZWN0 KSwgY3IpOworICAgIHBhZ2UoKS0+ZHJhd2luZ0FyZWEoKS0+cGFpbnQoSW50UmVjdChyZWN0KSwg Y3IpOwogfQogCiB2b2lkIFdlYlZpZXc6OnNldFNpemUoR3RrV2lkZ2V0KiwgSW50U2l6ZSB3aW5k b3dTaXplKQogewotICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZSh3aW5kb3dTaXpl LCBJbnRTaXplKCkpOworICAgIHBhZ2UoKS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZSh3aW5kb3dT aXplLCBJbnRTaXplKCkpOwogfQogCiB2b2lkIFdlYlZpZXc6OmhhbmRsZUtleWJvYXJkRXZlbnQo R2RrRXZlbnRLZXkqIGV2ZW50KQogewotICAgIG1fcGFnZS0+aGFuZGxlS2V5Ym9hcmRFdmVudChO YXRpdmVXZWJLZXlib2FyZEV2ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQqPihldmVudCkp KTsKKyAgICBwYWdlKCktPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0aXZlV2ViS2V5Ym9hcmRFdmVu dChyZWludGVycHJldF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpKSk7CiB9CiAKIHZvaWQgV2ViVmll dzo6aGFuZGxlTW91c2VFdmVudChHZGtFdmVudCogZXZlbnQsIGludCBjdXJyZW50Q2xpY2tDb3Vu dCkKIHsKLSAgICBtX3BhZ2UtPmhhbmRsZU1vdXNlRXZlbnQoTmF0aXZlV2ViTW91c2VFdmVudChl dmVudCwgY3VycmVudENsaWNrQ291bnQpKTsKKyAgICBwYWdlKCktPmhhbmRsZU1vdXNlRXZlbnQo TmF0aXZlV2ViTW91c2VFdmVudChldmVudCwgY3VycmVudENsaWNrQ291bnQpKTsKIH0KIAogdm9p ZCBXZWJWaWV3OjpoYW5kbGVXaGVlbEV2ZW50KEdka0V2ZW50U2Nyb2xsKiBldmVudCkKIHsKLSAg ICBtX3BhZ2UtPmhhbmRsZVdoZWVsRXZlbnQoV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVl bEV2ZW50KGV2ZW50KSk7CisgICAgcGFnZSgpLT5oYW5kbGVXaGVlbEV2ZW50KFdlYkV2ZW50RmFj dG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVudChldmVudCkpOwogfQogCiB2b2lkIFdlYlZpZXc6Omdl dEVkaXRvckNvbW1hbmRzRm9yS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYg ZXZlbnQsIFZlY3RvcjxXVEY6OlN0cmluZz4mIGNvbW1hbmRMaXN0KQpAQCAtMzQ1LDEzICszNDEs MTMgQEAgYm9vbCBXZWJWaWV3Ojppc0FjdGl2ZSgpCiAKIHZvaWQgV2ViVmlldzo6Y2xvc2UoKQog ewotICAgIG1fcGFnZS0+Y2xvc2UoKTsKKyAgICBwYWdlKCktPmNsb3NlKCk7CiB9CiAKIC8vIFBh Z2VDbGllbnQncyBwdXJlIHZpcnR1YWwgZnVuY3Rpb25zCiBQYXNzT3duUHRyPERyYXdpbmdBcmVh UHJveHk+IFdlYlZpZXc6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKQogewotICAgIHJldHVybiBD aHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eTo6Y3JlYXRlKFdFQktJVF9XRUJfVklFV19CQVNF KG1fdmlld1dpZGdldCksIG1fcGFnZS5nZXQoKSk7CisgICAgcmV0dXJuIENodW5rZWRVcGRhdGVE cmF3aW5nQXJlYVByb3h5OjpjcmVhdGUoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV92aWV3V2lkZ2V0 KSwgcGFnZSgpKTsKIH0KIAogdm9pZCBXZWJWaWV3OjpzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0 IFdlYkNvcmU6OkludFJlY3QmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2d0ay9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZpZXcuaApp bmRleCA2Njg3ZDkwLi5iNDU5MmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZ3RrL1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZp ZXcuaApAQCAtMzMsMjYgKzMzLDIxIEBACiAjaW5jbHVkZSAiV2luZG93c0tleWJvYXJkQ29kZXMu aCIKICNpbmNsdWRlIDxXZWJDb3JlL0ludFNpemUuaD4KICNpbmNsdWRlIDxndGsvZ3RrLmg+Ci0j aW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KLSNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgot I2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIERy YXdpbmdBcmVhUHJveHk7CiBjbGFzcyBXZWJQYWdlTmFtZXNwYWNlOwogCi1jbGFzcyBXZWJWaWV3 IDogcHVibGljIFJlZkNvdW50ZWQ8V2ViVmlldz4sIHB1YmxpYyBQYWdlQ2xpZW50IHsKK2NsYXNz IFdlYlZpZXcgOiBwdWJsaWMgUGFnZUNsaWVudCB7CiBwdWJsaWM6CiAgICAgfldlYlZpZXcoKTsK LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJWaWV3PiBjcmVhdGUoV2ViQ29udGV4dCogY29udGV4 dCwgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXApCisgICAgc3RhdGljIFBhc3NPd25QdHI8V2ViVmll dz4gY3JlYXRlKEd0a1dpZGdldCogdmlld1dpZGdldCkKICAgICB7Ci0gICAgICAgIHJldHVybiBh ZG9wdFJlZihuZXcgV2ViVmlldyhjb250ZXh0LCBwYWdlR3JvdXApKTsKKyAgICAgICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBXZWJWaWV3KHZpZXdXaWRnZXQpKTsKICAgICB9CiAKLSAgICBHdGtXaWRn ZXQqIHdpbmRvdygpIGNvbnN0IHsgcmV0dXJuIG1fdmlld1dpZGdldDsgfQotCi0gICAgV2ViUGFn ZVByb3h5KiBwYWdlKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlLmdldCgpOyB9CisgICAgV2ViUGFn ZVByb3h5KiBwYWdlKCkgY29uc3Q7CiAKICAgICB2b2lkIGhhbmRsZUZvY3VzSW5FdmVudChHdGtX aWRnZXQqKTsKICAgICB2b2lkIGhhbmRsZUZvY3VzT3V0RXZlbnQoR3RrV2lkZ2V0Kik7CkBAIC02 Niw3ICs2MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZFBlbmRpbmdFZGl0b3JDb21tYW5kKGNv bnN0IGNoYXIqIGNvbW1hbmQpIHsgbV9wZW5kaW5nRWRpdG9yQ29tbWFuZHMuYXBwZW5kKFdURjo6 U3RyaW5nKGNvbW1hbmQpKTsgfQogCiBwcml2YXRlOgotICAgIFdlYlZpZXcoV2ViQ29udGV4dCos IFdlYlBhZ2VHcm91cCopOworICAgIFdlYlZpZXcoR3RrV2lkZ2V0Kik7CiAKICAgICBib29sIGlz QWN0aXZlKCk7CiAgICAgdm9pZCBjbG9zZSgpOwpAQCAtMTIwLDcgKzExNSw2IEBAIHByaXZhdGU6 CiAgICAgLy8gTWVtYmVycyBvZiBXZWJWaWV3IGNsYXNzCiAgICAgR3RrV2lkZ2V0KiBtX3ZpZXdX aWRnZXQ7CiAgICAgYm9vbCBtX2lzUGFnZUFjdGl2ZTsKLSAgICBSZWZQdHI8V2ViUGFnZVByb3h5 PiBtX3BhZ2U7CiAgICAgVmVjdG9yPFdURjo6U3RyaW5nPiBtX3BlbmRpbmdFZGl0b3JDb21tYW5k czsKICAgICBHUmVmUHRyPEd0a1dpZGdldD4gbV9uYXRpdmVXaWRnZXQ7CiB9Owo=