41984 2010-07-09 13:51:17 -0700 Verify drawing coordinates, add crude painting support 2010-07-14 11:30:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 249236 0 andersca 2010-07-09 13:51:17 -0700 Verify drawing coordinates, add crude painting support 249252 1 61089 andersca 2010-07-09 14:08:03 -0700 Created attachment 61089 Patch 249255 2 webkit.review.bot 2010-07-09 14:10:41 -0700 Attachment 61089 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.cpp:26: Found header this file implements before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 251314 3 andersca 2010-07-14 11:30:28 -0700 Committed r62993: <http://trac.webkit.org/changeset/62993> 61089 2010-07-09 14:08:03 -0700 2010-07-09 14:16:24 -0700 Patch bug-41984-20100709140801.patch text/plain 15063 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg Njk4Yzg3MmYyNzIzZmJkMzNkNDNmYTk2YmFjZTEyNThmMDNkMTVjOS4uMDFjNjc5MGNjMjRhNDdl OTZiMGJmYWE4MWVhOGEzMzg4ZWY1MWIxNiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NiBAQAogMjAxMC0wNy0wOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZlcmlmeSBkcmF3aW5nIGNvb3JkaW5hdGVzLCBh ZGQgY3J1ZGUgcGFpbnRpbmcgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDE5ODQKKyAgICAKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgIEFkZCBOZXRzY2FwZVBsdWdpbk1hYy5jcHAuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3Bw OgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6TmV0c2NhcGVQbHVnaW4pOgorICAg ICAgICBJbml0aWFsaXplIGRyYXdpbmcgYW5kIGV2ZW50IG1vZGVscy4KKworICAgICAgICAoV2Vi S2l0OjpOZXRzY2FwZVBsdWdpbjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIENhbGwgcGxhdGZvcm1Q b3N0SW5pdGlhbGl6ZS4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6ZGVzdHJv eSk6CisgICAgICAgIENhbGwgTlBQX0Rlc3Ryb3kuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2Nh cGVQbHVnaW46OnBhaW50KToKKyAgICAgICAgQ2FsbCBwbGF0Zm9ybVBhaW50LgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmg6CisgICAgICAg IEFkZCBtZW1iZXIgZnVuY3Rpb25zLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0 OjpOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1Qb3N0SW5pdGlhbGl6ZSk6CisgICAgICAgIFNldCBk ZWZhdWx0IGV2ZW50IGFuZCBkcmF3aW5nIG1vZGVscyBhbmQgdmVyaWZ5IHRoYXQgdGhleSBhcmUg Y29tcGF0aWJsZS4KKyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpw bGF0Zm9ybVBhaW50KToKKyAgICAgICAgU2VuZCBhIHBhaW50IGV2ZW50IChhc3N1bWluZyB0aGUg Q29jb2EgZXZlbnQgbW9kZWwgY3VycmVudGx5KS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1 Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6cGFpbnQp OgorICAgICAgICBDaGFuZ2UgdGhlIHBhaW50IHJlY3QgdG8gYmUgaW4gd2luZG93IGNvb3JkaW5h dGVzLgorCisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OnZpZXdHZW9tZXRyeURpZENoYW5n ZSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OmNsaXBSZWN0SW5XaW5kb3dDb29yZGlu YXRlcyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaDoKKworMjAx MC0wNy0wOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAg IFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCiAKICAgICAgICAgUGFzcyBhIGNsaXAgcmVjdCB0byB0 aGUgcGx1Z2luIGFuZCBjYWxsIE5QUF9TZXRXaW5kb3cKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2Vi S2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggZDYwOTk3YmZlNTM3Nzc0ZWFlZDIxOWZhZjA3NWZkNjc1 ZDVjMzE4Yy4uZDAyMjgzNWY0YzkzOTNkMzIyNTMwZDc2YzBiZGMyZTliNGVjZjBmOCAxMDA2NDQK LS0tIGEvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvV2Vi S2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTYzLDYgKzYzLDcgQEAK IAkJMUFBMUNEMDcxMDBGQTFCQTAwNzhERUJDIC8qIENhcmJvbi5mcmFtZXdvcmsgaW4gRnJhbWV3 b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUExQ0QwNjEwMEZBMUJB MDA3OERFQkMgLyogQ2FyYm9uLmZyYW1ld29yayAqLzsgfTsKIAkJMUFBREU2RkYxMEQ4NTVGQzAw RDNENjNEIC8qIEFwcGxpY2F0aW9uU2VydmljZXMuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBREU2RkUxMEQ4NTVGQzAwRDNENjNE IC8qIEFwcGxpY2F0aW9uU2VydmljZXMuZnJhbWV3b3JrICovOyB9OwogCQkxQUUxMTdGNjExREJC MzA5MDA5ODE2MTUgLyogUHJvY2Vzc0xhdW5jaGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRTExN0Y1MTFEQkIzMDkwMDk4MTYxNSAvKiBQcm9j ZXNzTGF1bmNoZXIuY3BwICovOyB9OworCQkxQUU1QjdGQjExRTdBRUQyMDBCQTY3NjcgLyogTmV0 c2NhcGVQbHVnaW5NYWMuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUFFNUI3RjkxMUU3QUVEMjAwQkE2NzY3IC8qIE5ldHNjYXBlUGx1Z2luTWFjLmNw cCAqLzsgfTsKIAkJMUFFRkNDMTIxMUQwMUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZS5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFFRkNDMTAx MUQwMUY5NjAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZS5oICovOyB9OwogCQkxQUVGQ0MxMzEx RDAxRjk2MDA4MjE5RDMgLyogUGx1Z2luSW5mb1N0b3JlLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRUZDQzExMTFEMDFGOTYwMDgyMTlEMyAvKiBQ bHVnaW5JbmZvU3RvcmUuY3BwICovOyB9OwogCQkxQUVGQ0NCRDExRDAyQzVFMDA4MjE5RDMgLyog UGx1Z2luSW5mb1N0b3JlTWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMUFFRkNDQkMxMUQwMkM1RTAwODIxOUQzIC8qIFBsdWdpbkluZm9TdG9yZU1h Yy5tbSAqLzsgfTsKQEAgLTMzMiw2ICszMzMsNyBAQAogCQkxQUExQ0QwNjEwMEZBMUJBMDA3OERF QkMgLyogQ2FyYm9uLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0 S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBuYW1lID0gQ2FyYm9uLmZyYW1ld29y azsgcGF0aCA9IC9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL0NhcmJvbi5mcmFtZXdvcms7IHNv dXJjZVRyZWUgPSAiPGFic29sdXRlPiI7IH07CiAJCTFBQURFNkZFMTBEODU1RkMwMEQzRDYzRCAv KiBBcHBsaWNhdGlvblNlcnZpY2VzLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBuYW1lID0gQXBwbGlj YXRpb25TZXJ2aWNlcy5mcmFtZXdvcms7IHBhdGggPSBTeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtz L0FwcGxpY2F0aW9uU2VydmljZXMuZnJhbWV3b3JrOyBzb3VyY2VUcmVlID0gU0RLUk9PVDsgfTsK IAkJMUFFMTE3RjUxMURCQjMwOTAwOTgxNjE1IC8qIFByb2Nlc3NMYXVuY2hlci5jcHAgKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQcm9jZXNzTGF1bmNoZXIuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQUU1QjdGOTExRTdBRUQyMDBCQTY3NjcgLyogTmV0 c2NhcGVQbHVnaW5NYWMuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g TmV0c2NhcGVQbHVnaW5NYWMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUVG Q0MxMDExRDAxRjk2MDA4MjE5RDMgLyogUGx1Z2luSW5mb1N0b3JlLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpbkluZm9TdG9yZS5oOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQkxQUVGQ0MxMTExRDAxRjk2MDA4MjE5RDMgLyogUGx1Z2luSW5mb1N0b3JlLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBsdWdpbkluZm9TdG9yZS5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBRUZDQ0JDMTFEMDJDNUUwMDgyMTlE MyAvKiBQbHVnaW5JbmZvU3RvcmVNYWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBQbHVnaW5JbmZvU3RvcmVNYWMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CkBAIC02NjksNiArNjcxLDcgQEAKIAkJMUE2RkJBMDExMUU2ODEyQjAwREIxMzcxIC8qIG1h YyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCisJCQkJMUFFNUI3 RjkxMUU3QUVEMjAwQkE2NzY3IC8qIE5ldHNjYXBlUGx1Z2luTWFjLmNwcCAqLywKIAkJCQkxQTZG QkEwMjExRTY4MTNFMDBEQjEzNzEgLyogTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMuY3BwICovLAog CQkJKTsKIAkJCXBhdGggPSBtYWM7CkBAIC0xNDEyLDYgKzE0MTUsNyBAQAogCQkJCTFBNkZCQTAz MTFFNjgxM0UwMERCMTM3MSAvKiBOZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5jcHAgaW4gU291cmNl cyAqLywKIAkJCQkxQTZGQkEyQjExRTY4NjI3MDBEQjEzNzEgLyogTmV0c2NhcGVCcm93c2VyRnVu Y3MuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMUE2RkJEMjkxMUU2OUJDMjAwREIxMzcxIC8qIE5l dHNjYXBlUGx1Z2luLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTFBRTVCN0ZCMTFFN0FFRDIwMEJB Njc2NyAvKiBOZXRzY2FwZVBsdWdpbk1hYy5jcHAgaW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQly dW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKZGlmZiAtLWdpdCBh L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcCBi L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcApp bmRleCAwMjNhNWI2M2VmOWZmZGY5OTk2YzA2MjZlNzVlMDBmMWIxODI2MWYyLi40OTg1NzAwZWU4 ZGQ1YzAxYmU4Nzk3NTA0ZWMzOTJiYzc0YzFmZmQ1IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKKysrIGIvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCkBAIC0yNSw2ICsy NSw3IEBACiAKICNpbmNsdWRlICJOZXRzY2FwZVBsdWdpbi5oIgogCisjaW5jbHVkZSA8V2ViQ29y ZS9HcmFwaGljc0NvbnRleHQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ludFJlY3QuaD4KIAogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0zNCw2ICszNSwxMSBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKIE5ldHNjYXBlUGx1Z2luOjpOZXRzY2FwZVBsdWdpbihQYXNzUmVmUHRyPE5ldHNjYXBlUGx1 Z2luTW9kdWxlPiBwbHVnaW5Nb2R1bGUpCiAgICAgOiBtX3BsdWdpbk1vZHVsZShwbHVnaW5Nb2R1 bGUpCiAgICAgLCBtX25wV2luZG93KCkKKyAgICAsIG1faXNTdGFydGVkKGZhbHNlKQorI2lmIFBM QVRGT1JNKE1BQykKKyAgICAsIG1fZHJhd2luZ01vZGVsKHN0YXRpY19jYXN0PE5QRHJhd2luZ01v ZGVsPigtMSkpCisgICAgLCBtX2V2ZW50TW9kZWwoc3RhdGljX2Nhc3Q8TlBFdmVudE1vZGVsPigt MSkpCisjZW5kaWYKIHsKICAgICBtX25wcC5uZGF0YSA9IHRoaXM7CiAgICAgbV9ucHAucGRhdGEg PSAwOwpAQCAtNjYsMTggKzcyLDMwIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW46OmluaXRpYWxpemUo Y29uc3QgS1VSTCYsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5hbWVzLCBjCiAgICAgaWYg KGVycm9yICE9IE5QRVJSX05PX0VSUk9SKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBt X2lzU3RhcnRlZCA9IHRydWU7CisKICAgICAvLyBGSVhNRTogVGhpcyBpcyBub3QgY29ycmVjdCBp biBhbGwgY2FzZXMuCiAgICAgbV9ucFdpbmRvdy50eXBlID0gTlBXaW5kb3dUeXBlRHJhd2FibGU7 CiAKKyAgICBpZiAoIXBsYXRmb3JtUG9zdEluaXRpYWxpemUoKSkgeworICAgICAgICBkZXN0cm95 KCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKICAgICByZXR1cm4gdHJ1ZTsKIH0K ICAgICAKIHZvaWQgTmV0c2NhcGVQbHVnaW46OmRlc3Ryb3koKQogeworICAgIEFTU0VSVChtX2lz U3RhcnRlZCk7CisKKyAgICBtX3BsdWdpbk1vZHVsZS0+cGx1Z2luRnVuY3MoKS5kZXN0cm95KCZt X25wcCwgMCk7CisgICAgbV9pc1N0YXJ0ZWQgPSBmYWxzZTsKIH0KICAgICAKIHZvaWQgTmV0c2Nh cGVQbHVnaW46OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYg ZGlydHlSZWN0KQogeworICAgIHBsYXRmb3JtUGFpbnQoY29udGV4dCwgZGlydHlSZWN0KTsKIH0K IAogdm9pZCBOZXRzY2FwZVBsdWdpbjo6Z2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgSW50UmVjdCYg ZnJhbWVSZWN0LCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCkKZGlmZiAtLWdpdCBhL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmggYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCmluZGV4IDk3YzUzMjQ4 OGE1MzdmODIyZjNjNGUwM2Q5N2Q5ZjQ1YjU1NDdiOTIuLmMzNDNjYjFhOTM4YjQwNmU0YzhkMTBl YzJlNGFmZWMwYTdlZGE0MjMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaApAQCAtNDUsNiArNDUsOSBAQCBwcml2YXRlOgog CiAgICAgdm9pZCBjYWxsU2V0V2luZG93KCk7CiAKKyAgICBib29sIHBsYXRmb3JtUG9zdEluaXRp YWxpemUoKTsKKyAgICB2b2lkIHBsYXRmb3JtUGFpbnQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZGlydHlSZWN0KTsKKwogICAgIC8vIFBsdWdpbgog ICAgIHZpcnR1YWwgYm9vbCBpbml0aWFsaXplKGNvbnN0IFdlYkNvcmU6OktVUkwmLCBjb25zdCBW ZWN0b3I8V2ViQ29yZTo6U3RyaW5nPiYgcGFyYW1OYW1lcywgY29uc3QgVmVjdG9yPFdlYkNvcmU6 OlN0cmluZz4mIHBhcmFtVmFsdWVzLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1pbWVUeXBlLCBi b29sIGxvYWRNYW51YWxseSk7CiAgICAgdmlydHVhbCB2b2lkIGRlc3Ryb3koKTsKQEAgLTU0LDEx ICs1NywzMCBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpbk1vZHVsZT4gbV9w bHVnaW5Nb2R1bGU7CiAgICAgTlBQX3QgbV9ucHA7CiAgICAgTlBXaW5kb3cgbV9ucFdpbmRvdzsK LSAgICAKKwogICAgIFdlYkNvcmU6OkludFJlY3QgbV9mcmFtZVJlY3Q7CiAgICAgV2ViQ29yZTo6 SW50UmVjdCBtX2NsaXBSZWN0OworICAgIAorICAgIGJvb2wgbV9pc1N0YXJ0ZWQ7CisKKyNpZiBQ TEFURk9STShNQUMpCisgICAgTlBEcmF3aW5nTW9kZWwgbV9kcmF3aW5nTW9kZWw7CisgICAgTlBF dmVudE1vZGVsIG1fZXZlbnRNb2RlbDsKKyNlbmRpZgogfTsKIAorLy8gTW92ZSB0aGVzZSBmdW5j dGlvbnMgdG8gTmV0c2NhcGVQbHVnaW5XaW4uY3BwCisjaWYgIVBMQVRGT1JNKE1BQykKK2lubGlu ZSBib29sIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybVBvc3RJbml0aWFsaXplKCkKK3sKKyAgICBy ZXR1cm4gdHJ1ZTsKK30KKworaW5saW5lIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUGFp bnQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpCit7 Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBOZXRzY2Fw ZVBsdWdpbl9oCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iMDU3MzY4OGU3 MjdhYmEzYmE5YjdjNjNhN2ZlZmY4MjdjZDc3NjMwCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLmNwcApA QCAtMCwwICsxLDg4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJl IG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBU SU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgIk5ldHNjYXBlUGx1Z2luLmgi CisKKyNpbmNsdWRlIDxXZWJDb3JlL0dyYXBoaWNzQ29udGV4dC5oPgorCit1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK2Jvb2wgTmV0c2NhcGVQbHVnaW46 OnBsYXRmb3JtUG9zdEluaXRpYWxpemUoKQoreworICAgIGlmIChtX2RyYXdpbmdNb2RlbCA9PSBz dGF0aWNfY2FzdDxOUERyYXdpbmdNb2RlbD4oLTEpKSB7CisjaWZuZGVmIE5QX05PX1FVSUNLRFJB VworICAgICAgICAvLyBEZWZhdWx0IHRvIFF1aWNrRHJhdyBpZiB0aGUgcGx1Z2luIGRpZCBub3Qg c3BlY2lmeSBhIGRyYXdpbmcgbW9kZWwuCisgICAgICAgIG1fZHJhd2luZ01vZGVsID0gTlBEcmF3 aW5nTW9kZWxRdWlja0RyYXc7CisjZWxzZQorICAgICAgICAvLyBRdWlja0RyYXcgaXMgbm90IGF2 YWlsYWJsZSwgc28gd2UgY2FuJ3QgZGVmYXVsdCB0byBpdC4gSW5zdGVhZCwgZGVmYXVsdCB0byBD b3JlR3JhcGhpY3MuCisgICAgICAgIG1fZHJhd2luZ01vZGVsID0gTlBEcmF3aW5nTW9kZWxDb3Jl R3JhcGhpY3M7CisjZW5kaWYKKyAgICB9CisgICAgCisgICAgaWYgKG1fZXZlbnRNb2RlbCA9PSBz dGF0aWNfY2FzdDxOUEV2ZW50TW9kZWw+KC0xKSkgeworICAgICAgICAvLyBJZiB0aGUgcGx1Zy1p biBkaWQgbm90IHNwZWNpZnkgYSBkcmF3aW5nIG1vZGVsIHdlIGRlZmF1bHQgdG8gQ2FyYm9uIHdo ZW4gaXQgaXMgYXZhaWxhYmxlLgorI2lmbmRlZiBOUF9OT19DQVJCT04KKyAgICAgICAgbV9ldmVu dE1vZGVsID0gTlBFdmVudE1vZGVsQ2FyYm9uOworI2Vsc2UKKyAgICAgICAgbV9ldmVudE1vZGVs ID0gTlBFdmVudE1vZGVsQ29jb2E7CisjZW5kaWYgLy8gTlBfTk9fQ0FSQk9OCisgICAgfQorCisj aWYgIWRlZmluZWQoTlBfTk9fQ0FSQk9OKSAmJiAhZGVmaW5lZChOUF9OT19RVUlDS0RSQVcpCisg ICAgLy8gVGhlIENBIGRyYXdpbmcgbW9kZWwgZG9lcyBub3Qgd29yayB3aXRoIHRoZSBDYXJib24g ZXZlbnQgbW9kZWwuCisgICAgaWYgKG1fZHJhd2luZ01vZGVsID09IE5QRHJhd2luZ01vZGVsQ29y ZUFuaW1hdGlvbiAmJiBtX2V2ZW50TW9kZWwgPT0gTlBFdmVudE1vZGVsQ2FyYm9uKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgCisgICAgLy8gVGhlIENvY29hIGV2ZW50IG1vZGVsIGRvZXMg bm90IHdvcmsgd2l0aCB0aGUgUXVpY2tEcmF3IGRyYXdpbmcgbW9kZWwuCisgICAgaWYgKG1fZXZl bnRNb2RlbCA9PSBOUEV2ZW50TW9kZWxDb2NvYSAmJiBtX2RyYXdpbmdNb2RlbCA9PSBOUERyYXdp bmdNb2RlbFF1aWNrRHJhdykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCisgICAgCisj aWZuZGVmIE5QX05PX1FVSUNLRFJBVworICAgIC8vIFJpZ2h0IG5vdyB3ZSBkb24ndCBzdXBwb3J0 IHRoZSBRdWlja0RyYXcgZHJhd2luZyBtb2RlbCBhdCBhbGwKKyAgICBpZiAobV9kcmF3aW5nTW9k ZWwgPT0gTlBEcmF3aW5nTW9kZWxRdWlja0RyYXcpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyNl bmRpZgorCisgICAgcmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRm b3JtUGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJl Y3QpCit7CisgICAgTlBDb2NvYUV2ZW50IGV2ZW50OworICAgIGV2ZW50LnR5cGUgPSBOUENvY29h RXZlbnREcmF3UmVjdDsKKyAgICBldmVudC52ZXJzaW9uID0gMDsKKyAgICBldmVudC5kYXRhLmRy YXcuY29udGV4dCA9IGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOworICAgIGV2ZW50LmRhdGEu ZHJhdy54ID0gZGlydHlSZWN0LngoKSAtIG1fZnJhbWVSZWN0LngoKTsKKyAgICBldmVudC5kYXRh LmRyYXcueSA9IGRpcnR5UmVjdC55KCkgLSBtX2ZyYW1lUmVjdC55KCk7CisgICAgZXZlbnQuZGF0 YS5kcmF3LndpZHRoID0gZGlydHlSZWN0LndpZHRoKCk7CisgICAgZXZlbnQuZGF0YS5kcmF3Lmhl aWdodCA9IGRpcnR5UmVjdC5oZWlnaHQoKTsKKworICAgIG1fcGx1Z2luTW9kdWxlLT5wbHVnaW5G dW5jcygpLmV2ZW50KCZtX25wcCwgJmV2ZW50KTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBi L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IGExMTNhMzFm NzI2MzRiYjcyNTlhOTBlMGFiYTIwMmQ1NzUzNTc0ZGEuLjhlM2M0NWU4OGM4ODZjYjBlZGQ0Njg0 ZGE2M2Q4ZTYzZDAyYmRmZTEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpblZpZXcuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZp ZXcuY3BwCkBAIC01OCwxMSArNTgsMTkgQEAgdm9pZCBQbHVnaW5WaWV3OjpwYWludChHcmFwaGlj c0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKICAgICBpZiAoY29u dGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAgICAgCi0gICAgSW50 UmVjdCBwYWludFJlY3QgPSBpbnRlcnNlY3Rpb24oZGlydHlSZWN0LCBmcmFtZVJlY3QoKSk7Ci0g ICAgaWYgKHBhaW50UmVjdC5pc0VtcHR5KCkpCisgICAgSW50UmVjdCBkaXJ0eVJlY3RJbldpbmRv d0Nvb3JkaW5hdGVzID0gcGFyZW50KCktPmNvbnRlbnRzVG9XaW5kb3coZGlydHlSZWN0KTsKKyAg ICAKKyAgICBJbnRSZWN0IHBhaW50UmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBpbnRlcnNlY3Rp b24oZGlydHlSZWN0SW5XaW5kb3dDb29yZGluYXRlcywgY2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5h dGVzKCkpOworICAgIGlmIChwYWludFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLmlzRW1wdHkoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9wbHVnaW4tPnBhaW50KGNvbnRleHQsIHBhaW50UmVj dCk7CisgICAgY29udGV4dC0+c2F2ZSgpOworCisgICAgLy8gVHJhbnNsYXRlIHRoZSBjb250ZXh0 IHNvIHRoYXQgdGhlIG9yaWdpbiBpcyBhdCB0aGUgdG9wIGxlZnQgY29ybmVyIG9mIHRoZSBwbHVn LWluIHZpZXcuCisgICAgY29udGV4dC0+dHJhbnNsYXRlKGZyYW1lUmVjdCgpLngoKSwgZnJhbWVS ZWN0KCkueSgpKTsKKworICAgIG1fcGx1Z2luLT5wYWludChjb250ZXh0LCBwYWludFJlY3RJbldp bmRvd0Nvb3JkaW5hdGVzKTsKKyAgICBjb250ZXh0LT5yZXN0b3JlKCk7CiB9CiAKIHZvaWQgUGx1 Z2luVmlldzo6ZnJhbWVSZWN0c0NoYW5nZWQoKQpAQCAtODUsMTUgKzkzLDIzIEBAIHZvaWQgUGx1 Z2luVmlldzo6dmlld0dlb21ldHJ5RGlkQ2hhbmdlKCkKICAgICAvLyBHZXQgdGhlIGZyYW1lIHJl Y3QgaW4gd2luZG93IGNvb3JkaW5hdGVzLgogICAgIEludFJlY3QgZnJhbWVSZWN0SW5XaW5kb3dD b29yZGluYXRlcyA9IHBhcmVudCgpLT5jb250ZW50c1RvV2luZG93KGZyYW1lUmVjdCgpKTsKIAor ICAgIG1fcGx1Z2luLT5nZW9tZXRyeURpZENoYW5nZShmcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5h dGVzLCBjbGlwUmVjdEluV2luZG93Q29vcmRpbmF0ZXMoKSk7Cit9CisKK0ludFJlY3QgUGx1Z2lu Vmlldzo6Y2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkgY29uc3QKK3sKKyAgICBBU1NFUlQo cGFyZW50KCkpOworCisgICAgLy8gR2V0IHRoZSBmcmFtZSByZWN0IGluIHdpbmRvdyBjb29yZGlu YXRlcy4KKyAgICBJbnRSZWN0IGZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBwYXJlbnQo KS0+Y29udGVudHNUb1dpbmRvdyhmcmFtZVJlY3QoKSk7CisKICAgICAvLyBHZXQgdGhlIHdpbmRv dyBjbGlwIHJlY3QgZm9yIHRoZSBlbmNsb3NpbmcgbGF5ZXIgKGluIHdpbmRvdyBjb29yZGluYXRl cykuCiAgICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gbV9wbHVnaW5FbGVtZW50LT5yZW5kZXJlcigp LT5lbmNsb3NpbmdMYXllcigpOwogICAgIEZyYW1lVmlldyogcGFyZW50VmlldyA9IG1fcGx1Z2lu RWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+dmlldygpOwogICAgIEludFJlY3Qgd2luZG93 Q2xpcFJlY3QgPSBwYXJlbnRWaWV3LT53aW5kb3dDbGlwUmVjdEZvckxheWVyKGxheWVyLCB0cnVl KTsKIAogICAgIC8vIEludGVyc2VjdCB0aGUgdHdvIHJlY3RzIHRvIGdldCB0aGUgdmlldyBjbGlw IHJlY3QgaW4gd2luZG93IGNvb3JkaW5hdGVzLgotICAgIEludFJlY3QgY2xpcFJlY3RJbldpbmRv d0Nvb3JkaW5hdGVzID0gaW50ZXJzZWN0aW9uKGZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMs IHdpbmRvd0NsaXBSZWN0KTsKLQotICAgIG1fcGx1Z2luLT5nZW9tZXRyeURpZENoYW5nZShmcmFt ZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLCBjbGlwUmVjdEluV2luZG93Q29vcmRpbmF0ZXMpOwor ICAgIHJldHVybiBpbnRlcnNlY3Rpb24oZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcywgd2lu ZG93Q2xpcFJlY3QpOwogfQogCiB2b2lkIFBsdWdpblZpZXc6OmludmFsaWRhdGVSZWN0KGNvbnN0 IEludFJlY3QmKQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu Vmlldy5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCmluZGV4IGUz NDg2MGM2NTllMTkzZjI0NGFiNGUyNWI3MjJhNDEwOWIzNDBlMzguLjgwZDM5MWZlYWNlNDQ4ZTgw M2Q5ZTI1MzNmY2I0MTM5NzQ3N2Y1NTIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblZpZXcuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVn aW5WaWV3LmgKQEAgLTQ5LDYgKzQ5LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIH5QbHVnaW5W aWV3KCk7CiAKICAgICB2b2lkIHZpZXdHZW9tZXRyeURpZENoYW5nZSgpOworICAgIFdlYkNvcmU6 OkludFJlY3QgY2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkgY29uc3Q7CiAKICAgICAvLyBX ZWJDb3JlOjpXaWRnZXQKICAgICB2aXJ0dWFsIHZvaWQgc2V0RnJhbWVSZWN0KGNvbnN0IFdlYkNv cmU6OkludFJlY3QmKTsK