129091 2014-02-20 02:11:51 -0800 [GTK] Multimedia controls captions icon needs its own metaphor 2014-03-03 00:31:21 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugzilla.gnome.org/show_bug.cgi?id=722198 P2 Normal --- 1 calvaris calvaris commit-queue mrobinson oldest_to_newest 982751 0 calvaris 2014-02-20 02:11:51 -0800 Currently we are using "user-invisible-symbolic" which is nice but it could change as the theme changes. A bug was filed in GNOME to get the new icon: https://bugzilla.gnome.org/show_bug.cgi?id=722198 As soon as the GNOME bug is resolved we need to do two things in WebKitGTK+: * Bump the dependencies of the gnome-theme-icons-symbolic package to the version containing the fix. * Load the new icon with a fallback to the "user-invisible-symbolic" for compatibility with older versions of the theme. 985594 1 225472 calvaris 2014-02-28 09:27:33 -0800 Created attachment 225472 Patch 985631 2 mrobinson 2014-02-28 10:31:29 -0800 We should try to fall back to the old icon, I think. This is so new it will surely break on old systems, no? 985644 3 calvaris 2014-02-28 10:58:17 -0800 (In reply to comment #2) > We should try to fall back to the old icon, I think. This is so new it will surely break on old systems, no? We do fall back on the old icon, that's why the function we use for the other media buttons wasn't enough. 985655 4 mrobinson 2014-02-28 11:28:15 -0800 Ah, I see. Why do we need to bump the jhbuild requirements if you are not updating test results? 985662 5 calvaris 2014-02-28 11:46:53 -0800 (In reply to comment #4) > Ah, I see. Why do we need to bump the jhbuild requirements if you are not updating test results? It shouldn't be necessary, I guess. But it looks nicer :) 985664 6 mrobinson 2014-02-28 11:52:52 -0800 We need to rebaseline the pixel tests then. 985680 7 calvaris 2014-02-28 12:43:05 -0800 (In reply to comment #6) > We need to rebaseline the pixel tests then. It's weird, but I checked them and none of them required rebaseline. I guess having the trackmenu tests skipped can be the reason. 985691 8 calvaris 2014-02-28 13:22:03 -0800 (In reply to comment #7) > (In reply to comment #6) > > We need to rebaseline the pixel tests then. > > It's weird, but I checked them and none of them required rebaseline. I guess having the trackmenu tests skipped can be the reason. Well, at least point, what seems best is removing the jhbuild part of the patch as the track menu tests are skipped. 985693 9 225486 calvaris 2014-02-28 13:34:02 -0800 Created attachment 225486 Patch 985694 10 225486 mrobinson 2014-02-28 13:37:10 -0800 Comment on attachment 225486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225486&action=review > Source/WebCore/platform/gtk/RenderThemeGtk2.cpp:659 > + if (!iconName) > + return nullptr; Just noticed this but wouldn't an ASSERT make more sense here, since we always pass a static string. > Source/WebCore/platform/gtk/RenderThemeGtk3.cpp:883 > + return nullptr; > + Ditto. 985724 11 calvaris 2014-02-28 14:54:20 -0800 (In reply to comment #10) > (From update of attachment 225486 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=225486&action=review > > > Source/WebCore/platform/gtk/RenderThemeGtk2.cpp:659 > > + if (!iconName) > > + return nullptr; > > Just noticed this but wouldn't an ASSERT make more sense here, since we always pass a static string. Not in the piece of code that I wrote (RenderThemeGtk.cpp:571). If I hadn't done this, the result would be the same but some assertions would be triggered inside the GTK+ code. To avoid it I needed to bail out before getting to the GTK+ code, but the ASSERT doesn't bail out. I can avoid that "if" but I would need to refactor RenderThemeGtk::paintMediaButton and RenderThemeGtk::getStockSymbolicIconForWidgetType. Which option do you prefer? 985758 12 mrobinson 2014-02-28 15:53:31 -0800 I think that you should change the if statements to an ASSERT and then in getStockSymbolicIconForWidgetType, not call getStockIconForWidgetType if the fallback icon is null. 985988 13 225569 calvaris 2014-03-01 14:39:19 -0800 Created attachment 225569 Patch 986054 14 225569 mrobinson 2014-03-01 21:02:48 -0800 Comment on attachment 225569 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225569&action=review > Source/WebCore/platform/gtk/RenderThemeGtk2.cpp:674 > + if (fallbackStockIconName) > + return nullptr; > + Not sure I understand this check. If the argument can never be non-null why have it? 986065 15 225591 calvaris 2014-03-02 03:00:36 -0800 Created attachment 225591 Patch 986066 16 calvaris 2014-03-02 03:04:30 -0800 (In reply to comment #14) > (From update of attachment 225569 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=225569&action=review > > > Source/WebCore/platform/gtk/RenderThemeGtk2.cpp:674 > > + if (fallbackStockIconName) > > + return nullptr; > > + > > Not sure I understand this check. If the argument can never be non-null why have it? Good catch, I should check for !fallbackStockIconName instead. I added the assertions as you had asked but to prevent hitting them I check and bail out before calling the function. 986287 17 225591 commit-queue 2014-03-03 00:31:18 -0800 Comment on attachment 225591 Patch Clearing flags on attachment: 225591 Committed r164977: <http://trac.webkit.org/changeset/164977> 986288 18 commit-queue 2014-03-03 00:31:21 -0800 All reviewed patches have been landed. Closing bug. 225472 2014-02-28 09:27:33 -0800 2014-02-28 13:33:55 -0800 Patch bug-129091-20140228182732.patch text/plain 5927 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0ODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhkY2ZjZmRlZTc1MmYx OTBkNjM2MWI3ZTQ2NDZkNDBiZDU0YjExNC4uMDIxOGUzYzlkNzZhOWU4OGNjODUyZjYzN2IyOTE4 ZmQzYjU0M2Q4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE0LTAyLTI4ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dU S10gTXVsdGltZWRpYSBjb250cm9scyBjYXB0aW9ucyBpY29uIG5lZWRzIGl0cyBvd24gbWV0YXBo b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA5 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHdl IGdvdCB0aGUgbmV3IGljb24gY3JlYXRlZCwgd2UgdXNlZCBpdCB3aXRoIGEgZmFsbGJhY2sgdG8g dGhlCisgICAgICAgIG9sZCBpY29uIHRvIGtlZXAgcnVuLXRpbWUgY29tcGF0aWJpbGl0eS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIGN1cnJlbnQgb25lcyBzdWZmaWNlLgorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lR3RrOjpwYWludE1lZGlhVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b24pOgorICAgICAg ICBSZXBsaWNhdGVkIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhQnV0dG9uIHRvIGNoZWNrIGZv ciB0aGUKKyAgICAgICAgbmVjZXNzYXJ5IGljb24gZmlyc3QgYW5kIGRvIHRoZSBmYWxsYmFjayB0 byB0aGUgb2xkIGFuZCBzdG9jaworICAgICAgICBpY29ucy4KKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFN0b2NrSWNvbkZv cldpZGdldFR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Z2V0U3RvY2tJY29uRm9yV2lkZ2V0VHlwZSk6IENoZWNrIGZv ciBudWxsIGljb25OYW1lIGFuZAorICAgICAgICBiYWlsIG91dCBpZiBzby4KKworMjAxNC0wMi0y OCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgorCiAgICAg ICAgIFtHVEtdIEZpbmV0dW5lIGNhcHRpb25zIG1lbnUgYXMgcGVyIGRlc2lnbiB0ZWFtCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MzIKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKaW5kZXggYzQ2 OWU0MjA2ZDY4ZmIxZTc3M2ViNDk2YmU5OWExYWM0MTlmYmI2ZS4uMjc0YzcyM2ZlMmY2MTI4MGY2 ZGI2ZGVhMjBiNThhYWFiZmQ5NTYwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC01NjYsNyArNTY2LDE1IEBAIGJvb2wgUmVuZGVyVGhl bWVHdGs6OnBhaW50TWVkaWFTZWVrRm9yd2FyZEJ1dHRvbihSZW5kZXJPYmplY3QqIHJlbmRlck9i amVjdCwgY29uCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogYm9vbCBSZW5kZXJUaGVtZUd0azo6 cGFpbnRNZWRpYVRvZ2dsZUNsb3NlZENhcHRpb25zQnV0dG9uKFJlbmRlck9iamVjdCogcmVuZGVy T2JqZWN0LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkK IHsKLSAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihyZW5kZXJPYmplY3QsIHBhaW50SW5mby5j b250ZXh0LCByZWN0LCAidXNlci1pbnZpc2libGUtc3ltYm9saWMiLCBHVEtfU1RPQ0tfSlVTVElG WV9GSUxMKTsKKyAgICBJbnRSZWN0IGljb25SZWN0KHJlY3QueCgpICsgKHJlY3Qud2lkdGgoKSAt IG1fbWVkaWFJY29uU2l6ZSkgLyAyLCByZWN0LnkoKSArIChyZWN0LmhlaWdodCgpIC0gbV9tZWRp YUljb25TaXplKSAvIDIsCisgICAgICAgIG1fbWVkaWFJY29uU2l6ZSwgbV9tZWRpYUljb25TaXpl KTsKKyAgICBHUmVmUHRyPEdka1BpeGJ1Zj4gaWNvbiA9IGdldFN0b2NrU3ltYm9saWNJY29uRm9y V2lkZ2V0VHlwZShHVEtfVFlQRV9DT05UQUlORVIsICJtZWRpYS12aWV3LXN1YnRpdGxlcy1zeW1i b2xpYyIsIG51bGxwdHIsCisgICAgICAgIGd0a1RleHREaXJlY3Rpb24ocmVuZGVyT2JqZWN0LT5z dHlsZSgpLmRpcmVjdGlvbigpKSwgZ3RrSWNvblN0YXRlKHRoaXMsIHJlbmRlck9iamVjdCksIGlj b25SZWN0LndpZHRoKCkpOworICAgIGlmICghaWNvbikKKyAgICAgICAgaWNvbiA9IGdldFN0b2Nr U3ltYm9saWNJY29uRm9yV2lkZ2V0VHlwZShHVEtfVFlQRV9DT05UQUlORVIsICJ1c2VyLWludmlz aWJsZS1zeW1ib2xpYyIsIEdUS19TVE9DS19KVVNUSUZZX0ZJTEwsCisgICAgICAgICAgICBndGtU ZXh0RGlyZWN0aW9uKHJlbmRlck9iamVjdC0+c3R5bGUoKS5kaXJlY3Rpb24oKSksIGd0a0ljb25T dGF0ZSh0aGlzLCByZW5kZXJPYmplY3QpLCBpY29uUmVjdC53aWR0aCgpKTsKKyAgICBwYWludEdk a1BpeGJ1ZihwYWludEluZm8uY29udGV4dCwgaWNvbi5nZXQoKSwgaWNvblJlY3QpOworICAgIHJl dHVybiB0cnVlOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrMi5jcHAKaW5kZXggZmEzNjAwMzNlYjFiYWY4NDhiYjVhZjE5YjJkNjVl YWQ4MjhjMWRlNy4uYjBkYmYxMTYxNGZjNWVjNWMzYjVlNzcwOWVlMGJiNTkxNGViZjJlZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMi5jcHAKQEAg LTY1NSw2ICs2NTUsOSBAQCBHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tJY29uRm9yV2lkZ2V0 VHlwZShHVHlwZSB3aWRnZXRUeXBlLCBjb25zdCBjaGFyKiBpY29uTgogewogICAgIEFTU0VSVCh3 aWRnZXRUeXBlID09IEdUS19UWVBFX0NPTlRBSU5FUiB8fCB3aWRnZXRUeXBlID09IEdUS19UWVBF X0VOVFJZKTsKIAorICAgIGlmICghaWNvbk5hbWUpCisgICAgICAgIHJldHVybiBudWxscHRyOwor CiAgICAgUmVuZGVyVGhlbWVHdGsqIHRoZW1lID0gc3RhdGljX2Nhc3Q8UmVuZGVyVGhlbWVHdGsq PihSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCkuZ2V0KCkpOwogICAgIEd0a1dpZGdldCogd2lk Z2V0ID0gd2lkZ2V0VHlwZSA9PSBHVEtfVFlQRV9DT05UQUlORVIgPyBHVEtfV0lER0VUKHRoZW1l LT5ndGtDb250YWluZXIoKSkgOiB0aGVtZS0+Z3RrRW50cnkoKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcAppbmRleCA3NWEwODRhNjg5MjBh M2Q1MTFhNzhjNjRlY2Y4NWU1MGQwMTQ3NjUxLi40ZmMyNGQ0NDA3Y2VkNGE2MDU3YjZmYjQ0NDgz OTUyZWFmY2FjYzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGszLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGszLmNwcApAQCAtODc4LDYgKzg3OCw5IEBAIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBh aW50SW5uZXJTcGluQnV0dG9uKFJlbmRlck9iamVjdCogcmVuZGVyT2JqZWN0LCBjb25zdCBQYWlu CiAKIEdSZWZQdHI8R2RrUGl4YnVmPiBnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdp ZGdldFR5cGUsIGNvbnN0IGNoYXIqIGljb25OYW1lLCBnaW50IGRpcmVjdGlvbiwgZ2ludCBzdGF0 ZSwgZ2ludCBpY29uU2l6ZSkKIHsKKyAgICBpZiAoIWljb25OYW1lKQorICAgICAgICByZXR1cm4g bnVsbHB0cjsKKwogICAgIEd0a1N0eWxlQ29udGV4dCogY29udGV4dCA9IGdldFN0eWxlQ29udGV4 dCh3aWRnZXRUeXBlKTsKICAgICBHdGtJY29uU2V0KiBpY29uU2V0ID0gZ3RrX3N0eWxlX2NvbnRl eHRfbG9va3VwX2ljb25fc2V0KGNvbnRleHQsIGljb25OYW1lKTsKIApkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDk2NGQzMjg2MjM3YTdlNDg3Mzc3 ZDVkMWEzNTg0NDU5YWI0YWE1MWQuLjJhNTIzMzI5MmMzMDM5OGY3NGM5NTYzYjdlMThkNmI4Y2Vl YzFjZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMyBAQAorMjAxNC0wMi0yOCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxj YWx2YXJpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIE11bHRpbWVkaWEgY29udHJvbHMg Y2FwdGlvbnMgaWNvbiBuZWVkcyBpdHMgb3duIG1ldGFwaG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjkwOTEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGd0ay9qaGJ1aWxkLm1vZHVsZXM6IEJ1bXBl ZCBuZWNlc3NhcnkgdmVyc2lvbiBvZgorICAgICAgICBnbm9tZS1pY29uLXRoZW1lLXN5bWJvbGlj IHVwIHRvIDMuMTEuOTEuCisKIDIwMTQtMDItMjcgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5j b20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogbW9kZWwgdGVzdHMgc2hvdWxkIHVzZSBhIHNw ZWNpYWwgVGVzdC5odG1sIGluc3BlY3RvciBwYWdlCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvamhi dWlsZC5tb2R1bGVzIGIvVG9vbHMvZ3RrL2poYnVpbGQubW9kdWxlcwppbmRleCA1ZmQwNDg3ZGE2 YmQyZTFlNTE1ZmRlZmU0YzU2NDFjMDhjMGE2NDdlLi4wNzY0ZGQ1YjRkMTc5OGU4YjU1NzFkYTRh MDU1NDRkMmRmZjJmYTllIDEwMDY0NAotLS0gYS9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVzCisr KyBiL1Rvb2xzL2d0ay9qaGJ1aWxkLm1vZHVsZXMKQEAgLTIxMiwxMCArMjEyLDEwIEBACiAgICAg PGRlcGVuZGVuY2llcz4KICAgICAgIDxkZXAgcGFja2FnZT0iZ3RrKyIvPgogICAgIDwvZGVwZW5k ZW5jaWVzPgotICAgIDxicmFuY2ggbW9kdWxlPSJwdWIvR05PTUUvc291cmNlcy9nbm9tZS1pY29u LXRoZW1lLXN5bWJvbGljLzMuMi9nbm9tZS1pY29uLXRoZW1lLXN5bWJvbGljLTMuMi4xLnRhci54 eiIgdmVyc2lvbj0iMy4yLjEiCisgICAgPGJyYW5jaCBtb2R1bGU9InB1Yi9HTk9NRS9zb3VyY2Vz L2dub21lLWljb24tdGhlbWUtc3ltYm9saWMvMy4xMS9nbm9tZS1pY29uLXRoZW1lLXN5bWJvbGlj LTMuMTEuOTEudGFyLnh6IiB2ZXJzaW9uPSIzLjExLjkxIgogICAgICAgICAgICAgcmVwbz0iZnRw Lmdub21lLm9yZyIKLSAgICAgICAgICAgIGhhc2g9InNoYTI1NjphNTU4YWYyZjg3Zjc2MWYwMDQy MWY0OWMxYWRkZDIxNDliNzAyMjgxNThlMDkzMjdmYTg2MTIxOWFjMWE2M2NiIgotICAgICAgICAg ICAgbWQ1c3VtPSI5NDEzN2QzYzI1NmYyY2M4MDI5OGE5YmVmMTVkNjhjNCI+CisgICAgICAgICAg ICBoYXNoPSJzaGEyNTY6YWQwNzg0MDkwMzc4NDhkMjU3NTAwODAwYTc0M2M3YTcyNGM0M2YxODE4 Mzc5NTE4ZjhiODU4NGFlOGZlMzA4MyIKKyAgICAgICAgICAgIG1kNXN1bT0iOWQ3M2EzNGViMDlj NmI2Yzg2ZTg5MzYyNDM5YTg5NjYiPgogICAgIDwvYnJhbmNoPgogICA8L2F1dG90b29scz4KIAo= 225486 2014-02-28 13:34:02 -0800 2014-03-01 14:39:08 -0800 Patch bug-129091-20140228223359.patch text/plain 4316 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0ODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhkY2ZjZmRlZTc1MmYx OTBkNjM2MWI3ZTQ2NDZkNDBiZDU0YjExNC4uMDIxOGUzYzlkNzZhOWU4OGNjODUyZjYzN2IyOTE4 ZmQzYjU0M2Q4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE0LTAyLTI4ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dU S10gTXVsdGltZWRpYSBjb250cm9scyBjYXB0aW9ucyBpY29uIG5lZWRzIGl0cyBvd24gbWV0YXBo b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA5 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHdl IGdvdCB0aGUgbmV3IGljb24gY3JlYXRlZCwgd2UgdXNlZCBpdCB3aXRoIGEgZmFsbGJhY2sgdG8g dGhlCisgICAgICAgIG9sZCBpY29uIHRvIGtlZXAgcnVuLXRpbWUgY29tcGF0aWJpbGl0eS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIGN1cnJlbnQgb25lcyBzdWZmaWNlLgorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lR3RrOjpwYWludE1lZGlhVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b24pOgorICAgICAg ICBSZXBsaWNhdGVkIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhQnV0dG9uIHRvIGNoZWNrIGZv ciB0aGUKKyAgICAgICAgbmVjZXNzYXJ5IGljb24gZmlyc3QgYW5kIGRvIHRoZSBmYWxsYmFjayB0 byB0aGUgb2xkIGFuZCBzdG9jaworICAgICAgICBpY29ucy4KKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFN0b2NrSWNvbkZv cldpZGdldFR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Z2V0U3RvY2tJY29uRm9yV2lkZ2V0VHlwZSk6IENoZWNrIGZv ciBudWxsIGljb25OYW1lIGFuZAorICAgICAgICBiYWlsIG91dCBpZiBzby4KKworMjAxNC0wMi0y OCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgorCiAgICAg ICAgIFtHVEtdIEZpbmV0dW5lIGNhcHRpb25zIG1lbnUgYXMgcGVyIGRlc2lnbiB0ZWFtCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MzIKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKaW5kZXggYzQ2 OWU0MjA2ZDY4ZmIxZTc3M2ViNDk2YmU5OWExYWM0MTlmYmI2ZS4uMjc0YzcyM2ZlMmY2MTI4MGY2 ZGI2ZGVhMjBiNThhYWFiZmQ5NTYwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsuY3BwCkBAIC01NjYsNyArNTY2LDE1IEBAIGJvb2wgUmVuZGVyVGhl bWVHdGs6OnBhaW50TWVkaWFTZWVrRm9yd2FyZEJ1dHRvbihSZW5kZXJPYmplY3QqIHJlbmRlck9i amVjdCwgY29uCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogYm9vbCBSZW5kZXJUaGVtZUd0azo6 cGFpbnRNZWRpYVRvZ2dsZUNsb3NlZENhcHRpb25zQnV0dG9uKFJlbmRlck9iamVjdCogcmVuZGVy T2JqZWN0LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkK IHsKLSAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihyZW5kZXJPYmplY3QsIHBhaW50SW5mby5j b250ZXh0LCByZWN0LCAidXNlci1pbnZpc2libGUtc3ltYm9saWMiLCBHVEtfU1RPQ0tfSlVTVElG WV9GSUxMKTsKKyAgICBJbnRSZWN0IGljb25SZWN0KHJlY3QueCgpICsgKHJlY3Qud2lkdGgoKSAt IG1fbWVkaWFJY29uU2l6ZSkgLyAyLCByZWN0LnkoKSArIChyZWN0LmhlaWdodCgpIC0gbV9tZWRp YUljb25TaXplKSAvIDIsCisgICAgICAgIG1fbWVkaWFJY29uU2l6ZSwgbV9tZWRpYUljb25TaXpl KTsKKyAgICBHUmVmUHRyPEdka1BpeGJ1Zj4gaWNvbiA9IGdldFN0b2NrU3ltYm9saWNJY29uRm9y V2lkZ2V0VHlwZShHVEtfVFlQRV9DT05UQUlORVIsICJtZWRpYS12aWV3LXN1YnRpdGxlcy1zeW1i b2xpYyIsIG51bGxwdHIsCisgICAgICAgIGd0a1RleHREaXJlY3Rpb24ocmVuZGVyT2JqZWN0LT5z dHlsZSgpLmRpcmVjdGlvbigpKSwgZ3RrSWNvblN0YXRlKHRoaXMsIHJlbmRlck9iamVjdCksIGlj b25SZWN0LndpZHRoKCkpOworICAgIGlmICghaWNvbikKKyAgICAgICAgaWNvbiA9IGdldFN0b2Nr U3ltYm9saWNJY29uRm9yV2lkZ2V0VHlwZShHVEtfVFlQRV9DT05UQUlORVIsICJ1c2VyLWludmlz aWJsZS1zeW1ib2xpYyIsIEdUS19TVE9DS19KVVNUSUZZX0ZJTEwsCisgICAgICAgICAgICBndGtU ZXh0RGlyZWN0aW9uKHJlbmRlck9iamVjdC0+c3R5bGUoKS5kaXJlY3Rpb24oKSksIGd0a0ljb25T dGF0ZSh0aGlzLCByZW5kZXJPYmplY3QpLCBpY29uUmVjdC53aWR0aCgpKTsKKyAgICBwYWludEdk a1BpeGJ1ZihwYWludEluZm8uY29udGV4dCwgaWNvbi5nZXQoKSwgaWNvblJlY3QpOworICAgIHJl dHVybiB0cnVlOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrMi5jcHAKaW5kZXggZmEzNjAwMzNlYjFiYWY4NDhiYjVhZjE5YjJkNjVl YWQ4MjhjMWRlNy4uYjBkYmYxMTYxNGZjNWVjNWMzYjVlNzcwOWVlMGJiNTkxNGViZjJlZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMi5jcHAKQEAg LTY1NSw2ICs2NTUsOSBAQCBHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tJY29uRm9yV2lkZ2V0 VHlwZShHVHlwZSB3aWRnZXRUeXBlLCBjb25zdCBjaGFyKiBpY29uTgogewogICAgIEFTU0VSVCh3 aWRnZXRUeXBlID09IEdUS19UWVBFX0NPTlRBSU5FUiB8fCB3aWRnZXRUeXBlID09IEdUS19UWVBF X0VOVFJZKTsKIAorICAgIGlmICghaWNvbk5hbWUpCisgICAgICAgIHJldHVybiBudWxscHRyOwor CiAgICAgUmVuZGVyVGhlbWVHdGsqIHRoZW1lID0gc3RhdGljX2Nhc3Q8UmVuZGVyVGhlbWVHdGsq PihSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCkuZ2V0KCkpOwogICAgIEd0a1dpZGdldCogd2lk Z2V0ID0gd2lkZ2V0VHlwZSA9PSBHVEtfVFlQRV9DT05UQUlORVIgPyBHVEtfV0lER0VUKHRoZW1l LT5ndGtDb250YWluZXIoKSkgOiB0aGVtZS0+Z3RrRW50cnkoKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcAppbmRleCA3NWEwODRhNjg5MjBh M2Q1MTFhNzhjNjRlY2Y4NWU1MGQwMTQ3NjUxLi40ZmMyNGQ0NDA3Y2VkNGE2MDU3YjZmYjQ0NDgz OTUyZWFmY2FjYzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGszLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGszLmNwcApAQCAtODc4LDYgKzg3OCw5IEBAIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBh aW50SW5uZXJTcGluQnV0dG9uKFJlbmRlck9iamVjdCogcmVuZGVyT2JqZWN0LCBjb25zdCBQYWlu CiAKIEdSZWZQdHI8R2RrUGl4YnVmPiBnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdp ZGdldFR5cGUsIGNvbnN0IGNoYXIqIGljb25OYW1lLCBnaW50IGRpcmVjdGlvbiwgZ2ludCBzdGF0 ZSwgZ2ludCBpY29uU2l6ZSkKIHsKKyAgICBpZiAoIWljb25OYW1lKQorICAgICAgICByZXR1cm4g bnVsbHB0cjsKKwogICAgIEd0a1N0eWxlQ29udGV4dCogY29udGV4dCA9IGdldFN0eWxlQ29udGV4 dCh3aWRnZXRUeXBlKTsKICAgICBHdGtJY29uU2V0KiBpY29uU2V0ID0gZ3RrX3N0eWxlX2NvbnRl eHRfbG9va3VwX2ljb25fc2V0KGNvbnRleHQsIGljb25OYW1lKTsKIAo= 225569 2014-03-01 14:39:19 -0800 2014-03-02 03:00:21 -0800 Patch bug-129091-20140301233911.patch text/plain 7217 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0ODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhkY2ZjZmRlZTc1MmYx OTBkNjM2MWI3ZTQ2NDZkNDBiZDU0YjExNC4uMjc2Mzc1NDk3MzllYmJiN2E4MDA2N2IwYjA3ZTY2 NzRkMjM0ZThjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAzLTAxICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU S10gTXVsdGltZWRpYSBjb250cm9scyBjYXB0aW9ucyBpY29uIG5lZWRzIGl0cyBvd24gbWV0YXBo b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA5 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHdl IGdvdCB0aGUgbmV3IGljb24gY3JlYXRlZCwgd2UgdXNlZCBpdCB3aXRoIGEgZmFsbGJhY2sgdG8g dGhlCisgICAgICAgIG9sZCBpY29uIHRvIGtlZXAgcnVuLXRpbWUgY29tcGF0aWJpbGl0eS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIGN1cnJlbnQgb25lcyBzdWZmaWNlLgorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lR3RrOjpwYWludE1lZGlhVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b24pOgorICAgICAg ICBSZXBsaWNhdGVkIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhQnV0dG9uIHRvIGNoZWNrIGZv ciB0aGUKKyAgICAgICAgbmVjZXNzYXJ5IGljb24gZmlyc3QgYW5kIGRvIHRoZSBmYWxsYmFjayB0 byB0aGUgb2xkIGFuZCBzdG9jaworICAgICAgICBpY29ucy4KKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFN0b2NrSWNvbkZv cldpZGdldFR5cGUpOiBBZGRlZCBBU1NFUlQgZm9yIG5vbi1lbXB0eQorICAgICAgICBpY29uIG5h bWUuCisgICAgICAgIChXZWJDb3JlOjpnZXRTdG9ja1N5bWJvbGljSWNvbkZvcldpZGdldFR5cGUp OiBDaGVjayBmb3Igbm9uIGVtcHR5CisgICAgICAgIGljb24gbmFtZSBiZWZvcmUgY2FsbGluZyBn ZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlLiBGaXhlZCBjb2RpbmcKKyAgICAgICAgc3R5bGUuCisg ICAgICAgICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKTogQWRkZWQgQVNTRVJUIGZvciBub24tZW1w dHkKKyAgICAgICAgaWNvbiBuYW1lLgorICAgICAgICAoV2ViQ29yZTo6Z2V0U3RvY2tTeW1ib2xp Y0ljb25Gb3JXaWRnZXRUeXBlKTogQ2hlY2sgZm9yIG5vbiBlbXB0eQorICAgICAgICBpY29uIG5h bWUgYmVmb3JlIGNhbGxpbmcgZ2V0U3RvY2tJY29uRm9yV2lkZ2V0VHlwZS4gRml4ZWQgY29kaW5n CisgICAgICAgIHN0eWxlLgorCiAyMDE0LTAyLTI4ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAg PGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRmluZXR1bmUgY2FwdGlvbnMg bWVudSBhcyBwZXIgZGVzaWduIHRlYW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IGM0NjllNDIwNmQ2OGZiMWU3NzNlYjQ5NmJlOTlhMWFj NDE5ZmJiNmUuLjljMWVlZTg5NTRkMTU5MzhiYTQ5YzBiMTg0ODI0YzUwN2M0ZWVjYWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtNjIs NyArNjIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBUaGlzIHdvdWxkIGJlIGEgc3RhdGlj IG1ldGhvZCwgZXhjZXB0IHRoYXQgZm9yd2FyZCBkZWNsYXJpbmcgR1R5cGUgaXMgdHJpY2t5LCBz aW5jZSBpdHMKIC8vIGRlZmluaXRpb24gZGVwZW5kcyBvbiBpbmNsdWRpbmcgZ2xpYi5oLCBuZWdh dGluZyB0aGUgYmVuZWZpdCBvZiB1c2luZyBhIGZvcndhcmQgZGVjbGFyYXRpb24uCiBleHRlcm4g R1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrSWNvbkZvcldpZGdldFR5cGUoR1R5cGUsIGNvbnN0 IGNoYXIqIGljb25OYW1lLCBnaW50IGRpcmVjdGlvbiwgZ2ludCBzdGF0ZSwgZ2ludCBpY29uU2l6 ZSk7Ci1leHRlcm4gR1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrU3ltYm9saWNJY29uRm9yV2lk Z2V0VHlwZShHVHlwZSB3aWRnZXRUeXBlLCBjb25zdCBjaGFyKiBzeW1ib2xpY0ljb25OYW1lLCBj b25zdCBjaGFyICpmYWxsYmFja1N0b2NrSWNvbk5hbWUsIGdpbnQgZGlyZWN0aW9uLCBnaW50IHN0 YXRlLCBnaW50IGljb25TaXplKTsKK2V4dGVybiBHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tT eW1ib2xpY0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5 bWJvbGljSWNvbk5hbWUsIGNvbnN0IGNoYXIqIGZhbGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBk aXJlY3Rpb24sIGdpbnQgc3RhdGUsIGdpbnQgaWNvblNpemUpOwogCiAjaWYgRU5BQkxFKFZJREVP KQogc3RhdGljIEhUTUxNZWRpYUVsZW1lbnQqIGdldE1lZGlhRWxlbWVudEZyb21SZW5kZXJPYmpl Y3QoUmVuZGVyT2JqZWN0KiBvKQpAQCAtNTY2LDcgKzU2NiwxNSBAQCBib29sIFJlbmRlclRoZW1l R3RrOjpwYWludE1lZGlhU2Vla0ZvcndhcmRCdXR0b24oUmVuZGVyT2JqZWN0KiByZW5kZXJPYmpl Y3QsIGNvbgogI2lmIEVOQUJMRShWSURFT19UUkFDSykKIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBh aW50TWVkaWFUb2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbihSZW5kZXJPYmplY3QqIHJlbmRlck9i amVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7 Ci0gICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocmVuZGVyT2JqZWN0LCBwYWludEluZm8uY29u dGV4dCwgcmVjdCwgInVzZXItaW52aXNpYmxlLXN5bWJvbGljIiwgR1RLX1NUT0NLX0pVU1RJRllf RklMTCk7CisgICAgSW50UmVjdCBpY29uUmVjdChyZWN0LngoKSArIChyZWN0LndpZHRoKCkgLSBt X21lZGlhSWNvblNpemUpIC8gMiwgcmVjdC55KCkgKyAocmVjdC5oZWlnaHQoKSAtIG1fbWVkaWFJ Y29uU2l6ZSkgLyAyLAorICAgICAgICBtX21lZGlhSWNvblNpemUsIG1fbWVkaWFJY29uU2l6ZSk7 CisgICAgR1JlZlB0cjxHZGtQaXhidWY+IGljb24gPSBnZXRTdG9ja1N5bWJvbGljSWNvbkZvcldp ZGdldFR5cGUoR1RLX1RZUEVfQ09OVEFJTkVSLCAibWVkaWEtdmlldy1zdWJ0aXRsZXMtc3ltYm9s aWMiLCBudWxscHRyLAorICAgICAgICBndGtUZXh0RGlyZWN0aW9uKHJlbmRlck9iamVjdC0+c3R5 bGUoKS5kaXJlY3Rpb24oKSksIGd0a0ljb25TdGF0ZSh0aGlzLCByZW5kZXJPYmplY3QpLCBpY29u UmVjdC53aWR0aCgpKTsKKyAgICBpZiAoIWljb24pCisgICAgICAgIGljb24gPSBnZXRTdG9ja1N5 bWJvbGljSWNvbkZvcldpZGdldFR5cGUoR1RLX1RZUEVfQ09OVEFJTkVSLCAidXNlci1pbnZpc2li bGUtc3ltYm9saWMiLCBHVEtfU1RPQ0tfSlVTVElGWV9GSUxMLAorICAgICAgICAgICAgZ3RrVGV4 dERpcmVjdGlvbihyZW5kZXJPYmplY3QtPnN0eWxlKCkuZGlyZWN0aW9uKCkpLCBndGtJY29uU3Rh dGUodGhpcywgcmVuZGVyT2JqZWN0KSwgaWNvblJlY3Qud2lkdGgoKSk7CisgICAgcGFpbnRHZGtQ aXhidWYocGFpbnRJbmZvLmNvbnRleHQsIGljb24uZ2V0KCksIGljb25SZWN0KTsKKyAgICByZXR1 cm4gdHJ1ZTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvUmVuZGVyVGhlbWVHdGsyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9S ZW5kZXJUaGVtZUd0azIuY3BwCmluZGV4IGZhMzYwMDMzZWIxYmFmODQ4YmI1YWYxOWIyZDY1ZWFk ODI4YzFkZTcuLjVkYjg0Nzg2MWRmMDczMWY3M2QwNDMwZTM4ZTg2OGQyMDE4MGI2NDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwCkBAIC02 NTQsNiArNjU0LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRJbm5lclNwaW5CdXR0b24o UmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0IFBhaW4KIEdSZWZQdHI8R2RrUGl4YnVm PiBnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIq IGljb25OYW1lLCBnaW50IGRpcmVjdGlvbiwgZ2ludCBzdGF0ZSwgZ2ludCBpY29uU2l6ZSkKIHsK ICAgICBBU1NFUlQod2lkZ2V0VHlwZSA9PSBHVEtfVFlQRV9DT05UQUlORVIgfHwgd2lkZ2V0VHlw ZSA9PSBHVEtfVFlQRV9FTlRSWSk7CisgICAgQVNTRVJUKGljb25OYW1lKTsKIAogICAgIFJlbmRl clRoZW1lR3RrKiB0aGVtZSA9IHN0YXRpY19jYXN0PFJlbmRlclRoZW1lR3RrKj4oUmVuZGVyVGhl bWU6OmRlZmF1bHRUaGVtZSgpLmdldCgpKTsKICAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHdpZGdl dFR5cGUgPT0gR1RLX1RZUEVfQ09OVEFJTkVSID8gR1RLX1dJREdFVCh0aGVtZS0+Z3RrQ29udGFp bmVyKCkpIDogdGhlbWUtPmd0a0VudHJ5KCk7CkBAIC02NjYsOCArNjY3LDExIEBAIEdSZWZQdHI8 R2RrUGl4YnVmPiBnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNv bnN0IGNoYXIqIGljb25OCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RhdGljX2Nhc3Q8R3RrSWNvblNpemU+KGljb25TaXplKSwgMCwgMCkpOwogfQogCi1H UmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tTeW1ib2xpY0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBl IHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5bWJvbGljSWNvbk5hbWUsIGNvbnN0IGNoYXIgKmZh bGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBkaXJlY3Rpb24sIGdpbnQgc3RhdGUsIGdpbnQgaWNv blNpemUpCitHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tTeW1ib2xpY0ljb25Gb3JXaWRnZXRU eXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5bWJvbGljSWNvbk5hbWUsIGNvbnN0 IGNoYXIqIGZhbGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBkaXJlY3Rpb24sIGdpbnQgc3RhdGUs IGdpbnQgaWNvblNpemUpCiB7CisgICAgaWYgKGZhbGxiYWNrU3RvY2tJY29uTmFtZSkKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CisKICAgICByZXR1cm4gZ2V0U3RvY2tJY29uRm9yV2lkZ2V0VHlw ZSh3aWRnZXRUeXBlLCBmYWxsYmFja1N0b2NrSWNvbk5hbWUsIGRpcmVjdGlvbiwgc3RhdGUsIGlj b25TaXplKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Jl bmRlclRoZW1lR3RrMy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhl bWVHdGszLmNwcAppbmRleCA3NWEwODRhNjg5MjBhM2Q1MTFhNzhjNjRlY2Y4NWU1MGQwMTQ3NjUx Li4zMmUzNzA0MzFjOGNlMDllZWVhYmNkZWY2ZDE0ZmU1YzExMWU5Nzg5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcApAQCAtODc4LDYgKzg3 OCw4IEBAIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50SW5uZXJTcGluQnV0dG9uKFJlbmRlck9i amVjdCogcmVuZGVyT2JqZWN0LCBjb25zdCBQYWluCiAKIEdSZWZQdHI8R2RrUGl4YnVmPiBnZXRT dG9ja0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIGljb25O YW1lLCBnaW50IGRpcmVjdGlvbiwgZ2ludCBzdGF0ZSwgZ2ludCBpY29uU2l6ZSkKIHsKKyAgICBB U1NFUlQoaWNvbk5hbWUpOworCiAgICAgR3RrU3R5bGVDb250ZXh0KiBjb250ZXh0ID0gZ2V0U3R5 bGVDb250ZXh0KHdpZGdldFR5cGUpOwogICAgIEd0a0ljb25TZXQqIGljb25TZXQgPSBndGtfc3R5 bGVfY29udGV4dF9sb29rdXBfaWNvbl9zZXQoY29udGV4dCwgaWNvbk5hbWUpOwogCkBAIC04OTgs NyArOTAwLDcgQEAgR1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrSWNvbkZvcldpZGdldFR5cGUo R1R5cGUgd2lkZ2V0VHlwZSwgY29uc3QgY2hhciogaWNvbk4KICAgICByZXR1cm4gYWRvcHRHUmVm KGljb24pOwogfQogCi1HUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tTeW1ib2xpY0ljb25Gb3JX aWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5bWJvbGljSWNvbk5hbWUs IGNvbnN0IGNoYXIgKmZhbGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBkaXJlY3Rpb24sIGdpbnQg c3RhdGUsIGdpbnQgaWNvblNpemUpCitHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tTeW1ib2xp Y0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5bWJvbGlj SWNvbk5hbWUsIGNvbnN0IGNoYXIqIGZhbGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBkaXJlY3Rp b24sIGdpbnQgc3RhdGUsIGdpbnQgaWNvblNpemUpCiB7CiAgICAgR3RrU3R5bGVDb250ZXh0KiBj b250ZXh0ID0gZ2V0U3R5bGVDb250ZXh0KHdpZGdldFR5cGUpOwogCkBAIC05MjIsOCArOTI0LDEx IEBAIEdSZWZQdHI8R2RrUGl4YnVmPiBnZXRTdG9ja1N5bWJvbGljSWNvbkZvcldpZGdldFR5cGUo R1R5cGUgd2lkZ2V0VHlwZSwgY29uc3QgY2hhCiAKICAgICBndGtfc3R5bGVfY29udGV4dF9yZXN0 b3JlKGNvbnRleHQpOwogCi0gICAgaWYgKCFpY29uKQorICAgIGlmICghaWNvbikgeworICAgICAg ICBpZiAoIWZhbGxiYWNrU3RvY2tJY29uTmFtZSkKKyAgICAgICAgICAgIHJldHVybiBudWxscHRy OwogICAgICAgICByZXR1cm4gZ2V0U3RvY2tJY29uRm9yV2lkZ2V0VHlwZSh3aWRnZXRUeXBlLCBm YWxsYmFja1N0b2NrSWNvbk5hbWUsIGRpcmVjdGlvbiwgc3RhdGUsIGljb25TaXplKTsKKyAgICB9 CiAKICAgICByZXR1cm4gYWRvcHRHUmVmKGljb24pOwogfQo= 225591 2014-03-02 03:00:36 -0800 2014-03-03 00:31:18 -0800 Patch bug-129091-20140302120027.patch text/plain 7218 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0ODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhkY2ZjZmRlZTc1MmYx OTBkNjM2MWI3ZTQ2NDZkNDBiZDU0YjExNC4uZWNjZmE0ZGVlNTNkZTM3MWJmZGVhYzM3MGFhYWQy ZTRkZTBmNjc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAzLTAyICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU S10gTXVsdGltZWRpYSBjb250cm9scyBjYXB0aW9ucyBpY29uIG5lZWRzIGl0cyBvd24gbWV0YXBo b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTA5 MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHdl IGdvdCB0aGUgbmV3IGljb24gY3JlYXRlZCwgd2UgdXNlZCBpdCB3aXRoIGEgZmFsbGJhY2sgdG8g dGhlCisgICAgICAgIG9sZCBpY29uIHRvIGtlZXAgcnVuLXRpbWUgY29tcGF0aWJpbGl0eS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIGN1cnJlbnQgb25lcyBzdWZmaWNlLgorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lR3RrOjpwYWludE1lZGlhVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b24pOgorICAgICAg ICBSZXBsaWNhdGVkIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhQnV0dG9uIHRvIGNoZWNrIGZv ciB0aGUKKyAgICAgICAgbmVjZXNzYXJ5IGljb24gZmlyc3QgYW5kIGRvIHRoZSBmYWxsYmFjayB0 byB0aGUgb2xkIGFuZCBzdG9jaworICAgICAgICBpY29ucy4KKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVHdGsyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFN0b2NrSWNvbkZv cldpZGdldFR5cGUpOiBBZGRlZCBBU1NFUlQgZm9yIG5vbi1lbXB0eQorICAgICAgICBpY29uIG5h bWUuCisgICAgICAgIChXZWJDb3JlOjpnZXRTdG9ja1N5bWJvbGljSWNvbkZvcldpZGdldFR5cGUp OiBDaGVjayBmb3Igbm9uIGVtcHR5CisgICAgICAgIGljb24gbmFtZSBiZWZvcmUgY2FsbGluZyBn ZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlLiBGaXhlZCBjb2RpbmcKKyAgICAgICAgc3R5bGUuCisg ICAgICAgICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKTogQWRkZWQgQVNTRVJUIGZvciBub24tZW1w dHkKKyAgICAgICAgaWNvbiBuYW1lLgorICAgICAgICAoV2ViQ29yZTo6Z2V0U3RvY2tTeW1ib2xp Y0ljb25Gb3JXaWRnZXRUeXBlKTogQ2hlY2sgZm9yIG5vbiBlbXB0eQorICAgICAgICBpY29uIG5h bWUgYmVmb3JlIGNhbGxpbmcgZ2V0U3RvY2tJY29uRm9yV2lkZ2V0VHlwZS4gRml4ZWQgY29kaW5n CisgICAgICAgIHN0eWxlLgorCiAyMDE0LTAyLTI4ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAg PGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRmluZXR1bmUgY2FwdGlvbnMg bWVudSBhcyBwZXIgZGVzaWduIHRlYW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UmVuZGVyVGhlbWVHdGsuY3BwCmluZGV4IGM0NjllNDIwNmQ2OGZiMWU3NzNlYjQ5NmJlOTlhMWFj NDE5ZmJiNmUuLjljMWVlZTg5NTRkMTU5MzhiYTQ5YzBiMTg0ODI0YzUwN2M0ZWVjYWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtNjIs NyArNjIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAvLyBUaGlzIHdvdWxkIGJlIGEgc3RhdGlj IG1ldGhvZCwgZXhjZXB0IHRoYXQgZm9yd2FyZCBkZWNsYXJpbmcgR1R5cGUgaXMgdHJpY2t5LCBz aW5jZSBpdHMKIC8vIGRlZmluaXRpb24gZGVwZW5kcyBvbiBpbmNsdWRpbmcgZ2xpYi5oLCBuZWdh dGluZyB0aGUgYmVuZWZpdCBvZiB1c2luZyBhIGZvcndhcmQgZGVjbGFyYXRpb24uCiBleHRlcm4g R1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrSWNvbkZvcldpZGdldFR5cGUoR1R5cGUsIGNvbnN0 IGNoYXIqIGljb25OYW1lLCBnaW50IGRpcmVjdGlvbiwgZ2ludCBzdGF0ZSwgZ2ludCBpY29uU2l6 ZSk7Ci1leHRlcm4gR1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrU3ltYm9saWNJY29uRm9yV2lk Z2V0VHlwZShHVHlwZSB3aWRnZXRUeXBlLCBjb25zdCBjaGFyKiBzeW1ib2xpY0ljb25OYW1lLCBj b25zdCBjaGFyICpmYWxsYmFja1N0b2NrSWNvbk5hbWUsIGdpbnQgZGlyZWN0aW9uLCBnaW50IHN0 YXRlLCBnaW50IGljb25TaXplKTsKK2V4dGVybiBHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tT eW1ib2xpY0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5 bWJvbGljSWNvbk5hbWUsIGNvbnN0IGNoYXIqIGZhbGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBk aXJlY3Rpb24sIGdpbnQgc3RhdGUsIGdpbnQgaWNvblNpemUpOwogCiAjaWYgRU5BQkxFKFZJREVP KQogc3RhdGljIEhUTUxNZWRpYUVsZW1lbnQqIGdldE1lZGlhRWxlbWVudEZyb21SZW5kZXJPYmpl Y3QoUmVuZGVyT2JqZWN0KiBvKQpAQCAtNTY2LDcgKzU2NiwxNSBAQCBib29sIFJlbmRlclRoZW1l R3RrOjpwYWludE1lZGlhU2Vla0ZvcndhcmRCdXR0b24oUmVuZGVyT2JqZWN0KiByZW5kZXJPYmpl Y3QsIGNvbgogI2lmIEVOQUJMRShWSURFT19UUkFDSykKIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBh aW50TWVkaWFUb2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbihSZW5kZXJPYmplY3QqIHJlbmRlck9i amVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7 Ci0gICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocmVuZGVyT2JqZWN0LCBwYWludEluZm8uY29u dGV4dCwgcmVjdCwgInVzZXItaW52aXNpYmxlLXN5bWJvbGljIiwgR1RLX1NUT0NLX0pVU1RJRllf RklMTCk7CisgICAgSW50UmVjdCBpY29uUmVjdChyZWN0LngoKSArIChyZWN0LndpZHRoKCkgLSBt X21lZGlhSWNvblNpemUpIC8gMiwgcmVjdC55KCkgKyAocmVjdC5oZWlnaHQoKSAtIG1fbWVkaWFJ Y29uU2l6ZSkgLyAyLAorICAgICAgICBtX21lZGlhSWNvblNpemUsIG1fbWVkaWFJY29uU2l6ZSk7 CisgICAgR1JlZlB0cjxHZGtQaXhidWY+IGljb24gPSBnZXRTdG9ja1N5bWJvbGljSWNvbkZvcldp ZGdldFR5cGUoR1RLX1RZUEVfQ09OVEFJTkVSLCAibWVkaWEtdmlldy1zdWJ0aXRsZXMtc3ltYm9s aWMiLCBudWxscHRyLAorICAgICAgICBndGtUZXh0RGlyZWN0aW9uKHJlbmRlck9iamVjdC0+c3R5 bGUoKS5kaXJlY3Rpb24oKSksIGd0a0ljb25TdGF0ZSh0aGlzLCByZW5kZXJPYmplY3QpLCBpY29u UmVjdC53aWR0aCgpKTsKKyAgICBpZiAoIWljb24pCisgICAgICAgIGljb24gPSBnZXRTdG9ja1N5 bWJvbGljSWNvbkZvcldpZGdldFR5cGUoR1RLX1RZUEVfQ09OVEFJTkVSLCAidXNlci1pbnZpc2li bGUtc3ltYm9saWMiLCBHVEtfU1RPQ0tfSlVTVElGWV9GSUxMLAorICAgICAgICAgICAgZ3RrVGV4 dERpcmVjdGlvbihyZW5kZXJPYmplY3QtPnN0eWxlKCkuZGlyZWN0aW9uKCkpLCBndGtJY29uU3Rh dGUodGhpcywgcmVuZGVyT2JqZWN0KSwgaWNvblJlY3Qud2lkdGgoKSk7CisgICAgcGFpbnRHZGtQ aXhidWYocGFpbnRJbmZvLmNvbnRleHQsIGljb24uZ2V0KCksIGljb25SZWN0KTsKKyAgICByZXR1 cm4gdHJ1ZTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvUmVuZGVyVGhlbWVHdGsyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9S ZW5kZXJUaGVtZUd0azIuY3BwCmluZGV4IGZhMzYwMDMzZWIxYmFmODQ4YmI1YWYxOWIyZDY1ZWFk ODI4YzFkZTcuLmYwODg0NDI4Nzc0YmM2ZDMwZjZkZjczZjA0NmM0NjUzZDc1OGQwZjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwCkBAIC02 NTQsNiArNjU0LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRJbm5lclNwaW5CdXR0b24o UmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0IFBhaW4KIEdSZWZQdHI8R2RrUGl4YnVm PiBnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIq IGljb25OYW1lLCBnaW50IGRpcmVjdGlvbiwgZ2ludCBzdGF0ZSwgZ2ludCBpY29uU2l6ZSkKIHsK ICAgICBBU1NFUlQod2lkZ2V0VHlwZSA9PSBHVEtfVFlQRV9DT05UQUlORVIgfHwgd2lkZ2V0VHlw ZSA9PSBHVEtfVFlQRV9FTlRSWSk7CisgICAgQVNTRVJUKGljb25OYW1lKTsKIAogICAgIFJlbmRl clRoZW1lR3RrKiB0aGVtZSA9IHN0YXRpY19jYXN0PFJlbmRlclRoZW1lR3RrKj4oUmVuZGVyVGhl bWU6OmRlZmF1bHRUaGVtZSgpLmdldCgpKTsKICAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHdpZGdl dFR5cGUgPT0gR1RLX1RZUEVfQ09OVEFJTkVSID8gR1RLX1dJREdFVCh0aGVtZS0+Z3RrQ29udGFp bmVyKCkpIDogdGhlbWUtPmd0a0VudHJ5KCk7CkBAIC02NjYsOCArNjY3LDExIEBAIEdSZWZQdHI8 R2RrUGl4YnVmPiBnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBlIHdpZGdldFR5cGUsIGNv bnN0IGNoYXIqIGljb25OCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RhdGljX2Nhc3Q8R3RrSWNvblNpemU+KGljb25TaXplKSwgMCwgMCkpOwogfQogCi1H UmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tTeW1ib2xpY0ljb25Gb3JXaWRnZXRUeXBlKEdUeXBl IHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5bWJvbGljSWNvbk5hbWUsIGNvbnN0IGNoYXIgKmZh bGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBkaXJlY3Rpb24sIGdpbnQgc3RhdGUsIGdpbnQgaWNv blNpemUpCitHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tTeW1ib2xpY0ljb25Gb3JXaWRnZXRU eXBlKEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIHN5bWJvbGljSWNvbk5hbWUsIGNvbnN0 IGNoYXIqIGZhbGxiYWNrU3RvY2tJY29uTmFtZSwgZ2ludCBkaXJlY3Rpb24sIGdpbnQgc3RhdGUs IGdpbnQgaWNvblNpemUpCiB7CisgICAgaWYgKCFmYWxsYmFja1N0b2NrSWNvbk5hbWUpCisgICAg ICAgIHJldHVybiBudWxscHRyOworCiAgICAgcmV0dXJuIGdldFN0b2NrSWNvbkZvcldpZGdldFR5 cGUod2lkZ2V0VHlwZSwgZmFsbGJhY2tTdG9ja0ljb25OYW1lLCBkaXJlY3Rpb24sIHN0YXRlLCBp Y29uU2l6ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9S ZW5kZXJUaGVtZUd0azMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRo ZW1lR3RrMy5jcHAKaW5kZXggNzVhMDg0YTY4OTIwYTNkNTExYTc4YzY0ZWNmODVlNTBkMDE0NzY1 MS4uMzJlMzcwNDMxYzhjZTA5ZWVlYWJjZGVmNmQxNGZlNWMxMTFlOTc4OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHAKQEAgLTg3OCw2ICs4 NzgsOCBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludElubmVyU3BpbkJ1dHRvbihSZW5kZXJP YmplY3QqIHJlbmRlck9iamVjdCwgY29uc3QgUGFpbgogCiBHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0 U3RvY2tJY29uRm9yV2lkZ2V0VHlwZShHVHlwZSB3aWRnZXRUeXBlLCBjb25zdCBjaGFyKiBpY29u TmFtZSwgZ2ludCBkaXJlY3Rpb24sIGdpbnQgc3RhdGUsIGdpbnQgaWNvblNpemUpCiB7CisgICAg QVNTRVJUKGljb25OYW1lKTsKKwogICAgIEd0a1N0eWxlQ29udGV4dCogY29udGV4dCA9IGdldFN0 eWxlQ29udGV4dCh3aWRnZXRUeXBlKTsKICAgICBHdGtJY29uU2V0KiBpY29uU2V0ID0gZ3RrX3N0 eWxlX2NvbnRleHRfbG9va3VwX2ljb25fc2V0KGNvbnRleHQsIGljb25OYW1lKTsKIApAQCAtODk4 LDcgKzkwMCw3IEBAIEdSZWZQdHI8R2RrUGl4YnVmPiBnZXRTdG9ja0ljb25Gb3JXaWRnZXRUeXBl KEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYXIqIGljb25OCiAgICAgcmV0dXJuIGFkb3B0R1Jl ZihpY29uKTsKIH0KIAotR1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrU3ltYm9saWNJY29uRm9y V2lkZ2V0VHlwZShHVHlwZSB3aWRnZXRUeXBlLCBjb25zdCBjaGFyKiBzeW1ib2xpY0ljb25OYW1l LCBjb25zdCBjaGFyICpmYWxsYmFja1N0b2NrSWNvbk5hbWUsIGdpbnQgZGlyZWN0aW9uLCBnaW50 IHN0YXRlLCBnaW50IGljb25TaXplKQorR1JlZlB0cjxHZGtQaXhidWY+IGdldFN0b2NrU3ltYm9s aWNJY29uRm9yV2lkZ2V0VHlwZShHVHlwZSB3aWRnZXRUeXBlLCBjb25zdCBjaGFyKiBzeW1ib2xp Y0ljb25OYW1lLCBjb25zdCBjaGFyKiBmYWxsYmFja1N0b2NrSWNvbk5hbWUsIGdpbnQgZGlyZWN0 aW9uLCBnaW50IHN0YXRlLCBnaW50IGljb25TaXplKQogewogICAgIEd0a1N0eWxlQ29udGV4dCog Y29udGV4dCA9IGdldFN0eWxlQ29udGV4dCh3aWRnZXRUeXBlKTsKIApAQCAtOTIyLDggKzkyNCwx MSBAQCBHUmVmUHRyPEdka1BpeGJ1Zj4gZ2V0U3RvY2tTeW1ib2xpY0ljb25Gb3JXaWRnZXRUeXBl KEdUeXBlIHdpZGdldFR5cGUsIGNvbnN0IGNoYQogCiAgICAgZ3RrX3N0eWxlX2NvbnRleHRfcmVz dG9yZShjb250ZXh0KTsKIAotICAgIGlmICghaWNvbikKKyAgICBpZiAoIWljb24pIHsKKyAgICAg ICAgaWYgKCFmYWxsYmFja1N0b2NrSWNvbk5hbWUpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICAgICAgcmV0dXJuIGdldFN0b2NrSWNvbkZvcldpZGdldFR5cGUod2lkZ2V0VHlwZSwg ZmFsbGJhY2tTdG9ja0ljb25OYW1lLCBkaXJlY3Rpb24sIHN0YXRlLCBpY29uU2l6ZSk7CisgICAg fQogCiAgICAgcmV0dXJuIGFkb3B0R1JlZihpY29uKTsKIH0K