74316 2011-12-12 12:21:35 -0800 URL arg and printing fixes 2011-12-13 15:54:10 -0800 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 robin webkit-unassigned kevino oldest_to_newest 519374 0 118824 robin 2011-12-12 12:21:35 -0800 Created attachment 118824 printing fix patch Add a URL argument to the wxWebView constructor, and fix page calculations and margins on Windows and Mac. 520446 1 kevino 2011-12-13 15:54:10 -0800 Landed in r102715, thanks! 118824 2011-12-12 12:21:35 -0800 2011-12-13 15:42:56 -0800 printing fix patch printing_fix.patch text/plain 13596 robin SW5kZXg6IFRvb2xzL3d4L2Jyb3dzZXIvYnJvd3Nlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv d3gvYnJvd3Nlci9icm93c2VyLmNwcAkocmV2aXNpb24gMTAyNTQzKQorKysgVG9vbHMvd3gvYnJv d3Nlci9icm93c2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNyBAQAogICAgICAg ICAKICAgICAvLyBjcmVhdGUgdGhlIG1haW4gYXBwbGljYXRpb24gd2luZG93CiAgICAgLy8gc2Vl IFdlYktpdC93eC9XZWJGcmFtZS5jcHAgZm9yIGhvdyB0byB3cml0ZSBhIHNoZWxsIGFyb3VuZCB3 eFdlYlZpZXcuCi0gICAgd3hXZWJCcm93c2VyU2hlbGwgKmZyYW1lID0gbmV3IHd4V2ViQnJvd3Nl clNoZWxsKF9UKCJ3eFdlYktpdCBUZXN0IEFwcCIpKTsKKyAgICB3eFdlYkJyb3dzZXJTaGVsbCAq ZnJhbWUgPSBuZXcgd3hXZWJCcm93c2VyU2hlbGwoX1QoInd4V2ViS2l0IFRlc3QgQXBwIiksICJo dHRwOi8vd3d3LndlYmtpdC5vcmciKTsKIAogI2lmbmRlZiBOREVCVUcKICAgICBmcmFtZS0+U2hv d0RlYnVnTWVudSh0cnVlKTsKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0R1bXBSZW5k ZXJUcmVlV3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0R1bXBS ZW5kZXJUcmVlV3guY3BwCShyZXZpc2lvbiAxMDI1NDMpCisrKyBUb29scy9EdW1wUmVuZGVyVHJl ZS93eC9EdW1wUmVuZGVyVHJlZVd4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjkzLDcgKzI5Myw3 IEBACiAgICAgd3hJbml0QWxsSW1hZ2VIYW5kbGVycygpOwogICAgICAgICAKICAgICAvLyBjcmVh dGUgdGhlIG1haW4gYXBwbGljYXRpb24gd2luZG93Ci0gICAgd3hXZWJCcm93c2VyU2hlbGwqIHdl YkZyYW1lID0gbmV3IHd4V2ViQnJvd3NlclNoZWxsKF9UKCJ3eFdlYktpdCBEdW1wUmVuZGVyVHJl ZSBBcHAiKSk7CisgICAgd3hXZWJCcm93c2VyU2hlbGwqIHdlYkZyYW1lID0gbmV3IHd4V2ViQnJv d3NlclNoZWxsKF9UKCJ3eFdlYktpdCBEdW1wUmVuZGVyVHJlZSBBcHAiKSwgImFib3V0OmJsYW5r Iik7CiAgICAgU2V0VG9wV2luZG93KHdlYkZyYW1lKTsKICAgICB3ZWJWaWV3ID0gd2ViRnJhbWUt PndlYnZpZXc7CiAgICAgd2ViVmlldy0+U2V0U2l6ZSh3eFNpemUobWF4Vmlld1dpZHRoLCBtYXhW aWV3SGVpZ2h0KSk7CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv Q2hhbmdlTG9nCShyZXZpc2lvbiAxMDI1NDMpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMS0xMi0xMSAgUm9iaW4gRHVubiAgPHJvYmluQGFs bGR1bm4uY29tPgorCisgICAgICAgIFt3eF0gQWRkIGEgVVJMIGFyZ3VtZW50IHRvIHd4V2ViVmll dyBjb25zdHJ1Y3Rvci4KKyAgICAgICAgCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd3gvRHVtcFJlbmRlclRyZWVXeC5jcHA6 CisgICAgICAgIChNeUFwcDo6T25Jbml0KToKKyAgICAgICAgKiB3eC9icm93c2VyL2Jyb3dzZXIu Y3BwOgorICAgICAgICAoTXlBcHA6Ok9uSW5pdCk6CisKIDIwMTEtMTItMTEgIEtlbnRhcm8gSGFy YSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtSZWZhY3RvcmluZ10gTW92ZSB0 b3AtbGV2ZWwgY29kZSB0byBnZW5lcmF0ZSBhIG5ldyBDaGFuZ2VMb2cgaW50byBhIG1ldGhvZApJ bmRleDogU291cmNlL1dlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC93eC9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjU0MykKKysrIFNvdXJjZS9XZWJLaXQvd3gv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMTItMTEgIFJv YmluIER1bm4gIDxyb2JpbkBhbGxkdW5uLmNvbT4KKworICAgICAgICBBZGQgYSBVUkwgYXJndW1l bnQgdG8gdGhlIHd4V2ViVmlldyBjb25zdHJ1Y3RvciwKKyAgICAgICAgYW5kIGZpeCBwYWdlIGNh bGN1bGF0aW9ucyBhbmQgbWFyZ2lucyBvbiBXaW5kb3dzIGFuZCBNYWMuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJCcm93c2VyU2hlbGwuY3Bw OgorICAgICAgICAod3hXZWJCcm93c2VyU2hlbGw6Ond4V2ViQnJvd3NlclNoZWxsKToKKyAgICAg ICAgKiBXZWJCcm93c2VyU2hlbGwuaDoKKyAgICAgICAgKiBXZWJGcmFtZS5jcHA6CisgICAgICAg ICh3eFdlYkZyYW1lUHJpbnRvdXQ6Ond4V2ViRnJhbWVQcmludG91dCk6CisgICAgICAgICh3eFdl YkZyYW1lUHJpbnRvdXQ6On53eFdlYkZyYW1lUHJpbnRvdXQpOgorICAgICAgICAod3hXZWJGcmFt ZVByaW50b3V0OjpJbml0aWFsaXplV2l0aFBhZ2VTaXplKToKKyAgICAgICAgKHd4V2ViRnJhbWVQ cmludG91dDo6T25QcmVwYXJlUHJpbnRpbmcpOgorICAgICAgICAod3hXZWJGcmFtZVByaW50b3V0 OjpPblByaW50UGFnZSk6CisgICAgICAgICh3eFdlYkZyYW1lUHJpbnRvdXQ6Ok9uRW5kUHJpbnRp bmcpOgorICAgICAgICAod3hXZWJGcmFtZTo6UHJpbnQpOgorICAgICAgICAqIFdlYlZpZXcuY3Bw OgorICAgICAgICAod3hXZWJWaWV3Ojp3eFdlYlZpZXcpOgorICAgICAgICAod3hXZWJWaWV3OjpD cmVhdGUpOgorICAgICAgICAqIFdlYlZpZXcuaDoKKyAgICAgICAgKiBiaW5kaW5ncy9weXRob24v c2FtcGxlcy9zaW1wbGUucHk6CisgICAgICAgIChUZXN0UGFuZWwuX19pbml0X18pOgorCiAyMDEx LTEyLTA3ICBNYXJ5IFd1ICA8bWFyeS53dUB0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAg Q2hhbmdlIGZ1bmN0aW9uIG5hbWUgSW5pdGlhbGl6ZUxvZ2dpbmdDaGFubmVsc0lmTmVjZXNzYXJ5 IHRvIGZvbGxvdyBjb2Rpbmcgc3R5bGUgZ3VpZGVsaW5lCkluZGV4OiBTb3VyY2UvV2ViS2l0L3d4 L1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd3gvV2ViVmlldy5jcHAJ KHJldmlzaW9uIDEwMjU0MykKKysrIFNvdXJjZS9XZWJLaXQvd3gvV2ViVmlldy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM0OCw3ICszNDgsNyBAQAogewogfQogCi13eFdlYlZpZXc6Ond4V2ViVmll dyh3eFdpbmRvdyogcGFyZW50LCBpbnQgaWQsIGNvbnN0IHd4UG9pbnQmIHBvc2l0aW9uLCAKK3d4 V2ViVmlldzo6d3hXZWJWaWV3KHd4V2luZG93KiBwYXJlbnQsIGNvbnN0IHd4U3RyaW5nJiB1cmws IGludCBpZCwgY29uc3Qgd3hQb2ludCYgcG9zaXRpb24sIAogICAgICAgICAgICAgICAgICAgICAg Y29uc3Qgd3hTaXplJiBzaXplLCBsb25nIHN0eWxlLCBjb25zdCB3eFN0cmluZyYgbmFtZSkgOgog ICAgIG1fdGV4dE1hZ25pZmllcigxLjApLAogICAgIG1faXNJbml0aWFsaXplZChmYWxzZSksCkBA IC0zNTYsMTAgKzM1NiwxMCBAQAogICAgIG1fbW91c2VXaGVlbFpvb21zKGZhbHNlKSwKICAgICBt X3RpdGxlKHd4RW1wdHlTdHJpbmcpCiB7Ci0gICAgQ3JlYXRlKHBhcmVudCwgaWQsIHBvc2l0aW9u LCBzaXplLCBzdHlsZSwgbmFtZSk7CisgICAgQ3JlYXRlKHBhcmVudCwgdXJsLCBpZCwgcG9zaXRp b24sIHNpemUsIHN0eWxlLCBuYW1lKTsKIH0KIAotYm9vbCB3eFdlYlZpZXc6OkNyZWF0ZSh3eFdp bmRvdyogcGFyZW50LCBpbnQgaWQsIGNvbnN0IHd4UG9pbnQmIHBvc2l0aW9uLCAKK2Jvb2wgd3hX ZWJWaWV3OjpDcmVhdGUod3hXaW5kb3cqIHBhcmVudCwgY29uc3Qgd3hTdHJpbmcmIHVybCwgaW50 IGlkLCBjb25zdCB3eFBvaW50JiBwb3NpdGlvbiwgCiAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IHd4U2l6ZSYgc2l6ZSwgbG9uZyBzdHlsZSwgY29uc3Qgd3hTdHJpbmcmIG5hbWUpCiB7CiAj aWYgT1MoREFSV0lOKQpAQCAtNDIxLDcgKzQyMSw3IEBACiAKICAgICAvLyB3ZSBuZWVkIHRvIGRv IHRoaXMgc28gdGhhdCBvYmplY3RzIGxpa2UgdGhlIGZvY3VzQ29udHJvbGxlciBhcmUgcHJvcGVy bHkKICAgICAvLyBpbml0aWFsaXplZCBzbyB0aGF0IHRoZSBhY3RpdmF0ZSBoYW5kbGVyIGlzIHJ1 biBwcm9wZXJseS4KLSAgICBMb2FkVVJMKHd4VCgiYWJvdXQ6YmxhbmsiKSk7CisgICAgTG9hZFVS TCh1cmwpOwogICAgIAogICAgIG1faXNJbml0aWFsaXplZCA9IHRydWU7CiAKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvd3gvV2ViQnJvd3NlclNoZWxsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L3d4L1dlYkJyb3dzZXJTaGVsbC5jcHAJKHJldmlzaW9uIDEwMjU0MykKKysrIFNvdXJjZS9X ZWJLaXQvd3gvV2ViQnJvd3NlclNoZWxsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTcsNyArOTcs NyBAQAogRU5EX0VWRU5UX1RBQkxFKCkKIAogCi13eFdlYkJyb3dzZXJTaGVsbDo6d3hXZWJCcm93 c2VyU2hlbGwoY29uc3Qgd3hTdHJpbmcmIHRpdGxlKSA6IAord3hXZWJCcm93c2VyU2hlbGw6Ond4 V2ViQnJvd3NlclNoZWxsKGNvbnN0IHd4U3RyaW5nJiB0aXRsZSwgY29uc3Qgd3hTdHJpbmcmIHVy bCkgOiAKICAgICAgICAgd3hGcmFtZShOVUxMLCB3eElEX0FOWSwgdGl0bGUsIHd4RGVmYXVsdFBv c2l0aW9uLCB3eFNpemUoNjAwLCA1MDApKSwKICAgICAgICAgbV9jaGVja0JlZm9yZUxvYWQoZmFs c2UpCiB7CkBAIC0xNjcsNyArMTY3LDcgQEAKICAgICBTZXRUb29sQmFyKHRvb2xiYXIpOwogCiAg ICAgLy8gQ3JlYXRlIHRoZSB3eFdlYlZpZXcgV2luZG93Ci0gICAgd2VidmlldyA9IG5ldyB3eFdl YlZpZXcoKHd4V2luZG93Kil0aGlzLCBJRF9XRUJWSUVXLCB3eERlZmF1bHRQb3NpdGlvbiwgd3hT aXplKDIwMCwgMjAwKSk7CisgICAgd2VidmlldyA9IG5ldyB3eFdlYlZpZXcoKHd4V2luZG93Kil0 aGlzLCB1cmwsIElEX1dFQlZJRVcsIHd4RGVmYXVsdFBvc2l0aW9uLCB3eFNpemUoMjAwLCAyMDAp KTsKICAgICB3ZWJ2aWV3LT5TZXRCYWNrZ3JvdW5kQ29sb3VyKCp3eFdISVRFKTsKIAogICAgIC8v IGNyZWF0ZSBhIHN0YXR1cyBiYXIganVzdCBmb3IgZnVuIChieSBkZWZhdWx0IHdpdGggMSBwYW5l IG9ubHkpCkluZGV4OiBTb3VyY2UvV2ViS2l0L3d4L2JpbmRpbmdzL3B5dGhvbi9zYW1wbGVzL3Np bXBsZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3d4L2JpbmRpbmdzL3B5dGhvbi9z YW1wbGVzL3NpbXBsZS5weQkocmV2aXNpb24gMTAyNTQzKQorKysgU291cmNlL1dlYktpdC93eC9i aW5kaW5ncy9weXRob24vc2FtcGxlcy9zaW1wbGUucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcg KzQ0LDcgQEAKICAgICAgICAgc2l6ZXIgPSB3eC5Cb3hTaXplcih3eC5WRVJUSUNBTCkKICAgICAg ICAgYnRuU2l6ZXIgPSB3eC5Cb3hTaXplcih3eC5IT1JJWk9OVEFMKQogCi0gICAgICAgIHNlbGYu d2VidmlldyA9IHd4LndlYnZpZXcuV2ViVmlldyhzZWxmLCAtMSkKKyAgICAgICAgc2VsZi53ZWJ2 aWV3ID0gd3gud2Vidmlldy5XZWJWaWV3KHNlbGYsIHNlbGYuY3VycmVudCwgLTEpCiAKIAogICAg ICAgICBidG4gPSB3eC5CdXR0b24oc2VsZiwgLTEsICJPcGVuIiwgc3R5bGU9d3guQlVfRVhBQ1RG SVQpCkBAIC04Miw3ICs4Miw2IEBACiAgICAgICAgIHNpemVyLkFkZChidG5TaXplciwgMCwgd3gu RVhQQU5EKQogICAgICAgICBzaXplci5BZGQoc2VsZi53ZWJ2aWV3LCAxLCB3eC5FWFBBTkQpCiAK LSAgICAgICAgc2VsZi53ZWJ2aWV3LkxvYWRVUkwoc2VsZi5jdXJyZW50KQogICAgICAgICBzZWxm LmxvY2F0aW9uLkFwcGVuZChzZWxmLmN1cnJlbnQpCiAgICAgICAgIAogICAgICAgICBzZWxmLndl YnZpZXcuQmluZCh3eC53ZWJ2aWV3LkVWVF9XRUJWSUVXX0xPQUQsIHNlbGYuT25TdGF0ZUNoYW5n ZWQpCkluZGV4OiBTb3VyY2UvV2ViS2l0L3d4L1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L3d4L1dlYlZpZXcuaAkocmV2aXNpb24gMTAyNTQzKQorKysgU291cmNlL1dlYktp dC93eC9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTExNiw3ICsxMTYsOSBAQAogICAgICVw eXRob25BcHBlbmQgd3hXZWJWaWV3KCkgICIiCiAjZW5kaWYKIAotICAgIHd4V2ViVmlldyh3eFdp bmRvdyogcGFyZW50LCBpbnQgaWQgPSB3eElEX0FOWSwKKyAgICB3eFdlYlZpZXcod3hXaW5kb3cq IHBhcmVudCwKKyAgICAgICAgICAgICAgY29uc3Qgd3hTdHJpbmcmIHVybCA9ICJhYm91dDpibGFu ayIsIAorICAgICAgICAgICAgICBpbnQgaWQgPSB3eElEX0FOWSwKICAgICAgICAgICAgICAgY29u c3Qgd3hQb2ludCYgcG9pbnQgPSB3eERlZmF1bHRQb3NpdGlvbiwKICAgICAgICAgICAgICAgY29u c3Qgd3hTaXplJiBzaXplID0gd3hEZWZhdWx0U2l6ZSwKICAgICAgICAgICAgICAgbG9uZyBzdHls ZSA9IDAsCkBAIC0xMjcsNyArMTI5LDkgQEAKICAgICB3eFdlYlZpZXcoKTsKICNlbmRpZgogICAg IAotICAgIGJvb2wgQ3JlYXRlKHd4V2luZG93KiBwYXJlbnQsIGludCBpZCA9IHd4SURfQU5ZLAor ICAgIGJvb2wgQ3JlYXRlKHd4V2luZG93KiBwYXJlbnQsCisgICAgICAgICAgICAgICAgY29uc3Qg d3hTdHJpbmcmIHVybCA9ICJhYm91dDpibGFuayIsIAorICAgICAgICAgICAgICAgIGludCBpZCA9 IHd4SURfQU5ZLAogICAgICAgICAgICAgICAgIGNvbnN0IHd4UG9pbnQmIHBvaW50ID0gd3hEZWZh dWx0UG9zaXRpb24sCiAgICAgICAgICAgICAgICAgY29uc3Qgd3hTaXplJiBzaXplID0gd3hEZWZh dWx0U2l6ZSwKICAgICAgICAgICAgICAgICBsb25nIHN0eWxlID0gMCwKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvd3gvV2ViQnJvd3NlclNoZWxsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93 eC9XZWJCcm93c2VyU2hlbGwuaAkocmV2aXNpb24gMTAyNTQzKQorKysgU291cmNlL1dlYktpdC93 eC9XZWJCcm93c2VyU2hlbGwuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNyBAQAogI2lm IFNXSUcKICAgICAlcHl0aG9uQXBwZW5kIHd4V2ViQnJvd3NlclNoZWxsICJzZWxmLl9zZXRPT1JJ bmZvKHNlbGYpIgogI2VuZGlmCi0gICAgd3hXZWJCcm93c2VyU2hlbGwoY29uc3Qgd3hTdHJpbmcm IHRpdGxlKTsKKyAgICB3eFdlYkJyb3dzZXJTaGVsbChjb25zdCB3eFN0cmluZyYgdGl0bGUsIGNv bnN0IHd4U3RyaW5nJiB1cmwgPSAiYWJvdXQ6YmxhbmsiKTsKIAogI2lmbmRlZiBTV0lHCiAgICAg fnd4V2ViQnJvd3NlclNoZWxsKCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L3d4L1dlYkZyYW1lLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3d4L1dlYkZyYW1lLmNwcAkocmV2aXNpb24g MTAyNTQzKQorKysgU291cmNlL1dlYktpdC93eC9XZWJGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTk4LDEwICs5OCwxNyBAQAogICAgICAgICBtX3ByaW50Q29udGV4dChmcmFtZSksCiAgICAg ICAgIG1fcGFnZVdpZHRoKDAuMCksCiAgICAgICAgIG1fZnJvbVBhZ2UoMSksCi0gICAgICAgIG1f dG9QYWdlKDEpCisgICAgICAgIG1fdG9QYWdlKDEpLAorICAgICAgICBtX2lzUHJpbnRpbmcoZmFs c2UpCiAgICAgewogICAgIH0KIAorICAgIH53eFdlYkZyYW1lUHJpbnRvdXQoKSAKKyAgICB7Cisg ICAgICAgIGlmIChtX2lzUHJpbnRpbmcpCisgICAgICAgICAgICBtX3ByaW50Q29udGV4dC5lbmQo KTsKKyAgICB9CisgIAogICAgIGludCBHZXRQYWdlQ291bnQoKSB7IHJldHVybiBtX3ByaW50Q29u dGV4dC5wYWdlQ291bnQoKTsgfQogICAgIHZvaWQgU2V0Rmlyc3RQYWdlKGludCBwYWdlKSB7IG1f ZnJvbVBhZ2UgPSBwYWdlOyB9CiAgICAgdm9pZCBTZXRMYXN0UGFnZShpbnQgcGFnZSkgeyBtX3Rv UGFnZSA9IHBhZ2U7IH0KQEAgLTEwOSwyNCArMTE2LDIzIEBACiAgICAgdm9pZCBJbml0aWFsaXpl V2l0aFBhZ2VTaXplKHd4UmVjdCBwYWdlUmVjdCwgYm9vbCBpc01NID0gdHJ1ZSkKICAgICB7CiAg ICAgICAgIGlmIChpc01NKSB7Ci0gICAgICAgICAgICBkb3VibGUgbW1Ub1BpeGVsc1ggPSAoZG91 YmxlKXd4R2V0RGlzcGxheVNpemUoKS5HZXRXaWR0aCgpIC8KLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChkb3VibGUpd3hHZXREaXNwbGF5U2l6ZU1NKCkuR2V0V2lkdGgoKTsK LSAgICAgICAgICAgIGRvdWJsZSBtbVRvUGl4ZWxzWSA9IChkb3VibGUpd3hHZXREaXNwbGF5U2l6 ZSgpLkdldEhlaWdodCgpIC8KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChk b3VibGUpd3hHZXREaXNwbGF5U2l6ZU1NKCkuR2V0SGVpZ2h0KCk7Ci0gICAgICAgICAgICAvLyBj b252ZXJ0IG1tIHRvIHBpeGVscwotICAgICAgICAgICAgcGFnZVJlY3QueCA9IHBhZ2VSZWN0Lngg KiBtbVRvUGl4ZWxzWDsKLSAgICAgICAgICAgIHBhZ2VSZWN0LnkgPSBwYWdlUmVjdC55ICogbW1U b1BpeGVsc1k7Ci0gICAgICAgICAgICBwYWdlUmVjdC53aWR0aCA9IHBhZ2VSZWN0LndpZHRoICog bW1Ub1BpeGVsc1g7Ci0gICAgICAgICAgICBwYWdlUmVjdC5oZWlnaHQgPSBwYWdlUmVjdC5oZWln aHQgKiBtbVRvUGl4ZWxzWTsKKyAgICAgICAgICAgIGRvdWJsZSBtbVRvUG9pbnRzID0gMi44MzQ2 OworICAgICAgICAgICAgLy8gY29udmVydCBtbSB0byBwb2ludHMKKyAgICAgICAgICAgIHBhZ2VS ZWN0LnggPSBwYWdlUmVjdC54ICogbW1Ub1BvaW50czsKKyAgICAgICAgICAgIHBhZ2VSZWN0Lnkg PSBwYWdlUmVjdC55ICogbW1Ub1BvaW50czsKKyAgICAgICAgICAgIHBhZ2VSZWN0LndpZHRoID0g cGFnZVJlY3Qud2lkdGggKiBtbVRvUG9pbnRzOworICAgICAgICAgICAgcGFnZVJlY3QuaGVpZ2h0 ID0gcGFnZVJlY3QuaGVpZ2h0ICogbW1Ub1BvaW50czsKICAgICAgICAgfQogICAgICAgICBtX3Bh Z2VXaWR0aCA9IHBhZ2VSZWN0LndpZHRoOwogICAgICAgICBtX3ByaW50Q29udGV4dC5iZWdpbiht X3BhZ2VXaWR0aCk7CisgICAgICAgIC8vIGlzUHJpbnRpbmcgaXMgZnJvbSB0aGUgcGVyc3BlY3Rp dmUgb2YgdGhlIFByaW50Q29udGV4dCwgc28gd2UgbmVlZCB0aGlzIHdoZW4gd2UgY2FsbCBiZWdp bi4KKyAgICAgICAgbV9pc1ByaW50aW5nID0gdHJ1ZTsKIAogICAgICAgICBmbG9hdCBwYWdlSGVp Z2h0ID0gcGFnZVJlY3QuaGVpZ2h0OwogICAgICAgICBtX3ByaW50Q29udGV4dC5jb21wdXRlUGFn ZVJlY3RzKFdlYkNvcmU6OkZsb2F0UmVjdChwYWdlUmVjdCksIC8qIGhlYWRlckhlaWdodCAqLyAw LCAvKiBmb290ZXJIZWlnaHQgKi8gMCwgLyogdXNlclNjYWxlRmFjdG9yICovIDEuMCwgcGFnZUhl aWdodCk7CiAgICAgfQogICAgIAotICAgIHZvaWQgT25CZWdpblByaW50aW5nKCkKKyAgICB2b2lk IE9uUHJlcGFyZVByaW50aW5nKCkKICAgICB7CiAgICAgICAgIHd4UHJpbnRlckRDKiBwZGMgPSBk eW5hbWljX2Nhc3Q8d3hQcmludGVyREMqPihHZXREQygpKTsKICAgICAgICAgcGRjLT5TZXRNYXBN b2RlKHd4TU1fUE9JTlRTKTsKQEAgLTEzNSw3ICsxNDEsMTIgQEAKICAgICAgICAgcGRjLT5HZXRT aXplKCZwaXhlbHNXLCAmcGl4ZWxzSCk7CiAgICAgICAgIHBpeGVsc1cgPSBwZGMtPkRldmljZVRv TG9naWNhbFhSZWwocGl4ZWxzVyk7CiAgICAgICAgIHBpeGVsc0ggPSBwZGMtPkRldmljZVRvTG9n aWNhbFlSZWwocGl4ZWxzSCk7Ci0gICAgICAgIEluaXRpYWxpemVXaXRoUGFnZVNpemUod3hSZWN0 KDAsIDAsIHBpeGVsc1csIHBpeGVsc0ggLSA0MCksIGZhbHNlKTsKKyNpZiBfX1dYTVNXX18KKyAg ICAgICAgLy8gb24gV2luZG93cywgdGhlIGNvbnRleHQgaGFzIG5vIG1hcmdpbnMsIHNvIGFkZCB0 aGVtIG91cnNlbHZlcy4KKyAgICAgICAgcGl4ZWxzVyAtPSAzMDsKKyAgICAgICAgcGl4ZWxzSCAt PSAzMDsKKyNlbmRpZgorICAgICAgICBJbml0aWFsaXplV2l0aFBhZ2VTaXplKHd4UmVjdCgwLCAw LCBwaXhlbHNXLCBwaXhlbHNIKSwgZmFsc2UpOwogICAgIH0KICAgICAKICAgICB2b2lkIEdldFBh Z2VJbmZvKGludCAqbWluUGFnZSwgaW50ICptYXhQYWdlLCBpbnQgKnBhZ2VGcm9tLCBpbnQgKnBh Z2VUbykKQEAgLTE2Nyw2ICsxNzgsMTAgQEAKICAgICAgICAgQVNTRVJUKHJlbmRlcmVyKTsKICAg ICAgICAgd3hHcmFwaGljc0NvbnRleHQqIGNvbnRleHQgPSByZW5kZXJlci0+Q3JlYXRlQ29udGV4 dCgqcGRjKTsKICAgICAgICAgd3hHQ0RDIGdjZGMoY29udGV4dCk7CisjaWYgX19XWE1TV19fCisg ICAgICAgIC8vIHNlZSBjb21tZW50IGFib3ZlIGFib3V0IFdpbmRvd3MgY29udGV4dHMgbm90IGhh dmluZyBtYXJnaW5zIHNldC4KKyAgICAgICAgZ2NkYy5TZXREZXZpY2VPcmlnaW4oMTUsIDE1KTsK KyNlbmRpZgogICAgICAgICBpZiAoIWdjZGMuSXNPaygpKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogCkBAIC0xNzgsMTMgKzE5MywxNSBAQAogICAgIAogICAgIHZvaWQgT25FbmRQcmludGlu ZygpCiAgICAgewotICAgICAgICBtX3ByaW50Q29udGV4dC5lbmQoKTsgICAKKyAgICAgICAgbV9w cmludENvbnRleHQuZW5kKCk7CisgICAgICAgIG1faXNQcmludGluZyA9IGZhbHNlOwogICAgIH0K ICAgICAKIHByaXZhdGU6CiAgICAgZmxvYXQgbV9wYWdlV2lkdGg7CiAgICAgaW50IG1fZnJvbVBh Z2U7CiAgICAgaW50IG1fdG9QYWdlOworICAgIGJvb2wgbV9pc1ByaW50aW5nOwogICAgIFdlYkNv cmU6OkZyYW1lICptX2ZyYW1lOwogICAgIFdlYkNvcmU6OlByaW50Q29udGV4dCBtX3ByaW50Q29u dGV4dDsKIH07CkBAIC02MTIsNDIgKzYyOSw1MSBAQAogICAgIHByaW50ZGF0YS5HZXRQcmludERh dGEoKS5TZXROb0NvcGllcygxKTsKICNpZiB3eENIRUNLX1ZFUlNJT04oMiwgOSwgMikKICAgICBw cmludGRhdGEuR2V0UHJpbnREYXRhKCkuQ29udmVydEZyb21OYXRpdmUoKTsKLSNlbHNlCi0gICAg Ly8gZHVlIHRvIHd4IGJ1Z3MsIHdlIGNhbm5vdCBnZXQgdGhlIGFjdHVhbCBuYXRpdmUgZGVmYXVs dCBwYXBlciB0eXBlIGJlZm9yZSBzaG93aW5nIHRoZSBkaWFsb2cgdW50aWwgMi45LjIsIAotICAg IC8vIHNvIHBpY2sgYSBjb21tb24gZGVmYXVsdCBpbnN0ZWFkLgotICAgIHByaW50ZGF0YS5HZXRQ cmludERhdGEoKS5TZXRQYXBlcklkKHd4UEFQRVJfTEVUVEVSKTsKICNlbmRpZgogCisgICAgLy8g bWFrZSBzdXJlIHdlIGhhdmUgYSB2YWxpZCBwYXBlciB0eXBlLCBpZiB3ZSBkb24ndCwgdGhlIHRv IC8gZnJvbSBwYWdlcyB3aWxsIGJvdGggYmUgMAorICAgIC8vIGFuZCB0aGUgZGlhbG9nIHdvbid0 IHNob3cuCisgICAgaWYgKHByaW50ZGF0YS5HZXRQcmludERhdGEoKS5HZXRQYXBlcklkKCkgPT0g d3hQQVBFUl9OT05FKQorICAgICAgICBwcmludGRhdGEuR2V0UHJpbnREYXRhKCkuU2V0UGFwZXJJ ZCh3eFBBUEVSX0xFVFRFUik7CisKICAgICB3eFBhZ2VTZXR1cERpYWxvZ0RhdGEgcGFnZVNldHVw KHByaW50ZGF0YS5HZXRQcmludERhdGEoKSk7CiAKICAgICB3eFJlY3QgcGFwZXJTaXplID0gcGFn ZVNldHVwLkdldFBhcGVyU2l6ZSgpOwotI2lmZGVmIF9fV1hNU1dfXwotICAgIC8vIE9uIFdpbmRv d3MsIHRoZSBwYXBlciBzaXplIGFwcGFyZW50bHkgaW5jbHVkZXMgdGhlIG5vbi1wcmludGFibGUg YXJlYXMgb2YgdGhlIHBhZ2UuCi0gICAgLy8gR3Vlc3N0aW1hdGUgdGhlIHByaW50YWJsZSBwYWdl IG1hcmdpbnMgdW50aWwgd2UgZmluZCBhIGJldHRlciBzb2x1dGlvbi4KKyAgICAvLyBUaGUgcGFw ZXIgc2l6ZSBpbmNsdWRlcyB0aGUgbm9uLXByaW50YWJsZSBhcmVhcyBvZiB0aGUgcGFnZS4KKyAg ICAvLyBHdWVzc3RpbWF0ZSB0aGUgcHJpbnRhYmxlIHBhZ2UgbWFyZ2lucyB1bnRpbCB3ZSBmaW5k IGEgd2F5IHRvIHByZWNpc2VseQorICAgIC8vIGNhbGN1bGF0ZSB0aGUgbWFyZ2lucyB1c2VkIGJ5 IHRoZSBkZXZpY2UgY29udGV4dCBvbiBNYWMuCiAgICAgcGFwZXJTaXplLkRlZmxhdGUoMTUsIDE1 KTsKLSNlbmRpZgorCiAgICAgd3hXZWJGcmFtZVByaW50b3V0KiBwcmludG91dCA9IG5ldyB3eFdl YkZyYW1lUHJpbnRvdXQobV9pbXBsLT5mcmFtZSk7CiAgICAgcHJpbnRvdXQtPkluaXRpYWxpemVX aXRoUGFnZVNpemUocGFwZXJTaXplKTsKICAgICAKKyAgICBpbnQgcGFnZXMgPSBwcmludG91dC0+ R2V0UGFnZUNvdW50KCk7CisgICAgQVNTRVJUKHBhZ2VzID4gMCk7CisKICAgICBwcmludGRhdGEu U2V0TWluUGFnZSgxKTsKLSAgICBwcmludGRhdGEuU2V0TWF4UGFnZShwcmludG91dC0+R2V0UGFn ZUNvdW50KCkpOworICAgIHByaW50ZGF0YS5TZXRNYXhQYWdlKHBhZ2VzKTsKICAgICBwcmludGRh dGEuU2V0RnJvbVBhZ2UoMSk7Ci0gICAgcHJpbnRkYXRhLlNldFRvUGFnZShwcmludG91dC0+R2V0 UGFnZUNvdW50KCkpOworICAgIHByaW50ZGF0YS5TZXRUb1BhZ2UocGFnZXMpOwogCisgICAgYm9v bCBzaG91bGRQcmludCA9IHRydWU7CiAgICAgaWYgKHNob3dEaWFsb2cpIHsKICAgICAgICAgd3hQ cmludERpYWxvZyBkaWFsb2coMCwgJnByaW50ZGF0YSk7Ci0gICAgICAgIGlmIChkaWFsb2cuU2hv d01vZGFsKCkgPT0gd3hJRF9PSykgeworICAgICAgICBzaG91bGRQcmludCA9IChkaWFsb2cuU2hv d01vZGFsKCkgPT0gd3hJRF9PSyk7CisgICAgICAgIGlmIChzaG91bGRQcmludCkgewogICAgICAg ICAgICAgcHJpbnRkYXRhID0gZGlhbG9nLkdldFByaW50RGlhbG9nRGF0YSgpOyAgICAgICAgICAg IAogICAgICAgICAgICAgcHJpbnRvdXQtPlNldEZpcnN0UGFnZShwcmludGRhdGEuR2V0RnJvbVBh Z2UoKSk7CiAgICAgICAgICAgICBwcmludG91dC0+U2V0TGFzdFBhZ2UocHJpbnRkYXRhLkdldFRv UGFnZSgpKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K ICAgICB9CiAgICAgCi0gICAgd3hQcmludGVyIHByaW50ZXIoJnByaW50ZGF0YSk7CisgICAgaWYg KHNob3VsZFByaW50KSB7CisgICAgICAgIHd4UHJpbnRlciBwcmludGVyKCZwcmludGRhdGEpOwor ICAgICAgICBwcmludGVyLlByaW50KDAsIHByaW50b3V0LCBmYWxzZSk7CisgICAgfQorICAgIAor ICAgIGlmIChwcmludG91dCkKKyAgICAgICAgZGVsZXRlIHByaW50b3V0OwogICAgICAgICAKLSAg ICBwcmludGVyLlByaW50KDAsIHByaW50b3V0LCBmYWxzZSk7Ci0gICAgICAgIAogI2Vsc2UKICAg ICB3eEZBSUxfTVNHKHd4VCgiUHJpbnRpbmcgaXMgb25seSBzdXBwb3J0ZWQgaW4gd3hXaWRnZXRz IDIuOS4xIGFuZCBhYm92ZS4iKSk7CiAjZW5kaWYK