142664 2015-03-13 01:44:23 -0700 Sites that use a device-width viewport but don't have enough height to fill the view are scaled up 2015-03-13 14:08:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton benjamin sam simon.fraser oldest_to_newest 1076899 0 thorton 2015-03-13 01:44:23 -0700 Sites that use a device-width viewport but don't have enough height to fill the view are scaled up 1076900 1 248579 thorton 2015-03-13 01:44:47 -0700 Created attachment 248579 Patch 1077025 2 thorton 2015-03-13 14:08:16 -0700 http://trac.webkit.org/changeset/181488 248579 2015-03-13 01:44:47 -0700 2015-03-13 13:55:33 -0700 Patch bug-142664-20150313014420.patch text/plain 9889 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTJiYjkyOTY5NzIyZTY0 NTVmMGQ2OTE3ZTRhZGMyNjBhNTZkYTUwYS4uNzI1MDNlY2ZlOWQzNmExOThiZGVjNzkzYzEwNzYx YWI4YTA3ZjRmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTAzLTEzICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBTaXRlcyB0 aGF0IHVzZSBhIGRldmljZS13aWR0aCB2aWV3cG9ydCBidXQgZG9uJ3QgaGF2ZSBlbm91Z2ggaGVp Z2h0IHRvIGZpbGwgdGhlIHZpZXcgYXJlIHNjYWxlZCB1cAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNjY0CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8xODg1OTQ3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHBhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2hvdWxkSWdub3JlSG9yaXpvbnRhbFNjYWxpbmdDb25z dHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OnNob3Vs ZElnbm9yZVZlcnRpY2FsU2NhbGluZ0NvbnN0cmFpbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlZp ZXdwb3J0Q29uZmlndXJhdGlvbjo6c2hvdWxkSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzKToKKyAg ICAgICAgU3BsaXQgc2hvdWxkSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzIGludG8gb25lIGZvciBl YWNoIGRpbWVuc2lvbi4KKworICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9u Ojppbml0aWFsU2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9u OjptaW5pbXVtU2NhbGUpOgorICAgICAgICBEb24ndCBmb3JjZSB0aGUgaW5pdGlhbCBhbmQgbWlu aW11bSBzY2FsZXMgdG8gY292ZXIgdGhlIHdob2xlIHZpZXcgaWYgdGhlCisgICAgICAgIHBhZ2Ug Y2xhaW1zIHRvIHdhbnQgdG8gbGF5IG91dCB0byBkZXZpY2Ugd2lkdGggYnV0IHRoZW4gbGF5cyBv dXQgdG9vIGJpZy4KKyAgICAgICAgVGhpcyB3aWxsIGFsbG93IHBhZ2VzIHRoYXQgbWlzYmVoYXZl IGluIHRoaXMgd2F5IHRvIHNjYWxlIGRvd24gZnVydGhlcgorICAgICAgICB0aGFuIHRoZXkgcHJl dmlvdXNseSBjb3VsZCwgYnV0IHdpbGwgcmVzdWx0IGluIGEgcmVnaW9uIG9mIGVtcHR5IGJhY2tn cm91bmQKKyAgICAgICAgY29sb3IgYmVpbmcgZXhwb3NlZCBhdCB0aGUgaW5pdGlhbC9taW5pbXVt IHNjYWxlLgorCisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OmRlc2Ny aXB0aW9uKToKKyAgICAgICAgVXBkYXRlIHRoZSBsb2dnaW5nIHRvIHNob3cgZWFjaCBkaW1lbnNp b24gc2VwYXJhdGVseS4KKworICAgICAgICAqIHBhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmg6 CisKIDIwMTUtMDMtMTEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZWZhY3RvcmVkIHRoZSBKU0M6OkhlYXAgZXh0cmEgY29zdCBBUEkgZm9yIGNsYXJpdHkg YW5kIHRvIG1ha2Ugc29tZSBrbm93biBidWdzIG1vcmUgb2J2aW91cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDFk N2ZjZTE0OGQ0YmNmYmNhYmM3Nzc5YzVhNTlhZWNkNDRhZjVkOWQuLjczMDdmOWE0Mzc0NmMwZDk5 Njg1NWVjMjIyNDQ1ZGE1ZjA5MjIxZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx NS0wMy0xMyAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAg ICAgICAgU2l0ZXMgdGhhdCB1c2UgYSBkZXZpY2Utd2lkdGggdmlld3BvcnQgYnV0IGRvbid0IGhh dmUgZW5vdWdoIGhlaWdodCB0byBmaWxsIHRoZSB2aWV3IGFyZSBzY2FsZWQgdXAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjY2NAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTg4NTk0NzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbToKKyAgICAg ICAgKC1bV0tTY3JvbGxWaWV3IF9ydWJiZXJCYW5kT2Zmc2V0Rm9yT2Zmc2V0Om1heE9mZnNldDpt aW5PZmZzZXQ6cmFuZ2U6b3V0c2lkZTpdKToKKyAgICAgICAgTm93IHRoYXQgdGhlIFdLQ29udGVu dFZpZXcgY2FuICh3aXRob3V0IHBpbmNoaW5nKSBiZSBzbWFsbGVyIHRoYW4gdGhlIHVub2JzY3Vy ZWQKKyAgICAgICAgcmVnaW9uIG9mIHRoZSBXS1dlYlZpZXcsIHdlIG5lZWQgdG8gdGFrZSB0aGF0 IGludG8gYWNjb3VudCB3aGVuIGRlY2lkaW5nIHdoZXJlCisgICAgICAgIHRvIHJldGFyZ2V0IHNj cm9sbGluZy4KKwogMjAxNS0wMy0xMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBh cHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byB6b29tIG9uIHBhZ2VzIHRo YXQgY2xhaW0gdG8gbGF5IG91dCB0byBkZXZpY2Ugc2l6ZSBhbmQgdGhlbiBmYWlsIHRvIGRvIHNv CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAKaW5kZXgg MDBjNmMzYTJlMzkzNTBjODk2NDI4N2RjYmY5YjMzOTMyNTI0NmIyNy4uZGJkYzUyMTE2ZjM0NTI3 ZTFkNTNlNjVhZjFjNzZkN2ZlYmQ1MWU4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmll d3BvcnRDb25maWd1cmF0aW9uLmNwcApAQCAtOTcsNyArOTcsNyBAQCBJbnRTaXplIFZpZXdwb3J0 Q29uZmlndXJhdGlvbjo6bGF5b3V0U2l6ZSgpIGNvbnN0CiAgICAgcmV0dXJuIEludFNpemUobGF5 b3V0V2lkdGgoKSwgbGF5b3V0SGVpZ2h0KCkpOwogfQogCi1ib29sIFZpZXdwb3J0Q29uZmlndXJh dGlvbjo6c2hvdWxkSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzKCkgY29uc3QKK2Jvb2wgVmlld3Bv cnRDb25maWd1cmF0aW9uOjpzaG91bGRJZ25vcmVIb3Jpem9udGFsU2NhbGluZ0NvbnN0cmFpbnRz KCkgY29uc3QKIHsKICAgICBpZiAoIW1fY2FuSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzKQogICAg ICAgICByZXR1cm4gZmFsc2U7CkBAIC0xMDYsMTYgKzEwNiwyOSBAQCBib29sIFZpZXdwb3J0Q29u ZmlndXJhdGlvbjo6c2hvdWxkSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzKCkgY29uc3QKICAgICBp ZiAobV92aWV3cG9ydEFyZ3VtZW50cy53aWR0aCA9PSBWaWV3cG9ydEFyZ3VtZW50czo6VmFsdWVE ZXZpY2VXaWR0aCkKICAgICAgICAgcmV0dXJuIGxhaWRPdXRXaWRlclRoYW5WaWV3cG9ydDsKIAor ICAgIGlmIChtX2NvbmZpZ3VyYXRpb24uaW5pdGlhbFNjYWxlSXNTZXQgJiYgbV9jb25maWd1cmF0 aW9uLmluaXRpYWxTY2FsZSA9PSAxKQorICAgICAgICByZXR1cm4gbGFpZE91dFdpZGVyVGhhblZp ZXdwb3J0OworCisgICAgcmV0dXJuIGZhbHNlOworfQorCitib29sIFZpZXdwb3J0Q29uZmlndXJh dGlvbjo6c2hvdWxkSWdub3JlVmVydGljYWxTY2FsaW5nQ29uc3RyYWludHMoKSBjb25zdAorewor ICAgIGlmICghbV9jYW5JZ25vcmVTY2FsaW5nQ29uc3RyYWludHMpCisgICAgICAgIHJldHVybiBm YWxzZTsKKwogICAgIGJvb2wgbGFpZE91dFRhbGxlclRoYW5WaWV3cG9ydCA9IG1fY29udGVudFNp emUuaGVpZ2h0KCkgPiBsYXlvdXRIZWlnaHQoKTsKICAgICBpZiAobV92aWV3cG9ydEFyZ3VtZW50 cy5oZWlnaHQgPT0gVmlld3BvcnRBcmd1bWVudHM6OlZhbHVlRGV2aWNlSGVpZ2h0KQogICAgICAg ICByZXR1cm4gbGFpZE91dFRhbGxlclRoYW5WaWV3cG9ydDsKIAotICAgIGlmIChtX2NvbmZpZ3Vy YXRpb24uaW5pdGlhbFNjYWxlSXNTZXQgJiYgbV9jb25maWd1cmF0aW9uLmluaXRpYWxTY2FsZSA9 PSAxKQotICAgICAgICByZXR1cm4gbGFpZE91dFdpZGVyVGhhblZpZXdwb3J0OwotCiAgICAgcmV0 dXJuIGZhbHNlOwogfQogCitib29sIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2hvdWxkSWdub3Jl U2NhbGluZ0NvbnN0cmFpbnRzKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc2hvdWxkSWdub3JlSG9y aXpvbnRhbFNjYWxpbmdDb25zdHJhaW50cygpIHx8IHNob3VsZElnbm9yZVZlcnRpY2FsU2NhbGlu Z0NvbnN0cmFpbnRzKCk7Cit9CisKIGRvdWJsZSBWaWV3cG9ydENvbmZpZ3VyYXRpb246OmluaXRp YWxTY2FsZSgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCFjb25zdHJhaW50c0FyZUFsbFJlbGF0aXZl KG1fY29uZmlndXJhdGlvbikpOwpAQCAtMTMwLDEyICsxNDMsMTIgQEAgZG91YmxlIFZpZXdwb3J0 Q29uZmlndXJhdGlvbjo6aW5pdGlhbFNjYWxlKCkgY29uc3QKICAgICBjb25zdCBGbG9hdFNpemUm IG1pbmltdW1MYXlvdXRTaXplID0gbV9taW5pbXVtTGF5b3V0U2l6ZTsKICAgICBkb3VibGUgd2lk dGggPSBtX2NvbnRlbnRTaXplLndpZHRoKCkgPiAwID8gbV9jb250ZW50U2l6ZS53aWR0aCgpIDog bGF5b3V0V2lkdGgoKTsKICAgICBkb3VibGUgaW5pdGlhbFNjYWxlID0gMDsKLSAgICBpZiAod2lk dGggPiAwKQorICAgIGlmICh3aWR0aCA+IDAgJiYgIXNob3VsZElnbm9yZVZlcnRpY2FsU2NhbGlu Z0NvbnN0cmFpbnRzKCkpCiAgICAgICAgIGluaXRpYWxTY2FsZSA9IG1pbmltdW1MYXlvdXRTaXpl LndpZHRoKCkgLyB3aWR0aDsKIAotICAgIC8vIFByZXZlbnQgdGhlIGludGlhbCBzY2FsZSBmcm9t IHNocmlua2luZyB0byBhIGhlaWdodCBzbWFsbGVyIHRoYW4gb3VyIHZpZXcncyBtaW5pbXVtIGhl aWdodC4KKyAgICAvLyBQcmV2ZW50IHRoZSBpbml0aWFsIHNjYWxlIGZyb20gc2hyaW5raW5nIHRv IGEgaGVpZ2h0IHNtYWxsZXIgdGhhbiBvdXIgdmlldydzIG1pbmltdW0gaGVpZ2h0LgogICAgIGRv dWJsZSBoZWlnaHQgPSBtX2NvbnRlbnRTaXplLmhlaWdodCgpID4gMCA/IG1fY29udGVudFNpemUu aGVpZ2h0KCkgOiBsYXlvdXRIZWlnaHQoKTsKLSAgICBpZiAoaGVpZ2h0ID4gMCAmJiBoZWlnaHQg KiBpbml0aWFsU2NhbGUgPCBtaW5pbXVtTGF5b3V0U2l6ZS5oZWlnaHQoKSkKKyAgICBpZiAoaGVp Z2h0ID4gMCAmJiBoZWlnaHQgKiBpbml0aWFsU2NhbGUgPCBtaW5pbXVtTGF5b3V0U2l6ZS5oZWln aHQoKSAmJiAhc2hvdWxkSWdub3JlSG9yaXpvbnRhbFNjYWxpbmdDb25zdHJhaW50cygpKQogICAg ICAgICBpbml0aWFsU2NhbGUgPSBtaW5pbXVtTGF5b3V0U2l6ZS5oZWlnaHQoKSAvIGhlaWdodDsK ICAgICByZXR1cm4gc3RkOjptaW4oc3RkOjptYXgoaW5pdGlhbFNjYWxlLCBzaG91bGRJZ25vcmVT Y2FsaW5nQ29uc3RyYWludHMoKSA/IG1fZGVmYXVsdENvbmZpZ3VyYXRpb24ubWluaW11bVNjYWxl IDogbV9jb25maWd1cmF0aW9uLm1pbmltdW1TY2FsZSksIG1fY29uZmlndXJhdGlvbi5tYXhpbXVt U2NhbGUpOwogfQpAQCAtMTUxLDExICsxNjQsMTEgQEAgZG91YmxlIFZpZXdwb3J0Q29uZmlndXJh dGlvbjo6bWluaW11bVNjYWxlKCkgY29uc3QKIAogICAgIGNvbnN0IEZsb2F0U2l6ZSYgbWluaW11 bUxheW91dFNpemUgPSBtX21pbmltdW1MYXlvdXRTaXplOwogICAgIGRvdWJsZSBjb250ZW50V2lk dGggPSBtX2NvbnRlbnRTaXplLndpZHRoKCk7Ci0gICAgaWYgKGNvbnRlbnRXaWR0aCA+IDAgJiYg Y29udGVudFdpZHRoICogbWluaW11bVNjYWxlIDwgbWluaW11bUxheW91dFNpemUud2lkdGgoKSkK KyAgICBpZiAoY29udGVudFdpZHRoID4gMCAmJiBjb250ZW50V2lkdGggKiBtaW5pbXVtU2NhbGUg PCBtaW5pbXVtTGF5b3V0U2l6ZS53aWR0aCgpICYmICFzaG91bGRJZ25vcmVWZXJ0aWNhbFNjYWxp bmdDb25zdHJhaW50cygpKQogICAgICAgICBtaW5pbXVtU2NhbGUgPSBtaW5pbXVtTGF5b3V0U2l6 ZS53aWR0aCgpIC8gY29udGVudFdpZHRoOwogCiAgICAgZG91YmxlIGNvbnRlbnRIZWlnaHQgPSBt X2NvbnRlbnRTaXplLmhlaWdodCgpOwotICAgIGlmIChjb250ZW50SGVpZ2h0ID4gMCAmJiBjb250 ZW50SGVpZ2h0ICogbWluaW11bVNjYWxlIDwgbWluaW11bUxheW91dFNpemUuaGVpZ2h0KCkpCisg ICAgaWYgKGNvbnRlbnRIZWlnaHQgPiAwICYmIGNvbnRlbnRIZWlnaHQgKiBtaW5pbXVtU2NhbGUg PCBtaW5pbXVtTGF5b3V0U2l6ZS5oZWlnaHQoKSAmJiAhc2hvdWxkSWdub3JlSG9yaXpvbnRhbFNj YWxpbmdDb25zdHJhaW50cygpKQogICAgICAgICBtaW5pbXVtU2NhbGUgPSBtaW5pbXVtTGF5b3V0 U2l6ZS5oZWlnaHQoKSAvIGNvbnRlbnRIZWlnaHQ7CiAKICAgICBtaW5pbXVtU2NhbGUgPSBzdGQ6 Om1pbihzdGQ6Om1heChtaW5pbXVtU2NhbGUsIG1fY29uZmlndXJhdGlvbi5taW5pbXVtU2NhbGUp LCBtX2NvbmZpZ3VyYXRpb24ubWF4aW11bVNjYWxlKTsKQEAgLTQ5MCw3ICs1MDMsOSBAQCBDU3Ry aW5nIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6ZGVzY3JpcHRpb24oKSBjb25zdAogICAgIHRzLndy aXRlSW5kZW50KCk7CiAgICAgdHMgPDwgIihjb21wdXRlZCBsYXlvdXQgc2l6ZSAiIDw8IGxheW91 dFNpemUoKSA8PCAiKVxuIjsKICAgICB0cy53cml0ZUluZGVudCgpOwotICAgIHRzIDw8ICIoaWdu b3Jpbmcgc2NhbGluZyBjb25zdHJhaW50cyAiIDw8IChzaG91bGRJZ25vcmVTY2FsaW5nQ29uc3Ry YWludHMoKSA/ICJ0cnVlIiA6ICJmYWxzZSIpIDw8ICIpIjsKKyAgICB0cyA8PCAiKGlnbm9yaW5n IGhvcml6b250YWwgc2NhbGluZyBjb25zdHJhaW50cyAiIDw8IChzaG91bGRJZ25vcmVIb3Jpem9u dGFsU2NhbGluZ0NvbnN0cmFpbnRzKCkgPyAidHJ1ZSIgOiAiZmFsc2UiKSA8PCAiKVxuIjsKKyAg ICB0cy53cml0ZUluZGVudCgpOworICAgIHRzIDw8ICIoaWdub3JpbmcgdmVydGljYWwgc2NhbGlu ZyBjb25zdHJhaW50cyAiIDw8IChzaG91bGRJZ25vcmVWZXJ0aWNhbFNjYWxpbmdDb25zdHJhaW50 cygpID8gInRydWUiIDogImZhbHNlIikgPDwgIikiOwogICAgIHRzLmRlY3JlYXNlSW5kZW50KCk7 CiAKICAgICB0cyA8PCAiKVxuIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmll d3BvcnRDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmln dXJhdGlvbi5oCmluZGV4IDk3Mzg1YWM5OWUzYWFiMzdmZjlmNGU5YTZjZjE1ZDZiY2E1NWM2NTku LmUxYWNmNmUxMDQzYjc4ZDY1ZjFjZjI3ZmMwZTE0YzViNDc2MjY3M2UgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaApAQCAtMTAxLDcgKzEwMSwxMCBAQCBw cml2YXRlOgogICAgIGRvdWJsZSB2aWV3cG9ydEFyZ3VtZW50c0xlbmd0aChkb3VibGUgbGVuZ3Ro KSBjb25zdDsKICAgICBpbnQgbGF5b3V0V2lkdGgoKSBjb25zdDsKICAgICBpbnQgbGF5b3V0SGVp Z2h0KCkgY29uc3Q7CisKICAgICBib29sIHNob3VsZElnbm9yZVNjYWxpbmdDb25zdHJhaW50cygp IGNvbnN0OworICAgIGJvb2wgc2hvdWxkSWdub3JlVmVydGljYWxTY2FsaW5nQ29uc3RyYWludHMo KSBjb25zdDsKKyAgICBib29sIHNob3VsZElnbm9yZUhvcml6b250YWxTY2FsaW5nQ29uc3RyYWlu dHMoKSBjb25zdDsKIAogICAgIFBhcmFtZXRlcnMgbV9jb25maWd1cmF0aW9uOwogICAgIFBhcmFt ZXRlcnMgbV9kZWZhdWx0Q29uZmlndXJhdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XS1Njcm9sbFZpZXcubW0KaW5kZXggZDc1ZDJmMzdiNjAzY2I0ZjBiNDE5NTk4MjRjZWU1 MjA3NjlmNTZlOS4uNjM5ODk0YjI1YzFkMTVmOGYzYmRhYTc2ODU3N2E5M2JhYzAzYzU2MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0KKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0KQEAgLTE3Niw2 ICsxNzYsMTEgQEAgc3RhdGljIGlubGluZSBib29sIHZhbHVlc0FyZVdpdGhpbk9uZVBpeGVsKENH RmxvYXQgYSwgQ0dGbG9hdCBiKQogICAgIENHUmVjdCBib3VuZHMgPSBzZWxmLmJvdW5kczsKIAog ICAgIENHRmxvYXQgbWluaW1hbEhvcml6b250YWxSYW5nZSA9IGJvdW5kcy5zaXplLndpZHRoIC0g Y29udGVudEluc2V0cy5sZWZ0IC0gY29udGVudEluc2V0cy5yaWdodDsKKyAgICBDR0Zsb2F0IGNv bnRlbnRXaWR0aEF0TWluaW11bVNjYWxlID0gY29udGVudFNpemUud2lkdGggKiAoc2VsZi5taW5p bXVtWm9vbVNjYWxlIC8gc2VsZi56b29tU2NhbGUpOworICAgIGlmIChjb250ZW50V2lkdGhBdE1p bmltdW1TY2FsZSA8IG1pbmltYWxIb3Jpem9udGFsUmFuZ2UpIHsKKyAgICAgICAgQ0dGbG9hdCB1 bm9ic2N1cmVkRW1wdHlIb3Jpem9udGFsTWFyZ2luQXRNaW5pbXVtU2NhbGUgPSBtaW5pbWFsSG9y aXpvbnRhbFJhbmdlIC0gY29udGVudFdpZHRoQXRNaW5pbXVtU2NhbGU7CisgICAgICAgIG1pbmlt YWxIb3Jpem9udGFsUmFuZ2UgLT0gdW5vYnNjdXJlZEVtcHR5SG9yaXpvbnRhbE1hcmdpbkF0TWlu aW11bVNjYWxlOworICAgIH0KICAgICBpZiAoY29udGVudFNpemUud2lkdGggPCBtaW5pbWFsSG9y aXpvbnRhbFJhbmdlKSB7CiAgICAgICAgIGlmICh2YWx1ZXNBcmVXaXRoaW5PbmVQaXhlbChtaW5P ZmZzZXQsIC1jb250ZW50SW5zZXRzLmxlZnQpCiAgICAgICAgICAgICAmJiB2YWx1ZXNBcmVXaXRo aW5PbmVQaXhlbChtYXhPZmZzZXQsIGNvbnRlbnRTaXplLndpZHRoICsgY29udGVudEluc2V0cy5y aWdodCAtIGJvdW5kcy5zaXplLndpZHRoKQpAQCAtMTg4LDYgKzE5MywxMSBAQCBzdGF0aWMgaW5s aW5lIGJvb2wgdmFsdWVzQXJlV2l0aGluT25lUGl4ZWwoQ0dGbG9hdCBhLCBDR0Zsb2F0IGIpCiAg ICAgfQogCiAgICAgQ0dGbG9hdCBtaW5pbWFsVmVydGljYWxSYW5nZSA9IGJvdW5kcy5zaXplLmhl aWdodCAtIGNvbnRlbnRJbnNldHMudG9wIC0gY29udGVudEluc2V0cy5ib3R0b207CisgICAgQ0dG bG9hdCBjb250ZW50SGVpZ2h0QXRNaW5pbXVtU2NhbGUgPSBjb250ZW50U2l6ZS5oZWlnaHQgKiAo c2VsZi5taW5pbXVtWm9vbVNjYWxlIC8gc2VsZi56b29tU2NhbGUpOworICAgIGlmIChjb250ZW50 SGVpZ2h0QXRNaW5pbXVtU2NhbGUgPCBtaW5pbWFsVmVydGljYWxSYW5nZSkgeworICAgICAgICBD R0Zsb2F0IHVub2JzY3VyZWRFbXB0eVZlcnRpY2FsTWFyZ2luQXRNaW5pbXVtU2NhbGUgPSBtaW5p bWFsVmVydGljYWxSYW5nZSAtIGNvbnRlbnRIZWlnaHRBdE1pbmltdW1TY2FsZTsKKyAgICAgICAg bWluaW1hbFZlcnRpY2FsUmFuZ2UgLT0gdW5vYnNjdXJlZEVtcHR5VmVydGljYWxNYXJnaW5BdE1p bmltdW1TY2FsZTsKKyAgICB9CiAgICAgaWYgKGNvbnRlbnRTaXplLmhlaWdodCA8IG1pbmltYWxW ZXJ0aWNhbFJhbmdlKSB7CiAgICAgICAgIGlmICh2YWx1ZXNBcmVXaXRoaW5PbmVQaXhlbChtaW5P ZmZzZXQsIC1jb250ZW50SW5zZXRzLnRvcCkKICAgICAgICAgICAgICYmIHZhbHVlc0FyZVdpdGhp bk9uZVBpeGVsKG1heE9mZnNldCwgY29udGVudFNpemUuaGVpZ2h0ICsgY29udGVudEluc2V0cy5i b3R0b20gLSBib3VuZHMuc2l6ZS5oZWlnaHQpCg==