82928 2012-04-02 12:46:12 -0700 Optimizing tracking of intruding floats being removed from RenderBlock during layout 2012-04-13 17:38:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kenrb kenrb hyatt webkit.review.bot oldest_to_newest 593703 0 kenrb 2012-04-02 12:46:12 -0700 This is a follow-up for bug 74056, for some performance improvements in special cases. dhyatt's comment on https://bugs.webkit.org/show_bug.cgi?id=74056 -- > Not going to minus for this but thought of a couple of optimizations if you don't mind following up: > > (1) If the oldIntrudingFloat set ever empties out, you can bail out of that last loop early. > > In other words: > > for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end && !oldIntrudingFloatSet.isEmpty(); ++it) > oldIntrudingFloatSet.remove((*it)->m_renderer); > > That way once the set gets emptied out, you don't waste time iterating over floats that you know won't be found in the set. > > (2) If you cached an intruding object count and kept it up to date, you could really optimize the avoidsFloats case, since all it did was checked for if you had any intruding floats at all. Then you could make that case O(1) instead of O(n). > > I won't minus, but I'd appreciate a follow-up bug and fixes for this. 601396 1 136945 kenrb 2012-04-12 11:45:24 -0700 Created attachment 136945 Patch 602190 2 136945 hyatt 2012-04-13 10:44:49 -0700 Comment on attachment 136945 Patch r=me 602553 3 136945 webkit.review.bot 2012-04-13 17:38:42 -0700 Comment on attachment 136945 Patch Clearing flags on attachment: 136945 Committed r114190: <http://trac.webkit.org/changeset/114190> 602554 4 webkit.review.bot 2012-04-13 17:38:49 -0700 All reviewed patches have been landed. Closing bug. 136945 2012-04-12 11:45:24 -0700 2012-04-13 17:38:42 -0700 Patch bug-82928-20120412144445.patch text/plain 2356 kenrb U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTkxMjcxYTg0ZDJmNzky MWRmYjk2MTcxNjBkMTc5NTA5M2UwZTdjMS4uNWEwZWQ2NWRhYzYyMTU1Nzk2NzcwM2JjMGMzN2Uy YWFhNjI4NDdhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTEyICBLZW4g QnVjaGFuYW4gIDxrZW5yYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgT3B0aW1pemUgdHJhY2tp bmcgb2YgaW50cnVkaW5nIGZsb2F0cyBiZWluZyByZW1vdmVkIGZyb20gUmVuZGVyQmxvY2sgZHVy aW5nIGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODI5MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBQZXJmb3JtYW5jZSB0d2Vha3MgaW4gUmVuZGVyQmxvY2sgbGF5b3V0IGFzIGEgZm9sbG93IHVw IHRvIHIxMTI5MzUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNsZWFyRmxvYXRzKToKKwogMjAxMi0wNC0wNSAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjExMzI0MS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwCmluZGV4IGExZWFhOTUxMjY4YjY0NzU3YmJkNzhlMWE3MGUwNDUwN2E2Y2Zj YTkuLmE4NWFjMjZiYjIxOWVmODMwNjJiYTg5ODk5NDMzMmIxNGVjYzNhNTAgMTAwNzU1Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtNDI5NCwxMiArNDI5NCwxNiBAQCB2 b2lkIFJlbmRlckJsb2NrOjpjbGVhckZsb2F0cyhCbG9ja0xheW91dFBhc3MgbGF5b3V0UGFzcykK ICAgICB9IGVsc2UgaWYgKCFvbGRJbnRydWRpbmdGbG9hdFNldC5pc0VtcHR5KCkpIHsKICAgICAg ICAgLy8gSWYgdGhlcmUgYXJlIHByZXZpb3VzbHkgaW50cnVkaW5nIGZsb2F0cyB0aGF0IG5vIGxv bmdlciBpbnRydWRlLCB0aGVuIGNoaWxkcmVuIHdpdGggZmxvYXRzCiAgICAgICAgIC8vIHNob3Vs ZCBhbHNvIGdldCBsYXlvdXQgYmVjYXVzZSB0aGV5IG1pZ2h0IG5lZWQgdGhlaXIgZmxvYXRpbmcg b2JqZWN0IGxpc3RzIGNsZWFyZWQuCi0gICAgICAgIGNvbnN0IEZsb2F0aW5nT2JqZWN0U2V0JiBm bG9hdGluZ09iamVjdFNldCA9IG1fZmxvYXRpbmdPYmplY3RzLT5zZXQoKTsKLSAgICAgICAgRmxv YXRpbmdPYmplY3RTZXRJdGVyYXRvciBlbmQgPSBmbG9hdGluZ09iamVjdFNldC5lbmQoKTsKLSAg ICAgICAgZm9yIChGbG9hdGluZ09iamVjdFNldEl0ZXJhdG9yIGl0ID0gZmxvYXRpbmdPYmplY3RT ZXQuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICAgICAgb2xkSW50cnVkaW5nRmxv YXRTZXQucmVtb3ZlKCgqaXQpLT5tX3JlbmRlcmVyKTsKLSAgICAgICAgaWYgKCFvbGRJbnRydWRp bmdGbG9hdFNldC5pc0VtcHR5KCkpCisgICAgICAgIGlmIChtX2Zsb2F0aW5nT2JqZWN0cy0+c2V0 KCkuc2l6ZSgpIDwgb2xkSW50cnVkaW5nRmxvYXRTZXQuc2l6ZSgpKQogICAgICAgICAgICAgbWFy a0FsbERlc2NlbmRhbnRzV2l0aEZsb2F0c0ZvckxheW91dCgpOworICAgICAgICBlbHNlIHsKKyAg ICAgICAgICAgIGNvbnN0IEZsb2F0aW5nT2JqZWN0U2V0JiBmbG9hdGluZ09iamVjdFNldCA9IG1f ZmxvYXRpbmdPYmplY3RzLT5zZXQoKTsKKyAgICAgICAgICAgIEZsb2F0aW5nT2JqZWN0U2V0SXRl cmF0b3IgZW5kID0gZmxvYXRpbmdPYmplY3RTZXQuZW5kKCk7CisgICAgICAgICAgICBmb3IgKEZs b2F0aW5nT2JqZWN0U2V0SXRlcmF0b3IgaXQgPSBmbG9hdGluZ09iamVjdFNldC5iZWdpbigpOyBp dCAhPSBlbmQgJiYgIW9sZEludHJ1ZGluZ0Zsb2F0U2V0LmlzRW1wdHkoKTsgKytpdCkKKyAgICAg ICAgICAgICAgICBvbGRJbnRydWRpbmdGbG9hdFNldC5yZW1vdmUoKCppdCktPm1fcmVuZGVyZXIp OworICAgICAgICAgICAgaWYgKCFvbGRJbnRydWRpbmdGbG9hdFNldC5pc0VtcHR5KCkpCisgICAg ICAgICAgICAgICAgbWFya0FsbERlc2NlbmRhbnRzV2l0aEZsb2F0c0ZvckxheW91dCgpOworICAg ICAgICB9CiAgICAgfQogfQogCg==