51902 2011-01-04 15:19:47 -0800 [Qt] [WK2] Add support for non-trivial context menu action 2011-01-04 22:25:20 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt, QtTriaged P2 Normal --- 51825 1 benjamin webkit-unassigned commit-queue kenneth oldest_to_newest 329250 0 benjamin 2011-01-04 15:19:47 -0800 The patch https://bugs.webkit.org/show_bug.cgi?id=51825 added support for the context menu. Now it is time to use it to peform something useful :) 329253 1 kenneth 2011-01-04 15:25:51 -0800 (In reply to comment #0) > The patch https://bugs.webkit.org/show_bug.cgi?id=51825 added support for the context menu. Now it is time to use it to peform something useful :) You don't seem to like the letter r in the beginning of words: peform and suppot ;-) Let me fix the title! 329259 2 77937 benjamin 2011-01-04 15:39:43 -0800 Created attachment 77937 Patch 329261 3 77939 benjamin 2011-01-04 15:41:44 -0800 Created attachment 77939 Patch I did not mean to remove that blank line. 329263 4 benjamin 2011-01-04 15:43:37 -0800 (In reply to comment #1) > You don't seem to like the letter r in the beginning of words: peform and suppot ;-) Let me fix the title! Thanks for fixing the the title. I guess there is too much food in my keyboard for it to work properly ;) 329287 5 77939 kenneth 2011-01-04 16:25:00 -0800 Comment on attachment 77939 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77939&action=review Looks good > WebKit2/UIProcess/API/qt/qwkpage.cpp:604 > + QAction* qtAction = action(webAction); So this action() converter was already defined? 329304 6 benjamin 2011-01-04 17:05:15 -0800 (In reply to comment #5) > > WebKit2/UIProcess/API/qt/qwkpage.cpp:604 > > + QAction* qtAction = action(webAction); > > So this action() converter was already defined? Yep, QWKPage::action() seem to be a copy of the design of QWebPage::action(). It is used to get the page action in any context. Thanks for the review Kenneth. 329427 7 77939 commit-queue 2011-01-04 22:25:12 -0800 Comment on attachment 77939 Patch Clearing flags on attachment: 77939 Committed r75047: <http://trac.webkit.org/changeset/75047> 329428 8 commit-queue 2011-01-04 22:25:20 -0800 All reviewed patches have been landed. Closing bug. 77937 2011-01-04 15:39:43 -0800 2011-01-04 15:41:44 -0800 Patch 51902.patch text/plain 8200 benjamin ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjAwOTg3YS4uYmU2ODhkYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wMS0wNCAgQmVuamFtaW4gUG91 bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gW1dLMl0gQWRkIHN1cHBvcnQgZm9yIG5v bi10cml2aWFsIGNvbnRleHQgbWVudSBhY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUxOTAyCisKKyAgICAgICAgRml4IHRoZSBwcmVwcm9jZXNz b3IgZ3VhcmQgZm9yIENvbnRleHRNZW51SXRlbVRhZ1NlbGVjdEFsbCBpbgorICAgICAgICB0aGUg aW1wbGVtZW50YXRpb24gb2YgQ29udGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1T ZWxlY3RlZCgpLiBUaGUgZ3VhcmQgd2FzCisgICAgICAgIGluY29uc2lzdGVudCB3aXRoIHdoYXQg aXMgZGVmaW5lZCBpbiBDb250ZXh0TWVudUl0ZW0uaC4KKworICAgICAgICAqIHBhZ2UvQ29udGV4 dE1lbnVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJv bGxlcjo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpOgorCiAyMDExLTAxLTA0ICBZaSBTaGVuICA8 eWkuNC5zaGVuQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFu bi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIv V2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKaW5kZXggMzZkODgwZC4uMjYy MDY0YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAK KysrIGIvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKQEAgLTE2Nyw3ICsx NjcsNiBAQCBzdGF0aWMgdm9pZCBvcGVuTmV3V2luZG93KGNvbnN0IEtVUkwmIHVybFRvTG9hZCwg RnJhbWUqIGZyYW1lKQogdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OmNvbnRleHRNZW51SXRl bVNlbGVjdGVkKENvbnRleHRNZW51SXRlbSogaXRlbSkKIHsKICAgICBBU1NFUlQoaXRlbS0+dHlw ZSgpID09IEFjdGlvblR5cGUgfHwgaXRlbS0+dHlwZSgpID09IENoZWNrYWJsZUFjdGlvblR5cGUp OwotCiAgICAgaWYgKGl0ZW0tPmFjdGlvbigpID49IENvbnRleHRNZW51SXRlbUJhc2VBcHBsaWNh dGlvblRhZykgewogICAgICAgICBtX2NsaWVudC0+Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoaXRl bSwgbV9jb250ZXh0TWVudS5nZXQoKSk7CiAgICAgICAgIHJldHVybjsKQEAgLTI2Miw2ICsyNjEs OCBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQo Q29udGV4dE1lbnVJdGVtKiBpdGVtKQogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRGVsZXRl OgogICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPnBlcmZvcm1EZWxldGUoKTsKICAgICAgICAgYnJl YWs7CisjZW5kaWYKKyNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFFUKQogICAgIGNhc2Ug Q29udGV4dE1lbnVJdGVtVGFnU2VsZWN0QWxsOgogICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmNv bW1hbmQoIlNlbGVjdEFsbCIpLmV4ZWN1dGUoKTsKICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQg YS9XZWJLaXQyL0NoYW5nZUxvZyBiL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDAzYzVmM2MuLjcy ZmEwNWQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1dlYktpdDIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDEtMDQgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5q YW1pbi5wb3VsYWluQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbUXRdIFtXSzJdIEFkZCBzdXBwb3J0IGZvciBub24tdHJpdmlhbCBj b250ZXh0IG1lbnUgYWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01MTkwMgorCisgICAgICAgIEltcGxlbWVudCBhIGNhbGwgYmFjayBmcm9tIHRo ZSBRQWN0aW9uIHRyaWdnZXJlZCBpbiB0aGUgVUlQcm9jZXNzIHRvIHRoZQorICAgICAgICBhY3Rp b24gaW4gV2ViUHJvY2Vzcy4KKworICAgICAgICBBIGZldyBiYXNpYyBhY3Rpb25zIGhhdmUgYmVl biBpbXBsZW1lbnRlZCBiYXNlZCBvbiB0aGlzIGZlYXR1cmUuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL3F0L3F3a3BhZ2UuY3BwOgorICAgICAgICAoY29udGV4dE1lbnVBY3Rpb25Gb3JXZWJB Y3Rpb24pOgorICAgICAgICAoUVdLUGFnZTo6dHJpZ2dlckFjdGlvbik6CisgICAgICAgIChRV0tQ YWdlOjphY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9XZWJDb250ZXh0TWVudVByb3h5UXQuY3BwOgorICAgICAgICAo V2ViS2l0Ojp3ZWJBY3Rpb25Gb3JDb250ZXh0TWVudUFjdGlvbik6CisKIDIwMTEtMDEtMDQgIEJh bGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3F3a3BhZ2UuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2Uu Y3BwCmluZGV4IGVhN2IzYWIuLmUxMTNiZDAgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xd2twYWdlLmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFn ZS5jcHAKQEAgLTUzLDYgKzUzLDMyIEBACiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKK3N0YXRpYyBXZWJDb3JlOjpDb250ZXh0TWVudUFjdGlvbiBj b250ZXh0TWVudUFjdGlvbkZvcldlYkFjdGlvbihRV0tQYWdlOjpXZWJBY3Rpb24gYWN0aW9uKQor eworICAgIHN3aXRjaCAoYWN0aW9uKSB7CisgICAgY2FzZSBRV0tQYWdlOjpPcGVuTGluazoKKyAg ICAgICAgcmV0dXJuIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOworICAgIGNh c2UgUVdLUGFnZTo6T3BlbkxpbmtJbk5ld1dpbmRvdzoKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6 OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3c7CisgICAgY2FzZSBRV0tQYWdl OjpDb3B5TGlua1RvQ2xpcGJvYXJkOgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4dE1l bnVJdGVtVGFnQ29weUxpbmtUb0NsaXBib2FyZDsKKyAgICBjYXNlIFFXS1BhZ2U6Ok9wZW5JbWFn ZUluTmV3V2luZG93OgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFn T3BlbkltYWdlSW5OZXdXaW5kb3c7CisgICAgY2FzZSBRV0tQYWdlOjpDdXQ6CisgICAgICAgIHJl dHVybiBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdDdXQ7CisgICAgY2FzZSBRV0tQYWdlOjpD b3B5OgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnQ29weTsKKyAg ICBjYXNlIFFXS1BhZ2U6OlBhc3RlOgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4dE1l bnVJdGVtVGFnUGFzdGU7CisgICAgY2FzZSBRV0tQYWdlOjpTZWxlY3RBbGw6CisgICAgICAgIHJl dHVybiBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdTZWxlY3RBbGw7CisgICAgZGVmYXVsdDoK KyAgICAgICAgQVNTRVJUKGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIHJldHVy biBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbjsKK30KKwogUVdLUGFnZVByaXZh dGU6OlFXS1BhZ2VQcml2YXRlKFFXS1BhZ2UqIHFxLCBRV0tDb250ZXh0KiBjKQogICAgIDogcShx cSkKICAgICAsIGNvbnRleHQoYykKQEAgLTU1NiwyNCArNTgyLDI4IEBAIHZvaWQgUVdLUGFnZTo6 c2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoY29uc3QgUVNpemUmIHRhcmdldExh eW91dFNpemUpCiB9CiAKICNpZm5kZWYgUVRfTk9fQUNUSU9OCi12b2lkIFFXS1BhZ2U6OnRyaWdn ZXJBY3Rpb24oV2ViQWN0aW9uIGFjdGlvbiwgYm9vbCkKK3ZvaWQgUVdLUGFnZTo6dHJpZ2dlckFj dGlvbihXZWJBY3Rpb24gd2ViQWN0aW9uLCBib29sKQogewotICAgIHN3aXRjaCAoYWN0aW9uKSB7 CisgICAgc3dpdGNoICh3ZWJBY3Rpb24pIHsKICAgICBjYXNlIEJhY2s6CiAgICAgICAgIGQtPnBh Z2UtPmdvQmFjaygpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2Ug Rm9yd2FyZDoKICAgICAgICAgZC0+cGFnZS0+Z29Gb3J3YXJkKCk7Ci0gICAgICAgIGJyZWFrOwor ICAgICAgICByZXR1cm47CiAgICAgY2FzZSBTdG9wOgogICAgICAgICBkLT5wYWdlLT5zdG9wTG9h ZGluZygpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgUmVsb2Fk OgogICAgICAgICBkLT5wYWdlLT5yZWxvYWQoLyogcmVsb2FkRnJvbU9yaWdpbiAqLyB0cnVlKTsK LSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybjsKICAgICBkZWZhdWx0OgogICAgICAgICBi cmVhazsKICAgICB9CisKKyAgICBRQWN0aW9uKiBxdEFjdGlvbiA9IGFjdGlvbih3ZWJBY3Rpb24p OworICAgIFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtRGF0YSBtZW51SXRlbURhdGEoQWN0aW9u VHlwZSwgY29udGV4dE1lbnVBY3Rpb25Gb3JXZWJBY3Rpb24od2ViQWN0aW9uKSwgcXRBY3Rpb24t PnRleHQoKSwgcXRBY3Rpb24tPmlzRW5hYmxlZCgpLCBxdEFjdGlvbi0+aXNDaGVja2VkKCkpOwor ICAgIGQtPnBhZ2UtPmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKG1lbnVJdGVtRGF0YSk7CiB9CiAj ZW5kaWYgLy8gUVRfTk9fQUNUSU9OCiAKQEAgLTU5Miw2ICs2MjIsMTggQEAgUUFjdGlvbiogUVdL UGFnZTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiAgICAgYm9vbCBjaGVja2FibGUg PSBmYWxzZTsKIAogICAgIHN3aXRjaCAoYWN0aW9uKSB7CisgICAgY2FzZSBPcGVuTGluazoKKyAg ICAgICAgdGV4dCA9IGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rKCk7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgT3BlbkxpbmtJbk5ld1dpbmRvdzoKKyAgICAgICAgdGV4dCA9IGNvbnRleHRN ZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3coKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBDb3B5TGlua1RvQ2xpcGJvYXJkOgorICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFn Q29weUxpbmtUb0NsaXBib2FyZCgpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIE9wZW5JbWFn ZUluTmV3V2luZG93OgorICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnT3BlbkltYWdl SW5OZXdXaW5kb3coKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBCYWNrOgogICAgICAgICB0 ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnR29CYWNrKCk7CiAgICAgICAgIGljb24gPSBzdHlsZS0+ c3RhbmRhcmRJY29uKFFTdHlsZTo6U1BfQXJyb3dCYWNrKTsKQEAgLTYwOCw2ICs2NTAsMTggQEAg UUFjdGlvbiogUVdLUGFnZTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiAgICAgICAg IHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdSZWxvYWQoKTsKICAgICAgICAgaWNvbiA9IHN0eWxl LT5zdGFuZGFyZEljb24oUVN0eWxlOjpTUF9Ccm93c2VyUmVsb2FkKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBDdXQ6CisgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdDdXQoKTsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDb3B5OgorICAgICAgICB0ZXh0ID0gY29udGV4dE1l bnVJdGVtVGFnQ29weSgpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBhc3RlOgorICAgICAg ICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnUGFzdGUoKTsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBTZWxlY3RBbGw6CisgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdTZWxlY3RB bGwoKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIDA7CiAg ICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3Bh Z2UuaCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmgKaW5kZXggMmMwMWY4ZC4u NTU0YWQ4ZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaAor KysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oCkBAIC0yOCwxMSArMjgsMjEg QEAgcHVibGljOgogICAgIGVudW0gV2ViQWN0aW9uIHsKICAgICAgICAgTm9XZWJBY3Rpb24gPSAt IDEsCiAKKyAgICAgICAgT3BlbkxpbmssCisgICAgICAgIE9wZW5MaW5rSW5OZXdXaW5kb3csCisg ICAgICAgIENvcHlMaW5rVG9DbGlwYm9hcmQsCisgICAgICAgIE9wZW5JbWFnZUluTmV3V2luZG93 LAorCiAgICAgICAgIEJhY2ssCiAgICAgICAgIEZvcndhcmQsCiAgICAgICAgIFN0b3AsCiAgICAg ICAgIFJlbG9hZCwKIAorICAgICAgICBDdXQsCisgICAgICAgIENvcHksCisgICAgICAgIFBhc3Rl LAorICAgICAgICBTZWxlY3RBbGwsCisKICAgICAgICAgV2ViQWN0aW9uQ291bnQKICAgICB9Owog CmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJDb250ZXh0TWVudVByb3h5UXQu Y3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dE1lbnVQcm94eVF0LmNwcAppbmRl eCBmMDVkZGU2Li41NjZhMjJlIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJD b250ZXh0TWVudVByb3h5UXQuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkNvbnRl eHRNZW51UHJveHlRdC5jcHAKQEAgLTM4LDYgKzM4LDE0IEBAIG5hbWVzcGFjZSBXZWJLaXQgewog c3RhdGljIFFXS1BhZ2U6OldlYkFjdGlvbiB3ZWJBY3Rpb25Gb3JDb250ZXh0TWVudUFjdGlvbihX ZWJDb3JlOjpDb250ZXh0TWVudUFjdGlvbiBhY3Rpb24pCiB7CiAgICAgc3dpdGNoIChhY3Rpb24p IHsKKyAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOgorICAgICAg ICByZXR1cm4gUVdLUGFnZTo6T3Blbkxpbms7CisgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVu dUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93OgorICAgICAgICByZXR1cm4gUVdLUGFnZTo6T3Bl bkxpbmtJbk5ld1dpbmRvdzsKKyAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0Nv cHlMaW5rVG9DbGlwYm9hcmQ6CisgICAgICAgIHJldHVybiBRV0tQYWdlOjpDb3B5TGlua1RvQ2xp cGJvYXJkOworICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3BlbkltYWdlSW5O ZXdXaW5kb3c6CisgICAgICAgIHJldHVybiBRV0tQYWdlOjpPcGVuSW1hZ2VJbk5ld1dpbmRvdzsK ICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0dvQmFjazoKICAgICAgICAgcmV0 dXJuIFFXS1BhZ2U6OkJhY2s7CiAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdH b0ZvcndhcmQ6CkBAIC00Niw2ICs1NCwxNCBAQCBzdGF0aWMgUVdLUGFnZTo6V2ViQWN0aW9uIHdl YkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKFdlYkNvcmU6OkNvbnRleHRNZW51QWN0aQogICAg ICAgICByZXR1cm4gUVdLUGFnZTo6U3RvcDsKICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51 SXRlbVRhZ1JlbG9hZDoKICAgICAgICAgcmV0dXJuIFFXS1BhZ2U6OlJlbG9hZDsKKyAgICBjYXNl IFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0N1dDoKKyAgICAgICAgcmV0dXJuIFFXS1BhZ2U6 OkN1dDsKKyAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0NvcHk6CisgICAgICAg IHJldHVybiBRV0tQYWdlOjpDb3B5OworICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVt VGFnUGFzdGU6CisgICAgICAgIHJldHVybiBRV0tQYWdlOjpQYXN0ZTsKKyAgICBjYXNlIFdlYkNv cmU6OkNvbnRleHRNZW51SXRlbVRhZ1NlbGVjdEFsbDoKKyAgICAgICAgcmV0dXJuIFFXS1BhZ2U6 OlNlbGVjdEFsbDsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKICAgICB9Cg== 77939 2011-01-04 15:41:44 -0800 2011-01-04 22:25:12 -0800 Patch 51902.patch text/plain 7804 benjamin ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjAwOTg3YS4uYmU2ODhkYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0wMS0wNCAgQmVuamFtaW4gUG91 bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gW1dLMl0gQWRkIHN1cHBvcnQgZm9yIG5v bi10cml2aWFsIGNvbnRleHQgbWVudSBhY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUxOTAyCisKKyAgICAgICAgRml4IHRoZSBwcmVwcm9jZXNz b3IgZ3VhcmQgZm9yIENvbnRleHRNZW51SXRlbVRhZ1NlbGVjdEFsbCBpbgorICAgICAgICB0aGUg aW1wbGVtZW50YXRpb24gb2YgQ29udGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUl0ZW1T ZWxlY3RlZCgpLiBUaGUgZ3VhcmQgd2FzCisgICAgICAgIGluY29uc2lzdGVudCB3aXRoIHdoYXQg aXMgZGVmaW5lZCBpbiBDb250ZXh0TWVudUl0ZW0uaC4KKworICAgICAgICAqIHBhZ2UvQ29udGV4 dE1lbnVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJv bGxlcjo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpOgorCiAyMDExLTAxLTA0ICBZaSBTaGVuICA8 eWkuNC5zaGVuQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFu bi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIv V2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKaW5kZXggMzZkODgwZC4uYWM4 OWRiMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAK KysrIGIvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAKQEAgLTI2Miw2ICsy NjIsOCBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6Y29udGV4dE1lbnVJdGVtU2VsZWN0 ZWQoQ29udGV4dE1lbnVJdGVtKiBpdGVtKQogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRGVs ZXRlOgogICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPnBlcmZvcm1EZWxldGUoKTsKICAgICAgICAg YnJlYWs7CisjZW5kaWYKKyNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFFUKQogICAgIGNh c2UgQ29udGV4dE1lbnVJdGVtVGFnU2VsZWN0QWxsOgogICAgICAgICBmcmFtZS0+ZWRpdG9yKCkt PmNvbW1hbmQoIlNlbGVjdEFsbCIpLmV4ZWN1dGUoKTsKICAgICAgICAgYnJlYWs7CmRpZmYgLS1n aXQgYS9XZWJLaXQyL0NoYW5nZUxvZyBiL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDAzYzVmM2Mu LjcyZmEwNWQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1dlYktpdDIvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDEtMDQgIEJlbmphbWluIFBvdWxhaW4gIDxi ZW5qYW1pbi5wb3VsYWluQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbUXRdIFtXSzJdIEFkZCBzdXBwb3J0IGZvciBub24tdHJpdmlh bCBjb250ZXh0IG1lbnUgYWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MTkwMgorCisgICAgICAgIEltcGxlbWVudCBhIGNhbGwgYmFjayBmcm9t IHRoZSBRQWN0aW9uIHRyaWdnZXJlZCBpbiB0aGUgVUlQcm9jZXNzIHRvIHRoZQorICAgICAgICBh Y3Rpb24gaW4gV2ViUHJvY2Vzcy4KKworICAgICAgICBBIGZldyBiYXNpYyBhY3Rpb25zIGhhdmUg YmVlbiBpbXBsZW1lbnRlZCBiYXNlZCBvbiB0aGlzIGZlYXR1cmUuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwOgorICAgICAgICAoY29udGV4dE1lbnVBY3Rpb25Gb3JX ZWJBY3Rpb24pOgorICAgICAgICAoUVdLUGFnZTo6dHJpZ2dlckFjdGlvbik6CisgICAgICAgIChR V0tQYWdlOjphY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9xdC9XZWJDb250ZXh0TWVudVByb3h5UXQuY3BwOgorICAgICAg ICAoV2ViS2l0Ojp3ZWJBY3Rpb25Gb3JDb250ZXh0TWVudUFjdGlvbik6CisKIDIwMTEtMDEtMDQg IEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3Bh Z2UuY3BwCmluZGV4IGVhN2IzYWIuLmUxMTNiZDAgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xd2twYWdlLmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdr cGFnZS5jcHAKQEAgLTUzLDYgKzUzLDMyIEBACiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKK3N0YXRpYyBXZWJDb3JlOjpDb250ZXh0TWVudUFjdGlv biBjb250ZXh0TWVudUFjdGlvbkZvcldlYkFjdGlvbihRV0tQYWdlOjpXZWJBY3Rpb24gYWN0aW9u KQoreworICAgIHN3aXRjaCAoYWN0aW9uKSB7CisgICAgY2FzZSBRV0tQYWdlOjpPcGVuTGluazoK KyAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOworICAg IGNhc2UgUVdLUGFnZTo6T3BlbkxpbmtJbk5ld1dpbmRvdzoKKyAgICAgICAgcmV0dXJuIFdlYkNv cmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3c7CisgICAgY2FzZSBRV0tQ YWdlOjpDb3B5TGlua1RvQ2xpcGJvYXJkOgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4 dE1lbnVJdGVtVGFnQ29weUxpbmtUb0NsaXBib2FyZDsKKyAgICBjYXNlIFFXS1BhZ2U6Ok9wZW5J bWFnZUluTmV3V2luZG93OgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVt VGFnT3BlbkltYWdlSW5OZXdXaW5kb3c7CisgICAgY2FzZSBRV0tQYWdlOjpDdXQ6CisgICAgICAg IHJldHVybiBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdDdXQ7CisgICAgY2FzZSBRV0tQYWdl OjpDb3B5OgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnQ29weTsK KyAgICBjYXNlIFFXS1BhZ2U6OlBhc3RlOgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6Q29udGV4 dE1lbnVJdGVtVGFnUGFzdGU7CisgICAgY2FzZSBRV0tQYWdlOjpTZWxlY3RBbGw6CisgICAgICAg IHJldHVybiBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdTZWxlY3RBbGw7CisgICAgZGVmYXVs dDoKKyAgICAgICAgQVNTRVJUKGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIHJl dHVybiBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbjsKK30KKwogUVdLUGFnZVBy aXZhdGU6OlFXS1BhZ2VQcml2YXRlKFFXS1BhZ2UqIHFxLCBRV0tDb250ZXh0KiBjKQogICAgIDog cShxcSkKICAgICAsIGNvbnRleHQoYykKQEAgLTU1NiwyNCArNTgyLDI4IEBAIHZvaWQgUVdLUGFn ZTo6c2V0UmVzaXplc1RvQ29udGVudHNVc2luZ0xheW91dFNpemUoY29uc3QgUVNpemUmIHRhcmdl dExheW91dFNpemUpCiB9CiAKICNpZm5kZWYgUVRfTk9fQUNUSU9OCi12b2lkIFFXS1BhZ2U6OnRy aWdnZXJBY3Rpb24oV2ViQWN0aW9uIGFjdGlvbiwgYm9vbCkKK3ZvaWQgUVdLUGFnZTo6dHJpZ2dl ckFjdGlvbihXZWJBY3Rpb24gd2ViQWN0aW9uLCBib29sKQogewotICAgIHN3aXRjaCAoYWN0aW9u KSB7CisgICAgc3dpdGNoICh3ZWJBY3Rpb24pIHsKICAgICBjYXNlIEJhY2s6CiAgICAgICAgIGQt PnBhZ2UtPmdvQmFjaygpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNh c2UgRm9yd2FyZDoKICAgICAgICAgZC0+cGFnZS0+Z29Gb3J3YXJkKCk7Ci0gICAgICAgIGJyZWFr OworICAgICAgICByZXR1cm47CiAgICAgY2FzZSBTdG9wOgogICAgICAgICBkLT5wYWdlLT5zdG9w TG9hZGluZygpOwotICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgUmVs b2FkOgogICAgICAgICBkLT5wYWdlLT5yZWxvYWQoLyogcmVsb2FkRnJvbU9yaWdpbiAqLyB0cnVl KTsKLSAgICAgICAgYnJlYWs7CisgICAgICAgIHJldHVybjsKICAgICBkZWZhdWx0OgogICAgICAg ICBicmVhazsKICAgICB9CisKKyAgICBRQWN0aW9uKiBxdEFjdGlvbiA9IGFjdGlvbih3ZWJBY3Rp b24pOworICAgIFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtRGF0YSBtZW51SXRlbURhdGEoQWN0 aW9uVHlwZSwgY29udGV4dE1lbnVBY3Rpb25Gb3JXZWJBY3Rpb24od2ViQWN0aW9uKSwgcXRBY3Rp b24tPnRleHQoKSwgcXRBY3Rpb24tPmlzRW5hYmxlZCgpLCBxdEFjdGlvbi0+aXNDaGVja2VkKCkp OworICAgIGQtPnBhZ2UtPmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKG1lbnVJdGVtRGF0YSk7CiB9 CiAjZW5kaWYgLy8gUVRfTk9fQUNUSU9OCiAKQEAgLTU5Miw2ICs2MjIsMTggQEAgUUFjdGlvbiog UVdLUGFnZTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiAgICAgYm9vbCBjaGVja2Fi bGUgPSBmYWxzZTsKIAogICAgIHN3aXRjaCAoYWN0aW9uKSB7CisgICAgY2FzZSBPcGVuTGluazoK KyAgICAgICAgdGV4dCA9IGNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rKCk7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgT3BlbkxpbmtJbk5ld1dpbmRvdzoKKyAgICAgICAgdGV4dCA9IGNvbnRl eHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3coKTsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBDb3B5TGlua1RvQ2xpcGJvYXJkOgorICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVt VGFnQ29weUxpbmtUb0NsaXBib2FyZCgpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIE9wZW5J bWFnZUluTmV3V2luZG93OgorICAgICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnT3Blbklt YWdlSW5OZXdXaW5kb3coKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBCYWNrOgogICAgICAg ICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnR29CYWNrKCk7CiAgICAgICAgIGljb24gPSBzdHls ZS0+c3RhbmRhcmRJY29uKFFTdHlsZTo6U1BfQXJyb3dCYWNrKTsKQEAgLTYwOCw2ICs2NTAsMTgg QEAgUUFjdGlvbiogUVdLUGFnZTo6YWN0aW9uKFdlYkFjdGlvbiBhY3Rpb24pIGNvbnN0CiAgICAg ICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdSZWxvYWQoKTsKICAgICAgICAgaWNvbiA9IHN0 eWxlLT5zdGFuZGFyZEljb24oUVN0eWxlOjpTUF9Ccm93c2VyUmVsb2FkKTsKICAgICAgICAgYnJl YWs7CisgICAgY2FzZSBDdXQ6CisgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdDdXQo KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDb3B5OgorICAgICAgICB0ZXh0ID0gY29udGV4 dE1lbnVJdGVtVGFnQ29weSgpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBhc3RlOgorICAg ICAgICB0ZXh0ID0gY29udGV4dE1lbnVJdGVtVGFnUGFzdGUoKTsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBTZWxlY3RBbGw6CisgICAgICAgIHRleHQgPSBjb250ZXh0TWVudUl0ZW1UYWdTZWxl Y3RBbGwoKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIDA7 CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 a3BhZ2UuaCBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmgKaW5kZXggMmMwMWY4 ZC4uNTU0YWQ4ZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2Uu aAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oCkBAIC0yOCwxMSArMjgs MjEgQEAgcHVibGljOgogICAgIGVudW0gV2ViQWN0aW9uIHsKICAgICAgICAgTm9XZWJBY3Rpb24g PSAtIDEsCiAKKyAgICAgICAgT3BlbkxpbmssCisgICAgICAgIE9wZW5MaW5rSW5OZXdXaW5kb3cs CisgICAgICAgIENvcHlMaW5rVG9DbGlwYm9hcmQsCisgICAgICAgIE9wZW5JbWFnZUluTmV3V2lu ZG93LAorCiAgICAgICAgIEJhY2ssCiAgICAgICAgIEZvcndhcmQsCiAgICAgICAgIFN0b3AsCiAg ICAgICAgIFJlbG9hZCwKIAorICAgICAgICBDdXQsCisgICAgICAgIENvcHksCisgICAgICAgIFBh c3RlLAorICAgICAgICBTZWxlY3RBbGwsCisKICAgICAgICAgV2ViQWN0aW9uQ291bnQKICAgICB9 OwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJDb250ZXh0TWVudVByb3h5 UXQuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29udGV4dE1lbnVQcm94eVF0LmNwcApp bmRleCBmMDVkZGU2Li41NjZhMjJlIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9X ZWJDb250ZXh0TWVudVByb3h5UXQuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkNv bnRleHRNZW51UHJveHlRdC5jcHAKQEAgLTM4LDYgKzM4LDE0IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogc3RhdGljIFFXS1BhZ2U6OldlYkFjdGlvbiB3ZWJBY3Rpb25Gb3JDb250ZXh0TWVudUFjdGlv bihXZWJDb3JlOjpDb250ZXh0TWVudUFjdGlvbiBhY3Rpb24pCiB7CiAgICAgc3dpdGNoIChhY3Rp b24pIHsKKyAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOgorICAg ICAgICByZXR1cm4gUVdLUGFnZTo6T3Blbkxpbms7CisgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0 TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93OgorICAgICAgICByZXR1cm4gUVdLUGFnZTo6 T3BlbkxpbmtJbk5ld1dpbmRvdzsKKyAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRh Z0NvcHlMaW5rVG9DbGlwYm9hcmQ6CisgICAgICAgIHJldHVybiBRV0tQYWdlOjpDb3B5TGlua1Rv Q2xpcGJvYXJkOworICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnT3BlbkltYWdl SW5OZXdXaW5kb3c6CisgICAgICAgIHJldHVybiBRV0tQYWdlOjpPcGVuSW1hZ2VJbk5ld1dpbmRv dzsKICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0dvQmFjazoKICAgICAgICAg cmV0dXJuIFFXS1BhZ2U6OkJhY2s7CiAgICAgY2FzZSBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1U YWdHb0ZvcndhcmQ6CkBAIC00Niw2ICs1NCwxNCBAQCBzdGF0aWMgUVdLUGFnZTo6V2ViQWN0aW9u IHdlYkFjdGlvbkZvckNvbnRleHRNZW51QWN0aW9uKFdlYkNvcmU6OkNvbnRleHRNZW51QWN0aQog ICAgICAgICByZXR1cm4gUVdLUGFnZTo6U3RvcDsKICAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRN ZW51SXRlbVRhZ1JlbG9hZDoKICAgICAgICAgcmV0dXJuIFFXS1BhZ2U6OlJlbG9hZDsKKyAgICBj YXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0N1dDoKKyAgICAgICAgcmV0dXJuIFFXS1Bh Z2U6OkN1dDsKKyAgICBjYXNlIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0NvcHk6CisgICAg ICAgIHJldHVybiBRV0tQYWdlOjpDb3B5OworICAgIGNhc2UgV2ViQ29yZTo6Q29udGV4dE1lbnVJ dGVtVGFnUGFzdGU6CisgICAgICAgIHJldHVybiBRV0tQYWdlOjpQYXN0ZTsKKyAgICBjYXNlIFdl YkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ1NlbGVjdEFsbDoKKyAgICAgICAgcmV0dXJuIFFXS1Bh Z2U6OlNlbGVjdEFsbDsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKICAgICB9Cg==