101847 2012-11-10 12:34:43 -0800 Some minor optimizations in RenderLayer 2012-11-10 22:45:56 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin eric mitz simon.fraser webkit.review.bot oldest_to_newest 763701 0 simon.fraser 2012-11-10 12:34:43 -0800 RenderLayer code calls isRenderInline() in a few places, which is virtual. It's better to check the isInline() bit first. 763717 1 173470 simon.fraser 2012-11-10 13:52:17 -0800 Created attachment 173470 Patch 763788 2 simon.fraser 2012-11-10 22:45:56 -0800 http://trac.webkit.org/changeset/134162 173470 2012-11-10 13:52:17 -0800 2012-11-10 13:54:24 -0800 Patch bug-101847-20121110135022.patch text/plain 3791 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3YTlmZTAxMDEyNzBj NWY3Mjc5MDZhYTMyN2I5ZWM0YTU4NTE2Mi4uODJjMmViN2RhYzhkYzNkZTEwZWJjZDZmZTg0ZWRj MzkwNjJhM2JhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTExLTEwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgbWlub3Ig b3B0aW1pemF0aW9ucyBpbiBSZW5kZXJMYXllcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxODQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU29tZSBtaW5vciBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudHMg aW4gUmVuZGVyTGF5ZXIgY29kZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbik6 IGlzUmVuZGVySW5saW5lKCkgaXMgYSB2aXJ0dWFsIGNhbGwsCisgICAgICAgIHNvIHByZWZpeCBp dCB3aXRoIGFuIGlzSW5saW5lKCkgY2hlY2sgd2hpY2ggdGVzdHMgYSBiaXQgb24gUmVuZGVyT2Jq ZWN0LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmxvY2FsQm91bmRpbmdCb3gpOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvdW5k cyk6IFB1bGwgbGF5ZXItPnJlbmRlcmVyKCkKKyAgICAgICAgaW50byBhIGxvY2FsIHZhcmlhYmxl LgorCiAyMDEyLTExLTEwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAK ICAgICAgICAgRG9jdW1lbnQ6Om1fZnVsbFNjcmVlbkVsZW1lbnRTdGFjayBzaG91bGQgYmUgYSBW ZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGZjZDUy ZmQxNTYwMDAyOTQyOWZmMjdlMGYzYjgzYjJkOWI3ZjYyY2EuLjJhNzFiYmVhZmQwZWVmMjMwYjU1 MjExOTZkYjYzZWMxMDg4NTc1YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcApAQCAtODQ4LDcgKzg0OCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVy UG9zaXRpb24oKQogewogICAgIExheW91dFBvaW50IGxvY2FsUG9pbnQ7CiAgICAgTGF5b3V0U2l6 ZSBpbmxpbmVCb3VuZGluZ0JveE9mZnNldDsgLy8gV2UgZG9uJ3QgcHV0IHRoaXMgaW50byB0aGUg UmVuZGVyTGF5ZXIgeC95IGZvciBpbmxpbmVzLCBzbyB3ZSBuZWVkIHRvIHN1YnRyYWN0IGl0IG91 dCB3aGVuIGRvbmUuCi0gICAgaWYgKHJlbmRlcmVyKCktPmlzUmVuZGVySW5saW5lKCkpIHsKKyAg ICBpZiAocmVuZGVyZXIoKS0+aXNJbmxpbmUoKSAmJiByZW5kZXJlcigpLT5pc1JlbmRlcklubGlu ZSgpKSB7CiAgICAgICAgIFJlbmRlcklubGluZSogaW5saW5lRmxvdyA9IHRvUmVuZGVySW5saW5l KHJlbmRlcmVyKCkpOwogICAgICAgICBJbnRSZWN0IGxpbmVCb3ggPSBpbmxpbmVGbG93LT5saW5l c0JvdW5kaW5nQm94KCk7CiAgICAgICAgIHNldFNpemUobGluZUJveC5zaXplKCkpOwpAQCAtNDMx OSw3ICs0MzE5LDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJMYXllcjo6bG9jYWxCb3VuZGluZ0JveCgp IGNvbnN0CiAgICAgLy8gYXMgcGFydCBvZiBvdXIgYm91bmRpbmcgYm94LiAgV2UgZG8gdGhpcyBi ZWNhdXNlIHdlIGFyZSB0aGUgcmVzcG9uc2libGUgbGF5ZXIgZm9yIGJvdGggaGl0IHRlc3Rpbmcg YW5kIHBhaW50aW5nIHRob3NlCiAgICAgLy8gZmxvYXRzLgogICAgIExheW91dFJlY3QgcmVzdWx0 OwotICAgIGlmIChyZW5kZXJlcigpLT5pc1JlbmRlcklubGluZSgpKQorICAgIGlmIChyZW5kZXJl cigpLT5pc0lubGluZSgpICYmIHJlbmRlcmVyKCktPmlzUmVuZGVySW5saW5lKCkpCiAgICAgICAg IHJlc3VsdCA9IHRvUmVuZGVySW5saW5lKHJlbmRlcmVyKCkpLT5saW5lc1Zpc3VhbE92ZXJmbG93 Qm91bmRpbmdCb3goKTsKICAgICBlbHNlIGlmIChyZW5kZXJlcigpLT5pc1RhYmxlUm93KCkpIHsK ICAgICAgICAgLy8gT3VyIGJvdW5kaW5nIGJveCBpcyBqdXN0IHRoZSB1bmlvbiBvZiBhbGwgb2Yg b3VyIGNlbGxzJyBib3JkZXIvb3ZlcmZsb3cgcmVjdHMuCkBAIC00MzgyLDE3ICs0MzgyLDE4IEBA IEludFJlY3QgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUxheWVyQm91bmRzKGNvbnN0IFJlbmRlckxh eWVyKiBsYXllciwgY29uc3QgUmVuZGVyCiAgICAgaWYgKChmbGFncyAmIEV4Y2x1ZGVIaWRkZW5E ZXNjZW5kYW50cykgJiYgbGF5ZXIgIT0gYW5jZXN0b3JMYXllciAmJiAhbGF5ZXItPmhhc1Zpc2li bGVDb250ZW50KCkgJiYgIWxheWVyLT5oYXNWaXNpYmxlRGVzY2VuZGFudCgpKQogICAgICAgICBy ZXR1cm4gSW50UmVjdCgpOwogCisgICAgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogcmVuZGVyZXIg PSBsYXllci0+cmVuZGVyZXIoKTsKICAgICBMYXlvdXRSZWN0IGJvdW5kaW5nQm94UmVjdCA9IGxh eWVyLT5sb2NhbEJvdW5kaW5nQm94KCk7Ci0gICAgaWYgKGxheWVyLT5yZW5kZXJlcigpLT5pc0Jv eCgpKQotICAgICAgICBsYXllci0+cmVuZGVyQm94KCktPmZsaXBGb3JXcml0aW5nTW9kZShib3Vu ZGluZ0JveFJlY3QpOworICAgIGlmIChyZW5kZXJlci0+aXNCb3goKSkKKyAgICAgICAgdG9SZW5k ZXJCb3gocmVuZGVyZXIpLT5mbGlwRm9yV3JpdGluZ01vZGUoYm91bmRpbmdCb3hSZWN0KTsKICAg ICBlbHNlCi0gICAgICAgIGxheWVyLT5yZW5kZXJlcigpLT5jb250YWluaW5nQmxvY2soKS0+Zmxp cEZvcldyaXRpbmdNb2RlKGJvdW5kaW5nQm94UmVjdCk7CisgICAgICAgIHJlbmRlcmVyLT5jb250 YWluaW5nQmxvY2soKS0+ZmxpcEZvcldyaXRpbmdNb2RlKGJvdW5kaW5nQm94UmVjdCk7CiAKLSAg ICBpZiAobGF5ZXItPnJlbmRlcmVyKCktPmlzUm9vdCgpKSB7CisgICAgaWYgKHJlbmRlcmVyLT5p c1Jvb3QoKSkgewogICAgICAgICAvLyBJZiB0aGUgcm9vdCBsYXllciBiZWNvbWVzIGNvbXBvc2l0 ZWQgKGUuZy4gYmVjYXVzZSBzb21lIGRlc2NlbmRhbnQgd2l0aCBuZWdhdGl2ZSB6LWluZGV4IGlz IGNvbXBvc2l0ZWQpLAogICAgICAgICAvLyB0aGVuIGl0IGhhcyB0byBiZSBiaWcgZW5vdWdoIHRv IGNvdmVyIHRoZSB2aWV3cG9ydCBpbiBvcmRlciB0byBkaXNwbGF5IHRoZSBiYWNrZ3JvdW5kLiBU aGlzIGlzIGFraW4KICAgICAgICAgLy8gdG8gdGhlIGNvZGUgaW4gUmVuZGVyQm94OjpwYWludFJv b3RCb3hGaWxsTGF5ZXJzKCkuCi0gICAgICAgIGlmIChGcmFtZVZpZXcqIGZyYW1lVmlldyA9IGxh eWVyLT5yZW5kZXJlcigpLT52aWV3KCktPmZyYW1lVmlldygpKSB7CisgICAgICAgIGlmIChGcmFt ZVZpZXcqIGZyYW1lVmlldyA9IHJlbmRlcmVyLT52aWV3KCktPmZyYW1lVmlldygpKSB7CiAgICAg ICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRzV2lkdGggPSBmcmFtZVZpZXctPmNvbnRlbnRzV2lk dGgoKTsKICAgICAgICAgICAgIExheW91dFVuaXQgY29udGVudHNIZWlnaHQgPSBmcmFtZVZpZXct PmNvbnRlbnRzSGVpZ2h0KCk7CiAgICAgICAgIAo=