156835 2016-04-21 01:14:31 -0700 [GTK] WebKitWebView should claim the contents size as its natural size 2016-04-21 03:53:47 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue gustavo mcatanzaro mcrha mrobinson oldest_to_newest 1185710 0 cgarcia 2016-04-21 01:14:31 -0700 And keep claiming 0 as its minimum size since it's scrollable. 1185711 1 276902 cgarcia 2016-04-21 01:18:38 -0700 Created attachment 276902 Patch 1185712 2 commit-queue 2016-04-21 01:20:19 -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 1185730 3 276902 zan 2016-04-21 03:39:51 -0700 Comment on attachment 276902 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276902&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:1536 > + if (priv->contentsSize == contentsSize) > + return; > + priv->contentsSize = contentsSize; The early check-and-return doesn't help much IMO, since the assignment is the only change of state here, and there's no work or event propagated further if the same size is assigned. 1185733 4 cgarcia 2016-04-21 03:45:59 -0700 (In reply to comment #3) > Comment on attachment 276902 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=276902&action=review > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp:1536 > > + if (priv->contentsSize == contentsSize) > > + return; > > + priv->contentsSize = contentsSize; > > The early check-and-return doesn't help much IMO, since the assignment is > the only change of state here, and there's no work or event propagated > further if the same size is assigned. Yes, that's the case of this patch, but this is a actually a split of two patches. The other one adds new API to tell the web view to fit its size to the contents, so here I schedule a resize, but only when the contents size have actually changed. 1185737 5 cgarcia 2016-04-21 03:53:47 -0700 Committed r199811: <http://trac.webkit.org/changeset/199811> 276902 2016-04-21 01:18:38 -0700 2016-04-21 03:39:51 -0700 Patch wk2-webview-preferred-size.diff text/plain 8548 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0MDAzYjU4Li4yNDcyM2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQg QEAKIDIwMTYtMDQtMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIFdlYktpdFdlYlZpZXcgc2hvdWxkIGNsYWltIHRoZSBjb250ZW50 cyBzaXplIGFzIGl0cyBuYXR1cmFsIHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1NjgzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFuZCBrZWVwIGNsYWltaW5nIDAgYXMgaXRzIG1pbmltdW0gc2l6 ZSBzaW5jZSBpdCdzIHNjcm9sbGFibGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9Q YWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpkaWRD aGFuZ2VDb250ZW50U2l6ZSk6IENhbGwgd2Via2l0V2ViVmlld0Jhc2VTZXRDb250ZW50c1NpemUo KS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdl YmtpdFdlYlZpZXdCYXNlR2V0UHJlZmVycmVkV2lkdGgpOiBSZXR1cm4gdGhlIGNvbnRlbnRzIHdp ZHRoIGFzIG5hdHVyYWwgd2lkdGguCisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZUdldFByZWZl cnJlZEhlaWdodCk6IFJldHVybiB0aGUgY29udGVudHMgaGVpZ2h0IGFzIG5hdHVyYWwgaGVpZ2h0 LgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2Jhc2VfY2xhc3NfaW5pdCk6IEFkZCBpbXBsZW1l bnRhdGlvbnMgb2YgZ2V0X3ByZWZlcnJlZF93aWR0aC9oZWlnaHQuCisgICAgICAgICh3ZWJraXRX ZWJWaWV3QmFzZVNldENvbnRlbnRzU2l6ZSk6IFNhdmUgdGhlIGNvbnRlbnRzIHNpemUuCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmg6CisKKzIw MTYtMDQtMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAg ICAgICAgIFtHVEtdIFdlYktpdFdlYlZpZXcgc2hvdWxkIHByb3BhZ2F0ZSB3aGVlbCBldmVudHMg bm90IGhhbmRsZWQgYnkgdGhlIHdlYiBwcm9jZXNzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTY4MzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCmluZGV4IGY5NDRjYTguLjNjMmY4 NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGll bnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xp ZW50SW1wbC5jcHAKQEAgLTI1Myw2ICsyNTMsMTEgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6c2Vs ZWN0aW9uRGlkQ2hhbmdlKCkKICAgICAgICAgd2Via2l0V2ViVmlld1NlbGVjdGlvbkRpZENoYW5n ZShXRUJLSVRfV0VCX1ZJRVcobV92aWV3V2lkZ2V0KSk7CiB9CiAKK3ZvaWQgUGFnZUNsaWVudElt cGw6OmRpZENoYW5nZUNvbnRlbnRTaXplKGNvbnN0IEludFNpemUmIHNpemUpCit7CisgICAgd2Vi a2l0V2ViVmlld0Jhc2VTZXRDb250ZW50c1NpemUoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV92aWV3 V2lkZ2V0KSwgc2l6ZSk7Cit9CisKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogdm9pZCBQYWdl Q2xpZW50SW1wbDo6c3RhcnREcmFnKGNvbnN0IFdlYkNvcmU6OkRyYWdEYXRhJiBkcmFnRGF0YSwg UGFzc1JlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGRyYWdJbWFnZSkKIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oCmluZGV4IDYxYWI3YmEu LjhiOGJjMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1Bh Z2VDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFn ZUNsaWVudEltcGwuaApAQCAtOTUsNyArOTUsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgd2lsbEVu dGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKSBvdmVycmlkZTsKIAogICAgIHZvaWQgaGFu ZGxlRG93bmxvYWRSZXF1ZXN0KERvd25sb2FkUHJveHkqKSBvdmVycmlkZTsKLSAgICB2b2lkIGRp ZENoYW5nZUNvbnRlbnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKSBvdmVycmlkZSB7IH0K KyAgICB2b2lkIGRpZENoYW5nZUNvbnRlbnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKSBv dmVycmlkZTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgYm9vbCB1c2VDdXN0b21Db250ZW50UHJvdmlkZXIpIG92ZXJyaWRlOwogICAg IHZvaWQgZGlkRmFpbExvYWRGb3JNYWluRnJhbWUoKSBvdmVycmlkZSB7IH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3Bw CmluZGV4IGU2YTYwYWQuLjliZjc2MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKQEAgLTE5MSw2ICsxOTEsNyBA QCBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSB7CiAgICAgSW5wdXRNZXRob2RGaWx0 ZXIgaW5wdXRNZXRob2RGaWx0ZXI7CiAgICAgS2V5QmluZGluZ1RyYW5zbGF0b3Iga2V5QmluZGlu Z1RyYW5zbGF0b3I7CiAgICAgVG91Y2hFdmVudHNNYXAgdG91Y2hFdmVudHM7CisgICAgSW50U2l6 ZSBjb250ZW50c1NpemU7CiAKICAgICBHdGtXaW5kb3cqIHRvcGxldmVsT25TY3JlZW5XaW5kb3c7 CiAgICAgdW5zaWduZWQgbG9uZyB0b3BsZXZlbEZvY3VzSW5FdmVudElEOwpAQCAtNjk2LDYgKzY5 NywyMCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZShHdGtXaWRn ZXQqIHdpZGdldCwgR3RrQWxsb2NhdGlvbiogYWxsbwogICAgIGRyYXdpbmdBcmVhLT5zZXRTaXpl KHZpZXdSZWN0LnNpemUoKSwgSW50U2l6ZSgpLCBJbnRTaXplKCkpOwogfQogCitzdGF0aWMgdm9p ZCB3ZWJraXRXZWJWaWV3QmFzZUdldFByZWZlcnJlZFdpZHRoKEd0a1dpZGdldCogd2lkZ2V0LCBn aW50KiBtaW5pbXVtU2l6ZSwgZ2ludCogbmF0dXJhbFNpemUpCit7CisgICAgV2ViS2l0V2ViVmll d0Jhc2VQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2lkZ2V0KS0+cHJpdjsK KyAgICAqbWluaW11bVNpemUgPSAwOworICAgICpuYXR1cmFsU2l6ZSA9IHByaXYtPmNvbnRlbnRz U2l6ZS53aWR0aCgpOworfQorCitzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUdldFByZWZl cnJlZEhlaWdodChHdGtXaWRnZXQqIHdpZGdldCwgZ2ludCogbWluaW11bVNpemUsIGdpbnQqIG5h dHVyYWxTaXplKQoreworICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSogcHJpdiA9IFdFQktJ VF9XRUJfVklFV19CQVNFKHdpZGdldCktPnByaXY7CisgICAgKm1pbmltdW1TaXplID0gMDsKKyAg ICAqbmF0dXJhbFNpemUgPSBwcml2LT5jb250ZW50c1NpemUuaGVpZ2h0KCk7Cit9CisKIHN0YXRp YyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlTWFwKEd0a1dpZGdldCogd2lkZ2V0KQogewogICAgIEdU S19XSURHRVRfQ0xBU1Mod2Via2l0X3dlYl92aWV3X2Jhc2VfcGFyZW50X2NsYXNzKS0+bWFwKHdp ZGdldCk7CkBAIC0xMTY3LDYgKzExODIsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf YmFzZV9jbGFzc19pbml0KFdlYktpdFdlYlZpZXdCYXNlQ2xhc3MqIHdlYmtpdFdlYlZpZQogICAg IHdpZGdldENsYXNzLT51bnJlYWxpemUgPSB3ZWJraXRXZWJWaWV3QmFzZVVucmVhbGl6ZTsKICAg ICB3aWRnZXRDbGFzcy0+ZHJhdyA9IHdlYmtpdFdlYlZpZXdCYXNlRHJhdzsKICAgICB3aWRnZXRD bGFzcy0+c2l6ZV9hbGxvY2F0ZSA9IHdlYmtpdFdlYlZpZXdCYXNlU2l6ZUFsbG9jYXRlOworICAg IHdpZGdldENsYXNzLT5nZXRfcHJlZmVycmVkX3dpZHRoID0gd2Via2l0V2ViVmlld0Jhc2VHZXRQ cmVmZXJyZWRXaWR0aDsKKyAgICB3aWRnZXRDbGFzcy0+Z2V0X3ByZWZlcnJlZF9oZWlnaHQgPSB3 ZWJraXRXZWJWaWV3QmFzZUdldFByZWZlcnJlZEhlaWdodDsKICAgICB3aWRnZXRDbGFzcy0+bWFw ID0gd2Via2l0V2ViVmlld0Jhc2VNYXA7CiAgICAgd2lkZ2V0Q2xhc3MtPnVubWFwID0gd2Via2l0 V2ViVmlld0Jhc2VVbm1hcDsKICAgICB3aWRnZXRDbGFzcy0+Zm9jdXMgPSB3ZWJraXRXZWJWaWV3 QmFzZUZvY3VzOwpAQCAtMTUxMSw2ICsxNTI4LDE0IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VV cGRhdGVUZXh0SW5wdXRTdGF0ZShXZWJLaXRXZWJWaWV3QmFzZSogd2Via2l0V2ViVmlld0Jhc2Up CiAgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5pbnB1dE1ldGhvZEZpbHRlci5zZXRD dXJzb3JSZWN0KGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuY2FyZXRSZWN0QXRTdGFydCk7 CiB9CiAKK3ZvaWQgd2Via2l0V2ViVmlld0Jhc2VTZXRDb250ZW50c1NpemUoV2ViS2l0V2ViVmll d0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlLCBjb25zdCBJbnRTaXplJiBjb250ZW50c1NpemUpCit7 CisgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2Via2l0V2ViVmlld0Jhc2Ut PnByaXY7CisgICAgaWYgKHByaXYtPmNvbnRlbnRzU2l6ZSA9PSBjb250ZW50c1NpemUpCisgICAg ICAgIHJldHVybjsKKyAgICBwcml2LT5jb250ZW50c1NpemUgPSBjb250ZW50c1NpemU7Cit9CisK IHZvaWQgd2Via2l0V2ViVmlld0Jhc2VSZXNldENsaWNrQ291bnRlcihXZWJLaXRXZWJWaWV3QmFz ZSogd2Via2l0V2ViVmlld0Jhc2UpCiB7CiAgICAgd2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPmNs aWNrQ291bnRlci5yZXNldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaAppbmRleCAwZTZlODdlLi45 ODQyZTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3QmFzZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaApAQCAtNTUsNiArNTUsNyBAQCBXZWJLaXQ6 OldlYkNvbnRleHRNZW51UHJveHlHdGsqIHdlYmtpdFdlYlZpZXdCYXNlR2V0QWN0aXZlQ29udGV4 dE1lbnVQcm94eShXZWJLaQogR2RrRXZlbnQqIHdlYmtpdFdlYlZpZXdCYXNlVGFrZUNvbnRleHRN ZW51RXZlbnQoV2ViS2l0V2ViVmlld0Jhc2UqKTsKIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VTZXRJ bnB1dE1ldGhvZFN0YXRlKFdlYktpdFdlYlZpZXdCYXNlKiwgYm9vbCBlbmFibGVkKTsKIHZvaWQg d2Via2l0V2ViVmlld0Jhc2VVcGRhdGVUZXh0SW5wdXRTdGF0ZShXZWJLaXRXZWJWaWV3QmFzZSop Owordm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNldENvbnRlbnRzU2l6ZShXZWJLaXRXZWJWaWV3QmFz ZSosIGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNl dEZvY3VzKFdlYktpdFdlYlZpZXdCYXNlKiwgYm9vbCBmb2N1c2VkKTsKIGJvb2wgd2Via2l0V2Vi Vmlld0Jhc2VJc0luV2luZG93QWN0aXZlKFdlYktpdFdlYlZpZXdCYXNlKik7CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjg1ZjI1OS4uNjM2NWFh NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDE2LTA0LTIxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBXZWJLaXRXZWJWaWV3IHNob3VsZCBjbGFpbSB0 aGUgY29udGVudHMgc2l6ZSBhcyBpdHMgbmF0dXJhbCBzaXplCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTY4MzUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGVzdCBjYXNlIHRvIGNoZWNrIHRoZSBX ZWJLaXRXZWJWaWV3IHByZWZlcnJlZCBzaXplLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHRlc3RXZWJW aWV3UHJlZmVycmVkU2l6ZSk6CisgICAgICAgIChiZWZvcmVBbGwpOgorCiAyMDE2LTA0LTIwICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBjb250 ZW50IGFuaW1hdGlvbiB0ZXN0cyB0byBiZW5jaG1hcmtfcnVubmVyLCBhbmQgYWxsb3cgdGhlIHJ1 bm5lciB0byBjb2xsZWN0IGRldmljZSBkYXRhIGFzIHBhcnQgb2YgdGhlIHJlc3VsdHMKZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2Vi Vmlldy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktp dFdlYlZpZXcuY3BwCmluZGV4IDkyNDgwOTcuLjNhYWZkNzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViVmlldy5jcHAKKysrIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRXZWJWaWV3LmNw cApAQCAtODUzLDYgKzg1MywxOSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld0JhY2tncm91bmRD b2xvcihXZWJWaWV3VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICAvLyBNaW5pQnJvd3Nl ciAtLWJnLWNvbG9yPSI8Y29sb3ItdmFsdWU+IiBmb3IgbWFudWFsbHkgdGVzdGluZyB0aGlzIEFQ SS4KIH0KIAorc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdQcmVmZXJyZWRTaXplKFdlYlZpZXdUZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQoreworICAgIHRlc3QtPmxvYWRIdG1sKCI8aHRtbCBzdHls ZT0nd2lkdGg6IDMyNXB4OyBoZWlnaHQ6IDYxNXB4Jz48L2h0bWw+IiwgbnVsbHB0cik7CisgICAg dGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgdGVzdC0+c2hvd0luV2luZG93QW5k V2FpdFVudGlsTWFwcGVkKCk7CisgICAgR3RrUmVxdWlzaXRpb24gbWluaW11blNpemUsIG5hdHVy YWxTaXplOworICAgIGd0a193aWRnZXRfZ2V0X3ByZWZlcnJlZF9zaXplKEdUS19XSURHRVQodGVz dC0+bV93ZWJWaWV3KSwgJm1pbmltdW5TaXplLCAmbmF0dXJhbFNpemUpOworICAgIGdfYXNzZXJ0 X2NtcGludChtaW5pbXVuU2l6ZS53aWR0aCwgPT0sIDApOworICAgIGdfYXNzZXJ0X2NtcGludCht aW5pbXVuU2l6ZS5oZWlnaHQsID09LCAwKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQobmF0dXJhbFNp emUud2lkdGgsID09LCAzMjUpOworICAgIGdfYXNzZXJ0X2NtcGludChuYXR1cmFsU2l6ZS5oZWln aHQsID09LCA2MTUpOworfQorCiBzdGF0aWMgdm9pZCBzZXJ2ZXJDYWxsYmFjayhTb3VwU2VydmVy KiBzZXJ2ZXIsIFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBjaGFyKiBwYXRoLCBHSGFzaFRh YmxlKiwgU291cENsaWVudENvbnRleHQqLCBncG9pbnRlcikKIHsKICAgICBpZiAobWVzc2FnZS0+ bWV0aG9kICE9IFNPVVBfTUVUSE9EX0dFVCkgewpAQCAtODg3LDYgKzkwMCw3IEBAIHZvaWQgYmVm b3JlQWxsKCkKICAgICBOb3RpZmljYXRpb25XZWJWaWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3 IiwgIm5vdGlmaWNhdGlvbiIsIHRlc3RXZWJWaWV3Tm90aWZpY2F0aW9uKTsKICAgICBJc1BsYXlp bmdBdWRpb1dlYlZpZXdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiaXMtcGxheWluZy1hdWRp byIsIHRlc3RXZWJWaWV3SXNQbGF5aW5nQXVkaW8pOwogICAgIFdlYlZpZXdUZXN0OjphZGQoIldl YktpdFdlYlZpZXciLCAiYmFja2dyb3VuZC1jb2xvciIsIHRlc3RXZWJWaWV3QmFja2dyb3VuZENv bG9yKTsKKyAgICBXZWJWaWV3VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3IiwgInByZWZlcnJlZC1z aXplIiwgdGVzdFdlYlZpZXdQcmVmZXJyZWRTaXplKTsKIH0KIAogdm9pZCBhZnRlckFsbCgpCg==