34545 2010-02-03 16:13:56 -0800 [WinCairo] Properly Handle Margin Settings 2010-02-04 13:35:17 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham webkit.review.bot oldest_to_newest 187529 0 bfulgham 2010-02-03 16:13:56 -0800 The existing printing implementation for the WinCairo port does not properly consider the margin settings when calculating the scaling factor to use when drawing to the print context. Consequently, a page printed using the WinCairo port is not the same size as that produced by Safari, and does not properly draw within the specified margins. Fix is to compute the scaling factor after incorporating the margin regions. This allows the WinCairo print output to closely match the Safari output. 187544 1 48077 bfulgham 2010-02-03 16:25:33 -0800 Created attachment 48077 Patch to correct handling of margins when printing. 187545 2 webkit.review.bot 2010-02-03 16:28:11 -0800 Attachment 48077 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/win/WebFrame.cpp:2081: Extra space before ( in function call [whitespace/parens] [4] WebKit/win/WebFrame.cpp:2082: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 If any of these errors are false positives, please file a bug against check-webkit-style. 187547 3 48078 bfulgham 2010-02-03 16:30:42 -0800 Created attachment 48078 Revised patch, remove two extra spaces in function calls. 187827 4 48078 aroben 2010-02-04 09:07:07 -0800 Comment on attachment 48078 Revised patch, remove two extra spaces in function calls. > + cairoMarginRect.scale(1.0f / scale); You can just say "1 / scale" here. The 1 will get promoted to a float automatically. r=me 187876 5 bfulgham 2010-02-04 11:31:12 -0800 Landed in http://trac.webkit.org/changeset/54356. 48077 2010-02-03 16:25:33 -0800 2010-02-03 16:30:42 -0800 Patch to correct handling of margins when printing. margins.patch text/plain 4962 bfulgham SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA1NDMwOSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDItMDMgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFByb3Blcmx5IGhhbmRsZSBtYXJnaW4gc2V0dGluZ3MgaW4gV2luQ2Fpcm8uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDU0NQorCisg ICAgICAgICogV2ViRnJhbWUuY3BwOgorICAgICAgICAoc2NhbGVGYWN0b3IpOiBSZXF1aXJlIHRo ZSBtYXJnaW4gaW5mb3JtYXRpb24gYXMgYW4gaW5wdXQKKyAgICAgICAgICBwYXJhbWV0ZXIsIGFu ZCB1c2UgdGhlbSB3aGVuIGNvbXB1dGluZyB0aGUgc2NhbGluZyBmYWN0b3IuCisgICAgICAgIChX ZWJGcmFtZTo6ZHJhd0hlYWRlcik6IFBhc3MgbWFyZ2luIHNpemUgdG8gc2NhbGVGYWN0b3IuCisg ICAgICAgIChXZWJGcmFtZTo6ZHJhd0Zvb3Rlcik6IFBhc3MgbWFyZ2luIHNpemUgdG8gc2NhbGVG YWN0b3IuCisgICAgICAgIChXZWJGcmFtZTo6c3Bvb2xQYWdlKToKKyAgICAgICAgICAxLiBQYXNz IG1hcmdpbiBzaXplIHRvIHNjYWxlRmFjdG9yLgorICAgICAgICAgIDIuIFJlY29nbml6ZSB0aGF0 IHRoZSByZXR1cm4gdmFsdWUgb2YgcHJpbnRlck1hcmdpblJlY3QgaXMKKyAgICAgICAgICAgICBh bHJlYWR5IGluIGRldmljZSB1bml0cywgYW5kIHRoZXJlZm9yZSBzY2FsZSBpdCBzbyB0aGF0Cisg ICAgICAgICAgICAgdGhlIENhaXJvIGRyYXdpbmcgaXMgY29ycmVjdC4KKyAgICAgICAgICAzLiBS ZW1vdmUgc2NhbGluZyBjYWxsIGZvciBtYXJnaW5zIGluIEdESSBjb2RlLCBhcyBpdCBpcworICAg ICAgICAgICAgIGFscmVhZHkgaW4gc2NhbGVkIHVuaXRzLgorCiAyMDEwLTAyLTAzICBCcmlhbiBX ZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT dGV2ZSBGYWxrZW5idXJnLgpJbmRleDogV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAJKHJldmlzaW9uIDU0MDMyKQorKysgV2ViS2l0 L3dpbi9XZWJGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMTgsMTEgKzIwMTgsMTcgQEAg dm9pZCBXZWJGcmFtZTo6c3Bvb2xQYWdlKFBsYXRmb3JtR3JhcGhpYwogICAgIENHQ29udGV4dFJl c3RvcmVHU3RhdGUocGN0eCk7CiB9CiAjZWxpZiBQTEFURk9STShDQUlSTykKLXN0YXRpYyBmbG9h dCBzY2FsZUZhY3RvcihIREMgcHJpbnREQywgY29uc3QgSW50UmVjdCYgcGFnZVJlY3QpCitzdGF0 aWMgZmxvYXQgc2NhbGVGYWN0b3IoSERDIHByaW50REMsIGNvbnN0IEludFJlY3QmIG1hcmdpblJl Y3QsIGNvbnN0IEludFJlY3QmIHBhZ2VSZWN0KQogewogICAgIGNvbnN0IEludFJlY3QmIHByaW50 UmVjdCA9IHByaW50ZXJSZWN0KHByaW50REMpOwogCi0gICAgZmxvYXQgc2NhbGUgPSBzdGF0aWNf Y2FzdDxmbG9hdD4ocHJpbnRSZWN0LndpZHRoKCkpIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHBhZ2VS ZWN0LndpZHRoKCkpOworICAgIEludFJlY3QgYWRqdXN0ZWRSZWN0ID0gSW50UmVjdCgKKyAgICAg ICAgcHJpbnRSZWN0LngoKSArIG1hcmdpblJlY3QueCgpLAorICAgICAgICBwcmludFJlY3QueSgp ICsgbWFyZ2luUmVjdC55KCksCisgICAgICAgIHByaW50UmVjdC53aWR0aCgpIC0gbWFyZ2luUmVj dC54KCkgLSBtYXJnaW5SZWN0LnJpZ2h0KCksCisgICAgICAgIHByaW50UmVjdC5oZWlnaHQoKSAt IG1hcmdpblJlY3QueSgpIC0gbWFyZ2luUmVjdC5ib3R0b20oKSk7CisKKyAgICBmbG9hdCBzY2Fs ZSA9IHN0YXRpY19jYXN0PGZsb2F0PihhZGp1c3RlZFJlY3Qud2lkdGgoKSkgLyBzdGF0aWNfY2Fz dDxmbG9hdD4ocGFnZVJlY3Qud2lkdGgoKSk7CiAgICAgaWYgKCFzY2FsZSkKICAgICAgICBzY2Fs ZSA9IDEuMDsKIApAQCAtMjAzOCw4ICsyMDQ0LDkgQEAgc3RhdGljIEhEQyBoZGNGcm9tQ29udGV4 dChQbGF0Zm9ybUdyYXBoaQogdm9pZCBXZWJGcmFtZTo6ZHJhd0hlYWRlcihQbGF0Zm9ybUdyYXBo aWNzQ29udGV4dCogcGN0eCwgSVdlYlVJRGVsZWdhdGUqIHVpLCBjb25zdCBJbnRSZWN0JiBwYWdl UmVjdCwgZmxvYXQgaGVhZGVySGVpZ2h0KQogewogICAgIEhEQyBoZGMgPSBoZGNGcm9tQ29udGV4 dChwY3R4KTsKKyAgICBjb25zdCBJbnRSZWN0JiBtYXJnaW5SZWN0ID0gcHJpbnRlck1hcmdpblJl Y3QoaGRjKTsKIAotICAgIGNvbnN0IGZsb2F0IHNjYWxlID0gc2NhbGVGYWN0b3IoaGRjLCBwYWdl UmVjdCk7CisgICAgY29uc3QgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3RvcihoZGMsIG1hcmdpblJl Y3QsIHBhZ2VSZWN0KTsKICAgICBpbnQgeCA9IHN0YXRpY19jYXN0PGludD4oc2NhbGUgKiBwYWdl UmVjdC54KCkpOwogICAgIGludCB5ID0gMDsKICAgICBSRUNUIGhlYWRlclJlY3QgPSB7eCwgeSwg eCArIHN0YXRpY19jYXN0PGludD4oc2NhbGUgKiBwYWdlUmVjdC53aWR0aCgpKSwgeSArIHN0YXRp Y19jYXN0PGludD4oc2NhbGUgKiBoZWFkZXJIZWlnaHQpfTsKQEAgLTIwNTAsOCArMjA1Nyw5IEBA IHZvaWQgV2ViRnJhbWU6OmRyYXdIZWFkZXIoUGxhdGZvcm1HcmFwaGkKIHZvaWQgV2ViRnJhbWU6 OmRyYXdGb290ZXIoUGxhdGZvcm1HcmFwaGljc0NvbnRleHQqIHBjdHgsIElXZWJVSURlbGVnYXRl KiB1aSwgY29uc3QgSW50UmVjdCYgcGFnZVJlY3QsIFVJTlQgcGFnZSwgVUlOVCBwYWdlQ291bnQs IGZsb2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVySGVpZ2h0KQogewogICAgIEhEQyBoZGMg PSBoZGNGcm9tQ29udGV4dChwY3R4KTsKKyAgICBjb25zdCBJbnRSZWN0JiBtYXJnaW5SZWN0ID0g cHJpbnRlck1hcmdpblJlY3QoaGRjKTsKIAotICAgIGNvbnN0IGZsb2F0IHNjYWxlID0gc2NhbGVG YWN0b3IoaGRjLCBwYWdlUmVjdCk7CisgICAgY29uc3QgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3Rv cihoZGMsIG1hcmdpblJlY3QsIHBhZ2VSZWN0KTsKICAgICBpbnQgeCA9IHN0YXRpY19jYXN0PGlu dD4oc2NhbGUgKiBwYWdlUmVjdC54KCkpOwogICAgIGludCB5ID0gc3RhdGljX2Nhc3Q8aW50Pihz Y2FsZSAqIG1heChzdGF0aWNfY2FzdDxpbnQ+KGhlYWRlckhlaWdodCkgKyBwYWdlUmVjdC5oZWln aHQoKSwgbV9wYWdlSGVpZ2h0LXN0YXRpY19jYXN0PGludD4oZm9vdGVySGVpZ2h0KSkpOwogICAg IFJFQ1QgZm9vdGVyUmVjdCA9IHt4LCB5LCB4ICsgc3RhdGljX2Nhc3Q8aW50PihzY2FsZSAqIHBh Z2VSZWN0LndpZHRoKCkpLCB5ICsgc3RhdGljX2Nhc3Q8aW50PihzY2FsZSAqIGZvb3RlckhlaWdo dCl9OwpAQCAtMjA2NCwyNCArMjA3MiwyNyBAQCB2b2lkIFdlYkZyYW1lOjpzcG9vbFBhZ2UoUGxh dGZvcm1HcmFwaGljCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUodGhpcyk7CiAKICAgICBj b25zdCBJbnRSZWN0JiBwYWdlUmVjdCA9IG1fcGFnZVJlY3RzW3BhZ2VdOwotICAgIEludFJlY3Qg bWFyZ2luUmVjdCA9IHByaW50ZXJNYXJnaW5SZWN0KHByaW50REMpOworICAgIGNvbnN0IEludFJl Y3QmIG1hcmdpblJlY3QgPSBwcmludGVyTWFyZ2luUmVjdChwcmludERDKTsKIAogICAgIGNhaXJv X3NhdmUocGN0eCk7Ci0gICAgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3RvcihwcmludERDLCBwYWdl UmVjdCk7CisgICAgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3RvcihwcmludERDLCBtYXJnaW5SZWN0 LCBwYWdlUmVjdCk7CiAgICAgY2Fpcm9fc2NhbGUocGN0eCwgc2NhbGUsIHNjYWxlKTsKIAotICAg IGNhaXJvX3RyYW5zbGF0ZShwY3R4LCAtcGFnZVJlY3QueCgpICsgbWFyZ2luUmVjdC54KCksIC1w YWdlUmVjdC55KCkgKyBtYXJnaW5SZWN0LnkoKSArIGhlYWRlckhlaWdodCk7CisgICAgSW50UmVj dCBjYWlyb01hcmdpblJlY3QgKG1hcmdpblJlY3QpOworICAgIGNhaXJvTWFyZ2luUmVjdC5zY2Fs ZSAoMS4wZiAvIHNjYWxlKTsKKworICAgIGNhaXJvX3RyYW5zbGF0ZShwY3R4LCAtcGFnZVJlY3Qu eCgpICsgY2Fpcm9NYXJnaW5SZWN0LngoKSwgLXBhZ2VSZWN0LnkoKSArIGNhaXJvTWFyZ2luUmVj dC55KCkgKyBoZWFkZXJIZWlnaHQpOwogICAgIGNvcmVGcmFtZS0+dmlldygpLT5wYWludENvbnRl bnRzKHNwb29sQ3R4LCBwYWdlUmVjdCk7CiAKLSAgICBjYWlyb190cmFuc2xhdGUocGN0eCwgcGFn ZVJlY3QueCgpIC0gbWFyZ2luUmVjdC54KCksIHBhZ2VSZWN0LnkoKSAtIG1hcmdpblJlY3QueSgp IC0gaGVhZGVySGVpZ2h0KTsKKyAgICBjYWlyb190cmFuc2xhdGUocGN0eCwgcGFnZVJlY3QueCgp IC0gY2Fpcm9NYXJnaW5SZWN0LngoKSwgcGFnZVJlY3QueSgpIC0gY2Fpcm9NYXJnaW5SZWN0Lnko KSAtIGhlYWRlckhlaWdodCk7CiAKICAgICBYRk9STSBvcmlnaW5hbFdvcmxkOwogICAgIDo6R2V0 V29ybGRUcmFuc2Zvcm0ocHJpbnREQywgJm9yaWdpbmFsV29ybGQpOwogCiAgICAgLy8gUG9zaXRp b24gd29ybGQgdHJhbnNmb3JtIHRvIGFjY291bnQgZm9yIG1hcmdpbgogICAgIFhGT1JNIG5ld1dv cmxkID0gb3JpZ2luYWxXb3JsZDsKLSAgICBuZXdXb3JsZC5lRHggPSBzY2FsZSAqIG1hcmdpblJl Y3QueCgpOwotICAgIG5ld1dvcmxkLmVEeSA9IHNjYWxlICogbWFyZ2luUmVjdC55KCk7CisgICAg bmV3V29ybGQuZUR4ID0gbWFyZ2luUmVjdC54KCk7CisgICAgbmV3V29ybGQuZUR5ID0gbWFyZ2lu UmVjdC55KCk7CiAKICAgICA6OlNldFdvcmxkVHJhbnNmb3JtKHByaW50REMsICZuZXdXb3JsZCk7 CiAK 48078 2010-02-03 16:30:42 -0800 2010-02-04 09:07:06 -0800 Revised patch, remove two extra spaces in function calls. margins.patch text/plain 4960 bfulgham SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA1NDMwOSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDItMDMgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFByb3Blcmx5IGhhbmRsZSBtYXJnaW4gc2V0dGluZ3MgaW4gV2luQ2Fpcm8uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDU0NQorCisg ICAgICAgICogV2ViRnJhbWUuY3BwOgorICAgICAgICAoc2NhbGVGYWN0b3IpOiBSZXF1aXJlIHRo ZSBtYXJnaW4gaW5mb3JtYXRpb24gYXMgYW4gaW5wdXQKKyAgICAgICAgICBwYXJhbWV0ZXIsIGFu ZCB1c2UgdGhlbSB3aGVuIGNvbXB1dGluZyB0aGUgc2NhbGluZyBmYWN0b3IuCisgICAgICAgIChX ZWJGcmFtZTo6ZHJhd0hlYWRlcik6IFBhc3MgbWFyZ2luIHNpemUgdG8gc2NhbGVGYWN0b3IuCisg ICAgICAgIChXZWJGcmFtZTo6ZHJhd0Zvb3Rlcik6IFBhc3MgbWFyZ2luIHNpemUgdG8gc2NhbGVG YWN0b3IuCisgICAgICAgIChXZWJGcmFtZTo6c3Bvb2xQYWdlKToKKyAgICAgICAgICAxLiBQYXNz IG1hcmdpbiBzaXplIHRvIHNjYWxlRmFjdG9yLgorICAgICAgICAgIDIuIFJlY29nbml6ZSB0aGF0 IHRoZSByZXR1cm4gdmFsdWUgb2YgcHJpbnRlck1hcmdpblJlY3QgaXMKKyAgICAgICAgICAgICBh bHJlYWR5IGluIGRldmljZSB1bml0cywgYW5kIHRoZXJlZm9yZSBzY2FsZSBpdCBzbyB0aGF0Cisg ICAgICAgICAgICAgdGhlIENhaXJvIGRyYXdpbmcgaXMgY29ycmVjdC4KKyAgICAgICAgICAzLiBS ZW1vdmUgc2NhbGluZyBjYWxsIGZvciBtYXJnaW5zIGluIEdESSBjb2RlLCBhcyBpdCBpcworICAg ICAgICAgICAgIGFscmVhZHkgaW4gc2NhbGVkIHVuaXRzLgorCiAyMDEwLTAyLTAzICBCcmlhbiBX ZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT dGV2ZSBGYWxrZW5idXJnLgpJbmRleDogV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAJKHJldmlzaW9uIDU0MDMyKQorKysgV2ViS2l0 L3dpbi9XZWJGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMTgsMTEgKzIwMTgsMTcgQEAg dm9pZCBXZWJGcmFtZTo6c3Bvb2xQYWdlKFBsYXRmb3JtR3JhcGhpYwogICAgIENHQ29udGV4dFJl c3RvcmVHU3RhdGUocGN0eCk7CiB9CiAjZWxpZiBQTEFURk9STShDQUlSTykKLXN0YXRpYyBmbG9h dCBzY2FsZUZhY3RvcihIREMgcHJpbnREQywgY29uc3QgSW50UmVjdCYgcGFnZVJlY3QpCitzdGF0 aWMgZmxvYXQgc2NhbGVGYWN0b3IoSERDIHByaW50REMsIGNvbnN0IEludFJlY3QmIG1hcmdpblJl Y3QsIGNvbnN0IEludFJlY3QmIHBhZ2VSZWN0KQogewogICAgIGNvbnN0IEludFJlY3QmIHByaW50 UmVjdCA9IHByaW50ZXJSZWN0KHByaW50REMpOwogCi0gICAgZmxvYXQgc2NhbGUgPSBzdGF0aWNf Y2FzdDxmbG9hdD4ocHJpbnRSZWN0LndpZHRoKCkpIC8gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHBhZ2VS ZWN0LndpZHRoKCkpOworICAgIEludFJlY3QgYWRqdXN0ZWRSZWN0ID0gSW50UmVjdCgKKyAgICAg ICAgcHJpbnRSZWN0LngoKSArIG1hcmdpblJlY3QueCgpLAorICAgICAgICBwcmludFJlY3QueSgp ICsgbWFyZ2luUmVjdC55KCksCisgICAgICAgIHByaW50UmVjdC53aWR0aCgpIC0gbWFyZ2luUmVj dC54KCkgLSBtYXJnaW5SZWN0LnJpZ2h0KCksCisgICAgICAgIHByaW50UmVjdC5oZWlnaHQoKSAt IG1hcmdpblJlY3QueSgpIC0gbWFyZ2luUmVjdC5ib3R0b20oKSk7CisKKyAgICBmbG9hdCBzY2Fs ZSA9IHN0YXRpY19jYXN0PGZsb2F0PihhZGp1c3RlZFJlY3Qud2lkdGgoKSkgLyBzdGF0aWNfY2Fz dDxmbG9hdD4ocGFnZVJlY3Qud2lkdGgoKSk7CiAgICAgaWYgKCFzY2FsZSkKICAgICAgICBzY2Fs ZSA9IDEuMDsKIApAQCAtMjAzOCw4ICsyMDQ0LDkgQEAgc3RhdGljIEhEQyBoZGNGcm9tQ29udGV4 dChQbGF0Zm9ybUdyYXBoaQogdm9pZCBXZWJGcmFtZTo6ZHJhd0hlYWRlcihQbGF0Zm9ybUdyYXBo aWNzQ29udGV4dCogcGN0eCwgSVdlYlVJRGVsZWdhdGUqIHVpLCBjb25zdCBJbnRSZWN0JiBwYWdl UmVjdCwgZmxvYXQgaGVhZGVySGVpZ2h0KQogewogICAgIEhEQyBoZGMgPSBoZGNGcm9tQ29udGV4 dChwY3R4KTsKKyAgICBjb25zdCBJbnRSZWN0JiBtYXJnaW5SZWN0ID0gcHJpbnRlck1hcmdpblJl Y3QoaGRjKTsKIAotICAgIGNvbnN0IGZsb2F0IHNjYWxlID0gc2NhbGVGYWN0b3IoaGRjLCBwYWdl UmVjdCk7CisgICAgY29uc3QgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3RvcihoZGMsIG1hcmdpblJl Y3QsIHBhZ2VSZWN0KTsKICAgICBpbnQgeCA9IHN0YXRpY19jYXN0PGludD4oc2NhbGUgKiBwYWdl UmVjdC54KCkpOwogICAgIGludCB5ID0gMDsKICAgICBSRUNUIGhlYWRlclJlY3QgPSB7eCwgeSwg eCArIHN0YXRpY19jYXN0PGludD4oc2NhbGUgKiBwYWdlUmVjdC53aWR0aCgpKSwgeSArIHN0YXRp Y19jYXN0PGludD4oc2NhbGUgKiBoZWFkZXJIZWlnaHQpfTsKQEAgLTIwNTAsOCArMjA1Nyw5IEBA IHZvaWQgV2ViRnJhbWU6OmRyYXdIZWFkZXIoUGxhdGZvcm1HcmFwaGkKIHZvaWQgV2ViRnJhbWU6 OmRyYXdGb290ZXIoUGxhdGZvcm1HcmFwaGljc0NvbnRleHQqIHBjdHgsIElXZWJVSURlbGVnYXRl KiB1aSwgY29uc3QgSW50UmVjdCYgcGFnZVJlY3QsIFVJTlQgcGFnZSwgVUlOVCBwYWdlQ291bnQs IGZsb2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVySGVpZ2h0KQogewogICAgIEhEQyBoZGMg PSBoZGNGcm9tQ29udGV4dChwY3R4KTsKKyAgICBjb25zdCBJbnRSZWN0JiBtYXJnaW5SZWN0ID0g cHJpbnRlck1hcmdpblJlY3QoaGRjKTsKIAotICAgIGNvbnN0IGZsb2F0IHNjYWxlID0gc2NhbGVG YWN0b3IoaGRjLCBwYWdlUmVjdCk7CisgICAgY29uc3QgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3Rv cihoZGMsIG1hcmdpblJlY3QsIHBhZ2VSZWN0KTsKICAgICBpbnQgeCA9IHN0YXRpY19jYXN0PGlu dD4oc2NhbGUgKiBwYWdlUmVjdC54KCkpOwogICAgIGludCB5ID0gc3RhdGljX2Nhc3Q8aW50Pihz Y2FsZSAqIG1heChzdGF0aWNfY2FzdDxpbnQ+KGhlYWRlckhlaWdodCkgKyBwYWdlUmVjdC5oZWln aHQoKSwgbV9wYWdlSGVpZ2h0LXN0YXRpY19jYXN0PGludD4oZm9vdGVySGVpZ2h0KSkpOwogICAg IFJFQ1QgZm9vdGVyUmVjdCA9IHt4LCB5LCB4ICsgc3RhdGljX2Nhc3Q8aW50PihzY2FsZSAqIHBh Z2VSZWN0LndpZHRoKCkpLCB5ICsgc3RhdGljX2Nhc3Q8aW50PihzY2FsZSAqIGZvb3RlckhlaWdo dCl9OwpAQCAtMjA2NCwyNCArMjA3MiwyNyBAQCB2b2lkIFdlYkZyYW1lOjpzcG9vbFBhZ2UoUGxh dGZvcm1HcmFwaGljCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUodGhpcyk7CiAKICAgICBj b25zdCBJbnRSZWN0JiBwYWdlUmVjdCA9IG1fcGFnZVJlY3RzW3BhZ2VdOwotICAgIEludFJlY3Qg bWFyZ2luUmVjdCA9IHByaW50ZXJNYXJnaW5SZWN0KHByaW50REMpOworICAgIGNvbnN0IEludFJl Y3QmIG1hcmdpblJlY3QgPSBwcmludGVyTWFyZ2luUmVjdChwcmludERDKTsKIAogICAgIGNhaXJv X3NhdmUocGN0eCk7Ci0gICAgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3RvcihwcmludERDLCBwYWdl UmVjdCk7CisgICAgZmxvYXQgc2NhbGUgPSBzY2FsZUZhY3RvcihwcmludERDLCBtYXJnaW5SZWN0 LCBwYWdlUmVjdCk7CiAgICAgY2Fpcm9fc2NhbGUocGN0eCwgc2NhbGUsIHNjYWxlKTsKIAotICAg IGNhaXJvX3RyYW5zbGF0ZShwY3R4LCAtcGFnZVJlY3QueCgpICsgbWFyZ2luUmVjdC54KCksIC1w YWdlUmVjdC55KCkgKyBtYXJnaW5SZWN0LnkoKSArIGhlYWRlckhlaWdodCk7CisgICAgSW50UmVj dCBjYWlyb01hcmdpblJlY3QobWFyZ2luUmVjdCk7CisgICAgY2Fpcm9NYXJnaW5SZWN0LnNjYWxl KDEuMGYgLyBzY2FsZSk7CisKKyAgICBjYWlyb190cmFuc2xhdGUocGN0eCwgLXBhZ2VSZWN0Lngo KSArIGNhaXJvTWFyZ2luUmVjdC54KCksIC1wYWdlUmVjdC55KCkgKyBjYWlyb01hcmdpblJlY3Qu eSgpICsgaGVhZGVySGVpZ2h0KTsKICAgICBjb3JlRnJhbWUtPnZpZXcoKS0+cGFpbnRDb250ZW50 cyhzcG9vbEN0eCwgcGFnZVJlY3QpOwogCi0gICAgY2Fpcm9fdHJhbnNsYXRlKHBjdHgsIHBhZ2VS ZWN0LngoKSAtIG1hcmdpblJlY3QueCgpLCBwYWdlUmVjdC55KCkgLSBtYXJnaW5SZWN0LnkoKSAt IGhlYWRlckhlaWdodCk7CisgICAgY2Fpcm9fdHJhbnNsYXRlKHBjdHgsIHBhZ2VSZWN0LngoKSAt IGNhaXJvTWFyZ2luUmVjdC54KCksIHBhZ2VSZWN0LnkoKSAtIGNhaXJvTWFyZ2luUmVjdC55KCkg LSBoZWFkZXJIZWlnaHQpOwogCiAgICAgWEZPUk0gb3JpZ2luYWxXb3JsZDsKICAgICA6OkdldFdv cmxkVHJhbnNmb3JtKHByaW50REMsICZvcmlnaW5hbFdvcmxkKTsKIAogICAgIC8vIFBvc2l0aW9u IHdvcmxkIHRyYW5zZm9ybSB0byBhY2NvdW50IGZvciBtYXJnaW4KICAgICBYRk9STSBuZXdXb3Js ZCA9IG9yaWdpbmFsV29ybGQ7Ci0gICAgbmV3V29ybGQuZUR4ID0gc2NhbGUgKiBtYXJnaW5SZWN0 LngoKTsKLSAgICBuZXdXb3JsZC5lRHkgPSBzY2FsZSAqIG1hcmdpblJlY3QueSgpOworICAgIG5l d1dvcmxkLmVEeCA9IG1hcmdpblJlY3QueCgpOworICAgIG5ld1dvcmxkLmVEeSA9IG1hcmdpblJl Y3QueSgpOwogCiAgICAgOjpTZXRXb3JsZFRyYW5zZm9ybShwcmludERDLCAmbmV3V29ybGQpOwog Cg==