182304 2018-01-30 13:25:26 -0800 WKWebView layout is sometimes wrong after rotation on iPhone X 2018-01-30 19:03:05 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton achristensen commit-queue dino simon.fraser oldest_to_newest 1394703 0 thorton 2018-01-30 13:25:26 -0800 WKWebView layout is sometimes wrong after rotation on iPhone X 1394705 1 332692 thorton 2018-01-30 13:25:43 -0800 Created attachment 332692 Patch 1394753 2 332692 achristensen 2018-01-30 14:16:28 -0800 Comment on attachment 332692 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332692&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:2472 > + // return UIEdgeInsetsAdd([_scrollView _contentScrollInset], self.safeAreaInsets, [_scrollView _edgesApplyingSafeAreaInsetsToContentInset]); Did you mean to leave this commented out? 1394778 3 thorton 2018-01-30 14:39:23 -0800 Heh, no, this was from futzing with testing. I’ll fix it, thanks! 1394793 4 332713 thorton 2018-01-30 15:12:18 -0800 Created attachment 332713 Patch 1394794 5 thorton 2018-01-30 15:12:40 -0800 rdar://problem/34158671 1394803 6 332715 thorton 2018-01-30 15:43:02 -0800 Created attachment 332715 Patch 1394869 7 332715 commit-queue 2018-01-30 19:03:04 -0800 Comment on attachment 332715 Patch Clearing flags on attachment: 332715 Committed r227869: <https://trac.webkit.org/changeset/227869> 1394870 8 commit-queue 2018-01-30 19:03:05 -0800 All reviewed patches have been landed. Closing bug. 332692 2018-01-30 13:25:43 -0800 2018-01-30 15:12:16 -0800 Patch bug-182304-20180130132542.patch text/plain 4624 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBmMTZkMzU4MTNhYThmMzM2 OWJhNDE0OWFiZDRjNmJiNDY0MmMxMzguLmI4Yzk4YzgyYjdiYzBkNmIwNTUyYTMxZDliMzMwOTdm ZGViZGVkMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTgtMDEtMzAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgV0tXZWJWaWV3IGxheW91 dCBpcyBzb21ldGltZXMgd3JvbmcgYWZ0ZXIgcm90YXRpb24gb24gaVBob25lIFgKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjMwNAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzQxNTg2NzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmll dyBfY29tcHV0ZWRDb250ZW50SW5zZXRdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zY3JvbGxW aWV3U3lzdGVtQ29udGVudEluc2V0XSk6CisgICAgICAgIChhY3RpdmVNaW5pbXVtTGF5b3V0U2l6 ZSk6CisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IGl0IGlzIG5vdCBhbHdheXMgc2FmZSB0byBs b29rIGF0IHRoZSBzYWZlIGFyZWEgaW5zZXRzIG9mCisgICAgICAgIGNoaWxkcmVuIGZyb20gaW5z aWRlIGxheW91dFN1YnZpZXdzLCBldmVuIGFmdGVyIHRoZSBjYWxsIHRvIHN1cGVyLgorCisgICAg ICAgIEluc3RlYWQsIG1ha2UgdXNlIG9mIHRoZSBmYWN0IHRoYXQgV0tTY3JvbGxWaWV3IGFuZCBX S1dlYlZpZXcgaGF2ZSBpZGVudGljYWwKKyAgICAgICAgY29vcmRpbmF0ZSBzcGFjZXMsIGFuZCBt YXAgV0tXZWJWaWV3J3Mgc2FmZSBhcmVhIGluc2V0cyBpbnRvIHRoZSBXS1Njcm9sbFZpZXcuCisg ICAgICAgIEl0J3Mgc2FmZSB0byB1c2UgdGhlIHNjcm9sbCB2aWV3J3MgYWZmZWN0ZWQtZWRnZXMg YW5kIGNvbnRlbnRTY3JvbGxJbnNldCwKKyAgICAgICAgYmVjYXVzZSB0aG9zZSBhcmVuJ3QgdXBk YXRlZCBhdCB0aGUgc2FtZSBvdXRzaWRlLW9mLWxheW91dCB0aW1lIHRoYXQKKyAgICAgICAgc2Fm ZSBhcmVhIGluc2V0cyBhcmUuCisKKyAgICAgICAgV2UgY291bGQgYWx0ZXJuYXRpdmVseSBtb3Zl IGFsbCBjYWxscyB0byBhY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZSBvdXRzaWRlCisgICAgICAgIG9m IGxheW91dFN1YnZpZXdzLCBidXQgdGhhdCBzZWVtcyBsaWtlIGEgbGFyZ2VyIGFuZCByaXNraWVy IGNoYW5nZS4KKworICAgICAgICBBbGwgYXR0ZW1wdHMgdG8gd3JpdGUgYSB0ZXN0IGhhdmUgZmFp bGVkOyB0aGlzIGRlcGVuZHMgaGVhdmlseSBvbiB1c2Ugb2YKKyAgICAgICAgYXV0b2xheW91dCBh bmQgdGhlIG1lY2hhbmlzbSBieSB3aGljaCB0aGUgc3lzdGVtIHVwZGF0ZXMgc3lzdGVtLW93bmVk CisgICAgICAgIHNhZmUgYXJlYSBpbnNldHMgZHVyaW5nIGRldmljZSByb3RhdGlvbi4KKwogMjAx OC0wMS0yMyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyNzI3OSBhbmQgcjIyNzM3My4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dl YktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggNzkzZGFlYzY2OWNjZmU2OTY2 MmM5NmU4MzJiYzk5MDExY2FlOGY3OS4uMjBkMjhiNzNlZjQwM2JkYzAyZjQ4OTU4YWNkNWE2MjBk YThkYjI0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAg LTk3NCw2ICs5NzQsNyBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwgVUlEcmFnT3Bl cmF0aW9uKQogLSAoVUlTY3JvbGxWaWV3ICopX3Njcm9sbGVyOwogLSAoQ0dQb2ludClhY2Nlc3Np YmlsaXR5Q29udmVydFBvaW50RnJvbVNjZW5lUmVmZXJlbmNlQ29vcmRpbmF0ZXM6KENHUG9pbnQp cG9pbnQ7CiAtIChDR1JlY3QpYWNjZXNzaWJpbGl0eUNvbnZlcnRSZWN0VG9TY2VuZVJlZmVyZW5j ZUNvb3JkaW5hdGVzOihDR1JlY3QpcmVjdDsKKy0gKFVJUmVjdEVkZ2UpX2VkZ2VzQXBwbHlpbmdT YWZlQXJlYUluc2V0c1RvQ29udGVudEluc2V0OwogQGVuZAogCiBAaW50ZXJmYWNlIFVJUGVyaXBo ZXJhbEhvc3QgKElQSSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tCmluZGV4IGRkMjc1YTc0M2VjYzhkMzNkZGVhZmY1ZTFjYzRkYmEzMjE4NTlhNWMu LmQ2ZTg5YzFjMTk5YzMzZDM1OWU5MWY0NDM2OWU0NTg4NDBhN2M1N2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTU2Nyw3ICsxNTY3 LDcgQEAgLSAoVUlFZGdlSW5zZXRzKV9jb21wdXRlZENvbnRlbnRJbnNldAogCiAjaWYgX19JUEhP TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCiAgICAgaWYgKHNlbGYuX3NhZmVB cmVhU2hvdWxkQWZmZWN0T2JzY3VyZWRJbnNldHMpCi0gICAgICAgIGluc2V0cyA9IFVJRWRnZUlu c2V0c0FkZChpbnNldHMsIFtfc2Nyb2xsVmlldyBfc3lzdGVtQ29udGVudEluc2V0XSwgc2VsZi5f ZWZmZWN0aXZlT2JzY3VyZWRJbnNldEVkZ2VzQWZmZWN0ZWRCeVNhZmVBcmVhKTsKKyAgICAgICAg aW5zZXRzID0gVUlFZGdlSW5zZXRzQWRkKGluc2V0cywgc2VsZi5fc2Nyb2xsVmlld1N5c3RlbUNv bnRlbnRJbnNldCwgc2VsZi5fZWZmZWN0aXZlT2JzY3VyZWRJbnNldEVkZ2VzQWZmZWN0ZWRCeVNh ZmVBcmVhKTsKICNlbmRpZgogCiAgICAgcmV0dXJuIGluc2V0czsKQEAgLTI0NjMsMTQgKzI0NjMs MjMgQEAgLSAodm9pZClfZW5jbG9zaW5nU2Nyb2xsZXJTY3JvbGxpbmdFbmRlZDooTlNUaW1lciAq KXRpbWVyCiAgICAgX2VuY2xvc2luZ1Njcm9sbFZpZXdTY3JvbGxUaW1lciA9IG5pbDsKIH0KIAor LSAoVUlFZGdlSW5zZXRzKV9zY3JvbGxWaWV3U3lzdGVtQ29udGVudEluc2V0Cit7CisgICAgLy8g SXQncyBub3Qgc2FmZSB0byBhY2Nlc3MgdGhlIHNjcm9sbCB2aWV3J3Mgc2FmZUFyZWFJbnNldHMg b3IgX3N5c3RlbUNvbnRlbnRJbnNldCBmcm9tCisgICAgLy8gaW5zaWRlIG91ciBsYXlvdXRTdWJ2 aWV3cyBpbXBsZW1lbnRhdGlvbiwgYmVjYXVzZSB0aGV5IGFyZW4ndCB1cGRhdGVkIHVudGlsIGFm dGVyd2FyZHMuCisgICAgLy8gSW5zdGVhZCwgZGVwZW5kIG9uIHRoZSBmYWN0IHRoYXQgdGhlIFVJ U2Nyb2xsVmlldyBhbmQgV0tXZWJWaWV3IGFyZSBpbiB0aGUgc2FtZSBjb29yZGluYXRlCisgICAg Ly8gc3BhY2UsIGFuZCBtYXAgdGhlIFdLV2ViVmlldydzIG93biBpbnNldHMgaW50byB0aGUgc2Ny b2xsIHZpZXcgbWFudWFsbHkuCisgICAgLy8gcmV0dXJuIFVJRWRnZUluc2V0c0FkZChbX3Njcm9s bFZpZXcgX2NvbnRlbnRTY3JvbGxJbnNldF0sIHNlbGYuc2FmZUFyZWFJbnNldHMsIFtfc2Nyb2xs VmlldyBfZWRnZXNBcHBseWluZ1NhZmVBcmVhSW5zZXRzVG9Db250ZW50SW5zZXRdKTsKKyAgICBy ZXR1cm4gW19zY3JvbGxWaWV3IF9zeXN0ZW1Db250ZW50SW5zZXRdOworfQorCiBzdGF0aWMgV2Vi Q29yZTo6RmxvYXRTaXplIGFjdGl2ZU1pbmltdW1MYXlvdXRTaXplKFdLV2ViVmlldyAqd2ViVmll dywgY29uc3QgQ0dSZWN0JiBib3VuZHMpCiB7CiAgICAgaWYgKHdlYlZpZXctPl9vdmVycmlkZXNN aW5pbXVtTGF5b3V0U2l6ZSkKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZSh3ZWJW aWV3LT5fbWluaW11bUxheW91dFNpemVPdmVycmlkZSk7CiAKICNpZiBfX0lQSE9ORV9PU19WRVJT SU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKLSAgICBVSUVkZ2VJbnNldHMgc3lzdGVtQ29udGVu dEluc2V0ID0gW3dlYlZpZXctPl9zY3JvbGxWaWV3IF9zeXN0ZW1Db250ZW50SW5zZXRdOwotICAg IHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUoVUlFZGdlSW5zZXRzSW5zZXRSZWN0KENHUmVjdE1h a2UoMCwgMCwgYm91bmRzLnNpemUud2lkdGgsIGJvdW5kcy5zaXplLmhlaWdodCksIHN5c3RlbUNv bnRlbnRJbnNldCkuc2l6ZSk7CisgICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZShVSUVkZ2VJ bnNldHNJbnNldFJlY3QoQ0dSZWN0TWFrZSgwLCAwLCBib3VuZHMuc2l6ZS53aWR0aCwgYm91bmRz LnNpemUuaGVpZ2h0KSwgd2ViVmlldy5fc2Nyb2xsVmlld1N5c3RlbUNvbnRlbnRJbnNldCkuc2l6 ZSk7CiAjZWxzZQogICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUoYm91bmRzLnNpemUpOwog I2VuZGlmCg== 332713 2018-01-30 15:12:18 -0800 2018-01-30 15:43:01 -0800 Patch bug-182304-20180130151217.patch text/plain 4574 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBmMTZkMzU4MTNhYThmMzM2 OWJhNDE0OWFiZDRjNmJiNDY0MmMxMzguLmI4Yzk4YzgyYjdiYzBkNmIwNTUyYTMxZDliMzMwOTdm ZGViZGVkMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTgtMDEtMzAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgV0tXZWJWaWV3IGxheW91 dCBpcyBzb21ldGltZXMgd3JvbmcgYWZ0ZXIgcm90YXRpb24gb24gaVBob25lIFgKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjMwNAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzQxNTg2NzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmll dyBfY29tcHV0ZWRDb250ZW50SW5zZXRdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zY3JvbGxW aWV3U3lzdGVtQ29udGVudEluc2V0XSk6CisgICAgICAgIChhY3RpdmVNaW5pbXVtTGF5b3V0U2l6 ZSk6CisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IGl0IGlzIG5vdCBhbHdheXMgc2FmZSB0byBs b29rIGF0IHRoZSBzYWZlIGFyZWEgaW5zZXRzIG9mCisgICAgICAgIGNoaWxkcmVuIGZyb20gaW5z aWRlIGxheW91dFN1YnZpZXdzLCBldmVuIGFmdGVyIHRoZSBjYWxsIHRvIHN1cGVyLgorCisgICAg ICAgIEluc3RlYWQsIG1ha2UgdXNlIG9mIHRoZSBmYWN0IHRoYXQgV0tTY3JvbGxWaWV3IGFuZCBX S1dlYlZpZXcgaGF2ZSBpZGVudGljYWwKKyAgICAgICAgY29vcmRpbmF0ZSBzcGFjZXMsIGFuZCBt YXAgV0tXZWJWaWV3J3Mgc2FmZSBhcmVhIGluc2V0cyBpbnRvIHRoZSBXS1Njcm9sbFZpZXcuCisg ICAgICAgIEl0J3Mgc2FmZSB0byB1c2UgdGhlIHNjcm9sbCB2aWV3J3MgYWZmZWN0ZWQtZWRnZXMg YW5kIGNvbnRlbnRTY3JvbGxJbnNldCwKKyAgICAgICAgYmVjYXVzZSB0aG9zZSBhcmVuJ3QgdXBk YXRlZCBhdCB0aGUgc2FtZSBvdXRzaWRlLW9mLWxheW91dCB0aW1lIHRoYXQKKyAgICAgICAgc2Fm ZSBhcmVhIGluc2V0cyBhcmUuCisKKyAgICAgICAgV2UgY291bGQgYWx0ZXJuYXRpdmVseSBtb3Zl IGFsbCBjYWxscyB0byBhY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZSBvdXRzaWRlCisgICAgICAgIG9m IGxheW91dFN1YnZpZXdzLCBidXQgdGhhdCBzZWVtcyBsaWtlIGEgbGFyZ2VyIGFuZCByaXNraWVy IGNoYW5nZS4KKworICAgICAgICBBbGwgYXR0ZW1wdHMgdG8gd3JpdGUgYSB0ZXN0IGhhdmUgZmFp bGVkOyB0aGlzIGRlcGVuZHMgaGVhdmlseSBvbiB1c2Ugb2YKKyAgICAgICAgYXV0b2xheW91dCBh bmQgdGhlIG1lY2hhbmlzbSBieSB3aGljaCB0aGUgc3lzdGVtIHVwZGF0ZXMgc3lzdGVtLW93bmVk CisgICAgICAgIHNhZmUgYXJlYSBpbnNldHMgZHVyaW5nIGRldmljZSByb3RhdGlvbi4KKwogMjAx OC0wMS0yMyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyNzI3OSBhbmQgcjIyNzM3My4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dl YktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggNzkzZGFlYzY2OWNjZmU2OTY2 MmM5NmU4MzJiYzk5MDExY2FlOGY3OS4uMjBkMjhiNzNlZjQwM2JkYzAyZjQ4OTU4YWNkNWE2MjBk YThkYjI0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAg LTk3NCw2ICs5NzQsNyBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwgVUlEcmFnT3Bl cmF0aW9uKQogLSAoVUlTY3JvbGxWaWV3ICopX3Njcm9sbGVyOwogLSAoQ0dQb2ludClhY2Nlc3Np YmlsaXR5Q29udmVydFBvaW50RnJvbVNjZW5lUmVmZXJlbmNlQ29vcmRpbmF0ZXM6KENHUG9pbnQp cG9pbnQ7CiAtIChDR1JlY3QpYWNjZXNzaWJpbGl0eUNvbnZlcnRSZWN0VG9TY2VuZVJlZmVyZW5j ZUNvb3JkaW5hdGVzOihDR1JlY3QpcmVjdDsKKy0gKFVJUmVjdEVkZ2UpX2VkZ2VzQXBwbHlpbmdT YWZlQXJlYUluc2V0c1RvQ29udGVudEluc2V0OwogQGVuZAogCiBAaW50ZXJmYWNlIFVJUGVyaXBo ZXJhbEhvc3QgKElQSSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tCmluZGV4IGRkMjc1YTc0M2VjYzhkMzNkZGVhZmY1ZTFjYzRkYmEzMjE4NTlhNWMu LmVkNTM3NmE4YTY2YTBlY2M1MTJjNDhkNGQ0NGVkNTA1M2FmMzZhNDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTU2Nyw3ICsxNTY3 LDcgQEAgLSAoVUlFZGdlSW5zZXRzKV9jb21wdXRlZENvbnRlbnRJbnNldAogCiAjaWYgX19JUEhP TkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCiAgICAgaWYgKHNlbGYuX3NhZmVB cmVhU2hvdWxkQWZmZWN0T2JzY3VyZWRJbnNldHMpCi0gICAgICAgIGluc2V0cyA9IFVJRWRnZUlu c2V0c0FkZChpbnNldHMsIFtfc2Nyb2xsVmlldyBfc3lzdGVtQ29udGVudEluc2V0XSwgc2VsZi5f ZWZmZWN0aXZlT2JzY3VyZWRJbnNldEVkZ2VzQWZmZWN0ZWRCeVNhZmVBcmVhKTsKKyAgICAgICAg aW5zZXRzID0gVUlFZGdlSW5zZXRzQWRkKGluc2V0cywgc2VsZi5fc2Nyb2xsVmlld1N5c3RlbUNv bnRlbnRJbnNldCwgc2VsZi5fZWZmZWN0aXZlT2JzY3VyZWRJbnNldEVkZ2VzQWZmZWN0ZWRCeVNh ZmVBcmVhKTsKICNlbmRpZgogCiAgICAgcmV0dXJuIGluc2V0czsKQEAgLTI0NjMsMTQgKzI0NjMs MjIgQEAgLSAodm9pZClfZW5jbG9zaW5nU2Nyb2xsZXJTY3JvbGxpbmdFbmRlZDooTlNUaW1lciAq KXRpbWVyCiAgICAgX2VuY2xvc2luZ1Njcm9sbFZpZXdTY3JvbGxUaW1lciA9IG5pbDsKIH0KIAor LSAoVUlFZGdlSW5zZXRzKV9zY3JvbGxWaWV3U3lzdGVtQ29udGVudEluc2V0Cit7CisgICAgLy8g SXQncyBub3Qgc2FmZSB0byBhY2Nlc3MgdGhlIHNjcm9sbCB2aWV3J3Mgc2FmZUFyZWFJbnNldHMg b3IgX3N5c3RlbUNvbnRlbnRJbnNldCBmcm9tCisgICAgLy8gaW5zaWRlIG91ciBsYXlvdXRTdWJ2 aWV3cyBpbXBsZW1lbnRhdGlvbiwgYmVjYXVzZSB0aGV5IGFyZW4ndCB1cGRhdGVkIHVudGlsIGFm dGVyd2FyZHMuCisgICAgLy8gSW5zdGVhZCwgZGVwZW5kIG9uIHRoZSBmYWN0IHRoYXQgdGhlIFVJ U2Nyb2xsVmlldyBhbmQgV0tXZWJWaWV3IGFyZSBpbiB0aGUgc2FtZSBjb29yZGluYXRlCisgICAg Ly8gc3BhY2UsIGFuZCBtYXAgdGhlIFdLV2ViVmlldydzIG93biBpbnNldHMgaW50byB0aGUgc2Ny b2xsIHZpZXcgbWFudWFsbHkuCisgICAgcmV0dXJuIFVJRWRnZUluc2V0c0FkZChbX3Njcm9sbFZp ZXcgX2NvbnRlbnRTY3JvbGxJbnNldF0sIHNlbGYuc2FmZUFyZWFJbnNldHMsIFtfc2Nyb2xsVmll dyBfZWRnZXNBcHBseWluZ1NhZmVBcmVhSW5zZXRzVG9Db250ZW50SW5zZXRdKTsKK30KKwogc3Rh dGljIFdlYkNvcmU6OkZsb2F0U2l6ZSBhY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZShXS1dlYlZpZXcg KndlYlZpZXcsIGNvbnN0IENHUmVjdCYgYm91bmRzKQogewogICAgIGlmICh3ZWJWaWV3LT5fb3Zl cnJpZGVzTWluaW11bUxheW91dFNpemUpCiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNp emUod2ViVmlldy0+X21pbmltdW1MYXlvdXRTaXplT3ZlcnJpZGUpOwogCiAjaWYgX19JUEhPTkVf T1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCi0gICAgVUlFZGdlSW5zZXRzIHN5c3Rl bUNvbnRlbnRJbnNldCA9IFt3ZWJWaWV3LT5fc2Nyb2xsVmlldyBfc3lzdGVtQ29udGVudEluc2V0 XTsKLSAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKFVJRWRnZUluc2V0c0luc2V0UmVjdChD R1JlY3RNYWtlKDAsIDAsIGJvdW5kcy5zaXplLndpZHRoLCBib3VuZHMuc2l6ZS5oZWlnaHQpLCBz eXN0ZW1Db250ZW50SW5zZXQpLnNpemUpOworICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUo VUlFZGdlSW5zZXRzSW5zZXRSZWN0KENHUmVjdE1ha2UoMCwgMCwgYm91bmRzLnNpemUud2lkdGgs IGJvdW5kcy5zaXplLmhlaWdodCksIHdlYlZpZXcuX3Njcm9sbFZpZXdTeXN0ZW1Db250ZW50SW5z ZXQpLnNpemUpOwogI2Vsc2UKICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKGJvdW5kcy5z aXplKTsKICNlbmRpZgo= 332715 2018-01-30 15:43:02 -0800 2018-01-30 19:03:04 -0800 Patch bug-182304-20180130154301.patch text/plain 5046 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBmMTZkMzU4MTNhYThmMzM2 OWJhNDE0OWFiZDRjNmJiNDY0MmMxMzguLmI4Yzk4YzgyYjdiYzBkNmIwNTUyYTMxZDliMzMwOTdm ZGViZGVkMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTgtMDEtMzAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgV0tXZWJWaWV3IGxheW91 dCBpcyBzb21ldGltZXMgd3JvbmcgYWZ0ZXIgcm90YXRpb24gb24gaVBob25lIFgKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjMwNAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzQxNTg2NzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmll dyBfY29tcHV0ZWRDb250ZW50SW5zZXRdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zY3JvbGxW aWV3U3lzdGVtQ29udGVudEluc2V0XSk6CisgICAgICAgIChhY3RpdmVNaW5pbXVtTGF5b3V0U2l6 ZSk6CisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IGl0IGlzIG5vdCBhbHdheXMgc2FmZSB0byBs b29rIGF0IHRoZSBzYWZlIGFyZWEgaW5zZXRzIG9mCisgICAgICAgIGNoaWxkcmVuIGZyb20gaW5z aWRlIGxheW91dFN1YnZpZXdzLCBldmVuIGFmdGVyIHRoZSBjYWxsIHRvIHN1cGVyLgorCisgICAg ICAgIEluc3RlYWQsIG1ha2UgdXNlIG9mIHRoZSBmYWN0IHRoYXQgV0tTY3JvbGxWaWV3IGFuZCBX S1dlYlZpZXcgaGF2ZSBpZGVudGljYWwKKyAgICAgICAgY29vcmRpbmF0ZSBzcGFjZXMsIGFuZCBt YXAgV0tXZWJWaWV3J3Mgc2FmZSBhcmVhIGluc2V0cyBpbnRvIHRoZSBXS1Njcm9sbFZpZXcuCisg ICAgICAgIEl0J3Mgc2FmZSB0byB1c2UgdGhlIHNjcm9sbCB2aWV3J3MgYWZmZWN0ZWQtZWRnZXMg YW5kIGNvbnRlbnRTY3JvbGxJbnNldCwKKyAgICAgICAgYmVjYXVzZSB0aG9zZSBhcmVuJ3QgdXBk YXRlZCBhdCB0aGUgc2FtZSBvdXRzaWRlLW9mLWxheW91dCB0aW1lIHRoYXQKKyAgICAgICAgc2Fm ZSBhcmVhIGluc2V0cyBhcmUuCisKKyAgICAgICAgV2UgY291bGQgYWx0ZXJuYXRpdmVseSBtb3Zl IGFsbCBjYWxscyB0byBhY3RpdmVNaW5pbXVtTGF5b3V0U2l6ZSBvdXRzaWRlCisgICAgICAgIG9m IGxheW91dFN1YnZpZXdzLCBidXQgdGhhdCBzZWVtcyBsaWtlIGEgbGFyZ2VyIGFuZCByaXNraWVy IGNoYW5nZS4KKworICAgICAgICBBbGwgYXR0ZW1wdHMgdG8gd3JpdGUgYSB0ZXN0IGhhdmUgZmFp bGVkOyB0aGlzIGRlcGVuZHMgaGVhdmlseSBvbiB1c2Ugb2YKKyAgICAgICAgYXV0b2xheW91dCBh bmQgdGhlIG1lY2hhbmlzbSBieSB3aGljaCB0aGUgc3lzdGVtIHVwZGF0ZXMgc3lzdGVtLW93bmVk CisgICAgICAgIHNhZmUgYXJlYSBpbnNldHMgZHVyaW5nIGRldmljZSByb3RhdGlvbi4KKwogMjAx OC0wMS0yMyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyNzI3OSBhbmQgcjIyNzM3My4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dl YktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggNzkzZGFlYzY2OWNjZmU2OTY2 MmM5NmU4MzJiYzk5MDExY2FlOGY3OS4uNDJlODg0OTdhNWEyMWEwNWFmYWVjYmQ4YzlhMTA5MjFl ZWRlYjhhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKQEAg LTMyNCw2ICszMjQsNyBAQCB0eXBlZGVmIGVudW0gewogQHByb3BlcnR5IChub25hdG9taWMpIENH RmxvYXQgaG9yaXpvbnRhbFNjcm9sbERlY2VsZXJhdGlvbkZhY3RvcjsKIEBwcm9wZXJ0eSAobm9u YXRvbWljKSBDR0Zsb2F0IHZlcnRpY2FsU2Nyb2xsRGVjZWxlcmF0aW9uRmFjdG9yOwogQHByb3Bl cnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBCT09MIF9pc0ludGVycnVwdGluZ0RlY2VsZXJhdGlv bjsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBnZXR0ZXI9X2NvbnRlbnRTY3JvbGxJbnNldCwgc2V0 dGVyPV9zZXRDb250ZW50U2Nyb2xsSW5zZXQ6KSBVSUVkZ2VJbnNldHMgY29udGVudFNjcm9sbElu c2V0OwogI2lmIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gMTEwMDAwCiBAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFVJRWRnZUluc2V0cyBfc3lzdGVtQ29udGVudElu c2V0OwogI2VuZGlmCkBAIC05NzQsNiArOTc1LDcgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUlu dGVnZXIsIFVJRHJhZ09wZXJhdGlvbikKIC0gKFVJU2Nyb2xsVmlldyAqKV9zY3JvbGxlcjsKIC0g KENHUG9pbnQpYWNjZXNzaWJpbGl0eUNvbnZlcnRQb2ludEZyb21TY2VuZVJlZmVyZW5jZUNvb3Jk aW5hdGVzOihDR1BvaW50KXBvaW50OwogLSAoQ0dSZWN0KWFjY2Vzc2liaWxpdHlDb252ZXJ0UmVj dFRvU2NlbmVSZWZlcmVuY2VDb29yZGluYXRlczooQ0dSZWN0KXJlY3Q7CistIChVSVJlY3RFZGdl KV9lZGdlc0FwcGx5aW5nU2FmZUFyZWFJbnNldHNUb0NvbnRlbnRJbnNldDsKIEBlbmQKIAogQGlu dGVyZmFjZSBVSVBlcmlwaGVyYWxIb3N0IChJUEkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBkZDI3NWE3NDNlY2M4ZDMzZGRlYWZmNWUx Y2M0ZGJhMzIxODU5YTVjLi5lZDUzNzZhOGE2NmEwZWNjNTEyYzQ4ZDRkNDRlZDUwNTNhZjM2YTQ5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K QEAgLTE1NjcsNyArMTU2Nyw3IEBAIC0gKFVJRWRnZUluc2V0cylfY29tcHV0ZWRDb250ZW50SW5z ZXQKIAogI2lmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMAogICAg IGlmIChzZWxmLl9zYWZlQXJlYVNob3VsZEFmZmVjdE9ic2N1cmVkSW5zZXRzKQotICAgICAgICBp bnNldHMgPSBVSUVkZ2VJbnNldHNBZGQoaW5zZXRzLCBbX3Njcm9sbFZpZXcgX3N5c3RlbUNvbnRl bnRJbnNldF0sIHNlbGYuX2VmZmVjdGl2ZU9ic2N1cmVkSW5zZXRFZGdlc0FmZmVjdGVkQnlTYWZl QXJlYSk7CisgICAgICAgIGluc2V0cyA9IFVJRWRnZUluc2V0c0FkZChpbnNldHMsIHNlbGYuX3Nj cm9sbFZpZXdTeXN0ZW1Db250ZW50SW5zZXQsIHNlbGYuX2VmZmVjdGl2ZU9ic2N1cmVkSW5zZXRF ZGdlc0FmZmVjdGVkQnlTYWZlQXJlYSk7CiAjZW5kaWYKIAogICAgIHJldHVybiBpbnNldHM7CkBA IC0yNDYzLDE0ICsyNDYzLDIyIEBAIC0gKHZvaWQpX2VuY2xvc2luZ1Njcm9sbGVyU2Nyb2xsaW5n RW5kZWQ6KE5TVGltZXIgKil0aW1lcgogICAgIF9lbmNsb3NpbmdTY3JvbGxWaWV3U2Nyb2xsVGlt ZXIgPSBuaWw7CiB9CiAKKy0gKFVJRWRnZUluc2V0cylfc2Nyb2xsVmlld1N5c3RlbUNvbnRlbnRJ bnNldAoreworICAgIC8vIEl0J3Mgbm90IHNhZmUgdG8gYWNjZXNzIHRoZSBzY3JvbGwgdmlldydz IHNhZmVBcmVhSW5zZXRzIG9yIF9zeXN0ZW1Db250ZW50SW5zZXQgZnJvbQorICAgIC8vIGluc2lk ZSBvdXIgbGF5b3V0U3Vidmlld3MgaW1wbGVtZW50YXRpb24sIGJlY2F1c2UgdGhleSBhcmVuJ3Qg dXBkYXRlZCB1bnRpbCBhZnRlcndhcmRzLgorICAgIC8vIEluc3RlYWQsIGRlcGVuZCBvbiB0aGUg ZmFjdCB0aGF0IHRoZSBVSVNjcm9sbFZpZXcgYW5kIFdLV2ViVmlldyBhcmUgaW4gdGhlIHNhbWUg Y29vcmRpbmF0ZQorICAgIC8vIHNwYWNlLCBhbmQgbWFwIHRoZSBXS1dlYlZpZXcncyBvd24gaW5z ZXRzIGludG8gdGhlIHNjcm9sbCB2aWV3IG1hbnVhbGx5LgorICAgIHJldHVybiBVSUVkZ2VJbnNl dHNBZGQoW19zY3JvbGxWaWV3IF9jb250ZW50U2Nyb2xsSW5zZXRdLCBzZWxmLnNhZmVBcmVhSW5z ZXRzLCBbX3Njcm9sbFZpZXcgX2VkZ2VzQXBwbHlpbmdTYWZlQXJlYUluc2V0c1RvQ29udGVudElu c2V0XSk7Cit9CisKIHN0YXRpYyBXZWJDb3JlOjpGbG9hdFNpemUgYWN0aXZlTWluaW11bUxheW91 dFNpemUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBDR1JlY3QmIGJvdW5kcykKIHsKICAgICBp ZiAod2ViVmlldy0+X292ZXJyaWRlc01pbmltdW1MYXlvdXRTaXplKQogICAgICAgICByZXR1cm4g V2ViQ29yZTo6RmxvYXRTaXplKHdlYlZpZXctPl9taW5pbXVtTGF5b3V0U2l6ZU92ZXJyaWRlKTsK IAogI2lmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMAotICAgIFVJ RWRnZUluc2V0cyBzeXN0ZW1Db250ZW50SW5zZXQgPSBbd2ViVmlldy0+X3Njcm9sbFZpZXcgX3N5 c3RlbUNvbnRlbnRJbnNldF07Ci0gICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZShVSUVkZ2VJ bnNldHNJbnNldFJlY3QoQ0dSZWN0TWFrZSgwLCAwLCBib3VuZHMuc2l6ZS53aWR0aCwgYm91bmRz LnNpemUuaGVpZ2h0KSwgc3lzdGVtQ29udGVudEluc2V0KS5zaXplKTsKKyAgICByZXR1cm4gV2Vi Q29yZTo6RmxvYXRTaXplKFVJRWRnZUluc2V0c0luc2V0UmVjdChDR1JlY3RNYWtlKDAsIDAsIGJv dW5kcy5zaXplLndpZHRoLCBib3VuZHMuc2l6ZS5oZWlnaHQpLCB3ZWJWaWV3Ll9zY3JvbGxWaWV3 U3lzdGVtQ29udGVudEluc2V0KS5zaXplKTsKICNlbHNlCiAgICAgcmV0dXJuIFdlYkNvcmU6OkZs b2F0U2l6ZShib3VuZHMuc2l6ZSk7CiAjZW5kaWYK