152666 2016-01-03 10:39:39 -0800 Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation) 2016-01-03 17:20:08 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser ap bdakin ddkilzer ryanhaddad simon.fraser thorton zalan oldest_to_newest 1152124 0 simon.fraser 2016-01-03 10:39:39 -0800 Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation) 1152125 1 268141 simon.fraser 2016-01-03 10:41:06 -0800 Created attachment 268141 Patch 1152135 2 268145 simon.fraser 2016-01-03 11:20:35 -0800 Created attachment 268145 Patch 1152136 3 268145 mitz 2016-01-03 11:24:08 -0800 Comment on attachment 268145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268145&action=review > Source/WebCore/ChangeLog:15 > + (WebCore::ScrollView::scrollPosition): Deleted. Renamed > Source/WebCore/ChangeLog:24 > + (WebCore::RenderLayer::scrollPosition): Deleted. Renamed > Source/WebCore/ChangeLog:28 > + (WebCore::RenderListBox::scrollPosition): Deleted. Renamed 1152139 4 simon.fraser 2016-01-03 11:51:25 -0800 https://trac.webkit.org/changeset/194515 1152191 5 ddkilzer 2016-01-03 16:57:52 -0800 (In reply to comment #4) > https://trac.webkit.org/changeset/194515 Looks like this broke the Windows build. Too bad you didn't wait for the EWS to finish? <https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/74925> 1152192 6 ddkilzer 2016-01-03 16:58:58 -0800 (In reply to comment #5) > (In reply to comment #4) > > https://trac.webkit.org/changeset/194515 > > Looks like this broke the Windows build. Too bad you didn't wait for the > EWS to finish? > > <https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/ > builds/74925> c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\platform\win\PopupMenuWin.h(95): error C3668: 'WebCore::PopupMenuWin::scrollPosition': method with override specifier 'override' did not override any base class methods (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\platform\win\PopupMenuWin.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] c:\cygwin\home\buildbot\slave\win-release\build\source\webcore\platform\win\PopupMenuWin.h(95): error C3668: 'WebCore::PopupMenuWin::scrollPosition': method with override specifier 'override' did not override any base class methods (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\platform\win\SearchPopupMenuWin.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\platform\win\SearchPopupMenuWin.cpp(33): error C2259: 'WebCore::PopupMenuWin': cannot instantiate abstract class [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\platform\win\SearchPopupMenuWin.cpp(33): note: due to following members: C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\platform\win\SearchPopupMenuWin.cpp(33): note: 'int WebCore::ScrollableArea::scrollOffset(WebCore::ScrollbarOrientation) const': is abstract C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\platform\ScrollableArea.h(149): note: see declaration of 'WebCore::ScrollableArea::scrollOffset' 1152197 7 simon.fraser 2016-01-03 17:20:08 -0800 Windows fixed in r194522. 268141 2016-01-03 10:41:06 -0800 2016-01-03 11:20:33 -0800 Patch bug-152666-20160103104033.patch text/plain 11483 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmZiYTAyYjM3N2M1OGQx ZTkyZDc1N2JjMWQ1MzY0Zjk4NDgwZTJiZi4uYzJjNzk2YTRkODU0MzYxMTYyM2FkNTk5MGM0MTg2 NzE1OGI3MjNlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE2LTAxLTAzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJlbmFtZSBzY3Jv bGxQb3NpdGlvbihTY3JvbGxiYXIqKSB0byBzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50YXRp b24pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI2 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3Jv bGxiYXIgdmFsdWVzIHRha2Ugb2Zmc2V0cyAoemVyby1iYXNlZCksIHNvIHJlbmFtZSB0aGUgYWNj ZXNzb3IgdXNlZAorICAgICAgICBieSBzY3JvbGxiYXJzIHRvIHNldCB0aGVpciB2YWx1ZSwgYW5k IHBhc3MgaW4gYW4gb3JpZW50YXRpb24sIHJhdGhlciB0aGFuCisgICAgICAgIGEgcG9pbnRlciB0 byB0aGUgc2Nyb2xsYmFyLgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzY3JvbGxPZmZzZXQpOiBVc2Ugc2Nyb2xsT2Zm c2V0RnJvbVBvc2l0aW9uIHJhdGhlciB0aGFuCisgICAgICAgIG1hbnVhbGx5IGFkZGluZyBzY3Jv bGxPcmlnaW4uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzY3JvbGxQb3NpdGlvbik6 IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsVmlldzo6Y2FjaGVkU2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAqIHBsYXRm b3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcjo6U2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGJhcjo6b2Zmc2V0RGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbE9mZnNl dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsUG9zaXRpb24pOiBEZWxl dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6 OnNjcm9sbE9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0Qm94OjpzY3JvbGxQ b3NpdGlvbik6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaDoK KworMjAxNi0wMS0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwog ICAgICAgICBzY3JvbGxMZWZ0IHJldHVybnMgZGlmZmVyZW50IHZhbHVlcyBmb3Igdmlld3BvcnQg YW5kIG5vbi12aWV3cG9ydCBzY3JvbGxpbmcgd2l0aCBydGwKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NDA1CiAgICAgICAgIHJkYXI6Ly9wcm9ibGVt LzIxODI5NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmY0MjA0Y2NlYTk1ZDVjNTE5NTYyOTI0NzQyZGYwNTc1 MGExMzllNy4uZDI5ODJmYmY4YTdjNGQ1NzQxNTRiZmU5N2I0NTljYzQ2OWRhMjE5ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAxLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBzY3JvbGxQb3NpdGlvbihTY3JvbGxi YXIqKSB0byBzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50YXRpb24pCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI2NjYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3JvbGxiYXIgdmFsdWVzIHRha2Ug b2Zmc2V0cyAoemVyby1iYXNlZCksIHNvIHJlbmFtZSB0aGUgYWNjZXNzb3IgdXNlZAorICAgICAg ICBieSBzY3JvbGxiYXJzIHRvIHNldCB0aGVpciB2YWx1ZSwgYW5kIHBhc3MgaW4gYW4gb3JpZW50 YXRpb24sIHJhdGhlciB0aGFuCisgICAgICAgIGEgcG9pbnRlciB0byB0aGUgc2Nyb2xsYmFyLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVkUERGUGx1Z2luLmg6 CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVkUERGUGx1Z2luLm1t OgorICAgICAgICAoV2ViS2l0OjpQREZQbHVnaW46OnNjcm9sbE9mZnNldCk6CisgICAgICAgIChX ZWJLaXQ6OlBERlBsdWdpbjo6c2Nyb2xsUG9zaXRpb24pOiBEZWxldGVkLgorCiAyMDE1LTEyLTMx ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBsYWNlIFdURjo6 bW92ZSB3aXRoIFdURk1vdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5k ZXggYmI3OWFiYTRjZTlkZGYzYzY4MjYyOGJhMzNhYTBkNmY1M2NmNjAwZC4uYzdjMmYzN2VmZTVk MzYzZTc0YmIyMTFjMGZlMmQ0MzViOGQ1OWY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5jcHAKQEAgLTUwOCwxMiArNTA4LDE2IEBAIHZvaWQgU2Nyb2xsVmlldzo6Y29tcGxl dGVVcGRhdGVzQWZ0ZXJTY3JvbGxUbyhjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKICAgICB1 cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Nyb2xsaW5nKCk7CiB9CiAKLWludCBTY3JvbGxW aWV3OjpzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqIHNjcm9sbGJhcikgY29uc3QKK2ludCBTY3Jv bGxWaWV3OjpzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNv bnN0CiB7Ci0gICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Ny b2xsYmFyKQotICAgICAgICByZXR1cm4gc2Nyb2xsUG9zaXRpb24oKS54KCkgKyBzY3JvbGxPcmln aW4oKS54KCk7Ci0gICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbFNj cm9sbGJhcikKLSAgICAgICAgcmV0dXJuIHNjcm9sbFBvc2l0aW9uKCkueSgpICsgc2Nyb2xsT3Jp Z2luKCkueSgpOworICAgIFNjcm9sbE9mZnNldCBvZmZzZXQgPSBzY3JvbGxPZmZzZXRGcm9tUG9z aXRpb24oc2Nyb2xsUG9zaXRpb24oKSk7CisKKyAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpv bnRhbFNjcm9sbGJhcikKKyAgICAgICAgcmV0dXJuIG9mZnNldC54KCk7CisKKyAgICBpZiAob3Jp ZW50YXRpb24gPT0gVmVydGljYWxTY3JvbGxiYXIpCisgICAgICAgIHJldHVybiBvZmZzZXQueSgp OworCiAgICAgcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaApp bmRleCBjMjY5MGVmYmFhMDA2YzcwODdiNjU2MDRkZTlkZjVkOWQ0NTBmYTFmLi43ODg3ZmJhNTA5 NWY4YWQzODgwNjU1NTU1YTdlYWI1ZTVlMjk5Yjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5oCkBAIC02Niw3ICs2Niw3IEBAIHB1YmxpYzoKIAogICAgIC8vIFNjcm9sbGFibGVB cmVhIGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIGludCBzY3JvbGxTaXplKFNjcm9sbGJhck9yaWVu dGF0aW9uKSBjb25zdCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihT Y3JvbGxiYXIqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGludCBzY3JvbGxPZmZzZXQo U2Nyb2xsYmFyT3JpZW50YXRpb24pIGNvbnN0IG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQT1JU IHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxPZmZzZXQoY29uc3QgU2Nyb2xsT2Zmc2V0Jikgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCBib29sIGlzU2Nyb2xsQ29ybmVyVmlzaWJsZSgpIGNvbnN0IG92ZXJy aWRlOwogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxiYXJTdHlsZUNoYW5nZWQoU2Nyb2xsYmFyU3R5 bGUsIGJvb2wgZm9yY2VVcGRhdGUpIG92ZXJyaWRlOwpAQCAtMjYzLDcgKzI2Myw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIEludFNpemUgb3ZlcmhhbmdBbW91bnQoKSBjb25zdCBvdmVycmlkZTsK IAogICAgIHZvaWQgY2FjaGVDdXJyZW50U2Nyb2xsUG9zaXRpb24oKSB7IG1fY2FjaGVkU2Nyb2xs UG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbigpOyB9Ci0gICAgSW50UG9pbnQgY2FjaGVkU2Nyb2xs UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2NhY2hlZFNjcm9sbFBvc2l0aW9uOyB9CisgICAg U2Nyb2xsUG9zaXRpb24gY2FjaGVkU2Nyb2xsUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2Nh Y2hlZFNjcm9sbFBvc2l0aW9uOyB9CiAKICAgICAvLyBGdW5jdGlvbnMgZm9yIHNjcm9sbGluZyB0 aGUgdmlldy4KICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgU2Nyb2xs UG9zaXRpb24mKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFi bGVBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCmluZGV4 IDQyOTVkODQ5MDgyNGE4MjllNmE0NGY4MzYxZWU0NjQwY2RjMzg0M2EuLjUwMzIzMjc1ZTk2NGZl MTc2YzBiYjZkYzk2OWUwMTkyYjMyYzQzZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsYWJsZUFyZWEuaApAQCAtMTQ2LDcgKzE0Niw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg Ym9vbCBpc0FjdGl2ZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGludCBzY3JvbGxTaXplKFNj cm9sbGJhck9yaWVudGF0aW9uKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBpbnQgc2Nyb2xsUG9z aXRpb24oU2Nyb2xsYmFyKikgY29uc3QgPSAwOworICAgIHZpcnR1YWwgaW50IHNjcm9sbE9mZnNl dChTY3JvbGxiYXJPcmllbnRhdGlvbikgY29uc3QgPSAwOwogICAgIFdFQkNPUkVfRVhQT1JUIHZp cnR1YWwgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsYmFyKFNjcm9sbGJhciosIGNvbnN0IEludFJlY3Qm KTsKICAgICB2aXJ0dWFsIGJvb2wgaXNTY3JvbGxDb3JuZXJWaXNpYmxlKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgSW50UmVjdCBzY3JvbGxDb3JuZXJSZWN0KCkgY29uc3QgPSAwOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAKaW5kZXggOGQ4ZWZmODM5NTU0NTBiMzE4NTY5MjRh NmVjMDZmNGU4NDdlMTdlYS4uNGI3MDFjNzgxZmFkMTBiMDE0NmI5NGRkMjg4MzYyZmM1OWEwY2Uw MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuY3BwCkBAIC04Nyw3ICs4Nyw3IEBA IFNjcm9sbGJhcjo6U2Nyb2xsYmFyKFNjcm9sbGFibGVBcmVhJiBzY3JvbGxhYmxlQXJlYSwgU2Ny b2xsYmFyT3JpZW50YXRpb24gb3JpZW50CiAgICAgaW50IHRoaWNrbmVzcyA9IHRoZW1lKCkuc2Ny b2xsYmFyVGhpY2tuZXNzKGNvbnRyb2xTaXplKTsKICAgICBXaWRnZXQ6OnNldEZyYW1lUmVjdChJ bnRSZWN0KDAsIDAsIHRoaWNrbmVzcywgdGhpY2tuZXNzKSk7CiAKLSAgICBtX2N1cnJlbnRQb3Mg PSBzdGF0aWNfY2FzdDxmbG9hdD4obV9zY3JvbGxhYmxlQXJlYS5zY3JvbGxQb3NpdGlvbih0aGlz KSk7CisgICAgbV9jdXJyZW50UG9zID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KG1fc2Nyb2xsYWJsZUFy ZWEuc2Nyb2xsT2Zmc2V0KG1fb3JpZW50YXRpb24pKTsKIH0KIAogU2Nyb2xsYmFyOjp+U2Nyb2xs YmFyKCkKQEAgLTEwOSw3ICsxMDksNyBAQCBpbnQgU2Nyb2xsYmFyOjpvY2N1cGllZEhlaWdodCgp IGNvbnN0CiAKIHZvaWQgU2Nyb2xsYmFyOjpvZmZzZXREaWRDaGFuZ2UoKQogewotICAgIGZsb2F0 IHBvc2l0aW9uID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsUG9z aXRpb24odGhpcykpOworICAgIGZsb2F0IHBvc2l0aW9uID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KG1f c2Nyb2xsYWJsZUFyZWEuc2Nyb2xsT2Zmc2V0KG1fb3JpZW50YXRpb24pKTsKICAgICBpZiAocG9z aXRpb24gPT0gbV9jdXJyZW50UG9zKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDAwMTlmZTU3ZjQ2Mjk1ZjIwZWM3YzI5ZWEy MDEzNDVhMmE0NDQzZDIuLmJkZmVkNTNiMDIwZDE2MWVlZDI4MzgyMDAyYjYyOTFiMWExMTc0ZmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjczNSwxMiAr MjczNSwxNCBAQCB2b2lkIFJlbmRlckxheWVyOjpzZXRTY3JvbGxPZmZzZXQoY29uc3QgU2Nyb2xs T2Zmc2V0JiBvZmZzZXQpCiAgICAgc2Nyb2xsVG8oc2Nyb2xsUG9zaXRpb25Gcm9tT2Zmc2V0KG9m ZnNldCkpOwogfQogCi1pbnQgUmVuZGVyTGF5ZXI6OnNjcm9sbFBvc2l0aW9uKFNjcm9sbGJhciog c2Nyb2xsYmFyKSBjb25zdAoraW50IFJlbmRlckxheWVyOjpzY3JvbGxPZmZzZXQoU2Nyb2xsYmFy T3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNvbnN0CiB7Ci0gICAgaWYgKHNjcm9sbGJhci0+b3Jp ZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQorICAgIGlmIChvcmllbnRhdGlvbiA9 PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQogICAgICAgICByZXR1cm4gc2Nyb2xsT2Zmc2V0KCkueCgp OwotICAgIGlmIChzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gVmVydGljYWxTY3JvbGxiYXIp CisKKyAgICBpZiAob3JpZW50YXRpb24gPT0gVmVydGljYWxTY3JvbGxiYXIpCiAgICAgICAgIHJl dHVybiBzY3JvbGxPZmZzZXQoKS55KCk7CisKICAgICByZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCAzODA1MDllZTQzMDlkMGQyZmQ5ZWM5MGIy NjE4YTM4ZThmZTc4M2VlLi5iZDQ4MTIzYzkzNWI5NGQ4MzExMzA2N2U2YTRjMjMxNGVlODBlZGE4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtODU1LDcgKzg1NSw3 IEBAIHByaXZhdGU6CiAKICAgICBib29sIHNob3VsZEJlU2VsZlBhaW50aW5nTGF5ZXIoKSBjb25z dDsKIAotICAgIHZpcnR1YWwgaW50IHNjcm9sbFBvc2l0aW9uKFNjcm9sbGJhciopIGNvbnN0IG92 ZXJyaWRlOworICAgIHZpcnR1YWwgaW50IHNjcm9sbE9mZnNldChTY3JvbGxiYXJPcmllbnRhdGlv bikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgCiAgICAgLy8gU2Nyb2xsYWJsZUFyZWEgaW50ZXJmYWNl CiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGVTY3JvbGxiYXJSZWN0KFNjcm9sbGJhciosIGNv bnN0IEludFJlY3QmKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMaXN0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM aXN0Qm94LmNwcAppbmRleCA3NjQ1MzliY2FjZWMxMzdmZTM5NTM2NjAwZWMyNzQwMWQ0YjgxZGYx Li4wZTdjNDI4MjE5MmVlNGEwYjdjNWM0ZWRjMDM3MTNjOTI5NzFmYmExIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCkBAIC02MDMsNyArNjAzLDcgQEAgaW50 IFJlbmRlckxpc3RCb3g6OnNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRp b24pIGNvbnN0CiAgICAgcmV0dXJuICgob3JpZW50YXRpb24gPT0gVmVydGljYWxTY3JvbGxiYXIp ICYmIG1fdkJhcikgPyAobV92QmFyLT50b3RhbFNpemUoKSAtIG1fdkJhci0+dmlzaWJsZVNpemUo KSkgOiAwOwogfQogCi1pbnQgUmVuZGVyTGlzdEJveDo6c2Nyb2xsUG9zaXRpb24oU2Nyb2xsYmFy KikgY29uc3QKK2ludCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50 YXRpb24pIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1faW5kZXhPZmZzZXQ7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAppbmRleCAyZjg2OTdhNDQzMDg3ODkxMzAyN2I2 MmE2YjZhMGZmYzEzYjA2NjRiLi5hMmIwNDkyZGJmZmQ1N2RiZmMxZGU4ZWQ4MjY1MjQ4YzJkZmE3 YmU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmgKQEAgLTExMCw3 ICsxMTAsNyBAQCBwcml2YXRlOgogCiAgICAgLy8gU2Nyb2xsYWJsZUFyZWEgaW50ZXJmYWNlLgog ICAgIHZpcnR1YWwgaW50IHNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZW50YXRpb24pIGNvbnN0IG92 ZXJyaWRlOwotICAgIHZpcnR1YWwgaW50IHNjcm9sbFBvc2l0aW9uKFNjcm9sbGJhciopIGNvbnN0 IG92ZXJyaWRlOworICAgIHZpcnR1YWwgaW50IHNjcm9sbE9mZnNldChTY3JvbGxiYXJPcmllbnRh dGlvbikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbE9mZnNldChj b25zdCBTY3JvbGxPZmZzZXQmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFNjcm9sbFBvc2l0aW9u IG1pbmltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgU2Ny b2xsUG9zaXRpb24gbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0RlcHJlY2F0ZWRQ REZQbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvRGVwcmVj YXRlZFBERlBsdWdpbi5oCmluZGV4IDE3MzM0ZDllODhkMzZiZTJmY2I1YzhhNDE2MjY1Y2FiMjhi YWUxNzMuLjMwY2FmNjZiOGM0ZTliMmVhOTllYTJjNzI5MjAxYTc1ZWMyMjQxNjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvRGVwcmVjYXRlZFBERlBs dWdpbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvRGVwcmVj YXRlZFBERlBsdWdpbi5oCkBAIC0xOTYsNyArMTk2LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IGludCBzY3JvbGxTaXplKFdlYkNvcmU6OlNjcm9sbGJhck9yaWVudGF0aW9uKSBjb25zdCBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgaXNBY3RpdmUoKSBjb25zdCBvdmVycmlkZTsKICAgICB2 aXJ0dWFsIGJvb2wgaXNTY3JvbGxDb3JuZXJWaXNpYmxlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1 cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihXZWJDb3JlOjpTY3Jv bGxiYXIqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGludCBzY3JvbGxPZmZzZXQoV2Vi Q29yZTo6U2Nyb2xsYmFyT3JpZW50YXRpb24pIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwg V2ViQ29yZTo6U2Nyb2xsUG9zaXRpb24gc2Nyb2xsUG9zaXRpb24oKSBjb25zdCBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIFdlYkNvcmU6OlNjcm9sbFBvc2l0aW9uIG1pbmltdW1TY3JvbGxQb3NpdGlv bigpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6U2Nyb2xsUG9zaXRpb24g bWF4aW11bVNjcm9sbFBvc2l0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0RlcHJlY2F0ZWRQREZQbHVnaW4ubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0RlcHJlY2F0ZWRQREZQbHVn aW4ubW0KaW5kZXggYTEyZDNmZmVkMDA2ZmFjMmJjODY0NWFmOWUzMmNmMTE1ZWY5NTk5MS4uNTUx ZWYxOTFhNDMwYTE4NmQ2YmQwYTA5ZDBlZWQxOTkyZjFlNWZhZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVkUERGUGx1Z2luLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvRGVwcmVjYXRlZFBERlBs dWdpbi5tbQpAQCAtNzczLDEyICs3NzMsMTQgQEAgYm9vbCBQREZQbHVnaW46OmZvcmNlVXBkYXRl U2Nyb2xsYmFyc09uTWFpblRocmVhZEZvclBlcmZvcm1hbmNlVGVzdGluZygpIGNvbnN0CiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi1pbnQgUERGUGx1Z2luOjpzY3JvbGxQb3NpdGlvbihTY3JvbGxi YXIqIHNjcm9sbGJhcikgY29uc3QKK2ludCBQREZQbHVnaW46OnNjcm9sbE9mZnNldChTY3JvbGxi YXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikgY29uc3QKIHsKLSAgICBpZiAoc2Nyb2xsYmFyLT5v cmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpCisgICAgaWYgKG9yaWVudGF0aW9u ID09IEhvcml6b250YWxTY3JvbGxiYXIpCiAgICAgICAgIHJldHVybiBtX3Njcm9sbE9mZnNldC53 aWR0aCgpOwotICAgIGlmIChzY3JvbGxiYXItPm9yaWVudGF0aW9uKCkgPT0gVmVydGljYWxTY3Jv bGxiYXIpCisKKyAgICBpZiAob3JpZW50YXRpb24gPT0gVmVydGljYWxTY3JvbGxiYXIpCiAgICAg ICAgIHJldHVybiBtX3Njcm9sbE9mZnNldC5oZWlnaHQoKTsKKwogICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogICAgIHJldHVybiAwOwogfQo= 268145 2016-01-03 11:20:35 -0800 2016-01-03 11:24:08 -0800 Patch bug-152666-20160103112002.patch text/plain 12966 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmZiYTAyYjM3N2M1OGQx ZTkyZDc1N2JjMWQ1MzY0Zjk4NDgwZTJiZi4uYzJjNzk2YTRkODU0MzYxMTYyM2FkNTk5MGM0MTg2 NzE1OGI3MjNlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE2LTAxLTAzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJlbmFtZSBzY3Jv bGxQb3NpdGlvbihTY3JvbGxiYXIqKSB0byBzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50YXRp b24pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI2 NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3Jv bGxiYXIgdmFsdWVzIHRha2Ugb2Zmc2V0cyAoemVyby1iYXNlZCksIHNvIHJlbmFtZSB0aGUgYWNj ZXNzb3IgdXNlZAorICAgICAgICBieSBzY3JvbGxiYXJzIHRvIHNldCB0aGVpciB2YWx1ZSwgYW5k IHBhc3MgaW4gYW4gb3JpZW50YXRpb24sIHJhdGhlciB0aGFuCisgICAgICAgIGEgcG9pbnRlciB0 byB0aGUgc2Nyb2xsYmFyLgorCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzY3JvbGxPZmZzZXQpOiBVc2Ugc2Nyb2xsT2Zm c2V0RnJvbVBvc2l0aW9uIHJhdGhlciB0aGFuCisgICAgICAgIG1hbnVhbGx5IGFkZGluZyBzY3Jv bGxPcmlnaW4uCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzY3JvbGxQb3NpdGlvbik6 IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2Vi Q29yZTo6U2Nyb2xsVmlldzo6Y2FjaGVkU2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAqIHBsYXRm b3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcjo6U2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNv cmU6OlNjcm9sbGJhcjo6b2Zmc2V0RGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbE9mZnNl dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsUG9zaXRpb24pOiBEZWxl dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6 OnNjcm9sbE9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0Qm94OjpzY3JvbGxQ b3NpdGlvbik6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaDoK KworMjAxNi0wMS0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwog ICAgICAgICBzY3JvbGxMZWZ0IHJldHVybnMgZGlmZmVyZW50IHZhbHVlcyBmb3Igdmlld3BvcnQg YW5kIG5vbi12aWV3cG9ydCBzY3JvbGxpbmcgd2l0aCBydGwKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0NDA1CiAgICAgICAgIHJkYXI6Ly9wcm9ibGVt LzIxODI5NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmY0MjA0Y2NlYTk1ZDVjNTE5NTYyOTI0NzQyZGYwNTc1 MGExMzllNy4uZDI5ODJmYmY4YTdjNGQ1NzQxNTRiZmU5N2I0NTljYzQ2OWRhMjE5ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAxLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBzY3JvbGxQb3NpdGlvbihTY3JvbGxi YXIqKSB0byBzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50YXRpb24pCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI2NjYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTY3JvbGxiYXIgdmFsdWVzIHRha2Ug b2Zmc2V0cyAoemVyby1iYXNlZCksIHNvIHJlbmFtZSB0aGUgYWNjZXNzb3IgdXNlZAorICAgICAg ICBieSBzY3JvbGxiYXJzIHRvIHNldCB0aGVpciB2YWx1ZSwgYW5kIHBhc3MgaW4gYW4gb3JpZW50 YXRpb24sIHJhdGhlciB0aGFuCisgICAgICAgIGEgcG9pbnRlciB0byB0aGUgc2Nyb2xsYmFyLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVkUERGUGx1Z2luLmg6 CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVkUERGUGx1Z2luLm1t OgorICAgICAgICAoV2ViS2l0OjpQREZQbHVnaW46OnNjcm9sbE9mZnNldCk6CisgICAgICAgIChX ZWJLaXQ6OlBERlBsdWdpbjo6c2Nyb2xsUG9zaXRpb24pOiBEZWxldGVkLgorCiAyMDE1LTEyLTMx ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBsYWNlIFdURjo6 bW92ZSB3aXRoIFdURk1vdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5k ZXggYmI3OWFiYTRjZTlkZGYzYzY4MjYyOGJhMzNhYTBkNmY1M2NmNjAwZC4uYzdjMmYzN2VmZTVk MzYzZTc0YmIyMTFjMGZlMmQ0MzViOGQ1OWY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5jcHAKQEAgLTUwOCwxMiArNTA4LDE2IEBAIHZvaWQgU2Nyb2xsVmlldzo6Y29tcGxl dGVVcGRhdGVzQWZ0ZXJTY3JvbGxUbyhjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSkKICAgICB1 cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Nyb2xsaW5nKCk7CiB9CiAKLWludCBTY3JvbGxW aWV3OjpzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqIHNjcm9sbGJhcikgY29uc3QKK2ludCBTY3Jv bGxWaWV3OjpzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNv bnN0CiB7Ci0gICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Ny b2xsYmFyKQotICAgICAgICByZXR1cm4gc2Nyb2xsUG9zaXRpb24oKS54KCkgKyBzY3JvbGxPcmln aW4oKS54KCk7Ci0gICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbFNj cm9sbGJhcikKLSAgICAgICAgcmV0dXJuIHNjcm9sbFBvc2l0aW9uKCkueSgpICsgc2Nyb2xsT3Jp Z2luKCkueSgpOworICAgIFNjcm9sbE9mZnNldCBvZmZzZXQgPSBzY3JvbGxPZmZzZXRGcm9tUG9z aXRpb24oc2Nyb2xsUG9zaXRpb24oKSk7CisKKyAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpv bnRhbFNjcm9sbGJhcikKKyAgICAgICAgcmV0dXJuIG9mZnNldC54KCk7CisKKyAgICBpZiAob3Jp ZW50YXRpb24gPT0gVmVydGljYWxTY3JvbGxiYXIpCisgICAgICAgIHJldHVybiBvZmZzZXQueSgp OworCiAgICAgcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaApp bmRleCBjMjY5MGVmYmFhMDA2YzcwODdiNjU2MDRkZTlkZjVkOWQ0NTBmYTFmLi43ODg3ZmJhNTA5 NWY4YWQzODgwNjU1NTU1YTdlYWI1ZTVlMjk5Yjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsVmlldy5oCkBAIC02Niw3ICs2Niw3IEBAIHB1YmxpYzoKIAogICAgIC8vIFNjcm9sbGFibGVB cmVhIGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIGludCBzY3JvbGxTaXplKFNjcm9sbGJhck9yaWVu dGF0aW9uKSBjb25zdCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihT Y3JvbGxiYXIqKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGludCBzY3JvbGxPZmZzZXQo U2Nyb2xsYmFyT3JpZW50YXRpb24pIGNvbnN0IG92ZXJyaWRlOwogICAgIFdFQkNPUkVfRVhQT1JU IHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxPZmZzZXQoY29uc3QgU2Nyb2xsT2Zmc2V0Jikgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCBib29sIGlzU2Nyb2xsQ29ybmVyVmlzaWJsZSgpIGNvbnN0IG92ZXJy aWRlOwogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxiYXJTdHlsZUNoYW5nZWQoU2Nyb2xsYmFyU3R5 bGUsIGJvb2wgZm9yY2VVcGRhdGUpIG92ZXJyaWRlOwpAQCAtMjYzLDcgKzI2Myw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIEludFNpemUgb3ZlcmhhbmdBbW91bnQoKSBjb25zdCBvdmVycmlkZTsK IAogICAgIHZvaWQgY2FjaGVDdXJyZW50U2Nyb2xsUG9zaXRpb24oKSB7IG1fY2FjaGVkU2Nyb2xs UG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbigpOyB9Ci0gICAgSW50UG9pbnQgY2FjaGVkU2Nyb2xs UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2NhY2hlZFNjcm9sbFBvc2l0aW9uOyB9CisgICAg U2Nyb2xsUG9zaXRpb24gY2FjaGVkU2Nyb2xsUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX2Nh Y2hlZFNjcm9sbFBvc2l0aW9uOyB9CiAKICAgICAvLyBGdW5jdGlvbnMgZm9yIHNjcm9sbGluZyB0 aGUgdmlldy4KICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgU2Nyb2xs UG9zaXRpb24mKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFi bGVBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCmluZGV4 IDQyOTVkODQ5MDgyNGE4MjllNmE0NGY4MzYxZWU0NjQwY2RjMzg0M2EuLjQ3YmIyNzQ3YTZjZGZl NThjNzE2ZTc3MTgzYjM1ZjZkYWUyOTQ0ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsYWJsZUFyZWEuaApAQCAtMTQ2LDcgKzE0Niw3IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwg Ym9vbCBpc0FjdGl2ZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGludCBzY3JvbGxTaXplKFNj cm9sbGJhck9yaWVudGF0aW9uKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBpbnQgc2Nyb2xsUG9z aXRpb24oU2Nyb2xsYmFyKikgY29uc3QgPSAwOworICAgIHZpcnR1YWwgaW50IHNjcm9sbE9mZnNl dChTY3JvbGxiYXJPcmllbnRhdGlvbikgY29uc3QgPSAwOwogICAgIFdFQkNPUkVfRVhQT1JUIHZp cnR1YWwgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsYmFyKFNjcm9sbGJhciosIGNvbnN0IEludFJlY3Qm KTsKICAgICB2aXJ0dWFsIGJvb2wgaXNTY3JvbGxDb3JuZXJWaXNpYmxlKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgSW50UmVjdCBzY3JvbGxDb3JuZXJSZWN0KCkgY29uc3QgPSAwOwpAQCAtMjgx LDEwICsyODEsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc2VydmljZVNjcm9sbEFuaW1hdGlvbnMo KTsKIAogI2lmIFBMQVRGT1JNKElPUykKLSAgICBib29sIGlzSG9yaXpvbnRhbFNjcm9sbGVyUGlu bmVkVG9NaW5pbXVtUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiAhaG9yaXpvbnRhbFNjcm9sbGJh cigpIHx8IHNjcm9sbFBvc2l0aW9uKGhvcml6b250YWxTY3JvbGxiYXIoKSkgPD0gbWluaW11bVNj cm9sbFBvc2l0aW9uKCkueCgpOyB9Ci0gICAgYm9vbCBpc0hvcml6b250YWxTY3JvbGxlclBpbm5l ZFRvTWF4aW11bVBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gIWhvcml6b250YWxTY3JvbGxiYXIo KSB8fCBzY3JvbGxQb3NpdGlvbihob3Jpem9udGFsU2Nyb2xsYmFyKCkpID49IG1heGltdW1TY3Jv bGxQb3NpdGlvbigpLngoKTsgfQotICAgIGJvb2wgaXNWZXJ0aWNhbFNjcm9sbGVyUGlubmVkVG9N aW5pbXVtUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiAhdmVydGljYWxTY3JvbGxiYXIoKSB8fCBz Y3JvbGxQb3NpdGlvbih2ZXJ0aWNhbFNjcm9sbGJhcigpKSA8PSBtaW5pbXVtU2Nyb2xsUG9zaXRp b24oKS55KCk7IH0KLSAgICBib29sIGlzVmVydGljYWxTY3JvbGxlclBpbm5lZFRvTWF4aW11bVBv c2l0aW9uKCkgY29uc3QgeyByZXR1cm4gIXZlcnRpY2FsU2Nyb2xsYmFyKCkgfHwgc2Nyb2xsUG9z aXRpb24odmVydGljYWxTY3JvbGxiYXIoKSkgPj0gbWF4aW11bVNjcm9sbFBvc2l0aW9uKCkueSgp OyB9IAorICAgIGJvb2wgaXNIb3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01pbmltdW1Qb3NpdGlv bigpIGNvbnN0IHsgcmV0dXJuICFob3Jpem9udGFsU2Nyb2xsYmFyKCkgfHwgc2Nyb2xsT2Zmc2V0 KEhvcml6b250YWxTY3JvbGxiYXIpIDw9IDA7IH0KKyAgICBib29sIGlzSG9yaXpvbnRhbFNjcm9s bGVyUGlubmVkVG9NYXhpbXVtUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiAhaG9yaXpvbnRhbFNj cm9sbGJhcigpIHx8IHNjcm9sbE9mZnNldChIb3Jpem9udGFsU2Nyb2xsYmFyKSA+PSBtYXhpbXVt U2Nyb2xsT2Zmc2V0KCkueCgpOyB9CisgICAgYm9vbCBpc1ZlcnRpY2FsU2Nyb2xsZXJQaW5uZWRU b01pbmltdW1Qb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuICF2ZXJ0aWNhbFNjcm9sbGJhcigpIHx8 IHNjcm9sbE9mZnNldChWZXJ0aWNhbFNjcm9sbGJhcikgPD0gMDsgfQorICAgIGJvb2wgaXNWZXJ0 aWNhbFNjcm9sbGVyUGlubmVkVG9NYXhpbXVtUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiAhdmVy dGljYWxTY3JvbGxiYXIoKSB8fCBzY3JvbGxPZmZzZXQoVmVydGljYWxTY3JvbGxiYXIpID49IG1h eGltdW1TY3JvbGxPZmZzZXQoKS55KCk7IH0KIAogICAgIGJvb2wgaXNQaW5uZWRJbkJvdGhEaXJl Y3Rpb25zKGNvbnN0IEludFNpemUmKSBjb25zdDsgCiAgICAgYm9vbCBpc1Bpbm5lZEhvcml6b250 YWxseUluRGlyZWN0aW9uKGludCBob3Jpem9udGFsU2Nyb2xsRGVsdGEpIGNvbnN0OyAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuY3BwCmluZGV4IDhkOGVmZjgzOTU1NDUwYjMxODU2OTI0 YTZlYzA2ZjRlODQ3ZTE3ZWEuLjRiNzAxYzc4MWZhZDEwYjAxNDZiOTRkZDI4ODM2MmZjNTlhMGNl MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcApAQCAtODcsNyArODcsNyBA QCBTY3JvbGxiYXI6OlNjcm9sbGJhcihTY3JvbGxhYmxlQXJlYSYgc2Nyb2xsYWJsZUFyZWEsIFNj cm9sbGJhck9yaWVudGF0aW9uIG9yaWVudAogICAgIGludCB0aGlja25lc3MgPSB0aGVtZSgpLnNj cm9sbGJhclRoaWNrbmVzcyhjb250cm9sU2l6ZSk7CiAgICAgV2lkZ2V0OjpzZXRGcmFtZVJlY3Qo SW50UmVjdCgwLCAwLCB0aGlja25lc3MsIHRoaWNrbmVzcykpOwogCi0gICAgbV9jdXJyZW50UG9z ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KG1fc2Nyb2xsYWJsZUFyZWEuc2Nyb2xsUG9zaXRpb24odGhp cykpOworICAgIG1fY3VycmVudFBvcyA9IHN0YXRpY19jYXN0PGZsb2F0PihtX3Njcm9sbGFibGVB cmVhLnNjcm9sbE9mZnNldChtX29yaWVudGF0aW9uKSk7CiB9CiAKIFNjcm9sbGJhcjo6flNjcm9s bGJhcigpCkBAIC0xMDksNyArMTA5LDcgQEAgaW50IFNjcm9sbGJhcjo6b2NjdXBpZWRIZWlnaHQo KSBjb25zdAogCiB2b2lkIFNjcm9sbGJhcjo6b2Zmc2V0RGlkQ2hhbmdlKCkKIHsKLSAgICBmbG9h dCBwb3NpdGlvbiA9IHN0YXRpY19jYXN0PGZsb2F0PihtX3Njcm9sbGFibGVBcmVhLnNjcm9sbFBv c2l0aW9uKHRoaXMpKTsKKyAgICBmbG9hdCBwb3NpdGlvbiA9IHN0YXRpY19jYXN0PGZsb2F0Piht X3Njcm9sbGFibGVBcmVhLnNjcm9sbE9mZnNldChtX29yaWVudGF0aW9uKSk7CiAgICAgaWYgKHBv c2l0aW9uID09IG1fY3VycmVudFBvcykKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCAwMDE5ZmU1N2Y0NjI5NWYyMGVjN2MyOWVh MjAxMzQ1YTJhNDQ0M2QyLi5iZGZlZDUzYjAyMGQxNjFlZWQyODM4MjAwMmI2MjkxYjFhMTE3NGZj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTI3MzUsMTIg KzI3MzUsMTQgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFNjcm9s bE9mZnNldCYgb2Zmc2V0KQogICAgIHNjcm9sbFRvKHNjcm9sbFBvc2l0aW9uRnJvbU9mZnNldChv ZmZzZXQpKTsKIH0KIAotaW50IFJlbmRlckxheWVyOjpzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIq IHNjcm9sbGJhcikgY29uc3QKK2ludCBSZW5kZXJMYXllcjo6c2Nyb2xsT2Zmc2V0KFNjcm9sbGJh ck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKSBjb25zdAogewotICAgIGlmIChzY3JvbGxiYXItPm9y aWVudGF0aW9uKCkgPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKKyAgICBpZiAob3JpZW50YXRpb24g PT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKICAgICAgICAgcmV0dXJuIHNjcm9sbE9mZnNldCgpLngo KTsKLSAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsU2Nyb2xsYmFy KQorCisgICAgaWYgKG9yaWVudGF0aW9uID09IFZlcnRpY2FsU2Nyb2xsYmFyKQogICAgICAgICBy ZXR1cm4gc2Nyb2xsT2Zmc2V0KCkueSgpOworCiAgICAgcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggMzgwNTA5ZWU0MzA5ZDBkMmZkOWVjOTBi MjYxOGEzOGU4ZmU3ODNlZS4uYmQ0ODEyM2M5MzViOTRkODMxMTMwNjdlNmE0YzIzMTRlZTgwZWRh OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTg1NSw3ICs4NTUs NyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBzaG91bGRCZVNlbGZQYWludGluZ0xheWVyKCkgY29u c3Q7CiAKLSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqKSBjb25zdCBv dmVycmlkZTsKKyAgICB2aXJ0dWFsIGludCBzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50YXRp b24pIGNvbnN0IG92ZXJyaWRlOwogICAgIAogICAgIC8vIFNjcm9sbGFibGVBcmVhIGludGVyZmFj ZQogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsYmFyUmVjdChTY3JvbGxiYXIqLCBj b25zdCBJbnRSZWN0Jikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGlzdEJveC5jcHAKaW5kZXggNzY0NTM5YmNhY2VjMTM3ZmUzOTUzNjYwMGVjMjc0MDFkNGI4MWRm MS4uMGU3YzQyODIxOTJlZTRhMGI3YzVjNGVkYzAzNzEzYzkyOTcxZmJhMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcApAQCAtNjAzLDcgKzYwMyw3IEBAIGlu dCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxTaXplKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0 aW9uKSBjb25zdAogICAgIHJldHVybiAoKG9yaWVudGF0aW9uID09IFZlcnRpY2FsU2Nyb2xsYmFy KSAmJiBtX3ZCYXIpID8gKG1fdkJhci0+dG90YWxTaXplKCkgLSBtX3ZCYXItPnZpc2libGVTaXpl KCkpIDogMDsKIH0KIAotaW50IFJlbmRlckxpc3RCb3g6OnNjcm9sbFBvc2l0aW9uKFNjcm9sbGJh ciopIGNvbnN0CitpbnQgUmVuZGVyTGlzdEJveDo6c2Nyb2xsT2Zmc2V0KFNjcm9sbGJhck9yaWVu dGF0aW9uKSBjb25zdAogewogICAgIHJldHVybiBtX2luZGV4T2Zmc2V0OwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmgKaW5kZXggMmY4Njk3YTQ0MzA4Nzg5MTMwMjdi NjJhNmI2YTBmZmMxM2IwNjY0Yi4uYTJiMDQ5MmRiZmZkNTdkYmZjMWRlOGVkODI2NTI0OGMyZGZh N2JlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3gu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCkBAIC0xMTAs NyArMTEwLDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIFNjcm9sbGFibGVBcmVhIGludGVyZmFjZS4K ICAgICB2aXJ0dWFsIGludCBzY3JvbGxTaXplKFNjcm9sbGJhck9yaWVudGF0aW9uKSBjb25zdCBv dmVycmlkZTsKLSAgICB2aXJ0dWFsIGludCBzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqKSBjb25z dCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGludCBzY3JvbGxPZmZzZXQoU2Nyb2xsYmFyT3JpZW50 YXRpb24pIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxPZmZzZXQo Y29uc3QgU2Nyb2xsT2Zmc2V0Jikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBTY3JvbGxQb3NpdGlv biBtaW5pbXVtU2Nyb2xsUG9zaXRpb24oKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFNj cm9sbFBvc2l0aW9uIG1heGltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0IG92ZXJyaWRlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVk UERGUGx1Z2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0RlcHJl Y2F0ZWRQREZQbHVnaW4uaAppbmRleCAxNzMzNGQ5ZTg4ZDM2YmUyZmNiNWM4YTQxNjI2NWNhYjI4 YmFlMTczLi4zMGNhZjY2YjhjNGU5YjJlYTk5ZWEyYzcyOTIwMWE3NWVjMjI0MTY2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0RlcHJlY2F0ZWRQREZQ bHVnaW4uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0RlcHJl Y2F0ZWRQREZQbHVnaW4uaApAQCAtMTk2LDcgKzE5Niw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVh bCBpbnQgc2Nyb2xsU2l6ZShXZWJDb3JlOjpTY3JvbGxiYXJPcmllbnRhdGlvbikgY29uc3Qgb3Zl cnJpZGU7CiAgICAgdmlydHVhbCBib29sIGlzQWN0aXZlKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAg dmlydHVhbCBib29sIGlzU2Nyb2xsQ29ybmVyVmlzaWJsZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0 dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBpbnQgc2Nyb2xsUG9zaXRpb24oV2ViQ29yZTo6U2Ny b2xsYmFyKikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBpbnQgc2Nyb2xsT2Zmc2V0KFdl YkNvcmU6OlNjcm9sbGJhck9yaWVudGF0aW9uKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFs IFdlYkNvcmU6OlNjcm9sbFBvc2l0aW9uIHNjcm9sbFBvc2l0aW9uKCkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCBXZWJDb3JlOjpTY3JvbGxQb3NpdGlvbiBtaW5pbXVtU2Nyb2xsUG9zaXRp b24oKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OlNjcm9sbFBvc2l0aW9u IG1heGltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVkUERGUGx1Z2luLm1t IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9EZXByZWNhdGVkUERGUGx1 Z2luLm1tCmluZGV4IGExMmQzZmZlZDAwNmZhYzJiYzg2NDVhZjllMzJjZjExNWVmOTU5OTEuLjU1 MWVmMTkxYTQzMGExODZkNmJkMGEwOWQwZWVkMTk5MmYxZTVmYWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvRGVwcmVjYXRlZFBERlBsdWdpbi5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL0RlcHJlY2F0ZWRQREZQ bHVnaW4ubW0KQEAgLTc3MywxMiArNzczLDE0IEBAIGJvb2wgUERGUGx1Z2luOjpmb3JjZVVwZGF0 ZVNjcm9sbGJhcnNPbk1haW5UaHJlYWRGb3JQZXJmb3JtYW5jZVRlc3RpbmcoKSBjb25zdAogICAg IHJldHVybiBmYWxzZTsKIH0KIAotaW50IFBERlBsdWdpbjo6c2Nyb2xsUG9zaXRpb24oU2Nyb2xs YmFyKiBzY3JvbGxiYXIpIGNvbnN0CitpbnQgUERGUGx1Z2luOjpzY3JvbGxPZmZzZXQoU2Nyb2xs YmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNvbnN0CiB7Ci0gICAgaWYgKHNjcm9sbGJhci0+ b3JpZW50YXRpb24oKSA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQorICAgIGlmIChvcmllbnRhdGlv biA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQogICAgICAgICByZXR1cm4gbV9zY3JvbGxPZmZzZXQu d2lkdGgoKTsKLSAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigpID09IFZlcnRpY2FsU2Ny b2xsYmFyKQorCisgICAgaWYgKG9yaWVudGF0aW9uID09IFZlcnRpY2FsU2Nyb2xsYmFyKQogICAg ICAgICByZXR1cm4gbV9zY3JvbGxPZmZzZXQuaGVpZ2h0KCk7CisKICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKICAgICByZXR1cm4gMDsKIH0K