119603 2013-08-08 15:57:14 -0700 Fix ASSERT(m_contentsSolidColor.isValid()) assertion on iOS at nytimes.com 2013-08-08 19:39:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue psolanki simon.fraser oldest_to_newest 915632 0 simon.fraser 2013-08-08 15:57:14 -0700 Fix ASSERT(m_contentsSolidColor.isValid()) assertion on iOS at nytimes.com 915633 1 208378 simon.fraser 2013-08-08 16:00:20 -0700 Created attachment 208378 Patch 915679 2 208378 commit-queue 2013-08-08 19:39:01 -0700 Comment on attachment 208378 Patch Clearing flags on attachment: 208378 Committed r153875: <http://trac.webkit.org/changeset/153875> 915680 3 commit-queue 2013-08-08 19:39:03 -0700 All reviewed patches have been landed. Closing bug. 208378 2013-08-08 16:00:20 -0700 2013-08-08 19:39:01 -0700 Patch bug-119603-20130808160022.patch text/plain 4108 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM0NDZkNjUxZWU2M2Y5 ZDllMGI0ZTJiYWU5YjVmNmYyYjdhNDQwOC4uYzAyNWI5MTFhNTVlNDI0OTJjMWZmOTQzMjRhNWQ5 MjhmMGMwMTk5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA4LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBBU1NFUlQo bV9jb250ZW50c1NvbGlkQ29sb3IuaXNWYWxpZCgpKSBhc3NlcnRpb24gb24gaU9TIGF0IG55dGlt ZXMuY29tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTk2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBP biBpT1MgaXQncyBwb3NzaWJsZSBmb3IgYSBHcmFwaGljc0xheWVyIHRvIHRyYW5zaXRpb24gYmV0 d2VlbiBoYXZpbmcKKyAgICAgICAgYSBzb2xpZCBiYWNrZ3JvdW5kIGNvbG9yLCBhbmQgY29udGFp bmluZyBtZWRpYS4gVGhpcyBoYXBwZW5zIG9uIG55dGltZXMuY29tCisgICAgICAgIHdoZW4gcGxh eWluZyB2aWRlby4KKyAgICAgICAgCisgICAgICAgIEluIHRoaXMgY2FzZSwgR3JhcGhpY3NMYXll ckNBOjp1cGRhdGVDb250ZW50c0NvbG9yTGF5ZXIoKSB3b3VsZCBhc3NlcnQKKyAgICAgICAgYmVj YXVzZSBtX2NvbnRlbnRzTGF5ZXIgaGFkIGJlZW4gYWxyZWFkeSBzZXQgdXAgdG8gY29udGFpbiBt ZWRpYSwgYnV0CisgICAgICAgIGl0IHdvdWxkIGJlIHRyeWluZyB0byB1cGRhdGUgdGhlIGNvbG9y LgorICAgICAgICAKKyAgICAgICAgRml4IGJ5IGJhaWxpbmcgZnJvbSBhbGwgdGhlIHVwZGF0ZUNv bnRlbnRzKiBmdW5jdGlvbnMgaWYgdGhlcmUgaXMgbm8KKyAgICAgICAgY29udGVudHMgbGF5ZXIs IG9yIHRoYXQgbGF5ZXIgZXhpc3RzIGZvciBhIGRpZmZlcmVudCBwdXJwb3NlLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVudHNNZWRpYUxheWVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVudHNDYW52YXNMYXllcik6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUNvbnRlbnRzQ29sb3JM YXllcik6CisKIDIwMTMtMDgtMDYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+ CiAKICAgICAgICAgSW1wcm9wZXIgQ2FsY3VsYXRpb24gb2YgSW4tYmFuZCBDdWUgQ29sb3JzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xh eWVyQ0EuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NM YXllckNBLmNwcAppbmRleCBhYjRjYTM0Yzk3ZjNhMmMzMzZkODNiODhiMWViY2NkMzBmNzQwZjVj Li5mNzdhNmE3N2YzNjMxZDE1OWYyZGVhMDZmZTQyZDkxMzQwN2YzNzMzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5j cHAKQEAgLTE3MjcsMzcgKzE3MjcsNDAgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUNv bnRlbnRzSW1hZ2UoKQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVudHNNZWRp YUxheWVyKCkKIHsKKyAgICBpZiAoIW1fY29udGVudHNMYXllciB8fCBtX2NvbnRlbnRzTGF5ZXJQ dXJwb3NlICE9IENvbnRlbnRzTGF5ZXJGb3JNZWRpYSkKKyAgICAgICAgcmV0dXJuOworCiAgICAg Ly8gVmlkZW8gbGF5ZXIgd2FzIHNldCBhcyBtX2NvbnRlbnRzTGF5ZXIsIGFuZCB3aWxsIGdldCBw YXJlbnRlZCBpbiB1cGRhdGVTdWJsYXllckxpc3QoKS4KLSAgICBpZiAobV9jb250ZW50c0xheWVy KSB7Ci0gICAgICAgIHNldHVwQ29udGVudHNMYXllcihtX2NvbnRlbnRzTGF5ZXIuZ2V0KCkpOwot ICAgICAgICB1cGRhdGVDb250ZW50c1JlY3QoKTsKLSAgICB9CisgICAgc2V0dXBDb250ZW50c0xh eWVyKG1fY29udGVudHNMYXllci5nZXQoKSk7CisgICAgdXBkYXRlQ29udGVudHNSZWN0KCk7CiB9 CiAKIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRhdGVDb250ZW50c0NhbnZhc0xheWVyKCkKIHsK KyAgICBpZiAoIW1fY29udGVudHNMYXllciB8fCBtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlICE9IENv bnRlbnRzTGF5ZXJGb3JDYW52YXMpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIENhbnZhc0xh eWVyIHdhcyBzZXQgYXMgbV9jb250ZW50c0xheWVyLCBhbmQgd2lsbCBnZXQgcGFyZW50ZWQgaW4g dXBkYXRlU3VibGF5ZXJMaXN0KCkuCi0gICAgaWYgKG1fY29udGVudHNMYXllcikgewotICAgICAg ICBzZXR1cENvbnRlbnRzTGF5ZXIobV9jb250ZW50c0xheWVyLmdldCgpKTsKLSAgICAgICAgbV9j b250ZW50c0xheWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKLSAgICAgICAgdXBkYXRlQ29udGVudHNS ZWN0KCk7Ci0gICAgfQorICAgIHNldHVwQ29udGVudHNMYXllcihtX2NvbnRlbnRzTGF5ZXIuZ2V0 KCkpOworICAgIG1fY29udGVudHNMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CisgICAgdXBkYXRl Q29udGVudHNSZWN0KCk7CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRhdGVDb250ZW50 c0NvbG9yTGF5ZXIoKQogewogICAgIC8vIENvbG9yIGxheWVyIHdhcyBzZXQgYXMgbV9jb250ZW50 c0xheWVyLCBhbmQgd2lsbCBnZXQgcGFyZW50ZWQgaW4gdXBkYXRlU3VibGF5ZXJMaXN0KCkuCi0g ICAgaWYgKG1fY29udGVudHNMYXllcikgewotICAgICAgICBzZXR1cENvbnRlbnRzTGF5ZXIobV9j b250ZW50c0xheWVyLmdldCgpKTsKLSAgICAgICAgdXBkYXRlQ29udGVudHNSZWN0KCk7Ci0gICAg ICAgIEFTU0VSVChtX2NvbnRlbnRzU29saWRDb2xvci5pc1ZhbGlkKCkpOyAvLyBBbiBpbnZhbGlk IGNvbG9yIHNob3VsZCBoYXZlIHJlbW92ZWQgdGhlIGNvbnRlbnRzIGxheWVyLgotICAgICAgICBt X2NvbnRlbnRzTGF5ZXItPnNldEJhY2tncm91bmRDb2xvcihtX2NvbnRlbnRzU29saWRDb2xvcik7 CisgICAgaWYgKCFtX2NvbnRlbnRzTGF5ZXIgfHwgbV9jb250ZW50c0xheWVyUHVycG9zZSAhPSBD b250ZW50c0xheWVyRm9yQmFja2dyb3VuZENvbG9yKQorICAgICAgICByZXR1cm47CiAKLSAgICAg ICAgaWYgKG1fY29udGVudHNMYXllckNsb25lcykgewotICAgICAgICAgICAgTGF5ZXJNYXA6OmNv bnN0X2l0ZXJhdG9yIGVuZCA9IG1fY29udGVudHNMYXllckNsb25lcy0+ZW5kKCk7Ci0gICAgICAg ICAgICBmb3IgKExheWVyTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fY29udGVudHNMYXllckNs b25lcy0+YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICAgICAgICAgIGl0LT52YWx1 ZS0+c2V0QmFja2dyb3VuZENvbG9yKG1fY29udGVudHNTb2xpZENvbG9yKTsKLSAgICAgICAgfQor ICAgIHNldHVwQ29udGVudHNMYXllcihtX2NvbnRlbnRzTGF5ZXIuZ2V0KCkpOworICAgIHVwZGF0 ZUNvbnRlbnRzUmVjdCgpOworICAgIEFTU0VSVChtX2NvbnRlbnRzU29saWRDb2xvci5pc1ZhbGlk KCkpOworICAgIG1fY29udGVudHNMYXllci0+c2V0QmFja2dyb3VuZENvbG9yKG1fY29udGVudHNT b2xpZENvbG9yKTsKKworICAgIGlmIChtX2NvbnRlbnRzTGF5ZXJDbG9uZXMpIHsKKyAgICAgICAg TGF5ZXJNYXA6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fY29udGVudHNMYXllckNsb25lcy0+ZW5k KCk7CisgICAgICAgIGZvciAoTGF5ZXJNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9jb250ZW50 c0xheWVyQ2xvbmVzLT5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCisgICAgICAgICAgICBpdC0+ dmFsdWUtPnNldEJhY2tncm91bmRDb2xvcihtX2NvbnRlbnRzU29saWRDb2xvcik7CiAgICAgfQog fQogCg==