169160 2017-03-03 17:13:31 -0800 Clean up some RenderLayerBacking code 2017-03-03 17:45:57 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1283329 0 simon.fraser 2017-03-03 17:13:31 -0800 Clean up some RenderLayerBacking code 1283330 1 303365 simon.fraser 2017-03-03 17:15:27 -0800 Created attachment 303365 Patch 1283336 2 simon.fraser 2017-03-03 17:45:57 -0800 https://trac.webkit.org/r213405 303365 2017-03-03 17:15:27 -0800 2017-03-03 17:24:23 -0800 Patch bug-169160-20170303171526.patch text/plain 6942 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTI3NjBjMGU3NTU3Nzgx ODIyZGM3YmJlOWU2NjZmNjEwZGRhYzQwMy4uNWRjZTUxMzQ0NTFiODNlNDg1NzNlOTY2N2M4Nzcw ZTU3ZGM3MDlmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE3LTAzLTAzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIENsZWFuIHVwIHNv bWUgUmVuZGVyTGF5ZXJCYWNraW5nIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2OTE2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1vZGVybiBsb29wcyBpbiBkZXNjZW5kYW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IoKS4KKworICAgICAgICBSZW5hbWUgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWlu dHNDaGlsZHJlbigpIHRvIFJlbmRlckxheWVyQmFja2luZzo6cGFpbnRzQ2hpbGRSZW5kZXJlcnMo KSB0byBjbGFyaWZ5IHRoYXQKKyAgICAgICAgaXQgcmVmZXJzIHRvIHJlbmRlcmVycywgbm90IFJl bmRlckxheWVycy4KKworICAgICAgICBSZW5hbWUgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludHNO b25EaXJlY3RDb21wb3NpdGVkQm94RGVjb3JhdGlvbigpIHRvIFJlbmRlckxheWVyQmFja2luZzo6 cGFpbnRzQm94RGVjb3JhdGlvbnMoKS4KKyAgICAgICAgIlBhaW50cyIgYWxyZWFkeSBpbXBsaWVz IG5vbi1jb21wb3NpdGVkLgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVEcmF3c0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludHNCb3hEZWNvcmF0aW9ucyk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50c0NoaWxkUmVuZGVyZXJzKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6aXNTaW1wbGVDb250YWluZXJDb21wb3Np dGluZ0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OmRlc2NlbmRhbnRMYXllclBhaW50c0ludG9B bmNlc3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50c05v bkRpcmVjdENvbXBvc2l0ZWRCb3hEZWNvcmF0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6cGFpbnRzQ2hpbGRyZW4pOiBEZWxldGVkLgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKworMjAxNy0wMy0wMyAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBDbGVhbiB1cCBSZW5k ZXJJbWFnZSBhbmQgYSBSZW5kZXJJbWFnZVJlc291cmNlIGZ1bmN0aW9uCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxNTMKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCA4MGVjYWUxMDgy OTg5Y2I4YzBhYjgyNTI5MzI3NTU1NmVkOGIxMzZjLi43YjYyMGU3NTk0YzdlNjlkODFjY2NjODlj MmVjNzE3ZDA4MjAwODNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmNwcApAQCAtMTI3MSw3ICsxMjcxLDcgQEAgdm9pZCBSZW5kZXJMYXllckJh Y2tpbmc6OnVwZGF0ZURyYXdzQ29udGVudChib29sIGlzU2ltcGxlQ29udGFpbmVyKQogICAgICAg ICBib29sIGhhc05vblNjcm9sbGluZ1BhaW50ZWRDb250ZW50ID0gbV9vd25pbmdMYXllci5oYXNW aXNpYmxlQ29udGVudCgpICYmIG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUJveERlY29yYXRpb25z T3JCYWNrZ3JvdW5kKCk7CiAgICAgICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0RHJhd3NDb250ZW50 KGhhc05vblNjcm9sbGluZ1BhaW50ZWRDb250ZW50KTsKIAotICAgICAgICBib29sIGhhc1Njcm9s bGluZ1BhaW50ZWRDb250ZW50ID0gbV9vd25pbmdMYXllci5oYXNWaXNpYmxlQ29udGVudCgpICYm IChyZW5kZXJlcigpLmhhc0JhY2tncm91bmQoKSB8fCBwYWludHNDaGlsZHJlbigpKTsKKyAgICAg ICAgYm9vbCBoYXNTY3JvbGxpbmdQYWludGVkQ29udGVudCA9IG1fb3duaW5nTGF5ZXIuaGFzVmlz aWJsZUNvbnRlbnQoKSAmJiAocmVuZGVyZXIoKS5oYXNCYWNrZ3JvdW5kKCkgfHwgcGFpbnRzQ2hp bGRSZW5kZXJlcnMoKSk7CiAgICAgICAgIG1fc2Nyb2xsaW5nQ29udGVudHNMYXllci0+c2V0RHJh d3NDb250ZW50KGhhc1Njcm9sbGluZ1BhaW50ZWRDb250ZW50KTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KQEAgLTE4NjAsNyArMTg2MCw3IEBAIHN0YXRpYyBib29sIHN1cHBvcnRzRGlyZWN0Qm94 RGVjb3JhdGlvbnNDb21wb3NpdGlvbihjb25zdCBSZW5kZXJMYXllck1vZGVsT2JqZWN0CiAgICAg cmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludHNOb25EaXJl Y3RDb21wb3NpdGVkQm94RGVjb3JhdGlvbigpIGNvbnN0Citib29sIFJlbmRlckxheWVyQmFja2lu Zzo6cGFpbnRzQm94RGVjb3JhdGlvbnMoKSBjb25zdAogewogICAgIGlmICghbV9vd25pbmdMYXll ci5oYXNWaXNpYmxlQm94RGVjb3JhdGlvbnMoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAt MTg2OCw3ICsxODY4LDcgQEAgYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50c05vbkRpcmVj dENvbXBvc2l0ZWRCb3hEZWNvcmF0aW9uKCkgY29uc3QKICAgICByZXR1cm4gIXN1cHBvcnRzRGly ZWN0Qm94RGVjb3JhdGlvbnNDb21wb3NpdGlvbihyZW5kZXJlcigpKTsKIH0KIAotYm9vbCBSZW5k ZXJMYXllckJhY2tpbmc6OnBhaW50c0NoaWxkcmVuKCkgY29uc3QKK2Jvb2wgUmVuZGVyTGF5ZXJC YWNraW5nOjpwYWludHNDaGlsZFJlbmRlcmVycygpIGNvbnN0CiB7CiAgICAgaWYgKG1fb3duaW5n TGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSAmJiBtX293bmluZ0xheWVyLmhhc05vbkVtcHR5Q2hp bGRSZW5kZXJlcnMoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0xOTA3LDcgKzE5MDcsNyBA QCBib29sIFJlbmRlckxheWVyQmFja2luZzo6aXNTaW1wbGVDb250YWluZXJDb21wb3NpdGluZ0xh eWVyKCkgY29uc3QKICAgICBpZiAocmVuZGVyZXIoKS5pc1RleHRDb250cm9sKCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIGlmIChwYWludHNOb25EaXJlY3RDb21wb3NpdGVkQm94RGVj b3JhdGlvbigpIHx8IHBhaW50c0NoaWxkcmVuKCkpCisgICAgaWYgKHBhaW50c0JveERlY29yYXRp b25zKCkgfHwgcGFpbnRzQ2hpbGRSZW5kZXJlcnMoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgaWYgKHJlbmRlcmVyKCkuc3R5bGUoKS5iYWNrZ3JvdW5kQ2xpcCgpID09IFRleHRGaWxs Qm94KQpAQCAtMTk1NCwxMiArMTk1NCw5IEBAIHN0YXRpYyBib29sIGRlc2NlbmRhbnRMYXllclBh aW50c0ludG9BbmNlc3RvcihSZW5kZXJMYXllciYgcGFyZW50KQogICAgIExheWVyTGlzdE11dGF0 aW9uRGV0ZWN0b3IgbXV0YXRpb25DaGVja2VyKCZwYXJlbnQpOwogI2VuZGlmCiAKLSAgICBpZiAo VmVjdG9yPFJlbmRlckxheWVyKj4qIG5vcm1hbEZsb3dMaXN0ID0gcGFyZW50Lm5vcm1hbEZsb3dM aXN0KCkpIHsKLSAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gbm9ybWFsRmxvd0xpc3QtPnNpemUo KTsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7Ci0gICAg ICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBub3JtYWxGbG93TGlzdC0+YXQoaSk7Ci0g ICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjdXJMYXllcikK LSAgICAgICAgICAgICAgICAmJiAoY3VyTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgpIHx8IGRl c2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKKyAgICBpZiAoYXV0 byogbm9ybWFsRmxvd0xpc3QgPSBwYXJlbnQubm9ybWFsRmxvd0xpc3QoKSkgeworICAgICAgICBm b3IgKGF1dG8qIGNoaWxkTGF5ZXIgOiAqbm9ybWFsRmxvd0xpc3QpIHsKKyAgICAgICAgICAgIGlm ICghY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmNoaWxkTGF5ZXIpICYmIChjaGlsZExh eWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5j ZXN0b3IoKmNoaWxkTGF5ZXIpKSkKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAg ICAgfQogICAgIH0KQEAgLTE5NjksMjIgKzE5NjYsMTYgQEAgc3RhdGljIGJvb2wgZGVzY2VuZGFu dExheWVyUGFpbnRzSW50b0FuY2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgLy8gVXNlIHRoZSBtX2hhc0NvbXBvc2l0aW5nRGVz Y2VuZGFudCBiaXQgdG8gb3B0aW1pemU/Ci0gICAgICAgIGlmIChWZWN0b3I8UmVuZGVyTGF5ZXIq PiogbmVnWk9yZGVyTGlzdCA9IHBhcmVudC5uZWdaT3JkZXJMaXN0KCkpIHsKLSAgICAgICAgICAg IHNpemVfdCBsaXN0U2l6ZSA9IG5lZ1pPcmRlckxpc3QtPnNpemUoKTsKLSAgICAgICAgICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsraSkgewotICAgICAgICAgICAgICAgIFJl bmRlckxheWVyKiBjdXJMYXllciA9IG5lZ1pPcmRlckxpc3QtPmF0KGkpOwotICAgICAgICAgICAg ICAgIGlmICghY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmN1ckxheWVyKQotICAgICAg ICAgICAgICAgICAgICAmJiAoY3VyTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgpIHx8IGRlc2Nl bmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKKyAgICAgICAgaWYgKGF1 dG8qIG5lZ1pPcmRlckxpc3QgPSBwYXJlbnQubmVnWk9yZGVyTGlzdCgpKSB7CisgICAgICAgICAg ICBmb3IgKGF1dG8qIGNoaWxkTGF5ZXIgOiAqbmVnWk9yZGVyTGlzdCkgeworICAgICAgICAgICAg ICAgIGlmICghY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmNoaWxkTGF5ZXIpICYmIChj aGlsZExheWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IoKmNoaWxkTGF5ZXIpKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoVmVjdG9yPFJlbmRl ckxheWVyKj4qIHBvc1pPcmRlckxpc3QgPSBwYXJlbnQucG9zWk9yZGVyTGlzdCgpKSB7Ci0gICAg ICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBwb3NaT3JkZXJMaXN0LT5zaXplKCk7Ci0gICAgICAg ICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3RTaXplOyArK2kpIHsKLSAgICAgICAgICAg ICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBwb3NaT3JkZXJMaXN0LT5hdChpKTsKLSAgICAg ICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjdXJMYXllcikK LSAgICAgICAgICAgICAgICAgICAgJiYgKGN1ckxheWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8 fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoKmN1ckxheWVyKSkpCisgICAgICAg IGlmIChhdXRvKiBwb3NaT3JkZXJMaXN0ID0gcGFyZW50LnBvc1pPcmRlckxpc3QoKSkgeworICAg ICAgICAgICAgZm9yIChhdXRvKiBjaGlsZExheWVyIDogKnBvc1pPcmRlckxpc3QpIHsKKyAgICAg ICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjaGlsZExheWVy KSAmJiAoY2hpbGRMYXllci0+aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVzY2VuZGFudExheWVy UGFpbnRzSW50b0FuY2VzdG9yKCpjaGlsZExheWVyKSkpCiAgICAgICAgICAgICAgICAgICAgIHJl dHVybiB0cnVlOwogICAgICAgICAgICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKaW5kZXggODk3MjQ1MWJkYjYxMTVmM2Q4MGU2 YTE1M2JhY2M3NmZiYzIwNzU2Ni4uMDc1ZWMxMTExNWU1MzIxMTQwYjRiMThhMTY4OGNkYTcyMzU0 Y2ZjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu aApAQCAtMzA5LDggKzMwOSw4IEBAIHByaXZhdGU6CiAgICAgCiAgICAgYm9vbCBpc01haW5GcmFt ZVJlbmRlclZpZXdMYXllcigpIGNvbnN0OwogICAgIAotICAgIGJvb2wgcGFpbnRzTm9uRGlyZWN0 Q29tcG9zaXRlZEJveERlY29yYXRpb24oKSBjb25zdDsKLSAgICBib29sIHBhaW50c0NoaWxkcmVu KCkgY29uc3Q7CisgICAgYm9vbCBwYWludHNCb3hEZWNvcmF0aW9ucygpIGNvbnN0OworICAgIGJv b2wgcGFpbnRzQ2hpbGRSZW5kZXJlcnMoKSBjb25zdDsKIAogICAgIC8vIFJldHVybnMgdHJ1ZSBp ZiB0aGlzIGNvbXBvc2l0aW5nIGxheWVyIGhhcyBubyB2aXNpYmxlIGNvbnRlbnQuCiAgICAgYm9v bCBpc1NpbXBsZUNvbnRhaW5lckNvbXBvc2l0aW5nTGF5ZXIoKSBjb25zdDsK