173249 2017-06-12 01:58:17 -0700 [GTK] Move WebKit GType macros to WTF 2017-06-12 05:50:50 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned benjamin berto bugs-noreply buildbot cdumez cmarcelo dbates gustavo mcatanzaro zan oldest_to_newest 1318136 0 cgarcia 2017-06-12 01:58:17 -0700 Moving to a shared place where they could be shared by all ports using a glib-based API. Moved to WTF instead of platform/PAL because they will also be used by JavaScriptCore glib bindings. 1318137 1 312642 cgarcia 2017-06-12 02:01:42 -0700 Created attachment 312642 Patch 1318139 2 buildbot 2017-06-12 02:04:43 -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 1318140 3 buildbot 2017-06-12 02:04:50 -0700 Attachment 312642 did not pass style-queue: ERROR: Source/WTF/wtf/glib/WebKitGType.h:74: g_define_type_id__volatile is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] ERROR: Source/WTF/wtf/glib/WebKitGType.h:76: g_define_type_id is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1318173 4 312642 zan 2017-06-12 04:55:22 -0700 Comment on attachment 312642 Patch It looks OK. WEBKIT prefixes seem a bit strange for code that's located in WTF though. 1318174 5 cgarcia 2017-06-12 05:03:10 -0700 (In reply to Zan Dobersek from comment #4) > Comment on attachment 312642 [details] > Patch > > It looks OK. WEBKIT prefixes seem a bit strange for code that's located in > WTF though. Yes, they are currently helpers for glib based APIs that use WebKit prefix. They can be renamed to use WTF prefix once the JSC glib bindings are added, since we will not use WebKit prefix there. 1318191 6 cgarcia 2017-06-12 05:50:50 -0700 Committed r218096: <http://trac.webkit.org/changeset/218096> 312642 2017-06-12 02:01:42 -0700 2017-06-12 04:55:22 -0700 Patch wk2-gtype.diff text/plain 9922 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cK aW5kZXggYjIzZDIzZGNmZjQuLjc3NjczZmI3ZDVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV1RGL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3 LTA2LTEyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBNb3ZlIFdlYktpdCBHVHlwZSBtYWNyb3MgdG8gV1RGCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMyNDkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGV5IGNhbiBiZSB1c2VkIGJ5IGds aWItYmFzZWQgcG9ydHMgYW5kIGV2ZW50dWFsbHkgYnkgSmF2YVNjcmlwdENvcmUgZ2xpYiBiaW5k aW5ncyB0b28uCisKKyAgICAgICAgKiB3dGYvZ2xpYi9XZWJLaXRHVHlwZS5oOiBDb3BpZWQgZnJv bSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2YXRlLmguCisKIDIw MTctMDYtMTEgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAg ICAgW1dURl0gTWFrZSBUaHJlYWRNZXNzYWdlIHBvcnRhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9nbGliL1dlYktpdEdUeXBlLmggYi9Tb3VyY2UvV1RGL3d0Zi9nbGliL1dlYktpdEdU eXBlLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjdiNzMzYjU4Mzg5 Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dURi93dGYvZ2xpYi9XZWJLaXRHVHlwZS5oCkBA IC0wLDAgKzEsOTAgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTcgSWdhbGlhLCBTLkwuCisg KgorICogIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IKKyAqICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYworICogIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVl IFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICogIHZlcnNpb24gMiBvZiB0aGUgTGljZW5z ZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiAgVGhpcyBs aWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWws CisgKiAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQg d2FycmFudHkgb2YKKyAqICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGlj ZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQg YSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgKiAgYWxv bmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwg d3JpdGUgdG8KKyAqICB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFu a2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNB LgorICovCisKKyNwcmFnbWEgb25jZQorCisjaW5jbHVkZSA8Z2xpYi5oPgorCisjZGVmaW5lIFdF QktJVF9QQVJBTV9SRUFEQUJMRSAoc3RhdGljX2Nhc3Q8R1BhcmFtRmxhZ3M+KEdfUEFSQU1fUkVB REFCTEUgfCBHX1BBUkFNX1NUQVRJQ19OQU1FIHwgR19QQVJBTV9TVEFUSUNfTklDSyB8IEdfUEFS QU1fU1RBVElDX0JMVVJCKSkKKyNkZWZpbmUgV0VCS0lUX1BBUkFNX1dSSVRBQkxFIChzdGF0aWNf Y2FzdDxHUGFyYW1GbGFncz4oR19QQVJBTV9XUklUQUJMRSB8IEdfUEFSQU1fU1RBVElDX05BTUUg fCBHX1BBUkFNX1NUQVRJQ19OSUNLIHwgR19QQVJBTV9TVEFUSUNfQkxVUkIpKQorI2RlZmluZSBX RUJLSVRfUEFSQU1fUkVBRFdSSVRFIChzdGF0aWNfY2FzdDxHUGFyYW1GbGFncz4oR19QQVJBTV9S RUFEV1JJVEUgfCBHX1BBUkFNX1NUQVRJQ19OQU1FIHwgR19QQVJBTV9TVEFUSUNfTklDSyB8IEdf UEFSQU1fU1RBVElDX0JMVVJCKSkKKworI2RlZmluZSBXRUJLSVRfREVGSU5FX0FTWU5DX0RBVEFf U1RSVUNUKHN0cnVjdE5hbWUpIFwKK3N0YXRpYyBzdHJ1Y3ROYW1lKiBjcmVhdGUjI3N0cnVjdE5h bWUoKSBcCit7IFwKKyAgICBzdHJ1Y3ROYW1lKiBkYXRhID0gc3RhdGljX2Nhc3Q8c3RydWN0TmFt ZSo+KGZhc3RaZXJvZWRNYWxsb2Moc2l6ZW9mKHN0cnVjdE5hbWUpKSk7IFwKKyAgICBuZXcgKGRh dGEpIHN0cnVjdE5hbWUoKTsgXAorICAgIHJldHVybiBkYXRhOyBcCit9IFwKK3N0YXRpYyB2b2lk IGRlc3Ryb3kjI3N0cnVjdE5hbWUoc3RydWN0TmFtZSogZGF0YSkgXAoreyBcCisgICAgZGF0YS0+ fnN0cnVjdE5hbWUoKTsgXAorICAgIGZhc3RGcmVlKGRhdGEpOyBcCit9CisKKyNkZWZpbmUgV0VC S0lUX0RFRklORV9UWVBFKFR5cGVOYW1lLCB0eXBlX25hbWUsIFRZUEVfUEFSRU5UKSBfV0VCS0lU X0RFRklORV9UWVBFX0VYVEVOREVEKFR5cGVOYW1lLCB0eXBlX25hbWUsIFRZUEVfUEFSRU5ULCAw LCB7IH0pCisjZGVmaW5lIFdFQktJVF9ERUZJTkVfQUJTVFJBQ1RfVFlQRShUeXBlTmFtZSwgdHlw ZV9uYW1lLCBUWVBFX1BBUkVOVCkgX1dFQktJVF9ERUZJTkVfVFlQRV9FWFRFTkRFRChUeXBlTmFt ZSwgdHlwZV9uYW1lLCBUWVBFX1BBUkVOVCwgR19UWVBFX0ZMQUdfQUJTVFJBQ1QsIHsgfSkKKyNk ZWZpbmUgV0VCS0lUX0RFRklORV9UWVBFX1dJVEhfQ09ERShUeXBlTmFtZSwgdHlwZV9uYW1lLCBU WVBFX1BBUkVOVCwgQ29kZSkgX1dFQktJVF9ERUZJTkVfVFlQRV9FWFRFTkRFRF9CRUdJTihUeXBl TmFtZSwgdHlwZV9uYW1lLCBUWVBFX1BBUkVOVCwgMCkge0NvZGU7fSBfV0VCS0lUX0RFRklORV9U WVBFX0VYVEVOREVEX0VORCgpCisKKyNkZWZpbmUgX1dFQktJVF9ERUZJTkVfVFlQRV9FWFRFTkRF RChUeXBlTmFtZSwgdHlwZV9uYW1lLCBUWVBFX1BBUkVOVCwgZmxhZ3MsIENvZGUpIF9XRUJLSVRf REVGSU5FX1RZUEVfRVhURU5ERURfQkVHSU4oVHlwZU5hbWUsIHR5cGVfbmFtZSwgVFlQRV9QQVJF TlQsIGZsYWdzKSB7Q29kZTt9IF9XRUJLSVRfREVGSU5FX1RZUEVfRVhURU5ERURfRU5EKCkKKyNk ZWZpbmUgX1dFQktJVF9ERUZJTkVfVFlQRV9FWFRFTkRFRF9CRUdJTihUeXBlTmFtZSwgdHlwZV9u YW1lLCBUWVBFX1BBUkVOVCwgZmxhZ3MpIFwKK1wKK3N0YXRpYyB2b2lkIHR5cGVfbmFtZSMjX2Ns YXNzX2luaXQoVHlwZU5hbWUjI0NsYXNzKiBrbGFzcyk7IFwKK3N0YXRpYyBncG9pbnRlciB0eXBl X25hbWUjI19wYXJlbnRfY2xhc3MgPSAwOyBcCitzdGF0aWMgdm9pZCB0eXBlX25hbWUjI19maW5h bGl6ZShHT2JqZWN0KiBvYmplY3QpIFwKK3sgXAorICAgIFR5cGVOYW1lKiBzZWxmID0gKFR5cGVO YW1lKilvYmplY3Q7IFwKKyAgICBzZWxmLT5wcml2LT5+VHlwZU5hbWUjI1ByaXZhdGUoKTsgXAor ICAgIEdfT0JKRUNUX0NMQVNTKHR5cGVfbmFtZSMjX3BhcmVudF9jbGFzcyktPmZpbmFsaXplKG9i amVjdCk7IFwKK30gXAorXAorc3RhdGljIHZvaWQgdHlwZV9uYW1lIyNfY2xhc3NfaW50ZXJuX2lu aXQoZ3BvaW50ZXIga2xhc3MpIFwKK3sgXAorICAgIEdPYmplY3RDbGFzcyogZ09iamVjdENsYXNz ID0gR19PQkpFQ1RfQ0xBU1Moa2xhc3MpOyBcCisgICAgZ190eXBlX2NsYXNzX2FkZF9wcml2YXRl KGtsYXNzLCBzaXplb2YoVHlwZU5hbWUjI1ByaXZhdGUpKTsgXAorICAgIHR5cGVfbmFtZSMjX3Bh cmVudF9jbGFzcyA9IGdfdHlwZV9jbGFzc19wZWVrX3BhcmVudChrbGFzcyk7IFwKKyAgICB0eXBl X25hbWUjI19jbGFzc19pbml0KChUeXBlTmFtZSMjQ2xhc3MqKWtsYXNzKTsgXAorICAgIGdPYmpl Y3RDbGFzcy0+ZmluYWxpemUgPSB0eXBlX25hbWUjI19maW5hbGl6ZTsgXAorfSBcCitcCitzdGF0 aWMgdm9pZCB0eXBlX25hbWUjI19pbml0KFR5cGVOYW1lKiBzZWxmKSBcCit7IFwKKyAgICBUeXBl TmFtZSMjUHJpdmF0ZSogcHJpdiA9IEdfVFlQRV9JTlNUQU5DRV9HRVRfUFJJVkFURShzZWxmLCB0 eXBlX25hbWUjI19nZXRfdHlwZSgpLCBUeXBlTmFtZSMjUHJpdmF0ZSk7IFwKKyAgICBzZWxmLT5w cml2ID0gcHJpdjsgXAorICAgIG5ldyAocHJpdikgVHlwZU5hbWUjI1ByaXZhdGUoKTsgXAorfVwK K0dUeXBlIHR5cGVfbmFtZSMjX2dldF90eXBlKHZvaWQpIFwKK3sgXAorICAgIHN0YXRpYyB2b2xh dGlsZSBnc2l6ZSBnX2RlZmluZV90eXBlX2lkX192b2xhdGlsZSA9IDA7IFwKKyAgICBpZiAoZ19v bmNlX2luaXRfZW50ZXIoJmdfZGVmaW5lX3R5cGVfaWRfX3ZvbGF0aWxlKSkgeyBcCisgICAgICAg IEdUeXBlIGdfZGVmaW5lX3R5cGVfaWQgPSBcCisgICAgICAgICAgICBnX3R5cGVfcmVnaXN0ZXJf c3RhdGljX3NpbXBsZSggXAorICAgICAgICAgICAgICAgIFRZUEVfUEFSRU5ULCBcCisgICAgICAg ICAgICAgICAgZ19pbnRlcm5fc3RhdGljX3N0cmluZygjVHlwZU5hbWUpLCBcCisgICAgICAgICAg ICAgICAgc2l6ZW9mKFR5cGVOYW1lIyNDbGFzcyksIFwKKyAgICAgICAgICAgICAgICAoR0NsYXNz SW5pdEZ1bmMpdHlwZV9uYW1lIyNfY2xhc3NfaW50ZXJuX2luaXQsIFwKKyAgICAgICAgICAgICAg ICBzaXplb2YoVHlwZU5hbWUpLCBcCisgICAgICAgICAgICAgICAgKEdJbnN0YW5jZUluaXRGdW5j KXR5cGVfbmFtZSMjX2luaXQsIFwKKyAgICAgICAgICAgICAgICAoR1R5cGVGbGFncylmbGFncyk7 IFwKKyAgICAgICAgLy8gQ3VzdG9tIGNvZGUgZm9sbG93cy4KKyNkZWZpbmUgX1dFQktJVF9ERUZJ TkVfVFlQRV9FWFRFTkRFRF9FTkQoKSBcCisgICAgICAgIGdfb25jZV9pbml0X2xlYXZlKCZnX2Rl ZmluZV90eXBlX2lkX192b2xhdGlsZSwgZ19kZWZpbmVfdHlwZV9pZCk7IFwKKyAgICB9IFwKKyAg ICByZXR1cm4gZ19kZWZpbmVfdHlwZV9pZF9fdm9sYXRpbGU7IFwKK30gLy8gQ2xvc2VzIHR5cGVf bmFtZSMjX2dldF90eXBlKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmRhNmUxNTE0OGYuLmI2ZjNiZTg2ZWMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTctMDYtMTIgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIE1vdmUgV2ViS2l0 IEdUeXBlIG1hY3JvcyB0byBXVEYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3MzI0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1vdmluZyB0byBhIGNvbW1vbiBwbGFjZSB3aGVyZSB0aGV5IGNvdWxkIGJl IHNoYXJlZCBieSBhbGwgcG9ydHMgdXNpbmcgYSBnbGliLWJhc2VkIEFQSS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFByaXZhdGUuaDoKKwogMjAxNy0wNi0xMSAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gUmVt b3ZlIFdLSW5zcGVjdG9yQ2xpZW50R3RrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRQcml2YXRlLmgKaW5kZXggYTIyMDMzMTkxMTMuLjFjODMyMjgwNTBkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQcml2YXRl LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UHJpdmF0ZS5o CkBAIC0yMyw4ICsyMyw3IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAg Ki8KIAotI2lmbmRlZiBXZWJLaXRQcml2YXRlX2gKLSNkZWZpbmUgV2ViS2l0UHJpdmF0ZV9oCisj cHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIldlYktpdE5hdmlnYXRpb25BY3Rpb24uaCIKICNpbmNs dWRlIDxXZWJLaXQvV0tBUElDYXN0Lmg+CkBAIC00Miw3NCArNDEsNyBAQAogI2luY2x1ZGUgPFdl YktpdC9XZWJLaXQyX0MuaD4KICNpbmNsdWRlIDxnbGliLmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2Vy dGlvbnMuaD4KLQotI2RlZmluZSBXRUJLSVRfUEFSQU1fUkVBREFCTEUgKHN0YXRpY19jYXN0PEdQ YXJhbUZsYWdzPihHX1BBUkFNX1JFQURBQkxFIHwgR19QQVJBTV9TVEFUSUNfTkFNRSB8IEdfUEFS QU1fU1RBVElDX05JQ0sgfCBHX1BBUkFNX1NUQVRJQ19CTFVSQikpCi0jZGVmaW5lIFdFQktJVF9Q QVJBTV9XUklUQUJMRSAoc3RhdGljX2Nhc3Q8R1BhcmFtRmxhZ3M+KEdfUEFSQU1fV1JJVEFCTEUg fCBHX1BBUkFNX1NUQVRJQ19OQU1FIHwgR19QQVJBTV9TVEFUSUNfTklDSyB8IEdfUEFSQU1fU1RB VElDX0JMVVJCKSkKLSNkZWZpbmUgV0VCS0lUX1BBUkFNX1JFQURXUklURSAoc3RhdGljX2Nhc3Q8 R1BhcmFtRmxhZ3M+KEdfUEFSQU1fUkVBRFdSSVRFIHwgR19QQVJBTV9TVEFUSUNfTkFNRSB8IEdf UEFSQU1fU1RBVElDX05JQ0sgfCBHX1BBUkFNX1NUQVRJQ19CTFVSQikpCi0KLSNkZWZpbmUgV0VC S0lUX0RFRklORV9BU1lOQ19EQVRBX1NUUlVDVChzdHJ1Y3ROYW1lKSBcCi1zdGF0aWMgc3RydWN0 TmFtZSogY3JlYXRlIyNzdHJ1Y3ROYW1lKCkgXAoteyBcCi0gICAgc3RydWN0TmFtZSogZGF0YSA9 IHN0YXRpY19jYXN0PHN0cnVjdE5hbWUqPihmYXN0WmVyb2VkTWFsbG9jKHNpemVvZihzdHJ1Y3RO YW1lKSkpOyBcCi0gICAgbmV3IChkYXRhKSBzdHJ1Y3ROYW1lKCk7IFwKLSAgICByZXR1cm4gZGF0 YTsgXAotfSBcCi1zdGF0aWMgdm9pZCBkZXN0cm95IyNzdHJ1Y3ROYW1lKHN0cnVjdE5hbWUqIGRh dGEpIFwKLXsgXAotICAgIGRhdGEtPn5zdHJ1Y3ROYW1lKCk7IFwKLSAgICBmYXN0RnJlZShkYXRh KTsgXAotfQotCi0jZGVmaW5lIFdFQktJVF9ERUZJTkVfVFlQRShUeXBlTmFtZSwgdHlwZV9uYW1l LCBUWVBFX1BBUkVOVCkgX1dFQktJVF9ERUZJTkVfVFlQRV9FWFRFTkRFRChUeXBlTmFtZSwgdHlw ZV9uYW1lLCBUWVBFX1BBUkVOVCwgMCwgeyB9KQotI2RlZmluZSBXRUJLSVRfREVGSU5FX0FCU1RS QUNUX1RZUEUoVHlwZU5hbWUsIHR5cGVfbmFtZSwgVFlQRV9QQVJFTlQpIF9XRUJLSVRfREVGSU5F X1RZUEVfRVhURU5ERUQoVHlwZU5hbWUsIHR5cGVfbmFtZSwgVFlQRV9QQVJFTlQsIEdfVFlQRV9G TEFHX0FCU1RSQUNULCB7IH0pCi0jZGVmaW5lIFdFQktJVF9ERUZJTkVfVFlQRV9XSVRIX0NPREUo VHlwZU5hbWUsIHR5cGVfbmFtZSwgVFlQRV9QQVJFTlQsIENvZGUpIF9XRUJLSVRfREVGSU5FX1RZ UEVfRVhURU5ERURfQkVHSU4oVHlwZU5hbWUsIHR5cGVfbmFtZSwgVFlQRV9QQVJFTlQsIDApIHtD b2RlO30gX1dFQktJVF9ERUZJTkVfVFlQRV9FWFRFTkRFRF9FTkQoKQotCi0jZGVmaW5lIF9XRUJL SVRfREVGSU5FX1RZUEVfRVhURU5ERUQoVHlwZU5hbWUsIHR5cGVfbmFtZSwgVFlQRV9QQVJFTlQs IGZsYWdzLCBDb2RlKSBfV0VCS0lUX0RFRklORV9UWVBFX0VYVEVOREVEX0JFR0lOKFR5cGVOYW1l LCB0eXBlX25hbWUsIFRZUEVfUEFSRU5ULCBmbGFncykge0NvZGU7fSBfV0VCS0lUX0RFRklORV9U WVBFX0VYVEVOREVEX0VORCgpCi0jZGVmaW5lIF9XRUJLSVRfREVGSU5FX1RZUEVfRVhURU5ERURf QkVHSU4oVHlwZU5hbWUsIHR5cGVfbmFtZSwgVFlQRV9QQVJFTlQsIGZsYWdzKSBcCi1cCi1zdGF0 aWMgdm9pZCB0eXBlX25hbWUjI19jbGFzc19pbml0KFR5cGVOYW1lIyNDbGFzcyoga2xhc3MpOyBc Ci1zdGF0aWMgZ3BvaW50ZXIgdHlwZV9uYW1lIyNfcGFyZW50X2NsYXNzID0gMDsgXAotc3RhdGlj IHZvaWQgdHlwZV9uYW1lIyNfZmluYWxpemUoR09iamVjdCogb2JqZWN0KSBcCi17IFwKLSAgICBU eXBlTmFtZSogc2VsZiA9IChUeXBlTmFtZSopb2JqZWN0OyBcCi0gICAgc2VsZi0+cHJpdi0+flR5 cGVOYW1lIyNQcml2YXRlKCk7IFwKLSAgICBHX09CSkVDVF9DTEFTUyh0eXBlX25hbWUjI19wYXJl bnRfY2xhc3MpLT5maW5hbGl6ZShvYmplY3QpOyBcCi19IFwKLVwKLXN0YXRpYyB2b2lkIHR5cGVf bmFtZSMjX2NsYXNzX2ludGVybl9pbml0KGdwb2ludGVyIGtsYXNzKSBcCi17IFwKLSAgICBHT2Jq ZWN0Q2xhc3MqIGdPYmplY3RDbGFzcyA9IEdfT0JKRUNUX0NMQVNTKGtsYXNzKTsgXAotICAgIGdf dHlwZV9jbGFzc19hZGRfcHJpdmF0ZShrbGFzcywgc2l6ZW9mKFR5cGVOYW1lIyNQcml2YXRlKSk7 IFwKLSAgICB0eXBlX25hbWUjI19wYXJlbnRfY2xhc3MgPSBnX3R5cGVfY2xhc3NfcGVla19wYXJl bnQoa2xhc3MpOyBcCi0gICAgdHlwZV9uYW1lIyNfY2xhc3NfaW5pdCgoVHlwZU5hbWUjI0NsYXNz KilrbGFzcyk7IFwKLSAgICBnT2JqZWN0Q2xhc3MtPmZpbmFsaXplID0gdHlwZV9uYW1lIyNfZmlu YWxpemU7IFwKLX0gXAotXAotc3RhdGljIHZvaWQgdHlwZV9uYW1lIyNfaW5pdChUeXBlTmFtZSog c2VsZikgXAoteyBcCi0gICAgVHlwZU5hbWUjI1ByaXZhdGUqIHByaXYgPSBHX1RZUEVfSU5TVEFO Q0VfR0VUX1BSSVZBVEUoc2VsZiwgdHlwZV9uYW1lIyNfZ2V0X3R5cGUoKSwgVHlwZU5hbWUjI1By aXZhdGUpOyBcCi0gICAgc2VsZi0+cHJpdiA9IHByaXY7IFwKLSAgICBuZXcgKHByaXYpIFR5cGVO YW1lIyNQcml2YXRlKCk7IFwKLX1cCi1HVHlwZSB0eXBlX25hbWUjI19nZXRfdHlwZSh2b2lkKSBc Ci17IFwKLSAgICBzdGF0aWMgdm9sYXRpbGUgZ3NpemUgZ19kZWZpbmVfdHlwZV9pZF9fdm9sYXRp bGUgPSAwOyBcCi0gICAgaWYgKGdfb25jZV9pbml0X2VudGVyKCZnX2RlZmluZV90eXBlX2lkX192 b2xhdGlsZSkpIHsgXAotICAgICAgICBHVHlwZSBnX2RlZmluZV90eXBlX2lkID0gXAotICAgICAg ICAgICAgZ190eXBlX3JlZ2lzdGVyX3N0YXRpY19zaW1wbGUoIFwKLSAgICAgICAgICAgICAgICBU WVBFX1BBUkVOVCwgXAotICAgICAgICAgICAgICAgIGdfaW50ZXJuX3N0YXRpY19zdHJpbmcoI1R5 cGVOYW1lKSwgXAotICAgICAgICAgICAgICAgIHNpemVvZihUeXBlTmFtZSMjQ2xhc3MpLCBcCi0g ICAgICAgICAgICAgICAgKEdDbGFzc0luaXRGdW5jKXR5cGVfbmFtZSMjX2NsYXNzX2ludGVybl9p bml0LCBcCi0gICAgICAgICAgICAgICAgc2l6ZW9mKFR5cGVOYW1lKSwgXAotICAgICAgICAgICAg ICAgIChHSW5zdGFuY2VJbml0RnVuYyl0eXBlX25hbWUjI19pbml0LCBcCi0gICAgICAgICAgICAg ICAgKEdUeXBlRmxhZ3MpZmxhZ3MpOyBcCi0gICAgICAgIC8vIEN1c3RvbSBjb2RlIGZvbGxvd3Mu Ci0jZGVmaW5lIF9XRUJLSVRfREVGSU5FX1RZUEVfRVhURU5ERURfRU5EKCkgXAotICAgICAgICBn X29uY2VfaW5pdF9sZWF2ZSgmZ19kZWZpbmVfdHlwZV9pZF9fdm9sYXRpbGUsIGdfZGVmaW5lX3R5 cGVfaWQpOyBcCi0gICAgfSBcCi0gICAgcmV0dXJuIGdfZGVmaW5lX3R5cGVfaWRfX3ZvbGF0aWxl OyBcCi19IC8vIENsb3NlcyB0eXBlX25hbWUjI19nZXRfdHlwZSgpLgorI2luY2x1ZGUgPHd0Zi9n bGliL1dlYktpdEdUeXBlLmg+CiAKIHVuc2lnbmVkIHdrRXZlbnRNb2RpZmllcnNUb0dka01vZGlm aWVycyhXS0V2ZW50TW9kaWZpZXJzKTsKIHVuc2lnbmVkIHdrRXZlbnRNb3VzZUJ1dHRvblRvV2Vi S2l0TW91c2VCdXR0b24oV0tFdmVudE1vdXNlQnV0dG9uKTsKQEAgLTEyNSw1ICs1NywzIEBAIGVu dW0gU25hcHNob3RSZWdpb24gewogfTsKIAogc3RhdGljIGNvbnN0IGNoYXIgbmV0d29ya0NhY2hl U3ViZGlyZWN0b3J5W10gPSAiV2ViS2l0Q2FjaGUiOwotCi0jZW5kaWYgLy8gV2ViS2l0UHJpdmF0 ZV9oCg==