199637 2019-07-09 13:25:59 -0700 [iOS WK2] Use Optional<> for two data members of WKWebView 2019-07-09 18:36:01 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser thorton webkit-bug-importer oldest_to_newest 1551380 0 simon.fraser 2019-07-09 13:25:59 -0700 [iOS WK2] Use Optional<> for two data members of WKWebView 1551383 1 373751 simon.fraser 2019-07-09 13:26:46 -0700 Created attachment 373751 Patch 1551389 2 373751 thorton 2019-07-09 13:29:59 -0700 Comment on attachment 373751 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373751&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:6310 > + _viewLayoutSizeOverride = WTF::nullopt; > + _maximumUnobscuredSizeOverride = WTF::nullopt; .clear()? 🤷‍♂️ 1551558 3 373751 commit-queue 2019-07-09 18:31:09 -0700 Comment on attachment 373751 Patch Clearing flags on attachment: 373751 Committed r247290: <https://trac.webkit.org/changeset/247290> 1551559 4 commit-queue 2019-07-09 18:31:11 -0700 All reviewed patches have been landed. Closing bug. 1551561 5 webkit-bug-importer 2019-07-09 18:36:01 -0700 <rdar://problem/52866038> 373751 2019-07-09 13:26:46 -0700 2019-07-09 18:31:09 -0700 Patch bug-199637-20190709132645.patch text/plain 7144 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgzMGI2MTFlOGI5NmY5NGM0 N2I1OThiODlmYTJhZDg3ODcwMDVjY2IuLmIwOTk3NmIxYTVhODg3YjBkNzA5NmFhNWU1YTkwNDYz ZmYzMTE4ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDctMDkgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXSzJdIFVzZSBP cHRpb25hbDw+IGZvciB0d28gZGF0YSBtZW1iZXJzIG9mIFdLV2ViVmlldworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NjM3CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIE9wdGlvbmFsPENHU2l6ZT4g dG8gcmVwbGFjZSBfb3ZlcnJpZGVzVmlld0xheW91dFNpemUvX3ZpZXdMYXlvdXRTaXplT3ZlcnJp ZGUKKyAgICAgICAgYW5kIF9vdmVycmlkZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUvX21heGltdW1V bm9ic2N1cmVkU2l6ZU92ZXJyaWRlLgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtX S1dlYlZpZXcgYWN0aXZlVmlld0xheW91dFNpemU6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBf ZnJhbWVPckJvdW5kc0NoYW5nZWRdKToKKyAgICAgICAgKGFjdGl2ZU1heGltdW1Vbm9ic2N1cmVk U2l6ZSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfbWluaW11bUxheW91dFNpemVPdmVycmlkZV0p OgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NldFZpZXdMYXlvdXRTaXplT3ZlcnJpZGU6XSk6Cisg ICAgICAgICgtW1dLV2ViVmlldyBfbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGVdKToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF9zZXRNYXhpbXVtVW5vYnNjdXJlZFNpemVPdmVycmlkZTpdKToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6XSk6 CisgICAgICAgICgtW1dLV2ViVmlldyBfY2xlYXJPdmVycmlkZUxheW91dFBhcmFtZXRlcnNdKToK KwogMjAxOS0wNy0wOSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3Jn PgogCiAgICAgICAgIFVzZXJEYXRhOjpkZWNvZGUgc2hvdWxkIHJldHVybiBmYWxzZSB3aGVuIGRl Y29kaW5nIGFuIHVucmVjb2duaXplZCB0eXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCA5YzI0N2Q2NmNlYWMzNGIwN2U4ODVlNDI2MzU2 YjUyNTcwODY4Zjk1Li41MjdmZTBlYzkxM2FlZDJhZTFjZTMyMGM1Yzk3YTc4NmZlYjBlNzdhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg LTI4MywxMiArMjgzLDExIEBAIEBpbXBsZW1lbnRhdGlvbiBXS1dlYlZpZXcgewogICAgIFJldGFp blB0cjxXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyPiBfZnVsbFNjcmVlbldpbmRvd0NvbnRy b2xsZXI7CiAjZW5kaWYKIAotICAgIEJPT0wgX292ZXJyaWRlc1ZpZXdMYXlvdXRTaXplOwotICAg IENHU2l6ZSBfdmlld0xheW91dFNpemVPdmVycmlkZTsKKyAgICBPcHRpb25hbDxDR1NpemU+IF92 aWV3TGF5b3V0U2l6ZU92ZXJyaWRlOwogICAgIE9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0U2l6ZT4g X2xhc3RTZW50Vmlld0xheW91dFNpemU7Ci0gICAgQk9PTCBfb3ZlcnJpZGVzTWF4aW11bVVub2Jz Y3VyZWRTaXplOwotICAgIENHU2l6ZSBfbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGU7Cisg ICAgT3B0aW9uYWw8Q0dTaXplPiBfbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGU7CiAgICAg T3B0aW9uYWw8V2ViQ29yZTo6RmxvYXRTaXplPiBfbGFzdFNlbnRNYXhpbXVtVW5vYnNjdXJlZFNp emU7CisKICAgICBDR1JlY3QgX2lucHV0Vmlld0JvdW5kczsKICAgICBDR0Zsb2F0IF92aWV3cG9y dE1ldGFUYWdXaWR0aDsKICAgICBCT09MIF92aWV3cG9ydE1ldGFUYWdXaWR0aFdhc0V4cGxpY2l0 OwpAQCAtMjg2OCw4ICsyODY3LDggQEAgLSAoVUlFZGdlSW5zZXRzKV9zY3JvbGxWaWV3U3lzdGVt Q29udGVudEluc2V0CiAKIC0gKFdlYkNvcmU6OkZsb2F0U2l6ZSlhY3RpdmVWaWV3TGF5b3V0U2l6 ZTooY29uc3QgQ0dSZWN0Jilib3VuZHMKIHsKLSAgICBpZiAoX292ZXJyaWRlc1ZpZXdMYXlvdXRT aXplKQotICAgICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKF92aWV3TGF5b3V0U2l6ZU92 ZXJyaWRlKTsKKyAgICBpZiAoX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUpCisgICAgICAgIHJldHVy biBXZWJDb3JlOjpGbG9hdFNpemUoX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUudmFsdWUoKSk7CiAK ICNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKICAgICByZXR1 cm4gV2ViQ29yZTo6RmxvYXRTaXplKFVJRWRnZUluc2V0c0luc2V0UmVjdChDR1JlY3RNYWtlKDAs IDAsIGJvdW5kcy5zaXplLndpZHRoLCBib3VuZHMuc2l6ZS5oZWlnaHQpLCBzZWxmLl9zY3JvbGxW aWV3U3lzdGVtQ29udGVudEluc2V0KS5zaXplKTsKQEAgLTI5MTIsOSArMjkxMSw5IEBAIC0gKHZv aWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkCiAgICAgW19zY3JvbGxWaWV3IHNldEZyYW1lOmJvdW5k c107CiAKICAgICBpZiAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gV2ViS2l0OjpEeW5h bWljVmlld3BvcnRVcGRhdGVNb2RlOjpOb3RSZXNpemluZykgewotICAgICAgICBpZiAoIV9vdmVy cmlkZXNWaWV3TGF5b3V0U2l6ZSkKKyAgICAgICAgaWYgKCFfdmlld0xheW91dFNpemVPdmVycmlk ZSkKICAgICAgICAgICAgIFtzZWxmIF9kaXNwYXRjaFNldFZpZXdMYXlvdXRTaXplOltzZWxmIGFj dGl2ZVZpZXdMYXlvdXRTaXplOnNlbGYuYm91bmRzXV07Ci0gICAgICAgIGlmICghX292ZXJyaWRl c01heGltdW1Vbm9ic2N1cmVkU2l6ZSkKKyAgICAgICAgaWYgKCFfbWF4aW11bVVub2JzY3VyZWRT aXplT3ZlcnJpZGUpCiAgICAgICAgICAgICBbc2VsZiBfZGlzcGF0Y2hTZXRNYXhpbXVtVW5vYnNj dXJlZFNpemU6V2ViQ29yZTo6RmxvYXRTaXplKGJvdW5kcy5zaXplKV07CiAKICAgICAgICAgQk9P TCBzaXplQ2hhbmdlZCA9IE5POwpAQCAtMzE3Nyw3ICszMTc2LDcgQEAgLSAodm9pZClfZGlkU3Rh cnRQcm92aXNpb25hbExvYWRGb3JNYWluRnJhbWUKIAogc3RhdGljIFdlYkNvcmU6OkZsb2F0U2l6 ZSBhY3RpdmVNYXhpbXVtVW5vYnNjdXJlZFNpemUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBjb25zdCBD R1JlY3QmIGJvdW5kcykKIHsKLSAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKHdlYlZpZXct Pl9vdmVycmlkZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUgPyB3ZWJWaWV3LT5fbWF4aW11bVVub2Jz Y3VyZWRTaXplT3ZlcnJpZGUgOiBib3VuZHMuc2l6ZSk7CisgICAgcmV0dXJuIFdlYkNvcmU6OkZs b2F0U2l6ZSh3ZWJWaWV3LT5fbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGUudmFsdWVPcihi b3VuZHMuc2l6ZSkpOwogfQogCiBzdGF0aWMgaW50MzJfdCBhY3RpdmVPcmllbnRhdGlvbihXS1dl YlZpZXcgKndlYlZpZXcpCkBAIC01OTE3LDIwICs1OTE2LDE5IEBAIC0gKHZvaWQpcmVtb3ZlRnJv bVN1cGVydmlldwogfQogI2VuZGlmCiAKKy8vIERlcHJlY2F0ZWQgU1BJLgogLSAoQ0dTaXplKV9t aW5pbXVtTGF5b3V0U2l6ZU92ZXJyaWRlCiB7Ci0gICAgQVNTRVJUKF9vdmVycmlkZXNWaWV3TGF5 b3V0U2l6ZSk7Ci0gICAgcmV0dXJuIF92aWV3TGF5b3V0U2l6ZU92ZXJyaWRlOworICAgIEFTU0VS VChfdmlld0xheW91dFNpemVPdmVycmlkZSk7CisgICAgcmV0dXJuIF92aWV3TGF5b3V0U2l6ZU92 ZXJyaWRlLnZhbHVlT3IoQ0dTaXplWmVybyk7CiB9CiAKIC0gKHZvaWQpX3NldFZpZXdMYXlvdXRT aXplT3ZlcnJpZGU6KENHU2l6ZSl2aWV3TGF5b3V0U2l6ZU92ZXJyaWRlCiB7Ci0gICAgX292ZXJy aWRlc1ZpZXdMYXlvdXRTaXplID0gWUVTOwogICAgIF92aWV3TGF5b3V0U2l6ZU92ZXJyaWRlID0g dmlld0xheW91dFNpemVPdmVycmlkZTsKIAogICAgIGlmIChfZHluYW1pY1ZpZXdwb3J0VXBkYXRl TW9kZSA9PSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6aW5nKQog ICAgICAgICBbc2VsZiBfZGlzcGF0Y2hTZXRWaWV3TGF5b3V0U2l6ZTpXZWJDb3JlOjpGbG9hdFNp emUodmlld0xheW91dFNpemVPdmVycmlkZSldOwotCiB9CiAKIC0gKFVJRWRnZUluc2V0cylfb2Jz Y3VyZWRJbnNldHMKQEAgLTYwMjAsMTYgKzYwMTgsMTYgQEAgLSAodm9pZClfY2xlYXJJbnRlcmZh Y2VPcmllbnRhdGlvbk92ZXJyaWRlCiAgICAgX2ludGVyZmFjZU9yaWVudGF0aW9uT3ZlcnJpZGUg PSBVSUludGVyZmFjZU9yaWVudGF0aW9uUG9ydHJhaXQ7CiB9CiAKKy8vIERlcHJlY2F0ZWQgU1BJ CiAtIChDR1NpemUpX21heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlCiB7Ci0gICAgQVNTRVJU KF9vdmVycmlkZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUpOwotICAgIHJldHVybiBfbWF4aW11bVVu b2JzY3VyZWRTaXplT3ZlcnJpZGU7CisgICAgQVNTRVJUKF9tYXhpbXVtVW5vYnNjdXJlZFNpemVP dmVycmlkZSk7CisgICAgcmV0dXJuIF9tYXhpbXVtVW5vYnNjdXJlZFNpemVPdmVycmlkZS52YWx1 ZU9yKENHU2l6ZVplcm8pOwogfQogCiAtICh2b2lkKV9zZXRNYXhpbXVtVW5vYnNjdXJlZFNpemVP dmVycmlkZTooQ0dTaXplKXNpemUKIHsKICAgICBBU1NFUlQoc2l6ZS53aWR0aCA8PSBzZWxmLmJv dW5kcy5zaXplLndpZHRoICYmIHNpemUuaGVpZ2h0IDw9IHNlbGYuYm91bmRzLnNpemUuaGVpZ2h0 KTsKLSAgICBfb3ZlcnJpZGVzTWF4aW11bVVub2JzY3VyZWRTaXplID0gWUVTOwogICAgIF9tYXhp bXVtVW5vYnNjdXJlZFNpemVPdmVycmlkZSA9IHNpemU7CiAKICAgICBpZiAoX2R5bmFtaWNWaWV3 cG9ydFVwZGF0ZU1vZGUgPT0gV2ViS2l0OjpEeW5hbWljVmlld3BvcnRVcGRhdGVNb2RlOjpOb3RS ZXNpemluZykKQEAgLTYwOTUsMTMgKzYwOTMsMTMgQEAgLSAodm9pZClfYmVnaW5BbmltYXRlZFJl c2l6ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogICAgIENHUmVjdCBm dXR1cmVVbm9ic2N1cmVkUmVjdEluU2VsZkNvb3JkaW5hdGVzID0gVUlFZGdlSW5zZXRzSW5zZXRS ZWN0KG5ld0JvdW5kcywgX29ic2N1cmVkSW5zZXRzKTsKICAgICBDR1JlY3QgY29udGVudFZpZXdC b3VuZHMgPSBbX2NvbnRlbnRWaWV3IGJvdW5kc107CiAKLSAgICBBU1NFUlRfV0lUSF9NRVNTQUdF KCEoX292ZXJyaWRlc1ZpZXdMYXlvdXRTaXplICYmIG5ld1ZpZXdMYXlvdXRTaXplLmlzRW1wdHko KSksICJDbGllbnRzIGNvbnRyb2xsaW5nIHRoZSBsYXlvdXQgc2l6ZSBzaG91bGQgbWFpbnRhaW4g YSB2YWxpZCBsYXlvdXQgc2l6ZSB0byBtaW5pbWl6ZSBsYXlvdXRzLiIpOworICAgIEFTU0VSVF9X SVRIX01FU1NBR0UoIShfdmlld0xheW91dFNpemVPdmVycmlkZSAmJiBuZXdWaWV3TGF5b3V0U2l6 ZS5pc0VtcHR5KCkpLCAiQ2xpZW50cyBjb250cm9sbGluZyB0aGUgbGF5b3V0IHNpemUgc2hvdWxk IG1haW50YWluIGEgdmFsaWQgbGF5b3V0IHNpemUgdG8gbWluaW1pemUgbGF5b3V0cy4iKTsKICAg ICBpZiAoQ0dSZWN0SXNFbXB0eShuZXdCb3VuZHMpIHx8IG5ld1ZpZXdMYXlvdXRTaXplLmlzRW1w dHkoKSB8fCBDR1JlY3RJc0VtcHR5KGZ1dHVyZVVub2JzY3VyZWRSZWN0SW5TZWxmQ29vcmRpbmF0 ZXMpIHx8IENHUmVjdElzRW1wdHkoY29udGVudFZpZXdCb3VuZHMpKSB7CiAgICAgICAgIFtzZWxm IF9jYW5jZWxBbmltYXRlZFJlc2l6ZV07CiAgICAgICAgIFtzZWxmIF9mcmFtZU9yQm91bmRzQ2hh bmdlZF07Ci0gICAgICAgIGlmIChfb3ZlcnJpZGVzVmlld0xheW91dFNpemUpCisgICAgICAgIGlm IChfdmlld0xheW91dFNpemVPdmVycmlkZSkKICAgICAgICAgICAgIFtzZWxmIF9kaXNwYXRjaFNl dFZpZXdMYXlvdXRTaXplOm5ld1ZpZXdMYXlvdXRTaXplXTsKLSAgICAgICAgaWYgKF9vdmVycmlk ZXNNYXhpbXVtVW5vYnNjdXJlZFNpemUpCisgICAgICAgIGlmIChfbWF4aW11bVVub2JzY3VyZWRT aXplT3ZlcnJpZGUpCiAgICAgICAgICAgICBbc2VsZiBfZGlzcGF0Y2hTZXRNYXhpbXVtVW5vYnNj dXJlZFNpemU6V2ViQ29yZTo6RmxvYXRTaXplKG5ld01heGltdW1Vbm9ic2N1cmVkU2l6ZSldOwog ICAgICAgICBpZiAoX292ZXJyaWRlc0ludGVyZmFjZU9yaWVudGF0aW9uKQogICAgICAgICAgICAg W3NlbGYgX2Rpc3BhdGNoU2V0RGV2aWNlT3JpZW50YXRpb246bmV3T3JpZW50YXRpb25dOwpAQCAt NjMwOCwxMSArNjMwNiw4IEBAIC0gKHZvaWQpX292ZXJyaWRlTGF5b3V0UGFyYW1ldGVyc1dpdGhN aW5pbXVtTGF5b3V0U2l6ZTooQ0dTaXplKW1pbmltdW1MYXlvdXRTaXplCiAKIC0gKHZvaWQpX2Ns ZWFyT3ZlcnJpZGVMYXlvdXRQYXJhbWV0ZXJzCiB7Ci0gICAgX292ZXJyaWRlc1ZpZXdMYXlvdXRT aXplID0gTk87Ci0gICAgX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUgPSBDR1NpemVaZXJvOwotCi0g ICAgX292ZXJyaWRlc01heGltdW1Vbm9ic2N1cmVkU2l6ZSA9IE5POwotICAgIF9tYXhpbXVtVW5v YnNjdXJlZFNpemVPdmVycmlkZSA9IENHU2l6ZVplcm87CisgICAgX3ZpZXdMYXlvdXRTaXplT3Zl cnJpZGUgPSBXVEY6Om51bGxvcHQ7CisgICAgX21heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRl ID0gV1RGOjpudWxsb3B0OwogfQogCiBzdGF0aWMgV1RGOjpPcHRpb25hbDxXZWJDb3JlOjpWaWV3 cG9ydEFyZ3VtZW50cz4gdmlld3BvcnRBcmd1bWVudHNGcm9tRGljdGlvbmFyeShOU0RpY3Rpb25h cnk8TlNTdHJpbmcgKiwgTlNTdHJpbmcgKj4gKnZpZXdwb3J0QXJndW1lbnRQYWlycywgYm9vbCB2 aWV3cG9ydEZpdEVuYWJsZWQpCg==