71109 2011-10-28 04:36:25 -0700 [GTK] Add methods to get/set the settings of a web view to WebKit2 GTK+ API 2011-10-31 04:45:56 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned cgarcia gustavo pnormand webkit.review.bot xan.lopez oldest_to_newest 492375 0 cgarcia 2011-10-28 04:36:25 -0700 Add webkit_web_view_set_settings() and webkit_web_view_get_settings() 492376 1 112848 cgarcia 2011-10-28 04:39:44 -0700 Created attachment 112848 Patch 492378 2 webkit.review.bot 2011-10-28 04:41:39 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 492485 3 112848 mrobinson 2011-10-28 09:26:51 -0700 Comment on attachment 112848 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112848&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:617 > + * Sets the #WebKitSettings to be applied to @web_view. The > + * existing #WebKitSettings of @web_view will be replaced by > + * @settings. The same #WebKitSettings object can be shared > + * by multiple #WebKitWebView<!-- -->s. Might want to note that the settings on the WebView are updated immediately. > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:638 > + * #WebKitSettings will be returned. This method always return return -> returns > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:645 > + * @web_view settings and update it directly. Take into account that > + * #WebKitSettings objects can be shared by multiple I'd just remove "Take into account that" here. > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp:70 > + GRefPtr<GtkWidget> webView2 = webkit_web_view_new(); > + test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(webView2.get())); > + webkit_web_view_set_settings(WEBKIT_WEB_VIEW(webView2.get()), settings); > + g_assert(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(webView2.get())) == settings); > + Might want to add an assertion here that the default settings object on webView2 is different than the one from test->m_webView. 493251 4 cgarcia 2011-10-31 04:45:56 -0700 Committed r98845: <http://trac.webkit.org/changeset/98845> 112848 2011-10-28 04:39:44 -0700 2011-10-28 09:26:51 -0700 Patch wk2-set-get-settings.diff text/plain 12227 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0ZTYxMTIzLi5mNTdlN2Q4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTEtMTAtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFkZCBtZXRob2RzIHRvIGdldC9zZXQgdGhlIHNldHRpbmdzIG9m IGEgd2ViIHZpZXcgdG8gV2ViS2l0MiBHVEsrIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzExMDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBBZGQgV2ViS2l0U2V0dGlu Z3NQcml2YXRlLmguCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3Mu Y3BwOgorICAgICAgICAod2Via2l0U2V0dGluZ3NBdHRhY2hTZXR0aW5nc1RvUGFnZSk6IFNldCB0 aGUgcHJlZmVyZW5jZXMgb2YgdGhlCisgICAgICAgIGdpdmVuIFdlYktpdFNldHRpbmdzIG9iamVj dCB0byB0aGUgcGFnZSBncm91cCBvZiB0aGUgZ2l2ZW4gV0tQYWdlLgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzUHJpdmF0ZS5oOiBBZGRlZC4KKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZp ZXdDb25zdHJ1Y3RlZCk6IENyZWF0ZSB0aGUgZGVmYXVsdCBXZWJLaXRTZXR0aW5ncyBmb3IKKyAg ICAgICAgdGhlIHZpZXcuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdzKToK KyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3MpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0OgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHRlc3RXZWJWaWV3U2V0 dGluZ3MpOgorICAgICAgICAoYmVmb3JlQWxsKToKKworMjAxMS0xMC0yOCAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gQWRkIHdlYmtp dF93ZWJfdmlld19nZXRfdXJpKCkgdG8gV2ViS2l0MiBHVEsrIEFQSQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA4MTQKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5h bQppbmRleCAxZmM2MjFkLi4yMTdjMDFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9HTlVt YWtlZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9HTlVtYWtlZmlsZS5hbQpAQCAtNDk3LDYg KzQ5Nyw3IEBAIGxpYndlYmtpdDJndGtfQFdFQktJVEdUS19BUElfTUFKT1JfVkVSU0lPTkBfQFdF QktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkBfbGFfU09VCiAJU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0UHJpdmF0ZS5oIFwKIAlTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAgXAogCVNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFNldHRpbmdzLmggXAorCVNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFNldHRpbmdzUHJpdmF0ZS5oIFwKIAlTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmggXAogCVNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwIFwKIAlTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0UHJpdmF0ZS5oIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcAppbmRleCBjZjRkZWZkLi5i NzZkYmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0U2V0dGluZ3MuY3BwCkBAIC0zMiw5ICszMiw4IEBACiAjaW5jbHVkZSAiV2ViS2l0U2V0dGlu Z3MuaCIKIAogI2luY2x1ZGUgIldlYktpdFByaXZhdGUuaCIKLSNpbmNsdWRlIDxXZWJLaXQyL1dL UHJlZmVyZW5jZXMuaD4KKyNpbmNsdWRlICJXZWJLaXRTZXR0aW5nc1ByaXZhdGUuaCIKICNpbmNs dWRlIDxXZWJLaXQyL1dLUmV0YWluUHRyLmg+Ci0jaW5jbHVkZSA8V2ViS2l0Mi9XS1R5cGUuaD4K ICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5oPgogCiBzdHJ1Y3QgX1dlYktpdFNldHRpbmdzUHJp dmF0ZSB7CkBAIC0zODAsNiArMzc5LDExIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5nc19p bml0KFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKICAgICBwcml2LT5wcmVmZXJlbmNlcyA9IGFk b3B0V0soV0tQcmVmZXJlbmNlc0NyZWF0ZSgpKTsKIH0KIAordm9pZCB3ZWJraXRTZXR0aW5nc0F0 dGFjaFNldHRpbmdzVG9QYWdlKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncywgV0tQYWdlUmVmIHdr UGFnZSkKK3sKKyAgICBXS1BhZ2VHcm91cFNldFByZWZlcmVuY2VzKFdLUGFnZUdldFBhZ2VHcm91 cCh3a1BhZ2UpLCBzZXR0aW5ncy0+cHJpdi0+cHJlZmVyZW5jZXMuZ2V0KCkpOworfQorCiAvKioK ICAqIHdlYmtpdF9zZXR0aW5nc19uZXc6CiAgKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3NQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5nc1ByaXZhdGUuaApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNDdhYzdmCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3NQcml2YXRlLmgKQEAgLTAs MCArMSwzNCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBJZ2FsaWEgUy5MLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRT IENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5D LiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgor ICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkK KyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAq LworCisjaWZuZGVmIFdlYktpdFNldHRpbmdzUHJpdmF0ZV9oCisjZGVmaW5lIFdlYktpdFNldHRp bmdzUHJpdmF0ZV9oCisKKyNpbmNsdWRlICJXZWJLaXRTZXR0aW5ncy5oIgorI2luY2x1ZGUgPFdl YktpdDIvV2ViS2l0Mi5oPgorCit2b2lkIHdlYmtpdFNldHRpbmdzQXR0YWNoU2V0dGluZ3NUb1Bh Z2UoV2ViS2l0U2V0dGluZ3MqLCBXS1BhZ2VSZWYpOworCisjZW5kaWYgLy8gV2ViS2l0U2V0dGlu Z3NQcml2YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlldy5jcHAKaW5kZXggNGY5MWFiMC4uYzljMzhlOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTIxLDYgKzIx LDcgQEAKICNpbmNsdWRlICJXZWJLaXRXZWJWaWV3LmgiCiAKICNpbmNsdWRlICJXZWJLaXRCYWNr Rm9yd2FyZExpc3RQcml2YXRlLmgiCisjaW5jbHVkZSAiV2ViS2l0U2V0dGluZ3NQcml2YXRlLmgi CiAjaW5jbHVkZSAiV2ViS2l0V2ViQ29udGV4dFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRX ZWJMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJXZWJLaXRXZWJMb2FkZXJDbGllbnRQcml2YXRl LmgiCkBAIC01NCw2ICs1NSw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViVmlld1ByaXZhdGUgewogCiAg ICAgR1JlZlB0cjxXZWJLaXRXZWJMb2FkZXJDbGllbnQ+IGxvYWRlckNsaWVudDsKICAgICBHUmVm UHRyPFdlYktpdEJhY2tGb3J3YXJkTGlzdD4gYmFja0ZvcndhcmRMaXN0OworICAgIEdSZWZQdHI8 V2ViS2l0U2V0dGluZ3M+IHNldHRpbmdzOwogfTsKIAogR19ERUZJTkVfVFlQRShXZWJLaXRXZWJW aWV3LCB3ZWJraXRfd2ViX3ZpZXcsIFdFQktJVF9UWVBFX1dFQl9WSUVXX0JBU0UpCkBAIC04MSw2 ICs4Myw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdDb25zdHJ1Y3RlZChHT2JqZWN0KiBv YmplY3QpCiAgICAgd2Via2l0V2ViVmlld1NldExvYWRlckNsaWVudCh3ZWJWaWV3LCBkZWZhdWx0 TG9hZGVyQ2xpZW50LmdldCgpLCB0b0FQSShwYWdlKSk7CiAKICAgICBwcml2LT5iYWNrRm9yd2Fy ZExpc3QgPSBhZG9wdEdSZWYod2Via2l0QmFja0ZvcndhcmRMaXN0Q3JlYXRlKFdLUGFnZUdldEJh Y2tGb3J3YXJkTGlzdCh0b0FQSShwYWdlKSkpKTsKKyAgICBwcml2LT5zZXR0aW5ncyA9IGFkb3B0 R1JlZih3ZWJraXRfc2V0dGluZ3NfbmV3KCkpOworICAgIHdlYmtpdFNldHRpbmdzQXR0YWNoU2V0 dGluZ3NUb1BhZ2UocHJpdi0+c2V0dGluZ3MuZ2V0KCksIHRvQVBJKHBhZ2UpKTsKIH0KIAogc3Rh dGljIHZvaWQgd2Via2l0V2ViVmlld1NldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQg cHJvcElkLCBjb25zdCBHVmFsdWUqIHZhbHVlLCBHUGFyYW1TcGVjKiBwYXJhbVNwZWMpCkBAIC02 MDEsMyArNjA1LDUyIEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X2dvX3RvX2JhY2tfZm9yd2FyZF9s aXN0X2l0ZW0oV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgd2Via2l0QmFja0ZvcndhcmRMaXN0SXRlbUdldFdLSXRlbShsaXN0 SXRlbSkpOwogICAgIHdlYmtpdFdlYlZpZXdVcGRhdGVVUkkod2ViVmlldyk7CiB9CisKKy8qKgor ICogd2Via2l0X3dlYl92aWV3X3NldF9zZXR0aW5nczoKKyAqIEB3ZWJfdmlldzogYSAjV2ViS2l0 V2ViVmlldworICogQHNldHRpbmdzOiBhICNXZWJLaXRTZXR0aW5ncworICoKKyAqIFNldHMgdGhl ICNXZWJLaXRTZXR0aW5ncyB0byBiZSBhcHBsaWVkIHRvIEB3ZWJfdmlldy4gVGhlCisgKiBleGlz dGluZyAjV2ViS2l0U2V0dGluZ3Mgb2YgQHdlYl92aWV3IHdpbGwgYmUgcmVwbGFjZWQgYnkKKyAq IEBzZXR0aW5ncy4gVGhlIHNhbWUgI1dlYktpdFNldHRpbmdzIG9iamVjdCBjYW4gYmUgc2hhcmVk CisgKiBieSBtdWx0aXBsZSAjV2ViS2l0V2ViVmlldzwhLS0gLS0+cy4KKyAqLwordm9pZCB3ZWJr aXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdFNl dHRpbmdzKiBzZXR0aW5ncykKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJf VklFVyh3ZWJWaWV3KSk7CisgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Mo c2V0dGluZ3MpKTsKKworICAgIGlmICh3ZWJWaWV3LT5wcml2LT5zZXR0aW5ncyA9PSBzZXR0aW5n cykKKyAgICAgICAgcmV0dXJuOworCisgICAgd2ViVmlldy0+cHJpdi0+c2V0dGluZ3MgPSBzZXR0 aW5nczsKKyAgICB3ZWJraXRTZXR0aW5nc0F0dGFjaFNldHRpbmdzVG9QYWdlKHNldHRpbmdzLCB0 b0FQSSh3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmll dykpKSk7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5nczoKKyAqIEB3 ZWJfdmlldzogYSAjV2ViS2l0V2ViVmlldworICoKKyAqIEdldHMgdGhlICNXZWJLaXRTZXR0aW5n cyBjdXJyZW50bHkgYXBwbGllZCB0byBAd2ViX3ZpZXcuCisgKiBJZiBubyBvdGhlciAjV2ViS2l0 U2V0dGluZ3MgaGF2ZSBiZWVuIGV4cGxpY2l0bHkgYXBwbGllZCB0bworICogQHdlYl92aWV3IHdp dGggd2Via2l0X3dlYl92aWV3X3NldF9zZXR0aW5ncygpLCB0aGUgZGVmYXVsdAorICogI1dlYktp dFNldHRpbmdzIHdpbGwgYmUgcmV0dXJuZWQuIFRoaXMgbWV0aG9kIGFsd2F5cyByZXR1cm4KKyAq IGEgdmFsaWQgI1dlYktpdFNldHRpbmdzIG9iamVjdC4KKyAqIFRvIG1vZGlmeSBhbnkgb2YgdGhl IEB3ZWJfdmlldyBzZXR0aW5ncywgeW91IGNhbiBlaXRoZXIgY3JlYXRlCisgKiBhIG5ldyAjV2Vi S2l0U2V0dGluZ3Mgb2JqZWN0IHdpdGggd2Via2l0X3NldHRpbmdzX25ldygpLCBzZXR0aW5nCisg KiB0aGUgZGVzaXJlZCBwcmVmZXJlbmNlcywgYW5kIHRoZW4gcmVwbGFjZSB0aGUgZXhpc3Rpbmcg QHdlYl92aWV3CisgKiBzZXR0aW5ncyB3aXRoIHdlYmtpdF93ZWJfdmlld19zZXRfc2V0dGluZ3Mo KSBvciBnZXQgdGhlIGV4aXN0aW5nCisgKiBAd2ViX3ZpZXcgc2V0dGluZ3MgYW5kIHVwZGF0ZSBp dCBkaXJlY3RseS4gVGFrZSBpbnRvIGFjY291bnQgdGhhdAorICogI1dlYktpdFNldHRpbmdzIG9i amVjdHMgY2FuIGJlIHNoYXJlZCBieSBtdWx0aXBsZQorICogI1dlYktpdFdlYlZpZXc8IS0tIC0t PnMsIHNvIG1vZGlmeWluZyB0aGUgc2V0dGluZ3Mgb2YgYSAjV2ViS2l0V2ViVmlldworICogd291 bGQgYWZmZWN0IG90aGVyICNXZWJLaXRXZWJWaWV3PCEtLSAtLT5zIHVzaW5nIHRoZSBzYW1lICNX ZWJLaXRTZXR0aW5ncy4KKyAqCisgKiBSZXR1cm5zOiAodHJhbnNmZXIgbm9uZSk6IHRoZSAjV2Vi S2l0U2V0dGluZ3MgYXR0YWNoZWQgdG8gQHdlYl92aWV3CisgKi8KK1dlYktpdFNldHRpbmdzKiB3 ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7Cisg ICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9WSUVXKHdlYlZpZXcpLCAwKTsK KworICAgIHJldHVybiB3ZWJWaWV3LT5wcml2LT5zZXR0aW5ncy5nZXQoKTsKK30KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaAppbmRleCA3OTBh ZTRmLi4xYThhMTc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViVmlldy5oCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8d2Via2l0Mi9XZWJL aXREZWZpbmVzLmg+CiAjaW5jbHVkZSA8d2Via2l0Mi9XZWJLaXRXZWJDb250ZXh0Lmg+CiAjaW5j bHVkZSA8d2Via2l0Mi9XZWJLaXRXZWJMb2FkZXJDbGllbnQuaD4KKyNpbmNsdWRlIDx3ZWJraXQy L1dlYktpdFNldHRpbmdzLmg+CiAjaW5jbHVkZSA8d2Via2l0Mi9XZWJLaXRXZWJWaWV3QmFzZS5o PgogCiBHX0JFR0lOX0RFQ0xTCkBAIC0xMzQsNiArMTM1LDEzIEBAIFdFQktJVF9BUEkgdm9pZAog d2Via2l0X3dlYl92aWV3X3NldF9jdXN0b21fY2hhcnNldCAgICAgICAgICAgKFdlYktpdFdlYlZp ZXcgICAgICAgICAgICAgKndlYl92aWV3LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAgICAgKmNoYXJzZXQpOwogCitX RUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmlld19zZXRfc2V0dGluZ3MgICAgICAgICAgICAg ICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJfdmlldywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJLaXRTZXR0aW5ncyAgICAgICAgICAg ICpzZXR0aW5ncyk7CisKK1dFQktJVF9BUEkgV2ViS2l0U2V0dGluZ3MgKgord2Via2l0X3dlYl92 aWV3X2dldF9zZXR0aW5ncyAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAg ICAgKndlYl92aWV3KTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0 IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLXNlY3Rp b25zLnR4dAppbmRleCAzODk3NTQ3Li5mODFlNmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0CisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50 eHQKQEAgLTY0LDYgKzY0LDggQEAgd2Via2l0X3dlYl92aWV3X3NldF9jdXN0b21fY2hhcnNldAog d2Via2l0X3dlYl92aWV3X2dldF9iYWNrX2ZvcndhcmRfbGlzdAogd2Via2l0X3dlYl92aWV3X2dv X3RvX2JhY2tfZm9yd2FyZF9saXN0X2l0ZW0KIHdlYmtpdF93ZWJfdmlld19nZXRfdXJpCit3ZWJr aXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdzCit3ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzCiAK IDxTVUJTRUNUSU9OIFN0YW5kYXJkPgogV2ViS2l0V2ViVmlld0NsYXNzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViVmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2Vi Vmlldy5jcHAKaW5kZXggYTI5M2VlZi4uZGQ4NWUyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYlZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJWaWV3LmNw cApAQCAtNDcsMTEgKzQ3LDQxIEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3c1NoYXJlQ2xpZW50 cyhUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIGdfYXNzZXJ0KGNsaWVudDEgPT0gY2xp ZW50Mik7CiB9CiAKK3N0YXRpYyB2b2lkIHRlc3RXZWJWaWV3U2V0dGluZ3MoV2ViVmlld1Rlc3Qq IHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgV2ViS2l0U2V0dGluZ3MqIGRlZmF1bHRTZXR0 aW5ncyA9IHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3ModGVzdC0+bV93ZWJWaWV3KTsKKyAg ICB0ZXN0LT5hc3NlcnRPYmplY3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdfT0JKRUNUKGRl ZmF1bHRTZXR0aW5ncykpOworICAgIGdfYXNzZXJ0KGRlZmF1bHRTZXR0aW5ncyk7CisgICAgZ19h c3NlcnQod2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfamF2YXNjcmlwdChkZWZhdWx0U2V0dGlu Z3MpKTsKKworICAgIEdSZWZQdHI8V2ViS2l0U2V0dGluZ3M+IG5ld1NldHRpbmdzID0gYWRvcHRH UmVmKHdlYmtpdF9zZXR0aW5nc19uZXcoKSk7CisgICAgdGVzdC0+YXNzZXJ0T2JqZWN0SXNEZWxl dGVkV2hlblRlc3RGaW5pc2hlcyhHX09CSkVDVChuZXdTZXR0aW5ncy5nZXQoKSkpOworICAgIGdf b2JqZWN0X3NldChHX09CSkVDVChuZXdTZXR0aW5ncy5nZXQoKSksICJlbmFibGUtamF2YXNjcmlw dCIsIEZBTFNFLCBOVUxMKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdzKHRlc3Qt Pm1fd2ViVmlldywgbmV3U2V0dGluZ3MuZ2V0KCkpOworCisgICAgV2ViS2l0U2V0dGluZ3MqIHNl dHRpbmdzID0gd2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyh0ZXN0LT5tX3dlYlZpZXcpOwor ICAgIGdfYXNzZXJ0KHNldHRpbmdzICE9IGRlZmF1bHRTZXR0aW5ncyk7CisgICAgZ19hc3NlcnQo IXdlYmtpdF9zZXR0aW5nc19nZXRfZW5hYmxlX2phdmFzY3JpcHQoc2V0dGluZ3MpKTsKKworICAg IEdSZWZQdHI8R3RrV2lkZ2V0PiB3ZWJWaWV3MiA9IHdlYmtpdF93ZWJfdmlld19uZXcoKTsKKyAg ICB0ZXN0LT5hc3NlcnRPYmplY3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdfT0JKRUNUKHdl YlZpZXcyLmdldCgpKSk7CisgICAgd2Via2l0X3dlYl92aWV3X3NldF9zZXR0aW5ncyhXRUJLSVRf V0VCX1ZJRVcod2ViVmlldzIuZ2V0KCkpLCBzZXR0aW5ncyk7CisgICAgZ19hc3NlcnQod2Via2l0 X3dlYl92aWV3X2dldF9zZXR0aW5ncyhXRUJLSVRfV0VCX1ZJRVcod2ViVmlldzIuZ2V0KCkpKSA9 PSBzZXR0aW5ncyk7CisKKyAgICBHUmVmUHRyPFdlYktpdFNldHRpbmdzPiBuZXdTZXR0aW5nczIg PSBhZG9wdEdSZWYod2Via2l0X3NldHRpbmdzX25ldygpKTsKKyAgICB0ZXN0LT5hc3NlcnRPYmpl Y3RJc0RlbGV0ZWRXaGVuVGVzdEZpbmlzaGVzKEdfT0JKRUNUKG5ld1NldHRpbmdzMi5nZXQoKSkp OworICAgIHdlYmtpdF93ZWJfdmlld19zZXRfc2V0dGluZ3MoV0VCS0lUX1dFQl9WSUVXKHdlYlZp ZXcyLmdldCgpKSwgbmV3U2V0dGluZ3MyLmdldCgpKTsKKyAgICBzZXR0aW5ncyA9IHdlYmtpdF93 ZWJfdmlld19nZXRfc2V0dGluZ3MoV0VCS0lUX1dFQl9WSUVXKHdlYlZpZXcyLmdldCgpKSk7Cisg ICAgZ19hc3NlcnQoc2V0dGluZ3MgPT0gbmV3U2V0dGluZ3MyLmdldCgpKTsKKyAgICBnX2Fzc2Vy dCh3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9qYXZhc2NyaXB0KHNldHRpbmdzKSk7Cit9CisK IHZvaWQgYmVmb3JlQWxsKCkKIHsKICAgICBXZWJWaWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3 IiwgImRlZmF1bHQtY29udGV4dCIsIHRlc3RXZWJWaWV3RGVmYXVsdENvbnRleHQpOwogICAgIFdl YlZpZXdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiY3VzdG9tLWNoYXJzZXQiLCB0ZXN0V2Vi Vmlld0N1c3RvbUNoYXJzZXQpOwogICAgIFRlc3Q6OmFkZCgiV2ViS2l0V2ViVmlldyIsICJ3ZWJ2 aWV3cy1zaGFyZS1jbGllbnRzIiwgdGVzdFdlYlZpZXdzU2hhcmVDbGllbnRzKTsKKyAgICBXZWJW aWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgInNldHRpbmdzIiwgdGVzdFdlYlZpZXdTZXR0 aW5ncyk7CiB9CiAKIHZvaWQgYWZ0ZXJBbGwoKQo=