78520 2012-02-13 13:00:02 -0800 Cleanup PageCache::canCachePageContainingThisFrame readability 2012-02-13 13:09:07 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson oldest_to_newest 555486 0 beidson 2012-02-13 13:00:02 -0800 Cleanup PageCache::canCachePageContainingThisFrame It's a giant if statement that keeps accessing the same member variables through getters. Over and over. And over. Just store them locally to make it more readable. 555487 1 126810 beidson 2012-02-13 13:02:52 -0800 Created attachment 126810 Patch v1 555491 2 beidson 2012-02-13 13:09:07 -0800 http://trac.webkit.org/changeset/107596 126810 2012-02-13 13:02:52 -0800 2012-02-13 13:04:01 -0800 Patch v1 patch.txt text/plain 3726 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MmFhOTk4Li40MjcxMzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTItMDItMTMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODUyMAorICAgICAg ICBDbGVhbnVwIFBhZ2VDYWNoZTo6Y2FuQ2FjaGVQYWdlQ29udGFpbmluZ1RoaXNGcmFtZSByZWFk YWJpbGl0eQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gKENvZGUgY2xlYW51cCwgbm8gY2hhbmdlIGluIGJlaGF2aW9yKQorCisg ICAgICAgICogaGlzdG9yeS9QYWdlQ2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUNh Y2hlOjpjYW5DYWNoZVBhZ2VDb250YWluaW5nVGhpc0ZyYW1lKTogU3RvcmUgdGhyZWUgY29tbW9u bHkKKyAgICAgICAgICBnZXR0ZXItYWNjZXNzZWQgdmFyaWFibGVzIGluIGxvY2FsIHZhcmlhYmxl cyBmb3IgcmVhZGFiaWxpdHkuCisKIDIwMTItMDItMTAgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZp a0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBTY3JpcHRzTmF2 aWdhdG9yIGRlZmF1bHQgZmlsZSBzZWxlY3Rvci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2hpc3RvcnkvUGFnZUNhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hl LmNwcAppbmRleCBlOTY0Yzg4Li44NmQ2MmZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L1BhZ2VDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2Fj aGUuY3BwCkBAIC0yNTEsMjkgKzI1MSwzMyBAQCBib29sIFBhZ2VDYWNoZTo6Y2FuQ2FjaGVQYWdl Q29udGFpbmluZ1RoaXNGcmFtZShGcmFtZSogZnJhbWUpCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQogICAgIAotICAgIHJldHVybiBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9h ZGVyKCkKLSAgICAgICAgJiYgZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5tYWlu RG9jdW1lbnRFcnJvcigpLmlzTnVsbCgpCisgICAgRnJhbWVMb2FkZXIqIGZyYW1lTG9hZGVyID0g ZnJhbWUtPmxvYWRlcigpOworICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IGZy YW1lTG9hZGVyLT5kb2N1bWVudExvYWRlcigpOworICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZy YW1lLT5kb2N1bWVudCgpOworICAgIAorICAgIHJldHVybiBkb2N1bWVudExvYWRlcgorICAgICAg ICAmJiBkb2N1bWVudExvYWRlci0+bWFpbkRvY3VtZW50RXJyb3IoKS5pc051bGwoKQogICAgICAg ICAvLyBEbyBub3QgY2FjaGUgZXJyb3IgcGFnZXMgKHRoZXNlIGNhbiBiZSByZWNvZ25pemVkIGFz IHBhZ2VzIHdpdGggc3Vic3RpdHV0ZSBkYXRhIG9yIHVucmVhY2hhYmxlIFVSTHMpLgotICAgICAg ICAmJiAhKGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+c3Vic3RpdHV0ZURhdGEo KS5pc1ZhbGlkKCkgJiYgIWZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+c3Vic3Rp dHV0ZURhdGEoKS5mYWlsaW5nVVJMKCkuaXNFbXB0eSgpKQotICAgICAgICAmJiAoIWZyYW1lLT5s b2FkZXIoKS0+c3ViZnJhbWVMb2FkZXIoKS0+Y29udGFpbnNQbHVnaW5zKCkgfHwgZnJhbWUtPnBh Z2UoKS0+c2V0dGluZ3MoKS0+cGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zKCkpCi0gICAgICAgICYm ICFmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkucHJvdG9jb2xJcygiaHR0cHMiKQorICAgICAgICAm JiAhKGRvY3VtZW50TG9hZGVyLT5zdWJzdGl0dXRlRGF0YSgpLmlzVmFsaWQoKSAmJiAhZG9jdW1l bnRMb2FkZXItPnN1YnN0aXR1dGVEYXRhKCkuZmFpbGluZ1VSTCgpLmlzRW1wdHkoKSkKKyAgICAg ICAgJiYgKCFmcmFtZUxvYWRlci0+c3ViZnJhbWVMb2FkZXIoKS0+Y29udGFpbnNQbHVnaW5zKCkg fHwgZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+cGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zKCkp CisgICAgICAgICYmICFkb2N1bWVudC0+dXJsKCkucHJvdG9jb2xJcygiaHR0cHMiKQogICAgICAg ICAmJiAoIWZyYW1lLT5kb21XaW5kb3coKSB8fCAhZnJhbWUtPmRvbVdpbmRvdygpLT5oYXNFdmVu dExpc3RlbmVycyhldmVudE5hbWVzKCkudW5sb2FkRXZlbnQpKQogI2lmIEVOQUJMRShTUUxfREFU QUJBU0UpCi0gICAgICAgICYmICFmcmFtZS0+ZG9jdW1lbnQoKS0+aGFzT3BlbkRhdGFiYXNlcygp CisgICAgICAgICYmICFkb2N1bWVudC0+aGFzT3BlbkRhdGFiYXNlcygpCiAjZW5kaWYKICNpZiBF TkFCTEUoU0hBUkVEX1dPUktFUlMpCi0gICAgICAgICYmICFTaGFyZWRXb3JrZXJSZXBvc2l0b3J5 OjpoYXNTaGFyZWRXb3JrZXJzKGZyYW1lLT5kb2N1bWVudCgpKQorICAgICAgICAmJiAhU2hhcmVk V29ya2VyUmVwb3NpdG9yeTo6aGFzU2hhcmVkV29ya2Vycyhkb2N1bWVudCkKICNlbmRpZgotICAg ICAgICAmJiAhZnJhbWUtPmRvY3VtZW50KCktPnVzaW5nR2VvbG9jYXRpb24oKQotICAgICAgICAm JiBmcmFtZS0+bG9hZGVyKCktPmhpc3RvcnkoKS0+Y3VycmVudEl0ZW0oKQotICAgICAgICAmJiAh ZnJhbWUtPmxvYWRlcigpLT5xdWlja1JlZGlyZWN0Q29taW5nKCkKLSAgICAgICAgJiYgIWZyYW1l LT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+aXNMb2FkaW5nSW5BUElTZW5zZSgpCi0gICAg ICAgICYmICFmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPmlzU3RvcHBpbmcoKQot ICAgICAgICAmJiBmcmFtZS0+ZG9jdW1lbnQoKS0+Y2FuU3VzcGVuZEFjdGl2ZURPTU9iamVjdHMo KQorICAgICAgICAmJiAhZG9jdW1lbnQtPnVzaW5nR2VvbG9jYXRpb24oKQorICAgICAgICAmJiBm cmFtZUxvYWRlci0+aGlzdG9yeSgpLT5jdXJyZW50SXRlbSgpCisgICAgICAgICYmICFmcmFtZUxv YWRlci0+cXVpY2tSZWRpcmVjdENvbWluZygpCisgICAgICAgICYmICFkb2N1bWVudExvYWRlci0+ aXNMb2FkaW5nSW5BUElTZW5zZSgpCisgICAgICAgICYmICFkb2N1bWVudExvYWRlci0+aXNTdG9w cGluZygpCisgICAgICAgICYmIGRvY3VtZW50LT5jYW5TdXNwZW5kQWN0aXZlRE9NT2JqZWN0cygp CiAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgaW52ZXN0aWdhdGluZyBjYWNoaW5nIGZyYW1l cyB0aGF0IGhhdmUgYW4gYXNzb2NpYXRlZAogICAgICAgICAvLyBhcHBsaWNhdGlvbiBjYWNoZS4g PHJkYXI6Ly9wcm9ibGVtLzU5MTc4OTk+IHRyYWNrcyB0aGF0IHdvcmsuCi0gICAgICAgICYmIGZy YW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+YXBwbGljYXRpb25DYWNoZUhvc3QoKS0+ Y2FuQ2FjaGVJblBhZ2VDYWNoZSgpCi0gICAgICAgICYmIGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50 KCktPmNhbkNhY2hlUGFnZSgpOworICAgICAgICAmJiBkb2N1bWVudExvYWRlci0+YXBwbGljYXRp b25DYWNoZUhvc3QoKS0+Y2FuQ2FjaGVJblBhZ2VDYWNoZSgpCisgICAgICAgICYmIGZyYW1lTG9h ZGVyLT5jbGllbnQoKS0+Y2FuQ2FjaGVQYWdlKCk7CiB9CiAgICAgCiBib29sIFBhZ2VDYWNoZTo6 Y2FuQ2FjaGUoUGFnZSogcGFnZSkK