76276 2012-01-13 07:54:27 -0800 [Qt] [WK2] Get rid of the dependency to QtWidgets 2012-02-21 02:58:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P3 Normal --- 76275 78109 1 abecsi abecsi hausmann oldest_to_newest 535677 0 abecsi 2012-01-13 07:54:27 -0800 QScroller is going away from Qt5 (and QtWebKit) soon thus we should drop its widgets dependency as well. 560243 1 127822 abecsi 2012-02-20 08:50:19 -0800 Created attachment 127822 proposed patch This patch probably needs a clean build for the bot. 560324 2 127822 hausmann 2012-02-20 12:54:07 -0800 Comment on attachment 127822 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=127822&action=review LGTM, but I think the code in ActivateFontsQt.cpp should be re-added before landing. > Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:-48 > -#endif Don't we still need these for the layout tests for the time being? It's okay to use Widget stuff in WTR / the bundle, since this code isn't in the library itself. 560773 3 abecsi 2012-02-21 02:57:38 -0800 Committed r108328: <http://trac.webkit.org/changeset/108328> 560774 4 127822 abecsi 2012-02-21 02:58:23 -0800 Comment on attachment 127822 proposed patch Clearing flags from attachment. 127822 2012-02-20 08:50:19 -0800 2012-02-21 02:58:23 -0800 proposed patch widgets.patch text/plain 12667 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhNTk4MWQ4Li40YTA0NTNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDItMjAgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisK KyAgICAgICAgW1F0XVtXSzJdIEdldCByaWQgb2YgdGhlIGRlcGVuZGVuY3kgdG8gUXRXaWRnZXRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjI3Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGFyZ2V0 LnByaToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3RzdF9xbWx0 ZXN0cy5jcHA6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rl c3RzL3FxdWlja3dlYnZpZXcvdHN0X3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvcXQvdGVzdHMvdGVzdHMucHJpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQv dGVzdHMvdXRpbC5oOgorCiAyMDEyLTAyLTIwICBNaWNoYWVsIEJyw7xuaW5nICA8bWljaGFlbC5i cnVuaW5nQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdW1dLMl0gSW1wbGVtZW50IHByb3h5IGF1 dGhlbnRpY2F0aW9uIGhhbmRsaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVGFyZ2V0 LnByaSBiL1NvdXJjZS9XZWJLaXQyL1RhcmdldC5wcmkKaW5kZXggNWIyY2ZiOS4uY2QyZDA4ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9UYXJnZXQucHJpCkBAIC0xMiw3ICsxMiw3IEBAIGxvYWQoZmVhdHVyZXMpCiBpbmNsdWRlKFdl YktpdDIucHJpKQogCiBXRUJLSVQgKz0gd3RmIGphdmFzY3JpcHRjb3JlIHdlYmNvcmUKLVFUICs9 IGRlY2xhcmF0aXZlIHF1aWNrIHdpZGdldHMKK1FUICs9IGRlY2xhcmF0aXZlIHF1aWNrCiAKIENP TkZJRyArPSBzdGF0aWNsaWIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy90c3RfcW1sdGVzdHMuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy90c3RfcW1sdGVzdHMuY3BwCmluZGV4IGE4 MGM1YzMuLmJjYzI0NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvdGVzdHMvcW1sdGVzdHMvdHN0X3FtbHRlc3RzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3RzdF9xbWx0ZXN0cy5jcHAKQEAgLTIxLDkg KzIxLDkgQEAKICNpbmNsdWRlICIuLi91dGlsLmgiCiAKICNpbmNsdWRlICJxcXVpY2t3ZWJ2aWV3 X3AuaCIKKyNpbmNsdWRlIDxRR3VpQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UVZhckxlbmd0aEFy cmF5PgogI2luY2x1ZGUgPFF0UXVpY2tUZXN0L3F1aWNrdGVzdC5oPgotI2luY2x1ZGUgPFF0V2lk Z2V0cy9RQXBwbGljYXRpb24+CiAKIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKIHsK QEAgLTQyLDcgKzQyLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogCiAgICAg Ly8gSW5zdGFudGlhdGUgUUFwcGxpY2F0aW9uIHRvIHByZXZlbnQgcXVpY2tfdGVzdF9tYWluIHRv IGluc3RhbnRpYXRlIGEgUUd1aUFwcGxpY2F0aW9uLgogICAgIC8vIFRoaXMgY2FuIGJlIHJlbW92 ZWQgYXMgc29vbiBhcyB3ZSBkbyBub3QgdXNlIFF0V2lkZ2V0cyBhbnkgbW9yZS4KLSAgICBRQXBw bGljYXRpb24gYXBwKGFyZ2MsIGFyZ3YpOworICAgIFFHdWlBcHBsaWNhdGlvbiBhcHAoYXJnYywg YXJndik7CiAgICAgcW1sUmVnaXN0ZXJUeXBlPEJ5dGVBcnJheVRlc3REYXRhPigiVGVzdCIsIDEs IDAsICJCeXRlQXJyYXlUZXN0RGF0YSIpOwogCiAjaWZkZWYgRElTQUJMRV9GTElDS0FCTEVfVklF V1BPUlQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMv cXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FxdWlja3dlYnZpZXcvdHN0X3FxdWlja3dlYnZpZXcuY3BwCmlu ZGV4IDU3MmU5YjguLjEyODg2YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvdGVzdHMvcXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xcXVpY2t3ZWJ2aWV3L3RzdF9x cXVpY2t3ZWJ2aWV3LmNwcApAQCAtMzU2LDcgKzM1Niw3IEBAIHZvaWQgdHN0X1FRdWlja1dlYlZp ZXc6OnNjcm9sbFJlcXVlc3QoKQogICAgIFFWRVJJRlkod2ViVmlldygpLT5leHBlcmltZW50YWwo KS0+Y29udGVudFkoKSA9PSB5KTsKIH0KIAotUVRXRUJLSVRfQVBJX1RFU1RfTUFJTih0c3RfUVF1 aWNrV2ViVmlldykKK1FURVNUX01BSU4odHN0X1FRdWlja1dlYlZpZXcpCiAKICNpbmNsdWRlICJ0 c3RfcXF1aWNrd2Vidmlldy5tb2MiCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvdGVzdHMvdGVzdHMucHJpIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC90ZXN0cy90ZXN0cy5wcmkKaW5kZXggZWQ5MWQzOS4uZmFmNDQ1MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy90ZXN0cy5wcmkKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy90ZXN0cy5wcmkKQEAgLTksNyArOSw3 IEBAIFNPVVJDRVMgKz0gLi4vdXRpbC5jcHAgXAogICAgICAgICAgICAuLi9ieXRlYXJyYXl0ZXN0 ZGF0YS5jcHAKIElOQ0xVREVQQVRIICs9ICQkUFdECiAKLVFUICs9IHRlc3RsaWIgZGVjbGFyYXRp dmUgd2lkZ2V0cyBxdWljaworUVQgKz0gdGVzdGxpYiBkZWNsYXJhdGl2ZSBxdWljawogCiBDT05G SUcgKz0gcXR3ZWJraXQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC90ZXN0cy91dGlsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3Rz L3V0aWwuaAppbmRleCAwMDc5NjRmLi4xYzA1MmJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3V0aWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3V0aWwuaApAQCAtMjksMTMgKzI5LDMgQEAKIHZvaWQgYWRkUXRX ZWJQcm9jZXNzVG9QYXRoKCk7CiBib29sIHdhaXRGb3JTaWduYWwoUU9iamVjdCosIGNvbnN0IGNo YXIqIHNpZ25hbCwgaW50IHRpbWVvdXQgPSAxMDAwMCk7CiB2b2lkIHN1cHByZXNzRGVidWdPdXRw dXQoKTsKLQotI2RlZmluZSBRVFdFQktJVF9BUElfVEVTVF9NQUlOKFRlc3RPYmplY3QpIFwKLWlu dCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikgXAoteyBcCi0gICAgc3VwcHJlc3NEZWJ1Z091 dHB1dCgpOyBcCi0gICAgUUFwcGxpY2F0aW9uIGFwcChhcmdjLCBhcmd2KTsgXAotICAgIFFURVNU X0RJU0FCTEVfS0VZUEFEX05BVklHQVRJT04gXAotICAgIFRlc3RPYmplY3QgdGM7IFwKLSAgICBy ZXR1cm4gUVRlc3Q6OnFFeGVjKCZ0YywgYXJnYywgYXJndik7IFwKLX0KZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlOGFkNjc3Li5jODA5MTk2IDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjMgQEAKKzIwMTItMDItMjAgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5j b20+CisKKyAgICAgICAgW1F0XVtXSzJdIEdldCByaWQgb2YgdGhlIGRlcGVuZGVuY3kgdG8gUXRX aWRnZXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 NjI3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog TWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJvOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0 L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwOgorICAgICAgICAoTWluaUJyb3dzZXJBcHBsaWNh dGlvbjo6TWluaUJyb3dzZXJBcHBsaWNhdGlvbik6CisgICAgICAgIChNaW5pQnJvd3NlckFwcGxp Y2F0aW9uOjpub3RpZnkpOgorICAgICAgICAoTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6c2VuZFRv dWNoRXZlbnQpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRp b24uaDoKKyAgICAgICAgKE1pbmlCcm93c2VyQXBwbGljYXRpb24pOgorICAgICAgICAqIFF0VGVz dEJyb3dzZXIvbG9jYXRpb25lZGl0Lmg6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9UYXJnZXQucHJpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvcXQvQWN0aXZhdGVGb250c1F0LmNwcDoKKyAgICAgICAgKFdUUjo6YWN0aXZhdGVG b250cyk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9xdC9QbGF0Zm9ybVdlYlZpZXdRdC5j cHA6CisKIDIwMTItMDItMjAgIEFuZHkgV2luZ28gIDx3aW5nb0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIEFkZCB3aW5nbyBhcyBhIGNvbW1pdHRlci4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93 c2VyL3F0L01pbmlCcm93c2VyLnBybyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2Vy LnBybwppbmRleCAzMjM4OWYyLi5mMjI5MGM4IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci9xdC9NaW5pQnJvd3Nlci5wcm8KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dz ZXIucHJvCkBAIC0yNCw3ICsyNCw3IEBAIERFU1RESVIgPSAkJHtST09UX0JVSUxEX0RJUn0vYmlu CiAKIENPTkZJRyArPSBxdHdlYmtpdCBxdHdlYmtpdC1wcml2YXRlCiAKLVFUICs9IG5ldHdvcmsg ZGVjbGFyYXRpdmUgd2lkZ2V0cyBxdWljaworUVQgKz0gbmV0d29yayBkZWNsYXJhdGl2ZSBxdWlj awogbWFjeDogUVQgKz0geG1sCiAKIFJFU09VUkNFUyArPSBNaW5pQnJvd3Nlci5xcmMKZGlmZiAt LWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24uY3BwIGIv VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKaW5kZXggNTdh NTU5Mi4uMmVjOTVhZCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dz ZXJBcHBsaWNhdGlvbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJB cHBsaWNhdGlvbi5jcHAKQEAgLTM1LDcgKzM1LDYgQEAKICNpbmNsdWRlIDxRRXZlbnQ+CiAjaW5j bHVkZSA8UU1vdXNlRXZlbnQ+CiAjaW5jbHVkZSA8UVRvdWNoRXZlbnQ+Ci0jaW5jbHVkZSA8UUFw cGxpY2F0aW9uPgogCiBzdGF0aWMgaW5saW5lIGJvb2wgaXNUb3VjaEV2ZW50KGNvbnN0IFFFdmVu dCogZXZlbnQpCiB7CkBAIC02MywxMyArNjIsMTQgQEAgc3RhdGljIGlubGluZSBib29sIGlzTW91 c2VFdmVudChjb25zdCBRRXZlbnQqIGV2ZW50KQogfQogCiBNaW5pQnJvd3NlckFwcGxpY2F0aW9u OjpNaW5pQnJvd3NlckFwcGxpY2F0aW9uKGludCYgYXJnYywgY2hhcioqIGFyZ3YpCi0gICAgOiBR QXBwbGljYXRpb24oYXJnYywgYXJndikKKyAgICA6IFFHdWlBcHBsaWNhdGlvbihhcmdjLCBhcmd2 KQogICAgICwgbV9yZWFsVG91Y2hFdmVudFJlY2VpdmVkKGZhbHNlKQogICAgICwgbV9wZW5kaW5n RmFrZVRvdWNoRXZlbnRDb3VudCgwKQogICAgICwgbV9pc1JvYm90aXplZChmYWxzZSkKICAgICAs IG1fcm9ib3RUaW1lb3V0U2Vjb25kcygwKQogICAgICwgbV9yb2JvdEV4dHJhVGltZVNlY29uZHMo MCkKICAgICAsIG1fd2luZG93T3B0aW9ucyh0aGlzKQorICAgICwgbV9ob2xkaW5nQ29udHJvbChm YWxzZSkKIHsKICAgICBzZXRPcmdhbml6YXRpb25OYW1lKCJOb2tpYSIpOwogICAgIHNldEFwcGxp Y2F0aW9uTmFtZSgiUXRNaW5pQnJvd3NlciIpOwpAQCAtODAsMjMgKzgwLDI4IEBAIE1pbmlCcm93 c2VyQXBwbGljYXRpb246Ok1pbmlCcm93c2VyQXBwbGljYXRpb24oaW50JiBhcmdjLCBjaGFyKiog YXJndikKIAogYm9vbCBNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpub3RpZnkoUU9iamVjdCogdGFy Z2V0LCBRRXZlbnQqIGV2ZW50KQogeworICAgIGlmKFFJbnB1dEV2ZW50KiBpZSA9IHN0YXRpY19j YXN0PFFJbnB1dEV2ZW50Kj4oZXZlbnQpKQorICAgICAgICBtX2hvbGRpbmdDb250cm9sID0gaWUt Pm1vZGlmaWVycygpLnRlc3RGbGFnKFF0OjpDb250cm9sTW9kaWZpZXIpOworICAgIGVsc2UKKyAg ICAgICAgbV9ob2xkaW5nQ29udHJvbCA9IGZhbHNlOworCiAgICAgLy8gV2UgdHJ5IHRvIGJlIHNt YXJ0LCBpZiB3ZSByZWNlaXZlZCByZWFsIHRvdWNoIGV2ZW50LCB3ZSBhcmUgcHJvYmFibHkgb24g YSBkZXZpY2UKICAgICAvLyB3aXRoIHRvdWNoIHNjcmVlbiwgYW5kIHdlIHNob3VsZCBub3QgaGF2 ZSB0b3VjaCBtb2NraW5nLgogCiAgICAgaWYgKCFldmVudC0+c3BvbnRhbmVvdXMoKSB8fCBtX3Jl YWxUb3VjaEV2ZW50UmVjZWl2ZWQgfHwgIW1fd2luZG93T3B0aW9ucy50b3VjaE1vY2tpbmdFbmFi bGVkKCkpCi0gICAgICAgIHJldHVybiBRQXBwbGljYXRpb246Om5vdGlmeSh0YXJnZXQsIGV2ZW50 KTsKKyAgICAgICAgcmV0dXJuIFFHdWlBcHBsaWNhdGlvbjo6bm90aWZ5KHRhcmdldCwgZXZlbnQp OwogCiAgICAgaWYgKGlzVG91Y2hFdmVudChldmVudCkgJiYgc3RhdGljX2Nhc3Q8UVRvdWNoRXZl bnQqPihldmVudCktPmRldmljZVR5cGUoKSA9PSBRVG91Y2hFdmVudDo6VG91Y2hTY3JlZW4pIHsK ICAgICAgICAgaWYgKG1fcGVuZGluZ0Zha2VUb3VjaEV2ZW50Q291bnQpCiAgICAgICAgICAgICAt LW1fcGVuZGluZ0Zha2VUb3VjaEV2ZW50Q291bnQ7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IG1fcmVhbFRvdWNoRXZlbnRSZWNlaXZlZCA9IHRydWU7Ci0gICAgICAgIHJldHVybiBRQXBwbGlj YXRpb246Om5vdGlmeSh0YXJnZXQsIGV2ZW50KTsKKyAgICAgICAgcmV0dXJuIFFHdWlBcHBsaWNh dGlvbjo6bm90aWZ5KHRhcmdldCwgZXZlbnQpOwogICAgIH0KIAogICAgIEJyb3dzZXJXaW5kb3cq IGJyb3dzZXJXaW5kb3cgPSBxb2JqZWN0X2Nhc3Q8QnJvd3NlcldpbmRvdyo+KHRhcmdldCk7CiAg ICAgaWYgKCFicm93c2VyV2luZG93KQotICAgICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpub3Rp ZnkodGFyZ2V0LCBldmVudCk7CisgICAgICAgIHJldHVybiBRR3VpQXBwbGljYXRpb246Om5vdGlm eSh0YXJnZXQsIGV2ZW50KTsKIAogICAgIC8vIEluIFFNTCBldmVudHMgYXJlIHByb3BhZ2F0ZWQg dGhyb3VnaCBwYXJlbnRzLiBCdXQgc2luY2UgdGhlIFdlYlZpZXcKICAgICAvLyBtYXkgY29uc3Vt ZSBrZXkgZXZlbnRzLCBhIHNob3J0Y3V0IG1pZ2h0IG5ldmVyIHJlYWNoIHRoZSB0b3AgUVF1aWNr SXRlbS4KQEAgLTEzOSwxNiArMTQ0LDE2IEBAIGJvb2wgTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6 bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVudCkKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICBjYXNlIFFFdmVudDo6TW91c2VNb3ZlOgogICAgICAgICAgICAgaWYgKCFtb3Vz ZUV2ZW50LT5idXR0b25zKCkgfHwgIW1fdG91Y2hQb2ludHMuY29udGFpbnMobW91c2VFdmVudC0+ YnV0dG9ucygpKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gUUFwcGxpY2F0aW9uOjpub3RpZnko dGFyZ2V0LCBldmVudCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIFFHdWlBcHBsaWNhdGlvbjo6 bm90aWZ5KHRhcmdldCwgZXZlbnQpOwogICAgICAgICAgICAgdG91Y2hQb2ludC5pZCA9IG1vdXNl RXZlbnQtPmJ1dHRvbnMoKTsKICAgICAgICAgICAgIHRvdWNoUG9pbnQuc3RhdGUgPSBRdDo6VG91 Y2hQb2ludE1vdmVkOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUUV2ZW50OjpN b3VzZUJ1dHRvblJlbGVhc2U6CiAgICAgICAgICAgICB0b3VjaFBvaW50LnN0YXRlID0gUXQ6OlRv dWNoUG9pbnRSZWxlYXNlZDsKICAgICAgICAgICAgIHRvdWNoUG9pbnQuaWQgPSBtb3VzZUV2ZW50 LT5idXR0b24oKTsKLSAgICAgICAgICAgIGlmIChtb3VzZUV2ZW50LT5tb2RpZmllcnMoKS50ZXN0 RmxhZyhRdDo6Q29udHJvbE1vZGlmaWVyKSkgeworICAgICAgICAgICAgaWYgKG1faG9sZGluZ0Nv bnRyb2wpIHsKICAgICAgICAgICAgICAgICBtX2hlbGRUb3VjaFBvaW50cy5pbnNlcnQodG91Y2hQ b2ludC5pZCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFFBcHBsaWNhdGlvbjo6bm90aWZ5KHRh cmdldCwgZXZlbnQpOworICAgICAgICAgICAgICAgIHJldHVybiBRR3VpQXBwbGljYXRpb246Om5v dGlmeSh0YXJnZXQsIGV2ZW50KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBkZWZhdWx0OgpAQCAtMTY3LDcgKzE3Miw3IEBAIGJvb2wgTWluaUJyb3dzZXJBcHBs aWNhdGlvbjo6bm90aWZ5KFFPYmplY3QqIHRhcmdldCwgUUV2ZW50KiBldmVudCkKICAgICAgICAg c2VuZFRvdWNoRXZlbnQoYnJvd3NlcldpbmRvdyk7CiAgICAgfQogCi0gICAgcmV0dXJuIFFBcHBs aWNhdGlvbjo6bm90aWZ5KHRhcmdldCwgZXZlbnQpOworICAgIHJldHVybiBRR3VpQXBwbGljYXRp b246Om5vdGlmeSh0YXJnZXQsIGV2ZW50KTsKIH0KIAogdm9pZCBNaW5pQnJvd3NlckFwcGxpY2F0 aW9uOjpzZW5kVG91Y2hFdmVudChCcm93c2VyV2luZG93KiBicm93c2VyV2luZG93KQpAQCAtMTgy LDE0ICsxODcsMTMgQEAgdm9pZCBNaW5pQnJvd3NlckFwcGxpY2F0aW9uOjpzZW5kVG91Y2hFdmVu dChCcm93c2VyV2luZG93KiBicm93c2VyV2luZG93KQogICAgIG1fcGVuZGluZ0Zha2VUb3VjaEV2 ZW50Q291bnQrKzsKICAgICBRV2luZG93U3lzdGVtSW50ZXJmYWNlOjpoYW5kbGVUb3VjaEV2ZW50 KGJyb3dzZXJXaW5kb3csIGRldmljZSwgbV90b3VjaFBvaW50cy52YWx1ZXMoKSk7CiAKLSAgICBi b29sIGhvbGRpbmdDb250cm9sID0gUUFwcGxpY2F0aW9uOjprZXlib2FyZE1vZGlmaWVycygpLnRl c3RGbGFnKFF0OjpDb250cm9sTW9kaWZpZXIpOwogICAgIGlmIChRUXVpY2tXZWJWaWV3RXhwZXJp bWVudGFsOjpmbGlja2FibGVWaWV3cG9ydEVuYWJsZWQoKSkKLSAgICAgICAgYnJvd3NlcldpbmRv dy0+dXBkYXRlVmlzdWFsTW9ja1RvdWNoUG9pbnRzKGhvbGRpbmdDb250cm9sID8gbV90b3VjaFBv aW50cy52YWx1ZXMoKSA6IFFMaXN0PFFXaW5kb3dTeXN0ZW1JbnRlcmZhY2U6OlRvdWNoUG9pbnQ+ KCkpOworICAgICAgICBicm93c2VyV2luZG93LT51cGRhdGVWaXN1YWxNb2NrVG91Y2hQb2ludHMo bV9ob2xkaW5nQ29udHJvbCA/IG1fdG91Y2hQb2ludHMudmFsdWVzKCkgOiBRTGlzdDxRV2luZG93 U3lzdGVtSW50ZXJmYWNlOjpUb3VjaFBvaW50PigpKTsKIAogICAgIC8vIEdldCByaWQgb2YgdG91 Y2gtcG9pbnRzIHRoYXQgYXJlIG5vIGxvbmdlciB2YWxpZAogICAgIGZvcmVhY2ggKGNvbnN0IFFX aW5kb3dTeXN0ZW1JbnRlcmZhY2U6OlRvdWNoUG9pbnQmIHRvdWNoUG9pbnQsIG1fdG91Y2hQb2lu dHMpIHsKLSAgICBpZiAodG91Y2hQb2ludC5zdGF0ZSA9PSAgUXQ6OlRvdWNoUG9pbnRSZWxlYXNl ZCkKLSAgICAgICAgbV90b3VjaFBvaW50cy5yZW1vdmUodG91Y2hQb2ludC5pZCk7CisgICAgICAg IGlmICh0b3VjaFBvaW50LnN0YXRlID09ICBRdDo6VG91Y2hQb2ludFJlbGVhc2VkKQorICAgICAg ICAgICAgbV90b3VjaFBvaW50cy5yZW1vdmUodG91Y2hQb2ludC5pZCk7CiAgICAgfQogfQogCmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmgg Yi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3NlckFwcGxpY2F0aW9uLmgKaW5kZXggYjU1 NjU4NS4uMDQ0MWZhZCAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dz ZXJBcHBsaWNhdGlvbi5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBw bGljYXRpb24uaApAQCAtMzMsNyArMzMsNyBAQAogI2luY2x1ZGUgPFFPYmplY3Q+CiAjaW5jbHVk ZSA8UVN0cmluZ0xpc3Q+CiAjaW5jbHVkZSA8UXREZWNsYXJhdGl2ZT4KLSNpbmNsdWRlIDxRdFdp ZGdldHMvUUFwcGxpY2F0aW9uPgorI2luY2x1ZGUgPFFHdWlBcHBsaWNhdGlvbj4KICNpbmNsdWRl IDxRVG91Y2hFdmVudD4KICNpbmNsdWRlIDxRVXJsPgogI2luY2x1ZGUgInF3aW5kb3dzeXN0ZW1p bnRlcmZhY2VfcXBhLmgiCkBAIC04NCw3ICs4NCw3IEBAIHByaXZhdGU6CiAgICAgUVNpemUgbV93 aW5kb3dTaXplOwogfTsKIAotY2xhc3MgTWluaUJyb3dzZXJBcHBsaWNhdGlvbiA6IHB1YmxpYyBR QXBwbGljYXRpb24geworY2xhc3MgTWluaUJyb3dzZXJBcHBsaWNhdGlvbiA6IHB1YmxpYyBRR3Vp QXBwbGljYXRpb24gewogICAgIFFfT0JKRUNUCiAKIHB1YmxpYzoKQEAgLTExMyw2ICsxMTMsNyBA QCBwcml2YXRlOgogICAgIFFTZXQ8aW50PiBtX2hlbGRUb3VjaFBvaW50czsKIAogICAgIFdpbmRv d09wdGlvbnMgbV93aW5kb3dPcHRpb25zOworICAgIGJvb2wgbV9ob2xkaW5nQ29udHJvbDsKIH07 CiAKIFFNTF9ERUNMQVJFX1RZUEUoV2luZG93T3B0aW9ucyk7CmRpZmYgLS1naXQgYS9Ub29scy9R dFRlc3RCcm93c2VyL2xvY2F0aW9uZWRpdC5oIGIvVG9vbHMvUXRUZXN0QnJvd3Nlci9sb2NhdGlv bmVkaXQuaAppbmRleCBiNjQ0NzRkLi41NGQ4YTY4IDEwMDY0NAotLS0gYS9Ub29scy9RdFRlc3RC cm93c2VyL2xvY2F0aW9uZWRpdC5oCisrKyBiL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbG9jYXRpb25l ZGl0LmgKQEAgLTI4LDggKzI4LDYgQEAKICNpZm5kZWYgbG9jYXRpb25lZGl0X2gKICNkZWZpbmUg bG9jYXRpb25lZGl0X2gKIAotI2luY2x1ZGUgPHFjb25maWcuaD4KLQogI2lmbmRlZiBRVF9OT19J TlBVVERJQUxPRwogI2luY2x1ZGUgPFFBcHBsaWNhdGlvbj4KICNpbmNsdWRlIDxRSWNvbj4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvVGFyZ2V0LnBy aSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvVGFyZ2V0LnByaQppbmRl eCBkZTViNjNiLi40MmUwY2NjIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL1RhcmdldC5wcmkKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9UYXJnZXQucHJpCkBAIC01MCw3ICs1MCw3IEBAIEhFQURFUlMgKz0gXAogCiBE RVNURElSID0gJCR7Uk9PVF9CVUlMRF9ESVJ9L2xpYgogCi1RVCArPSBkZWNsYXJhdGl2ZSB3aWRn ZXRzCitRVCArPSBkZWNsYXJhdGl2ZQogCiBsb2FkKGZlYXR1cmVzKQogCmRpZmYgLS1naXQgYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL3F0L0FjdGl2YXRlRm9udHNRdC5j cHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL3F0L0FjdGl2YXRlRm9u dHNRdC5jcHAKaW5kZXggYmEyY2UwNC4uZTQwY2Q0ZiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9xdC9BY3RpdmF0ZUZvbnRzUXQuY3BwCisrKyBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvcXQvQWN0aXZhdGVGb250c1F0LmNw cApAQCAtMzIsMjAgKzMyLDExIEBACiAjaW5jbHVkZSAiRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQu aCIKICNpbmNsdWRlICJRdEluaXRpYWxpemVUZXN0Rm9udHMuaCIKIAotI2luY2x1ZGUgPFFBcHBs aWNhdGlvbj4KLSNpbmNsdWRlIDxRV2lkZ2V0PgotI2luY2x1ZGUgPFFXaW5kb3dzU3R5bGU+Ci0K IG5hbWVzcGFjZSBXVFIgewogCiB2b2lkIGFjdGl2YXRlRm9udHMoKQogewogICAgIFdlYktpdDo6 aW5pdGlhbGl6ZVRlc3RGb250cygpOwotCi0gICAgUUFwcGxpY2F0aW9uOjpzZXRHcmFwaGljc1N5 c3RlbShRTGF0aW4xU3RyaW5nKCJyYXN0ZXIiKSk7Ci0jaWYgSEFWRShRU1RZTEUpCi0gICAgUUFw cGxpY2F0aW9uOjpzZXRTdHlsZShuZXcgUVdpbmRvd3NTdHlsZSk7Ci0jZW5kaWYKIH0KIAogfQpk aWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9QbGF0Zm9ybVdlYlZpZXdRdC5j cHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L1BsYXRmb3JtV2ViVmlld1F0LmNwcAppbmRl eCBlOTM2OTFjLi5lZmZmMWVhIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0 L1BsYXRmb3JtV2ViVmlld1F0LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L1Bs YXRmb3JtV2ViVmlld1F0LmNwcApAQCAtMzAsNyArMzAsNyBAQAogI2luY2x1ZGUgInFxdWlja3dl YnBhZ2VfcC5oIgogI2luY2x1ZGUgInFxdWlja3dlYnZpZXdfcC5oIgogCi0jaW5jbHVkZSA8UUFw cGxpY2F0aW9uPgorI2luY2x1ZGUgPFFDb3JlQXBwbGljYXRpb24+CiAjaW5jbHVkZSA8UURlY2xh cmF0aXZlUHJvcGVydHk+CiAjaW5jbHVkZSA8UUV2ZW50TG9vcD4KICNpbmNsdWRlIDxRdFF1aWNr L1FRdWlja1ZpZXc+Cg==