157357 2016-05-04 15:05:34 -0700 Add an override point for drawing named images in ThemeCocoa 2016-05-05 01:29:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca achristensen dino ossy oldest_to_newest 1190225 0 andersca 2016-05-04 15:05:34 -0700 Add an override point for drawing named images in ThemeCocoa 1190228 1 278129 andersca 2016-05-04 15:07:40 -0700 Created attachment 278129 Patch 1190233 2 andersca 2016-05-04 15:14:06 -0700 Committed r200433: <http://trac.webkit.org/changeset/200433> 1190340 3 ossy 2016-05-05 00:34:09 -0700 (In reply to comment #2) > Committed r200433: <http://trac.webkit.org/changeset/200433> It broke the Apple Mac cmake build, this file should be renamed in cmake build system too. 1190343 4 ossy 2016-05-05 01:29:28 -0700 fixed in https://trac.webkit.org/changeset/200453 278129 2016-05-04 15:07:40 -0700 2016-05-04 15:09:14 -0700 Patch bug-157357-20160504150820.patch text/plain 13384 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjAwMzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYyMWMyZjZhY2M1MDVk Nzk2OTM1NDQ2MTgwMDdhZjc3ZWZjM2QzYi4uNjEzOWViMDBiODNiMTA2YmM0ZWYwOWM1YzdhYWMx MzIzYjlkNTgxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTA1LTA0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGFuIG92ZXJy aWRlIHBvaW50IGZvciBkcmF3aW5nIG5hbWVkIGltYWdlcyBpbiBUaGVtZUNvY29hCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTczNTcKKyAgICAgICAg cmRhcjovL3Byb2JsZW0vMjU4Nzg0NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZW5hbWUgVGhlbWVDb2NvYS5jcHAgdG8gVGhlbWVDb2NvYS5tbSBh bmQgcmVhcnJhbmdlIHRoZSBjb2RlIHRoYXQgZHJhd3MgdGhlIHdpcmVsZXNzLXBsYXliYWNrIGlt YWdlCisgICAgICAgIHNvIHdlIGNhbiBpbXBvcnQgVGhlbWVDb2NvYURyYXdOYW1lZEltYWdlLm1t IGJlbG93LgorCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgor ICAgICAgICAqIHBsYXRmb3JtL2NvY29hL1RoZW1lQ29jb2EuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Zml0Q29udGV4dFRvQm94KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlRoZW1lQ29j b2E6OmRyYXdOYW1lZEltYWdlKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9U aGVtZUNvY29hLm1tOiBSZW5hbWVkIGZyb20gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2Ev VGhlbWVDb2NvYS5jcHAuCisgICAgICAgIChXZWJDb3JlOjpmaXRDb250ZXh0VG9Cb3gpOgorICAg ICAgICAoV2ViQ29yZTo6VGhlbWVDb2NvYTo6ZHJhd05hbWVkSW1hZ2UpOgorCiAyMDE2LTA1LTAz ICBQcmFuamFsIEp1bWRlICA8cGp1bWRlQGFwcGxlLmNvbT4KIAogICAgICAgICBXb3JrZXJHbG9i YWxTY29wZSdzIHNlbGYsIGxvY2F0aW9uIGFuZCBuYXZpZ2F0b3IgYXR0cmlidXRlcyBzaG91bGQg bm90IGJlIHJlcGxhY2VhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggZjFiOWU2MjI5NGFmNWIzZTVhNGY1M2UxYmUwN2VjZWRh ZWY0OTY2Mi4uMDZiYmQ3MzNiMmYxNDk2YTk5OTFlY2E0M2U5ZGJkOTQ4ZGMzOGQ3YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisr KyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAt MTI5NSw3ICsxMjk1LDcgQEAKIAkJMzEwNzhDQzgxODgwQUFCQjAwODA5OURDIC8qIE9FU1RleHR1 cmVIYWxmRmxvYXRMaW5lYXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDMxMDc4Q0MzMTg4MEE2QTYwMDgwOTlEQyAvKiBPRVNUZXh0dXJlSGFsZkZsb2F0 TGluZWFyLmggKi87IH07CiAJCTMxMDc4Q0M5MTg4MEFBQzkwMDgwOTlEQyAvKiBKU09FU1RleHR1 cmVIYWxmRmxvYXRMaW5lYXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMzEwNzhDQzUxODgwQUFBQTAwODA5OURDIC8qIEpTT0VTVGV4dHVyZUhhbGZG bG9hdExpbmVhci5jcHAgKi87IH07CiAJCTMxMDc4Q0NBMTg4MEFBQ0UwMDgwOTlEQyAvKiBKU09F U1RleHR1cmVIYWxmRmxvYXRMaW5lYXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDMxMDc4Q0M2MTg4MEFBQUEwMDgwOTlEQyAvKiBKU09FU1RleHR1cmVI YWxmRmxvYXRMaW5lYXIuaCAqLzsgfTsKLQkJMzEwRDcxOTUxQjMzNUM5RDAwOUM3QjczIC8qIFRo ZW1lQ29jb2EuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMzEwRDcxOTMxQjMzNUM5RDAwOUM3QjczIC8qIFRoZW1lQ29jb2EuY3BwICovOyB9OworCQkz MTBENzE5NTFCMzM1QzlEMDA5QzdCNzMgLyogVGhlbWVDb2NvYS5tbSBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDMxMEQ3MTkzMUIzMzVDOUQwMDlDN0I3MyAv KiBUaGVtZUNvY29hLm1tICovOyB9OwogCQkzMTBENzE5NjFCMzM1QzlFMDA5QzdCNzMgLyogVGhl bWVDb2NvYS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MzEwRDcxOTQxQjMzNUM5RDAwOUM3QjczIC8qIFRoZW1lQ29jb2EuaCAqLzsgfTsKIAkJMzExQzA4 QkQxOEVCN0NBRjAwQjY1NjE1IC8qIG1lZGlhQ29udHJvbHNBcHBsZS5jc3MgaW4gUmVzb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IENEQzFERDQxMTdDQzJDNDgwMDhD QjU1RCAvKiBtZWRpYUNvbnRyb2xzQXBwbGUuY3NzICovOyB9OwogCQkzMTFDMDhCRTE4RUI3Q0FG MDBCNjU2MTUgLyogbWVkaWFDb250cm9sc0FwcGxlLmpzIGluIFJlc291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDREU2NTYwRTE3Q0E2RTc2MDA1MjZCQTcgLyogbWVk aWFDb250cm9sc0FwcGxlLmpzICovOyB9OwpAQCAtODc5MCw3ICs4NzkwLDcgQEAKIAkJMzEwNzhD QzQxODgwQTZBNjAwODA5OURDIC8qIE9FU1RleHR1cmVIYWxmRmxvYXRMaW5lYXIuaWRsICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gdGV4dDsgcGF0aCA9IE9FU1RleHR1cmVIYWxmRmxvYXRMaW5lYXIuaWRsOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkzMTA3OENDNTE4ODBBQUFBMDA4MDk5REMgLyogSlNPRVNU ZXh0dXJlSGFsZkZsb2F0TGluZWFyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IEpTT0VTVGV4dHVyZUhhbGZGbG9hdExpbmVhci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTMxMDc4Q0M2MTg4MEFBQUEwMDgwOTlEQyAvKiBKU09FU1RleHR1cmVIYWxm RmxvYXRMaW5lYXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNPRVNUZXh0 dXJlSGFsZkZsb2F0TGluZWFyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTMxMEQ3 MTkzMUIzMzVDOUQwMDlDN0I3MyAvKiBUaGVtZUNvY29hLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IFRoZW1lQ29jb2EuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OworCQkzMTBENzE5MzFCMzM1QzlEMDA5QzdCNzMgLyogVGhlbWVDb2NvYS5tbSAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFRoZW1lQ29jb2EubW07IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTMxMEQ3MTk0MUIzMzVDOUQwMDlDN0I3MyAvKiBUaGVtZUNv Y29hLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFRoZW1lQ29jb2EuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMzExQzA4QkMxOEUzNUQ2ODAwQjY1NjE1IC8qIENv bnRyb2xTdGF0ZXMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rpbmcg PSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ29udHJvbFN0 YXRlcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzMTI4OEU2RTBFMzAwNUQ2MDAz NjE5QUUgLyogQ1NTS2V5ZnJhbWVSdWxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IENTU0tleWZyYW1lUnVsZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CkBAIC0yMDA2NCw4ICsyMDA2NCw4IEBACiAJCQkJNUQ1OTc1QjExOTYzNUYxMTAwRDAwODc4IC8q IFN5c3RlbVZlcnNpb24uaCAqLywKIAkJCQk1RDU5NzVCMjE5NjM1RjExMDBEMDA4NzggLyogU3lz dGVtVmVyc2lvbi5tbSAqLywKIAkJCQk3Q0M1NjRCOTE4QkFDNzIwMDAxQjk2NTIgLyogVGVsZXBo b25lTnVtYmVyRGV0ZWN0b3JDb2NvYS5jcHAgKi8sCi0JCQkJMzEwRDcxOTMxQjMzNUM5RDAwOUM3 QjczIC8qIFRoZW1lQ29jb2EuY3BwICovLAogCQkJCTMxMEQ3MTk0MUIzMzVDOUQwMDlDN0I3MyAv KiBUaGVtZUNvY29hLmggKi8sCisJCQkJMzEwRDcxOTMxQjMzNUM5RDAwOUM3QjczIC8qIFRoZW1l Q29jb2EubW0gKi8sCiAJCQkJNDZEQjdENTYxQjIwRkUzQzAwNTY1MUIyIC8qIFZOb2RlVHJhY2tl ckNvY29hLmNwcCAqLywKIAkJCQlDREM5NzlGMzFDNDk4QzA5MDBEQjUwRDQgLyogV2ViQ29yZU5T RXJyb3JFeHRyYXMuaCAqLywKIAkJCQlDREM5NzlGMjFDNDk4QzA5MDBEQjUwRDQgLyogV2ViQ29y ZU5TRXJyb3JFeHRyYXMubW0gKi8sCkBAIC0zMTg5Myw3ICszMTg5Myw3IEBACiAJCQkJNDk4Nzcw RjAxMjQyQzUzNTAwMjIyNkJBIC8qIFRleHR1cmUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQ0Q5 RDgyNzUxQzdBRTUzNTAwNkZGMDY2IC8qIFRleHR1cmVDYWNoZUNWLm1tIGluIFNvdXJjZXMgKi8s CiAJCQkJQkNFNjVEMzIwRUFEMTIxMTAwN0U0NTMzIC8qIFRoZW1lLmNwcCBpbiBTb3VyY2VzICov LAotCQkJCTMxMEQ3MTk1MUIzMzVDOUQwMDlDN0I3MyAvKiBUaGVtZUNvY29hLmNwcCBpbiBTb3Vy Y2VzICovLAorCQkJCTMxMEQ3MTk1MUIzMzVDOUQwMDlDN0I3MyAvKiBUaGVtZUNvY29hLm1tIGlu IFNvdXJjZXMgKi8sCiAJCQkJNDRDOTkxQTAwRjNEMjEwRTAwNTg2NjcwIC8qIFRoZW1lSU9TLm1t IGluIFNvdXJjZXMgKi8sCiAJCQkJQkNFNjU5RTkwRUE5MkZGQTAwN0U0NTMzIC8qIFRoZW1lTWFj Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJOTc2RDZDOTQxMjJCOEEzRDAwMUZEMUY3IC8qIFRocmVh ZGFibGVCbG9iUmVnaXN0cnkuY3BwIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9UaGVtZUNvY29hLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2NvY29hL1RoZW1lQ29jb2EuY3BwCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAzMTRlZWQ1MzE1M2ExNzA5N2ZhMTk2ZTkzZGM3NzAyNDcxZjRlZWRhLi4wMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2NvY29hL1RoZW1lQ29jb2EuY3BwCisrKyAvZGV2L251bGwKQEAgLTEsOTAgKzAsMCBAQAotLyoK LSAqIENvcHlyaWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCi0g KgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAot ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBg QVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQotICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1F UkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFS RSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgotICogQ09OVFJJ QlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsCi0gKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKLSAqIFBST0ZJVFM7IE9SIEJVU0lO RVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKLSAqIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpbXBvcnQgImNvbmZp Zy5oIgotI2ltcG9ydCAiVGhlbWVDb2NvYS5oIgotCi0jaW1wb3J0ICJHcmFwaGljc0NvbnRleHQu aCIKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1zdGF0aWMgdm9pZCBmaXRDb250ZXh0VG9Cb3go R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFNpemUmIHNyY0ltYWdlU2l6ZSwg Y29uc3QgRmxvYXRTaXplJiBkc3RTaXplKQotewotICAgIGZsb2F0IHNyY1JhdGlvID0gc3JjSW1h Z2VTaXplLmFzcGVjdFJhdGlvKCk7Ci0gICAgZmxvYXQgZHN0UmF0aW8gPSBkc3RTaXplLmFzcGVj dFJhdGlvKCk7Ci0KLSAgICBmbG9hdCBzY2FsZTsKLSAgICBmbG9hdCB0cmFuc2xhdGlvblggPSAw OwotICAgIGZsb2F0IHRyYW5zbGF0aW9uWSA9IDA7Ci0gICAgaWYgKHNyY1JhdGlvID4gZHN0UmF0 aW8pIHsKLSAgICAgICAgc2NhbGUgPSBkc3RTaXplLndpZHRoKCkgLyBzcmNJbWFnZVNpemUud2lk dGgoKTsKLSAgICAgICAgdHJhbnNsYXRpb25ZID0gKGRzdFNpemUuaGVpZ2h0KCkgLSBzY2FsZSAq IHNyY0ltYWdlU2l6ZS5oZWlnaHQoKSkgLyAyOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIHNjYWxl ID0gZHN0U2l6ZS5oZWlnaHQoKSAvIHNyY0ltYWdlU2l6ZS5oZWlnaHQoKTsKLSAgICAgICAgdHJh bnNsYXRpb25YID0gKGRzdFNpemUud2lkdGgoKSAtIHNjYWxlICogc3JjSW1hZ2VTaXplLndpZHRo KCkpIC8gMjsKLSAgICB9Ci0gICAgY29udGV4dC50cmFuc2xhdGUodHJhbnNsYXRpb25YLCB0cmFu c2xhdGlvblkpOwotICAgIGNvbnRleHQuc2NhbGUoRmxvYXRTaXplKHNjYWxlLCBzY2FsZSkpOwot fQotCi12b2lkIFRoZW1lQ29jb2E6OmRyYXdOYW1lZEltYWdlKGNvbnN0IFN0cmluZyYgbmFtZSwg R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QpIGNvbnN0Ci17 Ci0gICAgLy8gV2Ugb25seSBoYW5kbGUgb25lIGljb24gYXQgdGhlIG1vbWVudC4KLSAgICBpZiAo bmFtZSAhPSAid2lyZWxlc3MtcGxheWJhY2siKSB7Ci0gICAgICAgIFRoZW1lOjpkcmF3TmFtZWRJ bWFnZShuYW1lLCBjb250ZXh0LCByZWN0KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAg IEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKLSAgICBjb250 ZXh0LnNldEZpbGxDb2xvcihDb2xvcjo6YmxhY2spOwotCi0gICAgRmxvYXRTaXplIHdpcmVsZXNz UGxheWJhY2tTcmNTaXplKDMyLCAyNC4wMTYpOwotICAgIGZpdENvbnRleHRUb0JveChjb250ZXh0 LCB3aXJlbGVzc1BsYXliYWNrU3JjU2l6ZSwgcmVjdC5zaXplKCkpOwotCi0gICAgUGF0aCBvdXRs aW5lOwotICAgIG91dGxpbmUubW92ZVRvKEZsb2F0UG9pbnQoMjQuMDY2LCAxOCkpOwotICAgIG91 dGxpbmUuYWRkTGluZVRvKEZsb2F0UG9pbnQoMjIuMTExLCAxNikpOwotICAgIG91dGxpbmUuYWRk TGluZVRvKEZsb2F0UG9pbnQoMzAsIDE2KSk7Ci0gICAgb3V0bGluZS5hZGRMaW5lVG8oRmxvYXRQ b2ludCgzMCwgMikpOwotICAgIG91dGxpbmUuYWRkTGluZVRvKEZsb2F0UG9pbnQoMiwgMikpOwot ICAgIG91dGxpbmUuYWRkTGluZVRvKEZsb2F0UG9pbnQoMiwgMTYpKTsKLSAgICBvdXRsaW5lLmFk ZExpbmVUbyhGbG9hdFBvaW50KDkuOTA4LCAxNikpOwotICAgIG91dGxpbmUuYWRkTGluZVRvKEZs b2F0UG9pbnQoNy45NTMsIDE4KSk7Ci0gICAgb3V0bGluZS5hZGRMaW5lVG8oRmxvYXRQb2ludCgw LCAxOCkpOwotICAgIG91dGxpbmUuYWRkTGluZVRvKEZsb2F0UG9pbnQoMCwgMCkpOwotICAgIG91 dGxpbmUuYWRkTGluZVRvKEZsb2F0UG9pbnQoMzIsIDApKTsKLSAgICBvdXRsaW5lLmFkZExpbmVU byhGbG9hdFBvaW50KDMyLCAxOCkpOwotICAgIG91dGxpbmUuYWRkTGluZVRvKEZsb2F0UG9pbnQo MjQuMDY2LCAxOCkpOwotICAgIG91dGxpbmUuY2xvc2VTdWJwYXRoKCk7Ci0gICAgb3V0bGluZS5t b3ZlVG8oRmxvYXRQb2ludCgyNi45MTcsIDI0LjAxNikpOwotICAgIG91dGxpbmUuYWRkTGluZVRv KEZsb2F0UG9pbnQoNS4wNDAsIDI0LjAxNikpOwotICAgIG91dGxpbmUuYWRkTGluZVRvKEZsb2F0 UG9pbnQoMTUuOTc4LCAxMi44MjgpKTsKLSAgICBvdXRsaW5lLmFkZExpbmVUbyhGbG9hdFBvaW50 KDI2LjkxNywgMjQuMDE2KSk7Ci0gICAgb3V0bGluZS5jbG9zZVN1YnBhdGgoKTsKLSAgICAKLSAg ICBjb250ZXh0LmZpbGxQYXRoKG91dGxpbmUpOwotfQotCi19CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9UaGVtZUNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY29jb2EvVGhlbWVDb2NvYS5tbQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wM2ZmMjhhOTMzZDYxMTEyYjI0 NTc5NjBkZTYwODhjYjJkNTFmMzM0Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY29jb2EvVGhlbWVDb2NvYS5tbQpAQCAtMCwwICsxLDk0IEBACisvKgorICogQ29w eXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9u cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K KyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycn IEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMg QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwK KyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5U RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklM SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2ltcG9ydCAiY29uZmlnLmgiCisj aW1wb3J0ICJUaGVtZUNvY29hLmgiCisKKyNpbXBvcnQgIkdyYXBoaWNzQ29udGV4dC5oIgorCitu YW1lc3BhY2UgV2ViQ29yZSB7CisKK3N0YXRpYyB2b2lkIGZpdENvbnRleHRUb0JveChHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0U2l6ZSYgc3JjSW1hZ2VTaXplLCBjb25zdCBG bG9hdFNpemUmIGRzdFNpemUpCit7CisgICAgZmxvYXQgc3JjUmF0aW8gPSBzcmNJbWFnZVNpemUu YXNwZWN0UmF0aW8oKTsKKyAgICBmbG9hdCBkc3RSYXRpbyA9IGRzdFNpemUuYXNwZWN0UmF0aW8o KTsKKworICAgIGZsb2F0IHNjYWxlOworICAgIGZsb2F0IHRyYW5zbGF0aW9uWCA9IDA7CisgICAg ZmxvYXQgdHJhbnNsYXRpb25ZID0gMDsKKyAgICBpZiAoc3JjUmF0aW8gPiBkc3RSYXRpbykgewor ICAgICAgICBzY2FsZSA9IGRzdFNpemUud2lkdGgoKSAvIHNyY0ltYWdlU2l6ZS53aWR0aCgpOwor ICAgICAgICB0cmFuc2xhdGlvblkgPSAoZHN0U2l6ZS5oZWlnaHQoKSAtIHNjYWxlICogc3JjSW1h Z2VTaXplLmhlaWdodCgpKSAvIDI7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc2NhbGUgPSBkc3RT aXplLmhlaWdodCgpIC8gc3JjSW1hZ2VTaXplLmhlaWdodCgpOworICAgICAgICB0cmFuc2xhdGlv blggPSAoZHN0U2l6ZS53aWR0aCgpIC0gc2NhbGUgKiBzcmNJbWFnZVNpemUud2lkdGgoKSkgLyAy OworICAgIH0KKyAgICBjb250ZXh0LnRyYW5zbGF0ZSh0cmFuc2xhdGlvblgsIHRyYW5zbGF0aW9u WSk7CisgICAgY29udGV4dC5zY2FsZShGbG9hdFNpemUoc2NhbGUsIHNjYWxlKSk7Cit9CisKK3Zv aWQgVGhlbWVDb2NvYTo6ZHJhd05hbWVkSW1hZ2UoY29uc3QgU3RyaW5nJiBuYW1lLCBHcmFwaGlj c0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkgY29uc3QKK3sKKyAgICAv LyBXZSBvbmx5IGhhbmRsZSBvbmUgaWNvbiBhdCB0aGUgbW9tZW50LgorICAgIGlmIChuYW1lID09 ICJ3aXJlbGVzcy1wbGF5YmFjayIpIHsKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZl ciBzdGF0ZVNhdmVyKGNvbnRleHQpOworICAgICAgICBjb250ZXh0LnNldEZpbGxDb2xvcihDb2xv cjo6YmxhY2spOworCisgICAgICAgIEZsb2F0U2l6ZSB3aXJlbGVzc1BsYXliYWNrU3JjU2l6ZSgz MiwgMjQuMDE2KTsKKyAgICAgICAgZml0Q29udGV4dFRvQm94KGNvbnRleHQsIHdpcmVsZXNzUGxh eWJhY2tTcmNTaXplLCByZWN0LnNpemUoKSk7CisKKyAgICAgICAgUGF0aCBvdXRsaW5lOworICAg ICAgICBvdXRsaW5lLm1vdmVUbyhGbG9hdFBvaW50KDI0LjA2NiwgMTgpKTsKKyAgICAgICAgb3V0 bGluZS5hZGRMaW5lVG8oRmxvYXRQb2ludCgyMi4xMTEsIDE2KSk7CisgICAgICAgIG91dGxpbmUu YWRkTGluZVRvKEZsb2F0UG9pbnQoMzAsIDE2KSk7CisgICAgICAgIG91dGxpbmUuYWRkTGluZVRv KEZsb2F0UG9pbnQoMzAsIDIpKTsKKyAgICAgICAgb3V0bGluZS5hZGRMaW5lVG8oRmxvYXRQb2lu dCgyLCAyKSk7CisgICAgICAgIG91dGxpbmUuYWRkTGluZVRvKEZsb2F0UG9pbnQoMiwgMTYpKTsK KyAgICAgICAgb3V0bGluZS5hZGRMaW5lVG8oRmxvYXRQb2ludCg5LjkwOCwgMTYpKTsKKyAgICAg ICAgb3V0bGluZS5hZGRMaW5lVG8oRmxvYXRQb2ludCg3Ljk1MywgMTgpKTsKKyAgICAgICAgb3V0 bGluZS5hZGRMaW5lVG8oRmxvYXRQb2ludCgwLCAxOCkpOworICAgICAgICBvdXRsaW5lLmFkZExp bmVUbyhGbG9hdFBvaW50KDAsIDApKTsKKyAgICAgICAgb3V0bGluZS5hZGRMaW5lVG8oRmxvYXRQ b2ludCgzMiwgMCkpOworICAgICAgICBvdXRsaW5lLmFkZExpbmVUbyhGbG9hdFBvaW50KDMyLCAx OCkpOworICAgICAgICBvdXRsaW5lLmFkZExpbmVUbyhGbG9hdFBvaW50KDI0LjA2NiwgMTgpKTsK KyAgICAgICAgb3V0bGluZS5jbG9zZVN1YnBhdGgoKTsKKyAgICAgICAgb3V0bGluZS5tb3ZlVG8o RmxvYXRQb2ludCgyNi45MTcsIDI0LjAxNikpOworICAgICAgICBvdXRsaW5lLmFkZExpbmVUbyhG bG9hdFBvaW50KDUuMDQwLCAyNC4wMTYpKTsKKyAgICAgICAgb3V0bGluZS5hZGRMaW5lVG8oRmxv YXRQb2ludCgxNS45NzgsIDEyLjgyOCkpOworICAgICAgICBvdXRsaW5lLmFkZExpbmVUbyhGbG9h dFBvaW50KDI2LjkxNywgMjQuMDE2KSk7CisgICAgICAgIG91dGxpbmUuY2xvc2VTdWJwYXRoKCk7 CisKKyAgICAgICAgY29udGV4dC5maWxsUGF0aChvdXRsaW5lKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKworI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaW5jbHVkZSA8V2ViS2l0QWRk aXRpb25zL1RoZW1lQ29jb2FEcmF3TmFtZWRJbWFnZS5tbT4KKyNlbmRpZgorCisgICAgVGhlbWU6 OmRyYXdOYW1lZEltYWdlKG5hbWUsIGNvbnRleHQsIHJlY3QpOworfQorCit9Cg==