201256 2019-08-28 17:26:05 -0700 Reloading a web view with a fixed-width viewport and variable content width restores the previous page scale, shouldn't 2019-08-28 19:07:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1565980 0 thorton 2019-08-28 17:26:05 -0700 Reloading a web view with a fixed-width viewport and variable content width restores the previous page scale, shouldn't 1565982 1 377516 thorton 2019-08-28 17:26:34 -0700 Created attachment 377516 Patch 1565983 2 thorton 2019-08-28 17:26:37 -0700 <rdar://problem/54809509> 1566045 3 377516 commit-queue 2019-08-28 19:07:42 -0700 Comment on attachment 377516 Patch Clearing flags on attachment: 377516 Committed r249230: <https://trac.webkit.org/changeset/249230> 1566046 4 commit-queue 2019-08-28 19:07:43 -0700 All reviewed patches have been landed. Closing bug. 377516 2019-08-28 17:26:34 -0700 2019-08-28 19:07:42 -0700 Patch bug-201256-20190828172633.patch text/plain 13874 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgzNWRkMWMyMjljMzE1Njg2 YjIzNmFiYzg3OGI1ZGY1YTVlZDMyOGUuLmJjMzlkOTY1ZjYwNzUwNmMwMmExOTA5MTJhZGI4NzM3 NGRhOGI0N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDgtMjggIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVsb2FkaW5nIGEgd2Vi IHZpZXcgd2l0aCBhIGZpeGVkLXdpZHRoIHZpZXdwb3J0IGFuZCB2YXJpYWJsZSBjb250ZW50IHdp ZHRoIHJlc3RvcmVzIHRoZSBwcmV2aW91cyBwYWdlIHNjYWxlLCBzaG91bGRuJ3QKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTI1NgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTQ4MDk1MDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlc3RvcmVQYWdlU3RhdGUpOgorICAgICAgICBX aGVuIHJlc3RvcmluZyBwYWdlIHN0YXRlIGZyb20gYSBoaXN0b3J5IGl0ZW0sIGlmIHRoZSBzYXZl ZCBzY2FsZSB3YXMgZXF1YWwgdG8gdGhlCisgICAgICAgIGluaXRpYWwgc2NhbGUgYXQgdGhlIHRp bWUgaXQgd2FzIHNhdmVkLCBpZ25vcmUgdGhlIHNhdmVkIHNjYWxlIGFuZCB1c2UgdGhlIGN1cnJl bnQKKyAgICAgICAgaW5pdGlhbCBzY2FsZSBpbnN0ZWFkLgorCisgICAgICAgIE5vcm1hbGx5IHRo aXMgZG9lc24ndCBtYXR0ZXIgYmVjYXVzZSBhIGdpdmVuIHBhZ2UncyBpbml0aWFsIHNjYWxlIGRv ZXNuJ3QgdXN1YWxseSBjaGFuZ2UKKyAgICAgICAgYmV0d2VlbiBsb2FkcywgYnV0IGl0IHRvdGFs bHkgY2FuISBTZWUgdGhlIHRlc3QgZm9yIG9uZSBleGFtcGxlIG9mIGEgd2F5IGFuIEFQSSBjbGll bnQKKyAgICAgICAgbWlnaHQgY2F1c2UgdGhpczsgeW91IGNvdWxkIGFsc28gaW1hZ2luZSBzb21l dGhpbmcgc2ltaWxhciBoYXBwZW5pbmcgaWYgdGhlIGFjdHVhbAorICAgICAgICBwYWdlIGNvbnRl bnQgY2hhbmdlZC4KKwogMjAxOS0wOC0yNyAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lA c29ueS5jb20+CiAKICAgICAgICAgW1JlbW90ZUluc3BlY3Rvcl1bU29ja2V0XSBSZXN0cnVjdHVy aW5nIHRoZSBjb21wb25lbnRzIG9mIFNvY2tldCBpbXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCA0MDAw MmNmOTMwZmNiYzFkMmRmNTM1ZmYzMzYwNTAwOWI3ODhmZmEyLi45MzQ3YmFlOWMyNTMxMDA5NjEy OTBmNmJhOThhN2ZlYTQ5ZmUzYzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMzc5LDcgKzM3OSw4IEBAIHZvaWQgV2Vi UGFnZTo6cmVzdG9yZVBhZ2VTdGF0ZShjb25zdCBIaXN0b3J5SXRlbSYgaGlzdG9yeUl0ZW0pCiAK ICAgICBGbG9hdFNpemUgY3VycmVudE1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRp bmF0ZXMgPSBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5taW5pbXVtTGF5b3V0U2l6ZSgpOwogICAg IGlmIChoaXN0b3J5SXRlbS5taW5pbXVtTGF5b3V0U2l6ZUluU2Nyb2xsVmlld0Nvb3JkaW5hdGVz KCkgPT0gY3VycmVudE1pbmltdW1MYXlvdXRTaXplSW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMpIHsK LSAgICAgICAgZmxvYXQgYm91bmRlZFNjYWxlID0gc3RkOjptaW48ZmxvYXQ+KG1fdmlld3BvcnRD b25maWd1cmF0aW9uLm1heGltdW1TY2FsZSgpLCBzdGQ6Om1heDxmbG9hdD4obV92aWV3cG9ydENv bmZpZ3VyYXRpb24ubWluaW11bVNjYWxlKCksIGhpc3RvcnlJdGVtLnBhZ2VTY2FsZUZhY3Rvcigp KSk7CisgICAgICAgIGZsb2F0IGJvdW5kZWRTY2FsZSA9IGhpc3RvcnlJdGVtLnNjYWxlSXNJbml0 aWFsKCkgPyBtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5pbml0aWFsU2NhbGUoKSA6IGhpc3RvcnlJ dGVtLnBhZ2VTY2FsZUZhY3RvcigpOworICAgICAgICBib3VuZGVkU2NhbGUgPSBzdGQ6Om1pbjxm bG9hdD4obV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWF4aW11bVNjYWxlKCksIHN0ZDo6bWF4PGZs b2F0PihtX3ZpZXdwb3J0Q29uZmlndXJhdGlvbi5taW5pbXVtU2NhbGUoKSwgYm91bmRlZFNjYWxl KSk7CiAgICAgICAgIHNjYWxlUGFnZShib3VuZGVkU2NhbGUsIEludFBvaW50KCkpOwogCiAgICAg ICAgIE9wdGlvbmFsPEZsb2F0UG9pbnQ+IHNjcm9sbFBvc2l0aW9uOwpkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDA5OGU5NGYyY2VmOWM0MmQyMzU4 ZWZhZjk0NTYxMDM3NjFlZTQ2NDYuLjI2ODY4YjhhZDhiNmM4MTk3NjM2YjI5Y2NjODQyOTY0N2Qy NmZhOTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOCBAQAorMjAxOS0wOC0yOCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9u QGFwcGxlLmNvbT4KKworICAgICAgICBSZWxvYWRpbmcgYSB3ZWIgdmlldyB3aXRoIGEgZml4ZWQt d2lkdGggdmlld3BvcnQgYW5kIHZhcmlhYmxlIGNvbnRlbnQgd2lkdGggcmVzdG9yZXMgdGhlIHBy ZXZpb3VzIHBhZ2Ugc2NhbGUsIHNob3VsZG4ndAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMjU2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDgw OTUwOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L2xvbmctZW1haWwtdmlld3BvcnQu aHRtbDogQWRkZWQuCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9S ZWxvYWRXaXRoRGlmZmVyaW5nSW5pdGlhbFNjYWxlLm1tOiBBZGRlZC4KKyAgICAgICAgKFRlc3RX ZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICBBZGQgYSB0ZXN0LiBJIGxlZnQgbWFueSBjb21tZW50 cyBiZWNhdXNlIEkgaGFkIGEgZ3JlYXQgZGVhbCBvZiB0cm91YmxlCisgICAgICAgIHdyaXRpbmcg dGhpcyB0ZXN0IGFuZCB3YW50ZWQgdG8gZG9jdW1lbnQgbXkgZmluZGluZ3MuCisKIDIwMTktMDgt MjcgIFpoaWZlaSBGYW5nICA8emhpZmVpX2ZhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFtyZXN1 bHRzLndlYmtpdC5vcmcgV2Via2l0LmNzc10gQ2VudGVyIHRoZSBsZWdlbmQgc3ltYm9scwpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagppbmRleCBiNGRkNTQ3Y2U3NGJlODkzYmQ3Mjc0YzRhMzAzYjhmZDQz OGNhM2M4Li5lYmEyYTk4OGIzZGYwNzUzZjdmOTUxNGUwNDVhYmJmNjU1NGM0N2IxIDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagpAQCAtMTI2LDYgKzEyNiw4IEBACiAJCTJEMjFGRTU5MUYwNDY0Mjkw MEI1OEU3RCAvKiBXS1BERlZpZXdTdGFibGVQcmVzZW50YXRpb25VcGRhdGVDYWxsYmFjay5tbSBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDJEMjFGRTU4MUYw NDY0MjgwMEI1OEU3RCAvKiBXS1BERlZpZXdTdGFibGVQcmVzZW50YXRpb25VcGRhdGVDYWxsYmFj ay5tbSAqLzsgfTsKIAkJMkQyQkVCMkQyMjMyNEU1RjAwNTU0NENBIC8qIFJlcXVlc3RUZXh0SW5w dXRDb250ZXh0Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMkQyQkVCMkMyMjMyNEU1RjAwNTU0NENBIC8qIFJlcXVlc3RUZXh0SW5wdXRDb250ZXh0Lm1t ICovOyB9OwogCQkyRDJEMTNCMzIyOUY0MDhCMDA1MDY4QUYgLyogRGV2aWNlTWFuYWdlbWVudFJl c3RyaWN0aW9ucy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDJEMkQxM0IyMjI5RjQwOEIwMDUwNjhBRiAvKiBEZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rp b25zLm1tICovOyB9OworCQkyRDJGRThEODIzMTVGMDZFMDBCMkU5QzkgLyogUmVsb2FkV2l0aERp ZmZlcmluZ0luaXRpYWxTY2FsZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDJEMkZFOEQ3MjMxNUYwNkQwMEIyRTlDOSAvKiBSZWxvYWRXaXRoRGlmZmVy aW5nSW5pdGlhbFNjYWxlLm1tICovOyB9OworCQkyRDJGRThEQTIzMTc0NUM5MDBCMkU5QzkgLyog bG9uZy1lbWFpbC12aWV3cG9ydC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDJEMkZFOEQ5MjMxNzQ1QUIwMEIyRTlDOSAvKiBsb25nLWVt YWlsLXZpZXdwb3J0Lmh0bWwgKi87IH07CiAJCTJEM0NBM0E4MjIxREY0QjQwMDg4RTgwMyAvKiBQ YWdlT3ZlcmxheVBsdWdpbi5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDJEM0NBM0E0MjIxREYyMzkwMDg4RTgwMyAvKiBQYWdlT3ZlcmxheVBsdWdpbi5t bSAqLzsgfTsKIAkJMkQ0Q0Y4QkQxRDgzNjBDQzAwMDFDRThEIC8qIFdLVGh1bWJuYWlsVmlldy5t bSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDJENENGOEJD MUQ4MzYwQ0MwMDAxQ0U4RCAvKiBXS1RodW1ibmFpbFZpZXcubW0gKi87IH07CiAJCTJENTFBMEM3 MUM4QkYwMEMwMDc2NUM0NSAvKiBET01IVE1MVmlkZW9FbGVtZW50V3JhcHBlci5tbSBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDJENTFBMEM1MUM4QkYwMDQw MDc2NUM0NSAvKiBET01IVE1MVmlkZW9FbGVtZW50V3JhcHBlci5tbSAqLzsgfTsKQEAgLTEzMjEs NiArMTMyMyw3IEBACiAJCQkJNDZDNTE5RTcxRDM1NjNGRDAwREFBNTFBIC8qIExvY2FsU3RvcmFn ZU51bGxFbnRyaWVzLmxvY2Fsc3RvcmFnZSBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQk0NkM1 MTlFODFEMzU2M0ZEMDBEQUE1MUEgLyogTG9jYWxTdG9yYWdlTnVsbEVudHJpZXMubG9jYWxzdG9y YWdlLXNobSBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQk3QTZBMkM3MjFEQ0NGQjUyMDBDMEQw ODUgLyogTG9jYWxTdG9yYWdlUXVpcmtFbmFibGVkLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8s CisJCQkJMkQyRkU4REEyMzE3NDVDOTAwQjJFOUM5IC8qIGxvbmctZW1haWwtdmlld3BvcnQuaHRt bCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQlDOUU4RUU3NTIxREVEOTQzMDA3OTc3NjUgLyog bG9uZy10ZXN0Lm1wNCBpbiBDb3B5IFJlc291cmNlcyAqLywKIAkJCQk5MzYxMDAyOTE0REM5NUE3 MDA2MTM3OUQgLyogbG90cy1vZi1pZnJhbWVzLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJ CQkJOTNBRjRFRDExNTA2RjEzMDAwN0ZENTdFIC8qIGxvdHMtb2YtaW1hZ2VzLmh0bWwgaW4gQ29w eSBSZXNvdXJjZXMgKi8sCkBAIC0xNTY4LDYgKzE1NzEsOCBAQAogCQkyRDIxRkU1ODFGMDQ2NDI4 MDBCNThFN0QgLyogV0tQREZWaWV3U3RhYmxlUHJlc2VudGF0aW9uVXBkYXRlQ2FsbGJhY2subW0g Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXS1BERlZpZXdTdGFibGVQ cmVzZW50YXRpb25VcGRhdGVDYWxsYmFjay5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJMkQyQkVCMkMyMjMyNEU1RjAwNTU0NENBIC8qIFJlcXVlc3RUZXh0SW5wdXRDb250ZXh0Lm1t ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gUmVxdWVzdFRleHRJbnB1 dENvbnRleHQubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJEMkQxM0IyMjI5RjQw OEIwMDUwNjhBRiAvKiBEZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25zLm1tICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gRGV2aWNlTWFuYWdlbWVudFJlc3RyaWN0aW9u cy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMkQyRkU4RDcyMzE1RjA2RDAwQjJF OUM5IC8qIFJlbG9hZFdpdGhEaWZmZXJpbmdJbml0aWFsU2NhbGUubW0gKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBSZWxvYWRXaXRoRGlmZmVyaW5nSW5pdGlhbFNjYWxl Lm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkyRDJGRThEOTIzMTc0NUFCMDBCMkU5 QzkgLyogbG9uZy1lbWFpbC12aWV3cG9ydC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRo ID0gImxvbmctZW1haWwtdmlld3BvcnQuaHRtbCI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTJEM0NBM0E0MjIxREYyMzkwMDg4RTgwMyAvKiBQYWdlT3ZlcmxheVBsdWdpbi5tbSAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFBhZ2VPdmVybGF5UGx1Z2luLm1t OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyRDRDRjhCQzFEODM2MENDMDAwMUNFOEQg LyogV0tUaHVtYm5haWxWaWV3Lm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBu YW1lID0gV0tUaHVtYm5haWxWaWV3Lm1tOyBwYXRoID0gV2ViS2l0L1dLVGh1bWJuYWlsVmlldy5t bTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkQ1MUEwQzUxQzhCRjAwNDAwNzY1QzQ1 IC8qIERPTUhUTUxWaWRlb0VsZW1lbnRXcmFwcGVyLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAub2JqY3BwOyBwYXRoID0gRE9NSFRNTFZpZGVvRWxlbWVudFdyYXBwZXIubW07IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0yODMwLDYgKzI4MzUsNyBAQAogCQkJCTU3OThFMkFGMUNB RjVDMjgwMEM1Q0JBMCAvKiBQcm92aXNpb25hbFVSTE5vdENoYW5nZS5tbSAqLywKIAkJCQk1Q0ZB Q0Y2NDIyNkZEMUZCMDA1NkM3RDAgLyogUHJveHkubW0gKi8sCiAJCQkJQTFDNEZCNkMxQkFDQ0U1 MDAwMzc0MkQwIC8qIFF1aWNrTG9vay5tbSAqLywKKwkJCQkyRDJGRThENzIzMTVGMDZEMDBCMkU5 QzkgLyogUmVsb2FkV2l0aERpZmZlcmluZ0luaXRpYWxTY2FsZS5tbSAqLywKIAkJCQkxQTRGODFE MDFCREZGRENGMDA0RTY3MkUgLyogUmVtb3RlT2JqZWN0UmVnaXN0cnkuaCAqLywKIAkJCQkxQTRG ODFDODFCREZGRDE4MDA0RTY3MkUgLyogUmVtb3RlT2JqZWN0UmVnaXN0cnkubW0gKi8sCiAJCQkJ MUE0RjgxQ0QxQkRGRkQ1MzAwNEU2NzJFIC8qIFJlbW90ZU9iamVjdFJlZ2lzdHJ5UGx1Z0luLm1t ICovLApAQCAtMzY5NSw2ICszNzAxLDcgQEAKIAkJCQk4MzYxRjE3NzFFNjEwQjIxMDA3NTlCMjUg LyogbGluay13aXRoLWRvd25sb2FkLWF0dHJpYnV0ZS13aXRoLXNsYXNoZXMuaHRtbCAqLywKIAkJ CQk4MzQ5RDNDMzFEQjk3MjRGMDA0QTlGNjUgLyogbGluay13aXRoLWRvd25sb2FkLWF0dHJpYnV0 ZS5odG1sICovLAogCQkJCTM3OEU2NDc4MTYzMjZGREYwMEI2QzY3NiAvKiBsaW5rLXdpdGgtdGl0 bGUuaHRtbCAqLywKKwkJCQkyRDJGRThEOTIzMTc0NUFCMDBCMkU5QzkgLyogbG9uZy1lbWFpbC12 aWV3cG9ydC5odG1sICovLAogCQkJCUM5RThFRTc0MjFERUQ5MUUwMDc5Nzc2NSAvKiBsb25nLXRl c3QubXA0ICovLAogCQkJCTkzNjEwMDI4MTREQzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFt ZXMuaHRtbCAqLywKIAkJCQk5M0FGNEVDRjE1MDZGMTIzMDA3RkQ1N0UgLyogbG90cy1vZi1pbWFn ZXMuaHRtbCAqLywKQEAgLTQ2NDQsNiArNDY1MSw3IEBACiAJCQkJN0M4M0UwQzIxRDBBNjUzNTAw RkVCQ0YzIC8qIFF1aWNrTG9vay5tbSBpbiBTb3VyY2VzICovLAogCQkJCTZCNEU4NjFDMjIyMEE1 NTIwMDIyRjM4OSAvKiBSZWdpc3RyYWJsZURvbWFpbi5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk3 Q0NFN0YwRDFBNDExQUU2MDA0NDdDNEMgLyogUmVsb2FkUGFnZUFmdGVyQ3Jhc2guY3BwIGluIFNv dXJjZXMgKi8sCisJCQkJMkQyRkU4RDgyMzE1RjA2RTAwQjJFOUM5IC8qIFJlbG9hZFdpdGhEaWZm ZXJpbmdJbml0aWFsU2NhbGUubW0gaW4gU291cmNlcyAqLywKIAkJCQk3QzgzRTBDMzFEMEE2NTNB MDBGRUJDRjMgLyogUmVtb3RlT2JqZWN0UmVnaXN0cnkubW0gaW4gU291cmNlcyAqLywKIAkJCQk3 Q0NFN0VDOTFBNDExQTdFMDA0NDdDNEMgLyogUmVuZGVyZWRJbWFnZUZyb21ET01Ob2RlLm1tIGlu IFNvdXJjZXMgKi8sCiAJCQkJN0NDRTdFQ0ExQTQxMUE3RTAwNDQ3QzRDIC8qIFJlbmRlcmVkSW1h Z2VGcm9tRE9NUmFuZ2UubW0gaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0L2xvbmctZW1haWwtdmlld3BvcnQuaHRtbCBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L2xvbmctZW1haWwtdmlld3BvcnQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5iM2YwOWEwNTQ3ZGE3NWJjYzNkYTUzNGU1MGMwOTJiZWNlZGY4OTgxCi0tLSAvZGV2L251 bGwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvbG9uZy1lbWFpbC12aWV3 cG9ydC5odG1sCkBAIC0wLDAgKzEsMTAgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8 IS0tIFRoaXMgbWF0Y2hlcyB0aGUgZGVmYXVsdCBNb2JpbGVNYWlsIHZpZXdwb3J0IG9uIGlPUyAt LT4KKyAgICAgICAgPG1ldGEgbmFtZT0ndmlld3BvcnQnIGNvbnRlbnQ9J3dpZHRoPTM3NSwgaW5p dGlhbC1zY2FsZT0tMSc+CisgICAgPC9oZWFkPgorICAgIDwhLS0gV2UgbmVlZCBhIGxhcmdlIGhl aWdodCBzbyB0aGF0IFdlYktpdCBkb2Vzbid0IGluZmxhdGUgdGhlIHNjYWxlCisgICAgICAgICB0 byBlbnN1cmUgdGhhdCB0aGUgd2ViIHZpZXcgaXMgdmVydGljYWxseSBjb3ZlcmVkIGJ5IGNvbnRl bnQuICAtLT4KKyAgICA8Ym9keSBzdHlsZT0iaGVpZ2h0OiAxMDAwMHB4OyI+CisgICAgPC9ib2R5 PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9SZWxvYWRXaXRoRGlmZmVyaW5nSW5pdGlhbFNjYWxlLm1tIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZWxvYWRXaXRoRGlmZmVyaW5nSW5pdGlhbFNjYWxlLm1t Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjExYWVmZTUzOTE1ODdjMTYxZTg1YzMyZTE0MDQ3YjczNzFkOWFlZDkKLS0t IC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jl bG9hZFdpdGhEaWZmZXJpbmdJbml0aWFsU2NhbGUubW0KQEAgLTAsMCArMSw4MiBAQAorLyoKKyAq IENvcHlyaWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgor ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRp b24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJ VFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJ TkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJ QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9G CisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor ICovCisKKyNpbXBvcnQgImNvbmZpZy5oIgorCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKwor I2ltcG9ydCAiSmF2YVNjcmlwdFRlc3QuaCIKKyNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgi CisjaW1wb3J0ICJQbGF0Zm9ybVdlYlZpZXcuaCIKKyNpbXBvcnQgIlRlc3QuaCIKKyNpbXBvcnQg IlRlc3ROYXZpZ2F0aW9uRGVsZWdhdGUuaCIKKyNpbXBvcnQgIlRlc3RXS1dlYlZpZXcuaCIKKyNp bXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2YXRlLmg+CisjaW1wb3J0IDx3dGYvUmV0YWluUHRy Lmg+CisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKKworVEVTVChXZWJLaXQsIFJlbG9hZFdp dGhEaWZmZXJpbmdJbml0aWFsU2NhbGUpCit7CisgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRv cHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKworICAgIGF1dG8g d2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNH UmVjdE1ha2UoMCwgMCwgMzc1LCAzNzUpIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQo KV0pOworCisgICAgLy8gSXQgaXMgaW1wb3J0YW50IHRoYXQgd2UgbG9hZCBmcm9tIGEgZmlsZSwg bm90IGEgSFRNTCBzdHJpbmcsIG90aGVyd2lzZSB3ZSBkb24ndAorICAgIC8vIGdldCBhIGJhY2st Zm9yd2FyZCBsaXN0IGl0ZW0sIGFuZCB0aHVzIGRvbid0IHRyeSB0byByZXN0b3JlIHN0YXRlLgor ICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkVGVzdFBhZ2VOYW1lZDpAImxvbmctZW1haWwt dmlld3BvcnQiXTsKKworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRl XTsKKworICAgIC8vICJmaXhlZC13aWR0aC12aWV3cG9ydCIgcmVxdWVzdHMgYSB3aWR0aD0zNzUg dmlld3BvcnQgYW5kIGhhcyBubyBvdmVyZmxvd2luZworICAgIC8vIGNvbnRlbnQsIHNvIHdlIHNo b3VsZCBlbmQgdXAgd2l0aCBhbiBpbml0aWFsIHNjYWxlIG9mIDEuCisgICAgRVhQRUNUX0VRKFt3 ZWJWaWV3IHNjcm9sbFZpZXddLnpvb21TY2FsZSwgMSk7CisKKyAgICAvLyBVbnBhcmVudGluZyB0 aGUgdmlldyB3aWxsIGNhdXNlIHRoZSBjdXJyZW50IHN0YXRlCisgICAgLy8gKGluY2x1ZGluZyBp c0luaXRpYWxTY2FsZT1ZRVMgYW5kIHBhZ2VTY2FsZUZhY3Rvcj0xKQorICAgIC8vIHRvIGJlIHNh dmVkIHRvIHRoZSBiYWNrLWZvcndhcmQgaXRlbS4KKyAgICBbd2ViVmlldyByZW1vdmVGcm9tU3Vw ZXJ2aWV3XTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CisK KyAgICBbd2ViVmlldyBhZGRUb1Rlc3RXaW5kb3ddOworCisgICAgLy8gSW5zdGFsbCB0aGUgdXNl ciBzY3JpcHQsIHNvIHRoYXQgdGhlIG5leHQgdGltZSB3ZSBsb2FkIHRoZSBwYWdlLAorICAgIC8v IHRoZSBkb2N1bWVudCBsYXlzIG91dCB2ZXJ5IHdpZGUsIGNhdXNpbmcgdGhlIGluaXRpYWwgc2Nh bGUgdG8gYmUgc21hbGwuCisgICAgYXV0byB1c2VyU2NyaXB0ID0gYWRvcHROUyhbW1dLVXNlclNj cmlwdCBhbGxvY10gaW5pdFdpdGhTb3VyY2U6QCJkb2N1bWVudC5ib2R5LnN0eWxlLndpZHRoID0g JzIwMDBweCc7IHNldFRpbWVvdXQoZnVuY3Rpb24gKCkgeyB3aW5kb3cud2Via2l0Lm1lc3NhZ2VI YW5kbGVycy50ZXN0SGFuZGxlci5wb3N0TWVzc2FnZSgncmFuVXNlclNjcmlwdCcpOyB9LCAwKSIg aW5qZWN0aW9uVGltZTpXS1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lQXREb2N1bWVudEVuZCBmb3JN YWluRnJhbWVPbmx5OllFU10pOworICAgIFtbd2ViVmlldyBjb25maWd1cmF0aW9uXS51c2VyQ29u dGVudENvbnRyb2xsZXIgYWRkVXNlclNjcmlwdDp1c2VyU2NyaXB0LmdldCgpXTsKKworICAgIC8v IFJlbG9hZCwgY2F1c2luZyBib3RoIHRoZSB1c2VyIHNjcmlwdCBhbmQgdGhlIHBhZ2Ugc3RhdGUg cmVzdG9yYXRpb24gY29kZSB0byBydW4uCisgICAgW3dlYlZpZXcgcmVsb2FkXTsKKworICAgIFt3 ZWJWaWV3IHdhaXRGb3JNZXNzYWdlOkAicmFuVXNlclNjcmlwdCJdOworICAgIFt3ZWJWaWV3IHdh aXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKKworICAgIC8vIEVuc3VyZSB0aGF0IHdlIGRp ZCAqbm90KiByZXN0b3JlIHBhZ2VTY2FsZUZhY3RvciB0byAxLgorICAgIEVYUEVDVF9FUShbd2Vi VmlldyBzY3JvbGxWaWV3XS56b29tU2NhbGUsIDAuMjUpOworfQorCit9IC8vIG5hbWVzcGFjZSBU ZXN0V2ViS2l0QVBJCisKKyNlbmRpZgo=