239779 2022-04-26 11:37:33 -0700 Show the option to Markup Image in the callout bar only when appropriate 2022-04-26 14:51:59 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi darin hi katherine_cheney megan_gardner thorton webkit-bug-importer oldest_to_newest 1864542 0 wenson_hsieh 2022-04-26 11:37:33 -0700 rdar://88941823 1864546 1 458385 wenson_hsieh 2022-04-26 11:42:55 -0700 Created attachment 458385 Patch 1864609 2 458385 wenson_hsieh 2022-04-26 13:38:40 -0700 Comment on attachment 458385 Patch Thanks for the review! 1864624 3 ews-feeder 2022-04-26 14:19:49 -0700 Tools/Scripts/svn-apply failed to apply attachment 458385 to trunk. Please resolve the conflicts and upload a new patch. 1864638 4 wenson_hsieh 2022-04-26 14:51:59 -0700 Hm..It looks like the CQ bot was out of disk space :( Committed r293454: <https://commits.webkit.org/r293454> Committed r293454 (250007@trunk): <https://commits.webkit.org/250007@trunk> 458385 2022-04-26 11:42:55 -0700 2022-04-26 14:19:50 -0700 Patch bug-239779-20220426114254.patch text/plain 7190 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZiYTg1M2NkN2NmNDU3MWVk ZDRmYTQzOGFhMjNiZDk1MGMzMGU5NzMuLmExMzkxNDJjZDFmNjc3ZmI0Mzg4ZDk2NTBjNzZjMjQ5 YjNlYzNkNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDQtMjYgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgU2hvdyB0aGUgb3B0aW9u IHRvIE1hcmt1cCBJbWFnZSBpbiB0aGUgY2FsbG91dCBiYXIgb25seSB3aGVuIGFwcHJvcHJpYXRl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk3NzkK KyAgICAgICAgcmRhcjovLzg4OTQxODIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTWFrZSBhIG1pbm9yIGFkanVzdG1lbnQgdG8gb25seSBzaG93IHRo aXMgY2FsbG91dCBiYXIgYWN0aW9uIGluIHRoZSBjYXNlIHdoZXJlIGBfaW1hZ2VBbmFseXNpc01h cmt1cERhdGFgIGhhcworICAgICAgICBhbHJlYWR5IGJlZW4gY29tcHV0ZWQgYW5kIGNhY2hlZC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgor ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGltYWdlQW5hbHlzaXNNYXJrdXBNZW51XSk6CisKIDIw MjItMDQtMjUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgQWRqdXN0IHNvbWUgaW1hZ2UgdHJhbnNjb2RpbmcgYmVoYXZpb3JzIHJlbGF0ZWQgdG8gIkNv cHkgQ3JvcHBlZCBJbWFnZSIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGZjMjliZmIwYWNiOGE1MjNmN2Ji YzhkMGQ2YzA4N2E0MWM0NDE2YmUuLmI5NzM0NmEyNWU0MDEwNjc3YjhhMWMzNzE3NDU3ZWRlYzM5 MWNlYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNDc1MCw3ICs0NzUwLDEwIEBAIC0gKFVJTWVudSAq KWltYWdlQW5hbHlzaXNNYXJrdXBNZW51CiAgICAgaWYgKCFfcGFnZSB8fCAhX3BhZ2UtPnByZWZl cmVuY2VzKCkuaW1hZ2VBbmFseXNpc01hcmt1cEVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIG5p bDsKIAotICAgIGlmIChfcGFnZS0+ZWRpdG9yU3RhdGUoKS5pc01pc3NpbmdQb3N0TGF5b3V0RGF0 YSB8fCAhX3BhZ2UtPmVkaXRvclN0YXRlKCkucG9zdExheW91dERhdGEoKS5zZWxlY3RlZEVkaXRh YmxlSW1hZ2UpCisgICAgaWYgKF9wYWdlLT5lZGl0b3JTdGF0ZSgpLmlzTWlzc2luZ1Bvc3RMYXlv dXREYXRhIHx8ICFfaW1hZ2VBbmFseXNpc01hcmt1cERhdGEpCisgICAgICAgIHJldHVybiBuaWw7 CisKKyAgICBpZiAoX2ltYWdlQW5hbHlzaXNNYXJrdXBEYXRhLT5lbGVtZW50ICE9IF9wYWdlLT5l ZGl0b3JTdGF0ZSgpLnBvc3RMYXlvdXREYXRhKCkuc2VsZWN0ZWRFZGl0YWJsZUltYWdlKQogICAg ICAgICByZXR1cm4gbmlsOwogCiAgICAgcmV0dXJuIFtzZWxmIG1lbnVXaXRoSW5saW5lQWN0aW9u OldlYkNvcmU6OmNvbnRleHRNZW51SXRlbVRpdGxlTWFya3VwSW1hZ2UoKSBpZGVudGlmaWVyOkAi V0tBY3Rpb25NYXJrdXBJbWFnZSIgaGFuZGxlcjpbXShXS0NvbnRlbnRWaWV3ICp2aWV3KSB7CmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDc5YzI3 NDk1M2Q3ZGE1ZDdmZGFjYTM2YzUzNTdmZTQ4OWEwNDMwMS4uOGJhNTMwNjA2Y2EzNTQxNWI3MjVk NmI5MDdkMTI5ZmQ5YmEyNmIzMyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTA0LTI2ICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFNob3cgdGhlIG9wdGlvbiB0byBN YXJrdXAgSW1hZ2UgaW4gdGhlIGNhbGxvdXQgYmFyIG9ubHkgd2hlbiBhcHByb3ByaWF0ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5Nzc5CisgICAg ICAgIHJkYXI6Ly84ODk0MTgyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkanVzdCBzb21lIEFQSSB0ZXN0cyBzbyB0aGF0IHRoZXkgY29udGludWUg cGFzc2luZyBhZnRlciB0aGVzZSBjaGFuZ2VzLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9JbWFnZUFuYWx5c2lzVGVzdHMubW06CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjppY29uSW1hZ2UpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6c2ltdWxhdGVDYWxs b3V0QmFyQXBwZWFyYW5jZSk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjppbnZva2VJbWFnZU1h cmt1cEFjdGlvbik6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKyAgICAgICAgKFRl c3RXZWJLaXRBUEk6OnJ1bk1hcmt1cFRlc3QpOgorCiAyMDIyLTA0LTI1ICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFkanVzdCBzb21lIGltYWdlIHRy YW5zY29kaW5nIGJlaGF2aW9ycyByZWxhdGVkIHRvICJDb3B5IENyb3BwZWQgSW1hZ2UiCmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0ltYWdlQW5hbHlz aXNUZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW1hZ2VB bmFseXNpc1Rlc3RzLm1tCmluZGV4IGIwMGI2NjNmOTQ1ZTFjNzJhMWNiZThlZjY1NWY0ZDE4NTM5 MGM4MTcuLjBhZDIxZDdhMDQwM2VlOTZmYmI4ODM1ZDg0MzNmMWMyNzUzYTk3NTYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW1hZ2VBbmFseXNpc1Rl c3RzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW1hZ2VB bmFseXNpc1Rlc3RzLm1tCkBAIC0zMjQsOCArMzI0LDM1IEBAIFRFU1QoSW1hZ2VBbmFseXNpc1Rl c3RzLCBJbWFnZUFuYWx5c2lzV2l0aFRyYW5zcGFyZW50SW1hZ2VzKQogCiAjaWYgRU5BQkxFKElN QUdFX0FOQUxZU0lTX0VOSEFOQ0VNRU5UUykgJiYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKIAorc3Rh dGljIFJldGFpblB0cjxVSUltYWdlPiBpY29uSW1hZ2UoKQoreworICAgIGF1dG8gaWNvblBhdGgg PSBbTlNCdW5kbGUubWFpbkJ1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJpY29uIiBvZlR5cGU6QCJw bmciIGluRGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXTsKKyAgICByZXR1cm4g W1VJSW1hZ2UgaW1hZ2VXaXRoQ29udGVudHNPZkZpbGU6aWNvblBhdGhdOworfQorCitzdGF0aWMg dm9pZCBzaW11bGF0ZUNhbGxvdXRCYXJBcHBlYXJhbmNlKFRlc3RXS1dlYlZpZXcgKndlYlZpZXcp Cit7CisgICAgX19ibG9jayBib29sIGRvbmUgPSBmYWxzZTsKKyAgICBbd2ViVmlldy50ZXh0SW5w dXRDb250ZW50VmlldyByZXF1ZXN0UmVjdHNUb0V2YWRlRm9yU2VsZWN0aW9uQ29tbWFuZHNXaXRo Q29tcGxldGlvbkhhbmRsZXI6XihOU0FycmF5PE5TVmFsdWUgKj4gKikgeworICAgICAgICBkb25l ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworfQorCitzdGF0aWMgdm9p ZCBpbnZva2VJbWFnZU1hcmt1cEFjdGlvbihUZXN0V0tXZWJWaWV3ICp3ZWJWaWV3KQoreworICAg IHNpbXVsYXRlQ2FsbG91dEJhckFwcGVhcmFuY2Uod2ViVmlldyk7CisKKyAgICBhdXRvIG1lbnVC dWlsZGVyID0gYWRvcHROUyhbW1Rlc3RVSU1lbnVCdWlsZGVyIGFsbG9jXSBpbml0XSk7CisgICAg W3dlYlZpZXcgYnVpbGRNZW51V2l0aEJ1aWxkZXI6bWVudUJ1aWxkZXIuZ2V0KCldOworICAgIFtb bWVudUJ1aWxkZXIgYWN0aW9uV2l0aFRpdGxlOldlYkNvcmU6OmNvbnRleHRNZW51SXRlbVRpdGxl TWFya3VwSW1hZ2UoKV0gX3BlcmZvcm1BY3Rpb25XaXRoU2VuZGVyOm5pbF07CisgICAgW3dlYlZp ZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOworfQorCiBURVNUKEltYWdlQW5hbHlz aXNUZXN0cywgTWVudUNvbnRyb2xsZXJJdGVtcykKIHsKKyAgICBJbWFnZUFuYWx5c2lzTWFya3Vw U3dpenpsZXIgc3dpenpsZXIgeyBbaWNvbkltYWdlKCkgQ0dJbWFnZV0sIENHUmVjdE1ha2UoMTAs IDEwLCAyMTUsIDE3NCkgfTsKKwogICAgIGF1dG8gd2ViVmlldyA9IGNyZWF0ZVdlYlZpZXdXaXRo VGV4dFJlY29nbml0aW9uRW5oYW5jZW1lbnRzKCk7CiAgICAgYXV0byBpbnB1dERlbGVnYXRlID0g YWRvcHROUyhbVGVzdElucHV0RGVsZWdhdGUgbmV3XSk7CiAgICAgW2lucHV0RGVsZWdhdGUgc2V0 Rm9jdXNTdGFydHNJbnB1dFNlc3Npb25Qb2xpY3lIYW5kbGVyOltdKFdLV2ViVmlldyAqLCBpZCA8 X1dLRm9jdXNlZEVsZW1lbnRJbmZvPikgewpAQCAtMzM3LDYgKzM2NCw3IEBAIFRFU1QoSW1hZ2VB bmFseXNpc1Rlc3RzLCBNZW51Q29udHJvbGxlckl0ZW1zKQogICAgIFt3ZWJWaWV3IHN5bmNocm9u b3VzbHlMb2FkVGVzdFBhZ2VOYW1lZDpAIm11bHRpcGxlLWltYWdlcyJdOwogICAgIFt3ZWJWaWV3 IG9iamVjdEJ5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJsZXQgaW1hZ2UgPSBkb2N1bWVudC5pbWFn ZXNbMF07IGdldFNlbGVjdGlvbigpLnNldEJhc2VBbmRFeHRlbnQoaW1hZ2UsIDAsIGltYWdlLCAx KTsiXTsKICAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CisgICAg c2ltdWxhdGVDYWxsb3V0QmFyQXBwZWFyYW5jZSh3ZWJWaWV3LmdldCgpKTsKIAogICAgIGF1dG8g bWVudUJ1aWxkZXIgPSBhZG9wdE5TKFtbVGVzdFVJTWVudUJ1aWxkZXIgYWxsb2NdIGluaXRdKTsK ICAgICBbd2ViVmlldyBidWlsZE1lbnVXaXRoQnVpbGRlcjptZW51QnVpbGRlci5nZXQoKV07CkBA IC0zNDQsNiArMzcyLDcgQEAgVEVTVChJbWFnZUFuYWx5c2lzVGVzdHMsIE1lbnVDb250cm9sbGVy SXRlbXMpCiAKICAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKICAgICBbd2ViVmlldyB3YWl0 Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CisgICAgc2ltdWxhdGVDYWxsb3V0QmFyQXBwZWFy YW5jZSh3ZWJWaWV3LmdldCgpKTsKIAogICAgIFttZW51QnVpbGRlciByZXNldF07CiAgICAgW3dl YlZpZXcgYnVpbGRNZW51V2l0aEJ1aWxkZXI6bWVudUJ1aWxkZXIuZ2V0KCldOwpAQCAtMzUxLDMy ICszODAsMTYgQEAgVEVTVChJbWFnZUFuYWx5c2lzVGVzdHMsIE1lbnVDb250cm9sbGVySXRlbXMp CiAKICAgICBbd2ViVmlldyBvYmplY3RCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZ2V0U2VsZWN0 aW9uKCkuc2V0QmFzZUFuZEV4dGVudChkb2N1bWVudC5ib2R5LCAwLCBkb2N1bWVudC5pbWFnZXNb MF0sIDEpOyJdOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsK KyAgICBzaW11bGF0ZUNhbGxvdXRCYXJBcHBlYXJhbmNlKHdlYlZpZXcuZ2V0KCkpOwogCiAgICAg W21lbnVCdWlsZGVyIHJlc2V0XTsKICAgICBbd2ViVmlldyBidWlsZE1lbnVXaXRoQnVpbGRlcjpt ZW51QnVpbGRlci5nZXQoKV07CiAgICAgRVhQRUNUX05PVF9OVUxMKFttZW51QnVpbGRlciBhY3Rp b25XaXRoVGl0bGU6V2ViQ29yZTo6Y29udGV4dE1lbnVJdGVtVGl0bGVNYXJrdXBJbWFnZSgpXSk7 CiB9CiAKLXN0YXRpYyB2b2lkIGludm9rZUltYWdlTWFya3VwQWN0aW9uKFRlc3RXS1dlYlZpZXcg KndlYlZpZXcpCi17Ci0gICAgLy8gU2ltdWxhdGUgY2FsbG91dCBiYXIgYXBwZWFyYW5jZS4KLSAg ICBfX2Jsb2NrIGJvb2wgZG9uZSA9IGZhbHNlOwotICAgIFt3ZWJWaWV3LnRleHRJbnB1dENvbnRl bnRWaWV3IHJlcXVlc3RSZWN0c1RvRXZhZGVGb3JTZWxlY3Rpb25Db21tYW5kc1dpdGhDb21wbGV0 aW9uSGFuZGxlcjpeKE5TQXJyYXk8TlNWYWx1ZSAqPiAqKSB7Ci0gICAgICAgIGRvbmUgPSB0cnVl OwotICAgIH1dOwotICAgIFV0aWw6OnJ1bigmZG9uZSk7Ci0KLSAgICBhdXRvIG1lbnVCdWlsZGVy ID0gYWRvcHROUyhbW1Rlc3RVSU1lbnVCdWlsZGVyIGFsbG9jXSBpbml0XSk7Ci0gICAgW3dlYlZp ZXcgYnVpbGRNZW51V2l0aEJ1aWxkZXI6bWVudUJ1aWxkZXIuZ2V0KCldOwotICAgIFtbbWVudUJ1 aWxkZXIgYWN0aW9uV2l0aFRpdGxlOldlYkNvcmU6OmNvbnRleHRNZW51SXRlbVRpdGxlTWFya3Vw SW1hZ2UoKV0gX3BlcmZvcm1BY3Rpb25XaXRoU2VuZGVyOm5pbF07Ci0gICAgW3dlYlZpZXcgd2Fp dEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOwotfQotCiBzdGF0aWMgdm9pZCBydW5NYXJrdXBU ZXN0KE5TU3RyaW5nICp0ZXN0UGFnZSwgTlNTdHJpbmcgKnNjcmlwdFRvU2VsZWN0VGV4dCwgRnVu Y3Rpb248dm9pZChUZXN0V0tXZWJWaWV3ICosIE5TU3RyaW5nICopPiYmIGNoZWNrV2ViVmlldykK IHsKLSAgICBhdXRvIGljb25QYXRoID0gW05TQnVuZGxlLm1haW5CdW5kbGUgcGF0aEZvclJlc291 cmNlOkAiaWNvbiIgb2ZUeXBlOkAicG5nIiBpbkRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVz b3VyY2VzIl07Ci0gICAgUmV0YWluUHRyIGljb25JbWFnZSA9IFtVSUltYWdlIGltYWdlV2l0aENv bnRlbnRzT2ZGaWxlOmljb25QYXRoXTsKLSAgICBJbWFnZUFuYWx5c2lzTWFya3VwU3dpenpsZXIg c3dpenpsZXIgeyBbaWNvbkltYWdlIENHSW1hZ2VdLCBDR1JlY3RNYWtlKDEwLCAxMCwgMjE1LCAx NzQpIH07CisgICAgSW1hZ2VBbmFseXNpc01hcmt1cFN3aXp6bGVyIHN3aXp6bGVyIHsgW2ljb25J bWFnZSgpIENHSW1hZ2VdLCBDR1JlY3RNYWtlKDEwLCAxMCwgMjE1LCAxNzQpIH07CiAKICAgICBh dXRvIHdlYlZpZXcgPSBjcmVhdGVXZWJWaWV3V2l0aFRleHRSZWNvZ25pdGlvbkVuaGFuY2VtZW50 cygpOwogICAgIGF1dG8gaW5wdXREZWxlZ2F0ZSA9IGFkb3B0TlMoW1Rlc3RJbnB1dERlbGVnYXRl IG5ld10pOwo=