152431 2015-12-18 10:13:12 -0800 Fix the !ENABLE(VIDEO) build after r192953 for <picture> element introduction 2015-12-18 11:38:27 -0800 1 1 1 Unclassified WebKit DOM Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116963 1 olivier.blin webkit-unassigned cdumez commit-queue dino esprehn+autocc gyuyoung.kim hyatt kondapallykalyan ossy zan oldest_to_newest 1150313 0 olivier.blin 2015-12-18 10:13:12 -0800 Since r192953, HTMLSourceElement is built even if video is disabled, since it is used by the picture element. But this breaks build with -no-video, since HTMLMediaElement usage should be guarded by VIDEO guards, and its JS bindings were still under a video conditional. 1150314 1 267637 olivier.blin 2015-12-18 10:14:33 -0800 Created attachment 267637 Patch 1150333 2 267637 achristensen 2015-12-18 10:50:55 -0800 Comment on attachment 267637 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=267637&action=review > Source/WebCore/html/HTMLSourceElement.cpp:67 > + else > +#endif > + if (is<HTMLPictureElement>(*parent)) This is strange, but it's clear what is going on and has the correct behavior, and I can't make anything that does this that doesn't also look strange. 1150355 3 olivier.blin 2015-12-18 11:21:05 -0800 (In reply to comment #2) > Comment on attachment 267637 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=267637&action=review > > > Source/WebCore/html/HTMLSourceElement.cpp:67 > > + else > > +#endif > > + if (is<HTMLPictureElement>(*parent)) > > This is strange, but it's clear what is going on and has the correct > behavior, and I can't make anything that does this that doesn't also look > strange. This is indeed a bit weird, but I didn't find a better way, and saw that this pattern is already used in a few places, like HTMLOptionElement.cpp Thanks for the review! 1150362 4 267637 commit-queue 2015-12-18 11:38:21 -0800 Comment on attachment 267637 Patch Clearing flags on attachment: 267637 Committed r194278: <http://trac.webkit.org/changeset/194278> 1150364 5 commit-queue 2015-12-18 11:38:27 -0800 All reviewed patches have been landed. Closing bug. 267637 2015-12-18 10:14:33 -0800 2015-12-18 11:38:21 -0800 Patch bug-152431-20151218191340.patch text/plain 3216 olivier.blin U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0MjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc4ZjhhMTE4MzMyZjI0 YjRlNWViNDAxODQ3MzJkNWE2MTBmMDdjNS4uYTYwN2MxZjg1MDVlM2UxZWFhOTQ2NWVjODdjY2U4 MTRkYzFlMWIzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTEyLTE4ICBPbGl2 aWVyIEJsaW4gIDxvbGl2aWVyLmJsaW5Ac29mdGF0aG9tZS5jb20+CisKKyAgICAgICAgRml4IHRo ZSAhRU5BQkxFKFZJREVPKSBidWlsZCBhZnRlciByMTkyOTUzIGZvciA8cGljdHVyZT4gZWxlbWVu dCBpbnRyb2R1Y3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MjQzMQorCisgICAgICAgIFNpbmNlIHIxOTI5NTMsIEhUTUxTb3VyY2VFbGVtZW50 IGlzIGJ1aWx0IGV2ZW4gaWYgdmlkZW8gaXMgZGlzYWJsZWQsCisgICAgICAgIHNpbmNlIGl0IGlz IHVzZWQgYnkgdGhlIHBpY3R1cmUgZWxlbWVudC4KKworICAgICAgICBCdXQgYnVpbGQgd2FzIGJy b2tlbiB3aXRoIC1uby12aWRlbywgc2luY2UgSFRNTE1lZGlhRWxlbWVudCB1c2FnZQorICAgICAg ICBzaG91bGQgYmUgZ3VhcmRlZCBieSBWSURFTyBndWFyZHMsIGFuZCBpdHMgSlMgYmluZGluZ3Mg d2VyZSBzdGlsbAorICAgICAgICB1bmRlciBhIHZpZGVvIGNvbmRpdGlvbmFsLgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYnVp bGQgZml4IG9ubHkuCisKKyAgICAgICAgKiBodG1sL0hUTUxTb3VyY2VFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxTb3VyY2VFbGVtZW50OjppbnNlcnRlZEludG8pOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTFNvdXJjZUVsZW1lbnQ6OnJlbW92ZWRGcm9tKToKKyAgICAgICAgKiBo dG1sL0hUTUxTb3VyY2VFbGVtZW50LmlkbDoKKwogMjAxNS0xMi0xNyAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW9kZXJuIElEQjogUmVmYWN0b3Igb3Blbi9k ZWxldGUgcmVxdWVzdHMgdG8gZXhpc3QgaW4gdGhlIHNhbWUgcXVldWUuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3BwCmluZGV4IDk5ZDRlYTkyNTJiZGQ0NjAzZDJmMjIx ZWFkOTIxZGYzZjYyZGVlMTYuLmMzYjY3NjBlM2M4MWMxNmFhM2FkYjQwZjVkNzIzYmFhZWU3MWVl ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuY3BwCkBAIC01OSw5 ICs1OSwxMiBAQCBOb2RlOjpJbnNlcnRpb25Ob3RpZmljYXRpb25SZXF1ZXN0IEhUTUxTb3VyY2VF bGVtZW50OjppbnNlcnRlZEludG8oQ29udGFpbmVyTm9kZQogICAgIEhUTUxFbGVtZW50OjppbnNl cnRlZEludG8oaW5zZXJ0aW9uUG9pbnQpOwogICAgIEVsZW1lbnQqIHBhcmVudCA9IHBhcmVudEVs ZW1lbnQoKTsKICAgICBpZiAocGFyZW50KSB7CisjaWYgRU5BQkxFKFZJREVPKQogICAgICAgICBp ZiAoaXM8SFRNTE1lZGlhRWxlbWVudD4oKnBhcmVudCkpCiAgICAgICAgICAgICBkb3duY2FzdDxI VE1MTWVkaWFFbGVtZW50PigqcGFyZW50KS5zb3VyY2VXYXNBZGRlZCh0aGlzKTsKLSAgICAgICAg ZWxzZSBpZiAoaXM8SFRNTFBpY3R1cmVFbGVtZW50PigqcGFyZW50KSkKKyAgICAgICAgZWxzZQor I2VuZGlmCisgICAgICAgIGlmIChpczxIVE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQpKQogICAg ICAgICAgICAgZG93bmNhc3Q8SFRNTFBpY3R1cmVFbGVtZW50PigqcGFyZW50KS5zb3VyY2VzQ2hh bmdlZCgpOwogICAgIH0KICAgICByZXR1cm4gSW5zZXJ0aW9uRG9uZTsKQEAgLTczLDkgKzc2LDEy IEBAIHZvaWQgSFRNTFNvdXJjZUVsZW1lbnQ6OnJlbW92ZWRGcm9tKENvbnRhaW5lck5vZGUmIHJl bW92YWxSb290KQogICAgIGlmICghcGFyZW50ICYmIGlzPEVsZW1lbnQ+KHJlbW92YWxSb290KSkK ICAgICAgICAgcGFyZW50ID0gJmRvd25jYXN0PEVsZW1lbnQ+KHJlbW92YWxSb290KTsKICAgICBp ZiAocGFyZW50KSB7CisjaWYgRU5BQkxFKFZJREVPKQogICAgICAgICBpZiAoaXM8SFRNTE1lZGlh RWxlbWVudD4oKnBhcmVudCkpCiAgICAgICAgICAgICBkb3duY2FzdDxIVE1MTWVkaWFFbGVtZW50 PigqcGFyZW50KS5zb3VyY2VXYXNSZW1vdmVkKHRoaXMpOwotICAgICAgICBlbHNlIGlmIChpczxI VE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQpKQorICAgICAgICBlbHNlCisjZW5kaWYKKyAgICAg ICAgaWYgKGlzPEhUTUxQaWN0dXJlRWxlbWVudD4oKnBhcmVudCkpCiAgICAgICAgICAgICBkb3du Y2FzdDxIVE1MUGljdHVyZUVsZW1lbnQ+KCpwYXJlbnQpLnNvdXJjZXNDaGFuZ2VkKCk7CiAgICAg fQogICAgIEhUTUxFbGVtZW50OjpyZW1vdmVkRnJvbShyZW1vdmFsUm9vdCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTb3VyY2VFbGVtZW50LmlkbCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuaWRsCmluZGV4IGNlZWQzNWVmNjdhYjAxNWQzM2Q0 MGVmMGFiN2YwNmQyM2YzOGVhMDguLjU1NDgwMTM4YTRkOGY3ZjFmNmVjYTI1MGI3NTlkNjM3NGZj M2JhYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQu aWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNvdXJjZUVsZW1lbnQuaWRsCkBAIC0y Myw5ICsyMyw3IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKICAqLwogCi1bCi0gICAgQ29uZGl0aW9uYWw9 VklERU8sCi1dIGludGVyZmFjZSBIVE1MU291cmNlRWxlbWVudCA6IEhUTUxFbGVtZW50IHsKK2lu dGVyZmFjZSBIVE1MU291cmNlRWxlbWVudCA6IEhUTUxFbGVtZW50IHsKIFtSZWZsZWN0LCBVUkxd IGF0dHJpYnV0ZSBET01TdHJpbmcgc3JjOwogYXR0cmlidXRlIERPTVN0cmluZyB0eXBlOwogYXR0 cmlidXRlIERPTVN0cmluZyBtZWRpYTsK