62794 2011-06-16 05:55:57 -0700 [GTK] Remove support for GTK+2 in WebKit2 2011-06-26 23:22:45 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gyuyoung.kim mrobinson xan.lopez oldest_to_newest 421921 0 cgarcia 2011-06-16 05:55:57 -0700 Make WebKit2 require GTK+ 3.x unconditionally. 421923 1 97440 cgarcia 2011-06-16 05:58:15 -0700 Created attachment 97440 Patch 421933 2 97440 xan.lopez 2011-06-16 07:06:02 -0700 Comment on attachment 97440 Patch r=me 421972 3 cgarcia 2011-06-16 08:40:11 -0700 Committed r89028: <http://trac.webkit.org/changeset/89028> 426763 4 gyuyoung.kim 2011-06-24 00:14:51 -0700 (In reply to comment #0) > Make WebKit2 require GTK+ 3.x unconditionally. Hello Carlos and Xan, I have an ignorant question. I wonder why WebKit2 GTK port requires GTK3 unconditionally. 426872 5 mrobinson 2011-06-24 07:08:02 -0700 (In reply to comment #4) > (In reply to comment #0) > > Make WebKit2 require GTK+ 3.x unconditionally. > > I have an ignorant question. I wonder why WebKit2 GTK port requires GTK3 unconditionally. Our reasoning was that by the time that we are ready to release WebKit2 in a stable branch, all Linux distributions will be shipping GTK+ 3.x as the default GTK+ version. Is it important to you to maintain GTK+ 2.x support for WebKit2? 427608 6 gyuyoung.kim 2011-06-26 18:59:44 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #0) > > > Make WebKit2 require GTK+ 3.x unconditionally. > > > > I have an ignorant question. I wonder why WebKit2 GTK port requires GTK3 unconditionally. > > Our reasoning was that by the time that we are ready to release WebKit2 in a stable branch, all Linux distributions will be shipping GTK+ 3.x as the default GTK+ version. Is it important to you to maintain GTK+ 2.x support for WebKit2? Hello Martin, Long time no see. :-) I heard that flash 10.x version only supports GTK2 ver. So, my coworkers who focus on WebKit GTK wanna support GTK2 on WebKit2's GTK port for now. 427671 7 cgarcia 2011-06-26 23:22:45 -0700 (In reply to comment #6) > (In reply to comment #5) > > (In reply to comment #4) > > > (In reply to comment #0) > > > > Make WebKit2 require GTK+ 3.x unconditionally. > > > > > > I have an ignorant question. I wonder why WebKit2 GTK port requires GTK3 unconditionally. > > > > Our reasoning was that by the time that we are ready to release WebKit2 in a stable branch, all Linux distributions will be shipping GTK+ 3.x as the default GTK+ version. Is it important to you to maintain GTK+ 2.x support for WebKit2? > > Hello Martin, > > Long time no see. :-) I heard that flash 10.x version only supports GTK2 ver. So, my coworkers who focus on WebKit GTK wanna support GTK2 on WebKit2's GTK port for now. The plugin process will use GTK2 unconditionally because of this reason. See bug #60546. 97440 2011-06-16 05:58:15 -0700 2011-06-16 07:06:01 -0700 Patch wk2-gtk3-only.diff text/plain 9119 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAwN2NjNWNhLi5hYjI3Y2Nm IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDYtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFJl bW92ZSBzdXBwb3J0IGZvciBHVEsrMiBpbiBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Mjc5NAorCisgICAgICAgICogY29uZmlndXJlLmFj OiBNYWtlIFdlYktpdDIgcmVxdWlyZSBHVEsrIDMueC4KKwogMjAxMS0wNi0xNSAgUnl1YW4gQ2hv aSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkg RXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGFlMWY1Mi4uM2Q4OWEwMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIxIEBACisyMDExLTA2LTE2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbR1RLXSBSZW1vdmUgc3VwcG9ydCBmb3IgR1RLKzIgaW4gV2ViS2l0MgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI3OTQKKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdl YmtpdFdlYlZpZXdCYXNlUmVhbGl6ZSk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZURyYXcp OgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VRdWVyeVRvb2x0aXApOgorICAgICAgICAod2Vi a2l0X3dlYl92aWV3X2Jhc2VfY2xhc3NfaW5pdCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFz ZVNldFRvb2x0aXBUZXh0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51 UHJveHlHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjpt ZW51UG9zaXRpb25GdW5jdGlvbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHA6CisgICAgICAgIChXZWJLaXQ6Om1vZHVsZU1p eGVzR3RrU3ltYm9scyk6CisKIDIwMTEtMDYtMTUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRl eCBiNzczZTcwLi40M2ViYTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCkBAIC03NSw5ICs3NSw2IEBAIHN0YXRp YyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKICAgICBh dHRyaWJ1dGVzLmhlaWdodCA9IGFsbG9jYXRpb24uaGVpZ2h0OwogICAgIGF0dHJpYnV0ZXMud2Ns YXNzID0gR0RLX0lOUFVUX09VVFBVVDsKICAgICBhdHRyaWJ1dGVzLnZpc3VhbCA9IGd0a193aWRn ZXRfZ2V0X3Zpc3VhbCh3aWRnZXQpOwotI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCi0gICAgYXR0 cmlidXRlcy5jb2xvcm1hcCA9IGd0a193aWRnZXRfZ2V0X2NvbG9ybWFwKHdpZGdldCk7Ci0jZW5k aWYKICAgICBhdHRyaWJ1dGVzLmV2ZW50X21hc2sgPSBHREtfVklTSUJJTElUWV9OT1RJRllfTUFT SwogICAgICAgICB8IEdES19FWFBPU1VSRV9NQVNLCiAgICAgICAgIHwgR0RLX0JVVFRPTl9QUkVT U19NQVNLCkBAIC05MSwyMyArODgsMTIgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VS ZWFsaXplKEd0a1dpZGdldCogd2lkZ2V0KQogICAgICAgICB8IEdES19CVVRUT04zX01PVElPTl9N QVNLOwogCiAgICAgZ2ludCBhdHRyaWJ1dGVzTWFzayA9IEdES19XQV9YIHwgR0RLX1dBX1kgfCBH REtfV0FfVklTVUFMOwotI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCi0gICAgYXR0cmlidXRlc01h c2sgfD0gR0RLX1dBX0NPTE9STUFQOwotI2VuZGlmCisKICAgICBHZGtXaW5kb3cqIHdpbmRvdyA9 IGdka193aW5kb3dfbmV3KGd0a193aWRnZXRfZ2V0X3BhcmVudF93aW5kb3cod2lkZ2V0KSwgJmF0 dHJpYnV0ZXMsIGF0dHJpYnV0ZXNNYXNrKTsKICAgICBndGtfd2lkZ2V0X3NldF93aW5kb3cod2lk Z2V0LCB3aW5kb3cpOwogICAgIGdka193aW5kb3dfc2V0X3VzZXJfZGF0YSh3aW5kb3csIHdpZGdl dCk7CiAKLSNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIs IDIwLCAwKQotICAgIGd0a193aWRnZXRfc3R5bGVfYXR0YWNoKHdpZGdldCk7Ci0jZWxzZQotICAg IHdpZGdldC0+c3R5bGUgPSBndGtfc3R5bGVfYXR0YWNoKGd0a193aWRnZXRfZ2V0X3N0eWxlKHdp ZGdldCksIHdpbmRvdyk7Ci0jZW5kaWYKLSAgICBndGtfc3R5bGVfc2V0X2JhY2tncm91bmQoZ3Rr X3dpZGdldF9nZXRfc3R5bGUod2lkZ2V0KSwgd2luZG93LCBHVEtfU1RBVEVfTk9STUFMKTsKLSNl bHNlCiAgICAgZ3RrX3N0eWxlX2NvbnRleHRfc2V0X2JhY2tncm91bmQoZ3RrX3dpZGdldF9nZXRf c3R5bGVfY29udGV4dCh3aWRnZXQpLCB3aW5kb3cpOwotI2VuZGlmCiAKICAgICBXZWJLaXRXZWJW aWV3QmFzZSogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CiAgICAgV2Vi S2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKQEAgLTE1MCwzNiAr MTM2LDIxIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19iYXNlX2luaXQoV2ViS2l0V2Vi Vmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlKQogICAgIHByaXYtPnBhZ2VDbGllbnQgPSBQYWdl Q2xpZW50SW1wbDo6Y3JlYXRlKEdUS19XSURHRVQod2Via2l0V2ViVmlld0Jhc2UpKTsKIH0KIAot c3RhdGljIHZvaWQgY2FsbERyYXdpbmdBcmVhUGFpbnRNZXRob2QoRHJhd2luZ0FyZWFQcm94eSog ZHJhd2luZ0FyZWEsIGNhaXJvX3QqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGFyZWEpCitzdGF0 aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld0Jhc2VEcmF3KEd0a1dpZGdldCogd2lkZ2V0LCBjYWly b190KiBjcikKIHsKKyAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSA9IFdFQktJVF9X RUJfVklFV19CQVNFKHdpZGdldCktPnByaXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKTsKICAg ICBpZiAoIWRyYXdpbmdBcmVhKQotICAgICAgICByZXR1cm47Ci0KLSAgICBXZWJLaXQ6OlJlZ2lv biB1bnBhaW50ZWRSZWdpb247IC8vIFRoaXMgaXMgc2ltcGx5IHVudXNlZC4KLSAgICBzdGF0aWNf Y2FzdDxEcmF3aW5nQXJlYVByb3h5SW1wbCo+KGRyYXdpbmdBcmVhKS0+cGFpbnQoY29udGV4dCwg YXJlYSwgdW5wYWludGVkUmVnaW9uKTsKLX0KLQotI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCi1z dGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld0Jhc2VFeHBvc2UoR3RrV2lkZ2V0KiB3aWRnZXQs IEdka0V2ZW50RXhwb3NlKiBldmVudCkKLXsKLSAgICBHZGtSZWN0YW5nbGUgY2xpcFJlY3Q7Ci0g ICAgZ2RrX3JlZ2lvbl9nZXRfY2xpcGJveChldmVudC0+cmVnaW9uLCAmY2xpcFJlY3QpOworICAg ICAgICByZXR1cm4gRkFMU0U7CiAKLSAgICBSZWZQdHI8Y2Fpcm9fdD4gY3IgPSBhZG9wdFJlZihn ZGtfY2Fpcm9fY3JlYXRlKGd0a193aWRnZXRfZ2V0X3dpbmRvdyh3aWRnZXQpKSk7Ci0gICAgY2Fs bERyYXdpbmdBcmVhUGFpbnRNZXRob2QoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2lkZ2V0KS0+cHJp di0+cGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLCBjci5nZXQoKSwgY2xpcFJlY3QpOwotICAgIHJl dHVybiBGQUxTRTsKLX0KLSNlbHNlCi1zdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld0Jhc2VE cmF3KEd0a1dpZGdldCogd2lkZ2V0LCBjYWlyb190KiBjcikKLXsKICAgICBHZGtSZWN0YW5nbGUg Y2xpcFJlY3Q7CiAgICAgaWYgKCFnZGtfY2Fpcm9fZ2V0X2NsaXBfcmVjdGFuZ2xlKGNyLCAmY2xp cFJlY3QpKQogICAgICAgICByZXR1cm4gRkFMU0U7CiAKLSAgICBjYWxsRHJhd2luZ0FyZWFQYWlu dE1ldGhvZChXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3aWRnZXQpLT5wcml2LT5wYWdlUHJveHktPmRy YXdpbmdBcmVhKCksIGNyLCBjbGlwUmVjdCk7CisgICAgV2ViS2l0OjpSZWdpb24gdW5wYWludGVk UmVnaW9uOyAvLyBUaGlzIGlzIHNpbXBseSB1bnVzZWQuCisgICAgc3RhdGljX2Nhc3Q8RHJhd2lu Z0FyZWFQcm94eUltcGwqPihkcmF3aW5nQXJlYSktPnBhaW50KGNyLCBjbGlwUmVjdCwgdW5wYWlu dGVkUmVnaW9uKTsKKwogICAgIHJldHVybiBGQUxTRTsKIH0KLSNlbmRpZgogCiBzdGF0aWMgdm9p ZCB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZShHdGtXaWRnZXQqIHdpZGdldCwgR3RrQWxs b2NhdGlvbiogYWxsb2NhdGlvbikKIHsKQEAgLTI5MCw3ICsyNjEsNiBAQCBzdGF0aWMgZ2Jvb2xl YW4gd2Via2l0V2ViVmlld0Jhc2VNb3Rpb25Ob3RpZnlFdmVudChHdGtXaWRnZXQqIHdpZGdldCwg R2RrRXZlbnRNbwogICAgIHJldHVybiBGQUxTRTsKIH0KIAotI2lmIEdUS19DSEVDS19WRVJTSU9O KDIsIDEyLCAwKQogc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlUXVlcnlUb29sdGlw KEd0a1dpZGdldCogd2lkZ2V0LCBnaW50IHgsIGdpbnQgeSwgZ2Jvb2xlYW4ga2V5Ym9hcmRNb2Rl LCBHdGtUb29sdGlwKiB0b29sdGlwKQogewogICAgIFdlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZSog cHJpdiA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCktPnByaXY7CkBAIC0zMDksMTcgKzI3 OSwxMiBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0V2ViVmlld0Jhc2VRdWVyeVRvb2x0aXAoR3Rr V2lkZ2V0KiB3aWRnZXQsIGdpbnQgeCwgZ2ludCB5LAogICAgIGd0a190b29sdGlwX3NldF90ZXh0 KHRvb2x0aXAsIHByaXYtPnRvb2x0aXBUZXh0LmRhdGEoKSk7CiAgICAgcmV0dXJuIFRSVUU7CiB9 Ci0jZW5kaWYKIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2Jhc2VfY2xhc3NfaW5pdChX ZWJLaXRXZWJWaWV3QmFzZUNsYXNzKiB3ZWJraXRXZWJWaWV3QmFzZUNsYXNzKQogewogICAgIEd0 a1dpZGdldENsYXNzKiB3aWRnZXRDbGFzcyA9IEdUS19XSURHRVRfQ0xBU1Mod2Via2l0V2ViVmll d0Jhc2VDbGFzcyk7CiAgICAgd2lkZ2V0Q2xhc3MtPnJlYWxpemUgPSB3ZWJraXRXZWJWaWV3QmFz ZVJlYWxpemU7Ci0jaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKLSAgICB3aWRnZXRDbGFzcy0+ZXhw b3NlX2V2ZW50ID0gd2Via2l0V2ViVmlld0Jhc2VFeHBvc2U7Ci0jZWxzZQogICAgIHdpZGdldENs YXNzLT5kcmF3ID0gd2Via2l0V2ViVmlld0Jhc2VEcmF3OwotI2VuZGlmCiAgICAgd2lkZ2V0Q2xh c3MtPnNpemVfYWxsb2NhdGUgPSB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0ZTsKICAgICB3 aWRnZXRDbGFzcy0+Zm9jdXNfaW5fZXZlbnQgPSB3ZWJraXRXZWJWaWV3QmFzZUZvY3VzSW5FdmVu dDsKICAgICB3aWRnZXRDbGFzcy0+Zm9jdXNfb3V0X2V2ZW50ID0gd2Via2l0V2ViVmlld0Jhc2VG b2N1c091dEV2ZW50OwpAQCAtMzI5LDkgKzI5NCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJf dmlld19iYXNlX2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0Jhc2VDbGFzcyogd2Via2l0V2ViVmll CiAgICAgd2lkZ2V0Q2xhc3MtPmJ1dHRvbl9yZWxlYXNlX2V2ZW50ID0gd2Via2l0V2ViVmlld0Jh c2VCdXR0b25SZWxlYXNlRXZlbnQ7CiAgICAgd2lkZ2V0Q2xhc3MtPnNjcm9sbF9ldmVudCA9IHdl YmtpdFdlYlZpZXdCYXNlU2Nyb2xsRXZlbnQ7CiAgICAgd2lkZ2V0Q2xhc3MtPm1vdGlvbl9ub3Rp ZnlfZXZlbnQgPSB3ZWJraXRXZWJWaWV3QmFzZU1vdGlvbk5vdGlmeUV2ZW50OwotI2lmIEdUS19D SEVDS19WRVJTSU9OKDIsIDEyLCAwKQogICAgIHdpZGdldENsYXNzLT5xdWVyeV90b29sdGlwID0g d2Via2l0V2ViVmlld0Jhc2VRdWVyeVRvb2x0aXA7Ci0jZW5kaWYKIAogICAgIEdPYmplY3RDbGFz cyogZ29iamVjdENsYXNzID0gR19PQkpFQ1RfQ0xBU1Mod2Via2l0V2ViVmlld0Jhc2VDbGFzcyk7 CiAgICAgZ29iamVjdENsYXNzLT5maW5hbGl6ZSA9IHdlYmtpdFdlYlZpZXdCYXNlRmluYWxpemU7 CkBAIC0zNjcsNyArMzMwLDYgQEAgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZUNyZWF0ZVdlYlBhZ2Uo V2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlLCBXS0NvbnQKIAogdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZVNldFRvb2x0aXBUZXh0KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFz ZSwgY29uc3QgY2hhciogdG9vbHRpcCkKIHsKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxMiwg MCkKICAgICBXZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUqIHByaXYgPSB3ZWJWaWV3QmFzZS0+cHJp djsKICAgICBpZiAodG9vbHRpcCAmJiB0b29sdGlwWzBdICE9ICdcMCcpIHsKICAgICAgICAgcHJp di0+dG9vbHRpcFRleHQgPSB0b29sdGlwOwpAQCAtMzc4LDExICszNDAsNiBAQCB2b2lkIHdlYmtp dFdlYlZpZXdCYXNlU2V0VG9vbHRpcFRleHQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNl LCBjb25zdCBjaGFyKgogICAgIH0KIAogICAgIGd0a193aWRnZXRfdHJpZ2dlcl90b29sdGlwX3F1 ZXJ5KEdUS19XSURHRVQod2ViVmlld0Jhc2UpKTsKLSNlbHNlCi0gICAgLy8gVE9ETzogU3VwcG9y dCBvbGRlciBHVEsrIHZlcnNpb25zCi0gICAgLy8gU2VlIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1NzkzCi0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSNlbmRpZgogfQog CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1l bnVQcm94eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRN ZW51UHJveHlHdGsuY3BwCmluZGV4IDBiMTQ0MzAuLjg1ZGRiMzcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcApA QCAtMTA1LDExICsxMDUsNyBAQCBXZWJDb250ZXh0TWVudVByb3h5R3RrOjp+V2ViQ29udGV4dE1l bnVQcm94eUd0aygpCiB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlHdGs6Om1lbnVQb3NpdGlvbkZ1 bmN0aW9uKEd0a01lbnUqIG1lbnUsIGdpbnQqIHgsIGdpbnQqIHksIGdib29sZWFuKiBwdXNoSW4s IFdlYkNvbnRleHRNZW51UHJveHlHdGsqIHBvcHVwTWVudSkKIHsKICAgICBHdGtSZXF1aXNpdGlv biBtZW51U2l6ZTsKLSNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgotICAgIGd0a193aWRnZXRfc2l6 ZV9yZXF1ZXN0KEdUS19XSURHRVQobWVudSksICZtZW51U2l6ZSk7Ci0jZWxzZQogICAgIGd0a193 aWRnZXRfZ2V0X3ByZWZlcnJlZF9zaXplKEdUS19XSURHRVQobWVudSksICZtZW51U2l6ZSwgMCk7 Ci0jZW5kaWYKIAogICAgIEdka1NjcmVlbiogc2NyZWVuID0gZ3RrX3dpZGdldF9nZXRfc2NyZWVu KHBvcHVwTWVudS0+bV93ZWJWaWV3KTsKICAgICAqeCA9IHBvcHVwTWVudS0+bV9wb3B1cFBvc2l0 aW9uLngoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHAKaW5kZXggNWZk ZGI3Zi4uMjJjMTc3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHAK QEAgLTEzNCwxMSArMTM0LDcgQEAgc3RhdGljIGlubGluZSBpbnQgeDExU2NyZWVuKCkKICNpZiBQ TEFURk9STShHVEspCiBzdGF0aWMgYm9vbCBtb2R1bGVNaXhlc0d0a1N5bWJvbHMoTW9kdWxlKiBt b2R1bGUpCiB7Ci0jaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKLSAgICByZXR1cm4gbW9kdWxlLT5m dW5jdGlvblBvaW50ZXI8Z3BvaW50ZXI+KCJndGtfYXBwbGljYXRpb25fZ2V0X3R5cGUiKTsKLSNl bHNlCiAgICAgcmV0dXJuIG1vZHVsZS0+ZnVuY3Rpb25Qb2ludGVyPGdwb2ludGVyPigiZ3RrX29i amVjdF9nZXRfdHlwZSIpOwotI2VuZGlmCiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvY29uZmln dXJlLmFjIGIvY29uZmlndXJlLmFjCmluZGV4IDQ3MjUwYWQuLmI1NWZiZWYgMTAwNjQ0Ci0tLSBh L2NvbmZpZ3VyZS5hYworKysgYi9jb25maWd1cmUuYWMKQEAgLTEwNjAsNiArMTA2MCwxMSBAQCBB Q19BUkdfRU5BQkxFKHdlYmtpdDIsCiAgICAgICAgICAgICAgICAgW2J1aWxkIHdlYmtpdDIgW2Rl ZmF1bHQ9bm9dXSksCiAgICAgICAgICAgICAgICAgW10sIFtlbmFibGVfd2Via2l0Mj0ibm8iXSkK IEFDX01TR19SRVNVTFQoWyRlbmFibGVfd2Via2l0Ml0pCitpZiB0ZXN0ICIkZW5hYmxlX3dlYmtp dDIiID0gInllcyI7IHRoZW4KKyAgIGlmIHRlc3QgIiRHVEtfQVBJX1ZFUlNJT04iID0gIjIuMCI7 IHRoZW4KKyAgICAgIEFDX01TR19FUlJPUihbV2ViS2l0MiByZXF1aXJlcyBHVEsrIDMueCwgdXNl IC0td2l0aC1ndGs9My4wXSkKKyAgIGZpCitmaQogCiAjIFBsdWdpbiBQcm9jZXNzCiBBQ19NU0df Q0hFQ0tJTkcoW3doZXRoZXIgdG8gYnVpbGQgcGx1Z2luIHByb2Nlc3MgZm9yIFdlYktpdDJdKQo=