165697 2016-12-09 15:58:47 -0800 Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible 2017-01-03 00:51:32 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue jonlee thorton webkit-bug-importer oldest_to_newest 1258430 0 jer.noble 2016-12-09 15:58:47 -0800 Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible 1258431 1 296729 jer.noble 2016-12-09 15:59:23 -0800 Created attachment 296729 Patch 1258574 2 296729 darin 2016-12-09 21:15:36 -0800 Comment on attachment 296729 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296729&action=review No way to regression-test? > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:421 > + _page->setTopContentInset(_savedTopContentInset); Can we make this share some code? At least three lines of this code are identical to part of finishedEnterFullScreenAnimation: and all five lines are the same although for some reason they are not in the same order here and there. We should make the two methods share as much as possible, to help us avoid bugs like this one. 1259127 3 296935 jer.noble 2016-12-12 11:08:03 -0800 Created attachment 296935 Patch 1259219 4 296952 jer.noble 2016-12-12 14:49:51 -0800 Created attachment 296952 Patch 1259238 5 296952 thorton 2016-12-12 15:35:14 -0800 Comment on attachment 296952 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296952&action=review > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:521 > + if ([_webView isKindOfClass:[WKWebView class]]) { This should go through PageClient and be implemented in WebViewImpl for Mac. 1259240 6 jer.noble 2016-12-12 15:39:34 -0800 (In reply to comment #5) > Comment on attachment 296952 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=296952&action=review > > > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:521 > > + if ([_webView isKindOfClass:[WKWebView class]]) { > > This should go through PageClient and be implemented in WebViewImpl for Mac. Tim told me (in person) to ignore the fact he said this. 1259273 7 296970 jer.noble 2016-12-12 16:52:40 -0800 Created attachment 296970 Patch 1259434 8 296970 thorton 2016-12-13 10:24:50 -0800 Comment on attachment 296970 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296970&action=review > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h:63 > + bool _savedAutomaticallyAdjustsContentInsets; Don't think you use this anymore? > Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm:61 > + [webView _setAutomaticallyAdjustsContentInsets:NO]; Do you still need this? I don't think it's on by default, is it? 1259437 9 jer.noble 2016-12-13 10:26:21 -0800 (In reply to comment #8) > Comment on attachment 296970 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=296970&action=review > > > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h:63 > > + bool _savedAutomaticallyAdjustsContentInsets; > > Don't think you use this anymore? Good point. > > Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm:61 > > + [webView _setAutomaticallyAdjustsContentInsets:NO]; > > Do you still need this? I don't think it's on by default, is it? It is on Mac. Thanks! 1259438 10 297020 jer.noble 2016-12-13 10:28:57 -0800 Created attachment 297020 Patch for landing 1259442 11 297022 jer.noble 2016-12-13 10:33:43 -0800 Created attachment 297022 Patch for landing 1259443 12 jonlee 2016-12-13 10:37:22 -0800 rdar://problem/27954473 1259564 13 297022 commit-queue 2016-12-13 15:37:50 -0800 Comment on attachment 297022 Patch for landing Clearing flags on attachment: 297022 Committed r209782: <http://trac.webkit.org/changeset/209782> 296729 2016-12-09 15:59:23 -0800 2016-12-12 11:08:01 -0800 Patch bug-165697-20161209155840.patch text/plain 1548 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmUxN2ZmN2MwYzJlMmVi YzdjYzZhNzJmMzkxYWJkMWQzYTZjN2Y1Ni4uZDVlMTQ5ZjI4OGM3ZDI2MmVhODdmM2JmZDZjNTQ3 MDY2ZmQ5MzA4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTEyLTA5ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4gaW4gV2Vi S2l0MiBkb2VzIG5vdCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7IGxlYXZl cyB0b3Agb2YgcGFnZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY1Njk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRy b2xsZXIubW06CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNo ZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKToKKwogMjAxNi0xMi0wOCAgS2VpdGggUm9sbGlu ICA8a3JvbGxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBGaWxlSGFuZGxlIHRvIFdlYkNv cmUgRmlsZUhhbmRsZS5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFj L1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KaW5kZXggMmVmMWRkNjQwZDli ZTdhODhmMWFhYmFlZGY5YWU1ZTY0MjQ1ODRmNC4uZmQ0ZTM2MDZjNmYyNmM4MDlhZTYwZjk1ZDAz YzFjMTE2OWM5NjM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X S0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQpAQCAtNDE4LDYgKzQxOCw3 IEBAIHN0YXRpYyBjb25zdCBmbG9hdCBtaW5WaWRlb1dpZHRoID0gNDgwICsgMjAgKyAyMDsgLy8g Tm90ZTogS2VlcCBpbiBzeW5jIHdpdGggbWVkCiAgICAgW3NlbGYgX21hbmFnZXJdLT5zZXRBbmlt YXRpbmdGdWxsU2NyZWVuKGZhbHNlKTsKICAgICBfcGFnZS0+c2NhbGVQYWdlKF9zYXZlZFNjYWxl LCBJbnRQb2ludCgpKTsKICAgICBbc2VsZiBfbWFuYWdlcl0tPnJlc3RvcmVTY3JvbGxQb3NpdGlv bigpOworICAgIF9wYWdlLT5zZXRUb3BDb250ZW50SW5zZXQoX3NhdmVkVG9wQ29udGVudEluc2V0 KTsKIAogICAgIGlmIChfcmVwYWludENhbGxiYWNrKSB7CiAgICAgICAgIF9yZXBhaW50Q2FsbGJh Y2stPmludmFsaWRhdGUoV2ViS2l0OjpDYWxsYmFja0Jhc2U6OkVycm9yOjpPd25lcldhc0ludmFs aWRhdGVkKTsK 296935 2016-12-12 11:08:03 -0800 2016-12-12 14:49:47 -0800 Patch bug-165697-20161212110719.patch text/plain 8681 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmUxN2ZmN2MwYzJlMmVi YzdjYzZhNzJmMzkxYWJkMWQzYTZjN2Y1Ni4uNzQ5OWZjNmE2ZjAyOTYzYTgxYWJkMDFkMzJhYzk1 YzM5NzE0ZDhkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTEyLTEyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4gaW4gV2Vi S2l0MiBkb2VzIG5vdCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7IGxlYXZl cyB0b3Agb2YgcGFnZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY1Njk3CisKKyAgICAgICAgVXNlIFdLV2ViVmlldyBvciBXS1Zp ZXcgU1BJcyB0byBzZXQgdGhlIHRvcCBjb250ZW50IGluc2V0IHJhdGhlciB0aGFuIGNhbGxpbmcg V2ViUGFnZVByb3h5CisgICAgICAgIGRpcmVjdGx5LCB0byBlbmFibGUgQVBJIHRlc3RzIHRvIGJl IHdyaXR0ZW4gZm9yIHRoaXMgZmVhdHVyZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBlbnRl ckZ1bGxTY3JlZW46XSk6CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIg ZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb246XSk6CisgICAgICAgICgtW1dLRnVsbFNj cmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKToK KyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBfc2F2ZVRvcENvbnRlbnRJ bnNldF0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIF9yZXN0b3Jl VG9wQ29udGVudEluc2V0XSk6CisKIDIwMTYtMTItMDggIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5A YXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgRmlsZUhhbmRsZSB0byBXZWJDb3JlIEZpbGVIYW5k bGUuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3Jl ZW5XaW5kb3dDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuaAppbmRleCAzNGVjYmIwOWFmMjU1ZDI2Y2EwNDYyODAz OWE1YzU4MTE2YjE1MjQ4Li5mMjgyODNhYTliNjM2YThhOGFmZDJlNTJiZjVlNzQ2ZjEzYThjZTUw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuaApAQCAtNjAsNiArNjAsNyBAQCB0eXBlZGVmIGVudW0g RnVsbFNjcmVlblN0YXRlIDogTlNJbnRlZ2VyIEZ1bGxTY3JlZW5TdGF0ZTsKICAgICBkb3VibGUg X3NhdmVkU2NhbGU7CiAgICAgUmVmUHRyPFdlYktpdDo6Vm9pZENhbGxiYWNrPiBfcmVwYWludENh bGxiYWNrOwogICAgIGZsb2F0IF9zYXZlZFRvcENvbnRlbnRJbnNldDsKKyAgICBib29sIF9zYXZl ZEF1dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVudEluc2V0czsKIH0KIAogQHByb3BlcnR5IChyZWFk b25seSkgTlNSZWN0IGluaXRpYWxGcmFtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQppbmRleCAy ZWYxZGQ2NDBkOWJlN2E4OGYxYWFiYWVkZjlhZTVlNjQyNDU4NGY0Li5kZjIyNjZhNDI4NjIwM2Y0 ZGZmMTQ0OTQzOTYyNmNlN2UxNDcxZmJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCkBAIC0z Myw2ICszMyw3IEBACiAjaW1wb3J0ICJXS0FQSUNhc3QuaCIKICNpbXBvcnQgIldLVmlld0ludGVy bmFsLmgiCiAjaW1wb3J0ICJXS1ZpZXdQcml2YXRlLmgiCisjaW1wb3J0ICJXS1dlYlZpZXdQcml2 YXRlLmgiCiAjaW1wb3J0ICJXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5LmgiCiAjaW1wb3J0ICJX ZWJQYWdlUHJveHkuaCIKICNpbXBvcnQgPFF1YXJ0ekNvcmUvUXVhcnR6Q29yZS5oPgpAQCAtNjUs NiArNjYsOCBAQCBlbnVtIEZ1bGxTY3JlZW5TdGF0ZSA6IE5TSW50ZWdlciB7CiBAZW5kCiAKIEBp bnRlcmZhY2UgV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciAoUHJpdmF0ZSkgPE5TQW5pbWF0 aW9uRGVsZWdhdGU+CistICh2b2lkKV9zYXZlVG9wQ29udGVudEluc2V0OworLSAodm9pZClfcmVz dG9yZVRvcENvbnRlbnRJbnNldDsKIC0gKHZvaWQpX3JlcGxhY2VWaWV3OihOU1ZpZXcqKXZpZXcg d2l0aDooTlNWaWV3KilvdGhlclZpZXc7CiAtIChXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5Kilf bWFuYWdlcjsKIC0gKHZvaWQpX3N0YXJ0RW50ZXJGdWxsU2NyZWVuQW5pbWF0aW9uV2l0aER1cmF0 aW9uOihOU1RpbWVJbnRlcnZhbClkdXJhdGlvbjsKQEAgLTIzMSw4ICsyMzQsNyBAQCBzdGF0aWMg UmV0YWluUHRyPENHSW1hZ2VSZWY+IGNyZWF0ZUltYWdlV2l0aENvcGllZERhdGEoQ0dJbWFnZVJl ZiBzb3VyY2VJbWFnZSkKIAogICAgIE5TUmVzcG9uZGVyICp3ZWJXaW5kb3dGaXJzdFJlc3BvbmRl ciA9IFtbX3dlYlZpZXcgd2luZG93XSBmaXJzdFJlc3BvbmRlcl07CiAgICAgW3NlbGYgX21hbmFn ZXJdLT5zYXZlU2Nyb2xsUG9zaXRpb24oKTsKLSAgICBfc2F2ZWRUb3BDb250ZW50SW5zZXQgPSBf cGFnZS0+dG9wQ29udGVudEluc2V0KCk7Ci0gICAgX3BhZ2UtPnNldFRvcENvbnRlbnRJbnNldCgw KTsKKyAgICBbc2VsZiBfc2F2ZVRvcENvbnRlbnRJbnNldF07CiAgICAgW1tzZWxmIHdpbmRvd10g c2V0RnJhbWU6c2NyZWVuRnJhbWUgZGlzcGxheTpOT107CiAKICAgICAvLyBQYWludGluZyBpcyBu b3JtYWxseSBzdXNwZW5kZWQgd2hlbiB0aGUgV0tWaWV3IGlzIHJlbW92ZWQgZnJvbSB0aGUgd2lu ZG93LCBidXQgdGhpcyBpcwpAQCAtMjUyLDkgKzI1NCw4IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dJ bWFnZVJlZj4gY3JlYXRlSW1hZ2VXaXRoQ29waWVkRGF0YShDR0ltYWdlUmVmIHNvdXJjZUltYWdl KQogICAgIFtzZWxmIF9yZXBsYWNlVmlldzpfd2ViVmlldyB3aXRoOl93ZWJWaWV3UGxhY2Vob2xk ZXIuZ2V0KCldOwogICAgIAogICAgIC8vIFRoZW4gaW5zZXJ0IHRoZSBXZWJWaWV3IGludG8gdGhl IGZ1bGwgc2NyZWVuIHdpbmRvdwotICAgIE5TVmlldyAqY29udGVudFZpZXcgPSBbW3NlbGYgd2lu ZG93XSBjb250ZW50Vmlld107CiAgICAgW19jbGlwVmlldyBhZGRTdWJ2aWV3Ol93ZWJWaWV3IHBv c2l0aW9uZWQ6TlNXaW5kb3dCZWxvdyByZWxhdGl2ZVRvOm5pbF07Ci0gICAgX3dlYlZpZXcuZnJh bWUgPSBOU0luc2V0UmVjdChjb250ZW50Vmlldy5ib3VuZHMsIDAsIC1fcGFnZS0+dG9wQ29udGVu dEluc2V0KCkpOworICAgIF93ZWJWaWV3LmZyYW1lID0gc2VsZi53aW5kb3cuY29udGVudFZpZXcu Ym91bmRzOwogCiAgICAgbWFrZVJlc3BvbmRlckZpcnN0UmVzcG9uZGVySWZEZXNjZW5kYW50T2ZW aWV3KHNlbGYud2luZG93LCB3ZWJXaW5kb3dGaXJzdFJlc3BvbmRlciwgX3dlYlZpZXcpOwogCkBA IC0zMjAsNyArMzIxLDcgQEAgc3RhdGljIGNvbnN0IGZsb2F0IG1pblZpZGVvV2lkdGggPSA0ODAg KyAyMCArIDIwOyAvLyBOb3RlOiBLZWVwIGluIHN5bmMgd2l0aCBtZWQKIAogICAgICAgICBfcGFn ZS0+c2NhbGVQYWdlKF9zYXZlZFNjYWxlLCBJbnRQb2ludCgpKTsKICAgICAgICAgW3NlbGYgX21h bmFnZXJdLT5yZXN0b3JlU2Nyb2xsUG9zaXRpb24oKTsKLSAgICAgICAgX3BhZ2UtPnNldFRvcENv bnRlbnRJbnNldChfc2F2ZWRUb3BDb250ZW50SW5zZXQpOworICAgICAgICBbc2VsZiBfcmVzdG9y ZVRvcENvbnRlbnRJbnNldF07CiAgICAgICAgIFtzZWxmIF9tYW5hZ2VyXS0+ZGlkRXhpdEZ1bGxT Y3JlZW4oKTsKICAgICAgICAgW3NlbGYgX21hbmFnZXJdLT5zZXRBbmltYXRpbmdGdWxsU2NyZWVu KGZhbHNlKTsKICAgICB9CkBAIC00MTgsNiArNDE5LDcgQEAgc3RhdGljIGNvbnN0IGZsb2F0IG1p blZpZGVvV2lkdGggPSA0ODAgKyAyMCArIDIwOyAvLyBOb3RlOiBLZWVwIGluIHN5bmMgd2l0aCBt ZWQKICAgICBbc2VsZiBfbWFuYWdlcl0tPnNldEFuaW1hdGluZ0Z1bGxTY3JlZW4oZmFsc2UpOwog ICAgIF9wYWdlLT5zY2FsZVBhZ2UoX3NhdmVkU2NhbGUsIEludFBvaW50KCkpOwogICAgIFtzZWxm IF9tYW5hZ2VyXS0+cmVzdG9yZVNjcm9sbFBvc2l0aW9uKCk7CisgICAgW3NlbGYgX3Jlc3RvcmVU b3BDb250ZW50SW5zZXRdOwogCiAgICAgaWYgKF9yZXBhaW50Q2FsbGJhY2spIHsKICAgICAgICAg X3JlcGFpbnRDYWxsYmFjay0+aW52YWxpZGF0ZShXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3I6 Ok93bmVyV2FzSW52YWxpZGF0ZWQpOwpAQCAtNTE2LDYgKzUxOCw0MCBAQCBzdGF0aWMgY29uc3Qg ZmxvYXQgbWluVmlkZW9XaWR0aCA9IDQ4MCArIDIwICsgMjA7IC8vIE5vdGU6IEtlZXAgaW4gc3lu YyB3aXRoIG1lZAogICAgIHJldHVybiBfcGFnZS0+ZnVsbFNjcmVlbk1hbmFnZXIoKTsKIH0KIAor LSAodm9pZClfc2F2ZVRvcENvbnRlbnRJbnNldAoreworICAgIGlmIChbX3dlYlZpZXcgaXNLaW5k T2ZDbGFzczpbV0tXZWJWaWV3IGNsYXNzXV0pIHsKKyAgICAgICAgV0tXZWJWaWV3ICp3ZWJWaWV3 ID0gKFdLV2ViVmlldyAqKV93ZWJWaWV3OworICAgICAgICBfc2F2ZWRUb3BDb250ZW50SW5zZXQg PSB3ZWJWaWV3Ll90b3BDb250ZW50SW5zZXQ7CisgICAgICAgIF9zYXZlZEF1dG9tYXRpY2FsbHlB ZGp1c3RzQ29udGVudEluc2V0cyA9IHdlYlZpZXcuX2F1dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVu dEluc2V0czsKKyAgICAgICAgd2ViVmlldy5fYXV0b21hdGljYWxseUFkanVzdHNDb250ZW50SW5z ZXRzID0gTk87CisgICAgICAgIHdlYlZpZXcuX3RvcENvbnRlbnRJbnNldCA9IDA7CisgICAgfQor CisgICAgaWYgKFtfd2ViVmlldyBpc0tpbmRPZkNsYXNzOltXS1ZpZXcgY2xhc3NdXSkgeworICAg ICAgICBXS1ZpZXcgKndlYlZpZXcgPSAoV0tWaWV3ICopX3dlYlZpZXc7CisgICAgICAgIF9zYXZl ZFRvcENvbnRlbnRJbnNldCA9IHdlYlZpZXcuX3RvcENvbnRlbnRJbnNldDsKKyAgICAgICAgX3Nh dmVkQXV0b21hdGljYWxseUFkanVzdHNDb250ZW50SW5zZXRzID0gd2ViVmlldy5fYXV0b21hdGlj YWxseUFkanVzdHNDb250ZW50SW5zZXRzOworICAgICAgICB3ZWJWaWV3Ll9hdXRvbWF0aWNhbGx5 QWRqdXN0c0NvbnRlbnRJbnNldHMgPSBOTzsKKyAgICAgICAgd2ViVmlldy5fdG9wQ29udGVudElu c2V0ID0gMDsKKyAgICB9Cit9CisKKy0gKHZvaWQpX3Jlc3RvcmVUb3BDb250ZW50SW5zZXQKK3sK KyAgICBpZiAoW193ZWJWaWV3IGlzS2luZE9mQ2xhc3M6W1dLV2ViVmlldyBjbGFzc11dKSB7Cisg ICAgICAgIFdLV2ViVmlldyAqd2ViVmlldyA9IChXS1dlYlZpZXcgKilfd2ViVmlldzsKKyAgICAg ICAgd2ViVmlldy5fdG9wQ29udGVudEluc2V0ID0gX3NhdmVkVG9wQ29udGVudEluc2V0OworICAg ICAgICB3ZWJWaWV3Ll9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHMgPSBfc2F2ZWRB dXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHM7CisgICAgfQorCisgICAgaWYgKFtfd2Vi VmlldyBpc0tpbmRPZkNsYXNzOltXS1ZpZXcgY2xhc3NdXSkgeworICAgICAgICBXS1ZpZXcgKndl YlZpZXcgPSAoV0tWaWV3ICopX3dlYlZpZXc7CisgICAgICAgIHdlYlZpZXcuX3RvcENvbnRlbnRJ bnNldCA9IF9zYXZlZFRvcENvbnRlbnRJbnNldDsKKyAgICAgICAgd2ViVmlldy5fYXV0b21hdGlj YWxseUFkanVzdHNDb250ZW50SW5zZXRzID0gX3NhdmVkQXV0b21hdGljYWxseUFkanVzdHNDb250 ZW50SW5zZXRzOworICAgIH0KK30KKwogLSAodm9pZClfcmVwbGFjZVZpZXc6KE5TVmlldyopdmll dyB3aXRoOihOU1ZpZXcqKW90aGVyVmlldwogewogICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYWM2 NzE1NjA4NDI5N2I2MjZmZmVjZjIwOGZmNzcyM2Y5ZjQzM2JhLi4zNDVhN2VlMzUxNjY1YWZlNmM0 NjU5OWIwYjUwZjI2ZWMyOGQyYjY1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMTItMTIgIEplciBOb2JsZSAg PGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgRnVsbHNjcmVlbiBpbiBXZWJLaXQyIGRv ZXMgbm90IHJlc3RvcmUgdG9wQ29udGVudEluc2V0IHVwb24gZXhpdGluZzsgbGVhdmVzIHRvcCBv ZiBwYWdlIG5vdCB2aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjU2OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL0Z1bGxzY3JlZW5U b3BDb250ZW50SW5zZXQubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAx Ni0xMi0wOCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAg ICBBZGQgNjQtYml0IHNpZ25lZCBMRUIgZGVjb2RlIG1ldGhvZApkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVlblRvcENvbnRlbnRJbnNl dC5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL0Z1bGxzY3JlZW5U b3BDb250ZW50SW5zZXQubW0KaW5kZXggMDFmNmU4ODkzYzFmMzcyNzNmNzk4MDIzNzc4Y2RjNTIx ZWViZDM4Zi4uZDExYzgwYWM2ZTRkZTMyZmE2MWJlZjNlMmQ4NzI5MzEwN2I2MmQxMCAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVlblRv cENvbnRlbnRJbnNldC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJD b2NvYS9GdWxsc2NyZWVuVG9wQ29udGVudEluc2V0Lm1tCkBAIC01OCw2ICs1OCw3IEBAIFRFU1Qo RnVsbHNjcmVlbiwgVG9wQ29udGVudEluc2V0KQogICAgIFJldGFpblB0cjxXS1dlYlZpZXdDb25m aWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gYWxsb2NdIGluaXRdKTsKICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3PiB3ZWJWaWV3ID0gYWRv cHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDEw MCwgMTAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKICAgICBbd2ViVmll dyBfc2V0VG9wQ29udGVudEluc2V0OjEwXTsKKyAgICBbd2ViVmlldyBfc2V0QXV0b21hdGljYWxs eUFkanVzdHNDb250ZW50SW5zZXRzOk5PXTsKICAgICBbY29uZmlndXJhdGlvbiBwcmVmZXJlbmNl c10uX2Z1bGxTY3JlZW5FbmFibGVkID0gWUVTOwogICAgIFJldGFpblB0cjxGdWxsc2NyZWVuQ2hh bmdlTWVzc2FnZUhhbmRsZXI+IGhhbmRsZXIgPSBhZG9wdE5TKFtbRnVsbHNjcmVlbkNoYW5nZU1l c3NhZ2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CiAgICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250 ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBuYW1l OkAiZnVsbHNjcmVlbkNoYW5nZUhhbmRsZXIiXTsKQEAgLTc1LDYgKzc2LDExIEBAIFRFU1QoRnVs bHNjcmVlbiwgVG9wQ29udGVudEluc2V0KQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigm cmVjZWl2ZWRGdWxsc2NyZWVuQ2hhbmdlTWVzc2FnZSk7CiAgICAgQVNTRVJUX0VRKHdpbmRvdy5n ZXQoKS5zY3JlZW4uZnJhbWUuc2l6ZS53aWR0aCwgd2ViVmlldy5nZXQoKS5mcmFtZS5zaXplLndp ZHRoKTsKICAgICBBU1NFUlRfRVEod2luZG93LmdldCgpLnNjcmVlbi5mcmFtZS5zaXplLmhlaWdo dCArIHdlYlZpZXcuZ2V0KCkuX3RvcENvbnRlbnRJbnNldCwgd2ViVmlldy5nZXQoKS5mcmFtZS5z aXplLmhlaWdodCk7CisKKyAgICByZWNlaXZlZEZ1bGxzY3JlZW5DaGFuZ2VNZXNzYWdlID0gZmFs c2U7CisgICAgW3dlYlZpZXcgbW91c2VEb3duOmV2ZW50XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJnJlY2VpdmVkRnVsbHNjcmVlbkNoYW5nZU1lc3NhZ2UpOworICAgIEFTU0VSVF9F USgxMCwgd2ViVmlldy5nZXQoKS5fdG9wQ29udGVudEluc2V0KTsKIH0KIAogfSAvLyBuYW1lc3Bh Y2UgVGVzdFdlYktpdEFQSQo= 296952 2016-12-12 14:49:51 -0800 2016-12-12 16:52:37 -0800 Patch bug-165697-20161212144906.patch text/plain 8725 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGFiODU2NjljOGJkZGRi N2NiMjBmOThjNTk5NzFhY2FjZTM2MzNmZC4uZDA1Y2RlMmQxMWZkZTI4MGFlNDJjMzBjYWZlYWM5 YWNiZDMyZDNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTEyLTEyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4gaW4gV2Vi S2l0MiBkb2VzIG5vdCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7IGxlYXZl cyB0b3Agb2YgcGFnZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY1Njk3CisKKyAgICAgICAgVXNlIFdLV2ViVmlldyBvciBXS1Zp ZXcgU1BJcyB0byBzZXQgdGhlIHRvcCBjb250ZW50IGluc2V0IHJhdGhlciB0aGFuIGNhbGxpbmcg V2ViUGFnZVByb3h5CisgICAgICAgIGRpcmVjdGx5LCB0byBlbmFibGUgQVBJIHRlc3RzIHRvIGJl IHdyaXR0ZW4gZm9yIHRoaXMgZmVhdHVyZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBlbnRl ckZ1bGxTY3JlZW46XSk6CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIg ZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb246XSk6CisgICAgICAgICgtW1dLRnVsbFNj cmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKToK KyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBfc2F2ZVRvcENvbnRlbnRJ bnNldF0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIF9yZXN0b3Jl VG9wQ29udGVudEluc2V0XSk6CisKIDIwMTYtMTItMTEgIEtvbnN0YW50aW4gVG9rYXJldiAgPGFu bnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFVucmV2aWV3ZWQgYXR0ZW1wdCB0byBmaXggRUZM IGFuZCBNYWMvY21ha2UgYnVpbGRzIGFmdGVyIHIyMDk2NjUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5o CmluZGV4IDM0ZWNiYjA5YWYyNTVkMjZjYTA0NjI4MDM5YTVjNTgxMTZiMTUyNDguLmYyODI4M2Fh OWI2MzZhOGE4YWZkMmU1MmJmNWU3NDZmMTNhOGNlNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5o CkBAIC02MCw2ICs2MCw3IEBAIHR5cGVkZWYgZW51bSBGdWxsU2NyZWVuU3RhdGUgOiBOU0ludGVn ZXIgRnVsbFNjcmVlblN0YXRlOwogICAgIGRvdWJsZSBfc2F2ZWRTY2FsZTsKICAgICBSZWZQdHI8 V2ViS2l0OjpWb2lkQ2FsbGJhY2s+IF9yZXBhaW50Q2FsbGJhY2s7CiAgICAgZmxvYXQgX3NhdmVk VG9wQ29udGVudEluc2V0OworICAgIGJvb2wgX3NhdmVkQXV0b21hdGljYWxseUFkanVzdHNDb250 ZW50SW5zZXRzOwogfQogCiBAcHJvcGVydHkgKHJlYWRvbmx5KSBOU1JlY3QgaW5pdGlhbEZyYW1l OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5X aW5kb3dDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCmluZGV4IGVjZjI1MjYyNTZjNDY5MGY4N2VlNGEwM2E5 ZmEzNDIyNTE5MDJmZDYuLjY3OGQ0YjQwNmUyY2Q1MTY1ODM1YzQ1YzI0Yjc1OWVlYWJhZmRiMDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2lu ZG93Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTMzLDYgKzMzLDcgQEAKICNpbXBvcnQgIldL QVBJQ2FzdC5oIgogI2ltcG9ydCAiV0tWaWV3SW50ZXJuYWwuaCIKICNpbXBvcnQgIldLVmlld1By aXZhdGUuaCIKKyNpbXBvcnQgIldLV2ViVmlld1ByaXZhdGUuaCIKICNpbXBvcnQgIldlYkZ1bGxT Y3JlZW5NYW5hZ2VyUHJveHkuaCIKICNpbXBvcnQgIldlYlBhZ2VQcm94eS5oIgogI2ltcG9ydCA8 UXVhcnR6Q29yZS9RdWFydHpDb3JlLmg+CkBAIC02NSw2ICs2Niw4IEBAIGVudW0gRnVsbFNjcmVl blN0YXRlIDogTlNJbnRlZ2VyIHsKIEBlbmQKIAogQGludGVyZmFjZSBXS0Z1bGxTY3JlZW5XaW5k b3dDb250cm9sbGVyIChQcml2YXRlKSA8TlNBbmltYXRpb25EZWxlZ2F0ZT4KKy0gKHZvaWQpX3Nh dmVUb3BDb250ZW50SW5zZXQ7CistICh2b2lkKV9yZXN0b3JlVG9wQ29udGVudEluc2V0OwogLSAo dm9pZClfcmVwbGFjZVZpZXc6KE5TVmlldyopdmlldyB3aXRoOihOU1ZpZXcqKW90aGVyVmlldzsK IC0gKFdlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHkqKV9tYW5hZ2VyOwogLSAodm9pZClfc3RhcnRF bnRlckZ1bGxTY3JlZW5BbmltYXRpb25XaXRoRHVyYXRpb246KE5TVGltZUludGVydmFsKWR1cmF0 aW9uOwpAQCAtMjMwLDggKzIzMyw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY3Jl YXRlSW1hZ2VXaXRoQ29waWVkRGF0YShDR0ltYWdlUmVmIHNvdXJjZUltYWdlKQogICAgIFtbc2Vs ZiB3aW5kb3ddIHNldEF1dG9kaXNwbGF5Ok5PXTsKIAogICAgIFtzZWxmIF9tYW5hZ2VyXS0+c2F2 ZVNjcm9sbFBvc2l0aW9uKCk7Ci0gICAgX3NhdmVkVG9wQ29udGVudEluc2V0ID0gX3BhZ2UtPnRv cENvbnRlbnRJbnNldCgpOwotICAgIF9wYWdlLT5zZXRUb3BDb250ZW50SW5zZXQoMCk7CisgICAg W3NlbGYgX3NhdmVUb3BDb250ZW50SW5zZXRdOwogICAgIFtbc2VsZiB3aW5kb3ddIHNldEZyYW1l OnNjcmVlbkZyYW1lIGRpc3BsYXk6Tk9dOwogCiAgICAgLy8gUGFpbnRpbmcgaXMgbm9ybWFsbHkg c3VzcGVuZGVkIHdoZW4gdGhlIFdLVmlldyBpcyByZW1vdmVkIGZyb20gdGhlIHdpbmRvdywgYnV0 IHRoaXMgaXMKQEAgLTI1MSw5ICsyNTMsOCBAQCBzdGF0aWMgUmV0YWluUHRyPENHSW1hZ2VSZWY+ IGNyZWF0ZUltYWdlV2l0aENvcGllZERhdGEoQ0dJbWFnZVJlZiBzb3VyY2VJbWFnZSkKICAgICBb c2VsZiBfcmVwbGFjZVZpZXc6X3dlYlZpZXcgd2l0aDpfd2ViVmlld1BsYWNlaG9sZGVyLmdldCgp XTsKICAgICAKICAgICAvLyBUaGVuIGluc2VydCB0aGUgV2ViVmlldyBpbnRvIHRoZSBmdWxsIHNj cmVlbiB3aW5kb3cKLSAgICBOU1ZpZXcgKmNvbnRlbnRWaWV3ID0gW1tzZWxmIHdpbmRvd10gY29u dGVudFZpZXddOwogICAgIFtfY2xpcFZpZXcgYWRkU3Vidmlldzpfd2ViVmlldyBwb3NpdGlvbmVk Ok5TV2luZG93QmVsb3cgcmVsYXRpdmVUbzpuaWxdOwotICAgIF93ZWJWaWV3LmZyYW1lID0gTlNJ bnNldFJlY3QoY29udGVudFZpZXcuYm91bmRzLCAwLCAtX3BhZ2UtPnRvcENvbnRlbnRJbnNldCgp KTsKKyAgICBfd2ViVmlldy5mcmFtZSA9IHNlbGYud2luZG93LmNvbnRlbnRWaWV3LmJvdW5kczsK IAogICAgIF9zYXZlZFNjYWxlID0gX3BhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpOwogICAgIF9wYWdl LT5zY2FsZVBhZ2UoMSwgSW50UG9pbnQoKSk7CkBAIC0zMTcsNyArMzE4LDcgQEAgc3RhdGljIGNv bnN0IGZsb2F0IG1pblZpZGVvV2lkdGggPSA0ODAgKyAyMCArIDIwOyAvLyBOb3RlOiBLZWVwIGlu IHN5bmMgd2l0aCBtZWQKIAogICAgICAgICBfcGFnZS0+c2NhbGVQYWdlKF9zYXZlZFNjYWxlLCBJ bnRQb2ludCgpKTsKICAgICAgICAgW3NlbGYgX21hbmFnZXJdLT5yZXN0b3JlU2Nyb2xsUG9zaXRp b24oKTsKLSAgICAgICAgX3BhZ2UtPnNldFRvcENvbnRlbnRJbnNldChfc2F2ZWRUb3BDb250ZW50 SW5zZXQpOworICAgICAgICBbc2VsZiBfcmVzdG9yZVRvcENvbnRlbnRJbnNldF07CiAgICAgICAg IFtzZWxmIF9tYW5hZ2VyXS0+ZGlkRXhpdEZ1bGxTY3JlZW4oKTsKICAgICAgICAgW3NlbGYgX21h bmFnZXJdLT5zZXRBbmltYXRpbmdGdWxsU2NyZWVuKGZhbHNlKTsKICAgICB9CkBAIC00MTUsNiAr NDE2LDcgQEAgc3RhdGljIGNvbnN0IGZsb2F0IG1pblZpZGVvV2lkdGggPSA0ODAgKyAyMCArIDIw OyAvLyBOb3RlOiBLZWVwIGluIHN5bmMgd2l0aCBtZWQKICAgICBbc2VsZiBfbWFuYWdlcl0tPnNl dEFuaW1hdGluZ0Z1bGxTY3JlZW4oZmFsc2UpOwogICAgIF9wYWdlLT5zY2FsZVBhZ2UoX3NhdmVk U2NhbGUsIEludFBvaW50KCkpOwogICAgIFtzZWxmIF9tYW5hZ2VyXS0+cmVzdG9yZVNjcm9sbFBv c2l0aW9uKCk7CisgICAgW3NlbGYgX3Jlc3RvcmVUb3BDb250ZW50SW5zZXRdOwogCiAgICAgaWYg KF9yZXBhaW50Q2FsbGJhY2spIHsKICAgICAgICAgX3JlcGFpbnRDYWxsYmFjay0+aW52YWxpZGF0 ZShXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3I6Ok93bmVyV2FzSW52YWxpZGF0ZWQpOwpAQCAt NTEzLDYgKzUxNSw0NCBAQCBzdGF0aWMgY29uc3QgZmxvYXQgbWluVmlkZW9XaWR0aCA9IDQ4MCAr IDIwICsgMjA7IC8vIE5vdGU6IEtlZXAgaW4gc3luYyB3aXRoIG1lZAogICAgIHJldHVybiBfcGFn ZS0+ZnVsbFNjcmVlbk1hbmFnZXIoKTsKIH0KIAorLSAodm9pZClfc2F2ZVRvcENvbnRlbnRJbnNl dAoreworI2lmIFdLX0FQSV9FTkFCTEVECisgICAgaWYgKFtfd2ViVmlldyBpc0tpbmRPZkNsYXNz OltXS1dlYlZpZXcgY2xhc3NdXSkgeworICAgICAgICBXS1dlYlZpZXcgKndlYlZpZXcgPSAoV0tX ZWJWaWV3ICopX3dlYlZpZXc7CisgICAgICAgIF9zYXZlZFRvcENvbnRlbnRJbnNldCA9IHdlYlZp ZXcuX3RvcENvbnRlbnRJbnNldDsKKyAgICAgICAgX3NhdmVkQXV0b21hdGljYWxseUFkanVzdHND b250ZW50SW5zZXRzID0gd2ViVmlldy5fYXV0b21hdGljYWxseUFkanVzdHNDb250ZW50SW5zZXRz OworICAgICAgICB3ZWJWaWV3Ll9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHMgPSBO TzsKKyAgICAgICAgd2ViVmlldy5fdG9wQ29udGVudEluc2V0ID0gMDsKKyAgICB9CisjZW5kaWYK KworICAgIGlmIChbX3dlYlZpZXcgaXNLaW5kT2ZDbGFzczpbV0tWaWV3IGNsYXNzXV0pIHsKKyAg ICAgICAgV0tWaWV3ICp3ZWJWaWV3ID0gKFdLVmlldyAqKV93ZWJWaWV3OworICAgICAgICBfc2F2 ZWRUb3BDb250ZW50SW5zZXQgPSB3ZWJWaWV3Ll90b3BDb250ZW50SW5zZXQ7CisgICAgICAgIF9z YXZlZEF1dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVudEluc2V0cyA9IHdlYlZpZXcuX2F1dG9tYXRp Y2FsbHlBZGp1c3RzQ29udGVudEluc2V0czsKKyAgICAgICAgd2ViVmlldy5fYXV0b21hdGljYWxs eUFkanVzdHNDb250ZW50SW5zZXRzID0gTk87CisgICAgICAgIHdlYlZpZXcuX3RvcENvbnRlbnRJ bnNldCA9IDA7CisgICAgfQorfQorCistICh2b2lkKV9yZXN0b3JlVG9wQ29udGVudEluc2V0Cit7 CisjaWYgV0tfQVBJX0VOQUJMRUQKKyAgICBpZiAoW193ZWJWaWV3IGlzS2luZE9mQ2xhc3M6W1dL V2ViVmlldyBjbGFzc11dKSB7CisgICAgICAgIFdLV2ViVmlldyAqd2ViVmlldyA9IChXS1dlYlZp ZXcgKilfd2ViVmlldzsKKyAgICAgICAgd2ViVmlldy5fdG9wQ29udGVudEluc2V0ID0gX3NhdmVk VG9wQ29udGVudEluc2V0OworICAgICAgICB3ZWJWaWV3Ll9hdXRvbWF0aWNhbGx5QWRqdXN0c0Nv bnRlbnRJbnNldHMgPSBfc2F2ZWRBdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHM7Cisg ICAgfQorI2VuZGlmCisKKyAgICBpZiAoW193ZWJWaWV3IGlzS2luZE9mQ2xhc3M6W1dLVmlldyBj bGFzc11dKSB7CisgICAgICAgIFdLVmlldyAqd2ViVmlldyA9IChXS1ZpZXcgKilfd2ViVmlldzsK KyAgICAgICAgd2ViVmlldy5fdG9wQ29udGVudEluc2V0ID0gX3NhdmVkVG9wQ29udGVudEluc2V0 OworICAgICAgICB3ZWJWaWV3Ll9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHMgPSBf c2F2ZWRBdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHM7CisgICAgfQorfQorCiAtICh2 b2lkKV9yZXBsYWNlVmlldzooTlNWaWV3Kil2aWV3IHdpdGg6KE5TVmlldyopb3RoZXJWaWV3CiB7 CiAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9n IGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGIzYmJiODRiOWMyNGMwN2E4MWJhN2E4YTM0ODFjZDgy ODQ2YWI5ZTUuLjhmYTFhZGQwM2Q1ZGY3MGQ2MDEwN2M0YzhlMGM2Mjc1MDA5Yzk4YjggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAxNi0xMi0xMiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAg ICAgICBGdWxsc2NyZWVuIGluIFdlYktpdDIgZG9lcyBub3QgcmVzdG9yZSB0b3BDb250ZW50SW5z ZXQgdXBvbiBleGl0aW5nOyBsZWF2ZXMgdG9wIG9mIHBhZ2Ugbm90IHZpc2libGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTY5NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVlblRvcENvbnRlbnRJbnNldC5tbToKKyAgICAgICAg KFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE2LTEyLTEyICBBbGV4ZXkgUHJvc2t1cnlha292 ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIENoYW5nZUxvZ3MgYmVjb21lIHJlYWRvbmx5IGFm dGVyIHJlc29sdmluZyBhIGNvbmZsaWN0CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJDb2NvYS9GdWxsc2NyZWVuVG9wQ29udGVudEluc2V0Lm1tIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVlblRvcENvbnRlbnRJbnNl dC5tbQppbmRleCAwMWY2ZTg4OTNjMWYzNzI3M2Y3OTgwMjM3NzhjZGM1MjFlZWJkMzhmLi5kMTFj ODBhYzZlNGRlMzJmYTYxYmVmM2UyZDg3MjkzMTA3YjYyZDEwIDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9GdWxsc2NyZWVuVG9wQ29udGVudEluc2V0 Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL0Z1bGxzY3Jl ZW5Ub3BDb250ZW50SW5zZXQubW0KQEAgLTU4LDYgKzU4LDcgQEAgVEVTVChGdWxsc2NyZWVuLCBU b3BDb250ZW50SW5zZXQpCiAgICAgUmV0YWluUHRyPFdLV2ViVmlld0NvbmZpZ3VyYXRpb24+IGNv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5p dF0pOwogICAgIFJldGFpblB0cjxXS1dlYlZpZXc+IHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMTAwLCAxMDApIGNvbmZp Z3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIFt3ZWJWaWV3IF9zZXRUb3BDb250 ZW50SW5zZXQ6MTBdOworICAgIFt3ZWJWaWV3IF9zZXRBdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRl bnRJbnNldHM6Tk9dOwogICAgIFtjb25maWd1cmF0aW9uIHByZWZlcmVuY2VzXS5fZnVsbFNjcmVl bkVuYWJsZWQgPSBZRVM7CiAgICAgUmV0YWluUHRyPEZ1bGxzY3JlZW5DaGFuZ2VNZXNzYWdlSGFu ZGxlcj4gaGFuZGxlciA9IGFkb3B0TlMoW1tGdWxsc2NyZWVuQ2hhbmdlTWVzc2FnZUhhbmRsZXIg YWxsb2NdIGluaXRdKTsKICAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVy XSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjpoYW5kbGVyLmdldCgpIG5hbWU6QCJmdWxsc2NyZWVu Q2hhbmdlSGFuZGxlciJdOwpAQCAtNzUsNiArNzYsMTEgQEAgVEVTVChGdWxsc2NyZWVuLCBUb3BD b250ZW50SW5zZXQpCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZEZ1bGxz Y3JlZW5DaGFuZ2VNZXNzYWdlKTsKICAgICBBU1NFUlRfRVEod2luZG93LmdldCgpLnNjcmVlbi5m cmFtZS5zaXplLndpZHRoLCB3ZWJWaWV3LmdldCgpLmZyYW1lLnNpemUud2lkdGgpOwogICAgIEFT U0VSVF9FUSh3aW5kb3cuZ2V0KCkuc2NyZWVuLmZyYW1lLnNpemUuaGVpZ2h0ICsgd2ViVmlldy5n ZXQoKS5fdG9wQ29udGVudEluc2V0LCB3ZWJWaWV3LmdldCgpLmZyYW1lLnNpemUuaGVpZ2h0KTsK KworICAgIHJlY2VpdmVkRnVsbHNjcmVlbkNoYW5nZU1lc3NhZ2UgPSBmYWxzZTsKKyAgICBbd2Vi VmlldyBtb3VzZURvd246ZXZlbnRdOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVj ZWl2ZWRGdWxsc2NyZWVuQ2hhbmdlTWVzc2FnZSk7CisgICAgQVNTRVJUX0VRKDEwLCB3ZWJWaWV3 LmdldCgpLl90b3BDb250ZW50SW5zZXQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0 QVBJCg== 296970 2016-12-12 16:52:40 -0800 2016-12-13 10:24:50 -0800 Patch bug-165697-20161212165155.patch text/plain 7683 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGFiODU2NjljOGJkZGRi N2NiMjBmOThjNTk5NzFhY2FjZTM2MzNmZC4uZDA1Y2RlMmQxMWZkZTI4MGFlNDJjMzBjYWZlYWM5 YWNiZDMyZDNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTEyLTEyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4gaW4gV2Vi S2l0MiBkb2VzIG5vdCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7IGxlYXZl cyB0b3Agb2YgcGFnZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY1Njk3CisKKyAgICAgICAgVXNlIFdLV2ViVmlldyBvciBXS1Zp ZXcgU1BJcyB0byBzZXQgdGhlIHRvcCBjb250ZW50IGluc2V0IHJhdGhlciB0aGFuIGNhbGxpbmcg V2ViUGFnZVByb3h5CisgICAgICAgIGRpcmVjdGx5LCB0byBlbmFibGUgQVBJIHRlc3RzIHRvIGJl IHdyaXR0ZW4gZm9yIHRoaXMgZmVhdHVyZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBlbnRl ckZ1bGxTY3JlZW46XSk6CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIg ZmluaXNoZWRFbnRlckZ1bGxTY3JlZW5BbmltYXRpb246XSk6CisgICAgICAgICgtW1dLRnVsbFNj cmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKToK KyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBfc2F2ZVRvcENvbnRlbnRJ bnNldF0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIF9yZXN0b3Jl VG9wQ29udGVudEluc2V0XSk6CisKIDIwMTYtMTItMTEgIEtvbnN0YW50aW4gVG9rYXJldiAgPGFu bnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFVucmV2aWV3ZWQgYXR0ZW1wdCB0byBmaXggRUZM IGFuZCBNYWMvY21ha2UgYnVpbGRzIGFmdGVyIHIyMDk2NjUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCmluZGV4IGIyOWRhNzg2MWJiMGJjODNiZTMyNzIy OTMzMmE5YTM4MTkwOWI5MGQuLjY1YTk5Y2U2MzE4ZTRjMzQ3NWRiNDQ4YTUzZGFiY2E3ZTQxOWNm MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1w bC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCkBA IC0xNzAsNyArMTcwLDcgQEAgcHVibGljOgogICAgIGJvb2wgYXV0b21hdGljYWxseUFkanVzdHND b250ZW50SW5zZXRzKCkgY29uc3QgeyByZXR1cm4gbV9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRl bnRJbnNldHM7IH0KICAgICB2b2lkIHVwZGF0ZUNvbnRlbnRJbnNldHNJZkF1dG9tYXRpYygpOwog ICAgIHZvaWQgc2V0VG9wQ29udGVudEluc2V0KENHRmxvYXQpOwotICAgIENHRmxvYXQgdG9wQ29u dGVudEluc2V0KCkgY29uc3QgeyByZXR1cm4gbV90b3BDb250ZW50SW5zZXQ7IH0KKyAgICBDR0Zs b2F0IHRvcENvbnRlbnRJbnNldCgpIGNvbnN0OwogCiAgICAgdm9pZCBwcmVwYXJlQ29udGVudElu UmVjdChDR1JlY3QpOwogICAgIHZvaWQgdXBkYXRlVmlld0V4cG9zZWRSZWN0KCk7CkBAIC02MDYs NyArNjA2LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fd2luZG93T2NjbHVzaW9uRGV0ZWN0aW9u RW5hYmxlZCB7IHRydWUgfTsKIAogICAgIGJvb2wgbV9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRl bnRJbnNldHMgeyBmYWxzZSB9OwotICAgIENHRmxvYXQgbV90b3BDb250ZW50SW5zZXQgeyAwIH07 CisgICAgQ0dGbG9hdCBtX3BlbmRpbmdUb3BDb250ZW50SW5zZXQgeyAwIH07CiAgICAgYm9vbCBt X2RpZFNjaGVkdWxlU2V0VG9wQ29udGVudEluc2V0IHsgZmFsc2UgfTsKIAogICAgIENHU2l6ZSBt X3Jlc2l6ZVNjcm9sbE9mZnNldCB7IDAsIDAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db2NvYS9XZWJWaWV3SW1wbC5tbQppbmRleCBlYWQ2MmE1YjMyYzRhNzhjYWMzOGFmODlhMjNh MDFjYTliOTYzYjVlLi4wZTE3NDAxN2QyODA2NGVkNTY4ZjE2YmEwZjcwZWNkMjRjMzAxNGExIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC0x NjE1LDE1ICsxNjE1LDIyIEBAIHZvaWQgV2ViVmlld0ltcGw6OnVwZGF0ZUNvbnRlbnRJbnNldHNJ ZkF1dG9tYXRpYygpCiAgICAgaWYgKCh3aW5kb3cuc3R5bGVNYXNrICYgTlNXaW5kb3dTdHlsZU1h c2tGdWxsU2l6ZUNvbnRlbnRWaWV3KSAmJiAhd2luZG93LnRpdGxlYmFyQXBwZWFyc1RyYW5zcGFy ZW50ICYmICFbbV92aWV3IGVuY2xvc2luZ1Njcm9sbFZpZXddKSB7CiAgICAgICAgIE5TUmVjdCBj b250ZW50TGF5b3V0UmVjdCA9IFttX3ZpZXcgY29udmVydFJlY3Q6d2luZG93LmNvbnRlbnRMYXlv dXRSZWN0IGZyb21WaWV3Om5pbF07CiAgICAgICAgIENHRmxvYXQgbmV3VG9wQ29udGVudEluc2V0 ID0gTlNNYXhZKGNvbnRlbnRMYXlvdXRSZWN0KSAtIE5TSGVpZ2h0KGNvbnRlbnRMYXlvdXRSZWN0 KTsKLSAgICAgICAgaWYgKG1fdG9wQ29udGVudEluc2V0ICE9IG5ld1RvcENvbnRlbnRJbnNldCkK KyAgICAgICAgaWYgKG1fcGFnZS0+dG9wQ29udGVudEluc2V0KCkgIT0gbmV3VG9wQ29udGVudElu c2V0KQogICAgICAgICAgICAgc2V0VG9wQ29udGVudEluc2V0KG5ld1RvcENvbnRlbnRJbnNldCk7 CiAgICAgfSBlbHNlCiAgICAgICAgIHNldFRvcENvbnRlbnRJbnNldCgwKTsKIH0KIAorQ0dGbG9h dCBXZWJWaWV3SW1wbDo6dG9wQ29udGVudEluc2V0KCkgY29uc3QKK3sKKyAgICBpZiAobV9kaWRT Y2hlZHVsZVNldFRvcENvbnRlbnRJbnNldCkKKyAgICAgICAgcmV0dXJuIG1fcGVuZGluZ1RvcENv bnRlbnRJbnNldDsKKyAgICByZXR1cm4gbV9wYWdlLT50b3BDb250ZW50SW5zZXQoKTsKK30KKwog dm9pZCBXZWJWaWV3SW1wbDo6c2V0VG9wQ29udGVudEluc2V0KENHRmxvYXQgY29udGVudEluc2V0 KQogewotICAgIG1fdG9wQ29udGVudEluc2V0ID0gY29udGVudEluc2V0OworICAgIG1fcGVuZGlu Z1RvcENvbnRlbnRJbnNldCA9IGNvbnRlbnRJbnNldDsKIAogICAgIGlmIChtX2RpZFNjaGVkdWxl U2V0VG9wQ29udGVudEluc2V0KQogICAgICAgICByZXR1cm47CkBAIC0xNjQ0LDcgKzE2NTEsNyBA QCB2b2lkIFdlYlZpZXdJbXBsOjpkaXNwYXRjaFNldFRvcENvbnRlbnRJbnNldCgpCiAgICAgICAg IHJldHVybjsKIAogICAgIG1fZGlkU2NoZWR1bGVTZXRUb3BDb250ZW50SW5zZXQgPSBmYWxzZTsK LSAgICBtX3BhZ2UtPnNldFRvcENvbnRlbnRJbnNldChtX3RvcENvbnRlbnRJbnNldCk7CisgICAg bV9wYWdlLT5zZXRUb3BDb250ZW50SW5zZXQobV9wZW5kaW5nVG9wQ29udGVudEluc2V0KTsKIH0K IAogdm9pZCBXZWJWaWV3SW1wbDo6cHJlcGFyZUNvbnRlbnRJblJlY3QoQ0dSZWN0IHJlY3QpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRv d0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlci5oCmluZGV4IDM0ZWNiYjA5YWYyNTVkMjZjYTA0NjI4MDM5YTVjNTgx MTZiMTUyNDguLmYyODI4M2FhOWI2MzZhOGE4YWZkMmU1MmJmNWU3NDZmMTNhOGNlNTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVu V2luZG93Q29udHJvbGxlci5oCkBAIC02MCw2ICs2MCw3IEBAIHR5cGVkZWYgZW51bSBGdWxsU2Ny ZWVuU3RhdGUgOiBOU0ludGVnZXIgRnVsbFNjcmVlblN0YXRlOwogICAgIGRvdWJsZSBfc2F2ZWRT Y2FsZTsKICAgICBSZWZQdHI8V2ViS2l0OjpWb2lkQ2FsbGJhY2s+IF9yZXBhaW50Q2FsbGJhY2s7 CiAgICAgZmxvYXQgX3NhdmVkVG9wQ29udGVudEluc2V0OworICAgIGJvb2wgX3NhdmVkQXV0b21h dGljYWxseUFkanVzdHNDb250ZW50SW5zZXRzOwogfQogCiBAcHJvcGVydHkgKHJlYWRvbmx5KSBO U1JlY3QgaW5pdGlhbEZyYW1lOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCmluZGV4IGVjZjI1MjYy NTZjNDY5MGY4N2VlNGEwM2E5ZmEzNDIyNTE5MDJmZDYuLjllMWM5NDdhNjRhY2YzMzVkYzMyMjll OWE0N2IzOGRjNzJmOTBkZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTQxNSw2ICs0 MTUsNyBAQCBzdGF0aWMgY29uc3QgZmxvYXQgbWluVmlkZW9XaWR0aCA9IDQ4MCArIDIwICsgMjA7 IC8vIE5vdGU6IEtlZXAgaW4gc3luYyB3aXRoIG1lZAogICAgIFtzZWxmIF9tYW5hZ2VyXS0+c2V0 QW5pbWF0aW5nRnVsbFNjcmVlbihmYWxzZSk7CiAgICAgX3BhZ2UtPnNjYWxlUGFnZShfc2F2ZWRT Y2FsZSwgSW50UG9pbnQoKSk7CiAgICAgW3NlbGYgX21hbmFnZXJdLT5yZXN0b3JlU2Nyb2xsUG9z aXRpb24oKTsKKyAgICBfcGFnZS0+c2V0VG9wQ29udGVudEluc2V0KF9zYXZlZFRvcENvbnRlbnRJ bnNldCk7CiAKICAgICBpZiAoX3JlcGFpbnRDYWxsYmFjaykgewogICAgICAgICBfcmVwYWludENh bGxiYWNrLT5pbnZhbGlkYXRlKFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6T3duZXJXYXNJ bnZhbGlkYXRlZCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggYjNiYmI4NGI5YzI0YzA3YTgxYmE3YThhMzQ4MWNkODI4NDZhYjllNS4uOGZhMWFk ZDAzZDVkZjcwZDYwMTA3YzRjOGUwYzYyNzUwMDljOThiOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTEyLTEy ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4g aW4gV2ViS2l0MiBkb2VzIG5vdCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7 IGxlYXZlcyB0b3Agb2YgcGFnZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1Njk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2Nv YS9GdWxsc2NyZWVuVG9wQ29udGVudEluc2V0Lm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 VEVTVCk6CisKIDIwMTYtMTItMTIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+ CiAKICAgICAgICAgQ2hhbmdlTG9ncyBiZWNvbWUgcmVhZG9ubHkgYWZ0ZXIgcmVzb2x2aW5nIGEg Y29uZmxpY3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNv Y29hL0Z1bGxzY3JlZW5Ub3BDb250ZW50SW5zZXQubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdDJDb2NvYS9GdWxsc2NyZWVuVG9wQ29udGVudEluc2V0Lm1tCmluZGV4IDAxZjZl ODg5M2MxZjM3MjczZjc5ODAyMzc3OGNkYzUyMWVlYmQzOGYuLmQxMWM4MGFjNmU0ZGUzMmZhNjFi ZWYzZTJkODcyOTMxMDdiNjJkMTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0MkNvY29hL0Z1bGxzY3JlZW5Ub3BDb250ZW50SW5zZXQubW0KKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVlblRvcENvbnRlbnRJbnNl dC5tbQpAQCAtNTgsNiArNTgsNyBAQCBURVNUKEZ1bGxzY3JlZW4sIFRvcENvbnRlbnRJbnNldCkK ICAgICBSZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFk b3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgUmV0YWlu UHRyPFdLV2ViVmlldz4gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCAxMDAsIDEwMCkgY29uZmlndXJhdGlvbjpjb25maWd1 cmF0aW9uLmdldCgpXSk7CiAgICAgW3dlYlZpZXcgX3NldFRvcENvbnRlbnRJbnNldDoxMF07Cisg ICAgW3dlYlZpZXcgX3NldEF1dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVudEluc2V0czpOT107CiAg ICAgW2NvbmZpZ3VyYXRpb24gcHJlZmVyZW5jZXNdLl9mdWxsU2NyZWVuRW5hYmxlZCA9IFlFUzsK ICAgICBSZXRhaW5QdHI8RnVsbHNjcmVlbkNoYW5nZU1lc3NhZ2VIYW5kbGVyPiBoYW5kbGVyID0g YWRvcHROUyhbW0Z1bGxzY3JlZW5DaGFuZ2VNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOwog ICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3Nh Z2VIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgbmFtZTpAImZ1bGxzY3JlZW5DaGFuZ2VIYW5kbGVyIl07 CkBAIC03NSw2ICs3NiwxMSBAQCBURVNUKEZ1bGxzY3JlZW4sIFRvcENvbnRlbnRJbnNldCkKICAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkRnVsbHNjcmVlbkNoYW5nZU1lc3Nh Z2UpOwogICAgIEFTU0VSVF9FUSh3aW5kb3cuZ2V0KCkuc2NyZWVuLmZyYW1lLnNpemUud2lkdGgs IHdlYlZpZXcuZ2V0KCkuZnJhbWUuc2l6ZS53aWR0aCk7CiAgICAgQVNTRVJUX0VRKHdpbmRvdy5n ZXQoKS5zY3JlZW4uZnJhbWUuc2l6ZS5oZWlnaHQgKyB3ZWJWaWV3LmdldCgpLl90b3BDb250ZW50 SW5zZXQsIHdlYlZpZXcuZ2V0KCkuZnJhbWUuc2l6ZS5oZWlnaHQpOworCisgICAgcmVjZWl2ZWRG dWxsc2NyZWVuQ2hhbmdlTWVzc2FnZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IG1vdXNlRG93bjpl dmVudF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZEZ1bGxzY3JlZW5D aGFuZ2VNZXNzYWdlKTsKKyAgICBBU1NFUlRfRVEoMTAsIHdlYlZpZXcuZ2V0KCkuX3RvcENvbnRl bnRJbnNldCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkK 297020 2016-12-13 10:28:57 -0800 2016-12-13 10:33:09 -0800 Patch for landing bug-165697-20161213102812.patch text/plain 7437 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGFiODU2NjljOGJkZGRi N2NiMjBmOThjNTk5NzFhY2FjZTM2MzNmZC4uOWZkNjg4M2VkOTRkZjE5YjBmNjZjZmMzMTYxMzMw ZjBjMGM4OWFkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTEyLTEyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4gaW4gV2Vi S2l0MiBkb2VzIG5vdCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7IGxlYXZl cyB0b3Agb2YgcGFnZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY1Njk3CisKKyAgICAgICAgRGVsZWdhdGUgdGhlIHZhbHVlcyBv ZiB0b3BDb250ZW50SW5zZXQoKSBmcm9tIFdlYlZpZXdJbXBsICh1c2VkIGJ5IFdLV2ViVmlldyBh bmQgV0tWaWV3KSB0byB0aGUKKyAgICAgICAgV2ViUGFnZVByb3h5LCBzbyB0aGF0IHNldHRpbmcg dGhlIHRvcENvbnRlbnRJbnNldCgpIG9uIFdlYlBhZ2VQcm94eSBpcyByZWZsZWN0ZWQgaW4gdGhl IGdldHRlcnMKKyAgICAgICAgZm9yIHRoZSB0d28gdmlldyBjbGFzc2VzLgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dl YlZpZXdJbXBsLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0b3BDb250ZW50SW5z ZXQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbToK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnVwZGF0ZUNvbnRlbnRJbnNldHNJZkF1dG9t YXRpYyk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0b3BDb250ZW50SW5zZXQpOgor ICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0VG9wQ29udGVudEluc2V0KToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRpc3BhdGNoU2V0VG9wQ29udGVudEluc2V0KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW06Cisg ICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZW50ZXJGdWxsU2NyZWVuOl0p OgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGZpbmlzaGVkRW50ZXJG dWxsU2NyZWVuQW5pbWF0aW9uOl0pOgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250 cm9sbGVyIGZpbmlzaGVkRXhpdEZ1bGxTY3JlZW5BbmltYXRpb246XSk6CisgICAgICAgICgtW1dL RnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX3NhdmVUb3BDb250ZW50SW5zZXRdKTogRGVsZXRl ZC4KKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBfcmVzdG9yZVRvcENv bnRlbnRJbnNldF0pOiBEZWxldGVkLgorCiAyMDE2LTEyLTExICBLb25zdGFudGluIFRva2FyZXYg IDxhbm51bGVuQHlhbmRleC5ydT4KIAogICAgICAgICBVbnJldmlld2VkIGF0dGVtcHQgdG8gZml4 IEVGTCBhbmQgTWFjL2NtYWtlIGJ1aWxkcyBhZnRlciByMjA5NjY1LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaAppbmRleCBiMjlkYTc4NjFiYjBiYzgzYmUz MjcyMjkzMzJhOWEzODE5MDliOTBkLi42NWE5OWNlNjMxOGU0YzM0NzVkYjQ0OGE1M2RhYmNhN2U0 MTljZjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwu aApAQCAtMTcwLDcgKzE3MCw3IEBAIHB1YmxpYzoKICAgICBib29sIGF1dG9tYXRpY2FsbHlBZGp1 c3RzQ29udGVudEluc2V0cygpIGNvbnN0IHsgcmV0dXJuIG1fYXV0b21hdGljYWxseUFkanVzdHND b250ZW50SW5zZXRzOyB9CiAgICAgdm9pZCB1cGRhdGVDb250ZW50SW5zZXRzSWZBdXRvbWF0aWMo KTsKICAgICB2b2lkIHNldFRvcENvbnRlbnRJbnNldChDR0Zsb2F0KTsKLSAgICBDR0Zsb2F0IHRv cENvbnRlbnRJbnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fdG9wQ29udGVudEluc2V0OyB9CisgICAg Q0dGbG9hdCB0b3BDb250ZW50SW5zZXQoKSBjb25zdDsKIAogICAgIHZvaWQgcHJlcGFyZUNvbnRl bnRJblJlY3QoQ0dSZWN0KTsKICAgICB2b2lkIHVwZGF0ZVZpZXdFeHBvc2VkUmVjdCgpOwpAQCAt NjA2LDcgKzYwNiw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3dpbmRvd09jY2x1c2lvbkRldGVj dGlvbkVuYWJsZWQgeyB0cnVlIH07CiAKICAgICBib29sIG1fYXV0b21hdGljYWxseUFkanVzdHND b250ZW50SW5zZXRzIHsgZmFsc2UgfTsKLSAgICBDR0Zsb2F0IG1fdG9wQ29udGVudEluc2V0IHsg MCB9OworICAgIENHRmxvYXQgbV9wZW5kaW5nVG9wQ29udGVudEluc2V0IHsgMCB9OwogICAgIGJv b2wgbV9kaWRTY2hlZHVsZVNldFRvcENvbnRlbnRJbnNldCB7IGZhbHNlIH07CiAKICAgICBDR1Np emUgbV9yZXNpemVTY3JvbGxPZmZzZXQgeyAwLCAwIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KaW5kZXggZWFkNjJhNWIzMmM0YTc4Y2FjMzhhZjg5 YTIzYTAxY2E5Yjk2M2I1ZS4uMGUxNzQwMTdkMjgwNjRlZDU2OGYxNmJhMGY3MGVjZDI0YzMwMTRh MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBs Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQpA QCAtMTYxNSwxNSArMTYxNSwyMiBAQCB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVDb250ZW50SW5z ZXRzSWZBdXRvbWF0aWMoKQogICAgIGlmICgod2luZG93LnN0eWxlTWFzayAmIE5TV2luZG93U3R5 bGVNYXNrRnVsbFNpemVDb250ZW50VmlldykgJiYgIXdpbmRvdy50aXRsZWJhckFwcGVhcnNUcmFu c3BhcmVudCAmJiAhW21fdmlldyBlbmNsb3NpbmdTY3JvbGxWaWV3XSkgewogICAgICAgICBOU1Jl Y3QgY29udGVudExheW91dFJlY3QgPSBbbV92aWV3IGNvbnZlcnRSZWN0OndpbmRvdy5jb250ZW50 TGF5b3V0UmVjdCBmcm9tVmlldzpuaWxdOwogICAgICAgICBDR0Zsb2F0IG5ld1RvcENvbnRlbnRJ bnNldCA9IE5TTWF4WShjb250ZW50TGF5b3V0UmVjdCkgLSBOU0hlaWdodChjb250ZW50TGF5b3V0 UmVjdCk7Ci0gICAgICAgIGlmIChtX3RvcENvbnRlbnRJbnNldCAhPSBuZXdUb3BDb250ZW50SW5z ZXQpCisgICAgICAgIGlmIChtX3BhZ2UtPnRvcENvbnRlbnRJbnNldCgpICE9IG5ld1RvcENvbnRl bnRJbnNldCkKICAgICAgICAgICAgIHNldFRvcENvbnRlbnRJbnNldChuZXdUb3BDb250ZW50SW5z ZXQpOwogICAgIH0gZWxzZQogICAgICAgICBzZXRUb3BDb250ZW50SW5zZXQoMCk7CiB9CiAKK0NH RmxvYXQgV2ViVmlld0ltcGw6OnRvcENvbnRlbnRJbnNldCgpIGNvbnN0Cit7CisgICAgaWYgKG1f ZGlkU2NoZWR1bGVTZXRUb3BDb250ZW50SW5zZXQpCisgICAgICAgIHJldHVybiBtX3BlbmRpbmdU b3BDb250ZW50SW5zZXQ7CisgICAgcmV0dXJuIG1fcGFnZS0+dG9wQ29udGVudEluc2V0KCk7Cit9 CisKIHZvaWQgV2ViVmlld0ltcGw6OnNldFRvcENvbnRlbnRJbnNldChDR0Zsb2F0IGNvbnRlbnRJ bnNldCkKIHsKLSAgICBtX3RvcENvbnRlbnRJbnNldCA9IGNvbnRlbnRJbnNldDsKKyAgICBtX3Bl bmRpbmdUb3BDb250ZW50SW5zZXQgPSBjb250ZW50SW5zZXQ7CiAKICAgICBpZiAobV9kaWRTY2hl ZHVsZVNldFRvcENvbnRlbnRJbnNldCkKICAgICAgICAgcmV0dXJuOwpAQCAtMTY0NCw3ICsxNjUx LDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZGlzcGF0Y2hTZXRUb3BDb250ZW50SW5zZXQoKQogICAg ICAgICByZXR1cm47CiAKICAgICBtX2RpZFNjaGVkdWxlU2V0VG9wQ29udGVudEluc2V0ID0gZmFs c2U7Ci0gICAgbV9wYWdlLT5zZXRUb3BDb250ZW50SW5zZXQobV90b3BDb250ZW50SW5zZXQpOwor ICAgIG1fcGFnZS0+c2V0VG9wQ29udGVudEluc2V0KG1fcGVuZGluZ1RvcENvbnRlbnRJbnNldCk7 CiB9CiAKIHZvaWQgV2ViVmlld0ltcGw6OnByZXBhcmVDb250ZW50SW5SZWN0KENHUmVjdCByZWN0 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5X aW5kb3dDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCmluZGV4IGVjZjI1MjYyNTZjNDY5MGY4N2VlNGEwM2E5 ZmEzNDIyNTE5MDJmZDYuLjllMWM5NDdhNjRhY2YzMzVkYzMyMjllOWE0N2IzOGRjNzJmOTBkZTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2lu ZG93Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTQxNSw2ICs0MTUsNyBAQCBzdGF0aWMgY29u c3QgZmxvYXQgbWluVmlkZW9XaWR0aCA9IDQ4MCArIDIwICsgMjA7IC8vIE5vdGU6IEtlZXAgaW4g c3luYyB3aXRoIG1lZAogICAgIFtzZWxmIF9tYW5hZ2VyXS0+c2V0QW5pbWF0aW5nRnVsbFNjcmVl bihmYWxzZSk7CiAgICAgX3BhZ2UtPnNjYWxlUGFnZShfc2F2ZWRTY2FsZSwgSW50UG9pbnQoKSk7 CiAgICAgW3NlbGYgX21hbmFnZXJdLT5yZXN0b3JlU2Nyb2xsUG9zaXRpb24oKTsKKyAgICBfcGFn ZS0+c2V0VG9wQ29udGVudEluc2V0KF9zYXZlZFRvcENvbnRlbnRJbnNldCk7CiAKICAgICBpZiAo X3JlcGFpbnRDYWxsYmFjaykgewogICAgICAgICBfcmVwYWludENhbGxiYWNrLT5pbnZhbGlkYXRl KFdlYktpdDo6Q2FsbGJhY2tCYXNlOjpFcnJvcjo6T3duZXJXYXNJbnZhbGlkYXRlZCk7CmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjNiYmI4NGI5 YzI0YzA3YTgxYmE3YThhMzQ4MWNkODI4NDZhYjllNS4uOGZhMWFkZDAzZDVkZjcwZDYwMTA3YzRj OGUwYzYyNzUwMDljOThiOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTEyLTEyICBKZXIgTm9ibGUgIDxqZXIu bm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4gaW4gV2ViS2l0MiBkb2VzIG5v dCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7IGxlYXZlcyB0b3Agb2YgcGFn ZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTY1Njk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9GdWxsc2NyZWVuVG9wQ29u dGVudEluc2V0Lm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMTYtMTIt MTIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hhbmdl TG9ncyBiZWNvbWUgcmVhZG9ubHkgYWZ0ZXIgcmVzb2x2aW5nIGEgY29uZmxpY3QKZGlmZiAtLWdp dCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL0Z1bGxzY3JlZW5Ub3BD b250ZW50SW5zZXQubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9G dWxsc2NyZWVuVG9wQ29udGVudEluc2V0Lm1tCmluZGV4IDAxZjZlODg5M2MxZjM3MjczZjc5ODAy Mzc3OGNkYzUyMWVlYmQzOGYuLmQxMWM4MGFjNmU0ZGUzMmZhNjFiZWYzZTJkODcyOTMxMDdiNjJk MTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL0Z1 bGxzY3JlZW5Ub3BDb250ZW50SW5zZXQubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVlblRvcENvbnRlbnRJbnNldC5tbQpAQCAtNTgsNiArNTgs NyBAQCBURVNUKEZ1bGxzY3JlZW4sIFRvcENvbnRlbnRJbnNldCkKICAgICBSZXRhaW5QdHI8V0tX ZWJWaWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdD b25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgUmV0YWluUHRyPFdLV2ViVmlldz4gd2Vi VmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVj dCgwLCAwLCAxMDAsIDEwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CiAg ICAgW3dlYlZpZXcgX3NldFRvcENvbnRlbnRJbnNldDoxMF07CisgICAgW3dlYlZpZXcgX3NldEF1 dG9tYXRpY2FsbHlBZGp1c3RzQ29udGVudEluc2V0czpOT107CiAgICAgW2NvbmZpZ3VyYXRpb24g cHJlZmVyZW5jZXNdLl9mdWxsU2NyZWVuRW5hYmxlZCA9IFlFUzsKICAgICBSZXRhaW5QdHI8RnVs bHNjcmVlbkNoYW5nZU1lc3NhZ2VIYW5kbGVyPiBoYW5kbGVyID0gYWRvcHROUyhbW0Z1bGxzY3Jl ZW5DaGFuZ2VNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOwogICAgIFtbY29uZmlndXJhdGlv biB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOmhhbmRsZXIu Z2V0KCkgbmFtZTpAImZ1bGxzY3JlZW5DaGFuZ2VIYW5kbGVyIl07CkBAIC03NSw2ICs3NiwxMSBA QCBURVNUKEZ1bGxzY3JlZW4sIFRvcENvbnRlbnRJbnNldCkKICAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJnJlY2VpdmVkRnVsbHNjcmVlbkNoYW5nZU1lc3NhZ2UpOwogICAgIEFTU0VSVF9F USh3aW5kb3cuZ2V0KCkuc2NyZWVuLmZyYW1lLnNpemUud2lkdGgsIHdlYlZpZXcuZ2V0KCkuZnJh bWUuc2l6ZS53aWR0aCk7CiAgICAgQVNTRVJUX0VRKHdpbmRvdy5nZXQoKS5zY3JlZW4uZnJhbWUu c2l6ZS5oZWlnaHQgKyB3ZWJWaWV3LmdldCgpLl90b3BDb250ZW50SW5zZXQsIHdlYlZpZXcuZ2V0 KCkuZnJhbWUuc2l6ZS5oZWlnaHQpOworCisgICAgcmVjZWl2ZWRGdWxsc2NyZWVuQ2hhbmdlTWVz c2FnZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IG1vdXNlRG93bjpldmVudF07CisgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZEZ1bGxzY3JlZW5DaGFuZ2VNZXNzYWdlKTsKKyAg ICBBU1NFUlRfRVEoMTAsIHdlYlZpZXcuZ2V0KCkuX3RvcENvbnRlbnRJbnNldCk7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkK 297022 2016-12-13 10:33:43 -0800 2016-12-13 15:37:50 -0800 Patch for landing bug-165697-20161213103258.patch text/plain 7429 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5NzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGFiODU2NjljOGJkZGRi N2NiMjBmOThjNTk5NzFhY2FjZTM2MzNmZC4uYmY1ODk4NWVkYjlmYmQxNmQyMGI4Mzk1YWM0MGVl YzFmOTY2MmFkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTEyLTEyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEZ1bGxzY3JlZW4gaW4gV2Vi S2l0MiBkb2VzIG5vdCByZXN0b3JlIHRvcENvbnRlbnRJbnNldCB1cG9uIGV4aXRpbmc7IGxlYXZl cyB0b3Agb2YgcGFnZSBub3QgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTY1Njk3CisKKyAgICAgICAgRGVsZWdhdGUgdGhlIHZhbHVlcyBv ZiB0b3BDb250ZW50SW5zZXQoKSBmcm9tIFdlYlZpZXdJbXBsICh1c2VkIGJ5IFdLV2ViVmlldyBh bmQgV0tWaWV3KSB0byB0aGUKKyAgICAgICAgV2ViUGFnZVByb3h5LCBzbyB0aGF0IHNldHRpbmcg dGhlIHRvcENvbnRlbnRJbnNldCgpIG9uIFdlYlBhZ2VQcm94eSBpcyByZWZsZWN0ZWQgaW4gdGhl IGdldHRlcnMKKyAgICAgICAgZm9yIHRoZSB0d28gdmlldyBjbGFzc2VzLgorCisgICAgICAgIFJl dmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnRvcENvbnRlbnRJbnNldCk6 IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dXBkYXRlQ29udGVudEluc2V0c0lmQXV0b21hdGlj KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnRvcENvbnRlbnRJbnNldCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRUb3BDb250ZW50SW5zZXQpOgorICAgICAgICAo V2ViS2l0OjpXZWJWaWV3SW1wbDo6ZGlzcGF0Y2hTZXRUb3BDb250ZW50SW5zZXQpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlci5tbToKKyAgICAg ICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBlbnRlckZ1bGxTY3JlZW46XSk6Cisg ICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgZmluaXNoZWRFbnRlckZ1bGxT Y3JlZW5BbmltYXRpb246XSk6CisgICAgICAgICgtW1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xs ZXIgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFuaW1hdGlvbjpdKToKKyAgICAgICAgKC1bV0tGdWxs U2NyZWVuV2luZG93Q29udHJvbGxlciBfc2F2ZVRvcENvbnRlbnRJbnNldF0pOiBEZWxldGVkLgor ICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIF9yZXN0b3JlVG9wQ29udGVu dEluc2V0XSk6IERlbGV0ZWQuCisKIDIwMTYtMTItMTEgIEtvbnN0YW50aW4gVG9rYXJldiAgPGFu bnVsZW5AeWFuZGV4LnJ1PgogCiAgICAgICAgIFVucmV2aWV3ZWQgYXR0ZW1wdCB0byBmaXggRUZM IGFuZCBNYWMvY21ha2UgYnVpbGRzIGFmdGVyIHIyMDk2NjUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCmluZGV4IGIyOWRhNzg2MWJiMGJjODNiZTMyNzIy OTMzMmE5YTM4MTkwOWI5MGQuLjY1YTk5Y2U2MzE4ZTRjMzQ3NWRiNDQ4YTUzZGFiY2E3ZTQxOWNm MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1w bC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCkBA IC0xNzAsNyArMTcwLDcgQEAgcHVibGljOgogICAgIGJvb2wgYXV0b21hdGljYWxseUFkanVzdHND b250ZW50SW5zZXRzKCkgY29uc3QgeyByZXR1cm4gbV9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRl bnRJbnNldHM7IH0KICAgICB2b2lkIHVwZGF0ZUNvbnRlbnRJbnNldHNJZkF1dG9tYXRpYygpOwog ICAgIHZvaWQgc2V0VG9wQ29udGVudEluc2V0KENHRmxvYXQpOwotICAgIENHRmxvYXQgdG9wQ29u dGVudEluc2V0KCkgY29uc3QgeyByZXR1cm4gbV90b3BDb250ZW50SW5zZXQ7IH0KKyAgICBDR0Zs b2F0IHRvcENvbnRlbnRJbnNldCgpIGNvbnN0OwogCiAgICAgdm9pZCBwcmVwYXJlQ29udGVudElu UmVjdChDR1JlY3QpOwogICAgIHZvaWQgdXBkYXRlVmlld0V4cG9zZWRSZWN0KCk7CkBAIC02MDYs NyArNjA2LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fd2luZG93T2NjbHVzaW9uRGV0ZWN0aW9u RW5hYmxlZCB7IHRydWUgfTsKIAogICAgIGJvb2wgbV9hdXRvbWF0aWNhbGx5QWRqdXN0c0NvbnRl bnRJbnNldHMgeyBmYWxzZSB9OwotICAgIENHRmxvYXQgbV90b3BDb250ZW50SW5zZXQgeyAwIH07 CisgICAgQ0dGbG9hdCBtX3BlbmRpbmdUb3BDb250ZW50SW5zZXQgeyAwIH07CiAgICAgYm9vbCBt X2RpZFNjaGVkdWxlU2V0VG9wQ29udGVudEluc2V0IHsgZmFsc2UgfTsKIAogICAgIENHU2l6ZSBt X3Jlc2l6ZVNjcm9sbE9mZnNldCB7IDAsIDAgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db2NvYS9XZWJWaWV3SW1wbC5tbQppbmRleCBlYWQ2MmE1YjMyYzRhNzhjYWMzOGFmODlhMjNh MDFjYTliOTYzYjVlLi4wZTE3NDAxN2QyODA2NGVkNTY4ZjE2YmEwZjcwZWNkMjRjMzAxNGExIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC0x NjE1LDE1ICsxNjE1LDIyIEBAIHZvaWQgV2ViVmlld0ltcGw6OnVwZGF0ZUNvbnRlbnRJbnNldHNJ ZkF1dG9tYXRpYygpCiAgICAgaWYgKCh3aW5kb3cuc3R5bGVNYXNrICYgTlNXaW5kb3dTdHlsZU1h c2tGdWxsU2l6ZUNvbnRlbnRWaWV3KSAmJiAhd2luZG93LnRpdGxlYmFyQXBwZWFyc1RyYW5zcGFy ZW50ICYmICFbbV92aWV3IGVuY2xvc2luZ1Njcm9sbFZpZXddKSB7CiAgICAgICAgIE5TUmVjdCBj b250ZW50TGF5b3V0UmVjdCA9IFttX3ZpZXcgY29udmVydFJlY3Q6d2luZG93LmNvbnRlbnRMYXlv dXRSZWN0IGZyb21WaWV3Om5pbF07CiAgICAgICAgIENHRmxvYXQgbmV3VG9wQ29udGVudEluc2V0 ID0gTlNNYXhZKGNvbnRlbnRMYXlvdXRSZWN0KSAtIE5TSGVpZ2h0KGNvbnRlbnRMYXlvdXRSZWN0 KTsKLSAgICAgICAgaWYgKG1fdG9wQ29udGVudEluc2V0ICE9IG5ld1RvcENvbnRlbnRJbnNldCkK KyAgICAgICAgaWYgKG1fcGFnZS0+dG9wQ29udGVudEluc2V0KCkgIT0gbmV3VG9wQ29udGVudElu c2V0KQogICAgICAgICAgICAgc2V0VG9wQ29udGVudEluc2V0KG5ld1RvcENvbnRlbnRJbnNldCk7 CiAgICAgfSBlbHNlCiAgICAgICAgIHNldFRvcENvbnRlbnRJbnNldCgwKTsKIH0KIAorQ0dGbG9h dCBXZWJWaWV3SW1wbDo6dG9wQ29udGVudEluc2V0KCkgY29uc3QKK3sKKyAgICBpZiAobV9kaWRT Y2hlZHVsZVNldFRvcENvbnRlbnRJbnNldCkKKyAgICAgICAgcmV0dXJuIG1fcGVuZGluZ1RvcENv bnRlbnRJbnNldDsKKyAgICByZXR1cm4gbV9wYWdlLT50b3BDb250ZW50SW5zZXQoKTsKK30KKwog dm9pZCBXZWJWaWV3SW1wbDo6c2V0VG9wQ29udGVudEluc2V0KENHRmxvYXQgY29udGVudEluc2V0 KQogewotICAgIG1fdG9wQ29udGVudEluc2V0ID0gY29udGVudEluc2V0OworICAgIG1fcGVuZGlu Z1RvcENvbnRlbnRJbnNldCA9IGNvbnRlbnRJbnNldDsKIAogICAgIGlmIChtX2RpZFNjaGVkdWxl U2V0VG9wQ29udGVudEluc2V0KQogICAgICAgICByZXR1cm47CkBAIC0xNjQ0LDcgKzE2NTEsNyBA QCB2b2lkIFdlYlZpZXdJbXBsOjpkaXNwYXRjaFNldFRvcENvbnRlbnRJbnNldCgpCiAgICAgICAg IHJldHVybjsKIAogICAgIG1fZGlkU2NoZWR1bGVTZXRUb3BDb250ZW50SW5zZXQgPSBmYWxzZTsK LSAgICBtX3BhZ2UtPnNldFRvcENvbnRlbnRJbnNldChtX3RvcENvbnRlbnRJbnNldCk7CisgICAg bV9wYWdlLT5zZXRUb3BDb250ZW50SW5zZXQobV9wZW5kaW5nVG9wQ29udGVudEluc2V0KTsKIH0K IAogdm9pZCBXZWJWaWV3SW1wbDo6cHJlcGFyZUNvbnRlbnRJblJlY3QoQ0dSZWN0IHJlY3QpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRv d0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVl bldpbmRvd0NvbnRyb2xsZXIubW0KaW5kZXggZWNmMjUyNjI1NmM0NjkwZjg3ZWU0YTAzYTlmYTM0 MjI1MTkwMmZkNi4uOWUxYzk0N2E2NGFjZjMzNWRjMzIyOWU5YTQ3YjM4ZGM3MmY5MGRlOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2Ny ZWVuV2luZG93Q29udHJvbGxlci5tbQpAQCAtNDE1LDYgKzQxNSw3IEBAIHN0YXRpYyBjb25zdCBm bG9hdCBtaW5WaWRlb1dpZHRoID0gNDgwICsgMjAgKyAyMDsgLy8gTm90ZTogS2VlcCBpbiBzeW5j IHdpdGggbWVkCiAgICAgW3NlbGYgX21hbmFnZXJdLT5zZXRBbmltYXRpbmdGdWxsU2NyZWVuKGZh bHNlKTsKICAgICBfcGFnZS0+c2NhbGVQYWdlKF9zYXZlZFNjYWxlLCBJbnRQb2ludCgpKTsKICAg ICBbc2VsZiBfbWFuYWdlcl0tPnJlc3RvcmVTY3JvbGxQb3NpdGlvbigpOworICAgIF9wYWdlLT5z ZXRUb3BDb250ZW50SW5zZXQoX3NhdmVkVG9wQ29udGVudEluc2V0KTsKIAogICAgIGlmIChfcmVw YWludENhbGxiYWNrKSB7CiAgICAgICAgIF9yZXBhaW50Q2FsbGJhY2stPmludmFsaWRhdGUoV2Vi S2l0OjpDYWxsYmFja0Jhc2U6OkVycm9yOjpPd25lcldhc0ludmFsaWRhdGVkKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiM2JiYjg0YjljMjRj MDdhODFiYTdhOGEzNDgxY2Q4Mjg0NmFiOWU1Li5mODM5ODk0MDQ4MDg5YjMwNzM1YzU5OTA2OTIy MjUwMTVkNzgxMTBhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMTItMTIgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgRnVsbHNjcmVlbiBpbiBXZWJLaXQyIGRvZXMgbm90IHJl c3RvcmUgdG9wQ29udGVudEluc2V0IHVwb24gZXhpdGluZzsgbGVhdmVzIHRvcCBvZiBwYWdlIG5v dCB2aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNjU2OTcKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVlblRvcENvbnRlbnRJbnNl dC5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE2LTEyLTEyICBBbGV4 ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIENoYW5nZUxvZ3MgYmVj b21lIHJlYWRvbmx5IGFmdGVyIHJlc29sdmluZyBhIGNvbmZsaWN0CmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9GdWxsc2NyZWVuVG9wQ29udGVudElu c2V0Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvRnVsbHNjcmVl blRvcENvbnRlbnRJbnNldC5tbQppbmRleCAwMWY2ZTg4OTNjMWYzNzI3M2Y3OTgwMjM3NzhjZGM1 MjFlZWJkMzhmLi5kMTFjODBhYzZlNGRlMzJmYTYxYmVmM2UyZDg3MjkzMTA3YjYyZDEwIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9GdWxsc2NyZWVu VG9wQ29udGVudEluc2V0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 MkNvY29hL0Z1bGxzY3JlZW5Ub3BDb250ZW50SW5zZXQubW0KQEAgLTU4LDYgKzU4LDcgQEAgVEVT VChGdWxsc2NyZWVuLCBUb3BDb250ZW50SW5zZXQpCiAgICAgUmV0YWluUHRyPFdLV2ViVmlld0Nv bmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBhbGxvY10gaW5pdF0pOwogICAgIFJldGFpblB0cjxXS1dlYlZpZXc+IHdlYlZpZXcgPSBh ZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwg MTAwLCAxMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgIFt3ZWJW aWV3IF9zZXRUb3BDb250ZW50SW5zZXQ6MTBdOworICAgIFt3ZWJWaWV3IF9zZXRBdXRvbWF0aWNh bGx5QWRqdXN0c0NvbnRlbnRJbnNldHM6Tk9dOwogICAgIFtjb25maWd1cmF0aW9uIHByZWZlcmVu Y2VzXS5fZnVsbFNjcmVlbkVuYWJsZWQgPSBZRVM7CiAgICAgUmV0YWluUHRyPEZ1bGxzY3JlZW5D aGFuZ2VNZXNzYWdlSGFuZGxlcj4gaGFuZGxlciA9IGFkb3B0TlMoW1tGdWxsc2NyZWVuQ2hhbmdl TWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKICAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNv bnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjpoYW5kbGVyLmdldCgpIG5h bWU6QCJmdWxsc2NyZWVuQ2hhbmdlSGFuZGxlciJdOwpAQCAtNzUsNiArNzYsMTEgQEAgVEVTVChG dWxsc2NyZWVuLCBUb3BDb250ZW50SW5zZXQpCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZyZWNlaXZlZEZ1bGxzY3JlZW5DaGFuZ2VNZXNzYWdlKTsKICAgICBBU1NFUlRfRVEod2luZG93 LmdldCgpLnNjcmVlbi5mcmFtZS5zaXplLndpZHRoLCB3ZWJWaWV3LmdldCgpLmZyYW1lLnNpemUu d2lkdGgpOwogICAgIEFTU0VSVF9FUSh3aW5kb3cuZ2V0KCkuc2NyZWVuLmZyYW1lLnNpemUuaGVp Z2h0ICsgd2ViVmlldy5nZXQoKS5fdG9wQ29udGVudEluc2V0LCB3ZWJWaWV3LmdldCgpLmZyYW1l LnNpemUuaGVpZ2h0KTsKKworICAgIHJlY2VpdmVkRnVsbHNjcmVlbkNoYW5nZU1lc3NhZ2UgPSBm YWxzZTsKKyAgICBbd2ViVmlldyBtb3VzZURvd246ZXZlbnRdOworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmcmVjZWl2ZWRGdWxsc2NyZWVuQ2hhbmdlTWVzc2FnZSk7CisgICAgQVNTRVJU X0VRKDEwLCB3ZWJWaWV3LmdldCgpLl90b3BDb250ZW50SW5zZXQpOwogfQogCiB9IC8vIG5hbWVz cGFjZSBUZXN0V2ViS2l0QVBJCg==