29327 2009-09-17 00:12:32 -0700 FontDescription.h includes RenderStyleConstants.h, which violates layering 2009-09-17 10:44:39 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned bdakin oldest_to_newest 147749 0 mitz 2009-09-17 00:12:32 -0700 FontDescription.h includes RenderStyleConstants.h for the FontSmoothing enum, but that constitutes a layering violation (platform code should not depend on other engine code). Patch forthcoming. 147751 1 39682 mitz 2009-09-17 00:23:04 -0700 Created attachment 39682 Move the FontSmoothing enum into platform 147813 2 39682 simon.fraser 2009-09-17 09:23:22 -0700 Comment on attachment 39682 Move the FontSmoothing enum into platform r=me but you should check to see if other build system need fixing. 147839 3 mitz 2009-09-17 10:34:15 -0700 Fixed in <http://trac.webkit.org/projects/webkit/changeset/48474> 147845 4 mitz 2009-09-17 10:44:39 -0700 And <http://trac.webkit.org/projects/webkit/changeset/48475> 39682 2009-09-17 00:23:04 -0700 2009-09-17 09:23:21 -0700 Move the FontSmoothing enum into platform 29327_r1.diff text/plain 13483 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODQ1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzYgQEAKKzIwMDktMDktMTcgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb250 RGVzY3JpcHRpb24uaCBpbmNsdWRlcyBSZW5kZXJTdHlsZUNvbnN0YW50cy5oLCB3aGljaCB2aW9s YXRlcyBsYXllcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjkzMjcKKworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ajogQWRkZWQgRm9udFNtb290aGluZ01vZGUuaCBhbmQgbWFkZQorICAgICAgICAgICAgaXQgYSBw cml2YXRlIGhlYWRlci4KKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0 UHJvcGVydHlDU1NWYWx1ZSk6IEdldCB0aGUKKyAgICAgICAgICAgIGZvbnQgc21vb3RoaW5nIG1v ZGUgdmlhIHRoZSBmb250IGRlc2NyaXB0aW9uLgorICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVW YWx1ZU1hcHBpbmdzLmg6IEluY2x1ZGUgRm9udFNtb290aGluZ01vZGUuaAorICAgICAgICAoV2Vi Q29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKTogVXBkYXRlZCBmb3Ig dGhlIHJlbmFtZQorICAgICAgICAgICAgb2YgRm9udFNtb290aGluZyB0byBGb250U21vb3RoaW5n TW9kZS4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBGb250 U21vb3RoaW5nTW9kZSk6IERpdHRvLgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOiBH ZXQgdGhlIGZvbnQgc21vb3RoaW5nIG1vZGUKKyAgICAgICAgICAgIHZpYSB0aGUgZm9udCBkZXNj cmlwdGlvbi4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250RGVzY3JpcHRpb24uaDog RG8gbm90IGluY2x1ZGUKKyAgICAgICAgICAgIFJlbmRlclN0eWxlQ29uc3RhbnRzLmguCisgICAg ICAgIChXZWJDb3JlOjpGb250RGVzY3JpcHRpb246OmZvbnRTbW9vdGhpbmcpOiBVcGRhdGVkIGZv ciB0aGUgcmVuYW1lIG9mCisgICAgICAgICAgICBGb250U21vb3RoaW5nIHRvIEZvbnRTbW9vdGhp bmdNb2RlLgorICAgICAgICAoV2ViQ29yZTo6Rm9udERlc2NyaXB0aW9uOjpzZXRGb250U21vb3Ro aW5nKTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFNtb290aGluZ01v ZGUuaDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpGb250U21vb3RoaW5nTW9kZSk6IE1vdmVk IHRoZSBGb250U21vb3RoaW5nIGVudW0gZnJvbQorICAgICAgICAgICAgUmVuZGVyU3R5bGVDb25z dGFudHMgaGVyZSBhbmQgcmVuYW1lZCBpdCB0byB0aGlzLgorICAgICAgICAqIHJlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6OmZv bnRTbW9vdGhpbmcpOiBSZW1vdmVkIHRoaXMgZ2V0dGVyLCBzaW5jZQorICAgICAgICAgICAgdGhp cyBjYW4gYmUgYWNjZXNzZWQgdmlhIHRoZSBmb250IGRlc2NyaXB0aW9uLgorICAgICAgICAqIHJl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oOiBNb3ZlZCB0aGUgRm9udFNtb290 aGluZyBlbnVtCisgICAgICAgICAgICBmcm9tIGhlcmUgdG8gRm9udFNtb290aGluZ01vZGUuaC4K KwogMjAwOS0wOS0xNiAgRGFuaWVsIEJhdGVzICA8ZGJhdGVzQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gNDg0NTMpCisrKyBXZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtNjU2LDYgKzY1Niw3 IEBACiAJCTM3MUY1MUEyMEQyNjJGQTAwMEVDRTBENSAvKiBDU1NTZWdtZW50ZWRGb250RmFjZS5j cHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzNzFGNTFB MDBEMjYyRkEwMDBFQ0UwRDUgLyogQ1NTU2VnbWVudGVkRm9udEZhY2UuY3BwICovOyB9OwogCQkz NzFGNTNFOTBEMjcwNEY5MDBFQ0UwRDUgLyogQ1NTVW5pY29kZVJhbmdlVmFsdWUuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3MUY1M0U3MEQyNzA0Rjkw MEVDRTBENSAvKiBDU1NVbmljb2RlUmFuZ2VWYWx1ZS5oICovOyB9OwogCQkzNzFGNTNFQTBEMjcw NEY5MDBFQ0UwRDUgLyogQ1NTVW5pY29kZVJhbmdlVmFsdWUuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzcxRjUzRTgwRDI3MDRGOTAwRUNFMEQ1IC8q IENTU1VuaWNvZGVSYW5nZVZhbHVlLmNwcCAqLzsgfTsKKwkJMzcyMDIxOTkxMDYyMTNDNjAwRjI1 QzRCIC8qIEZvbnRTbW9vdGhpbmdNb2RlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAzNzIwMjE5ODEwNjIxM0M2MDBGMjVDNEIgLyogRm9udFNtb290aGlu Z01vZGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9Owog CQkzNzI0Q0E1NzBFNjhBN0U0MDBEQjQzODQgLyogQ29yZVRleHRDb250cm9sbGVyLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzNzI0Q0E1NDBFNjhBN0U0 MDBEQjQzODQgLyogQ29yZVRleHRDb250cm9sbGVyLmggKi87IH07CiAJCTM3MjRDQTU4MEU2OEE3 RTQwMERCNDM4NCAvKiBDb3JlVGV4dENvbnRyb2xsZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzcyNENBNTUwRTY4QTdFNDAwREI0Mzg0IC8qIENv cmVUZXh0Q29udHJvbGxlci5jcHAgKi87IH07CiAJCTM3MjRDQTU5MEU2OEE3RTQwMERCNDM4NCAv KiBGb250TWFjQVRTVUkubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAzNzI0Q0E1NjBFNjhBN0U0MDBEQjQzODQgLyogRm9udE1hY0FUU1VJLm1tICovOyB9 OwpAQCAtNTgwOSw2ICs1ODEwLDcgQEAKIAkJMzcxRjUxQTAwRDI2MkZBMDAwRUNFMEQ1IC8qIENT U1NlZ21lbnRlZEZvbnRGYWNlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IENTU1NlZ21lbnRlZEZvbnRGYWNlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJMzcxRjUzRTcwRDI3MDRGOTAwRUNFMEQ1IC8qIENTU1VuaWNvZGVSYW5nZVZhbHVlLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENTU1VuaWNvZGVSYW5nZVZhbHVlLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTM3MUY1M0U4MEQyNzA0RjkwMEVDRTBENSAvKiBD U1NVbmljb2RlUmFuZ2VWYWx1ZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBDU1NVbmljb2RlUmFuZ2VWYWx1ZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CisJCTM3MjAyMTk4MTA2MjEzQzYwMEYyNUM0QiAvKiBGb250U21vb3RoaW5nTW9kZS5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBGb250U21vb3RoaW5nTW9kZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkzNzI0Q0E1NDBFNjhBN0U0MDBEQjQzODQgLyogQ29yZVRl eHRDb250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENvcmVUZXh0 Q29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzNzI0Q0E1NTBFNjhB N0U0MDBEQjQzODQgLyogQ29yZVRleHRDb250cm9sbGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IENvcmVUZXh0Q29udHJvbGxlci5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTM3MjRDQTU2MEU2OEE3RTQwMERCNDM4NCAvKiBGb250TWFjQVRTVUku bW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBGb250TWFjQVRTVUku bW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xMzkxNyw2ICsxMzkxOSw3IEBACiAJ CQkJNzI2MjZFMDEwRUYwMjJGRTAwQTA3RTIwIC8qIEZvbnRGYXN0UGF0aC5jcHAgKi8sCiAJCQkJ MzdBQ0NFNDEwREEyOTgwRjAwODlFNjAyIC8qIEZvbnRSZW5kZXJpbmdNb2RlLmggKi8sCiAJCQkJ QjJDM0RBNUEwRDAwNkNENjAwRUY2RjI2IC8qIEZvbnRTZWxlY3Rvci5oICovLAorCQkJCTM3MjAy MTk4MTA2MjEzQzYwMEYyNUM0QiAvKiBGb250U21vb3RoaW5nTW9kZS5oICovLAogCQkJCTM3ODRD MzRBMEUxMUFBMzQwMDdEOEQ0OCAvKiBGb250VHJhaXRzTWFzay5oICovLAogCQkJCUJDRTA0Qzkz MERBRkY5MDIwMDdBMEY0MSAvKiBHZW5lcmF0ZWRJbWFnZS5jcHAgKi8sCiAJCQkJQkMyM0YwREEw REFGRjRBNDAwOUZEQzkxIC8qIEdlbmVyYXRlZEltYWdlLmggKi8sCkBAIC0xNzgwOSw2ICsxNzgx Miw3IEBACiAJCQkJNTEwRDRBNEYxMDMxNzdBMjAwNDlFQTU0IC8qIFdlYlNvY2tldENoYW5uZWwu aCBpbiBIZWFkZXJzICovLAogCQkJCTUxMEQ0QTUwMTAzMTc3QTIwMDQ5RUE1NCAvKiBXZWJTb2Nr ZXRDaGFubmVsQ2xpZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQk1MUFCQUU0NTEwNDNBQjRBMDA4 QzUyNjAgLyogV2ViU29ja2V0SGFuZHNoYWtlLmggaW4gSGVhZGVycyAqLywKKwkJCQkzNzIwMjE5 OTEwNjIxM0M2MDBGMjVDNEIgLyogRm9udFNtb290aGluZ01vZGUuaCBpbiBIZWFkZXJzICovLAog CQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpJ bmRleDogV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCShyZXZp c2lvbiA0ODQ1MykKKysrIFdlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTExMjIsNyArMTEyMiw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFs dWU+IENTU0NvbXB1dGVkU3R5bGVEZWMKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVJlc2l6ZToK ICAgICAgICAgICAgIHJldHVybiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKHN0eWxlLT5yZXNp emUoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGb250U21vb3RoaW5nOgotICAg ICAgICAgICAgcmV0dXJuIENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoc3R5bGUtPmZvbnRTbW9v dGhpbmcoKSk7CisgICAgICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShz dHlsZS0+Zm9udERlc2NyaXB0aW9uKCkuZm9udFNtb290aGluZygpKTsKICAgICAgICAgY2FzZSBD U1NQcm9wZXJ0eVpJbmRleDoKICAgICAgICAgICAgIGlmIChzdHlsZS0+aGFzQXV0b1pJbmRleCgp KQogICAgICAgICAgICAgICAgIHJldHVybiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlSWRlbnRp ZmllcihDU1NWYWx1ZUF1dG8pOwpJbmRleDogV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVN YXBwaW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFw cGluZ3MuaAkocmV2aXNpb24gNDg0NTMpCisrKyBXZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1 ZU1hcHBpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1ZGUg IkNTU1ByaW1pdGl2ZVZhbHVlLmgiCiAjaW5jbHVkZSAiQ1NTVmFsdWVLZXl3b3Jkcy5oIgorI2lu Y2x1ZGUgIkZvbnRTbW9vdGhpbmdNb2RlLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NUeXBlcy5oIgog I2luY2x1ZGUgIlBhdGguaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZUNvbnN0YW50cy5oIgpAQCAt MTc5OCw3ICsxNzk5LDcgQEAgdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9w ZQogICAgIH0KIH0KIAotdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU1By aW1pdGl2ZVZhbHVlKEZvbnRTbW9vdGhpbmcgc21vb3RoaW5nKQordGVtcGxhdGU8PiBpbmxpbmUg Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKEZvbnRTbW9vdGhpbmdNb2RlIHNt b290aGluZykKICAgICA6IG1fdHlwZShDU1NfSURFTlQpCiB7CiAgICAgc3dpdGNoIChzbW9vdGhp bmcpIHsKQEAgLTE4MjAsNyArMTgyMSw3IEBAIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1MKICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVBdXRvOwogfQogCi10ZW1w bGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgRm9udFNtb290aGluZygp IGNvbnN0Cit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgRm9u dFNtb290aGluZ01vZGUoKSBjb25zdAogewogICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgewog ICAgIGNhc2UgQ1NTVmFsdWVBdXRvOgpJbmRleDogV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJl dmlzaW9uIDQ4NDUzKQorKysgV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM0OTgsMTQgKzM0OTgsMTQgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjph cHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGb250U21vb3RoaW5n OiB7CiAgICAgICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBtX3N0eWxlLT5m b250RGVzY3JpcHRpb24oKTsKICAgICAgICAgaWYgKGlzSW5oZXJpdCkgCi0gICAgICAgICAgICBm b250RGVzY3JpcHRpb24uc2V0Rm9udFNtb290aGluZyhtX3BhcmVudFN0eWxlLT5mb250U21vb3Ro aW5nKCkpOworICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEZvbnRTbW9vdGhpbmcobV9w YXJlbnRTdHlsZS0+Zm9udERlc2NyaXB0aW9uKCkuZm9udFNtb290aGluZygpKTsKICAgICAgICAg ZWxzZSBpZiAoaXNJbml0aWFsKQogICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEZvbnRT bW9vdGhpbmcoQXV0b1Ntb290aGluZyk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgaWYg KCFwcmltaXRpdmVWYWx1ZSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBp bnQgaWQgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKTsKLSAgICAgICAgICAgIEZvbnRTbW9v dGhpbmcgc21vb3RoaW5nOworICAgICAgICAgICAgRm9udFNtb290aGluZ01vZGUgc21vb3RoaW5n OwogICAgICAgICAgICAgc3dpdGNoIChpZCkgewogICAgICAgICAgICAgICAgIGNhc2UgQ1NTVmFs dWVBdXRvOgogICAgICAgICAgICAgICAgICAgICBzbW9vdGhpbmcgPSBBdXRvU21vb3RoaW5nOwpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250RGVzY3JpcHRpb24uaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnREZXNjcmlwdGlvbi5oCShyZXZp c2lvbiA0ODQ1MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9u LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDggKzI3LDggQEAKIAogI2luY2x1ZGUgIkZvbnRGYW1p bHkuaCIKICNpbmNsdWRlICJGb250UmVuZGVyaW5nTW9kZS5oIgorI2luY2x1ZGUgIkZvbnRTbW9v dGhpbmdNb2RlLmgiCiAjaW5jbHVkZSAiRm9udFRyYWl0c01hc2suaCIKLSNpbmNsdWRlICJSZW5k ZXJTdHlsZUNvbnN0YW50cy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTg2LDcgKzg2 LDcgQEAgcHVibGljOgogICAgIGJvb2wgdXNlRml4ZWREZWZhdWx0U2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIGdlbmVyaWNGYW1pbHkoKSA9PSBNb25vc3BhY2VGYW1pbHkgJiYgIWZhbWlseSgpLm5leHQo KSAmJiBmYW1pbHkoKS5mYW1pbHkoKSA9PSAiLXdlYmtpdC1tb25vc3BhY2UiOyB9CiAgICAgRm9u dFJlbmRlcmluZ01vZGUgcmVuZGVyaW5nTW9kZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0 PEZvbnRSZW5kZXJpbmdNb2RlPihtX3JlbmRlcmluZ01vZGUpOyB9CiAgICAgdW5zaWduZWQga2V5 d29yZFNpemUoKSBjb25zdCB7IHJldHVybiBtX2tleXdvcmRTaXplOyB9Ci0gICAgRm9udFNtb290 aGluZyBmb250U21vb3RoaW5nKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Rm9udFNtb290 aGluZz4obV9mb250U21vb3RoaW5nKTsgfQorICAgIEZvbnRTbW9vdGhpbmdNb2RlIGZvbnRTbW9v dGhpbmcoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxGb250U21vb3RoaW5nTW9kZT4obV9m b250U21vb3RoaW5nKTsgfQogCiAgICAgRm9udFRyYWl0c01hc2sgdHJhaXRzTWFzaygpIGNvbnN0 OwogCkBAIC0xMDEsNyArMTAxLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VXNlUHJpbnRlckZv bnQoYm9vbCBwKSB7IG1fdXNlUHJpbnRlckZvbnQgPSBwOyB9CiAgICAgdm9pZCBzZXRSZW5kZXJp bmdNb2RlKEZvbnRSZW5kZXJpbmdNb2RlIG1vZGUpIHsgbV9yZW5kZXJpbmdNb2RlID0gbW9kZTsg fQogICAgIHZvaWQgc2V0S2V5d29yZFNpemUodW5zaWduZWQgcykgeyBtX2tleXdvcmRTaXplID0g czsgfQotICAgIHZvaWQgc2V0Rm9udFNtb290aGluZyhGb250U21vb3RoaW5nIHNtb290aGluZykg eyBtX2ZvbnRTbW9vdGhpbmcgPSBzbW9vdGhpbmc7IH0KKyAgICB2b2lkIHNldEZvbnRTbW9vdGhp bmcoRm9udFNtb290aGluZ01vZGUgc21vb3RoaW5nKSB7IG1fZm9udFNtb290aGluZyA9IHNtb290 aGluZzsgfQogCiBwcml2YXRlOgogICAgIEZvbnRGYW1pbHkgbV9mYW1pbHlMaXN0OyAvLyBUaGUg bGlzdCBvZiBmb250IGZhbWlsaWVzIHRvIGJlIHVzZWQuCkBAIC0xMjQsNyArMTI0LDcgQEAgcHJp dmF0ZToKICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHRoZW4gd2UgY2FuIGFjY3VyYXRl bHkgdHJhbnNsYXRlIGFjcm9zcyBkaWZmZXJlbnQgZ2VuZXJpYyBmYW1pbGllcyB0byBhZGp1c3Qg Zm9yIGRpZmZlcmVudCBwcmVmZXJlbmNlIHNldHRpbmdzCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvLyAoZS5nLiwgMTNweCBtb25vc3BhY2UgdnMuIDE2cHggZXZlcnl0aGluZyBlbHNlKS4g IFNpemVzIGFyZSAxLTggKGxpa2UgdGhlIEhUTUwgc2l6ZSB2YWx1ZXMgZm9yIDxmb250PikuCiAK LSAgICB1bnNpZ25lZCBtX2ZvbnRTbW9vdGhpbmcgOiAyOyAvLyBGb250U21vb3RoaW5nCisgICAg dW5zaWduZWQgbV9mb250U21vb3RoaW5nIDogMjsgLy8gRm9udFNtb290aGluZ01vZGUKIH07CiAK IGlubGluZSBib29sIEZvbnREZXNjcmlwdGlvbjo6b3BlcmF0b3I9PShjb25zdCBGb250RGVzY3Jp cHRpb24mIG90aGVyKSBjb25zdApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 U21vb3RoaW5nTW9kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udFNtb290aGluZ01vZGUuaAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udFNtb290aGluZ01vZGUuaAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzNSBAQAor LyoKKyAqIENvcHlyaWdodCAoQykgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMu IGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgorICogQ09O VFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws IFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAq IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1Ig VE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyAqLworCisjaWZuZGVmIEZv bnRTbW9vdGhpbmdNb2RlX2gKKyNkZWZpbmUgRm9udFNtb290aGluZ01vZGVfaAorCituYW1lc3Bh Y2UgV2ViQ29yZSB7CisKKyAgICBlbnVtIEZvbnRTbW9vdGhpbmdNb2RlIHsgQXV0b1Ntb290aGlu ZywgTm9TbW9vdGhpbmcsIEFudGlhbGlhc2VkLCBTdWJwaXhlbEFudGlhbGlhc2VkIH07CisgICAg Cit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZiAvLyBGb250U21vb3RoaW5nTW9kZV9o CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDQ4NDUz KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29ya2luZyBjb3B5 KQpAQCAtNDM0LDcgKzQzNCw2IEBAIHB1YmxpYzoKICAgICBjb25zdCBGb250JiBmb250KCkgY29u c3QgeyByZXR1cm4gaW5oZXJpdGVkLT5mb250OyB9CiAgICAgY29uc3QgRm9udERlc2NyaXB0aW9u JiBmb250RGVzY3JpcHRpb24oKSBjb25zdCB7IHJldHVybiBpbmhlcml0ZWQtPmZvbnQuZm9udERl c2NyaXB0aW9uKCk7IH0KICAgICBpbnQgZm9udFNpemUoKSBjb25zdCB7IHJldHVybiBpbmhlcml0 ZWQtPmZvbnQucGl4ZWxTaXplKCk7IH0KLSAgICBGb250U21vb3RoaW5nIGZvbnRTbW9vdGhpbmco KSBjb25zdCB7IHJldHVybiBpbmhlcml0ZWQtPmZvbnQuZm9udERlc2NyaXB0aW9uKCkuZm9udFNt b290aGluZygpOyB9CiAKICAgICBjb25zdCBDb2xvciYgY29sb3IoKSBjb25zdCB7IHJldHVybiBp bmhlcml0ZWQtPmNvbG9yOyB9CiAgICAgTGVuZ3RoIHRleHRJbmRlbnQoKSBjb25zdCB7IHJldHVy biBpbmhlcml0ZWQtPmluZGVudDsgfQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGVDb25zdGFudHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCShyZXZpc2lvbiA0ODQ1MykKKysrIFdlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMy MSwxMCArMzIxLDYgQEAgZW51bSBFQmFja2ZhY2VWaXNpYmlsaXR5IHsKICAgICBCYWNrZmFjZVZp c2liaWxpdHlWaXNpYmxlLCBCYWNrZmFjZVZpc2liaWxpdHlIaWRkZW4KIH07CiAKLWVudW0gRm9u dFNtb290aGluZyB7Ci0gICAgQXV0b1Ntb290aGluZywgTm9TbW9vdGhpbmcsIEFudGlhbGlhc2Vk LCBTdWJwaXhlbEFudGlhbGlhc2VkCi19OwotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZiAvLyBSZW5kZXJTdHlsZUNvbnN0YW50c19oCg==