48357 2010-10-26 11:56:13 -0700 [GTK] Add the GtkScrollablePolicy property to the webview 2010-10-29 04:26:59 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 alex webkit-unassigned gustavo mrobinson webkit.review.bot xan.lopez oldest_to_newest 299669 0 alex 2010-10-26 11:56:13 -0700 We have to add the GtkScrollablePolicy properties to the webView, it is now required for gtk3 gtkscrollable interfaces. 299672 1 mrobinson 2010-10-26 11:59:01 -0700 Is there more necessary than was added by this change? http://trac.webkit.org/changeset/70514 299695 2 alex 2010-10-26 12:14:43 -0700 (In reply to comment #1) > Is there more necessary than was added by this change? http://trac.webkit.org/changeset/70514 Yeah, apparently they added this new property to control when to start the scrolling. 299697 3 71925 alex 2010-10-26 12:16:39 -0700 Created attachment 71925 Proposed patch 299703 4 71925 mrobinson 2010-10-26 12:22:03 -0700 Comment on attachment 71925 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=71925&action=review Looks good, but I have a couple concerns. > WebKit/gtk/webkit/webkitprivate.h:161 > + guint hscroll_policy : 1; > + guint vscroll_policy : 1; > + I think I'd prefer these to be named horizontalScrollingPolicy and verticalScrollingPolicy. Why the use of bitfields here? I'm a little worried about such a rarely used feature causing issues with other compilers. Is it possible to make these of type GtkScrollablePolicy instead of guint? 300105 5 alex 2010-10-27 04:03:06 -0700 (In reply to comment #4) > (From update of attachment 71925 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71925&action=review > > Looks good, but I have a couple concerns. > > > WebKit/gtk/webkit/webkitprivate.h:161 > > + guint hscroll_policy : 1; > > + guint vscroll_policy : 1; > > + > > I think I'd prefer these to be named horizontalScrollingPolicy and verticalScrollingPolicy. Changed. > Why the use of bitfields here? I'm a little worried about such a rarely used feature causing issues with other compilers. Is it possible to make these of type GtkScrollablePolicy instead of guint? It is the usual way in gtk, it is basically how it is defined in all the other gtk widgest in the library so I assume it is safe enough for us. But yeah, I guess it is just about making smaller structs. I'm ok using the enum because we are not using the bitwise any other place. 300114 6 72004 alex 2010-10-27 04:40:58 -0700 Created attachment 72004 Proposed patch 300294 7 72004 mrobinson 2010-10-27 09:52:10 -0700 Comment on attachment 72004 Proposed patch Thanks! 300949 8 webkit.review.bot 2010-10-28 01:55:37 -0700 Attachment 72004 did not build on gtk: Build output: http://queues.webkit.org/results/4852063 301662 9 alex 2010-10-29 03:26:14 -0700 (In reply to comment #8) > Attachment 72004 [details] did not build on gtk: > Build output: http://queues.webkit.org/results/4852063 I have to add guards to the .h for gtk2, I'll add them and upload. 301683 10 alex 2010-10-29 04:26:59 -0700 Landed http://trac.webkit.org/changeset/70861 71925 2010-10-26 12:16:39 -0700 2010-10-27 04:40:58 -0700 Proposed patch scrollable_policy.patch text/plain 4613 alex ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZjRkNGIwOC4uNjBmNDU0YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0xMC0yNiAg QWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBBZGQgdGhlIEd0a1Njcm9sbGFi bGVQb2xpY3kgcHJvcGVydHkgdG8gdGhlIHdlYnZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzU3CisKKyAgICAgICAgQWRkZWQgdGhlIEd0a1Nj cm9sbGFibGVQb2xpY3kgcHJvcGVydGllcyB0byB0aGUgd2VidmlldyB3aWRnZXQsIGl0CisgICAg ICAgIGlzIG5vdyByZXF1aXJlZCBmb3IgR3RrU2Nyb2xsYWJsZSB3aWRnZXRzIGluIEdUSysgMy54 LgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHByaXZhdGUuaDoKKyAgICAgICAgKiB3ZWJraXQv d2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgIChzZXRIb3Jpem9udGFsU2Nyb2xsUG9saWN5KTog QWRkZWQuCisgICAgICAgIChzZXRWZXJ0aWNhbFNjcm9sbFBvbGljeSk6IEFkZGVkLgorICAgICAg ICAoZ2V0SG9yaXpvbnRhbFNjcm9sbFBvbGljeSk6IEFkZGVkLgorICAgICAgICAoZ2V0VmVydGlj YWxTY3JvbGxQb2xpY3kpOiBBZGRlZC4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfcHJv cGVydHkpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NldF9wcm9wZXJ0eSk6CisgICAgICAg ICh3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdCk6CisKIDIwMTAtMTAtMjYgIFhhbiBMb3BleiAg PHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNv bi4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaAppbmRleCA2MTZlZTZiLi4xZDdlYTBjIDEwMDY0 NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKKysrIGIvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCkBAIC0xNTQsNiArMTU0LDExIEBAIGV4dGVybiAiQyIg ewogICAgICAgICBQbGF0Zm9ybVJlZlB0cjxHdGtBZGp1c3RtZW50PiBob3Jpem9udGFsQWRqdXN0 bWVudDsKICAgICAgICAgUGxhdGZvcm1SZWZQdHI8R3RrQWRqdXN0bWVudD4gdmVydGljYWxBZGp1 c3RtZW50OwogCisgICAgICAgIC8vIEd0a1Njcm9sbGFibGVQb2xpY3kgbmVlZHMgdG8gYmUgY2hl Y2tlZCB3aGVuCisgICAgICAgIC8vIGRyaXZpbmcgdGhlIHNjcm9sbGFibGUgYWRqdXN0bWVudCB2 YWx1ZXMKKyAgICAgICAgZ3VpbnQgaHNjcm9sbF9wb2xpY3kgOiAxOworICAgICAgICBndWludCB2 c2Nyb2xsX3BvbGljeSA6IDE7CisKICAgICAgICAgZ2Jvb2xlYW4gem9vbUZ1bGxDb250ZW50Owog ICAgICAgICBXZWJLaXRMb2FkU3RhdHVzIGxvYWRTdGF0dXM7CiAgICAgICAgIENTdHJpbmcgZW5j b2Rpbmc7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBi L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDk3NGI1M2YuLjhlNjkw ZGYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBi L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0yMDEsNyArMjAxLDkgQEAg ZW51bSB7CiAjZWxzZQogICAgIFBST1BfVklFV19NT0RFLAogICAgIFBST1BfSEFESlVTVE1FTlQs Ci0gICAgUFJPUF9WQURKVVNUTUVOVAorICAgIFBST1BfVkFESlVTVE1FTlQsCisgICAgUFJPUF9I U0NST0xMX1BPTElDWSwKKyAgICBQUk9QX1ZTQ1JPTExfUE9MSUNZCiAjZW5kaWYKIH07CiAKQEAg LTQzMCw2ICs0MzIsMjkgQEAgc3RhdGljIEd0a0FkanVzdG1lbnQqIGdldFZlcnRpY2FsQWRqdXN0 bWVudChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewogICAgIHJldHVybiB3ZWJWaWV3LT5wcml2 LT52ZXJ0aWNhbEFkanVzdG1lbnQuZ2V0KCk7CiB9CisKK3N0YXRpYyB2b2lkIHNldEhvcml6b250 YWxTY3JvbGxQb2xpY3koV2ViS2l0V2ViVmlldyogd2ViVmlldywgR3RrU2Nyb2xsYWJsZVBvbGlj eSBwb2xpY3kpCit7CisgICAgd2ViVmlldy0+cHJpdi0+aHNjcm9sbF9wb2xpY3kgPSBwb2xpY3k7 CisgICAgZ3RrX3dpZGdldF9xdWV1ZV9yZXNpemUoR1RLX1dJREdFVCh3ZWJWaWV3KSk7Cit9CisK K3N0YXRpYyB2b2lkIHNldFZlcnRpY2FsU2Nyb2xsUG9saWN5KFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcsIEd0a1Njcm9sbGFibGVQb2xpY3kgcG9saWN5KQoreworICAgIHdlYlZpZXctPnByaXYtPnZz Y3JvbGxfcG9saWN5ID0gcG9saWN5OworICAgIGd0a193aWRnZXRfcXVldWVfcmVzaXplKEdUS19X SURHRVQod2ViVmlldykpOworfQorCitzdGF0aWMgR3RrU2Nyb2xsYWJsZVBvbGljeSBnZXRIb3Jp em9udGFsU2Nyb2xsUG9saWN5KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgcmV0dXJu IHN0YXRpY19jYXN0PEd0a1Njcm9sbGFibGVQb2xpY3k+KHdlYlZpZXctPnByaXYtPmhzY3JvbGxf cG9saWN5KTsKK30KKworc3RhdGljIEd0a1Njcm9sbGFibGVQb2xpY3kgZ2V0VmVydGljYWxTY3Jv bGxQb2xpY3koV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8R3RrU2Nyb2xsYWJsZVBvbGljeT4od2ViVmlldy0+cHJpdi0+dnNjcm9sbF9wb2xpY3kpOwor fQorCiAjZW5kaWYKIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2dldF9wcm9wZXJ0eShH T2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQsIEdWYWx1ZSogdmFsdWUsIEdQYXJhbVNwZWMq IHBzcGVjKQpAQCAtNDk4LDYgKzUyMywxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf Z2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcF9pZCwgR1ZhbHVlKgogICAg IGNhc2UgUFJPUF9WQURKVVNUTUVOVDoKICAgICAgICAgZ192YWx1ZV9zZXRfb2JqZWN0KHZhbHVl LCBnZXRWZXJ0aWNhbEFkanVzdG1lbnQod2ViVmlldykpOwogICAgICAgICBicmVhazsKKyAgICBj YXNlIFBST1BfSFNDUk9MTF9QT0xJQ1k6CisgICAgICAgIGdfdmFsdWVfc2V0X2VudW0odmFsdWUs IGdldEhvcml6b250YWxTY3JvbGxQb2xpY3kod2ViVmlldykpOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIFBST1BfVlNDUk9MTF9QT0xJQ1k6CisgICAgICAgIGdfdmFsdWVfc2V0X2VudW0odmFs dWUsIGdldFZlcnRpY2FsU2Nyb2xsUG9saWN5KHdlYlZpZXcpKTsKKyAgICAgICAgYnJlYWs7CiAj ZW5kaWYKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURfUFJPUEVS VFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CkBAIC01NDAsNiArNTcxLDEyIEBAIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXRfcHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWlu dCBwcm9wX2lkLCBjb25zdCBHCiAgICAgY2FzZSBQUk9QX1ZBREpVU1RNRU5UOgogICAgICAgICBz ZXRWZXJ0aWNhbEFkanVzdG1lbnQod2ViVmlldywgc3RhdGljX2Nhc3Q8R3RrQWRqdXN0bWVudCo+ KGdfdmFsdWVfZ2V0X29iamVjdCh2YWx1ZSkpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQ Uk9QX0hTQ1JPTExfUE9MSUNZOgorICAgICAgICBzZXRIb3Jpem9udGFsU2Nyb2xsUG9saWN5KHdl YlZpZXcsIHN0YXRpY19jYXN0PEd0a1Njcm9sbGFibGVQb2xpY3k+KGdfdmFsdWVfZ2V0X2VudW0o dmFsdWUpKSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9WU0NST0xMX1BPTElDWToK KyAgICAgICAgc2V0VmVydGljYWxTY3JvbGxQb2xpY3kod2ViVmlldywgc3RhdGljX2Nhc3Q8R3Rr U2Nyb2xsYWJsZVBvbGljeT4oZ192YWx1ZV9nZXRfZW51bSh2YWx1ZSkpKTsKKyAgICAgICAgYnJl YWs7CiAjZW5kaWYKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURf UFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wX2lkLCBwc3BlYyk7CkBAIC0yNjAzLDYgKzI2NDAsOCBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xh c3MqIHdlYlZpZXdDbGFzcykKICNlbHNlCiAgICAgZ19vYmplY3RfY2xhc3Nfb3ZlcnJpZGVfcHJv cGVydHkob2JqZWN0Q2xhc3MsIFBST1BfSEFESlVTVE1FTlQsICJoYWRqdXN0bWVudCIpOwogICAg IGdfb2JqZWN0X2NsYXNzX292ZXJyaWRlX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9QX1ZBREpV U1RNRU5ULCAidmFkanVzdG1lbnQiKTsKKyAgICBnX29iamVjdF9jbGFzc19vdmVycmlkZV9wcm9w ZXJ0eShvYmplY3RDbGFzcywgUFJPUF9IU0NST0xMX1BPTElDWSwgImhzY3JvbGwtcG9saWN5Iik7 CisgICAgZ19vYmplY3RfY2xhc3Nfb3ZlcnJpZGVfcHJvcGVydHkob2JqZWN0Q2xhc3MsIFBST1Bf VlNDUk9MTF9QT0xJQ1ksICJ2c2Nyb2xsLXBvbGljeSIpOwogI2VuZGlmCiAKICAgICAvKgo= 72004 2010-10-27 04:40:58 -0700 2010-10-27 09:52:09 -0700 Proposed patch scrollable_policy.patch text/plain 4626 alex ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggYmZiOTcwYy4uN2UwMzk3ZSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0xMC0yNiAg QWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBBZGQgdGhlIEd0a1Njcm9sbGFi bGVQb2xpY3kgcHJvcGVydHkgdG8gdGhlIHdlYnZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzU3CisKKyAgICAgICAgQWRkZWQgdGhlIEd0a1Nj cm9sbGFibGVQb2xpY3kgcHJvcGVydGllcyB0byB0aGUgd2VidmlldyB3aWRnZXQsIGl0CisgICAg ICAgIGlzIG5vdyByZXF1aXJlZCBmb3IgR3RrU2Nyb2xsYWJsZSB3aWRnZXRzIGluIEdUSysgMy54 LgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHByaXZhdGUuaDoKKyAgICAgICAgKiB3ZWJraXQv d2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgIChzZXRIb3Jpem9udGFsU2Nyb2xsUG9saWN5KTog QWRkZWQuCisgICAgICAgIChzZXRWZXJ0aWNhbFNjcm9sbFBvbGljeSk6IEFkZGVkLgorICAgICAg ICAoZ2V0SG9yaXpvbnRhbFNjcm9sbFBvbGljeSk6IEFkZGVkLgorICAgICAgICAoZ2V0VmVydGlj YWxTY3JvbGxQb2xpY3kpOiBBZGRlZC4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfcHJv cGVydHkpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NldF9wcm9wZXJ0eSk6CisgICAgICAg ICh3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdCk6CisKIDIwMTAtMTAtMjYgIEFudG9uaW8gR29t ZXMgIDxhZ29tZXNAcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5z b24uCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmggYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmgKaW5kZXggNjE2ZWU2Yi4uYzdmNDlhZiAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5oCisrKyBiL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHByaXZhdGUuaApAQCAtMTU0LDYgKzE1NCwxMSBAQCBleHRlcm4gIkMi IHsKICAgICAgICAgUGxhdGZvcm1SZWZQdHI8R3RrQWRqdXN0bWVudD4gaG9yaXpvbnRhbEFkanVz dG1lbnQ7CiAgICAgICAgIFBsYXRmb3JtUmVmUHRyPEd0a0FkanVzdG1lbnQ+IHZlcnRpY2FsQWRq dXN0bWVudDsKIAorICAgICAgICAvLyBHdGtTY3JvbGxhYmxlUG9saWN5IG5lZWRzIHRvIGJlIGNo ZWNrZWQgd2hlbgorICAgICAgICAvLyBkcml2aW5nIHRoZSBzY3JvbGxhYmxlIGFkanVzdG1lbnQg dmFsdWVzCisgICAgICAgIEd0a1Njcm9sbGFibGVQb2xpY3kgaG9yaXpvbnRhbFNjcm9sbGluZ1Bv bGljeTsKKyAgICAgICAgR3RrU2Nyb2xsYWJsZVBvbGljeSB2ZXJ0aWNhbFNjcm9sbGluZ1BvbGlj eTsKKwogICAgICAgICBnYm9vbGVhbiB6b29tRnVsbENvbnRlbnQ7CiAgICAgICAgIFdlYktpdExv YWRTdGF0dXMgbG9hZFN0YXR1czsKICAgICAgICAgQ1N0cmluZyBlbmNvZGluZzsKZGlmZiAtLWdp dCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggOTc0YjUzZi4uZTEyZjdmZiAxMDA2NDQKLS0tIGEv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTIwMSw3ICsyMDEsOSBAQCBlbnVtIHsKICNlbHNlCiAg ICAgUFJPUF9WSUVXX01PREUsCiAgICAgUFJPUF9IQURKVVNUTUVOVCwKLSAgICBQUk9QX1ZBREpV U1RNRU5UCisgICAgUFJPUF9WQURKVVNUTUVOVCwKKyAgICBQUk9QX0hTQ1JPTExfUE9MSUNZLAor ICAgIFBST1BfVlNDUk9MTF9QT0xJQ1kKICNlbmRpZgogfTsKIApAQCAtNDMwLDYgKzQzMiwyOSBA QCBzdGF0aWMgR3RrQWRqdXN0bWVudCogZ2V0VmVydGljYWxBZGp1c3RtZW50KFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcpCiB7CiAgICAgcmV0dXJuIHdlYlZpZXctPnByaXYtPnZlcnRpY2FsQWRqdXN0 bWVudC5nZXQoKTsKIH0KKworc3RhdGljIHZvaWQgc2V0SG9yaXpvbnRhbFNjcm9sbFBvbGljeShX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHdGtTY3JvbGxhYmxlUG9saWN5IHBvbGljeSkKK3sKKyAg ICB3ZWJWaWV3LT5wcml2LT5ob3Jpem9udGFsU2Nyb2xsaW5nUG9saWN5ID0gcG9saWN5OworICAg IGd0a193aWRnZXRfcXVldWVfcmVzaXplKEdUS19XSURHRVQod2ViVmlldykpOworfQorCitzdGF0 aWMgdm9pZCBzZXRWZXJ0aWNhbFNjcm9sbFBvbGljeShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBH dGtTY3JvbGxhYmxlUG9saWN5IHBvbGljeSkKK3sKKyAgICB3ZWJWaWV3LT5wcml2LT52ZXJ0aWNh bFNjcm9sbGluZ1BvbGljeSA9IHBvbGljeTsKKyAgICBndGtfd2lkZ2V0X3F1ZXVlX3Jlc2l6ZShH VEtfV0lER0VUKHdlYlZpZXcpKTsKK30KKworc3RhdGljIEd0a1Njcm9sbGFibGVQb2xpY3kgZ2V0 SG9yaXpvbnRhbFNjcm9sbFBvbGljeShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIHJl dHVybiB3ZWJWaWV3LT5wcml2LT5ob3Jpem9udGFsU2Nyb2xsaW5nUG9saWN5OworfQorCitzdGF0 aWMgR3RrU2Nyb2xsYWJsZVBvbGljeSBnZXRWZXJ0aWNhbFNjcm9sbFBvbGljeShXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3KQoreworICAgIHJldHVybiB3ZWJWaWV3LT5wcml2LT52ZXJ0aWNhbFNjcm9s bGluZ1BvbGljeTsKK30KKwogI2VuZGlmCiAKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19n ZXRfcHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBHVmFsdWUqIHZhbHVl LCBHUGFyYW1TcGVjKiBwc3BlYykKQEAgLTQ5OCw2ICs1MjMsMTIgQEAgc3RhdGljIHZvaWQgd2Vi a2l0X3dlYl92aWV3X2dldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BfaWQs IEdWYWx1ZSoKICAgICBjYXNlIFBST1BfVkFESlVTVE1FTlQ6CiAgICAgICAgIGdfdmFsdWVfc2V0 X29iamVjdCh2YWx1ZSwgZ2V0VmVydGljYWxBZGp1c3RtZW50KHdlYlZpZXcpKTsKICAgICAgICAg YnJlYWs7CisgICAgY2FzZSBQUk9QX0hTQ1JPTExfUE9MSUNZOgorICAgICAgICBnX3ZhbHVlX3Nl dF9lbnVtKHZhbHVlLCBnZXRIb3Jpem9udGFsU2Nyb2xsUG9saWN5KHdlYlZpZXcpKTsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX1ZTQ1JPTExfUE9MSUNZOgorICAgICAgICBnX3ZhbHVl X3NldF9lbnVtKHZhbHVlLCBnZXRWZXJ0aWNhbFNjcm9sbFBvbGljeSh3ZWJWaWV3KSk7CisgICAg ICAgIGJyZWFrOwogI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9J TlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcF9pZCwgcHNwZWMpOwpAQCAtNTQwLDYgKzU3 MSwxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X3Byb3BlcnR5KEdPYmplY3Qq IG9iamVjdCwgZ3VpbnQgcHJvcF9pZCwgY29uc3QgRwogICAgIGNhc2UgUFJPUF9WQURKVVNUTUVO VDoKICAgICAgICAgc2V0VmVydGljYWxBZGp1c3RtZW50KHdlYlZpZXcsIHN0YXRpY19jYXN0PEd0 a0FkanVzdG1lbnQqPihnX3ZhbHVlX2dldF9vYmplY3QodmFsdWUpKSk7CiAgICAgICAgIGJyZWFr OworICAgIGNhc2UgUFJPUF9IU0NST0xMX1BPTElDWToKKyAgICAgICAgc2V0SG9yaXpvbnRhbFNj cm9sbFBvbGljeSh3ZWJWaWV3LCBzdGF0aWNfY2FzdDxHdGtTY3JvbGxhYmxlUG9saWN5PihnX3Zh bHVlX2dldF9lbnVtKHZhbHVlKSkpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfVlND Uk9MTF9QT0xJQ1k6CisgICAgICAgIHNldFZlcnRpY2FsU2Nyb2xsUG9saWN5KHdlYlZpZXcsIHN0 YXRpY19jYXN0PEd0a1Njcm9sbGFibGVQb2xpY3k+KGdfdmFsdWVfZ2V0X2VudW0odmFsdWUpKSk7 CisgICAgICAgIGJyZWFrOwogI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1Rf V0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcF9pZCwgcHNwZWMpOwpAQCAtMjYw Myw2ICsyNjQwLDggQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2Vi S2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3Q2xhc3MpCiAjZWxzZQogICAgIGdfb2JqZWN0X2NsYXNz X292ZXJyaWRlX3Byb3BlcnR5KG9iamVjdENsYXNzLCBQUk9QX0hBREpVU1RNRU5ULCAiaGFkanVz dG1lbnQiKTsKICAgICBnX29iamVjdF9jbGFzc19vdmVycmlkZV9wcm9wZXJ0eShvYmplY3RDbGFz cywgUFJPUF9WQURKVVNUTUVOVCwgInZhZGp1c3RtZW50Iik7CisgICAgZ19vYmplY3RfY2xhc3Nf b3ZlcnJpZGVfcHJvcGVydHkob2JqZWN0Q2xhc3MsIFBST1BfSFNDUk9MTF9QT0xJQ1ksICJoc2Ny b2xsLXBvbGljeSIpOworICAgIGdfb2JqZWN0X2NsYXNzX292ZXJyaWRlX3Byb3BlcnR5KG9iamVj dENsYXNzLCBQUk9QX1ZTQ1JPTExfUE9MSUNZLCAidnNjcm9sbC1wb2xpY3kiKTsKICNlbmRpZgog CiAgICAgLyoK