187159 2018-06-28 14:52:44 -0700 Fix a bug ComponentBase that wrong content template may be used. 2018-07-02 11:10:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned dewei_zhu rniwa oldest_to_newest 1437565 0 dewei_zhu 2018-06-28 14:52:44 -0700 Fix a bug ComponentBase that wrong content template may be used. 1437570 1 343855 dewei_zhu 2018-06-28 14:56:48 -0700 Created attachment 343855 Patch 1437576 2 343855 rniwa 2018-06-28 15:04:23 -0700 Comment on attachment 343855 Patch Nice catch! 1438560 3 dewei_zhu 2018-07-02 11:10:47 -0700 Landed in r233333 343855 2018-06-28 14:56:48 -0700 2018-06-28 15:04:23 -0700 Patch bug-187159-20180628145648.patch text/plain 5099 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzI2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA5ZjdmZWIwYTYwZjViYTA1OTE2MzE5MzdjNTRlOTY0NWRhNTlkNTE4Li43NjZhODk5MGUy Yzc2MTE4ZTNhNWFmMjI3OTAxMTRhYmJlZmE4MTdiIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOC0wNi0yOCAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBGaXggYSBidWcgQ29tcG9uZW50QmFzZSB0aGF0IHdyb25n IGNvbnRlbnQgdGVtcGxhdGUgbWF5IGJlIHVzZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODcxNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDb21wb25lbnRCYXNlIHVzZXMgJ19wYXJzZWQnIHRvIG1h cmsgd2hldGhlciBjb250ZW50IGFuZCBzdHlsZSB0ZW1wbGF0ZXMgb2YgYSBjbGFzcworICAgICAg ICBpcyBwYXJzZWQuIEhvd2V2ZXIsIGRlcml2ZWQgY2xhc3MgcGFyc2luZyB3aWxsIGJlIHNraXBw ZWQgYXMgJ0Rlcml2ZS5fcGFyc2VkJyBpcyBhdmFpbGFibGUKKyAgICAgICAgdmlhIHByb3RvdHlw ZSBjaGFpbiB3aGVuZXZlciB0aGUgYmFzZSBjbGFzcyBpcyBwYXJzZWQuCisKKyAgICAgICAgKiBi cm93c2VyLXRlc3RzL2NvbXBvbmVudC1iYXNlLXRlc3RzLmpzOiBBZGRlZCB1bml0IHRlc3RzLgor ICAgICAgICAqIHB1YmxpYy92My9jb21wb25lbnRzL2Jhc2UuanM6IEFkZGVkICdoYXNPd25Qcm9w ZXJ0eScgdG8gbWFrZSBzdXJlIGN1cnJlbnQgY2xhc3MgaXMgcGFyc2VkLgorICAgICAgICAoQ29t cG9uZW50QmFzZS5wcm90b3R5cGUuX2Vuc3VyZVNoYWRvd1RyZWUpOgorCiAyMDE4LTA2LTI1ICBE ZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgogCiAgICAgICAgIE1lYXN1cmVtZW50U2V0 QW5hbHl6ZXIgc2hvdWxkIGNoZWNrIHRyaWdnZXJhYmxlIGF2YWlsYWJpbGl0eSBiZWZvcmUgY3Jl YXRpbmcgY29uZmlybWluZyBBL0IgdGVzdHMuCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvYnJvd3Nlci10ZXN0cy9jb21wb25lbnQtYmFzZS10ZXN0cy5qcyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9icm93c2VyLXRlc3RzL2NvbXBvbmVudC1iYXNlLXRlc3RzLmpzCmlu ZGV4IGFkZWY2OWY1OGY4YTM0MTFkMTUzMmQzOGZjMmY3OTYzZWEwZjIyMWIuLjQ0MThmODE5OTdh N2Q3MmZmZTY5MGQ1ZjQwY2UwYzc3ZWFmNGQ3NzggMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9icm93c2VyLXRlc3RzL2NvbXBvbmVudC1iYXNlLXRlc3RzLmpzCisrKyBiL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9icm93c2VyLXRlc3RzL2NvbXBvbmVudC1iYXNlLXRlc3Rz LmpzCkBAIC0xOTUsNiArMTk1LDI3IEBAIGRlc2NyaWJlKCdDb21wb25lbnRCYXNlJywgZnVuY3Rp b24oKSB7CiAgICAgICAgICAgICBleHBlY3QoY29udGFpbmVyLnRleHRDb250ZW50KS50by5iZSgn aGVsbG8sIHdvcmxkJyk7CiAgICAgICAgIH0pOwogCisgICAgICAgIGl0KCdpdCBtdXN0IGNyZWF0 ZSBjb250ZW50IHVzaW5nIGRlcml2ZWQgY2xhc3MgY29udGVudCB0ZW1wbGF0ZScsIGFzeW5jICgp ID0+IHsKKyAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBuZXcgQnJvd3NpbmdDb250ZXh0KCk7 CisgICAgICAgICAgICBjb25zdCBDb21wb25lbnRCYXNlID0gYXdhaXQgaW1wb3J0Q29tcG9uZW50 QmFzZShjb250ZXh0KTsKKworICAgICAgICAgICAgY2xhc3MgQmFzZUNsYXNzIGV4dGVuZHMgQ29t cG9uZW50QmFzZSB7IH07CisgICAgICAgICAgICBCYXNlQ2xhc3MuY29udGVudFRlbXBsYXRlID0g WydkaXYnLCB7aWQ6ICdjb250YWluZXInfSwgJ2Jhc2UtY2xhc3MnXTsKKyAgICAgICAgICAgIGNv bnN0IGJhc2VJbnN0YW5jZSA9IG5ldyBCYXNlQ2xhc3MoJ2Jhc2UtY2xhc3MnKTsKKworICAgICAg ICAgICAgY2xhc3MgRGVyaXZlZENsYXNzIGV4dGVuZHMgQmFzZUNsYXNzIHt9OworICAgICAgICAg ICAgRGVyaXZlZENsYXNzLmNvbnRlbnRUZW1wbGF0ZSA9IFsnZGl2Jywge2lkOiAnY29udGFpbmVy J30sICdkZXJpdmVkLWNsYXNzJ107CisgICAgICAgICAgICBjb25zdCBkZXJpdmVkSW5zdGFuY2Ug PSBuZXcgRGVyaXZlZENsYXNzKCdkZXJpdmVkLWNsYXNzJyk7CisKKyAgICAgICAgICAgIGNvbnN0 IGJhc2VDb250YWluZXIgPSBiYXNlSW5zdGFuY2UuY29udGVudCgnY29udGFpbmVyJyk7CisgICAg ICAgICAgICBleHBlY3QoYmFzZUNvbnRhaW5lcikudG8uYmUuYShjb250ZXh0Lmdsb2JhbC5IVE1M RGl2RWxlbWVudCk7CisgICAgICAgICAgICBleHBlY3QoYmFzZUNvbnRhaW5lci50ZXh0Q29udGVu dCkudG8uYmUoJ2Jhc2UtY2xhc3MnKTsKKworICAgICAgICAgICAgY29uc3QgZGVyaXZlZENvbnRh aW5lciA9IGRlcml2ZWRJbnN0YW5jZS5jb250ZW50KCdjb250YWluZXInKTsKKyAgICAgICAgICAg IGV4cGVjdChkZXJpdmVkQ29udGFpbmVyKS50by5iZS5hKGNvbnRleHQuZ2xvYmFsLkhUTUxEaXZF bGVtZW50KTsKKyAgICAgICAgICAgIGV4cGVjdChkZXJpdmVkQ29udGFpbmVyLnRleHRDb250ZW50 KS50by5iZSgnZGVyaXZlZC1jbGFzcycpOworICAgICAgICB9KTsKKwogICAgICAgICBpdCgnaXQg bXVzdCBjcmVhdGUgc3R5bHNoZWV0IGZyb20gc3R5bGVUZW1wbGF0ZScsIGFzeW5jICgpID0+IHsK ICAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBuZXcgQnJvd3NpbmdDb250ZXh0KCk7CiAgICAg ICAgICAgICBjb25zdCBDb21wb25lbnRCYXNlID0gYXdhaXQgaW1wb3J0Q29tcG9uZW50QmFzZShj b250ZXh0KTsKQEAgLTY5OSw0ICs3MjAsMjggQEAgZGVzY3JpYmUoJ0NvbXBvbmVudEJhc2UnLCBm dW5jdGlvbigpIHsKIAogICAgIH0pOwogCisgICAgZGVzY3JpYmUoJ19lbnN1cmVTaGFkb3dUcmVl JywgKCkgPT4geworICAgICAgICBpdCgnc2hvdWxkIHBhcnNlIGRlcml2ZWQgY29tcG9uZW50IGFm dGVyIHBhcnNpbmcgYmFzZSBjb21wb25lbnQnLCBhc3luYyAoKSA9PiB7CisgICAgICAgICAgICBj b25zdCBjb250ZXh0ID0gbmV3IEJyb3dzaW5nQ29udGV4dCgpOworICAgICAgICAgICAgY29uc3Qg Q29tcG9uZW50QmFzZSA9IGF3YWl0IGltcG9ydENvbXBvbmVudEJhc2UoY29udGV4dCk7CisgICAg ICAgICAgICBjbGFzcyBEZXJpdmVkQ29tcG9uZW50IGV4dGVuZHMgQ29tcG9uZW50QmFzZSB7fTsK KyAgICAgICAgICAgIGNvbnN0IGJhc2VJbnN0YW5jZSA9IG5ldyBDb21wb25lbnRCYXNlOworICAg ICAgICAgICAgZXhwZWN0KENvbXBvbmVudEJhc2UuaGFzT3duUHJvcGVydHkoJ19wYXJzZWQnKSku dG8uYmUoZmFsc2UpOworICAgICAgICAgICAgZXhwZWN0KERlcml2ZWRDb21wb25lbnQuaGFzT3du UHJvcGVydHkoJ19wYXJzZWQnKSkudG8uYmUoZmFsc2UpOworCisgICAgICAgICAgICBiYXNlSW5z dGFuY2UuX2Vuc3VyZVNoYWRvd1RyZWUoKTsKKyAgICAgICAgICAgIGV4cGVjdChDb21wb25lbnRC YXNlLmhhc093blByb3BlcnR5KCdfcGFyc2VkJykpLnRvLmJlKHRydWUpOworICAgICAgICAgICAg ZXhwZWN0KERlcml2ZWRDb21wb25lbnQuaGFzT3duUHJvcGVydHkoJ19wYXJzZWQnKSkudG8uYmUo ZmFsc2UpOworICAgICAgICAgICAgZXhwZWN0KCEhQ29tcG9uZW50QmFzZS5fcGFyc2VkKS50by5i ZSh0cnVlKTsKKyAgICAgICAgICAgIGV4cGVjdCghIURlcml2ZWRDb21wb25lbnQuX3BhcnNlZCku dG8uYmUodHJ1ZSk7CisKKyAgICAgICAgICAgIGNvbnN0IGRlcml2ZWRJbnN0YW5jZSA9IG5ldyBE ZXJpdmVkQ29tcG9uZW50OworICAgICAgICAgICAgZGVyaXZlZEluc3RhbmNlLl9lbnN1cmVTaGFk b3dUcmVlKCk7CisgICAgICAgICAgICBleHBlY3QoQ29tcG9uZW50QmFzZS5oYXNPd25Qcm9wZXJ0 eSgnX3BhcnNlZCcpKS50by5iZSh0cnVlKTsKKyAgICAgICAgICAgIGV4cGVjdChEZXJpdmVkQ29t cG9uZW50Lmhhc093blByb3BlcnR5KCdfcGFyc2VkJykpLnRvLmJlKHRydWUpOworICAgICAgICAg ICAgZXhwZWN0KCEhQ29tcG9uZW50QmFzZS5fcGFyc2VkKS50by5iZSh0cnVlKTsKKyAgICAgICAg ICAgIGV4cGVjdCghIURlcml2ZWRDb21wb25lbnQuX3BhcnNlZCkudG8uYmUodHJ1ZSk7CisgICAg ICAgIH0pOworICAgIH0pOworCiB9KTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9iYXNlLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy92My9jb21wb25lbnRzL2Jhc2UuanMKaW5kZXggNDJlZDhmZTRjMjY2ZmNiNGVj ZWMyMWFlMGQ5YWNiMDQxMWU1NjJlYy4uMzE3NTE3NzA1ZGI4ZDMyNDE5MWQxMjkxNWM3NmEwOThi ZTZhYWI5ZCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9j b21wb25lbnRzL2Jhc2UuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9jb21wb25lbnRzL2Jhc2UuanMKQEAgLTE1NCw5ICsxNTQsOCBAQCBjbGFzcyBDb21wb25lbnRC YXNlIGV4dGVuZHMgQ29tbW9uQ29tcG9uZW50QmFzZSB7CiAKICAgICAgICAgbGV0IGNvbnRlbnQ7 CiAgICAgICAgIGxldCBzdHlsZXNoZWV0OwotICAgICAgICBpZiAoIXRoaXNDbGFzcy5fcGFyc2Vk KSB7CisgICAgICAgIGlmICghdGhpc0NsYXNzLmhhc093blByb3BlcnR5KCdfcGFyc2VkJykgfHwg IXRoaXNDbGFzcy5fcGFyc2VkKSB7CiAgICAgICAgICAgICB0aGlzQ2xhc3MuX3BhcnNlZCA9IHRy dWU7Ci0KICAgICAgICAgICAgIGNvbnN0IGNvbnRlbnRUZW1wbGF0ZSA9IHRoaXNDbGFzc1snY29u dGVudFRlbXBsYXRlJ107CiAgICAgICAgICAgICBpZiAoY29udGVudFRlbXBsYXRlKQogICAgICAg ICAgICAgICAgIGNvbnRlbnQgPSBDb21wb25lbnRCYXNlLl9jb25zdHJ1Y3ROb2RlVHJlZUZyb21U ZW1wbGF0ZShjb250ZW50VGVtcGxhdGUpOwo=