130173 2014-03-12 19:45:24 -0700 [Texmap] Remove duplicated code in TextureMapperLayer 2014-03-14 17:36:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jaepark jaepark cmarcelo commit-queue kondapallykalyan luiz mrobinson noam svillar webkit-ews oldest_to_newest 989903 0 jaepark 2014-03-12 19:45:24 -0700 Patch to follow. 989905 1 226568 jaepark 2014-03-12 19:47:04 -0700 Created attachment 226568 Patch 989906 2 226568 mrobinson 2014-03-12 19:51:09 -0700 Comment on attachment 226568 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226568&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:496 > - if (m_parent) { > - unsigned i; > - for (i = 0; i < m_parent->m_children.size(); i++) { > - if (this == m_parent->m_children[i]) { > - m_parent->m_children.remove(i); > - break; > - } > - } > + if (m_parent) > + m_parent->m_children.remove(m_parent->m_children.find(this)); The removed code is slightly different in that it gracefully handles the situation where m_parent->m_children doesn't contain "this." Do you know if that's important? 989909 3 jaepark 2014-03-12 20:07:30 -0700 (In reply to comment #2) > (From update of attachment 226568 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226568&action=review > > > Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp:496 > > - if (m_parent) { > > - unsigned i; > > - for (i = 0; i < m_parent->m_children.size(); i++) { > > - if (this == m_parent->m_children[i]) { > > - m_parent->m_children.remove(i); > > - break; > > - } > > - } > > + if (m_parent) > > + m_parent->m_children.remove(m_parent->m_children.find(this)); > > The removed code is slightly different in that it gracefully handles the situation where m_parent->m_children doesn't contain "this." Do you know if that's important? I can't think of a case where m_parent exists but m_parent->children doesn't contain "this". Do you happen to know how that might happen? 989911 4 mrobinson 2014-03-12 20:17:53 -0700 (In reply to comment #3) > I can't think of a case where m_parent exists but m_parent->children doesn't contain "this". Do you happen to know how that might happen? I'm not sure. 989968 5 svillar 2014-03-13 02:12:03 -0700 (In reply to comment #4) > (In reply to comment #3) > > > I can't think of a case where m_parent exists but m_parent->children doesn't contain "this". Do you happen to know how that might happen? > > I'm not sure. Then we could try with an ASSERT() and check if it's hit. 990219 6 226634 jaepark 2014-03-13 18:02:27 -0700 Created attachment 226634 Patch 990756 7 226634 commit-queue 2014-03-14 17:36:17 -0700 Comment on attachment 226634 Patch Clearing flags on attachment: 226634 Committed r165665: <http://trac.webkit.org/changeset/165665> 990757 8 commit-queue 2014-03-14 17:36:21 -0700 All reviewed patches have been landed. Closing bug. 226568 2014-03-12 19:47:04 -0700 2014-03-13 18:02:18 -0700 Patch bug-130173-20140313114656.patch text/plain 2318 jaepark U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjAwNTA5N2Q1ZWY3MDk0 NjNhOGIwNDk4MjZhNGVjN2UxYTE5NTM3NS4uMTY5ZTFkMjExZWU4ZDNiNjc2M2RjMDc0MmE3MTIy OGJkMjBjZGQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAzLTEyICBKYWUg SHl1biBQYXJrICA8amFlcGFya0B3ZWJraXQub3JnPgorCisgICAgICAgIFtUZXhtYXBdIFJlbW92 ZSBkdXBsaWNhdGVkIGNvZGUgaW4gVGV4dHVyZU1hcHBlckxheWVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAxNzMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGEgc2ltcGxlIHJl ZmFjdG9yaW5nIHRvIHJlbW92ZSBkdXBsaWNhdGVkIGNvZGUgaW4KKyAgICAgICAgVGV4dHVyZU1h cHBlckxheWVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6On5U ZXh0dXJlTWFwcGVyTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVy OjpyZW1vdmVGcm9tUGFyZW50KToKKwogMjAxNC0wMy0xMiAgQnJpYW4gQnVyZyAgPGJidXJnQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgUmVwbGF5OiBhZGQgaW5mcmFzdHJ1Y3R1cmUgZm9yIG1l bW9pemluZyBub25kZXRlcm1pbmlzdGljIERPTSBBUElzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIu Y3BwCmluZGV4IDI5NTMyYmIwOWNhM2YyOWJjNjQ0NWJlNDZiMTI3ZGY0ZmJiMGI5ZDQuLjI0ZmM0 OTk2NGExMWVkMTUwYjhhOTU5N2VjYjAxYzM1MTM4NWJjZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy TGF5ZXIuY3BwCkBAIC00NjIsMTAgKzQ2Miw5IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpw YWludFJlY3Vyc2l2ZShjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zCiBU ZXh0dXJlTWFwcGVyTGF5ZXI6On5UZXh0dXJlTWFwcGVyTGF5ZXIoKQogewogICAgIGZvciAoaW50 IGkgPSBtX2NoaWxkcmVuLnNpemUoKSAtIDE7IGkgPj0gMDsgLS1pKQotICAgICAgICBtX2NoaWxk cmVuW2ldLT5tX3BhcmVudCA9IDA7CisgICAgICAgIG1fY2hpbGRyZW5baV0tPm1fcGFyZW50ID0g bnVsbHB0cjsKIAotICAgIGlmIChtX3BhcmVudCkKLSAgICAgICAgbV9wYXJlbnQtPm1fY2hpbGRy ZW4ucmVtb3ZlKG1fcGFyZW50LT5tX2NoaWxkcmVuLmZpbmQodGhpcykpOworICAgIHJlbW92ZUZy b21QYXJlbnQoKTsKIH0KIAogVGV4dHVyZU1hcHBlciogVGV4dHVyZU1hcHBlckxheWVyOjp0ZXh0 dXJlTWFwcGVyKCkgY29uc3QKQEAgLTQ5MywxNyArNDkyLDEwIEBAIHZvaWQgVGV4dHVyZU1hcHBl ckxheWVyOjphZGRDaGlsZChUZXh0dXJlTWFwcGVyTGF5ZXIqIGNoaWxkTGF5ZXIpCiAKIHZvaWQg VGV4dHVyZU1hcHBlckxheWVyOjpyZW1vdmVGcm9tUGFyZW50KCkKIHsKLSAgICBpZiAobV9wYXJl bnQpIHsKLSAgICAgICAgdW5zaWduZWQgaTsKLSAgICAgICAgZm9yIChpID0gMDsgaSA8IG1fcGFy ZW50LT5tX2NoaWxkcmVuLnNpemUoKTsgaSsrKSB7Ci0gICAgICAgICAgICBpZiAodGhpcyA9PSBt X3BhcmVudC0+bV9jaGlsZHJlbltpXSkgewotICAgICAgICAgICAgICAgIG1fcGFyZW50LT5tX2No aWxkcmVuLnJlbW92ZShpKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0K LSAgICAgICAgfQorICAgIGlmIChtX3BhcmVudCkKKyAgICAgICAgbV9wYXJlbnQtPm1fY2hpbGRy ZW4ucmVtb3ZlKG1fcGFyZW50LT5tX2NoaWxkcmVuLmZpbmQodGhpcykpOwogCi0gICAgICAgIG1f cGFyZW50ID0gMDsKLSAgICB9CisgICAgbV9wYXJlbnQgPSBudWxscHRyOwogfQogCiB2b2lkIFRl eHR1cmVNYXBwZXJMYXllcjo6cmVtb3ZlQWxsQ2hpbGRyZW4oKQo= 226634 2014-03-13 18:02:27 -0700 2014-03-14 17:36:17 -0700 Patch bug-130173-20140314100223.patch text/plain 2363 jaepark U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg4NGU2NjAyNTM3YTI0 ZjQxN2ZjNjczZjY5NTE5YjkzMjUxOGY0Yy4uNTU0YzRhNjU4OWU3Yzc0MDU4ZDQ1NWNmMWNjZTEx ZTE3MzU1YmE4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAzLTEyICBKYWUg SHl1biBQYXJrICA8amFlcGFya0B3ZWJraXQub3JnPgorCisgICAgICAgIFtUZXhtYXBdIFJlbW92 ZSBkdXBsaWNhdGVkIGNvZGUgaW4gVGV4dHVyZU1hcHBlckxheWVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAxNzMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGEgc2ltcGxlIHJl ZmFjdG9yaW5nIHRvIHJlbW92ZSBkdXBsaWNhdGVkIGNvZGUgaW4KKyAgICAgICAgVGV4dHVyZU1h cHBlckxheWVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6On5U ZXh0dXJlTWFwcGVyTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVy OjpyZW1vdmVGcm9tUGFyZW50KToKKwogMjAxNC0wMy0xMyAgQmVuamFtaW4gUG91bGFpbiAgPGJw b3VsYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYSBidW5jaCBvZiBtaXN0YWtlcyBpbiB0 aGUgcGFyc2luZyBvZiA6OmN1ZSggYW5kIDo6Y3VlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3Bw CmluZGV4IDI5NTMyYmIwOWNhM2YyOWJjNjQ0NWJlNDZiMTI3ZGY0ZmJiMGI5ZDQuLmFkM2U1OWVi ODc3NDZiNTdlM2IxMzFmNDk1Y2VkNmNiZDI4MThlNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5 ZXIuY3BwCkBAIC00NjIsMTAgKzQ2Miw5IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpwYWlu dFJlY3Vyc2l2ZShjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zCiBUZXh0 dXJlTWFwcGVyTGF5ZXI6On5UZXh0dXJlTWFwcGVyTGF5ZXIoKQogewogICAgIGZvciAoaW50IGkg PSBtX2NoaWxkcmVuLnNpemUoKSAtIDE7IGkgPj0gMDsgLS1pKQotICAgICAgICBtX2NoaWxkcmVu W2ldLT5tX3BhcmVudCA9IDA7CisgICAgICAgIG1fY2hpbGRyZW5baV0tPm1fcGFyZW50ID0gbnVs bHB0cjsKIAotICAgIGlmIChtX3BhcmVudCkKLSAgICAgICAgbV9wYXJlbnQtPm1fY2hpbGRyZW4u cmVtb3ZlKG1fcGFyZW50LT5tX2NoaWxkcmVuLmZpbmQodGhpcykpOworICAgIHJlbW92ZUZyb21Q YXJlbnQoKTsKIH0KIAogVGV4dHVyZU1hcHBlciogVGV4dHVyZU1hcHBlckxheWVyOjp0ZXh0dXJl TWFwcGVyKCkgY29uc3QKQEAgLTQ5NCwxNiArNDkzLDEyIEBAIHZvaWQgVGV4dHVyZU1hcHBlckxh eWVyOjphZGRDaGlsZChUZXh0dXJlTWFwcGVyTGF5ZXIqIGNoaWxkTGF5ZXIpCiB2b2lkIFRleHR1 cmVNYXBwZXJMYXllcjo6cmVtb3ZlRnJvbVBhcmVudCgpCiB7CiAgICAgaWYgKG1fcGFyZW50KSB7 Ci0gICAgICAgIHVuc2lnbmVkIGk7Ci0gICAgICAgIGZvciAoaSA9IDA7IGkgPCBtX3BhcmVudC0+ bV9jaGlsZHJlbi5zaXplKCk7IGkrKykgewotICAgICAgICAgICAgaWYgKHRoaXMgPT0gbV9wYXJl bnQtPm1fY2hpbGRyZW5baV0pIHsKLSAgICAgICAgICAgICAgICBtX3BhcmVudC0+bV9jaGlsZHJl bi5yZW1vdmUoaSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLQotICAgICAgICBtX3BhcmVudCA9IDA7CisgICAgICAgIHNpemVfdCBpbmRleCA9IG1f cGFyZW50LT5tX2NoaWxkcmVuLmZpbmQodGhpcyk7CisgICAgICAgIEFTU0VSVChpbmRleCAhPSBu b3RGb3VuZCk7CisgICAgICAgIG1fcGFyZW50LT5tX2NoaWxkcmVuLnJlbW92ZShpbmRleCk7CiAg ICAgfQorCisgICAgbV9wYXJlbnQgPSBudWxscHRyOwogfQogCiB2b2lkIFRleHR1cmVNYXBwZXJM YXllcjo6cmVtb3ZlQWxsQ2hpbGRyZW4oKQo=