29678 2009-09-23 05:37:45 -0700 Conditionally guard cursor code with !QT_NO_CURSOR 2009-10-02 08:50:56 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 27065 0 norbert.leser webkit-unassigned hausmann koshuin laszlo.gombos yongjun.zhang oldest_to_newest 149364 0 norbert.leser 2009-09-23 05:37:45 -0700 Conditionally guard cursor code with !QT_NO_CURSOR. Otherwise, it is inconsistent with class declaration of QCursor. 149365 1 39991 norbert.leser 2009-09-23 05:38:46 -0700 Created attachment 39991 Patch for QT_NO_CURSOR guard 149377 2 39991 hausmann 2009-09-23 06:15:31 -0700 Comment on attachment 39991 Patch for QT_NO_CURSOR guard > Index: WebKit/qt/Api/qwebgraphicsitem.cpp > =================================================================== > --- WebKit/qt/Api/qwebgraphicsitem.cpp (revision 48670) > +++ WebKit/qt/Api/qwebgraphicsitem.cpp (working copy) > @@ -95,12 +95,16 @@ void QWebGraphicsItemPrivate::update(con > > QCursor QWebGraphicsItemPrivate::cursor() const > { > +#ifndef QT_NO_CURSOR > return q->cursor(); > +#endif > } > > void QWebGraphicsItemPrivate::updateCursor(const QCursor& cursor) > { > +#ifndef QT_NO_CURSOR > q->setCursor(cursor); > +#endif > } The patch looks good to me, expect for these two hunks. Instead of placing the #ifdef into the function it should be placed around the definition/declaration. In other words: If QT_NO_CURSOR is defined, then those functions not not be declared in the first place, similar to the guards around QWidget::setCursor()/cursor() in qwidget.h. 149382 3 norbert.leser 2009-09-23 06:48:45 -0700 (In reply to comment #2) > (From update of attachment 39991 [details]) > > > Index: WebKit/qt/Api/qwebgraphicsitem.cpp > > =================================================================== > > --- WebKit/qt/Api/qwebgraphicsitem.cpp (revision 48670) > > +++ WebKit/qt/Api/qwebgraphicsitem.cpp (working copy) > > @@ -95,12 +95,16 @@ void QWebGraphicsItemPrivate::update(con > > > > QCursor QWebGraphicsItemPrivate::cursor() const > > { > > +#ifndef QT_NO_CURSOR > > return q->cursor(); > > +#endif > > } > > > > void QWebGraphicsItemPrivate::updateCursor(const QCursor& cursor) > > { > > +#ifndef QT_NO_CURSOR > > q->setCursor(cursor); > > +#endif > > } > > The patch looks good to me, expect for these two hunks. Instead of placing the > #ifdef into the function it should be placed > around the definition/declaration. In other words: If QT_NO_CURSOR is defined, > then those functions not not be declared > in the first place, similar to the guards around QWidget::setCursor()/cursor() > in qwidget.h. That is your call, or whoever implemented the classes/functions. In the case of conditionally guarding the functions itself, you may end up with a multitude of conditional statements in the client code. Otherwise, it would be transparent (though, perhaps unexpected behavior - i.e., updateCursor etc would do nothing, unless there is another default implementation). Anyway, could you or the implementer of QWebGraphicsItemPrivate, QWebViewPrivate, and QWebPageClient take it from here? - Thanks. 149694 4 koshuin 2009-09-24 01:15:06 -0700 I have to agree with Simon here. Even if you would return empty QCursor (which you don't), client still needs to be aware of that cursor is not enabled. I'm saying this even if we are in huge trouble with ordinal exports and conditional exporting in Symbian. 151837 5 40513 norbert.leser 2009-10-02 06:46:12 -0700 Created attachment 40513 updated patch for bug 29678 Patch updated according to Simon's comments (enclosed whole functions within conditional clause. This should not affect the API since these are functions of a private class. 151840 6 koshuin 2009-10-02 07:46:40 -0700 (In reply to comment #5) > This should not affect the API since these are functions of a private class. Right, I've been way too much in QtCore and QtGui where private classes are exported. 151841 7 40513 hausmann 2009-10-02 07:54:40 -0700 Comment on attachment 40513 updated patch for bug 29678 r=me. Thanks! 151852 8 40513 laszlo.gombos 2009-10-02 08:50:40 -0700 Comment on attachment 40513 updated patch for bug 29678 Landed as http://trac.webkit.org/changeset/49023 39991 2009-09-23 05:38:46 -0700 2009-10-02 06:46:12 -0700 Patch for QT_NO_CURSOR guard qt_no_cursor.patch text/plain 3481 norbert.leser SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODY3MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDktMjMgIE5vcmJlcnQgTGVzZXIgIDxub3JiZXJ0Lmxlc2Vy QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDb25kaXRpb25hbGx5IGd1YXJkIGN1cnNvciBjb2RlIHdpdGggIVFUX05PX0NVUlNPUi4K KyAgICAgICAgT3RoZXJ3aXNlLCBpdCBpcyBpbmNvbnNpc3RlbnQgd2l0aCBjbGFzcyBkZWNsYXJh dGlvbiBvZiBRQ3Vyc29yLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAg ICAgICogcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaDoKKyAgICAgICAgKFFXZWJQYWdlQ2xp ZW50OjpyZXNldEN1cnNvcik6CisgICAgICAgIChRV2ViUGFnZUNsaWVudDo6c2V0Q3Vyc29yKToK KwogMjAwOS0wOS0yMiAgQ2hhcmxlcyBXZWkgIDxjaGFybGVzLndlaUB0b3JjaG1vYmlsZS5jb20u Y24+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9xdC9RV2ViUGFnZUNsaWVudC5oCShyZXZpc2lvbiA0ODY2OSkKKysrIFdlYkNvcmUvcGxhdGZv cm0vcXQvUVdlYlBhZ2VDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTcgKzM1LDIxIEBA IHB1YmxpYzoKIAogICAgIGlubGluZSB2b2lkIHJlc2V0Q3Vyc29yKCkKICAgICB7CisjaWZuZGVm IFFUX05PX0NVUlNPUgogICAgICAgICBpZiAoIWN1cnNvcigpLmJpdG1hcCgpICYmIGN1cnNvcigp LnNoYXBlKCkgPT0gbV9sYXN0Q3Vyc29yLnNoYXBlKCkpCiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIHVwZGF0ZUN1cnNvcihtX2xhc3RDdXJzb3IpOworI2VuZGlmCiAgICAgfQogCiAgICAg aW5saW5lIHZvaWQgc2V0Q3Vyc29yKGNvbnN0IFFDdXJzb3ImIGN1cnNvcikKICAgICB7CisjaWZu ZGVmIFFUX05PX0NVUlNPUgogICAgICAgICBtX2xhc3RDdXJzb3IgPSBjdXJzb3I7CiAgICAgICAg IGlmICghY3Vyc29yLmJpdG1hcCgpICYmIGN1cnNvci5zaGFwZSgpID09IHRoaXMtPmN1cnNvcigp LnNoYXBlKCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHVwZGF0ZUN1cnNvcihjdXJz b3IpOworI2VuZGlmCiAgICAgfQogCiAgICAgdmlydHVhbCBpbnQgc2NyZWVuTnVtYmVyKCkgY29u c3QgPSAwOwpAQCAtNTYsNyArNjAsOSBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHVw ZGF0ZUN1cnNvcihjb25zdCBRQ3Vyc29yJiBjdXJzb3IpID0gMDsKIAogcHJpdmF0ZToKKyNpZm5k ZWYgUVRfTk9fQ1VSU09SCiAgICAgUUN1cnNvciBtX2xhc3RDdXJzb3I7CisjZW5kaWYKIH07CiAK ICNlbmRpZgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2ViZ3JhcGhpY3NpdGVtLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJncmFwaGljc2l0ZW0uY3BwCShyZXZpc2lvbiA0ODY3 MCkKKysrIFdlYktpdC9xdC9BcGkvcXdlYmdyYXBoaWNzaXRlbS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTk1LDEyICs5NSwxNiBAQCB2b2lkIFFXZWJHcmFwaGljc0l0ZW1Qcml2YXRlOjp1cGRhdGUo Y29uCiAKIFFDdXJzb3IgUVdlYkdyYXBoaWNzSXRlbVByaXZhdGU6OmN1cnNvcigpIGNvbnN0CiB7 CisjaWZuZGVmIFFUX05PX0NVUlNPUgogICAgIHJldHVybiBxLT5jdXJzb3IoKTsKKyNlbmRpZgog fQogCiB2b2lkIFFXZWJHcmFwaGljc0l0ZW1Qcml2YXRlOjp1cGRhdGVDdXJzb3IoY29uc3QgUUN1 cnNvciYgY3Vyc29yKQogeworI2lmbmRlZiBRVF9OT19DVVJTT1IKICAgICBxLT5zZXRDdXJzb3Io Y3Vyc29yKTsKKyNlbmRpZgogfQogCiBpbnQgUVdlYkdyYXBoaWNzSXRlbVByaXZhdGU6OnNjcmVl bk51bWJlcigpIGNvbnN0CkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAkocmV2aXNpb24gNDg2NzApCisrKyBX ZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzIsMTIgKzcyLDE2 IEBAIHZvaWQgUVdlYlZpZXdQcml2YXRlOjp1cGRhdGUoY29uc3QgUVJlY3QKIAogUUN1cnNvciBR V2ViVmlld1ByaXZhdGU6OmN1cnNvcigpIGNvbnN0CiB7CisjaWZuZGVmIFFUX05PX0NVUlNPUgog ICAgIHJldHVybiB2aWV3LT5jdXJzb3IoKTsKKyNlbmRpZgogfQogCiB2b2lkIFFXZWJWaWV3UHJp dmF0ZTo6dXBkYXRlQ3Vyc29yKGNvbnN0IFFDdXJzb3ImIGN1cnNvcikKIHsKKyNpZm5kZWYgUVRf Tk9fQ1VSU09SCiAgICAgdmlldy0+c2V0Q3Vyc29yKGN1cnNvcik7CisjZW5kaWYKIH0KIAogaW50 IFFXZWJWaWV3UHJpdmF0ZTo6c2NyZWVuTnVtYmVyKCkgY29uc3QKSW5kZXg6IFdlYktpdC9xdC9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gNDg2 NzApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcg QEAKKzIwMDktMDktMjMgIE5vcmJlcnQgTGVzZXIgIDxub3JiZXJ0Lmxlc2VyQG5va2lhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb25kaXRp b25hbGx5IGd1YXJkIGN1cnNvciBjb2RlIHdpdGggIVFUX05PX0NVUlNPUi4KKyAgICAgICAgT3Ro ZXJ3aXNlLCBpdCBpcyBpbmNvbnNpc3RlbnQgd2l0aCBjbGFzcyBkZWNsYXJhdGlvbiBvZiBRQ3Vy c29yLgorCisgICAgICAgICogQXBpL3F3ZWJncmFwaGljc2l0ZW0uY3BwOgorICAgICAgICAoUVdl YkdyYXBoaWNzSXRlbVByaXZhdGU6OmN1cnNvcik6CisgICAgICAgIChRV2ViR3JhcGhpY3NJdGVt UHJpdmF0ZTo6dXBkYXRlQ3Vyc29yKToKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuY3BwOgorICAg ICAgICAoUVdlYlZpZXdQcml2YXRlOjpjdXJzb3IpOgorICAgICAgICAoUVdlYlZpZXdQcml2YXRl Ojp1cGRhdGVDdXJzb3IpOgorCiAyMDA5LTA5LTIyICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5 bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21h bm4uCg== 40513 2009-10-02 06:46:12 -0700 2009-10-02 08:50:40 -0700 updated patch for bug 29678 qt_no_cursor_29678_2.patch text/plain 3864 norbert.leser SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTAyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMTAtMDIgIE5vcmJlcnQgTGVzZXIgIDxub3JiZXJ0Lmxlc2Vy QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDb25kaXRpb25hbGx5IGd1YXJkIGN1cnNvciBjb2RlIChjdXJzb3IgYW5kIHVwZGF0ZUN1 cnNvciBmdW5jdGlvbnMpIHdpdGggIVFUX05PX0NVUlNPUi4KKyAgICAgICAgT3RoZXJ3aXNlLCBp dCBpcyBpbmNvbnNpc3RlbnQgd2l0aCBjbGFzcyBkZWNsYXJhdGlvbiBvZiBRQ3Vyc29yLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vcXQvUVdl YlBhZ2VDbGllbnQuaDoKKwogMjAwOS0xMC0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5k QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhLgpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9xdC9RV2ViUGFnZUNsaWVudC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vcXQvUVdlYlBhZ2VDbGllbnQuaAkocmV2aXNpb24gNDkwMjEpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL3F0L1FXZWJQYWdlQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1 LDI4ICszNSwzNiBAQAogCiAgICAgaW5saW5lIHZvaWQgcmVzZXRDdXJzb3IoKQogICAgIHsKKyNp Zm5kZWYgUVRfTk9fQ1VSU09SCiAgICAgICAgIGlmICghY3Vyc29yKCkuYml0bWFwKCkgJiYgY3Vy c29yKCkuc2hhcGUoKSA9PSBtX2xhc3RDdXJzb3Iuc2hhcGUoKSkKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgdXBkYXRlQ3Vyc29yKG1fbGFzdEN1cnNvcik7CisjZW5kaWYKICAgICB9CiAK ICAgICBpbmxpbmUgdm9pZCBzZXRDdXJzb3IoY29uc3QgUUN1cnNvciYgY3Vyc29yKQogICAgIHsK KyNpZm5kZWYgUVRfTk9fQ1VSU09SCiAgICAgICAgIG1fbGFzdEN1cnNvciA9IGN1cnNvcjsKICAg ICAgICAgaWYgKCFjdXJzb3IuYml0bWFwKCkgJiYgY3Vyc29yLnNoYXBlKCkgPT0gdGhpcy0+Y3Vy c29yKCkuc2hhcGUoKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdXBkYXRlQ3Vyc29y KGN1cnNvcik7CisjZW5kaWYKICAgICB9CiAKICAgICB2aXJ0dWFsIGludCBzY3JlZW5OdW1iZXIo KSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBXSWQgd2luSWQoKSBjb25zdCA9IDA7CiAKIHByb3Rl Y3RlZDoKKyNpZm5kZWYgUVRfTk9fQ1VSU09SCiAgICAgdmlydHVhbCBRQ3Vyc29yIGN1cnNvcigp IGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQ3Vyc29yKGNvbnN0IFFDdXJzb3Im IGN1cnNvcikgPSAwOworI2VuZGlmCiAKIHByaXZhdGU6CisjaWZuZGVmIFFUX05PX0NVUlNPUgog ICAgIFFDdXJzb3IgbV9sYXN0Q3Vyc29yOworI2VuZGlmCiB9OwogCiAjZW5kaWYKSW5kZXg6IFdl YktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAkocmV2aXNpb24gNDkwMjEpCisrKyBXZWJLaXQvcXQv QXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NSw4ICs0NSwxMCBA QAogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGwoaW50IGR4LCBpbnQgZHksIGNvbnN0IFFSZWN0Jik7 CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZShjb25zdCBRUmVjdCYgZGlydHlSZWN0KTsKIAorI2lm bmRlZiBRVF9OT19DVVJTT1IKICAgICB2aXJ0dWFsIFFDdXJzb3IgY3Vyc29yKCkgY29uc3Q7CiAg ICAgdmlydHVhbCB2b2lkIHVwZGF0ZUN1cnNvcihjb25zdCBRQ3Vyc29yJiBjdXJzb3IpOworI2Vu ZGlmCiAKICAgICB2aXJ0dWFsIGludCBzY3JlZW5OdW1iZXIoKSBjb25zdDsKICAgICB2aXJ0dWFs IFdJZCB3aW5JZCgpIGNvbnN0OwpAQCAtOTUsNiArOTcsNyBAQAogICAgIHEtPnVwZGF0ZShRUmVj dEYoZGlydHlSZWN0KSk7CiB9CiAKKyNpZm5kZWYgUVRfTk9fQ1VSU09SCiBRQ3Vyc29yIFFHcmFw aGljc1dlYlZpZXdQcml2YXRlOjpjdXJzb3IoKSBjb25zdAogewogICAgIHJldHVybiBxLT5jdXJz b3IoKTsKQEAgLTEwNCw2ICsxMDcsNyBAQAogewogICAgIHEtPnNldEN1cnNvcihjdXJzb3IpOwog fQorI2VuZGlmCiAKIGludCBRR3JhcGhpY3NXZWJWaWV3UHJpdmF0ZTo6c2NyZWVuTnVtYmVyKCkg Y29uc3QKIHsKSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCShyZXZpc2lvbiA0OTAyMSkKKysrIFdlYktpdC9x dC9BcGkvcXdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OCw4ICs0OCwxMCBAQAogICAg IHZpcnR1YWwgdm9pZCBzY3JvbGwoaW50IGR4LCBpbnQgZHksIGNvbnN0IFFSZWN0Jik7CiAgICAg dmlydHVhbCB2b2lkIHVwZGF0ZShjb25zdCBRUmVjdCYgZGlydHlSZWN0KTsKIAorI2lmbmRlZiBR VF9OT19DVVJTT1IKICAgICB2aXJ0dWFsIFFDdXJzb3IgY3Vyc29yKCkgY29uc3Q7CiAgICAgdmly dHVhbCB2b2lkIHVwZGF0ZUN1cnNvcihjb25zdCBRQ3Vyc29yJiBjdXJzb3IpOworI2VuZGlmCiAK ICAgICB2aXJ0dWFsIGludCBzY3JlZW5OdW1iZXIoKSBjb25zdDsKICAgICB2aXJ0dWFsIFdJZCB3 aW5JZCgpIGNvbnN0OwpAQCAtNzIsNiArNzQsNyBAQAogICAgIHZpZXctPnVwZGF0ZShkaXJ0eVJl Y3QpOwogfQogCisjaWZuZGVmIFFUX05PX0NVUlNPUgogUUN1cnNvciBRV2ViVmlld1ByaXZhdGU6 OmN1cnNvcigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHZpZXctPmN1cnNvcigpOwpAQCAtODEsNiAr ODQsNyBAQAogewogICAgIHZpZXctPnNldEN1cnNvcihjdXJzb3IpOwogfQorI2VuZGlmCiAKIGlu dCBRV2ViVmlld1ByaXZhdGU6OnNjcmVlbk51bWJlcigpIGNvbnN0CiB7CkluZGV4OiBXZWJLaXQv cXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9u IDQ5MDIxKQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDEzIEBACisyMDA5LTEwLTAyICBOb3JiZXJ0IExlc2VyICA8bm9yYmVydC5sZXNlckBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29u ZGl0aW9uYWxseSBndWFyZCBjdXJzb3IgY29kZSAoY3Vyc29yIGFuZCB1cGRhdGVDdXJzb3IgZnVu Y3Rpb25zKSB3aXRoICFRVF9OT19DVVJTT1IuCisgICAgICAgIE90aGVyd2lzZSwgaXQgaXMgaW5j b25zaXN0ZW50IHdpdGggY2xhc3MgZGVjbGFyYXRpb24gb2YgUUN1cnNvci4KKworICAgICAgICAq IEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuY3BwOgor CiAyMDA5LTEwLTAyICBQcmFzYW50aCBVbGxhdHRpbCAgPHByYXNhbnRoLnVsbGF0dGlsQG5va2lh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4K