144760 2015-05-07 14:26:19 -0700 Add a mechanism to opt-out of the automatic scaling applied to not-really-responsive sites 2015-05-20 13:44:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, WebExposed P2 Normal --- 1 thorton thorton benjamin commit-queue dbates esprehn+autocc kangil.han sam simon.fraser webkit-bug-importer oldest_to_newest 1092750 0 thorton 2015-05-07 14:26:19 -0700 Add a mechanism to opt-out of the automatic scaling applied to not-really-responsive sites 1092751 1 252628 thorton 2015-05-07 14:26:44 -0700 Created attachment 252628 Patch 1092779 2 252628 thorton 2015-05-07 15:15:33 -0700 Comment on attachment 252628 Patch Going in a different direction with this. 1092831 3 252645 thorton 2015-05-07 16:29:05 -0700 Created attachment 252645 Patch 1093606 4 252645 darin 2015-05-10 15:20:57 -0700 Comment on attachment 252645 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252645&action=review > Source/WebCore/dom/ViewportArguments.cpp:398 > // FIXME: Ignore silently for now. This should eventually fallback to the warning. the verb fall back is two words > Source/WebCore/dom/ViewportArguments.h:91 > + , shrinkToFit(ValueAuto) Should initialize below instead of here in the constructor (now that we can). > Source/WebCore/dom/ViewportArguments.h:109 > + float shrinkToFit; I don’t get why this is a float. > Source/WebCore/page/ViewportConfiguration.cpp:306 > + if (booleanViewportArgumentIsSet(m_viewportArguments.userZoom)) > m_configuration.allowsUserScaling = m_viewportArguments.userZoom != 0.; Strange to use a function for one thing and inline code for the other. Also the use of != 0. here is strangely different from what booleanViewportArgumentIsSet does. 1096340 5 thorton 2015-05-20 13:43:30 -0700 http://trac.webkit.org/changeset/184654 1096342 6 webkit-bug-importer 2015-05-20 13:44:47 -0700 <rdar://problem/21044514> 252628 2015-05-07 14:26:44 -0700 2015-05-07 15:15:51 -0700 Patch bug-144760-20150507142527.patch text/plain 12146 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQzYmMzMjc0OWM0Yzc3 YmQ1ZWNkNmNmMjNjNjY0MDAzNmVhZjc3ZC4uYzMzMDk5OGI3OTFkNjljYjkyODdjMzFhZGMzMGNh ZTE0MDQzNTk0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE1LTA1LTA3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIG1lY2hh bmlzbSB0byBvcHQtb3V0IG9mIHRoZSBhdXRvbWF0aWMgc2NhbGluZyBhcHBsaWVkIHRvIG5vdC1y ZWFsbHktcmVzcG9uc2l2ZSBzaXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ0NzYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIHR3byBuZXcgdmlld3BvcnQgdmFsdWVzLCB3aW5kb3ctd2lkdGgg YW5kIHdpbmRvdy1oZWlnaHQsIHdoaWNoIGNhbiBiZQorICAgICAgICB1c2VkIGFzIHRoZSB2YWx1 ZXMgZm9yIHRoZSB3aWR0aCBhbmQgaGVpZ2h0IHByb3BlcnRpZXMsIGFuZCBiZWhhdmUgZXhhY3Rs eQorICAgICAgICB0aGUgc2FtZSBhcyBkZXZpY2Utd2lkdGggYW5kIGRldmljZS1oZWlnaHQgKHdo aWNoIGFscmVhZHkgbWFwIHRvIHRoZSAid2luZG93IgorICAgICAgICBzaXplLCBub3QgdG8gdGhl IGRldmljZSBzaXplKSwgZXhjZXB0IHdpdGhvdXQgdGhlIGF1dG9tYXRpYyBzY2FsaW5nCisgICAg ICAgIGludHJvZHVjZWQgaW4gcjE4MTQwMC4gVGhpcyBwcm92aWRlcyBzaXRlcyB3aXRoIGEgd2F5 IHRvIHRlbGwgV2ViS2l0IHRoYXQKKyAgICAgICAgdGhleSdyZSByZWFsbHkgc3VyZSB0aGV5IHdh bnQgdG8gYmUgbGFpZCBvdXQgYXQgd2luZG93LXdpZHRoL2hlaWdodCwgZXZlbgorICAgICAgICBp ZiB0aGV5IGZhaWwgdG8gZml0IHdpdGhpbiB0aGF0IHNpemUuCisKKyAgICAgICAgKiBkb20vVmll d3BvcnRBcmd1bWVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2xhbXBMZW5ndGhWYWx1ZSk6 CisgICAgICAgIChXZWJDb3JlOjpjbGFtcFNjYWxlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6 Vmlld3BvcnRBcmd1bWVudHM6OnJlc29sdmUpOgorICAgICAgICAoV2ViQ29yZTo6ZmluZFNpemVW YWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpmaW5kU2NhbGVWYWx1ZSk6CisgICAgICAgIChXZWJD b3JlOjpmaW5kVXNlclNjYWxhYmxlVmFsdWUpOgorICAgICAgICBNYWtlIGFsbCBsb2dpYyB0aGF0 IGNvbnNpZGVycyBWYWx1ZURldmljZVtXaWR0aHxIZWlnaHRdIG9yIGRldmljZS1bd2lkdGh8aGVp Z2h0XQorICAgICAgICBhbHNvIGFjY2VwdCBWYWx1ZVdpbmRvd1tXaWR0aHxIZWlnaHRdIG9yIHdp bmRvdy1bd2lkdGh8aGVpZ2h0XS4KKyAgICAgICAgTWFrZSB1c2Ugb2YgaXNXaW5kb3dPckRldmlj ZVtXaWR0aHxIZWlnaHRdIHRvIGRvIHNvLgorICAgICAgICBJbiBWaWV3cG9ydEFyZ3VtZW50cywg ZGV2aWNlLSBhbmQgd2luZG93LSBiZWhhdmUgaWRlbnRpY2FsbHkuCisKKyAgICAgICAgKiBkb20v Vmlld3BvcnRBcmd1bWVudHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRz Ojppc1dpbmRvd09yRGV2aWNlV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRBcmd1 bWVudHM6OmlzV2luZG93T3JEZXZpY2VIZWlnaHQpOgorICAgICAgICBBZGQgdGhlIG5ldyB2YWx1 ZXMgYW5kIGhlbHBlcnMgdG8gY29tcGFyZSBhIHZhbHVlIHRvIHdpbmRvdy14IG9yIGRldmljZS14 LgorCisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjp2aWV3cG9ydEFyZ3VtZW50c0xlbmd0aCk6 CisgICAgICAgIFdoZW4gcmVzb2x2aW5nIGEgbGVuZ3RoIGluIFZpZXdwb3J0Q29uZmlndXJhdGlv biwgdHJlYXQgd2luZG93LXggYW5kIGRldmljZS14IGlkZW50aWNhbGx5LgorICAgICAgICBOb3Rl IHRoYXQgdGhlIG9ubHkgb3RoZXIgY29kZSBpbiBWaWV3cG9ydENvbmZpZ3VyYXRpb24gdGhhdCBs b29rcyBhdAorICAgICAgICBkZXZpY2UtW3dpZHRofGhlaWdodF0gaXMgdGhlIGF1dG9tYXRpYyBz Y2FsaW5nIGNvZGUgdGhhdCB3ZSdyZSB0cnlpbmcgdG8gZGlzYWJsZSwKKyAgICAgICAgYW5kIGl0 IGlzIG5vdCBtb2RpZmllZCBpbiB0aGlzIGNhc2UuCisKIDIwMTUtMDUtMDcgIERhbiBCZXJuc3Rl aW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBUcmllZCB0byBmaXggdGhlIGJ1aWxkLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKaW5kZXggMGUxMjRiMWUxZWZi ZTE4ZGMxMmViODc5NGNiNGU1NWU3OGU5MTkxNC4uYTYzNDkyZjFjNWM5NTMxNmI0YzY4MTFmNWI1 NGVkOGQxNmY4OTdkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJn dW1lbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3Bw CkBAIC01NSw4ICs1NSw4IEBAIHN0YXRpYyBjb25zdCBmbG9hdCYgY29tcGFyZUlnbm9yaW5nQXV0 byhjb25zdCBmbG9hdCYgdmFsdWUxLCBjb25zdCBmbG9hdCYgdmFsdWUyCiAKIHN0YXRpYyBpbmxp bmUgZmxvYXQgY2xhbXBMZW5ndGhWYWx1ZShmbG9hdCB2YWx1ZSkKIHsKLSAgICBBU1NFUlQodmFs dWUgIT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlV2lkdGgpOwotICAgIEFTU0VSVCh2 YWx1ZSAhPSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVEZXZpY2VIZWlnaHQpOworICAgIEFTU0VS VCghVmlld3BvcnRBcmd1bWVudHM6OmlzV2luZG93T3JEZXZpY2VXaWR0aCh2YWx1ZSkpOworICAg IEFTU0VSVCghVmlld3BvcnRBcmd1bWVudHM6OmlzV2luZG93T3JEZXZpY2VIZWlnaHQodmFsdWUp KTsKIAogICAgIC8vIExpbWl0cyBhcyBkZWZpbmVkIGluIHRoZSBjc3MtZGV2aWNlLWFkYXB0IHNw ZWMuCiAgICAgaWYgKHZhbHVlICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZUF1dG8pCkBAIC02 Niw4ICs2Niw4IEBAIHN0YXRpYyBpbmxpbmUgZmxvYXQgY2xhbXBMZW5ndGhWYWx1ZShmbG9hdCB2 YWx1ZSkKIAogc3RhdGljIGlubGluZSBmbG9hdCBjbGFtcFNjYWxlVmFsdWUoZmxvYXQgdmFsdWUp CiB7Ci0gICAgQVNTRVJUKHZhbHVlICE9IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZVdp ZHRoKTsKLSAgICBBU1NFUlQodmFsdWUgIT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNl SGVpZ2h0KTsKKyAgICBBU1NFUlQoIVZpZXdwb3J0QXJndW1lbnRzOjppc1dpbmRvd09yRGV2aWNl V2lkdGgodmFsdWUpKTsKKyAgICBBU1NFUlQoIVZpZXdwb3J0QXJndW1lbnRzOjppc1dpbmRvd09y RGV2aWNlSGVpZ2h0KHZhbHVlKSk7CiAKICAgICAvLyBMaW1pdHMgYXMgZGVmaW5lZCBpbiB0aGUg Y3NzLWRldmljZS1hZGFwdCBzcGVjLgogICAgIGlmICh2YWx1ZSAhPSBWaWV3cG9ydEFyZ3VtZW50 czo6VmFsdWVBdXRvKQpAQCAtOTAsMTggKzkwLDIyIEBAIFZpZXdwb3J0QXR0cmlidXRlcyBWaWV3 cG9ydEFyZ3VtZW50czo6cmVzb2x2ZShjb25zdCBGbG9hdFNpemUmIGluaXRpYWxWaWV3cG9ydFNp CiAKICAgICBzd2l0Y2ggKGludChyZXN1bHRXaWR0aCkpIHsKICAgICBjYXNlIFZpZXdwb3J0QXJn dW1lbnRzOjpWYWx1ZURldmljZVdpZHRoOgorICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6OlZh bHVlV2luZG93V2lkdGg6CiAgICAgICAgIHJlc3VsdFdpZHRoID0gZGV2aWNlU2l6ZS53aWR0aCgp OwogICAgICAgICBicmVhazsKICAgICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmlj ZUhlaWdodDoKKyAgICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZVdpbmRvd0hlaWdodDoK ICAgICAgICAgcmVzdWx0V2lkdGggPSBkZXZpY2VTaXplLmhlaWdodCgpOwogICAgICAgICBicmVh azsKICAgICB9CiAKICAgICBzd2l0Y2ggKGludChyZXN1bHRIZWlnaHQpKSB7CiAgICAgY2FzZSBW aWV3cG9ydEFyZ3VtZW50czo6VmFsdWVEZXZpY2VXaWR0aDoKKyAgICBjYXNlIFZpZXdwb3J0QXJn dW1lbnRzOjpWYWx1ZVdpbmRvd1dpZHRoOgogICAgICAgICByZXN1bHRIZWlnaHQgPSBkZXZpY2VT aXplLndpZHRoKCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6 OlZhbHVlRGV2aWNlSGVpZ2h0OgorICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlV2lu ZG93SGVpZ2h0OgogICAgICAgICByZXN1bHRIZWlnaHQgPSBkZXZpY2VTaXplLmhlaWdodCgpOwog ICAgICAgICBicmVhazsKICAgICB9CkBAIC0xMDksMzYgKzExMyw0NCBAQCBWaWV3cG9ydEF0dHJp YnV0ZXMgVmlld3BvcnRBcmd1bWVudHM6OnJlc29sdmUoY29uc3QgRmxvYXRTaXplJiBpbml0aWFs Vmlld3BvcnRTaQogICAgIGlmICh0eXBlID09IFZpZXdwb3J0QXJndW1lbnRzOjpDU1NEZXZpY2VB ZGFwdGF0aW9uKSB7CiAgICAgICAgIHN3aXRjaCAoaW50KHJlc3VsdE1pbldpZHRoKSkgewogICAg ICAgICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZVdpZHRoOgorICAgICAgICBj YXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZVdpbmRvd1dpZHRoOgogICAgICAgICAgICAgcmVz dWx0TWluV2lkdGggPSBkZXZpY2VTaXplLndpZHRoKCk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgY2FzZSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVEZXZpY2VIZWlnaHQ6CisgICAgICAg IGNhc2UgVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlV2luZG93SGVpZ2h0OgogICAgICAgICAgICAg cmVzdWx0TWluV2lkdGggPSBkZXZpY2VTaXplLmhlaWdodCgpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KIAogICAgICAgICBzd2l0Y2ggKGludChyZXN1bHRNYXhXaWR0aCkpIHsKICAg ICAgICAgY2FzZSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVEZXZpY2VXaWR0aDoKKyAgICAgICAg Y2FzZSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVXaW5kb3dXaWR0aDoKICAgICAgICAgICAgIHJl c3VsdE1heFdpZHRoID0gZGV2aWNlU2l6ZS53aWR0aCgpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlSGVpZ2h0OgorICAgICAg ICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZVdpbmRvd0hlaWdodDoKICAgICAgICAgICAg IHJlc3VsdE1heFdpZHRoID0gZGV2aWNlU2l6ZS5oZWlnaHQoKTsKICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CiAKICAgICAgICAgc3dpdGNoIChpbnQocmVzdWx0TWluSGVpZ2h0KSkgewog ICAgICAgICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZVdpZHRoOgorICAgICAg ICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZVdpbmRvd1dpZHRoOgogICAgICAgICAgICAg cmVzdWx0TWluSGVpZ2h0ID0gZGV2aWNlU2l6ZS53aWR0aCgpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIGNhc2UgVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlSGVpZ2h0OgorICAg ICAgICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZVdpbmRvd0hlaWdodDoKICAgICAgICAg ICAgIHJlc3VsdE1pbkhlaWdodCA9IGRldmljZVNpemUuaGVpZ2h0KCk7CiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgfQogCiAgICAgICAgIHN3aXRjaCAoaW50KHJlc3VsdE1heEhlaWdodCkp IHsKICAgICAgICAgY2FzZSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVEZXZpY2VXaWR0aDoKKyAg ICAgICAgY2FzZSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVXaW5kb3dXaWR0aDoKICAgICAgICAg ICAgIHJlc3VsdE1heEhlaWdodCA9IGRldmljZVNpemUud2lkdGgoKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZUhlaWdodDoK KyAgICAgICAgY2FzZSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVXaW5kb3dIZWlnaHQ6CiAgICAg ICAgICAgICByZXN1bHRNYXhIZWlnaHQgPSBkZXZpY2VTaXplLmhlaWdodCgpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KQEAgLTMxMCwxMyArMzIyLDE3IEBAIHN0YXRpYyBmbG9hdCBm aW5kU2l6ZVZhbHVlKGNvbnN0IFN0cmluZyYga2V5U3RyaW5nLCBjb25zdCBTdHJpbmcmIHZhbHVl U3RyaW5nLCBECiB7CiAgICAgLy8gMSkgTm9uLW5lZ2F0aXZlIG51bWJlciB2YWx1ZXMgYXJlIHRy YW5zbGF0ZWQgdG8gcHggbGVuZ3Rocy4KICAgICAvLyAyKSBOZWdhdGl2ZSBudW1iZXIgdmFsdWVz IGFyZSB0cmFuc2xhdGVkIHRvIGF1dG8uCi0gICAgLy8gMykgZGV2aWNlLXdpZHRoIGFuZCBkZXZp Y2UtaGVpZ2h0IGFyZSB1c2VkIGFzIGtleXdvcmRzLgorICAgIC8vIDMpIFtkZXZpY2V8d2luZG93 XS13aWR0aCBhbmQgW2RldmljZXx3aW5kb3ddLWhlaWdodCBhcmUgdXNlZCBhcyBrZXl3b3Jkcy4K ICAgICAvLyA0KSBPdGhlciBrZXl3b3JkcyBhbmQgdW5rbm93biB2YWx1ZXMgdHJhbnNsYXRlIHRv IDAuMC4KIAogICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZVN0cmluZywgImRldmljZS13 aWR0aCIpKQogICAgICAgICByZXR1cm4gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlV2lk dGg7CiAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHZhbHVlU3RyaW5nLCAiZGV2aWNlLWhlaWdo dCIpKQogICAgICAgICByZXR1cm4gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlSGVpZ2h0 OworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh2YWx1ZVN0cmluZywgIndpbmRvdy13aWR0aCIp KQorICAgICAgICByZXR1cm4gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlV2luZG93V2lkdGg7Cisg ICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHZhbHVlU3RyaW5nLCAid2luZG93LWhlaWdodCIpKQor ICAgICAgICByZXR1cm4gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlV2luZG93SGVpZ2h0OwogCiAg ICAgZmxvYXQgdmFsdWUgPSBudW1lcmljUHJlZml4KGtleVN0cmluZywgdmFsdWVTdHJpbmcsIGRv Y3VtZW50KTsKIApAQCAtMzMxLDcgKzM0Nyw3IEBAIHN0YXRpYyBmbG9hdCBmaW5kU2NhbGVWYWx1 ZShjb25zdCBTdHJpbmcmIGtleVN0cmluZywgY29uc3QgU3RyaW5nJiB2YWx1ZVN0cmluZywKICAg ICAvLyAxKSBOb24tbmVnYXRpdmUgbnVtYmVyIHZhbHVlcyBhcmUgdHJhbnNsYXRlZCB0byA8bnVt YmVyPiB2YWx1ZXMuCiAgICAgLy8gMikgTmVnYXRpdmUgbnVtYmVyIHZhbHVlcyBhcmUgdHJhbnNs YXRlZCB0byBhdXRvLgogICAgIC8vIDMpIHllcyBpcyB0cmFuc2xhdGVkIHRvIDEuMC4KLSAgICAv LyA0KSBkZXZpY2Utd2lkdGggYW5kIGRldmljZS1oZWlnaHQgYXJlIHRyYW5zbGF0ZWQgdG8gMTAu MC4KKyAgICAvLyA0KSBbZGV2aWNlfHdpbmRvd10td2lkdGggYW5kIFtkZXZpY2V8d2luZG93XS1o ZWlnaHQgYXJlIHRyYW5zbGF0ZWQgdG8gMTAuMC4KICAgICAvLyA1KSBubyBhbmQgdW5rbm93biB2 YWx1ZXMgYXJlIHRyYW5zbGF0ZWQgdG8gMC4wCiAKICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo dmFsdWVTdHJpbmcsICJ5ZXMiKSkKQEAgLTM0Miw2ICszNTgsMTAgQEAgc3RhdGljIGZsb2F0IGZp bmRTY2FsZVZhbHVlKGNvbnN0IFN0cmluZyYga2V5U3RyaW5nLCBjb25zdCBTdHJpbmcmIHZhbHVl U3RyaW5nLAogICAgICAgICByZXR1cm4gMTA7CiAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHZh bHVlU3RyaW5nLCAiZGV2aWNlLWhlaWdodCIpKQogICAgICAgICByZXR1cm4gMTA7CisgICAgaWYg KGVxdWFsSWdub3JpbmdDYXNlKHZhbHVlU3RyaW5nLCAid2luZG93LXdpZHRoIikpCisgICAgICAg IHJldHVybiAxMDsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWVTdHJpbmcsICJ3aW5k b3ctaGVpZ2h0IikpCisgICAgICAgIHJldHVybiAxMDsKIAogICAgIGZsb2F0IHZhbHVlID0gbnVt ZXJpY1ByZWZpeChrZXlTdHJpbmcsIHZhbHVlU3RyaW5nLCBkb2N1bWVudCk7CiAKQEAgLTM1Nyw3 ICszNzcsNyBAQCBzdGF0aWMgZmxvYXQgZmluZFNjYWxlVmFsdWUoY29uc3QgU3RyaW5nJiBrZXlT dHJpbmcsIGNvbnN0IFN0cmluZyYgdmFsdWVTdHJpbmcsCiBzdGF0aWMgZmxvYXQgZmluZFVzZXJT Y2FsYWJsZVZhbHVlKGNvbnN0IFN0cmluZyYga2V5U3RyaW5nLCBjb25zdCBTdHJpbmcmIHZhbHVl U3RyaW5nLCBEb2N1bWVudCogZG9jdW1lbnQpCiB7CiAgICAgLy8geWVzIGFuZCBubyBhcmUgdXNl ZCBhcyBrZXl3b3Jkcy4KLSAgICAvLyBOdW1iZXJzID49IDEsIG51bWJlcnMgPD0gLTEsIGRldmlj ZS13aWR0aCBhbmQgZGV2aWNlLWhlaWdodCBhcmUgbWFwcGVkIHRvIHllcy4KKyAgICAvLyBOdW1i ZXJzID49IDEsIG51bWJlcnMgPD0gLTEsIFtkZXZpY2V8d2luZG93XS13aWR0aCBhbmQgW2Rldmlj ZXx3aW5kb3ddLWhlaWdodCBhcmUgbWFwcGVkIHRvIHllcy4KICAgICAvLyBOdW1iZXJzIGluIHRo ZSByYW5nZSA8LTEsIDE+LCBhbmQgdW5rbm93biB2YWx1ZXMsIGFyZSBtYXBwZWQgdG8gbm8uCiAK ICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWVTdHJpbmcsICJ5ZXMiKSkKQEAgLTM2OCw2 ICszODgsMTAgQEAgc3RhdGljIGZsb2F0IGZpbmRVc2VyU2NhbGFibGVWYWx1ZShjb25zdCBTdHJp bmcmIGtleVN0cmluZywgY29uc3QgU3RyaW5nJiB2YWx1ZVMKICAgICAgICAgcmV0dXJuIDE7CiAg ICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHZhbHVlU3RyaW5nLCAiZGV2aWNlLWhlaWdodCIpKQog ICAgICAgICByZXR1cm4gMTsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWVTdHJpbmcs ICJ3aW5kb3ctd2lkdGgiKSkKKyAgICAgICAgcmV0dXJuIDE7CisgICAgaWYgKGVxdWFsSWdub3Jp bmdDYXNlKHZhbHVlU3RyaW5nLCAid2luZG93LWhlaWdodCIpKQorICAgICAgICByZXR1cm4gMTsK IAogICAgIGZsb2F0IHZhbHVlID0gbnVtZXJpY1ByZWZpeChrZXlTdHJpbmcsIHZhbHVlU3RyaW5n LCBkb2N1bWVudCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFy Z3VtZW50cy5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmgKaW5kZXgg OTE3OWQ5MTI1MjQ3NDI5N2M5NzA4ZDJjNGEwZmFmMDU0ZjFhMmE4Yi4uZGRhYzQ5ZjViZGU3MmYz MjlmOTViMTVjNTAzNmMxNWNiODQ3MzRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L1ZpZXdwb3J0QXJndW1lbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJn dW1lbnRzLmgKQEAgLTcxLDcgKzcxLDkgQEAgc3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKICAg ICAgICAgVmFsdWVEZXZpY2VXaWR0aCA9IC0yLAogICAgICAgICBWYWx1ZURldmljZUhlaWdodCA9 IC0zLAogICAgICAgICBWYWx1ZVBvcnRyYWl0ID0gLTQsCi0gICAgICAgIFZhbHVlTGFuZHNjYXBl ID0gLTUKKyAgICAgICAgVmFsdWVMYW5kc2NhcGUgPSAtNSwKKyAgICAgICAgVmFsdWVXaW5kb3dX aWR0aCA9IC02LAorICAgICAgICBWYWx1ZVdpbmRvd0hlaWdodCA9IC03CiAgICAgfTsKIAogICAg IGV4cGxpY2l0IFZpZXdwb3J0QXJndW1lbnRzKFR5cGUgdHlwZSA9IEltcGxpY2l0KQpAQCAtMTA1 LDYgKzEwNywxNiBAQCBzdHJ1Y3QgVmlld3BvcnRBcmd1bWVudHMgewogICAgIGZsb2F0IHVzZXJa b29tOwogICAgIGZsb2F0IG9yaWVudGF0aW9uOwogCisgICAgc3RhdGljIGJvb2wgaXNXaW5kb3dP ckRldmljZVdpZHRoKGRvdWJsZSBsZW5ndGgpCisgICAgeworICAgICAgICByZXR1cm4gbGVuZ3Ro ID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZVdpZHRoIHx8IGxlbmd0aCA9PSBWaWV3 cG9ydEFyZ3VtZW50czo6VmFsdWVXaW5kb3dXaWR0aDsKKyAgICB9CisKKyAgICBzdGF0aWMgYm9v bCBpc1dpbmRvd09yRGV2aWNlSGVpZ2h0KGRvdWJsZSBsZW5ndGgpCisgICAgeworICAgICAgICBy ZXR1cm4gbGVuZ3RoID09IFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZUhlaWdodCB8fCBs ZW5ndGggPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlV2luZG93SGVpZ2h0OworICAgIH0KKwog ICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBWaWV3cG9ydEFyZ3VtZW50cyYgb3RoZXIpIGNvbnN0 CiAgICAgewogICAgICAgICAvLyBVc2VkIGZvciBmaWd1cmluZyBvdXQgd2hldGhlciB0byByZXNl dCB0aGUgdmlld3BvcnQgb3Igbm90LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9W aWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENv bmZpZ3VyYXRpb24uY3BwCmluZGV4IDBhMzNkZDhiMDZiNmUwMmEwOTNkMDY2ODdmN2QxNGM5NTNk NDRlYTUuLjlhYzVkMWZkNTU4MzY4YzRlY2RhMzFiYWE4ZmZmYzRmZGYyYWExYzAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAKQEAgLTEwMyw2ICsx MDMsNyBAQCBib29sIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2hvdWxkSWdub3JlSG9yaXpvbnRh bFNjYWxpbmdDb25zdHJhaW50cygpIGNvbnN0CiAgICAgaWYgKCFtX2Nhbklnbm9yZVNjYWxpbmdD b25zdHJhaW50cykKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgLy8gVmFsdWVXaW5kb3dX aWR0aCBpcyBub3QgaGFuZGxlZCBoZXJlLCBiZWNhdXNlIGl0IGlzIHRoZSB3YXkgdG8gb3B0LW91 dCBvZiBpZ25vcmluZyBzY2FsaW5nIGNvbnN0cmFpbnRzLgogICAgIGJvb2wgbGFpZE91dFdpZGVy VGhhblZpZXdwb3J0ID0gbV9jb250ZW50U2l6ZS53aWR0aCgpID4gbGF5b3V0V2lkdGgoKTsKICAg ICBpZiAobV92aWV3cG9ydEFyZ3VtZW50cy53aWR0aCA9PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFs dWVEZXZpY2VXaWR0aCkKICAgICAgICAgcmV0dXJuIGxhaWRPdXRXaWRlclRoYW5WaWV3cG9ydDsK QEAgLTExOCw2ICsxMTksNyBAQCBib29sIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2hvdWxkSWdu b3JlVmVydGljYWxTY2FsaW5nQ29uc3RyYWludHMoKSBjb25zdAogICAgIGlmICghbV9jYW5JZ25v cmVTY2FsaW5nQ29uc3RyYWludHMpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIC8vIFZh bHVlV2luZG93SGVpZ2h0IGlzIG5vdCBoYW5kbGVkIGhlcmUsIGJlY2F1c2UgaXQgaXMgdGhlIHdh eSB0byBvcHQtb3V0IG9mIGlnbm9yaW5nIHNjYWxpbmcgY29uc3RyYWludHMuCiAgICAgYm9vbCBs YWlkT3V0VGFsbGVyVGhhblZpZXdwb3J0ID0gbV9jb250ZW50U2l6ZS5oZWlnaHQoKSA+IGxheW91 dEhlaWdodCgpOwogICAgIGlmIChtX3ZpZXdwb3J0QXJndW1lbnRzLmhlaWdodCA9PSBWaWV3cG9y dEFyZ3VtZW50czo6VmFsdWVEZXZpY2VIZWlnaHQgJiYgbV92aWV3cG9ydEFyZ3VtZW50cy53aWR0 aCA9PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVBdXRvKQogICAgICAgICByZXR1cm4gbGFpZE91 dFRhbGxlclRoYW5WaWV3cG9ydDsKQEAgLTI5OCw5ICszMDAsOSBAQCB2b2lkIFZpZXdwb3J0Q29u ZmlndXJhdGlvbjo6dXBkYXRlQ29uZmlndXJhdGlvbigpCiAKIGRvdWJsZSBWaWV3cG9ydENvbmZp Z3VyYXRpb246OnZpZXdwb3J0QXJndW1lbnRzTGVuZ3RoKGRvdWJsZSBsZW5ndGgpIGNvbnN0CiB7 Ci0gICAgaWYgKGxlbmd0aCA9PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVEZXZpY2VXaWR0aCkK KyAgICBpZiAoVmlld3BvcnRBcmd1bWVudHM6OmlzV2luZG93T3JEZXZpY2VXaWR0aChsZW5ndGgp KQogICAgICAgICByZXR1cm4gbV9taW5pbXVtTGF5b3V0U2l6ZS53aWR0aCgpOwotICAgIGlmIChs ZW5ndGggPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlSGVpZ2h0KQorICAgIGlmIChW aWV3cG9ydEFyZ3VtZW50czo6aXNXaW5kb3dPckRldmljZUhlaWdodChsZW5ndGgpKQogICAgICAg ICByZXR1cm4gbV9taW5pbXVtTGF5b3V0U2l6ZS5oZWlnaHQoKTsKICAgICByZXR1cm4gbGVuZ3Ro OwogfQo= 252645 2015-05-07 16:29:05 -0700 2015-05-10 15:20:57 -0700 Patch bug-144760-20150507162748.patch text/plain 11132 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzOTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQzYmMzMjc0OWM0Yzc3 YmQ1ZWNkNmNmMjNjNjY0MDAzNmVhZjc3ZC4uMGE5ZDljOTMwZDY2MTMxOTc4YmFkNTc5NDU0OTY0 NDQzNDVkNjhjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE1LTA1LTA3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIG1lY2hh bmlzbSB0byBvcHQtb3V0IG9mIHRoZSBhdXRvbWF0aWMgc2NhbGluZyBhcHBsaWVkIHRvIG5vdC1y ZWFsbHktcmVzcG9uc2l2ZSBzaXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ0NzYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkIGEgbmV3IHZpZXdwb3J0IHByb3BlcnR5LCBzaHJpbmstdG8tZml0 LCB3aGljaCBjYW4gYmUgdXNlZCB0byBkaXNhYmxlCisgICAgICAgIHRoZSBhdXRvbWF0aWMgc2Nh bGluZyBpbnRyb2R1Y2VkIGluIHIxODE0MDAuIFRoaXMgcHJvdmlkZXMgc2l0ZXMgd2l0aCBhCisg ICAgICAgIHdheSB0byB0ZWxsIFdlYktpdCB0aGF0IHRoZXkncmUgcmVhbGx5IHN1cmUgdGhleSB3 YW50IHRvIGJlIGxhaWQgb3V0IGF0CisgICAgICAgIHdpbmRvdy13aWR0aC9oZWlnaHQsIGV2ZW4g aWYgdGhleSBmYWlsIHRvIGZpdCB3aXRoaW4gdGhhdCBzaXplLgorCisgICAgICAgICogZG9tL1Zp ZXdwb3J0QXJndW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRz OjpyZXNvbHZlKToKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRCb29sZWFuVmFsdWUpOgorICAgICAg ICAoV2ViQ29yZTo6c2V0Vmlld3BvcnRGZWF0dXJlKToKKyAgICAgICAgKiBkb20vVmlld3BvcnRB cmd1bWVudHMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0QXJndW1lbnRzOjpWaWV3cG9y dEFyZ3VtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydEFyZ3VtZW50czo6b3BlcmF0 b3I9PSk6CisgICAgICAgICogcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjpzaG91bGRJZ25vcmVIb3Jpem9udGFs U2NhbGluZ0NvbnN0cmFpbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJh dGlvbjo6c2hvdWxkSWdub3JlVmVydGljYWxTY2FsaW5nQ29uc3RyYWludHMpOgorICAgICAgICAo V2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjp3ZWJwYWdlUGFyYW1ldGVycyk6CisgICAg ICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OnRleHREb2N1bWVudFBhcmFtZXRl cnMpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjppbWFnZURvY3Vt ZW50UGFyYW1ldGVycyk6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246 OnRlc3RpbmdQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OmJvb2xlYW5WaWV3cG9ydEFy Z3VtZW50SXNTZXQpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjp1 cGRhdGVDb25maWd1cmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJh dGlvblRleHRTdHJlYW06Om9wZXJhdG9yPDwpOgorICAgICAgICAoV2ViQ29yZTo6dmlld3BvcnRB cmd1bWVudFVzZXJab29tSXNTZXQpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvVmlld3BvcnRD b25maWd1cmF0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246 OlBhcmFtZXRlcnM6OlBhcmFtZXRlcnMpOgorICAgICAgICBQbHVtYiB0aGUgc2hyaW5rLXRvLWZp dCB2aWV3cG9ydCBwcm9wZXJ0eSB0aHJvdWdoLgorICAgICAgICBJZiBzaHJpbmstdG8tZml0IGlz IHNldCB0byB5ZXMsIG9yIG5vdCBzZXQsIHdlIGJlaGF2ZSBhcyB1c3VhbDsgaWYgaXQgaXMKKyAg ICAgICAgc2V0IHRvIG5vLCB3ZSB3aWxsIGJhaWwgZnJvbSBzaG91bGRJZ25vcmVbSG9yaXpvbnRh bHxWZXJ0aWNhbF1TY2FsaW5nQ29uc3RyYWludHMsCisgICAgICAgIGVmZmVjdGl2ZWx5IGRpc2Fi bGluZyB0aGUgYXV0b21hdGljIHNjYWxpbmcgaW50cm9kdWNlZCBpbiByMTgxNDAwLgorCiAyMDE1 LTA1LTA3ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgVHJpZWQg dG8gZml4IHRoZSBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9y dEFyZ3VtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3Bw CmluZGV4IDBlMTI0YjFlMWVmYmUxOGRjMTJlYjg3OTRjYjRlNTVlNzhlOTE5MTQuLmI1ZTM3ZjM3 MWUzYWMwOTg2N2EzZTQzMWRmMTkwYjA1N2IzMjMyYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1Zp ZXdwb3J0QXJndW1lbnRzLmNwcApAQCAtODYsNyArODYsNiBAQCBWaWV3cG9ydEF0dHJpYnV0ZXMg Vmlld3BvcnRBcmd1bWVudHM6OnJlc29sdmUoY29uc3QgRmxvYXRTaXplJiBpbml0aWFsVmlld3Bv cnRTaQogICAgIGZsb2F0IHJlc3VsdFpvb20gPSB6b29tOwogICAgIGZsb2F0IHJlc3VsdE1pblpv b20gPSBtaW5ab29tOwogICAgIGZsb2F0IHJlc3VsdE1heFpvb20gPSBtYXhab29tOwotICAgIGZs b2F0IHJlc3VsdFVzZXJab29tID0gdXNlclpvb207CiAKICAgICBzd2l0Y2ggKGludChyZXN1bHRX aWR0aCkpIHsKICAgICBjYXNlIFZpZXdwb3J0QXJndW1lbnRzOjpWYWx1ZURldmljZVdpZHRoOgpA QCAtMjQ0LDggKzI0Myw5IEBAIFZpZXdwb3J0QXR0cmlidXRlcyBWaWV3cG9ydEFyZ3VtZW50czo6 cmVzb2x2ZShjb25zdCBGbG9hdFNpemUmIGluaXRpYWxWaWV3cG9ydFNpCiAgICAgLy8gaWYgKHJl c3VsdFpvb20gPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bykKICAgICAvLyAgICByZXN1 bHQuaW5pdGlhbFNjYWxlID0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlQXV0bzsKIAotICAgIHJl c3VsdC51c2VyU2NhbGFibGUgPSByZXN1bHRVc2VyWm9vbTsKKyAgICByZXN1bHQudXNlclNjYWxh YmxlID0gdXNlclpvb207CiAgICAgcmVzdWx0Lm9yaWVudGF0aW9uID0gb3JpZW50YXRpb247Cisg ICAgcmVzdWx0LnNocmlua1RvRml0ID0gc2hyaW5rVG9GaXQ7CiAKICAgICByZXR1cm4gcmVzdWx0 OwogfQpAQCAtMzU0LDcgKzM1NCw3IEBAIHN0YXRpYyBmbG9hdCBmaW5kU2NhbGVWYWx1ZShjb25z dCBTdHJpbmcmIGtleVN0cmluZywgY29uc3QgU3RyaW5nJiB2YWx1ZVN0cmluZywKICAgICByZXR1 cm4gdmFsdWU7CiB9CiAKLXN0YXRpYyBmbG9hdCBmaW5kVXNlclNjYWxhYmxlVmFsdWUoY29uc3Qg U3RyaW5nJiBrZXlTdHJpbmcsIGNvbnN0IFN0cmluZyYgdmFsdWVTdHJpbmcsIERvY3VtZW50KiBk b2N1bWVudCkKK3N0YXRpYyBmbG9hdCBmaW5kQm9vbGVhblZhbHVlKGNvbnN0IFN0cmluZyYga2V5 U3RyaW5nLCBjb25zdCBTdHJpbmcmIHZhbHVlU3RyaW5nLCBEb2N1bWVudCogZG9jdW1lbnQpCiB7 CiAgICAgLy8geWVzIGFuZCBubyBhcmUgdXNlZCBhcyBrZXl3b3Jkcy4KICAgICAvLyBOdW1iZXJz ID49IDEsIG51bWJlcnMgPD0gLTEsIGRldmljZS13aWR0aCBhbmQgZGV2aWNlLWhlaWdodCBhcmUg bWFwcGVkIHRvIHllcy4KQEAgLTM5MiwxMiArMzkyLDE0IEBAIHZvaWQgc2V0Vmlld3BvcnRGZWF0 dXJlKGNvbnN0IFN0cmluZyYga2V5U3RyaW5nLCBjb25zdCBTdHJpbmcmIHZhbHVlU3RyaW5nLCBE b2N1CiAgICAgZWxzZSBpZiAoa2V5U3RyaW5nID09ICJtYXhpbXVtLXNjYWxlIikKICAgICAgICAg YXJndW1lbnRzLT5tYXhab29tID0gZmluZFNjYWxlVmFsdWUoa2V5U3RyaW5nLCB2YWx1ZVN0cmlu ZywgZG9jdW1lbnQpOwogICAgIGVsc2UgaWYgKGtleVN0cmluZyA9PSAidXNlci1zY2FsYWJsZSIp Ci0gICAgICAgIGFyZ3VtZW50cy0+dXNlclpvb20gPSBmaW5kVXNlclNjYWxhYmxlVmFsdWUoa2V5 U3RyaW5nLCB2YWx1ZVN0cmluZywgZG9jdW1lbnQpOworICAgICAgICBhcmd1bWVudHMtPnVzZXJa b29tID0gZmluZEJvb2xlYW5WYWx1ZShrZXlTdHJpbmcsIHZhbHVlU3RyaW5nLCBkb2N1bWVudCk7 CiAjaWYgUExBVEZPUk0oSU9TKQogICAgIGVsc2UgaWYgKGtleVN0cmluZyA9PSAibWluaW1hbC11 aSIpCiAgICAgICAgIC8vIEZJWE1FOiBJZ25vcmUgc2lsZW50bHkgZm9yIG5vdy4gVGhpcyBzaG91 bGQgZXZlbnR1YWxseSBmYWxsYmFjayB0byB0aGUgd2FybmluZy4KICAgICAgICAgeyB9CiAjZW5k aWYKKyAgICBlbHNlIGlmIChrZXlTdHJpbmcgPT0gInNocmluay10by1maXQiKQorICAgICAgICBh cmd1bWVudHMtPnNocmlua1RvRml0ID0gZmluZEJvb2xlYW5WYWx1ZShrZXlTdHJpbmcsIHZhbHVl U3RyaW5nLCBkb2N1bWVudCk7CiAgICAgZWxzZQogICAgICAgICByZXBvcnRWaWV3cG9ydFdhcm5p bmcoZG9jdW1lbnQsIFVucmVjb2duaXplZFZpZXdwb3J0QXJndW1lbnRLZXlFcnJvciwga2V5U3Ry aW5nLCBTdHJpbmcoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3Bv cnRBcmd1bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCmlu ZGV4IDkxNzlkOTEyNTI0NzQyOTdjOTcwOGQyYzRhMGZhZjA1NGYxYTJhOGIuLjYxZmNmYzFjMTFm NDg1YTk1N2JjOGI4N2Q3ZmRiZWMyNGJhYzUxYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9y dEFyZ3VtZW50cy5oCkBAIC01MSw2ICs1MSw3IEBAIHN0cnVjdCBWaWV3cG9ydEF0dHJpYnV0ZXMg ewogCiAgICAgZmxvYXQgdXNlclNjYWxhYmxlOwogICAgIGZsb2F0IG9yaWVudGF0aW9uOworICAg IGZsb2F0IHNocmlua1RvRml0OwogfTsKIAogc3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKQEAg LTg3LDYgKzg4LDcgQEAgc3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKICAgICAgICAgLCBtYXha b29tKFZhbHVlQXV0bykKICAgICAgICAgLCB1c2VyWm9vbShWYWx1ZUF1dG8pCiAgICAgICAgICwg b3JpZW50YXRpb24oVmFsdWVBdXRvKQorICAgICAgICAsIHNocmlua1RvRml0KFZhbHVlQXV0bykK ICAgICB7CiAgICAgfQogCkBAIC0xMDQsNiArMTA2LDcgQEAgc3RydWN0IFZpZXdwb3J0QXJndW1l bnRzIHsKICAgICBmbG9hdCBtYXhab29tOwogICAgIGZsb2F0IHVzZXJab29tOwogICAgIGZsb2F0 IG9yaWVudGF0aW9uOworICAgIGZsb2F0IHNocmlua1RvRml0OwogCiAgICAgYm9vbCBvcGVyYXRv cj09KGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBvdGhlcikgY29uc3QKICAgICB7CkBAIC0xMTks NyArMTIyLDggQEAgc3RydWN0IFZpZXdwb3J0QXJndW1lbnRzIHsKICAgICAgICAgICAgICYmIG1p blpvb20gPT0gb3RoZXIubWluWm9vbQogICAgICAgICAgICAgJiYgbWF4Wm9vbSA9PSBvdGhlci5t YXhab29tCiAgICAgICAgICAgICAmJiB1c2VyWm9vbSA9PSBvdGhlci51c2VyWm9vbQotICAgICAg ICAgICAgJiYgb3JpZW50YXRpb24gPT0gb3RoZXIub3JpZW50YXRpb247CisgICAgICAgICAgICAm JiBvcmllbnRhdGlvbiA9PSBvdGhlci5vcmllbnRhdGlvbgorICAgICAgICAgICAgJiYgc2hyaW5r VG9GaXQgPT0gb3RoZXIuc2hyaW5rVG9GaXQ7CiAgICAgfQogCiAgICAgYm9vbCBvcGVyYXRvciE9 KGNvbnN0IFZpZXdwb3J0QXJndW1lbnRzJiBvdGhlcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcAppbmRleCAwYTMzZGQ4YjA2YjZlMDJhMDkz ZDA2Njg3ZjdkMTRjOTUzZDQ0ZWE1Li40OGQzZDQzYmEwYzdlYTkzYzNmOWIxYjNhNGMxYjA2MzQ1 OWZlOWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJh dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24u Y3BwCkBAIC0xMDMsNiArMTAzLDkgQEAgYm9vbCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OnNob3Vs ZElnbm9yZUhvcml6b250YWxTY2FsaW5nQ29uc3RyYWludHMoKSBjb25zdAogICAgIGlmICghbV9j YW5JZ25vcmVTY2FsaW5nQ29uc3RyYWludHMpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAg IGlmICghbV9jb25maWd1cmF0aW9uLmFsbG93c1Nocmlua1RvRml0KQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKICAgICBib29sIGxhaWRPdXRXaWRlclRoYW5WaWV3cG9ydCA9IG1fY29udGVudFNp emUud2lkdGgoKSA+IGxheW91dFdpZHRoKCk7CiAgICAgaWYgKG1fdmlld3BvcnRBcmd1bWVudHMu d2lkdGggPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlV2lkdGgpCiAgICAgICAgIHJl dHVybiBsYWlkT3V0V2lkZXJUaGFuVmlld3BvcnQ7CkBAIC0xMTgsNiArMTIxLDkgQEAgYm9vbCBW aWV3cG9ydENvbmZpZ3VyYXRpb246OnNob3VsZElnbm9yZVZlcnRpY2FsU2NhbGluZ0NvbnN0cmFp bnRzKCkgY29uc3QKICAgICBpZiAoIW1fY2FuSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIW1fY29uZmlndXJhdGlvbi5hbGxvd3NTaHJp bmtUb0ZpdCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgYm9vbCBsYWlkT3V0VGFsbGVy VGhhblZpZXdwb3J0ID0gbV9jb250ZW50U2l6ZS5oZWlnaHQoKSA+IGxheW91dEhlaWdodCgpOwog ICAgIGlmIChtX3ZpZXdwb3J0QXJndW1lbnRzLmhlaWdodCA9PSBWaWV3cG9ydEFyZ3VtZW50czo6 VmFsdWVEZXZpY2VIZWlnaHQgJiYgbV92aWV3cG9ydEFyZ3VtZW50cy53aWR0aCA9PSBWaWV3cG9y dEFyZ3VtZW50czo6VmFsdWVBdXRvKQogICAgICAgICByZXR1cm4gbGFpZE91dFRhbGxlclRoYW5W aWV3cG9ydDsKQEAgLTE4OCw2ICsxOTQsNyBAQCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OlBhcmFt ZXRlcnMgVmlld3BvcnRDb25maWd1cmF0aW9uOjp3ZWJwYWdlUGFyYW1ldGVycygpCiAgICAgcGFy YW1ldGVycy53aWR0aCA9IDk4MDsKICAgICBwYXJhbWV0ZXJzLndpZHRoSXNTZXQgPSB0cnVlOwog ICAgIHBhcmFtZXRlcnMuYWxsb3dzVXNlclNjYWxpbmcgPSB0cnVlOworICAgIHBhcmFtZXRlcnMu YWxsb3dzU2hyaW5rVG9GaXQgPSB0cnVlOwogICAgIHBhcmFtZXRlcnMubWluaW11bVNjYWxlID0g MC4yNTsKICAgICBwYXJhbWV0ZXJzLm1heGltdW1TY2FsZSA9IDU7CiAgICAgcmV0dXJuIHBhcmFt ZXRlcnM7CkBAIC0yMDYsNiArMjEzLDcgQEAgVmlld3BvcnRDb25maWd1cmF0aW9uOjpQYXJhbWV0 ZXJzIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6dGV4dERvY3VtZW50UGFyYW1ldGVycygKIAogICAg IHBhcmFtZXRlcnMud2lkdGhJc1NldCA9IHRydWU7CiAgICAgcGFyYW1ldGVycy5hbGxvd3NVc2Vy U2NhbGluZyA9IHRydWU7CisgICAgcGFyYW1ldGVycy5hbGxvd3NTaHJpbmtUb0ZpdCA9IGZhbHNl OwogICAgIHBhcmFtZXRlcnMubWluaW11bVNjYWxlID0gMC4yNTsKICAgICBwYXJhbWV0ZXJzLm1h eGltdW1TY2FsZSA9IDU7CiAgICAgcmV0dXJuIHBhcmFtZXRlcnM7CkBAIC0yMTcsNiArMjI1LDcg QEAgVmlld3BvcnRDb25maWd1cmF0aW9uOjpQYXJhbWV0ZXJzIFZpZXdwb3J0Q29uZmlndXJhdGlv bjo6aW1hZ2VEb2N1bWVudFBhcmFtZXRlcnMKICAgICBwYXJhbWV0ZXJzLndpZHRoID0gOTgwOwog ICAgIHBhcmFtZXRlcnMud2lkdGhJc1NldCA9IHRydWU7CiAgICAgcGFyYW1ldGVycy5hbGxvd3NV c2VyU2NhbGluZyA9IHRydWU7CisgICAgcGFyYW1ldGVycy5hbGxvd3NTaHJpbmtUb0ZpdCA9IGZh bHNlOwogICAgIHBhcmFtZXRlcnMubWluaW11bVNjYWxlID0gMC4wMTsKICAgICBwYXJhbWV0ZXJz Lm1heGltdW1TY2FsZSA9IDU7CiAgICAgcmV0dXJuIHBhcmFtZXRlcnM7CkBAIC0yMzQsNiArMjQz LDcgQEAgVmlld3BvcnRDb25maWd1cmF0aW9uOjpQYXJhbWV0ZXJzIFZpZXdwb3J0Q29uZmlndXJh dGlvbjo6dGVzdGluZ1BhcmFtZXRlcnMoKQogICAgIFBhcmFtZXRlcnMgcGFyYW1ldGVyczsKICAg ICBwYXJhbWV0ZXJzLmluaXRpYWxTY2FsZSA9IDE7CiAgICAgcGFyYW1ldGVycy5pbml0aWFsU2Nh bGVJc1NldCA9IHRydWU7CisgICAgcGFyYW1ldGVycy5hbGxvd3NTaHJpbmtUb0ZpdCA9IHRydWU7 CiAgICAgcGFyYW1ldGVycy5taW5pbXVtU2NhbGUgPSAxOwogICAgIHBhcmFtZXRlcnMubWF4aW11 bVNjYWxlID0gNTsKICAgICByZXR1cm4gcGFyYW1ldGVyczsKQEAgLTI2MSw3ICsyNzEsNyBAQCBz dGF0aWMgaW5saW5lIHZvaWQgYXBwbHlWaWV3cG9ydEFyZ3VtZW50KFZhbHVlVHlwZSYgdmFsdWUs IGJvb2wmIHZhbHVlSXNTZXQsIFZpZQogICAgICAgICB2YWx1ZUlzU2V0ID0gZmFsc2U7CiB9CiAK LXN0YXRpYyBpbmxpbmUgYm9vbCB2aWV3cG9ydEFyZ3VtZW50VXNlclpvb21Jc1NldChmbG9hdCB2 YWx1ZSkKK3N0YXRpYyBpbmxpbmUgYm9vbCBib29sZWFuVmlld3BvcnRBcmd1bWVudElzU2V0KGZs b2F0IHZhbHVlKQogewogICAgIHJldHVybiAhdmFsdWUgfHwgdmFsdWUgPT0gMTsKIH0KQEAgLTI5 Miw4ICszMDIsMTEgQEAgdm9pZCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OnVwZGF0ZUNvbmZpZ3Vy YXRpb24oKQogICAgICAgICBtX2NvbmZpZ3VyYXRpb24uaGVpZ2h0SXNTZXQgPSB2aWV3cG9ydEFy Z3VtZW50c092ZXJyaWRlc0hlaWdodDsKICAgICB9CiAKLSAgICBpZiAodmlld3BvcnRBcmd1bWVu dFVzZXJab29tSXNTZXQobV92aWV3cG9ydEFyZ3VtZW50cy51c2VyWm9vbSkpCisgICAgaWYgKGJv b2xlYW5WaWV3cG9ydEFyZ3VtZW50SXNTZXQobV92aWV3cG9ydEFyZ3VtZW50cy51c2VyWm9vbSkp CiAgICAgICAgIG1fY29uZmlndXJhdGlvbi5hbGxvd3NVc2VyU2NhbGluZyA9IG1fdmlld3BvcnRB cmd1bWVudHMudXNlclpvb20gIT0gMC47CisKKyAgICBpZiAoYm9vbGVhblZpZXdwb3J0QXJndW1l bnRJc1NldChtX3ZpZXdwb3J0QXJndW1lbnRzLnNocmlua1RvRml0KSkKKyAgICAgICAgbV9jb25m aWd1cmF0aW9uLmFsbG93c1Nocmlua1RvRml0ID0gbV92aWV3cG9ydEFyZ3VtZW50cy5zaHJpbmtU b0ZpdCAhPSAwLjsKIH0KIAogZG91YmxlIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6dmlld3BvcnRB cmd1bWVudHNMZW5ndGgoZG91YmxlIGxlbmd0aCkgY29uc3QKQEAgLTQzNyw2ICs0NTAsNyBAQCBW aWV3cG9ydENvbmZpZ3VyYXRpb25UZXh0U3RyZWFtJiBWaWV3cG9ydENvbmZpZ3VyYXRpb25UZXh0 U3RyZWFtOjpvcGVyYXRvcjw8KGNvbgogICAgIGR1bXBQcm9wZXJ0eSh0cywgIm1pbmltdW1TY2Fs ZSIsIHBhcmFtZXRlcnMubWluaW11bVNjYWxlKTsKICAgICBkdW1wUHJvcGVydHkodHMsICJtYXhp bXVtU2NhbGUiLCBwYXJhbWV0ZXJzLm1heGltdW1TY2FsZSk7CiAgICAgZHVtcFByb3BlcnR5KHRz LCAiYWxsb3dzVXNlclNjYWxpbmciLCBwYXJhbWV0ZXJzLmFsbG93c1VzZXJTY2FsaW5nKTsKKyAg ICBkdW1wUHJvcGVydHkodHMsICJhbGxvd3NTaHJpbmtUb0ZpdCIsIHBhcmFtZXRlcnMuYWxsb3dz U2hyaW5rVG9GaXQpOwogCiAgICAgcmV0dXJuIHRzOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Vmlld3BvcnRDb25maWd1cmF0aW9uLmgKaW5kZXggY2JkMDY0MjQ1NmQ0MmU5NTM1NjEyZGY1Yzk4 N2IwYmUxMjNjODQ1OC4uMjA3ZGUyNjdlMGEzODQ2ZTQzZWZhOWRkMjc3OTkzOWJkNjg5ZjAxNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5oCkBAIC00NSw2 ICs0NSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgICwgbWluaW11bVNjYWxlKDApCiAgICAgICAg ICAgICAsIG1heGltdW1TY2FsZSgwKQogICAgICAgICAgICAgLCBhbGxvd3NVc2VyU2NhbGluZyhm YWxzZSkKKyAgICAgICAgICAgICwgYWxsb3dzU2hyaW5rVG9GaXQoZmFsc2UpCiAgICAgICAgICAg ICAsIHdpZHRoSXNTZXQoZmFsc2UpCiAgICAgICAgICAgICAsIGhlaWdodElzU2V0KGZhbHNlKQog ICAgICAgICAgICAgLCBpbml0aWFsU2NhbGVJc1NldChmYWxzZSkKQEAgLTU3LDYgKzU4LDcgQEAg cHVibGljOgogICAgICAgICBkb3VibGUgbWluaW11bVNjYWxlOwogICAgICAgICBkb3VibGUgbWF4 aW11bVNjYWxlOwogICAgICAgICBib29sIGFsbG93c1VzZXJTY2FsaW5nOworICAgICAgICBib29s IGFsbG93c1Nocmlua1RvRml0OwogCiAgICAgICAgIGJvb2wgd2lkdGhJc1NldDsKICAgICAgICAg Ym9vbCBoZWlnaHRJc1NldDsKQEAgLTg1LDYgKzg3LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVf RVhQT1JUIGRvdWJsZSBtaW5pbXVtU2NhbGUoKSBjb25zdDsKICAgICBkb3VibGUgbWF4aW11bVNj YWxlKCkgY29uc3QgeyByZXR1cm4gbV9jb25maWd1cmF0aW9uLm1heGltdW1TY2FsZTsgfQogICAg IFdFQkNPUkVfRVhQT1JUIGJvb2wgYWxsb3dzVXNlclNjYWxpbmcoKSBjb25zdDsKKyAgICBib29s IGFsbG93c1Nocmlua1RvRml0KCkgY29uc3Q7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg UGFyYW1ldGVycyB3ZWJwYWdlUGFyYW1ldGVycygpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBQYXJhbWV0ZXJzIHRleHREb2N1bWVudFBhcmFtZXRlcnMoKTsKQEAgLTk2LDcgKzk5LDcgQEAg cHVibGljOgogICAgIFdURjo6Q1N0cmluZyBkZXNjcmlwdGlvbigpIGNvbnN0OwogICAgIHZvaWQg ZHVtcCgpIGNvbnN0OwogI2VuZGlmCi0gICAgCisKIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVD b25maWd1cmF0aW9uKCk7CiAgICAgZG91YmxlIHZpZXdwb3J0QXJndW1lbnRzTGVuZ3RoKGRvdWJs ZSBsZW5ndGgpIGNvbnN0Owo=