30357 2009-10-14 05:47:51 -0700 [Qt] Be able to specify a header and footer when printing from WebKit 2014-02-03 03:15:52 -0800 1 1 1 Unclassified WebKit WebKit Qt 523.x (Safari 3) All All RESOLVED INVALID Qt P3 Enhancement --- 1 qt-info diegohcg bfulgham cmarcelo darin oldest_to_newest 154561 0 qt-info 2009-10-14 05:47:51 -0700 Be able to specify a header and footer when printing from WebKit, this has been requested from a Qt user. Currently they have to render it separately so that the header and footer can be included afterwards when actually printing it. This was requested against Qt 4.5.3 (not sure if the WebKit version matches up or not). 173183 1 bfulgham 2009-12-18 09:25:35 -0800 Doesn't the WebUIDelegate provide the ability to specify the header/footer behavior? 325574 2 77234 diegohcg 2010-12-22 10:50:53 -0800 Created attachment 77234 no customizable way 327971 3 77691 diegohcg 2010-12-30 11:30:51 -0800 Created attachment 77691 Patch 328051 4 77691 ariya.hidayat 2010-12-30 15:40:13 -0800 Comment on attachment 77691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77691&action=review r-, in particular because the merging with 26584 needs to be planned > WebKit/qt/Api/qwebframe.cpp:1431 > +QWebPrinter* QWebFrame::webPrinter() > +{ > + static QWebPrinter* p = 0; > + if (!p) > + p = new QWebPrinter; > + > + return p; > +} This will leak memory. > WebKit/qt/Api/qwebframe.h:131 > +class QWEBKIT_EXPORT QWebPrinter { > +public: > + bool printHeaderAndFooter() const { return hasHeaderAndFooter; } > + void setPrintHeaderAndFooter(bool flag = true) { hasHeaderAndFooter = flag; } > + > + void setHeader(const QString& left, const QString& center, const QString& right); > + void setFooter(const QString& left, const QString& center, const QString& right); > + > +private: > + QWebPrinter() > + : hasHeaderAndFooter(false) > + {} > + > + QString headerLeft; > + QString headerCenter; > + QString headerRight; > + QString footerLeft; > + QString footerCenter; > + QString footerRight; > + > + bool hasHeaderAndFooter; > + > + friend class QWebFrame; > +}; > +#endif This is a whole new set of API. Needs some coordinated discussion. For example, this should be merged to Bug 26584. 328529 5 diegohcg 2011-01-03 05:11:44 -0800 Sure Ariya, I will take at bug 26584 to discuss this merge :) (In reply to comment #4) > (From update of attachment 77691 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77691&action=review > > r-, in particular because the merging with 26584 needs to be planned > > > WebKit/qt/Api/qwebframe.cpp:1431 > > +QWebPrinter* QWebFrame::webPrinter() > > +{ > > + static QWebPrinter* p = 0; > > + if (!p) > > + p = new QWebPrinter; > > + > > + return p; > > +} > > This will leak memory. > > > WebKit/qt/Api/qwebframe.h:131 > > +class QWEBKIT_EXPORT QWebPrinter { > > +public: > > + bool printHeaderAndFooter() const { return hasHeaderAndFooter; } > > + void setPrintHeaderAndFooter(bool flag = true) { hasHeaderAndFooter = flag; } > > + > > + void setHeader(const QString& left, const QString& center, const QString& right); > > + void setFooter(const QString& left, const QString& center, const QString& right); > > + > > +private: > > + QWebPrinter() > > + : hasHeaderAndFooter(false) > > + {} > > + > > + QString headerLeft; > > + QString headerCenter; > > + QString headerRight; > > + QString footerLeft; > > + QString footerCenter; > > + QString footerRight; > > + > > + bool hasHeaderAndFooter; > > + > > + friend class QWebFrame; > > +}; > > +#endif > > This is a whole new set of API. Needs some coordinated discussion. > > For example, this should be merged to Bug 26584. 975093 6 jturcotte 2014-02-03 03:15:52 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it and remove [Qt] from the summary. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 77234 2010-12-22 10:50:53 -0800 2010-12-30 11:30:51 -0800 no customizable way 0001-printer-header-and-footer.diff text/plain 4732 diegohcg RnJvbSBlMDc4OWY4ZGNhZmRiZDk4MDYxM2UyMmFhYjljODhiZDg2YjI0OWQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K RGF0ZTogVHVlLCAxNCBEZWMgMjAxMCAxMDoxODo1OSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIHBy aW50ZXIgaGVhZGVyIGFuZCBmb290ZXIKCi0tLQogVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWlud2lu ZG93LmNwcCB8ICAgIDIgKysKIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCAgICAgICAgfCAg IDI1ICsrKysrKysrKysrKysrKysrKysrKysrKy0KIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgg ICAgICAgICAgfCAgICA1ICsrKystCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZV9wLmggICAgICAg IHwgICAgNyArKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWlud2luZG93LmNw cCBiL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5jcHAKaW5kZXggZjM2MWZhOC4uODgy YTUzNCAxMDA2NDQKLS0tIGEvVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWlud2luZG93LmNwcAorKysg Yi9Ub29scy9RdFRlc3RCcm93c2VyL21haW53aW5kb3cuY3BwCkBAIC05OSw2ICs5OSw4IEBAIHZv aWQgTWFpbldpbmRvdzo6YnVpbGRVSSgpCiAgICAgcGFnZSgpLT5hY3Rpb24oUVdlYlBhZ2U6OlRv Z2dsZUJvbGQpLT5zZXRTaG9ydGN1dChRS2V5U2VxdWVuY2UoUXQ6OkNUUkwgfCBRdDo6S2V5X0Ip KTsKICAgICBwYWdlKCktPmFjdGlvbihRV2ViUGFnZTo6VG9nZ2xlSXRhbGljKS0+c2V0U2hvcnRj dXQoUUtleVNlcXVlbmNlKFF0OjpDVFJMIHwgUXQ6OktleV9JKSk7CiAgICAgcGFnZSgpLT5hY3Rp b24oUVdlYlBhZ2U6OlRvZ2dsZVVuZGVybGluZSktPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShR dDo6Q1RSTCB8IFF0OjpLZXlfVSkpOworCisgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+c2V0UHJp bnRIZWFkZXJBbmRGb290ZXIodHJ1ZSk7CiB9CiAKIHZvaWQgTWFpbldpbmRvdzo6c2V0UGFnZShX ZWJQYWdlKiBwYWdlKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIv V2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmluZGV4IDcwMWNmZTAuLjA1MmJjOTcgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3 ZWJmcmFtZS5jcHAKQEAgLTE0MDgsNiArMTQwOCwxNCBAQCBib29sIFFXZWJGcmFtZTo6ZXZlbnQo UUV2ZW50ICplKQogCiAjaWZuZGVmIFFUX05PX1BSSU5URVIKIC8qIQorICAgIEVuYWJsZSB0byBw cmludCBoZWFzZGVyIGFuZCBmb290ZXIuCisqLwordm9pZCBRV2ViRnJhbWU6OnNldFByaW50SGVh ZGVyQW5kRm9vdGVyKGJvb2wgZW5hYmxlKQoreworICAgIGQtPnByaW50SGVhZGVyQW5kRm9vdGVy ID0gZW5hYmxlOworfQorCisvKiEKICAgICBQcmludHMgdGhlIGZyYW1lIHRvIHRoZSBnaXZlbiBc YSBwcmludGVyLgogCiAgICAgXHNhIHJlbmRlcigpCkBAIC0xNDcwLDcgKzE0NzgsNiBAQCB2b2lk IFFXZWJGcmFtZTo6cHJpbnQoUVByaW50ZXIgKnByaW50ZXIpIGNvbnN0CiAKICAgICBwYWludGVy LnNjYWxlKHpvb21GYWN0b3JYLCB6b29tRmFjdG9yWSk7CiAgICAgR3JhcGhpY3NDb250ZXh0IGN0 eCgmcGFpbnRlcik7Ci0KICAgICBmb3IgKGludCBpID0gMDsgaSA8IGRvY0NvcGllczsgKytpKSB7 CiAgICAgICAgIGludCBwYWdlID0gZnJvbVBhZ2U7CiAgICAgICAgIHdoaWxlICh0cnVlKSB7CkBA IC0xNDgxLDYgKzE0ODgsMjEgQEAgdm9pZCBRV2ViRnJhbWU6OnByaW50KFFQcmludGVyICpwcmlu dGVyKSBjb25zdAogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIHByaW50Q29udGV4dC5zcG9vbFBhZ2UoY3R4LCBwYWdlIC0gMSwg cGFnZVJlY3Qud2lkdGgoKSk7CisKKyAgICAgICAgICAgICAgICBpZiAoZC0+cHJpbnRIZWFkZXJB bmRGb290ZXIpIHsKKyAgICAgICAgICAgICAgICAgICAgcXJlYWwgb2Zmc2V0WCA9IChwcmludGVy LT5wYXBlclJlY3QoKS53aWR0aCgpIC0gcHJpbnRlci0+cGFnZVJlY3QoKS53aWR0aCgpKS8yOwor ICAgICAgICAgICAgICAgICAgICBxcmVhbCBvZmZzZXRZID0gKHByaW50ZXItPnBhcGVyUmVjdCgp LmhlaWdodCgpIC0gcHJpbnRlci0+cGFnZVJlY3QoKS5oZWlnaHQoKSkvMjsKKworICAgICAgICAg ICAgICAgICAgICBRUmVjdEYgaGVhZGVyUmVjdCA9IFFSZWN0Rigtb2Zmc2V0WCwgLW9mZnNldFks IHByaW50ZXItPnBhcGVyUmVjdCgpLndpZHRoKCksIG9mZnNldFkpOworICAgICAgICAgICAgICAg ICAgICBwYWludGVyLmRyYXdUZXh0KGhlYWRlclJlY3QsIFF0OjpBbGlnbkxlZnQsIHRpdGxlKCkp OworICAgICAgICAgICAgICAgICAgICBwYWludGVyLmRyYXdUZXh0KGhlYWRlclJlY3QsIFF0OjpB bGlnblJpZ2h0LCB1cmwoKS50b1N0cmluZygpKTsKKworICAgICAgICAgICAgICAgICAgICBRUmVj dEYgZm9vdGVyUmVjdCA9IFFSZWN0Rigtb2Zmc2V0WCwgcHJpbnRlci0+cGFwZXJSZWN0KCkuYm90 dG9tKCksIHByaW50ZXItPnBhcGVyUmVjdCgpLndpZHRoKCksIG9mZnNldFkpOworICAgICAgICAg ICAgICAgICAgICBmb290ZXJSZWN0LnNldFkoZm9vdGVyUmVjdC55KCkgLSAob2Zmc2V0WSArIHBh aW50ZXIuZm9udE1ldHJpY3MoKS5oZWlnaHQoKSkpOworICAgICAgICAgICAgICAgICAgICBwYWlu dGVyLmRyYXdUZXh0KGZvb3RlclJlY3QsIFF0OjpBbGlnbkxlZnQsIFFTdHJpbmcoIlBhZ2UgJTEg b2YgJTIiKS5hcmcocGFnZSkuYXJnKHRvUGFnZSkpOworICAgICAgICAgICAgICAgICAgICBwYWlu dGVyLmRyYXdUZXh0KGZvb3RlclJlY3QsIFF0OjpBbGlnblJpZ2h0LCBRRGF0ZVRpbWU6OmN1cnJl bnREYXRlVGltZSgpLnRvU3RyaW5nKCkpOworICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAg ICAgICAgIGlmIChqIDwgcGFnZUNvcGllcyAtIDEpCiAgICAgICAgICAgICAgICAgICAgIHByaW50 ZXItPm5ld1BhZ2UoKTsKICAgICAgICAgICAgIH0KQEAgLTE1MDIsNiArMTUyNCw3IEBAIHZvaWQg UVdlYkZyYW1lOjpwcmludChRUHJpbnRlciAqcHJpbnRlcikgY29uc3QKIAogICAgIHByaW50Q29u dGV4dC5lbmQoKTsKIH0KKwogI2VuZGlmIC8vIFFUX05PX1BSSU5URVIKIAogLyohCmRpZmYgLS1n aXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu aAppbmRleCA4NDEwOTYyLi43MjIwNzA5IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJm cmFtZS5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmgKQEAgLTQ0LDYgKzQ0LDcgQEAg UVRfRU5EX05BTUVTUEFDRQogY2xhc3MgUVdlYk5ldHdvcmtSZXF1ZXN0OwogY2xhc3MgUVdlYkZy YW1lUHJpdmF0ZTsKIGNsYXNzIFFXZWJQYWdlOworY2xhc3MgUVdlYlByaW50U2V0dGluZ3M7CiBj bGFzcyBRV2ViSGl0VGVzdFJlc3VsdDsKIGNsYXNzIFFXZWJIaXN0b3J5SXRlbTsKIGNsYXNzIFFX ZWJTZWN1cml0eU9yaWdpbjsKQEAgLTE5OCw2ICsxOTksOSBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBib29sIGV2ZW50KFFFdmVudCAqKTsKIAogICAgIFFXZWJTZWN1cml0eU9yaWdpbiBzZWN1cml0 eU9yaWdpbigpIGNvbnN0OworI2lmbmRlZiBRVF9OT19QUklOVEVSCisgICAgdm9pZCBzZXRQcmlu dEhlYWRlckFuZEZvb3Rlcihib29sIGVuYWJsZSk7CisjZW5kaWYKIAogcHVibGljIFFfU0xPVFM6 CiAgICAgUVZhcmlhbnQgZXZhbHVhdGVKYXZhU2NyaXB0KGNvbnN0IFFTdHJpbmcmIHNjcmlwdFNv dXJjZSk7CkBAIC0yMzgsNSArMjQyLDQgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgV2Vi Q29yZTo6UGxhdGZvcm1MYXllclByb3h5UXQ7CiAgICAgUVdlYkZyYW1lUHJpdmF0ZSAqZDsKIH07 Ci0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oIGIvV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWVfcC5oCmluZGV4IGVlOGM0NjMuLjUwNjc2MTYgMTAwNjQ0Ci0t LSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lX3AuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJm cmFtZV9wLmgKQEAgLTg0LDYgKzg0LDkgQEAgcHVibGljOgogI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykgJiYgVVNFKFRFWFRVUkVfTUFQUEVSKQogICAgICAgICAsIHJvb3RHcmFwaGlj c0xheWVyKDApCiAjZW5kaWYKKyNpZm5kZWYgUVRfTk9fUFJJTlRFUgorICAgICAgICAsIHByaW50 SGVhZGVyQW5kRm9vdGVyKGZhbHNlKQorI2VuZGlmCiAgICAgICAgIHt9CiAgICAgdm9pZCBpbml0 KFFXZWJGcmFtZSogcWZyYW1lLCBRV2ViRnJhbWVEYXRhKiBmcmFtZURhdGEpOwogICAgIHZvaWQg c2V0UGFnZShRV2ViUGFnZSopOwpAQCAtMTIyLDYgKzEyNSwxMCBAQCBwdWJsaWM6CiAjaWYgRU5B QkxFKE9SSUVOVEFUSU9OX0VWRU5UUykgJiYgRU5BQkxFKERFVklDRV9PUklFTlRBVElPTikKICAg ICBRdE1vYmlsaXR5OjpRT3JpZW50YXRpb25TZW5zb3IgbV9vcmllbnRhdGlvbjsKICNlbmRpZgor CisjaWZuZGVmIFFUX05PX1BSSU5URVIKKyAgICBib29sIHByaW50SGVhZGVyQW5kRm9vdGVyOwor I2VuZGlmCiB9OwogCiBjbGFzcyBRV2ViSGl0VGVzdFJlc3VsdFByaXZhdGUgewotLSAKMS43LjEK Cg== 77691 2010-12-30 11:30:51 -0800 2010-12-30 15:40:13 -0800 Patch 0001-Be-able-to-specify-a-header-and-footer-when-printing-.diff text/plain 5529 diegohcg RnJvbSA4ODM2YTE2ZjE4ZjBhZDhjMTMwNzA5NGIyZWNkMjVjOGMyZWM2ZmZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ29oY2dAd2Via2l0Lm9yZz4K RGF0ZTogVGh1LCAzMCBEZWMgMjAxMCAxNDozMDo0MyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIEJl IGFibGUgdG8gc3BlY2lmeSBhIGhlYWRlciBhbmQgZm9vdGVyIHdoZW4gcHJpbnRpbmcgZnJvbSBX ZWJLaXQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDM1NwoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIEFwaS9xd2ViZnJhbWUuY3BwOgooUVdlYlByaW50 ZXI6OnNldEhlYWRlcik6CihRV2ViUHJpbnRlcjo6c2V0Rm9vdGVyKToKKFFXZWJGcmFtZTo6d2Vi UHJpbnRlcik6CihRV2ViRnJhbWU6OnByaW50KToKKiBBcGkvcXdlYmZyYW1lLmg6Ci0tLQogV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIHwgICA0MyArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKystCiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oICAgfCAgIDMyICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAg ICAgfCAgIDE0ICsrKysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMo KyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmluZGV4IDcwMWNmZTAuLjFjNTQwZGEg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvcXQv QXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTE0MDcsNiArMTQwNywyOSBAQCBib29sIFFXZWJGcmFtZTo6 ZXZlbnQoUUV2ZW50ICplKQogfQogCiAjaWZuZGVmIFFUX05PX1BSSU5URVIKK3ZvaWQgUVdlYlBy aW50ZXI6OnNldEhlYWRlcihjb25zdCBRU3RyaW5nJiBsZWZ0LCBjb25zdCBRU3RyaW5nJiBjZW50 ZXIsIGNvbnN0IFFTdHJpbmcmIHJpZ2h0KQoreworICAgIGhlYWRlckxlZnQgPSBsZWZ0OworICAg IGhlYWRlckNlbnRlciA9IGNlbnRlcjsKKyAgICBoZWFkZXJSaWdodCA9IHJpZ2h0OworfQorCit2 b2lkIFFXZWJQcmludGVyOjpzZXRGb290ZXIoY29uc3QgUVN0cmluZyYgbGVmdCwgY29uc3QgUVN0 cmluZyYgY2VudGVyLCBjb25zdCBRU3RyaW5nJiByaWdodCkKK3sKKyAgICBmb290ZXJMZWZ0ID0g bGVmdDsKKyAgICBmb290ZXJDZW50ZXIgPSBjZW50ZXI7CisgICAgZm9vdGVyUmlnaHQgPSByaWdo dDsKK30KKworUVdlYlByaW50ZXIqIFFXZWJGcmFtZTo6d2ViUHJpbnRlcigpCit7CisgICAgc3Rh dGljIFFXZWJQcmludGVyKiBwID0gMDsKKyAgICBpZiAoIXApCisgICAgICAgcCA9IG5ldyBRV2Vi UHJpbnRlcjsKKworICAgIHJldHVybiBwOworfQorCiAvKiEKICAgICBQcmludHMgdGhlIGZyYW1l IHRvIHRoZSBnaXZlbiBcYSBwcmludGVyLgogCkBAIC0xNDY4LDkgKzE0OTEsOSBAQCB2b2lkIFFX ZWJGcmFtZTo6cHJpbnQoUVByaW50ZXIgKnByaW50ZXIpIGNvbnN0CiAgICAgICAgIGFzY2VuZGlu ZyA9IGZhbHNlOwogICAgIH0KIAorICAgIFFXZWJQcmludGVyKiBwID0gd2ViUHJpbnRlcigpOwog ICAgIHBhaW50ZXIuc2NhbGUoem9vbUZhY3RvclgsIHpvb21GYWN0b3JZKTsKICAgICBHcmFwaGlj c0NvbnRleHQgY3R4KCZwYWludGVyKTsKLQogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgZG9jQ29w aWVzOyArK2kpIHsKICAgICAgICAgaW50IHBhZ2UgPSBmcm9tUGFnZTsKICAgICAgICAgd2hpbGUg KHRydWUpIHsKQEAgLTE0ODEsNiArMTUwNCwyMyBAQCB2b2lkIFFXZWJGcmFtZTo6cHJpbnQoUVBy aW50ZXIgKnByaW50ZXIpIGNvbnN0CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcHJpbnRDb250ZXh0LnNwb29sUGFnZShjdHgs IHBhZ2UgLSAxLCBwYWdlUmVjdC53aWR0aCgpKTsKKworICAgICAgICAgICAgICAgIGlmIChwLT5w cmludEhlYWRlckFuZEZvb3RlcigpKSB7CisgICAgICAgICAgICAgICAgICAgIHFyZWFsIG9mZnNl dFggPSAocHJpbnRlci0+cGFwZXJSZWN0KCkud2lkdGgoKSAtIHByaW50ZXItPnBhZ2VSZWN0KCku d2lkdGgoKSkgLyAyOworICAgICAgICAgICAgICAgICAgICBxcmVhbCBvZmZzZXRZID0gKHByaW50 ZXItPnBhcGVyUmVjdCgpLmhlaWdodCgpIC0gcHJpbnRlci0+cGFnZVJlY3QoKS5oZWlnaHQoKSkg LyAyOworCisgICAgICAgICAgICAgICAgICAgIFFSZWN0RiBoZWFkZXJSZWN0ID0gUVJlY3RGKC1v ZmZzZXRYLCAtb2Zmc2V0WSwgcHJpbnRlci0+cGFwZXJSZWN0KCkud2lkdGgoKSwgb2Zmc2V0WSk7 CisgICAgICAgICAgICAgICAgICAgIHBhaW50ZXIuZHJhd1RleHQoaGVhZGVyUmVjdCwgUXQ6OkFs aWduTGVmdCwgcC0+aGVhZGVyTGVmdCk7CisgICAgICAgICAgICAgICAgICAgIHBhaW50ZXIuZHJh d1RleHQoaGVhZGVyUmVjdCwgUXQ6OkFsaWduSENlbnRlciwgcC0+aGVhZGVyQ2VudGVyKTsKKyAg ICAgICAgICAgICAgICAgICAgcGFpbnRlci5kcmF3VGV4dChoZWFkZXJSZWN0LCBRdDo6QWxpZ25S aWdodCwgcC0+aGVhZGVyUmlnaHQpOworCisgICAgICAgICAgICAgICAgICAgIFFSZWN0RiBmb290 ZXJSZWN0ID0gUVJlY3RGKC1vZmZzZXRYLCBwcmludGVyLT5wYXBlclJlY3QoKS5ib3R0b20oKSwg cHJpbnRlci0+cGFwZXJSZWN0KCkud2lkdGgoKSwgb2Zmc2V0WSk7CisgICAgICAgICAgICAgICAg ICAgIGZvb3RlclJlY3Quc2V0WShmb290ZXJSZWN0LnkoKSAtIChvZmZzZXRZICsgcGFpbnRlci5m b250TWV0cmljcygpLmhlaWdodCgpKSk7CisgICAgICAgICAgICAgICAgICAgIHBhaW50ZXIuZHJh d1RleHQoZm9vdGVyUmVjdCwgUXQ6OkFsaWduTGVmdCwgcC0+Zm9vdGVyTGVmdCk7CisgICAgICAg ICAgICAgICAgICAgIHBhaW50ZXIuZHJhd1RleHQoZm9vdGVyUmVjdCwgUXQ6OkFsaWduSENlbnRl ciwgcC0+Zm9vdGVyQ2VudGVyKTsKKyAgICAgICAgICAgICAgICAgICAgcGFpbnRlci5kcmF3VGV4 dChmb290ZXJSZWN0LCBRdDo6QWxpZ25SaWdodCwgcC0+Zm9vdGVyUmlnaHQpOworICAgICAgICAg ICAgICAgIH0KKwogICAgICAgICAgICAgICAgIGlmIChqIDwgcGFnZUNvcGllcyAtIDEpCiAgICAg ICAgICAgICAgICAgICAgIHByaW50ZXItPm5ld1BhZ2UoKTsKICAgICAgICAgICAgIH0KQEAgLTE1 MDIsNiArMTU0Miw3IEBAIHZvaWQgUVdlYkZyYW1lOjpwcmludChRUHJpbnRlciAqcHJpbnRlcikg Y29uc3QKIAogICAgIHByaW50Q29udGV4dC5lbmQoKTsKIH0KKwogI2VuZGlmIC8vIFFUX05PX1BS SU5URVIKIAogLyohCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oIGIvV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWUuaAppbmRleCA4NDEwOTYyLi4xODI2ODJlIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1l LmgKQEAgLTEwMyw2ICsxMDMsMzMgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgUVdlYlBh Z2U7CiB9OwogCisjaWZuZGVmIFFUX05PX1BSSU5URVIKK2NsYXNzIFFXRUJLSVRfRVhQT1JUIFFX ZWJQcmludGVyIHsKK3B1YmxpYzoKKyAgICBib29sIHByaW50SGVhZGVyQW5kRm9vdGVyKCkgY29u c3QgeyByZXR1cm4gaGFzSGVhZGVyQW5kRm9vdGVyOyB9CisgICAgdm9pZCBzZXRQcmludEhlYWRl ckFuZEZvb3Rlcihib29sIGZsYWcgPSB0cnVlKSB7IGhhc0hlYWRlckFuZEZvb3RlciA9IGZsYWc7 IH0KKworICAgIHZvaWQgc2V0SGVhZGVyKGNvbnN0IFFTdHJpbmcmIGxlZnQsIGNvbnN0IFFTdHJp bmcmIGNlbnRlciwgY29uc3QgUVN0cmluZyYgcmlnaHQpOworICAgIHZvaWQgc2V0Rm9vdGVyKGNv bnN0IFFTdHJpbmcmIGxlZnQsIGNvbnN0IFFTdHJpbmcmIGNlbnRlciwgY29uc3QgUVN0cmluZyYg cmlnaHQpOworCitwcml2YXRlOgorICAgIFFXZWJQcmludGVyKCkKKyAgICAgICAgOiBoYXNIZWFk ZXJBbmRGb290ZXIoZmFsc2UpCisgICAge30KKworICAgIFFTdHJpbmcgaGVhZGVyTGVmdDsKKyAg ICBRU3RyaW5nIGhlYWRlckNlbnRlcjsKKyAgICBRU3RyaW5nIGhlYWRlclJpZ2h0OworICAgIFFT dHJpbmcgZm9vdGVyTGVmdDsKKyAgICBRU3RyaW5nIGZvb3RlckNlbnRlcjsKKyAgICBRU3RyaW5n IGZvb3RlclJpZ2h0OworCisgICAgYm9vbCBoYXNIZWFkZXJBbmRGb290ZXI7CisKKyAgICBmcmll bmQgY2xhc3MgUVdlYkZyYW1lOworfTsKKyNlbmRpZgorCiBjbGFzcyBRV0VCS0lUX0VYUE9SVCBR V2ViRnJhbWUgOiBwdWJsaWMgUU9iamVjdCB7CiAgICAgUV9PQkpFQ1QKICAgICBRX1BST1BFUlRZ KHFyZWFsIHRleHRTaXplTXVsdGlwbGllciBSRUFEIHRleHRTaXplTXVsdGlwbGllciBXUklURSBz ZXRUZXh0U2l6ZU11bHRpcGxpZXIgREVTSUdOQUJMRSBmYWxzZSkKQEAgLTE5OSw2ICsyMjYsMTAg QEAgcHVibGljOgogCiAgICAgUVdlYlNlY3VyaXR5T3JpZ2luIHNlY3VyaXR5T3JpZ2luKCkgY29u c3Q7CiAKKyNpZm5kZWYgUVRfTk9fUFJJTlRFUgorICAgIHN0YXRpYyBRV2ViUHJpbnRlciogd2Vi UHJpbnRlcigpOworI2VuZGlmCisKIHB1YmxpYyBRX1NMT1RTOgogICAgIFFWYXJpYW50IGV2YWx1 YXRlSmF2YVNjcmlwdChjb25zdCBRU3RyaW5nJiBzY3JpcHRTb3VyY2UpOwogI2lmbmRlZiBRVF9O T19QUklOVEVSCkBAIC0yMzgsNSArMjY5LDQgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3Mg V2ViQ29yZTo6UGxhdGZvcm1MYXllclByb3h5UXQ7CiAgICAgUVdlYkZyYW1lUHJpdmF0ZSAqZDsK IH07Ci0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggYWI3OGUwYy4uOTIwNzZiMSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIw MTAtMTItMzAgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Via2l0Lm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCZSBhYmxlIHRvIHNwZWNp ZnkgYSBoZWFkZXIgYW5kIGZvb3RlciB3aGVuIHByaW50aW5nIGZyb20gV2ViS2l0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDM1NworCisgICAgICAg ICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViUHJpbnRlcjo6c2V0SGVhZGVyKToK KyAgICAgICAgKFFXZWJQcmludGVyOjpzZXRGb290ZXIpOgorICAgICAgICAoUVdlYkZyYW1lOjp3 ZWJQcmludGVyKToKKyAgICAgICAgKFFXZWJGcmFtZTo6cHJpbnQpOgorICAgICAgICAqIEFwaS9x d2ViZnJhbWUuaDoKKwogMjAxMC0xMi0yOSAgS2VudCBIYW5zZW4gIDxrZW50LmhhbnNlbkBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCi0tIAoxLjcuMQoK