146992 2015-07-15 18:08:19 -0700 Move indicator rect uniting code to TextIndicatorWindow instead of TextIndicator 2015-07-15 23:38:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca commit-queue dbates sam simon.fraser oldest_to_newest 1109789 0 thorton 2015-07-15 18:08:19 -0700 Move indicator rect uniting code to TextIndicatorWindow instead of TextIndicator 1109790 1 256882 thorton 2015-07-15 18:09:05 -0700 Created attachment 256882 Patch 1109827 2 256882 dbates 2015-07-15 22:43:02 -0700 Comment on attachment 256882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256882&action=review > Source/WebCore/page/TextIndicator.cpp:-52 > -const float dropShadowBlurRadius = 12; Notice that the !ENABLE(LEGACY_TEXT_INDICATOR_STYLE)-variant of the constant dropShadowBlurRadius is defined to be 2 (not 12 as it is defined here) in file Source/WebCore/page/mac/TextIndicatorWindow.mm, <http://trac.webkit.org/browser/trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm?rev=185844#L60>. Is this change in blur radius intentional? 1109828 3 thorton 2015-07-15 22:49:52 -0700 Must be a mistake I made long ago (this is why having two copies of the constants is bad!). In any case, the version in TextIndicatorWindow is the "real" one (the one that actually determines... the size of the shadow); this one was just here for this silly rect merging code. Thanks for your very careful review! 1109834 4 256882 commit-queue 2015-07-15 23:38:06 -0700 Comment on attachment 256882 Patch Clearing flags on attachment: 256882 Committed r186890: <http://trac.webkit.org/changeset/186890> 1109835 5 commit-queue 2015-07-15 23:38:10 -0700 All reviewed patches have been landed. Closing bug. 256882 2015-07-15 18:09:05 -0700 2015-07-15 23:38:06 -0700 Patch bug-146992-20150715180757.patch text/plain 6459 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2ODc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2MwMjhlNGJhY2NiMGM1 YTU0NDc4OTBmMzQ2M2M2NzE5MTA3MDY4Ni4uYjhiZDk3ZWE0ZTFhN2I1YmEwMzFjYjg3YTQ3OTNk MmNkYjBkZDNhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA3LTE1ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgaW5kaWNh dG9yIHJlY3QgdW5pdGluZyBjb2RlIHRvIFRleHRJbmRpY2F0b3JXaW5kb3cgaW5zdGVhZCBvZiBU ZXh0SW5kaWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDY5OTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxNjQzMDk0PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhdmluZyB0byB1bml0ZSBh bGwgdGhlIHJlY3RzIGlmIGFueSBvdmVybGFwIGlzIGFuIGltcGxlbWVudGF0aW9uCisgICAgICAg IGRldGFpbCBvZiB0aGUgTWFjIFRleHRJbmRpY2F0b3JXaW5kb3cgcHJlc2VudGF0aW9uLCBub3Qg YSBmdW5kYW1lbnRhbAorICAgICAgICBwcm9wZXJ0eSBvZiBUZXh0SW5kaWNhdG9yLgorCisgICAg ICAgIE90aGVyIFRleHRJbmRpY2F0b3IgcHJlc2VudGF0aW9ucyBtaWdodCBiZSBhYmxlIHRvIGhh bmRsZSBvdmVybGFwcGluZworICAgICAgICByZWN0cyBtb3JlIGVmZmVjdGl2ZWx5LCBzbyB3ZSBz aG91bGRuJ3QgbG9zZSBpbmZvcm1hdGlvbiB1bmxlc3Mgd2UgbmVlZCB0by4KKworICAgICAgICBU aGlzIGFsc28gYXZvaWRzIGhhdmluZyBhIHNlY29uZCBjb3B5IG9mIHNvbWUgY29uc3RhbnRzIQor CisgICAgICAgICogcGFnZS9UZXh0SW5kaWNhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om91 dHNldEluZGljYXRvclJlY3RJbmNsdWRpbmdTaGFkb3cpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6dGV4dEluZGljYXRvcnNGb3JUZXh0UmVjdHNPdmVybGFwKTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OlRleHRJbmRpY2F0b3I6OlRleHRJbmRpY2F0b3IpOiBEZWxldGVkLgorICAg ICAgICAqIHBhZ2UvbWFjL1RleHRJbmRpY2F0b3JXaW5kb3cubW06CisgICAgICAgIChvdXRzZXRJ bmRpY2F0b3JSZWN0SW5jbHVkaW5nU2hhZG93KToKKyAgICAgICAgKHRleHRJbmRpY2F0b3JzRm9y VGV4dFJlY3RzT3ZlcmxhcCk6CisgICAgICAgICgtW1dlYlRleHRJbmRpY2F0b3JWaWV3IGluaXRX aXRoRnJhbWU6dGV4dEluZGljYXRvcjptYXJnaW46b2Zmc2V0Ol0pOgorCiAyMDE1LTA3LTE1ICBC cmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIEFub3Ro ZXIgYnVpbGQgZml4IGFmdGVyIHIxODY4NTguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1RleHRJbmRpY2F0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9y LmNwcAppbmRleCA4MWQzMTVjY2Y1NWYzM2ZjMTEzZjUwYzkxMTg1MjRjMDE3NTE1ZmUzLi40NzFm YWIzN2JhODg5YjI2ZjA5YmY4NWI4MzFiMjM4NGQ1ZDBiNmVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv VGV4dEluZGljYXRvci5jcHAKQEAgLTQwLDUyICs0MCw4IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCi0vLyBUaGVzZSBzaG91bGQgbWF0Y2ggdGhlIHZhbHVlcyBpbiBUZXh0SW5kaWNh dG9yV2luZG93LgotLy8gRklYTUU6IElkZWFsbHkgdGhlc2Ugd291bGQgb25seSBiZSBpbiBvbmUg cGxhY2UuCi0jaWYgRU5BQkxFKExFR0FDWV9URVhUX0lORElDQVRPUl9TVFlMRSkKLWNvbnN0IGZs b2F0IGhvcml6b250YWxCb3JkZXIgPSAzOwotY29uc3QgZmxvYXQgdmVydGljYWxCb3JkZXIgPSAx OwotY29uc3QgZmxvYXQgZHJvcFNoYWRvd0JsdXJSYWRpdXMgPSAxLjU7Ci0jZWxzZQotY29uc3Qg ZmxvYXQgaG9yaXpvbnRhbEJvcmRlciA9IDI7Ci1jb25zdCBmbG9hdCB2ZXJ0aWNhbEJvcmRlciA9 IDE7Ci1jb25zdCBmbG9hdCBkcm9wU2hhZG93Qmx1clJhZGl1cyA9IDEyOwotI2VuZGlmCi0KIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIEZsb2F0UmVjdCBvdXRzZXRJbmRpY2F0b3JSZWN0 SW5jbHVkaW5nU2hhZG93KGNvbnN0IEZsb2F0UmVjdCByZWN0KQotewotICAgIEZsb2F0UmVjdCBv dXRzZXRSZWN0ID0gcmVjdDsKLSAgICBvdXRzZXRSZWN0LmluZmxhdGVYKGRyb3BTaGFkb3dCbHVy UmFkaXVzICsgaG9yaXpvbnRhbEJvcmRlcik7Ci0gICAgb3V0c2V0UmVjdC5pbmZsYXRlWShkcm9w U2hhZG93Qmx1clJhZGl1cyArIHZlcnRpY2FsQm9yZGVyKTsKLSAgICByZXR1cm4gb3V0c2V0UmVj dDsKLX0KLQotc3RhdGljIGJvb2wgdGV4dEluZGljYXRvcnNGb3JUZXh0UmVjdHNPdmVybGFwKGNv bnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiB0ZXh0UmVjdHMpCi17Ci0gICAgc2l6ZV90IGNvdW50ID0g dGV4dFJlY3RzLnNpemUoKTsKLSAgICBpZiAoY291bnQgPD0gMSkKLSAgICAgICAgcmV0dXJuIGZh bHNlOwotCi0gICAgVmVjdG9yPEZsb2F0UmVjdD4gaW5kaWNhdG9yUmVjdHM7Ci0gICAgaW5kaWNh dG9yUmVjdHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShjb3VudCk7Ci0KLSAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgRmxvYXRSZWN0IGluZGljYXRvclJl Y3QgPSBvdXRzZXRJbmRpY2F0b3JSZWN0SW5jbHVkaW5nU2hhZG93KHRleHRSZWN0c1tpXSk7Ci0K LSAgICAgICAgZm9yIChzaXplX3QgaiA9IGluZGljYXRvclJlY3RzLnNpemUoKTsgajsgKSB7Ci0g ICAgICAgICAgICAtLWo7Ci0gICAgICAgICAgICBpZiAoaW5kaWNhdG9yUmVjdC5pbnRlcnNlY3Rz KGluZGljYXRvclJlY3RzW2pdKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAg ICAgfQotCi0gICAgICAgIGluZGljYXRvclJlY3RzLnVuY2hlY2tlZEFwcGVuZChpbmRpY2F0b3JS ZWN0KTsKLSAgICB9Ci0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KIFJlZjxUZXh0SW5kaWNhdG9y PiBUZXh0SW5kaWNhdG9yOjpjcmVhdGUoY29uc3QgVGV4dEluZGljYXRvckRhdGEmIGRhdGEpCiB7 CiAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgVGV4dEluZGljYXRvcihkYXRhKSk7CkBAIC0xODks MTEgKzE0NSw2IEBAIFRleHRJbmRpY2F0b3I6OlRleHRJbmRpY2F0b3IoY29uc3QgVGV4dEluZGlj YXRvckRhdGEmIGRhdGEpCiAgICAgOiBtX2RhdGEoZGF0YSkKIHsKICAgICBBU1NFUlQobV9kYXRh LmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yICE9IDEgfHwgbV9kYXRhLmNvbnRlbnRJbWFnZS0+c2l6 ZSgpID09IGVuY2xvc2luZ0ludFJlY3QobV9kYXRhLnNlbGVjdGlvblJlY3RJblJvb3RWaWV3Q29v cmRpbmF0ZXMpLnNpemUoKSk7Ci0KLSAgICBpZiAodGV4dEluZGljYXRvcnNGb3JUZXh0UmVjdHNP dmVybGFwKG1fZGF0YS50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzKSkgewotICAg ICAgICBtX2RhdGEudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlc1swXSA9IHVuaW9u UmVjdChtX2RhdGEudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcyk7Ci0gICAgICAg IG1fZGF0YS50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzLnNocmluaygxKTsKLSAg ICB9CiB9CiAKIFRleHRJbmRpY2F0b3I6On5UZXh0SW5kaWNhdG9yKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1RleHRJbmRpY2F0b3JXaW5kb3cubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL21hYy9UZXh0SW5kaWNhdG9yV2luZG93Lm1tCmluZGV4IGU1NDBmZDgzYjRkNjQy YWM5OTU3NjYwNTAyOWU5NDY2NGM4YjIyMTkuLmY1MTcxZTk0MTlmZjZkNWNmNGJkM2NlODA2NDJl YzIyY2QyYjJkNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1RleHRJbmRp Y2F0b3JXaW5kb3cubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvVGV4dEluZGljYXRv cldpbmRvdy5tbQpAQCAtMjksNiArMjksNyBAQAogI2lmIFBMQVRGT1JNKE1BQykKIAogI2ltcG9y dCAiQ29yZUdyYXBoaWNzU1BJLmgiCisjaW1wb3J0ICJHZW9tZXRyeVV0aWxpdGllcy5oIgogI2lt cG9ydCAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW1wb3J0ICJRdWFydHpDb3JlU1BJLmgiCiAjaW1w b3J0ICJUZXh0SW5kaWNhdG9yLmgiCkBAIC05MSw2ICs5MiwzOCBAQCB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIAogQHN5bnRoZXNpemUgZmFkaW5nT3V0ID0gX2ZhZGluZ091dDsKIAorc3RhdGlj IEZsb2F0UmVjdCBvdXRzZXRJbmRpY2F0b3JSZWN0SW5jbHVkaW5nU2hhZG93KGNvbnN0IEZsb2F0 UmVjdCByZWN0KQoreworICAgIEZsb2F0UmVjdCBvdXRzZXRSZWN0ID0gcmVjdDsKKyAgICBvdXRz ZXRSZWN0LmluZmxhdGVYKGRyb3BTaGFkb3dCbHVyUmFkaXVzICsgaG9yaXpvbnRhbEJvcmRlcik7 CisgICAgb3V0c2V0UmVjdC5pbmZsYXRlWShkcm9wU2hhZG93Qmx1clJhZGl1cyArIHZlcnRpY2Fs Qm9yZGVyKTsKKyAgICByZXR1cm4gb3V0c2V0UmVjdDsKK30KKworc3RhdGljIGJvb2wgdGV4dElu ZGljYXRvcnNGb3JUZXh0UmVjdHNPdmVybGFwKGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiB0ZXh0 UmVjdHMpCit7CisgICAgc2l6ZV90IGNvdW50ID0gdGV4dFJlY3RzLnNpemUoKTsKKyAgICBpZiAo Y291bnQgPD0gMSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgVmVjdG9yPEZsb2F0UmVj dD4gaW5kaWNhdG9yUmVjdHM7CisgICAgaW5kaWNhdG9yUmVjdHMucmVzZXJ2ZUluaXRpYWxDYXBh Y2l0eShjb3VudCk7CisKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsK KyAgICAgICAgRmxvYXRSZWN0IGluZGljYXRvclJlY3QgPSBvdXRzZXRJbmRpY2F0b3JSZWN0SW5j bHVkaW5nU2hhZG93KHRleHRSZWN0c1tpXSk7CisKKyAgICAgICAgZm9yIChzaXplX3QgaiA9IGlu ZGljYXRvclJlY3RzLnNpemUoKTsgajsgKSB7CisgICAgICAgICAgICAtLWo7CisgICAgICAgICAg ICBpZiAoaW5kaWNhdG9yUmVjdC5pbnRlcnNlY3RzKGluZGljYXRvclJlY3RzW2pdKSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIGluZGljYXRvclJl Y3RzLnVuY2hlY2tlZEFwcGVuZChpbmRpY2F0b3JSZWN0KTsKKyAgICB9CisKKyAgICByZXR1cm4g ZmFsc2U7Cit9CisKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0aEZyYW1lOihOU1JlY3QpZnJhbWUg dGV4dEluZGljYXRvcjooUGFzc1JlZlB0cjxUZXh0SW5kaWNhdG9yPil0ZXh0SW5kaWNhdG9yIG1h cmdpbjooTlNTaXplKW1hcmdpbiBvZmZzZXQ6KE5TUG9pbnQpb2Zmc2V0CiB7CiAgICAgaWYgKCEo c2VsZiA9IFtzdXBlciBpbml0V2l0aEZyYW1lOmZyYW1lXSkpCkBAIC0xMjAsNyArMTUzLDEzIEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAgIFJldGFpblB0cjxDR0NvbG9yUmVmPiBncmFk aWVudERhcmtDb2xvciA9IFtOU0NvbG9yIGNvbG9yV2l0aERldmljZVJlZDouOTI5IGdyZWVuOi44 IGJsdWU6MCBhbHBoYToxXS5DR0NvbG9yOwogICAgIFJldGFpblB0cjxDR0NvbG9yUmVmPiBncmFk aWVudExpZ2h0Q29sb3IgPSBbTlNDb2xvciBjb2xvcldpdGhEZXZpY2VSZWQ6Ljk0OSBncmVlbjou OTM3IGJsdWU6MCBhbHBoYToxXS5DR0NvbG9yOwogCi0gICAgZm9yIChjb25zdCBhdXRvJiB0ZXh0 UmVjdCA6IF90ZXh0SW5kaWNhdG9yLT50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVz KCkpIHsKKyAgICBWZWN0b3I8RmxvYXRSZWN0PiB0ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3Jk aW5hdGVzID0gX3RleHRJbmRpY2F0b3ItPnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0 ZXMoKTsKKyAgICBpZiAodGV4dEluZGljYXRvcnNGb3JUZXh0UmVjdHNPdmVybGFwKHRleHRSZWN0 c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMpKSB7CisgICAgICAgIHRleHRSZWN0c0luQm91bmRp bmdSZWN0Q29vcmRpbmF0ZXNbMF0gPSB1bmlvblJlY3QodGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RD b29yZGluYXRlcyk7CisgICAgICAgIHRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMu c2hyaW5rKDEpOworICAgIH0KKworICAgIGZvciAoY29uc3QgYXV0byYgdGV4dFJlY3QgOiB0ZXh0 UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzKSB7CiAgICAgICAgIEZsb2F0UmVjdCBvZmZz ZXRUZXh0UmVjdCA9IHRleHRSZWN0OwogICAgICAgICBvZmZzZXRUZXh0UmVjdC5tb3ZlKG9mZnNl dC54LCBvZmZzZXQueSk7CiAK