50542 2010-12-05 11:46:25 -0800 [GTK] Fix GtkLauncher.c style, use webkit style 2010-12-06 07:51:06 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 alex webkit-unassigned mrobinson xan.lopez oldest_to_newest 317399 0 alex 2010-12-05 11:46:25 -0800 Use webkit style for GtkLauncher to avoid style warnings. 317406 1 75638 alex 2010-12-05 12:20:13 -0800 Created attachment 75638 Proposed patch 317417 2 75638 mrobinson 2010-12-05 15:44:50 -0800 Comment on attachment 75638 Proposed patch Thanks! 317621 3 alex 2010-12-06 07:51:06 -0800 landed http://trac.webkit.org/changeset/73367 75638 2010-12-05 12:20:13 -0800 2010-12-05 15:44:50 -0800 Proposed patch gtk_launcher_style.patch text/plain 15817 alex ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2NTNiMzBlLi4zNDMzZWJjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEgQEAKIDIwMTAtMTIt MDUgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CiAKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gRml4IEd0a0xhdW5jaGVy LmMgc3R5bGUsIHVzZSB3ZWJraXQgc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUwNTQyCisKKyAgICAgICAgKiBHdGtMYXVuY2hlci9tYWluLmM6 CisgICAgICAgIChhY3RpdmF0ZVVyaUVudHJ5Q2IpOgorICAgICAgICAodXBkYXRlVGl0bGUpOgor ICAgICAgICAobGlua0hvdmVyQ2IpOgorICAgICAgICAobm90aWZ5VGl0bGVDYik6CisgICAgICAg IChub3RpZnlMb2FkU3RhdHVzQ2IpOgorICAgICAgICAobm90aWZ5UHJvZ3Jlc3NDYik6CisgICAg ICAgIChkZXN0cm95Q2IpOgorICAgICAgICAoZ29CYWNrQ2IpOgorICAgICAgICAoZ29Gb3J3YXJk Q2IpOgorICAgICAgICAoY3JlYXRlX3dlYlZpZXdDYik6CisgICAgICAgICh3ZWJWaWV3UmVhZHlD Yik6CisgICAgICAgIChjbG9zZVdlYlZpZXdDYik6CisgICAgICAgIChjcmVhdGVCcm93c2VyKToK KyAgICAgICAgKGNyZWF0ZVN0YXR1c2Jhcik6CisgICAgICAgIChjcmVhdGVUb29sYmFyKToKKyAg ICAgICAgKGNyZWF0ZVdpbmRvdyk6CisgICAgICAgIChtYWluKToKKworMjAxMC0xMi0wNSAgQWxl amFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBi eSBYYW4gTG9wZXouCiAKICAgICAgICAgW0dUS10gRml4IGNvbXBpbGF0aW9uIHdhcm5pbmdzIHJl cG9ydGVkIGJ5IGNsYW5nCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWlu LmMgYi9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKaW5kZXggZjc5NjUwZC4uYTFiYWYw NSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCisrKyBiL1dlYktp dFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYwpAQCAtMjcsMjA4ICsyNywxOTMgQEAKICNpbmNsdWRl IDxndGsvZ3RrLmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtpdC5oPgogCi1zdGF0aWMgZ2ludCB3 aW5kb3dfY291bnQgPSAwOworc3RhdGljIGdpbnQgd2luZG93Q291bnQgPSAwOwogCi1zdGF0aWMg R3RrV2lkZ2V0KiBjcmVhdGVfd2luZG93IChXZWJLaXRXZWJWaWV3Kiogb3V0X3dlYl92aWV3KTsK K3N0YXRpYyBHdGtXaWRnZXQqIGNyZWF0ZVdpbmRvdyhXZWJLaXRXZWJWaWV3Kiogb3V0V2ViVmll dyk7CiAKLXN0YXRpYyB2b2lkCi1hY3RpdmF0ZV91cmlfZW50cnlfY2IgKEd0a1dpZGdldCogZW50 cnksIGdwb2ludGVyIGRhdGEpCitzdGF0aWMgdm9pZCBhY3RpdmF0ZVVyaUVudHJ5Q2IoR3RrV2lk Z2V0KiBlbnRyeSwgZ3BvaW50ZXIgZGF0YSkKIHsKLSAgICBXZWJLaXRXZWJWaWV3ICp3ZWJfdmll dyA9IGdfb2JqZWN0X2dldF9kYXRhIChHX09CSkVDVCAoZW50cnkpLCAid2ViLXZpZXciKTsKLSAg ICBjb25zdCBnY2hhciogdXJpID0gZ3RrX2VudHJ5X2dldF90ZXh0IChHVEtfRU5UUlkgKGVudHJ5 KSk7Ci0gICAgZ19hc3NlcnQgKHVyaSk7Ci0gICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpICh3 ZWJfdmlldywgdXJpKTsKKyAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3ID0gZ19vYmplY3RfZ2V0 X2RhdGEoR19PQkpFQ1QoZW50cnkpLCAid2ViLXZpZXciKTsKKyAgICBjb25zdCBnY2hhciogdXJp ID0gZ3RrX2VudHJ5X2dldF90ZXh0KEdUS19FTlRSWShlbnRyeSkpOworICAgIGdfYXNzZXJ0KHVy aSk7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKHdlYlZpZXcsIHVyaSk7CiB9CiAKLXN0 YXRpYyB2b2lkCi11cGRhdGVfdGl0bGUgKEd0a1dpbmRvdyogd2luZG93LCBXZWJLaXRXZWJWaWV3 KiB3ZWJfdmlldykKK3N0YXRpYyB2b2lkIHVwZGF0ZVRpdGxlKEd0a1dpbmRvdyogd2luZG93LCBX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIEdTdHJpbmcgKnN0cmluZyA9IGdfc3RyaW5n X25ldyAod2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3ZWJfdmlldykpOwotICAgIGdkb3VibGUg bG9hZF9wcm9ncmVzcyA9IHdlYmtpdF93ZWJfdmlld19nZXRfcHJvZ3Jlc3MgKHdlYl92aWV3KSAq IDEwMDsKLSAgICBnX3N0cmluZ19hcHBlbmQgKHN0cmluZywgIiAtIFdlYktpdCBMYXVuY2hlciIp OwotICAgIGlmIChsb2FkX3Byb2dyZXNzIDwgMTAwKQotICAgICAgICBnX3N0cmluZ19hcHBlbmRf cHJpbnRmIChzdHJpbmcsICIgKCVmJSUpIiwgbG9hZF9wcm9ncmVzcyk7Ci0gICAgZ2NoYXIqIHRp dGxlID0gZ19zdHJpbmdfZnJlZSAoc3RyaW5nLCBGQUxTRSk7Ci0gICAgZ3RrX3dpbmRvd19zZXRf dGl0bGUgKHdpbmRvdywgdGl0bGUpOwotICAgIGdfZnJlZSAodGl0bGUpOworICAgIEdTdHJpbmcg KnN0cmluZyA9IGdfc3RyaW5nX25ldyh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RpdGxlKHdlYlZpZXcp KTsKKyAgICBnZG91YmxlIGxvYWRQcm9ncmVzcyA9IHdlYmtpdF93ZWJfdmlld19nZXRfcHJvZ3Jl c3Mod2ViVmlldykgKiAxMDA7CisgICAgZ19zdHJpbmdfYXBwZW5kKHN0cmluZywgIiAtIFdlYktp dCBMYXVuY2hlciIpOworICAgIGlmIChsb2FkUHJvZ3Jlc3MgPCAxMDApCisgICAgICAgIGdfc3Ry aW5nX2FwcGVuZF9wcmludGYoc3RyaW5nLCAiICglZiUlKSIsIGxvYWRQcm9ncmVzcyk7CisgICAg Z2NoYXIgKnRpdGxlID0gZ19zdHJpbmdfZnJlZShzdHJpbmcsIEZBTFNFKTsKKyAgICBndGtfd2lu ZG93X3NldF90aXRsZSh3aW5kb3csIHRpdGxlKTsKKyAgICBnX2ZyZWUodGl0bGUpOwogfQogCi1z dGF0aWMgdm9pZAotbGlua19ob3Zlcl9jYiAoV2ViS2l0V2ViVmlldyogcGFnZSwgY29uc3QgZ2No YXIqIHRpdGxlLCBjb25zdCBnY2hhciogbGluaywgR3RrU3RhdHVzYmFyKiBzdGF0dXNiYXIpCitz dGF0aWMgdm9pZCBsaW5rSG92ZXJDYihXZWJLaXRXZWJWaWV3KiBwYWdlLCBjb25zdCBnY2hhciog dGl0bGUsIGNvbnN0IGdjaGFyKiBsaW5rLCBHdGtTdGF0dXNiYXIqIHN0YXR1c2JhcikKIHsKLSAg ICBndWludCBzdGF0dXNfY29udGV4dF9pZCA9Ci0gICAgICBHUE9JTlRFUl9UT19VSU5UIChnX29i amVjdF9nZXRfZGF0YSAoR19PQkpFQ1QgKHN0YXR1c2JhciksICJsaW5rLWhvdmVyLWNvbnRleHQi KSk7CisgICAgZ3VpbnQgc3RhdHVzQ29udGV4dElkID0KKyAgICAgIEdQT0lOVEVSX1RPX1VJTlQo Z19vYmplY3RfZ2V0X2RhdGEoR19PQkpFQ1Qoc3RhdHVzYmFyKSwgImxpbmstaG92ZXItY29udGV4 dCIpKTsKICAgICAvKiB1bmRlcmZsb3cgaXMgYWxsb3dlZCAqLwotICAgIGd0a19zdGF0dXNiYXJf cG9wIChzdGF0dXNiYXIsIHN0YXR1c19jb250ZXh0X2lkKTsKKyAgICBndGtfc3RhdHVzYmFyX3Bv cChzdGF0dXNiYXIsIHN0YXR1c0NvbnRleHRJZCk7CiAgICAgaWYgKGxpbmspCi0gICAgICAgIGd0 a19zdGF0dXNiYXJfcHVzaCAoc3RhdHVzYmFyLCBzdGF0dXNfY29udGV4dF9pZCwgbGluayk7Cisg ICAgICAgIGd0a19zdGF0dXNiYXJfcHVzaChzdGF0dXNiYXIsIHN0YXR1c0NvbnRleHRJZCwgbGlu ayk7CiB9CiAKLXN0YXRpYyB2b2lkCi1ub3RpZnlfdGl0bGVfY2IgKFdlYktpdFdlYlZpZXcqIHdl Yl92aWV3LCBHUGFyYW1TcGVjKiBwc3BlYywgR3RrV2lkZ2V0KiB3aW5kb3cpCitzdGF0aWMgdm9p ZCBub3RpZnlUaXRsZUNiKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIEdQYXJhbVNwZWMqIHBzcGVj LCBHdGtXaWRnZXQqIHdpbmRvdykKIHsKLSAgICB1cGRhdGVfdGl0bGUgKEdUS19XSU5ET1cgKHdp bmRvdyksIHdlYl92aWV3KTsKKyAgICB1cGRhdGVUaXRsZShHVEtfV0lORE9XKHdpbmRvdyksIHdl YlZpZXcpOwogfQogCi1zdGF0aWMgdm9pZAotbm90aWZ5X2xvYWRfc3RhdHVzX2NiIChXZWJLaXRX ZWJWaWV3KiB3ZWJfdmlldywgR1BhcmFtU3BlYyogcHNwZWMsIEd0a1dpZGdldCogdXJpX2VudHJ5 KQorc3RhdGljIHZvaWQgbm90aWZ5TG9hZFN0YXR1c0NiKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcs IEdQYXJhbVNwZWMqIHBzcGVjLCBHdGtXaWRnZXQqIHVyaUVudHJ5KQogewotICAgIGlmICh3ZWJr aXRfd2ViX3ZpZXdfZ2V0X2xvYWRfc3RhdHVzICh3ZWJfdmlldykgPT0gV0VCS0lUX0xPQURfQ09N TUlUVEVEKSB7Ci0gICAgICAgIFdlYktpdFdlYkZyYW1lKiBmcmFtZSA9IHdlYmtpdF93ZWJfdmll d19nZXRfbWFpbl9mcmFtZSAod2ViX3ZpZXcpOwotICAgICAgICBjb25zdCBnY2hhciogdXJpID0g d2Via2l0X3dlYl9mcmFtZV9nZXRfdXJpIChmcmFtZSk7CisgICAgaWYgKHdlYmtpdF93ZWJfdmll d19nZXRfbG9hZF9zdGF0dXMod2ViVmlldykgPT0gV0VCS0lUX0xPQURfQ09NTUlUVEVEKSB7Cisg ICAgICAgIFdlYktpdFdlYkZyYW1lICpmcmFtZSA9IHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9m cmFtZSh3ZWJWaWV3KTsKKyAgICAgICAgY29uc3QgZ2NoYXIgKnVyaSA9IHdlYmtpdF93ZWJfZnJh bWVfZ2V0X3VyaShmcmFtZSk7CiAgICAgICAgIGlmICh1cmkpCi0gICAgICAgICAgICBndGtfZW50 cnlfc2V0X3RleHQgKEdUS19FTlRSWSAodXJpX2VudHJ5KSwgdXJpKTsKKyAgICAgICAgICAgIGd0 a19lbnRyeV9zZXRfdGV4dChHVEtfRU5UUlkodXJpRW50cnkpLCB1cmkpOwogICAgIH0KIH0KIAot c3RhdGljIHZvaWQKLW5vdGlmeV9wcm9ncmVzc19jYiAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcs IEdQYXJhbVNwZWMqIHBzcGVjLCBHdGtXaWRnZXQqIHdpbmRvdykKK3N0YXRpYyB2b2lkIG5vdGlm eVByb2dyZXNzQ2IoV2ViS2l0V2ViVmlldyogd2ViVmlldywgR1BhcmFtU3BlYyogcHNwZWMsIEd0 a1dpZGdldCogd2luZG93KQogewotICAgIHVwZGF0ZV90aXRsZSAoR1RLX1dJTkRPVyAod2luZG93 KSwgd2ViX3ZpZXcpOworICAgIHVwZGF0ZVRpdGxlKEdUS19XSU5ET1cod2luZG93KSwgd2ViVmll dyk7CiB9CiAKLXN0YXRpYyB2b2lkCi1kZXN0cm95X2NiIChHdGtXaWRnZXQqIHdpZGdldCwgR3Rr V2lkZ2V0KiB3aW5kb3cpCitzdGF0aWMgdm9pZCBkZXN0cm95Q2IoR3RrV2lkZ2V0KiB3aWRnZXQs IEd0a1dpZGdldCogd2luZG93KQogewotICAgIGlmIChnX2F0b21pY19pbnRfZGVjX2FuZF90ZXN0 ICgmd2luZG93X2NvdW50KSkKLSAgICAgIGd0a19tYWluX3F1aXQgKCk7CisgICAgaWYgKGdfYXRv bWljX2ludF9kZWNfYW5kX3Rlc3QoJndpbmRvd0NvdW50KSkKKyAgICAgIGd0a19tYWluX3F1aXQo KTsKIH0KIAotc3RhdGljIHZvaWQKLWdvX2JhY2tfY2IgKEd0a1dpZGdldCogd2lkZ2V0LCAgV2Vi S2l0V2ViVmlldyogd2ViX3ZpZXcpCitzdGF0aWMgdm9pZCBnb0JhY2tDYihHdGtXaWRnZXQqIHdp ZGdldCwgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7Ci0gICAgd2Via2l0X3dlYl92aWV3X2dv X2JhY2sgKHdlYl92aWV3KTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfZ29fYmFjayh3ZWJWaWV3KTsK IH0KIAotc3RhdGljIHZvaWQKLWdvX2ZvcndhcmRfY2IgKEd0a1dpZGdldCogd2lkZ2V0LCBXZWJL aXRXZWJWaWV3KiB3ZWJfdmlldykKK3N0YXRpYyB2b2lkIGdvRm9yd2FyZENiKEd0a1dpZGdldCog d2lkZ2V0LCBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIHdlYmtpdF93ZWJfdmlld19n b19mb3J3YXJkICh3ZWJfdmlldyk7CisgICAgd2Via2l0X3dlYl92aWV3X2dvX2ZvcndhcmQod2Vi Vmlldyk7CiB9CiAKIHN0YXRpYyBXZWJLaXRXZWJWaWV3KgotY3JlYXRlX3dlYl92aWV3X2NiIChX ZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgV2ViS2l0V2ViRnJhbWUqIHdlYl9mcmFtZSwgR3RrV2lk Z2V0KiB3aW5kb3cpCitjcmVhdGVXZWJWaWV3Q2IoV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2Vi S2l0V2ViRnJhbWUqIHdlYl9mcmFtZSwgR3RrV2lkZ2V0KiB3aW5kb3cpCiB7Ci0gICAgV2ViS2l0 V2ViVmlldyAqbmV3X3dlYl92aWV3OwotICAgIGNyZWF0ZV93aW5kb3cgKCZuZXdfd2ViX3ZpZXcp OwotICAgIHJldHVybiBuZXdfd2ViX3ZpZXc7CisgICAgV2ViS2l0V2ViVmlldyAqbmV3V2ViVmll dzsKKyAgICBjcmVhdGVXaW5kb3coJm5ld1dlYlZpZXcpOworICAgIHJldHVybiBuZXdXZWJWaWV3 OwogfQogCi1zdGF0aWMgZ2Jvb2xlYW4KLXdlYl92aWV3X3JlYWR5X2NiIChXZWJLaXRXZWJWaWV3 KiB3ZWJfdmlldywgR3RrV2lkZ2V0KiB3aW5kb3cpCitzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld1Jl YWR5Q2IoV2ViS2l0V2ViVmlldyogd2ViVmlldywgR3RrV2lkZ2V0KiB3aW5kb3cpCiB7Ci0gICAg Z3RrX3dpZGdldF9ncmFiX2ZvY3VzIChHVEtfV0lER0VUICh3ZWJfdmlldykpOwotICAgIGd0a193 aWRnZXRfc2hvd19hbGwgKHdpbmRvdyk7CisgICAgZ3RrX3dpZGdldF9ncmFiX2ZvY3VzKEdUS19X SURHRVQod2ViVmlldykpOworICAgIGd0a193aWRnZXRfc2hvd19hbGwod2luZG93KTsKICAgICBy ZXR1cm4gRkFMU0U7CiB9CiAKLXN0YXRpYyBnYm9vbGVhbgotY2xvc2Vfd2ViX3ZpZXdfY2IgKFdl YktpdFdlYlZpZXcqIHdlYl92aWV3LCBHdGtXaWRnZXQqIHdpbmRvdykKK3N0YXRpYyBnYm9vbGVh biBjbG9zZVdlYlZpZXdDYihXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHdGtXaWRnZXQqIHdpbmRv dykKIHsKLSAgICBndGtfd2lkZ2V0X2Rlc3Ryb3kgKHdpbmRvdyk7CisgICAgZ3RrX3dpZGdldF9k ZXN0cm95KHdpbmRvdyk7CiAgICAgcmV0dXJuIFRSVUU7CiB9CiAKLXN0YXRpYyBHdGtXaWRnZXQq Ci1jcmVhdGVfYnJvd3NlciAoR3RrV2lkZ2V0KiB3aW5kb3csIEd0a1dpZGdldCogdXJpX2VudHJ5 LCBHdGtXaWRnZXQqIHN0YXR1c2JhciwgV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcpCitzdGF0aWMg R3RrV2lkZ2V0KiBjcmVhdGVCcm93c2VyKEd0a1dpZGdldCogd2luZG93LCBHdGtXaWRnZXQqIHVy aUVudHJ5LCBHdGtXaWRnZXQqIHN0YXR1c2JhciwgV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsK LSAgICBHdGtXaWRnZXQqIHNjcm9sbGVkX3dpbmRvdyA9IGd0a19zY3JvbGxlZF93aW5kb3dfbmV3 IChOVUxMLCBOVUxMKTsKLSAgICBndGtfc2Nyb2xsZWRfd2luZG93X3NldF9wb2xpY3kgKEdUS19T Q1JPTExFRF9XSU5ET1cgKHNjcm9sbGVkX3dpbmRvdyksIEdUS19QT0xJQ1lfQVVUT01BVElDLCBH VEtfUE9MSUNZX0FVVE9NQVRJQyk7CisgICAgR3RrV2lkZ2V0ICpzY3JvbGxlZFdpbmRvdyA9IGd0 a19zY3JvbGxlZF93aW5kb3dfbmV3KE5VTEwsIE5VTEwpOworICAgIGd0a19zY3JvbGxlZF93aW5k b3dfc2V0X3BvbGljeShHVEtfU0NST0xMRURfV0lORE9XKHNjcm9sbGVkV2luZG93KSwgR1RLX1BP TElDWV9BVVRPTUFUSUMsIEdUS19QT0xJQ1lfQVVUT01BVElDKTsKIAotICAgIGd0a19jb250YWlu ZXJfYWRkIChHVEtfQ09OVEFJTkVSIChzY3JvbGxlZF93aW5kb3cpLCBHVEtfV0lER0VUICh3ZWJf dmlldykpOworICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIoc2Nyb2xsZWRXaW5k b3cpLCBHVEtfV0lER0VUKHdlYlZpZXcpKTsKIAotICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHdlYl92 aWV3LCAibm90aWZ5Ojp0aXRsZSIsIEdfQ0FMTEJBQ0sgKG5vdGlmeV90aXRsZV9jYiksIHdpbmRv dyk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3ZpZXcsICJub3RpZnk6OmxvYWQtc3RhdHVz IiwgR19DQUxMQkFDSyAobm90aWZ5X2xvYWRfc3RhdHVzX2NiKSwgdXJpX2VudHJ5KTsKLSAgICBn X3NpZ25hbF9jb25uZWN0ICh3ZWJfdmlldywgIm5vdGlmeTo6cHJvZ3Jlc3MiLCBHX0NBTExCQUNL IChub3RpZnlfcHJvZ3Jlc3NfY2IpLCB3aW5kb3cpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHdl Yl92aWV3LCAiaG92ZXJpbmctb3Zlci1saW5rIiwgR19DQUxMQkFDSyAobGlua19ob3Zlcl9jYiks IHN0YXR1c2Jhcik7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3ZpZXcsICJjcmVhdGUtd2Vi LXZpZXciLCBHX0NBTExCQUNLIChjcmVhdGVfd2ViX3ZpZXdfY2IpLCB3aW5kb3cpOwotICAgIGdf c2lnbmFsX2Nvbm5lY3QgKHdlYl92aWV3LCAid2ViLXZpZXctcmVhZHkiLCBHX0NBTExCQUNLICh3 ZWJfdmlld19yZWFkeV9jYiksIHdpbmRvdyk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3Zp ZXcsICJjbG9zZS13ZWItdmlldyIsIEdfQ0FMTEJBQ0sgKGNsb3NlX3dlYl92aWV3X2NiKSwgd2lu ZG93KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHdlYlZpZXcsICJub3RpZnk6OnRpdGxlIiwgR19D QUxMQkFDSyhub3RpZnlUaXRsZUNiKSwgd2luZG93KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHdl YlZpZXcsICJub3RpZnk6OmxvYWQtc3RhdHVzIiwgR19DQUxMQkFDSyhub3RpZnlMb2FkU3RhdHVz Q2IpLCB1cmlFbnRyeSk7CisgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAibm90aWZ5Ojpw cm9ncmVzcyIsIEdfQ0FMTEJBQ0sobm90aWZ5UHJvZ3Jlc3NDYiksIHdpbmRvdyk7CisgICAgZ19z aWduYWxfY29ubmVjdCh3ZWJWaWV3LCAiaG92ZXJpbmctb3Zlci1saW5rIiwgR19DQUxMQkFDSyhs aW5rSG92ZXJDYiksIHN0YXR1c2Jhcik7CisgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3LCAi Y3JlYXRlLXdlYi12aWV3IiwgR19DQUxMQkFDSyhjcmVhdGVXZWJWaWV3Q2IpLCB3aW5kb3cpOwor ICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2ViVmlldywgIndlYi12aWV3LXJlYWR5IiwgR19DQUxMQkFD Syh3ZWJWaWV3UmVhZHlDYiksIHdpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJWaWV3 LCAiY2xvc2Utd2ViLXZpZXciLCBHX0NBTExCQUNLKGNsb3NlV2ViVmlld0NiKSwgd2luZG93KTsK IAotICAgIHJldHVybiBzY3JvbGxlZF93aW5kb3c7CisgICAgcmV0dXJuIHNjcm9sbGVkV2luZG93 OwogfQogCi1zdGF0aWMgR3RrV2lkZ2V0KgotY3JlYXRlX3N0YXR1c2JhciAoKQorc3RhdGljIEd0 a1dpZGdldCogY3JlYXRlU3RhdHVzYmFyKCkKIHsKLSAgICBHdGtTdGF0dXNiYXIgKnN0YXR1c2Jh ciA9IEdUS19TVEFUVVNCQVIgKGd0a19zdGF0dXNiYXJfbmV3ICgpKTsKLSAgICBndWludCBzdGF0 dXNfY29udGV4dF9pZCA9IGd0a19zdGF0dXNiYXJfZ2V0X2NvbnRleHRfaWQgKHN0YXR1c2Jhciwg IkxpbmsgSG92ZXIiKTsKLSAgICBnX29iamVjdF9zZXRfZGF0YSAoR19PQkpFQ1QgKHN0YXR1c2Jh ciksICJsaW5rLWhvdmVyLWNvbnRleHQiLAotICAgICAgICBHVUlOVF9UT19QT0lOVEVSKHN0YXR1 c19jb250ZXh0X2lkKSk7CisgICAgR3RrU3RhdHVzYmFyICpzdGF0dXNiYXIgPSBHVEtfU1RBVFVT QkFSKGd0a19zdGF0dXNiYXJfbmV3KCkpOworICAgIGd1aW50IHN0YXR1c0NvbnRleHRJZCA9IGd0 a19zdGF0dXNiYXJfZ2V0X2NvbnRleHRfaWQoc3RhdHVzYmFyLCAiTGluayBIb3ZlciIpOworICAg IGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHN0YXR1c2JhciksICJsaW5rLWhvdmVyLWNvbnRl eHQiLAorICAgICAgICBHVUlOVF9UT19QT0lOVEVSKHN0YXR1c0NvbnRleHRJZCkpOwogCi0gICAg cmV0dXJuIEdUS19XSURHRVQgKHN0YXR1c2Jhcik7CisgICAgcmV0dXJuIEdUS19XSURHRVQoc3Rh dHVzYmFyKTsKIH0KIAotc3RhdGljIEd0a1dpZGdldCoKLWNyZWF0ZV90b29sYmFyIChHdGtXaWRn ZXQqIHVyaV9lbnRyeSwgV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcpCitzdGF0aWMgR3RrV2lkZ2V0 KiBjcmVhdGVUb29sYmFyKEd0a1dpZGdldCogdXJpRW50cnksIFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcpCiB7Ci0gICAgR3RrV2lkZ2V0KiB0b29sYmFyID0gZ3RrX3Rvb2xiYXJfbmV3ICgpOworICAg IEd0a1dpZGdldCAqdG9vbGJhciA9IGd0a190b29sYmFyX25ldygpOwogCi0jaWYgR1RLX0NIRUNL X1ZFUlNJT04oMiwxNSwwKQotICAgIGd0a19vcmllbnRhYmxlX3NldF9vcmllbnRhdGlvbiAoR1RL X09SSUVOVEFCTEUgKHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCk7CisjaWYg R1RLX0NIRUNLX1ZFUlNJT04oMiwgMTUsIDApCisgICAgZ3RrX29yaWVudGFibGVfc2V0X29yaWVu dGF0aW9uKEdUS19PUklFTlRBQkxFKHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRB TCk7CiAjZWxzZQotICAgIGd0a190b29sYmFyX3NldF9vcmllbnRhdGlvbiAoR1RLX1RPT0xCQVIg KHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCk7CisgICAgZ3RrX3Rvb2xiYXJf c2V0X29yaWVudGF0aW9uKEdUS19UT09MQkFSKHRvb2xiYXIpLCBHVEtfT1JJRU5UQVRJT05fSE9S SVpPTlRBTCk7CiAjZW5kaWYKLSAgICBndGtfdG9vbGJhcl9zZXRfc3R5bGUgKEdUS19UT09MQkFS ICh0b29sYmFyKSwgR1RLX1RPT0xCQVJfQk9USF9IT1JJWik7CisgICAgZ3RrX3Rvb2xiYXJfc2V0 X3N0eWxlKEdUS19UT09MQkFSKHRvb2xiYXIpLCBHVEtfVE9PTEJBUl9CT1RIX0hPUklaKTsKIAot ICAgIEd0a1Rvb2xJdGVtKiBpdGVtOworICAgIEd0a1Rvb2xJdGVtICppdGVtOwogCiAgICAgLyog dGhlIGJhY2sgYnV0dG9uICovCi0gICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9z dG9jayAoR1RLX1NUT0NLX0dPX0JBQ0spOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNU IChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNLIChnb19iYWNrX2NiKSwgd2ViX3ZpZXcpOwot ICAgIGd0a190b29sYmFyX2luc2VydCAoR1RLX1RPT0xCQVIgKHRvb2xiYXIpLCBpdGVtLCAtMSk7 CisgICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtfU1RPQ0tfR09f QkFDSyk7CisgICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChpdGVtKSwgImNsaWNrZWQiLCBH X0NBTExCQUNLKGdvQmFja0NiKSwgd2ViVmlldyk7CisgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdU S19UT09MQkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAKICAgICAvKiBUaGUgZm9yd2FyZCBidXR0 b24gKi8KLSAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrIChHVEtfU1RP Q0tfR09fRk9SV0FSRCk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKGl0ZW0pLCAi Y2xpY2tlZCIsIEdfQ0FMTEJBQ0sgKGdvX2ZvcndhcmRfY2IpLCB3ZWJfdmlldyk7Ci0gICAgZ3Rr X3Rvb2xiYXJfaW5zZXJ0IChHVEtfVE9PTEJBUiAodG9vbGJhciksIGl0ZW0sIC0xKTsKKyAgICBp dGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrKEdUS19TVE9DS19HT19GT1JXQVJE KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNUKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FM TEJBQ0soZ29Gb3J3YXJkQ2IpLCB3ZWJWaWV3KTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RL X1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKIAogICAgIC8qIFRoZSBVUkwgZW50cnkgKi8K LSAgICBpdGVtID0gZ3RrX3Rvb2xfaXRlbV9uZXcgKCk7Ci0gICAgZ3RrX3Rvb2xfaXRlbV9zZXRf ZXhwYW5kIChpdGVtLCBUUlVFKTsKLSAgICBndGtfY29udGFpbmVyX2FkZCAoR1RLX0NPTlRBSU5F UiAoaXRlbSksIHVyaV9lbnRyeSk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKHVy aV9lbnRyeSksICJhY3RpdmF0ZSIsIEdfQ0FMTEJBQ0sgKGFjdGl2YXRlX3VyaV9lbnRyeV9jYiks IE5VTEwpOwotICAgIGd0a190b29sYmFyX2luc2VydCAoR1RLX1RPT0xCQVIgKHRvb2xiYXIpLCBp dGVtLCAtMSk7CisgICAgaXRlbSA9IGd0a190b29sX2l0ZW1fbmV3KCk7CisgICAgZ3RrX3Rvb2xf aXRlbV9zZXRfZXhwYW5kKGl0ZW0sIFRSVUUpOworICAgIGd0a19jb250YWluZXJfYWRkKEdUS19D T05UQUlORVIoaXRlbSksIHVyaUVudHJ5KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KEdfT0JKRUNU KHVyaUVudHJ5KSwgImFjdGl2YXRlIiwgR19DQUxMQkFDSyhhY3RpdmF0ZVVyaUVudHJ5Q2IpLCBO VUxMKTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0s IC0xKTsKIAogICAgIC8qIFRoZSBnbyBidXR0b24gKi8KLSAgICBnX29iamVjdF9zZXRfZGF0YSAo R19PQkpFQ1QgKHVyaV9lbnRyeSksICJ3ZWItdmlldyIsIHdlYl92aWV3KTsKLSAgICBpdGVtID0g Z3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrIChHVEtfU1RPQ0tfT0spOwotICAgIGdfc2ln bmFsX2Nvbm5lY3Rfc3dhcHBlZCAoR19PQkpFQ1QgKGl0ZW0pLCAiY2xpY2tlZCIsIEdfQ0FMTEJB Q0sgKGFjdGl2YXRlX3VyaV9lbnRyeV9jYiksIChncG9pbnRlcil1cmlfZW50cnkpOwotICAgIGd0 a190b29sYmFyX2luc2VydCAoR1RLX1RPT0xCQVIgKHRvb2xiYXIpLCBpdGVtLCAtMSk7CisgICAg Z19vYmplY3Rfc2V0X2RhdGEoR19PQkpFQ1QodXJpRW50cnkpLCAid2ViLXZpZXciLCB3ZWJWaWV3 KTsKKyAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrKEdUS19TVE9DS19P Syk7CisgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKEdfT0JKRUNUKGl0ZW0pLCAiY2xpY2tl ZCIsIEdfQ0FMTEJBQ0soYWN0aXZhdGVVcmlFbnRyeUNiKSwgKGdwb2ludGVyKXVyaUVudHJ5KTsK KyAgICBndGtfdG9vbGJhcl9pbnNlcnQoR1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsK IAogICAgIHJldHVybiB0b29sYmFyOwogfQogCi1zdGF0aWMgR3RrV2lkZ2V0KgotY3JlYXRlX3dp bmRvdyAoV2ViS2l0V2ViVmlldyoqIG91dF93ZWJfdmlldykKK3N0YXRpYyBHdGtXaWRnZXQqIGNy ZWF0ZVdpbmRvdyhXZWJLaXRXZWJWaWV3Kiogb3V0V2ViVmlldykKIHsKLSAgICBXZWJLaXRXZWJW aWV3ICp3ZWJfdmlldzsKKyAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3OwogICAgIEd0a1dpZGdl dCAqdmJveDsKICAgICBHdGtXaWRnZXQgKndpbmRvdzsKLSAgICBHdGtXaWRnZXQgKnVyaV9lbnRy eTsKKyAgICBHdGtXaWRnZXQgKnVyaUVudHJ5OwogICAgIEd0a1dpZGdldCAqc3RhdHVzYmFyOwog Ci0gICAgZ19hdG9taWNfaW50X2luYyAoJndpbmRvd19jb3VudCk7Ci0gICAKLSAgICB3aW5kb3cg PSBndGtfd2luZG93X25ldyAoR1RLX1dJTkRPV19UT1BMRVZFTCk7Ci0gICAgZ3RrX3dpbmRvd19z ZXRfZGVmYXVsdF9zaXplIChHVEtfV0lORE9XICh3aW5kb3cpLCA4MDAsIDYwMCk7Ci0gICAgZ3Rr X3dpZGdldF9zZXRfbmFtZSAod2luZG93LCAiR3RrTGF1bmNoZXIiKTsKKyAgICBnX2F0b21pY19p bnRfaW5jKCZ3aW5kb3dDb3VudCk7CiAKLSAgICB3ZWJfdmlldyA9IFdFQktJVF9XRUJfVklFVyAo d2Via2l0X3dlYl92aWV3X25ldyAoKSk7Ci0gICAgdXJpX2VudHJ5ID0gZ3RrX2VudHJ5X25ldyAo KTsKKyAgICB3aW5kb3cgPSBndGtfd2luZG93X25ldyhHVEtfV0lORE9XX1RPUExFVkVMKTsKKyAg ICBndGtfd2luZG93X3NldF9kZWZhdWx0X3NpemUoR1RLX1dJTkRPVyh3aW5kb3cpLCA4MDAsIDYw MCk7CisgICAgZ3RrX3dpZGdldF9zZXRfbmFtZSh3aW5kb3csICJHdGtMYXVuY2hlciIpOwogCi0g ICAgdmJveCA9IGd0a192Ym94X25ldyAoRkFMU0UsIDApOwotICAgIHN0YXR1c2JhciA9IGNyZWF0 ZV9zdGF0dXNiYXIgKCk7Ci0gICAgZ3RrX2JveF9wYWNrX3N0YXJ0IChHVEtfQk9YICh2Ym94KSwg Y3JlYXRlX3Rvb2xiYXIgKHVyaV9lbnRyeSwgd2ViX3ZpZXcpLCBGQUxTRSwgRkFMU0UsIDApOwot ICAgIGd0a19ib3hfcGFja19zdGFydCAoR1RLX0JPWCAodmJveCksIGNyZWF0ZV9icm93c2VyICh3 aW5kb3csIHVyaV9lbnRyeSwgc3RhdHVzYmFyLCB3ZWJfdmlldyksIFRSVUUsIFRSVUUsIDApOwot ICAgIGd0a19ib3hfcGFja19zdGFydCAoR1RLX0JPWCAodmJveCksIHN0YXR1c2JhciwgRkFMU0Us IEZBTFNFLCAwKTsKKyAgICB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93ZWJfdmll d19uZXcoKSk7CisgICAgdXJpRW50cnkgPSBndGtfZW50cnlfbmV3KCk7CiAKLSAgICBndGtfY29u dGFpbmVyX2FkZCAoR1RLX0NPTlRBSU5FUiAod2luZG93KSwgdmJveCk7CisgICAgdmJveCA9IGd0 a192Ym94X25ldyhGQUxTRSwgMCk7CisgICAgc3RhdHVzYmFyID0gY3JlYXRlU3RhdHVzYmFyKHdl YlZpZXcpOworICAgIGd0a19ib3hfcGFja19zdGFydChHVEtfQk9YKHZib3gpLCBjcmVhdGVUb29s YmFyKHVyaUVudHJ5LCB3ZWJWaWV3KSwgRkFMU0UsIEZBTFNFLCAwKTsKKyAgICBndGtfYm94X3Bh Y2tfc3RhcnQoR1RLX0JPWCh2Ym94KSwgY3JlYXRlQnJvd3Nlcih3aW5kb3csIHVyaUVudHJ5LCBz dGF0dXNiYXIsIHdlYlZpZXcpLCBUUlVFLCBUUlVFLCAwKTsKKyAgICBndGtfYm94X3BhY2tfc3Rh cnQoR1RLX0JPWCh2Ym94KSwgc3RhdHVzYmFyLCBGQUxTRSwgRkFMU0UsIDApOwogCi0gICAgZ19z aWduYWxfY29ubmVjdCAod2luZG93LCAiZGVzdHJveSIsIEdfQ0FMTEJBQ0sgKGRlc3Ryb3lfY2Ip LCBOVUxMKTsKKyAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKHdpbmRvdyksIHZi b3gpOwogCi0gICAgaWYgKG91dF93ZWJfdmlldykKLSAgICAgICAgKm91dF93ZWJfdmlldyA9IHdl Yl92aWV3OworICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LCAiZGVzdHJveSIsIEdfQ0FMTEJB Q0soZGVzdHJveUNiKSwgTlVMTCk7CisKKyAgICBpZiAob3V0V2ViVmlldykKKyAgICAgICAgKm91 dFdlYlZpZXcgPSB3ZWJWaWV3OwogCiAgICAgcmV0dXJuIHdpbmRvdzsKIH0KQEAgLTI0NSwyNyAr MjMwLDI2IEBAIHN0YXRpYyBnY2hhciogZmlsZW5hbWVUb1VSTChjb25zdCBjaGFyKiBmaWxlbmFt ZSkKICAgICByZXR1cm4gZmlsZVVSTDsKIH0KIAotaW50Ci1tYWluIChpbnQgYXJnYywgY2hhciog YXJndltdKQoraW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIHsKLSAgICBXZWJLaXRX ZWJWaWV3ICp3ZWJfdmlldzsKKyAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3OwogICAgIEd0a1dp ZGdldCAqbWFpbl93aW5kb3c7CiAKLSAgICBndGtfaW5pdCAoJmFyZ2MsICZhcmd2KTsKLSAgICBp ZiAoIWdfdGhyZWFkX3N1cHBvcnRlZCAoKSkKLSAgICAgICAgZ190aHJlYWRfaW5pdCAoTlVMTCk7 CisgICAgZ3RrX2luaXQoJmFyZ2MsICZhcmd2KTsKKyAgICBpZiAoIWdfdGhyZWFkX3N1cHBvcnRl ZCgpKQorICAgICAgICBnX3RocmVhZF9pbml0KE5VTEwpOwogCi0gICAgbWFpbl93aW5kb3cgPSBj cmVhdGVfd2luZG93ICgmd2ViX3ZpZXcpOworICAgIG1haW5fd2luZG93ID0gY3JlYXRlV2luZG93 KCZ3ZWJWaWV3KTsKIAotICAgIGdjaGFyICp1cmkgPSAoZ2NoYXIqKSAoYXJnYyA+IDEgPyBhcmd2 WzFdIDogImh0dHA6Ly93d3cuZ29vZ2xlLmNvbS8iKTsKKyAgICBnY2hhciAqdXJpID0oZ2NoYXIq KShhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiaHR0cDovL3d3dy5nb29nbGUuY29tLyIpOwogICAgIGdj aGFyICpmaWxlVVJMID0gZmlsZW5hbWVUb1VSTCh1cmkpOwogCi0gICAgd2Via2l0X3dlYl92aWV3 X2xvYWRfdXJpKHdlYl92aWV3LCBmaWxlVVJMID8gZmlsZVVSTCA6IHVyaSk7CisgICAgd2Via2l0 X3dlYl92aWV3X2xvYWRfdXJpKHdlYlZpZXcsIGZpbGVVUkwgPyBmaWxlVVJMIDogdXJpKTsKICAg ICBnX2ZyZWUoZmlsZVVSTCk7CiAKLSAgICBndGtfd2lkZ2V0X2dyYWJfZm9jdXMgKEdUS19XSURH RVQgKHdlYl92aWV3KSk7Ci0gICAgZ3RrX3dpZGdldF9zaG93X2FsbCAobWFpbl93aW5kb3cpOwot ICAgIGd0a19tYWluICgpOworICAgIGd0a193aWRnZXRfZ3JhYl9mb2N1cyhHVEtfV0lER0VUKHdl YlZpZXcpKTsKKyAgICBndGtfd2lkZ2V0X3Nob3dfYWxsKG1haW5fd2luZG93KTsKKyAgICBndGtf bWFpbigpOwogCiAgICAgcmV0dXJuIDA7CiB9Cg==