91645 2012-07-18 11:29:58 -0700 [Qt][WK2] Map the elementRect exposed in QML to the view for popup menu 2012-07-19 07:59:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pierre.rossi pierre.rossi cmarcelo hausmann menard webkit.review.bot zoltan oldest_to_newest 672570 0 pierre.rossi 2012-07-18 11:29:58 -0700 [Qt][WK2] Map the elementRect exposed in QML to the view for popup menu 672573 1 153057 pierre.rossi 2012-07-18 11:34:27 -0700 Created attachment 153057 Patch 673319 2 153057 hausmann 2012-07-19 02:05:05 -0700 Comment on attachment 153057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=153057&action=review > Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp:102 > Q_PROPERTY(QObject* items READ items CONSTANT FINAL) > > public: > - ItemSelectorContextObject(const IntRect& elementRect, const Vector<WebPopupItem>&, int selectedIndex); > + ItemSelectorContextObject(const QRectF& elementRect, const Vector<WebPopupItem>&, int selectedIndex); > > - QRect elementRect() const { return m_elementRect; } > + QRectF elementRect() const { return m_elementRect; } > PopupMenuItemModel* items() { return &m_items; } > > + Q_INVOKABLE int itemCount() const { return m_items.rowCount(); } I think there's an API problem here, that's strictly speaking unrelated to your patch. If "items" is the model, then shouldn't it be called "model" perhaps? Anyway, I don't think itemCount() should be an invokable method. Instead all models in QML seem to have a "count" _property_ instead, and I think that's what we should have, too. 673445 3 153246 pierre.rossi 2012-07-19 06:40:50 -0700 Created attachment 153246 Patch 673514 4 153246 webkit.review.bot 2012-07-19 07:59:46 -0700 Comment on attachment 153246 Patch Clearing flags on attachment: 153246 Committed r123103: <http://trac.webkit.org/changeset/123103> 673515 5 webkit.review.bot 2012-07-19 07:59:51 -0700 All reviewed patches have been landed. Closing bug. 153057 2012-07-18 11:34:27 -0700 2012-07-19 06:40:43 -0700 Patch bug-91645-20120718203735.patch text/plain 5186 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMyMzRhZGM2NmU0NmRk Zjk3MTZhMGFiMjUzMGI4MzA4MWY4ZmRhNy4uMmM4YWJjNmZjOTRiYTIyODAzZTdhYTdlZjliMTBm ZDdhMjhmMDZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA3LTE4ICBQaWVy cmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBN YXAgdGhlIGVsZW1lbnRSZWN0IGV4cG9zZWQgaW4gUU1MIHRvIHRoZSB2aWV3IGZvciBwb3B1cCBt ZW51CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTY0 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg d2F5IHRoZSBnZW9tZXRyeSBvZiB0aGUgUU1MIGl0ZW0gaXMgc3RpbGwgc2Vuc2libGUgZXZlbiBp ZiB3ZSBwYW5uZWQKKyAgICAgICAgYW5kIHpvb21lZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9x dC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcDoKKyAgICAgICAgKEl0ZW1TZWxlY3RvckNvbnRleHRP YmplY3QpOgorICAgICAgICAoV2ViS2l0OjpJdGVtU2VsZWN0b3JDb250ZXh0T2JqZWN0OjplbGVt ZW50UmVjdCk6CisgICAgICAgIChXZWJLaXQ6Okl0ZW1TZWxlY3RvckNvbnRleHRPYmplY3Q6Oml0 ZW1Db3VudCk6CisgICAgICAgIChXZWJLaXQ6Okl0ZW1TZWxlY3RvckNvbnRleHRPYmplY3Q6Okl0 ZW1TZWxlY3RvckNvbnRleHRPYmplY3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQb3B1cE1lbnVQ cm94eVF0OjpzaG93UG9wdXBNZW51KToKKwogMjAxMi0wNy0xMSAgUGllcnJlIFJvc3NpICA8cGll cnJlLnJvc3NpQGdtYWlsLmNvbT4KIAogICAgICAgICBbUXRdIEVuYWJsZSB0b3VjaCBzbGlkZXIg d2hlbiB0b3VjaCBldmVudHMgYXJlIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcAppbmRleCAyZjkyMDk4Y2FhYzNhYTA4 MjNiOTAyYjgyYzM4MjZlYmRiZWI2NjY1Li5jODgwMzY4MzRkOTAwMDRhMDIzYzI1NDhiMGQ4ZDg2 MjA0NTc1ZDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViUG9w dXBNZW51UHJveHlRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYlBv cHVwTWVudVByb3h5UXQuY3BwCkBAIC05MCwxNSArOTAsMTYgQEAgcHJpdmF0ZToKIAogY2xhc3Mg SXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdCA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVD VAotICAgIFFfUFJPUEVSVFkoUVJlY3QgZWxlbWVudFJlY3QgUkVBRCBlbGVtZW50UmVjdCBDT05T VEFOVCBGSU5BTCkKKyAgICBRX1BST1BFUlRZKFFSZWN0RiBlbGVtZW50UmVjdCBSRUFEIGVsZW1l bnRSZWN0IENPTlNUQU5UIEZJTkFMKQogICAgIFFfUFJPUEVSVFkoUU9iamVjdCogaXRlbXMgUkVB RCBpdGVtcyBDT05TVEFOVCBGSU5BTCkKIAogcHVibGljOgotICAgIEl0ZW1TZWxlY3RvckNvbnRl eHRPYmplY3QoY29uc3QgSW50UmVjdCYgZWxlbWVudFJlY3QsIGNvbnN0IFZlY3RvcjxXZWJQb3B1 cEl0ZW0+JiwgaW50IHNlbGVjdGVkSW5kZXgpOworICAgIEl0ZW1TZWxlY3RvckNvbnRleHRPYmpl Y3QoY29uc3QgUVJlY3RGJiBlbGVtZW50UmVjdCwgY29uc3QgVmVjdG9yPFdlYlBvcHVwSXRlbT4m LCBpbnQgc2VsZWN0ZWRJbmRleCk7CiAKLSAgICBRUmVjdCBlbGVtZW50UmVjdCgpIGNvbnN0IHsg cmV0dXJuIG1fZWxlbWVudFJlY3Q7IH0KKyAgICBRUmVjdEYgZWxlbWVudFJlY3QoKSBjb25zdCB7 IHJldHVybiBtX2VsZW1lbnRSZWN0OyB9CiAgICAgUG9wdXBNZW51SXRlbU1vZGVsKiBpdGVtcygp IHsgcmV0dXJuICZtX2l0ZW1zOyB9CiAKKyAgICBRX0lOVk9LQUJMRSBpbnQgaXRlbUNvdW50KCkg Y29uc3QgeyByZXR1cm4gbV9pdGVtcy5yb3dDb3VudCgpOyB9CiAgICAgUV9JTlZPS0FCTEUgdm9p ZCBhY2NlcHQoaW50IGluZGV4ID0gLTEpOwogICAgIFFfSU5WT0tBQkxFIHZvaWQgcmVqZWN0KCkg eyBlbWl0IHJlamVjdGVkKCk7IH0KIApAQCAtMTA3LDExICsxMDgsMTEgQEAgUV9TSUdOQUxTOgog ICAgIHZvaWQgcmVqZWN0ZWQoKTsKIAogcHJpdmF0ZToKLSAgICBRUmVjdCBtX2VsZW1lbnRSZWN0 OworICAgIFFSZWN0RiBtX2VsZW1lbnRSZWN0OwogICAgIFBvcHVwTWVudUl0ZW1Nb2RlbCBtX2l0 ZW1zOwogfTsKIAotSXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdDo6SXRlbVNlbGVjdG9yQ29udGV4 dE9iamVjdChjb25zdCBJbnRSZWN0JiBlbGVtZW50UmVjdCwgY29uc3QgVmVjdG9yPFdlYlBvcHVw SXRlbT4mIHdlYlBvcHVwSXRlbXMsIGludCBzZWxlY3RlZEluZGV4KQorSXRlbVNlbGVjdG9yQ29u dGV4dE9iamVjdDo6SXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdChjb25zdCBRUmVjdEYmIGVsZW1l bnRSZWN0LCBjb25zdCBWZWN0b3I8V2ViUG9wdXBJdGVtPiYgd2ViUG9wdXBJdGVtcywgaW50IHNl bGVjdGVkSW5kZXgpCiAgICAgOiBtX2VsZW1lbnRSZWN0KGVsZW1lbnRSZWN0KQogICAgICwgbV9p dGVtcyh3ZWJQb3B1cEl0ZW1zLCBzZWxlY3RlZEluZGV4KQogewpAQCAtMjM2LDcgKzIzNyw4IEBA IHZvaWQgV2ViUG9wdXBNZW51UHJveHlRdDo6c2hvd1BvcHVwTWVudShjb25zdCBJbnRSZWN0JiBy ZWN0LCBXZWJDb3JlOjpUZXh0RGlyZWN0CiB7CiAgICAgbV9zZWxlY3RlZEluZGV4ID0gc2VsZWN0 ZWRJbmRleDsKIAotICAgIEl0ZW1TZWxlY3RvckNvbnRleHRPYmplY3QqIGNvbnRleHRPYmplY3Qg PSBuZXcgSXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdChyZWN0LCBpdGVtcywgbV9zZWxlY3RlZElu ZGV4KTsKKyAgICBjb25zdCBRUmVjdEYgbWFwcGVkUmVjdD0gbV93ZWJWaWV3LT5tYXBSZWN0RnJv bVdlYkNvbnRlbnQoUVJlY3QocmVjdCkpOworICAgIEl0ZW1TZWxlY3RvckNvbnRleHRPYmplY3Qq IGNvbnRleHRPYmplY3QgPSBuZXcgSXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdChtYXBwZWRSZWN0 LCBpdGVtcywgbV9zZWxlY3RlZEluZGV4KTsKICAgICBjcmVhdGVJdGVtKGNvbnRleHRPYmplY3Qp OwogICAgIGlmICghbV9pdGVtU2VsZWN0b3IpIHsKICAgICAgICAgbm90aWZ5VmFsdWVDaGFuZ2Vk KCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg NmNhNzZkZmRhYjJmZWIxOGZmNDI4N2U3MjYwNDZjYzMzZDdkZDFlZS4uZGYwNjFlNjA3NjY3YmFi ODdiMTM1MGI0MDg5M2RkNGFjNjUzMTk3MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA3LTE4ICBQaWVycmUg Um9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBNYXAg dGhlIGVsZW1lbnRSZWN0IGV4cG9zZWQgaW4gUU1MIHRvIHRoZSB2aWV3IGZvciBwb3B1cCBtZW51 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTY0NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsc28gaW1w cm92ZWQgdGhlIGxvZ2ljIHNsaWdodGx5IGZvciBlZGdlIGNhc2VzLgorCisgICAgICAgICogTWlu aUJyb3dzZXIvcXQvcW1sL0l0ZW1TZWxlY3Rvci5xbWw6CisKIDIwMTItMDctMTggIFRoaWFnbyBN YXJjb3MgUC4gU2FudG9zICA8dGhpYWdvLnNhbnRvc0BpbnRlbC5jb20+CiAKICAgICAgICAgW0NN YWtlXVtFRkxdIEJ1aWxkIGFuZCBydW4gVGVzdFdlYktpdEFQSSB1bml0IHRlc3RzCmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvSXRlbVNlbGVjdG9yLnFtbCBiL1Rvb2xzL01p bmlCcm93c2VyL3F0L3FtbC9JdGVtU2VsZWN0b3IucW1sCmluZGV4IDQzMDIyYjY4NGIwZTZmNzZj MDM3MjM3NjdjMzRhZjkxZmU1YzA1ODguLmMyZGQ4ZGQ5OTNlNGYxNTYzMzJjYThhZGIxZjAxMDg1 OWE0ZmMxZGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9JdGVtU2VsZWN0 b3IucW1sCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9JdGVtU2VsZWN0b3IucW1sCkBA IC0zNSwxMCArMzUsMTIgQEAgTW91c2VBcmVhIHsKIAogICAgIFJlY3RhbmdsZSB7CiAgICAgICAg IGNsaXA6IHRydWUKLSAgICAgICAgeDogc2VsZWN0b3JNb2RlbC5lbGVtZW50UmVjdC54Ci0gICAg ICAgIHk6IHNlbGVjdG9yTW9kZWwuZWxlbWVudFJlY3QueSArIHNlbGVjdG9yTW9kZWwuZWxlbWVu dFJlY3QuaGVpZ2h0Ci0gICAgICAgIGhlaWdodDogTWF0aC5taW4oNDAwLCBwYXJlbnQuaGVpZ2h0 IC0geSkKICAgICAgICAgd2lkdGg6IDIwMAorICAgICAgICBoZWlnaHQ6IE1hdGgubWluKDE1ICsg NTUgKiBzZWxlY3Rvck1vZGVsLml0ZW1Db3VudCgpLAorICAgICAgICAgICAgICAgICAgICAgICAg IE1hdGgubWF4KHNlbGVjdG9yTW9kZWwuZWxlbWVudFJlY3QueSwgcGFyZW50LmhlaWdodCAtIHNl bGVjdG9yTW9kZWwuZWxlbWVudFJlY3QueSAtIHNlbGVjdG9yTW9kZWwuZWxlbWVudFJlY3QuaGVp Z2h0KSkKKyAgICAgICAgeDogKHNlbGVjdG9yTW9kZWwuZWxlbWVudFJlY3QueCArIDIwMCA+IHBh cmVudC53aWR0aCkgPyBwYXJlbnQud2lkdGggLSAyMDAgOiBzZWxlY3Rvck1vZGVsLmVsZW1lbnRS ZWN0LngKKyAgICAgICAgeTogKHNlbGVjdG9yTW9kZWwuZWxlbWVudFJlY3QueSArIHNlbGVjdG9y TW9kZWwuZWxlbWVudFJlY3QuaGVpZ2h0ICsgaGVpZ2h0IDwgcGFyZW50LmhlaWdodCApID8gc2Vs ZWN0b3JNb2RlbC5lbGVtZW50UmVjdC55ICsgc2VsZWN0b3JNb2RlbC5lbGVtZW50UmVjdC5oZWln aHQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDogc2VsZWN0b3JNb2RlbC5lbGVtZW50UmVjdC55IC0gaGVpZ2h0OwogICAgICAgICByYWRp dXM6IDUKICAgICAgICAgY29sb3I6ICJnYWluc2Jvcm8iCiAgICAgICAgIG9wYWNpdHk6IDAuOAo= 153246 2012-07-19 06:40:50 -0700 2012-07-19 07:59:46 -0700 Patch bug-91645-20120719154354.patch text/plain 5198 pierre.rossi U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWMyMzRhZGM2NmU0NmRk Zjk3MTZhMGFiMjUzMGI4MzA4MWY4ZmRhNy4uMWEzNzNkNDkyNTY1ZWZiZDU2NzdiN2Q3MDE2YjI0 OTM1N2VhN2Y4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA3LTE4ICBQaWVy cmUgUm9zc2kgIDxwaWVycmUucm9zc2lAZ21haWwuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBN YXAgdGhlIGVsZW1lbnRSZWN0IGV4cG9zZWQgaW4gUU1MIHRvIHRoZSB2aWV3IGZvciBwb3B1cCBt ZW51CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTY0 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg d2F5IHRoZSBnZW9tZXRyeSBvZiB0aGUgUU1MIGl0ZW0gaXMgc3RpbGwgc2Vuc2libGUgZXZlbiBp ZiB3ZSBwYW5uZWQKKyAgICAgICAgYW5kIHpvb21lZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9x dC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcDoKKyAgICAgICAgKEl0ZW1TZWxlY3RvckNvbnRleHRP YmplY3QpOgorICAgICAgICAoV2ViS2l0OjpJdGVtU2VsZWN0b3JDb250ZXh0T2JqZWN0OjplbGVt ZW50UmVjdCk6CisgICAgICAgIChXZWJLaXQ6Okl0ZW1TZWxlY3RvckNvbnRleHRPYmplY3Q6Okl0 ZW1TZWxlY3RvckNvbnRleHRPYmplY3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQb3B1cE1lbnVQ cm94eVF0OjpzaG93UG9wdXBNZW51KToKKwogMjAxMi0wNy0xMSAgUGllcnJlIFJvc3NpICA8cGll cnJlLnJvc3NpQGdtYWlsLmNvbT4KIAogICAgICAgICBbUXRdIEVuYWJsZSB0b3VjaCBzbGlkZXIg d2hlbiB0b3VjaCBldmVudHMgYXJlIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9XZWJQb3B1cE1lbnVQcm94eVF0LmNwcAppbmRleCAyZjkyMDk4Y2FhYzNhYTA4 MjNiOTAyYjgyYzM4MjZlYmRiZWI2NjY1Li45ZDkzNmE2NjllY2FjMDBmNTZiOWY3ZDU1ZjQwODU2 NWE2MWQ5OTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViUG9w dXBNZW51UHJveHlRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYlBv cHVwTWVudVByb3h5UXQuY3BwCkBAIC05MCwxMyArOTAsMTMgQEAgcHJpdmF0ZToKIAogY2xhc3Mg SXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdCA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVD VAotICAgIFFfUFJPUEVSVFkoUVJlY3QgZWxlbWVudFJlY3QgUkVBRCBlbGVtZW50UmVjdCBDT05T VEFOVCBGSU5BTCkKKyAgICBRX1BST1BFUlRZKFFSZWN0RiBlbGVtZW50UmVjdCBSRUFEIGVsZW1l bnRSZWN0IENPTlNUQU5UIEZJTkFMKQogICAgIFFfUFJPUEVSVFkoUU9iamVjdCogaXRlbXMgUkVB RCBpdGVtcyBDT05TVEFOVCBGSU5BTCkKIAogcHVibGljOgotICAgIEl0ZW1TZWxlY3RvckNvbnRl eHRPYmplY3QoY29uc3QgSW50UmVjdCYgZWxlbWVudFJlY3QsIGNvbnN0IFZlY3RvcjxXZWJQb3B1 cEl0ZW0+JiwgaW50IHNlbGVjdGVkSW5kZXgpOworICAgIEl0ZW1TZWxlY3RvckNvbnRleHRPYmpl Y3QoY29uc3QgUVJlY3RGJiBlbGVtZW50UmVjdCwgY29uc3QgVmVjdG9yPFdlYlBvcHVwSXRlbT4m LCBpbnQgc2VsZWN0ZWRJbmRleCk7CiAKLSAgICBRUmVjdCBlbGVtZW50UmVjdCgpIGNvbnN0IHsg cmV0dXJuIG1fZWxlbWVudFJlY3Q7IH0KKyAgICBRUmVjdEYgZWxlbWVudFJlY3QoKSBjb25zdCB7 IHJldHVybiBtX2VsZW1lbnRSZWN0OyB9CiAgICAgUG9wdXBNZW51SXRlbU1vZGVsKiBpdGVtcygp IHsgcmV0dXJuICZtX2l0ZW1zOyB9CiAKICAgICBRX0lOVk9LQUJMRSB2b2lkIGFjY2VwdChpbnQg aW5kZXggPSAtMSk7CkBAIC0xMDcsMTEgKzEwNywxMSBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCBy ZWplY3RlZCgpOwogCiBwcml2YXRlOgotICAgIFFSZWN0IG1fZWxlbWVudFJlY3Q7CisgICAgUVJl Y3RGIG1fZWxlbWVudFJlY3Q7CiAgICAgUG9wdXBNZW51SXRlbU1vZGVsIG1faXRlbXM7CiB9Owog Ci1JdGVtU2VsZWN0b3JDb250ZXh0T2JqZWN0OjpJdGVtU2VsZWN0b3JDb250ZXh0T2JqZWN0KGNv bnN0IEludFJlY3QmIGVsZW1lbnRSZWN0LCBjb25zdCBWZWN0b3I8V2ViUG9wdXBJdGVtPiYgd2Vi UG9wdXBJdGVtcywgaW50IHNlbGVjdGVkSW5kZXgpCitJdGVtU2VsZWN0b3JDb250ZXh0T2JqZWN0 OjpJdGVtU2VsZWN0b3JDb250ZXh0T2JqZWN0KGNvbnN0IFFSZWN0RiYgZWxlbWVudFJlY3QsIGNv bnN0IFZlY3RvcjxXZWJQb3B1cEl0ZW0+JiB3ZWJQb3B1cEl0ZW1zLCBpbnQgc2VsZWN0ZWRJbmRl eCkKICAgICA6IG1fZWxlbWVudFJlY3QoZWxlbWVudFJlY3QpCiAgICAgLCBtX2l0ZW1zKHdlYlBv cHVwSXRlbXMsIHNlbGVjdGVkSW5kZXgpCiB7CkBAIC0yMzYsNyArMjM2LDggQEAgdm9pZCBXZWJQ b3B1cE1lbnVQcm94eVF0OjpzaG93UG9wdXBNZW51KGNvbnN0IEludFJlY3QmIHJlY3QsIFdlYkNv cmU6OlRleHREaXJlY3QKIHsKICAgICBtX3NlbGVjdGVkSW5kZXggPSBzZWxlY3RlZEluZGV4Owog Ci0gICAgSXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdCogY29udGV4dE9iamVjdCA9IG5ldyBJdGVt U2VsZWN0b3JDb250ZXh0T2JqZWN0KHJlY3QsIGl0ZW1zLCBtX3NlbGVjdGVkSW5kZXgpOworICAg IGNvbnN0IFFSZWN0RiBtYXBwZWRSZWN0PSBtX3dlYlZpZXctPm1hcFJlY3RGcm9tV2ViQ29udGVu dChRUmVjdChyZWN0KSk7CisgICAgSXRlbVNlbGVjdG9yQ29udGV4dE9iamVjdCogY29udGV4dE9i amVjdCA9IG5ldyBJdGVtU2VsZWN0b3JDb250ZXh0T2JqZWN0KG1hcHBlZFJlY3QsIGl0ZW1zLCBt X3NlbGVjdGVkSW5kZXgpOwogICAgIGNyZWF0ZUl0ZW0oY29udGV4dE9iamVjdCk7CiAgICAgaWYg KCFtX2l0ZW1TZWxlY3RvcikgewogICAgICAgICBub3RpZnlWYWx1ZUNoYW5nZWQoKTsKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2Y2E3NmRmZGFi MmZlYjE4ZmY0Mjg3ZTcyNjA0NmNjMzNkN2RkMWVlLi5kZjA2MWU2MDc2NjdiYWI4N2IxMzUwYjQw ODkzZGQ0YWM2NTMxOTcyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDctMTggIFBpZXJyZSBSb3NzaSAgPHBp ZXJyZS5yb3NzaUBnbWFpbC5jb20+CisKKyAgICAgICAgW1F0XVtXSzJdIE1hcCB0aGUgZWxlbWVu dFJlY3QgZXhwb3NlZCBpbiBRTUwgdG8gdGhlIHZpZXcgZm9yIHBvcHVwIG1lbnUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxNjQ1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbyBpbXByb3ZlZCB0aGUg bG9naWMgc2xpZ2h0bHkgZm9yIGVkZ2UgY2FzZXMuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9x dC9xbWwvSXRlbVNlbGVjdG9yLnFtbDoKKwogMjAxMi0wNy0xOCAgVGhpYWdvIE1hcmNvcyBQLiBT YW50b3MgIDx0aGlhZ28uc2FudG9zQGludGVsLmNvbT4KIAogICAgICAgICBbQ01ha2VdW0VGTF0g QnVpbGQgYW5kIHJ1biBUZXN0V2ViS2l0QVBJIHVuaXQgdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xz L01pbmlCcm93c2VyL3F0L3FtbC9JdGVtU2VsZWN0b3IucW1sIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvcW1sL0l0ZW1TZWxlY3Rvci5xbWwKaW5kZXggNDMwMjJiNjg0YjBlNmY3NmMwMzcyMzc2N2Mz NGFmOTFmZTVjMDU4OC4uNjI4OGQyMmJhYWM2NmE2ZmIzOWJjNDBjNTRkZWU0OTA3ZjlmYjdlNyAx MDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0l0ZW1TZWxlY3Rvci5xbWwKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0l0ZW1TZWxlY3Rvci5xbWwKQEAgLTM1LDE1ICsz NSwxOCBAQCBNb3VzZUFyZWEgewogCiAgICAgUmVjdGFuZ2xlIHsKICAgICAgICAgY2xpcDogdHJ1 ZQotICAgICAgICB4OiBzZWxlY3Rvck1vZGVsLmVsZW1lbnRSZWN0LngKLSAgICAgICAgeTogc2Vs ZWN0b3JNb2RlbC5lbGVtZW50UmVjdC55ICsgc2VsZWN0b3JNb2RlbC5lbGVtZW50UmVjdC5oZWln aHQKLSAgICAgICAgaGVpZ2h0OiBNYXRoLm1pbig0MDAsIHBhcmVudC5oZWlnaHQgLSB5KQogICAg ICAgICB3aWR0aDogMjAwCisgICAgICAgIGhlaWdodDogTWF0aC5taW4obGlzdFZpZXcuY29udGVu dEl0ZW0uaGVpZ2h0ICsgbGlzdFZpZXcuYW5jaG9ycy50b3BNYXJnaW4gKyBsaXN0Vmlldy5hbmNo b3JzLmJvdHRvbU1hcmdpbgorICAgICAgICAgICAgICAgICAgICAgICAgICwgTWF0aC5tYXgoc2Vs ZWN0b3JNb2RlbC5lbGVtZW50UmVjdC55LCBwYXJlbnQuaGVpZ2h0IC0gc2VsZWN0b3JNb2RlbC5l bGVtZW50UmVjdC55IC0gc2VsZWN0b3JNb2RlbC5lbGVtZW50UmVjdC5oZWlnaHQpKQorICAgICAg ICB4OiAoc2VsZWN0b3JNb2RlbC5lbGVtZW50UmVjdC54ICsgMjAwID4gcGFyZW50LndpZHRoKSA/ IHBhcmVudC53aWR0aCAtIDIwMCA6IHNlbGVjdG9yTW9kZWwuZWxlbWVudFJlY3QueAorICAgICAg ICB5OiAoc2VsZWN0b3JNb2RlbC5lbGVtZW50UmVjdC55ICsgc2VsZWN0b3JNb2RlbC5lbGVtZW50 UmVjdC5oZWlnaHQgKyBoZWlnaHQgPCBwYXJlbnQuaGVpZ2h0ICkgPyBzZWxlY3Rvck1vZGVsLmVs ZW1lbnRSZWN0LnkgKyBzZWxlY3Rvck1vZGVsLmVsZW1lbnRSZWN0LmhlaWdodAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOiBzZWxlY3Rv ck1vZGVsLmVsZW1lbnRSZWN0LnkgLSBoZWlnaHQ7CiAgICAgICAgIHJhZGl1czogNQogICAgICAg ICBjb2xvcjogImdhaW5zYm9ybyIKICAgICAgICAgb3BhY2l0eTogMC44CiAKICAgICAgICAgTGlz dFZpZXcgeworICAgICAgICAgICAgaWQ6IGxpc3RWaWV3CiAgICAgICAgICAgICBhbmNob3JzLmZp bGw6IHBhcmVudAogICAgICAgICAgICAgYW5jaG9ycy5tYXJnaW5zOiAxMAogICAgICAgICAgICAg c3BhY2luZzogNQo=