102618 2012-11-18 13:07:44 -0800 Make convertToLayerCoords iterative, rather than recursive 2012-11-23 09:10:08 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bdakin eric koivisto simon.fraser webkit.review.bot oldest_to_newest 770177 0 simon.fraser 2012-11-18 13:07:44 -0800 Make convertToLayerCoords iterative, rather than recursive 770178 1 174855 simon.fraser 2012-11-18 13:09:26 -0800 Created attachment 174855 Patch 770179 2 simon.fraser 2012-11-18 13:10:34 -0800 This reduced the time in this function from 5% to about 1% when scrolling a large facebook page. 770180 3 174855 koivisto 2012-11-18 13:11:26 -0800 Comment on attachment 174855 Patch r=me 770182 4 simon.fraser 2012-11-18 13:37:04 -0800 <rdar://problem/12726154> 774605 5 simon.fraser 2012-11-23 09:10:08 -0800 http://trac.webkit.org/changeset/135080 174855 2012-11-18 13:09:26 -0800 2012-11-18 13:11:26 -0800 Patch bug-102618-20121118130718.patch text/plain 7682 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFjYmFkODE0YmFmZTEz MWZhZGM5NDg3ZjllZWQzOWUwZGYxYjVmNC4uODgzYzM1ODE1Zjg5ZmVhYjQzMDU2MDg3ZWUwNjlk MmZkY2M1MDk2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTExLTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgY29udmVy dFRvTGF5ZXJDb29yZHMgaXRlcmF0aXZlLCByYXRoZXIgdGhhbiByZWN1cnNpdmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjYxOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmRlckxheWVyOjpjb252 ZXJ0VG9MYXllckNvb3JkcygpIGlzIGEgaG90IGZ1bmN0aW9uIG9uIHByb2ZpbGVzLgorICAgICAg ICBDaGFuZ2UgaXQgdG8gYmUgaXRlcmF0aXZlLCByYXRoZXIgdGhhbiByZWN1cnNpdmUsIHNvIHRo YXQgdGhlCisgICAgICAgIGJ1bGsgb2YgdGhlIGZ1bmN0aW9uIGNhbiBiZSBpbmxpbmVkLgorICAg ICAgICAKKyAgICAgICAgV2FzIHRlc3RlZCB3aXRoIGFzc2VydGlvbnMgYWdhaW5zdCB0aGUgb2xk IGNvZGUgZHVyaW5nIGRldmVsb3BtZW50LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFjY3VtdWxhdGVPZmZzZXRUb3dhcmRzQW5jZXN0 b3IpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNvbnZlcnRUb0xheWVyQ29vcmRz KToKKwogMjAxMi0xMS0xNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBEb24ndCBzYXkgdGhlcmUgYXJlIGRpcnR5IG92ZXJsYXkgc2Nyb2xsYmFycyB3 aGVuIHRoZXkgYXJlIGNsaXBwZWQgb3V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAppbmRleCA1ZjI5YzM4ZmVlZDAyMmQ4OTM1NDllMmM1N2MyYTk1OGE0ZWJlZDVjLi5i YzQ5ZmU4MjMxZTU1NjUyZmZjMGMzNTUwMzMxZDc1NzlmZDlkMDMzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTE0NzksMzYgKzE0NzksMzcgQEAgdm9pZCBS ZW5kZXJMYXllcjo6Y29udmVydFRvUGl4ZWxTbmFwcGVkTGF5ZXJDb29yZHMoY29uc3QgUmVuZGVy TGF5ZXIqIGFuY2VzdG9yTGEKICAgICByb3VuZGVkUmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3Qo cmVjdCk7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OmNvbnZlcnRUb0xheWVyQ29vcmRzKGNvbnN0 IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyLCBMYXlvdXRQb2ludCYgbG9jYXRpb24pIGNvbnN0 CisvLyBSZXR1cm5zIHRoZSBsYXllciByZWFjaGVkIG9uIHRoZSB3YWxrIHVwIHRvd2FyZHMgdGhl IGFuY2VzdG9yLgorc3RhdGljIGlubGluZSBjb25zdCBSZW5kZXJMYXllciogYWNjdW11bGF0ZU9m ZnNldFRvd2FyZHNBbmNlc3Rvcihjb25zdCBSZW5kZXJMYXllciogbGF5ZXIsIGNvbnN0IFJlbmRl ckxheWVyKiBhbmNlc3RvckxheWVyLCBMYXlvdXRQb2ludCYgbG9jYXRpb24pCiB7Ci0gICAgaWYg KGFuY2VzdG9yTGF5ZXIgPT0gdGhpcykKLSAgICAgICAgcmV0dXJuOworICAgIEFTU0VSVChhbmNl c3RvckxheWVyICE9IGxheWVyKTsKIAotICAgIEVQb3NpdGlvbiBwb3NpdGlvbiA9IHJlbmRlcmVy KCktPnN0eWxlKCktPnBvc2l0aW9uKCk7CisgICAgY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVj dCogcmVuZGVyZXIgPSBsYXllci0+cmVuZGVyZXIoKTsKKyAgICBFUG9zaXRpb24gcG9zaXRpb24g PSByZW5kZXJlci0+c3R5bGUoKS0+cG9zaXRpb24oKTsKIAogICAgIC8vIEZJWE1FOiBQb3NpdGlv bmluZyBvZiBvdXQtb2YtZmxvdyhmaXhlZCwgYWJzb2x1dGUpIGVsZW1lbnRzIGNvbGxlY3RlZCBp biBhIFJlbmRlckZsb3dUaHJlYWQKICAgICAvLyBtYXkgbmVlZCB0byBiZSByZXZpc2l0ZWQgaW4g YSBmdXR1cmUgcGF0Y2guCiAgICAgLy8gSWYgdGhlIGZpeGVkIHJlbmRlcmVyIGlzIGluc2lkZSBh IFJlbmRlckZsb3dUaHJlYWQsIHdlIHNob3VsZCBub3QgY29tcHV0ZSBsb2NhdGlvbiB1c2luZyBs b2NhbFRvQWJzb2x1dGUsCiAgICAgLy8gc2luY2UgbG9jYWxUb0Fic29sdXRlIG1hcHMgdGhlIGNv b3JkaW5hdGVzIGZyb20gbmFtZWQgZmxvdyB0byByZWdpb25zIGNvb3JkaW5hdGVzIGFuZCByZWdp b25zIGNhbiBiZQogICAgIC8vIHBvc2l0aW9uZWQgaW4gYSBjb21wbGV0ZWx5IGRpZmZlcmVudCBw bGFjZSBpbiB0aGUgdmlld3BvcnQgKFJlbmRlclZpZXcpLgotICAgIGlmIChwb3NpdGlvbiA9PSBG aXhlZFBvc2l0aW9uICYmICFyZW5kZXJlcigpLT5pblJlbmRlckZsb3dUaHJlYWQoKSAmJiAoIWFu Y2VzdG9yTGF5ZXIgfHwgYW5jZXN0b3JMYXllciA9PSByZW5kZXJlcigpLT52aWV3KCktPmxheWVy KCkpKSB7CisgICAgaWYgKHBvc2l0aW9uID09IEZpeGVkUG9zaXRpb24gJiYgIXJlbmRlcmVyLT5p blJlbmRlckZsb3dUaHJlYWQoKSAmJiAoIWFuY2VzdG9yTGF5ZXIgfHwgYW5jZXN0b3JMYXllciA9 PSByZW5kZXJlci0+dmlldygpLT5sYXllcigpKSkgewogICAgICAgICAvLyBJZiB0aGUgZml4ZWQg bGF5ZXIncyBjb250YWluZXIgaXMgdGhlIHJvb3QsIGp1c3QgYWRkIGluIHRoZSBvZmZzZXQgb2Yg dGhlIHZpZXcuIFdlIGNhbiBvYnRhaW4gdGhpcyBieSBjYWxsaW5nCiAgICAgICAgIC8vIGxvY2Fs VG9BYnNvbHV0ZSgpIG9uIHRoZSBSZW5kZXJWaWV3LgotICAgICAgICBGbG9hdFBvaW50IGFic1Bv cyA9IHJlbmRlcmVyKCktPmxvY2FsVG9BYnNvbHV0ZShGbG9hdFBvaW50KCksIElzRml4ZWQpOwor ICAgICAgICBGbG9hdFBvaW50IGFic1BvcyA9IHJlbmRlcmVyLT5sb2NhbFRvQWJzb2x1dGUoRmxv YXRQb2ludCgpLCBJc0ZpeGVkKTsKICAgICAgICAgbG9jYXRpb24gKz0gTGF5b3V0U2l6ZShhYnNQ b3MueCgpLCBhYnNQb3MueSgpKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gYW5j ZXN0b3JMYXllcjsKICAgICB9CiAKICAgICAvLyBGb3IgdGhlIGZpeGVkIHBvc2l0aW9uZWQgZWxl bWVudHMgaW5zaWRlIGEgcmVuZGVyIGZsb3cgdGhyZWFkLCB3ZSBzaG91bGQgYWxzbyBza2lwIHRo ZSBjb2RlIHBhdGggYmVsb3cKICAgICAvLyBPdGhlcndpc2UsIGZvciB0aGUgY2FzZSBvZiBhbmNl c3RvckxheWVyID09IHJvb3RMYXllciBhbmQgZml4ZWQgcG9zaXRpb25lZCBlbGVtZW50IGNoaWxk IG9mIGEgdHJhbnNmb3JtZWQKICAgICAvLyBlbGVtZW50IGluIHJlbmRlciBmbG93IHRocmVhZCwg d2Ugd2lsbCBoaXQgdGhlIGZpeGVkIHBvc2l0aW9uZWQgY29udGFpbmVyIGJlZm9yZSBoaXR0aW5n IHRoZSBhbmNlc3RvciBsYXllci4KLSAgICBpZiAocG9zaXRpb24gPT0gRml4ZWRQb3NpdGlvbiAm JiAhcmVuZGVyZXIoKS0+aW5SZW5kZXJGbG93VGhyZWFkKCkpIHsKKyAgICBpZiAocG9zaXRpb24g PT0gRml4ZWRQb3NpdGlvbiAmJiAhcmVuZGVyZXItPmluUmVuZGVyRmxvd1RocmVhZCgpKSB7CiAg ICAgICAgIC8vIEZvciBhIGZpeGVkIGxheWVycywgd2UgbmVlZCB0byB3YWxrIHVwIHRvIHRoZSBy b290IHRvIHNlZSBpZiB0aGVyZSdzIGEgZml4ZWQgcG9zaXRpb24gY29udGFpbmVyCiAgICAgICAg IC8vIChlLmcuIGEgdHJhbnNmb3JtZWQgbGF5ZXIpLiBJdCdzIGFuIGVycm9yIHRvIGNhbGwgY29u dmVydFRvTGF5ZXJDb29yZHMoKSBhY3Jvc3MgYSBsYXllciB3aXRoIGEgdHJhbnNmb3JtLAogICAg ICAgICAvLyBzbyB3ZSBzaG91bGQgYWx3YXlzIGZpbmQgdGhlIGFuY2VzdG9yIGF0IG9yIGJlZm9y ZSB3ZSBmaW5kIHRoZSBmaXhlZCBwb3NpdGlvbiBjb250YWluZXIuCiAgICAgICAgIFJlbmRlckxh eWVyKiBmaXhlZFBvc2l0aW9uQ29udGFpbmVyTGF5ZXIgPSAwOwogICAgICAgICBib29sIGZvdW5k QW5jZXN0b3IgPSBmYWxzZTsKLSAgICAgICAgZm9yIChSZW5kZXJMYXllciogY3VyckxheWVyID0g cGFyZW50KCk7IGN1cnJMYXllcjsgY3VyckxheWVyID0gY3VyckxheWVyLT5wYXJlbnQoKSkgewor ICAgICAgICBmb3IgKFJlbmRlckxheWVyKiBjdXJyTGF5ZXIgPSBsYXllci0+cGFyZW50KCk7IGN1 cnJMYXllcjsgY3VyckxheWVyID0gY3VyckxheWVyLT5wYXJlbnQoKSkgewogICAgICAgICAgICAg aWYgKGN1cnJMYXllciA9PSBhbmNlc3RvckxheWVyKQogICAgICAgICAgICAgICAgIGZvdW5kQW5j ZXN0b3IgPSB0cnVlOwogCkBAIC0xNTIzLDIwICsxNTI0LDIwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OmNvbnZlcnRUb0xheWVyQ29vcmRzKGNvbnN0IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyLCBM YXlvdXRQCiAKICAgICAgICAgaWYgKGZpeGVkUG9zaXRpb25Db250YWluZXJMYXllciAhPSBhbmNl c3RvckxheWVyKSB7CiAgICAgICAgICAgICBMYXlvdXRQb2ludCBmaXhlZENvbnRhaW5lckNvb3Jk czsKLSAgICAgICAgICAgIGNvbnZlcnRUb0xheWVyQ29vcmRzKGZpeGVkUG9zaXRpb25Db250YWlu ZXJMYXllciwgZml4ZWRDb250YWluZXJDb29yZHMpOworICAgICAgICAgICAgbGF5ZXItPmNvbnZl cnRUb0xheWVyQ29vcmRzKGZpeGVkUG9zaXRpb25Db250YWluZXJMYXllciwgZml4ZWRDb250YWlu ZXJDb29yZHMpOwogCiAgICAgICAgICAgICBMYXlvdXRQb2ludCBhbmNlc3RvckNvb3JkczsKICAg ICAgICAgICAgIGFuY2VzdG9yTGF5ZXItPmNvbnZlcnRUb0xheWVyQ29vcmRzKGZpeGVkUG9zaXRp b25Db250YWluZXJMYXllciwgYW5jZXN0b3JDb29yZHMpOwogCiAgICAgICAgICAgICBsb2NhdGlv biArPSAoZml4ZWRDb250YWluZXJDb29yZHMgLSBhbmNlc3RvckNvb3Jkcyk7Ci0gICAgICAgICAg ICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gYW5jZXN0b3JMYXllcjsKICAgICAgICAgfQog ICAgIH0KICAgICAKICAgICBSZW5kZXJMYXllciogcGFyZW50TGF5ZXI7CiAgICAgaWYgKHBvc2l0 aW9uID09IEFic29sdXRlUG9zaXRpb24gfHwgcG9zaXRpb24gPT0gRml4ZWRQb3NpdGlvbikgewog ICAgICAgICAvLyBEbyB3aGF0IGVuY2xvc2luZ1Bvc2l0aW9uZWRBbmNlc3RvcigpIGRvZXMsIGJ1 dCBjaGVjayBmb3IgYW5jZXN0b3JMYXllciBhbG9uZyB0aGUgd2F5LgotICAgICAgICBwYXJlbnRM YXllciA9IHBhcmVudCgpOworICAgICAgICBwYXJlbnRMYXllciA9IGxheWVyLT5wYXJlbnQoKTsK ICAgICAgICAgYm9vbCBmb3VuZEFuY2VzdG9yRmlyc3QgPSBmYWxzZTsKICAgICAgICAgd2hpbGUg KHBhcmVudExheWVyKSB7CiAgICAgICAgICAgICAvLyBSZW5kZXJGbG93VGhyZWFkIGlzIGEgcG9z aXRpb25lZCBjb250YWluZXIsIGNoaWxkIG9mIFJlbmRlclZpZXcsIHBvc2l0aW9uZWQgYXQgKDAs MCkuCkBAIC0xNTU1LDggKzE1NTYsOCBAQCB2b2lkIFJlbmRlckxheWVyOjpjb252ZXJ0VG9MYXll ckNvb3Jkcyhjb25zdCBSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciwgTGF5b3V0UAogCiAgICAg ICAgIC8vIFdlIHNob3VsZCBub3QgcmVhY2ggUmVuZGVyVmlldyBsYXllciBwYXN0IHRoZSBSZW5k ZXJGbG93VGhyZWFkIGxheWVyIGZvciBhbnkKICAgICAgICAgLy8gY2hpbGRyZW4gb2YgdGhlIFJl bmRlckZsb3dUaHJlYWQuCi0gICAgICAgIGlmIChyZW5kZXJlcigpLT5pblJlbmRlckZsb3dUaHJl YWQoKSAmJiAhcmVuZGVyZXIoKS0+aXNSZW5kZXJGbG93VGhyZWFkKCkpCi0gICAgICAgICAgICBB U1NFUlQocGFyZW50TGF5ZXIgIT0gcmVuZGVyZXIoKS0+dmlldygpLT5sYXllcigpKTsKKyAgICAg ICAgaWYgKHJlbmRlcmVyLT5pblJlbmRlckZsb3dUaHJlYWQoKSAmJiAhcmVuZGVyZXItPmlzUmVu ZGVyRmxvd1RocmVhZCgpKQorICAgICAgICAgICAgQVNTRVJUKHBhcmVudExheWVyICE9IHJlbmRl cmVyLT52aWV3KCktPmxheWVyKCkpOwogCiAgICAgICAgIGlmIChmb3VuZEFuY2VzdG9yRmlyc3Qp IHsKICAgICAgICAgICAgIC8vIEZvdW5kIGFuY2VzdG9yTGF5ZXIgYmVmb3JlIHRoZSBhYnMuIHBv c2l0aW9uZWQgY29udGFpbmVyLCBzbyBjb21wdXRlIG9mZnNldCBvZiBib3RoIHJlbGF0aXZlCkBA IC0xNTY0LDIzICsxNTY1LDMyIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbnZlcnRUb0xheWVyQ29v cmRzKGNvbnN0IFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyLCBMYXlvdXRQCiAgICAgICAgICAg ICBSZW5kZXJMYXllciogcG9zaXRpb25lZEFuY2VzdG9yID0gcGFyZW50TGF5ZXItPmVuY2xvc2lu Z1Bvc2l0aW9uZWRBbmNlc3RvcigpOwogCiAgICAgICAgICAgICBMYXlvdXRQb2ludCB0aGlzQ29v cmRzOwotICAgICAgICAgICAgY29udmVydFRvTGF5ZXJDb29yZHMocG9zaXRpb25lZEFuY2VzdG9y LCB0aGlzQ29vcmRzKTsKKyAgICAgICAgICAgIGxheWVyLT5jb252ZXJ0VG9MYXllckNvb3Jkcyhw b3NpdGlvbmVkQW5jZXN0b3IsIHRoaXNDb29yZHMpOwogICAgICAgICAgICAgCiAgICAgICAgICAg ICBMYXlvdXRQb2ludCBhbmNlc3RvckNvb3JkczsKICAgICAgICAgICAgIGFuY2VzdG9yTGF5ZXIt PmNvbnZlcnRUb0xheWVyQ29vcmRzKHBvc2l0aW9uZWRBbmNlc3RvciwgYW5jZXN0b3JDb29yZHMp OwogCiAgICAgICAgICAgICBsb2NhdGlvbiArPSAodGhpc0Nvb3JkcyAtIGFuY2VzdG9yQ29vcmRz KTsKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBhbmNlc3RvckxheWVy OwogICAgICAgICB9CiAgICAgfSBlbHNlCi0gICAgICAgIHBhcmVudExheWVyID0gcGFyZW50KCk7 CisgICAgICAgIHBhcmVudExheWVyID0gbGF5ZXItPnBhcmVudCgpOwogICAgIAogICAgIGlmICgh cGFyZW50TGF5ZXIpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBs b2NhdGlvbiArPSB0b1NpemUobGF5ZXItPmxvY2F0aW9uKCkpOworICAgIHJldHVybiBwYXJlbnRM YXllcjsKK30KIAotICAgIHBhcmVudExheWVyLT5jb252ZXJ0VG9MYXllckNvb3JkcyhhbmNlc3Rv ckxheWVyLCBsb2NhdGlvbik7Cit2b2lkIFJlbmRlckxheWVyOjpjb252ZXJ0VG9MYXllckNvb3Jk cyhjb25zdCBSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciwgTGF5b3V0UG9pbnQmIGxvY2F0aW9u KSBjb25zdAoreworICAgIGlmIChhbmNlc3RvckxheWVyID09IHRoaXMpCisgICAgICAgIHJldHVy bjsKIAotICAgIGxvY2F0aW9uICs9IHRvU2l6ZShtX3RvcExlZnQpOworICAgIGNvbnN0IFJlbmRl ckxheWVyKiBjdXJyTGF5ZXIgPSB0aGlzOworICAgIHdoaWxlIChjdXJyTGF5ZXIgJiYgY3Vyckxh eWVyICE9IGFuY2VzdG9yTGF5ZXIpCisgICAgICAgIGN1cnJMYXllciA9IGFjY3VtdWxhdGVPZmZz ZXRUb3dhcmRzQW5jZXN0b3IoY3VyckxheWVyLCBhbmNlc3RvckxheWVyLCBsb2NhdGlvbik7CiB9 CiAKIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbnZlcnRUb0xheWVyQ29vcmRzKGNvbnN0IFJlbmRlckxh eWVyKiBhbmNlc3RvckxheWVyLCBMYXlvdXRSZWN0JiByZWN0KSBjb25zdAo=