147152 2015-07-21 09:46:19 -0700 [iOS] Avoid using a TextIndicator if there are non-text things to indicate 2015-07-21 12:59:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin commit-queue enrica hyatt sam simon.fraser oldest_to_newest 1110949 0 thorton 2015-07-21 09:46:19 -0700 [iOS] Avoid using a TextIndicator if there are non-text things to indicate 1110950 1 257184 thorton 2015-07-21 09:46:53 -0700 Created attachment 257184 Patch 1110963 2 257184 bdakin 2015-07-21 10:41:20 -0700 Comment on attachment 257184 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257184&action=review > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:2215 > + const float marginInPoints = 4; It's unfortunate to have this constant in two places. Maybe it can be declared in one spot for use in both? 1110965 3 thorton 2015-07-21 10:42:52 -0700 (In reply to comment #2) > Comment on attachment 257184 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257184&action=review > > > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:2215 > > + const float marginInPoints = 4; > > It's unfortunate to have this constant in two places. Maybe it can be > declared in one spot for use in both? Ideally yes, but where! 1111018 4 257184 commit-queue 2015-07-21 12:59:21 -0700 Comment on attachment 257184 Patch Clearing flags on attachment: 257184 Committed r187117: <http://trac.webkit.org/changeset/187117> 1111019 5 commit-queue 2015-07-21 12:59:25 -0700 All reviewed patches have been landed. Closing bug. 257184 2015-07-21 09:46:53 -0700 2015-07-21 12:59:21 -0700 Patch bug-147152-20150721094539.patch text/plain 5717 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmZiN2U5NTA1MjgyOWI3 NDMwOWVjYzk2M2EyN2QyMmYyNjEyNmVlYS4uNDAyMTMxZmI2YTRkNmM5MTMxYWY1NTY4MDk0ZDJk YjM2ZTljNmQwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTIxICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEF2b2lk IHVzaW5nIGEgVGV4dEluZGljYXRvciBpZiB0aGVyZSBhcmUgbm9uLXRleHQgdGhpbmdzIHRvIGlu ZGljYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDcxNTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxOTIxMDYxPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgd2lsbFByZXNl bnRQcmV2aWV3Vmlld0NvbnRyb2xsZXI6Zm9yUG9zaXRpb246aW5Tb3VyY2VWaWV3Ol0pOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdl YktpdDo6c2hvdWxkVXNlVGV4dEluZGljYXRvckZvckxpbmspOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpnZXRQb3NpdGlvbkluZm9ybWF0aW9uKToKKyAgICAgICAgRmFsbCBiYWNrIHRvIGEg cmVjdGFuZ3VsYXIgYXJlYSBpbnN0ZWFkIG9mIGEgVGV4dEluZGljYXRvciBpZiB0aGVyZSBhcmUg YW55CisgICAgICAgIG5vbi1pbmxpbmUgZWxlbWVudHMgaW5zaWRlIHRoZSBsaW5rLgorCiAyMDE1 LTA3LTIwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1RLXSBBZGQgQVBJIHRvIGJlIG5vdGlmaWVkIGFib3V0IGVkaXRvciBzdGF0ZSBjaGFu Z2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGM1NDZmMTQ4MTI3NDliMDNmYTI1OTI2NjRlYTU5YzQw NzlmZGFjOWYuLjZjY2I0Nzg4YmY2YjZmMDYwMjVkNzVkM2Q3OTk3MTBhYjc4YTJhMjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCkBAIC0zMzMxLDkgKzMzMzEsMTQgQEAgc3RhdGljIGJvb2wgaXNBc3Npc3Rh YmxlSW5wdXRUeXBlKElucHV0VHlwZSB0eXBlKQogCiAgICAgW19wcmV2aWV3SW5kaWNhdG9yVmll dyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKIAorICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0g X3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCk7CisKICAgICBSZWZQdHI8SW1hZ2U+IGltYWdlID0g X3Bvc2l0aW9uSW5mb3JtYXRpb24ubGlua0luZGljYXRvci5jb250ZW50SW1hZ2U7CiAgICAgaWYg KCFpbWFnZSkgewotICAgICAgICBbW3ZpZXdDb250cm9sbGVyIHByZXNlbnRhdGlvbkNvbnRyb2xs ZXJdIHNldFNvdXJjZVJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzXTsKKyAgICAgICAg SW50UmVjdCBzb3VyY2VSZWN0ID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzOworICAgICAg ICBjb25zdCBmbG9hdCBtYXJnaW5JblBvaW50cyA9IDQ7CisgICAgICAgIHNvdXJjZVJlY3QuaW5m bGF0ZShtYXJnaW5JblBvaW50cyAqIGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICAgICAgW1t2aWV3 Q29udHJvbGxlciBwcmVzZW50YXRpb25Db250cm9sbGVyXSBzZXRTb3VyY2VSZWN0OnNvdXJjZVJl Y3RdOwogICAgICAgICBbW3ZpZXdDb250cm9sbGVyIHByZXNlbnRhdGlvbkNvbnRyb2xsZXJdIHNl dFNvdXJjZVZpZXc6c2VsZl07CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0zMzQxLDcgKzMz NDYsNiBAQCBzdGF0aWMgYm9vbCBpc0Fzc2lzdGFibGVJbnB1dFR5cGUoSW5wdXRUeXBlIHR5cGUp CiAgICAgUmV0YWluUHRyPFVJSW1hZ2U+IGluZGljYXRvckltYWdlID0gYWRvcHROUyhbW1VJSW1h Z2UgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTppbWFnZS0+Z2V0Q0dJbWFnZVJlZigpXSk7CiAgICAg X3ByZXZpZXdJbmRpY2F0b3JWaWV3ID0gYWRvcHROUyhbW1VJSW1hZ2VWaWV3IGFsbG9jXSBpbml0 V2l0aEltYWdlOmluZGljYXRvckltYWdlLmdldCgpXSk7CiAKLSAgICBmbG9hdCBkZXZpY2VTY2Fs ZUZhY3RvciA9IF9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpOwogICAgIGNvbnN0IGZsb2F0IGNv cm5lclJhZGl1c0luUG9pbnRzID0gNTsKICAgICBQYXRoIHBhdGggPSBQYXRoVXRpbGl0aWVzOjpw YXRoV2l0aFNocmlua1dyYXBwZWRSZWN0cyhfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5kaWNh dG9yLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMsIGNvcm5lclJhZGl1c0luUG9p bnRzICogZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgIFJldGFpblB0cjxDQVNoYXBlTGF5ZXI+IG1h c2tMYXllciA9IGFkb3B0TlMoW1tDQVNoYXBlTGF5ZXIgYWxsb2NdIGluaXRdKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRl eCA2MDY3MjUyZTI0YmM0YmFhOTM2MzczMjlmZWViYzRjMTY0NDBjNDQzLi5jZGY4ZWVhNjU1ODU4 MDJmYWQ5ZWQxMmFiNGVlNzFhNDUzMGRkZGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC02Myw2ICs2Myw3IEBACiAj aW1wb3J0IDxXZWJDb3JlL0dlb21ldHJ5VXRpbGl0aWVzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hU TUxFbGVtZW50VHlwZUhlbHBlcnMuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTEZvcm1FbGVtZW50 Lmg+CisjaW1wb3J0IDxXZWJDb3JlL0hUTUxJbWFnZUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNv cmUvSFRNTElucHV0RWxlbWVudC5oPgogI2ltcG9ydCA8V2ViQ29yZS9IVE1MT3B0R3JvdXBFbGVt ZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxPcHRpb25FbGVtZW50Lmg+CkBAIC0yMTQzLDYg KzIxNDQsMTkgQEAgc3RhdGljIEVsZW1lbnQqIGNvbnRhaW5pbmdMaW5rRWxlbWVudChFbGVtZW50 KiBlbGVtZW50KQogICAgIHJldHVybiBudWxscHRyOwogfQogCitzdGF0aWMgYm9vbCBzaG91bGRV c2VUZXh0SW5kaWNhdG9yRm9yTGluayhFbGVtZW50JiBlbGVtZW50KQoreworICAgIGlmIChlbGVt ZW50LnJlbmRlcmVyKCkgJiYgIWVsZW1lbnQucmVuZGVyZXIoKS0+aXNJbmxpbmUoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgZm9yIChhdXRvJiBjaGlsZCA6IGRlc2NlbmRhbnRzT2ZU eXBlPEVsZW1lbnQ+KGVsZW1lbnQpKSB7CisgICAgICAgIGlmIChjaGlsZC5yZW5kZXJlcigpICYm ICFjaGlsZC5yZW5kZXJlcigpLT5pc0lubGluZSgpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIH0KKworICAgIHJldHVybiB0cnVlOworfQorCiB2b2lkIFdlYlBhZ2U6OmdldFBvc2l0 aW9uSW5mb3JtYXRpb24oY29uc3QgSW50UG9pbnQmIHBvaW50LCBJbnRlcmFjdGlvbkluZm9ybWF0 aW9uQXRQb3NpdGlvbiYgaW5mbykKIHsKICAgICBGbG9hdFBvaW50IGFkanVzdGVkUG9pbnQ7CkBA IC0yMTk0LDEzICsyMjA4LDE1IEBAIHZvaWQgV2ViUGFnZTo6Z2V0UG9zaXRpb25JbmZvcm1hdGlv bihjb25zdCBJbnRQb2ludCYgcG9pbnQsIEludGVyYWN0aW9uSW5mb3JtYXRpCiAgICAgICAgICAg ICAgICAgICAgIGlmIChSZWZQdHI8V2ViSW1hZ2U+IHNuYXBzaG90ID0gc25hcHNob3ROb2RlKCpl bGVtZW50LCBTbmFwc2hvdE9wdGlvbnNTaGFyZWFibGUsIDYwMCAqIDEwMjQpKQogICAgICAgICAg ICAgICAgICAgICAgICAgaW5mby5pbWFnZSA9IHNuYXBzaG90LT5iaXRtYXAoKTsKIAotICAgICAg ICAgICAgICAgICAgICBSZWZQdHI8UmFuZ2U+IGxpbmtSYW5nZSA9IHJhbmdlT2ZDb250ZW50cygq bGlua0VsZW1lbnQpOwotICAgICAgICAgICAgICAgICAgICBpZiAobGlua1JhbmdlKSB7Ci0gICAg ICAgICAgICAgICAgICAgICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IGNvcmVQYWdlKCkt PmRldmljZVNjYWxlRmFjdG9yKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBmbG9h dCBtYXJnaW5JblBvaW50cyA9IDQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICBSZWZQdHI8VGV4 dEluZGljYXRvcj4gdGV4dEluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5n ZSgqbGlua1JhbmdlLCBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6Tm9uZSwg bWFyZ2luSW5Qb2ludHMgKiBkZXZpY2VTY2FsZUZhY3Rvcik7Ci0gICAgICAgICAgICAgICAgICAg ICAgICBpZiAodGV4dEluZGljYXRvcikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZv LmxpbmtJbmRpY2F0b3IgPSB0ZXh0SW5kaWNhdG9yLT5kYXRhKCk7CisgICAgICAgICAgICAgICAg ICAgIGlmIChzaG91bGRVc2VUZXh0SW5kaWNhdG9yRm9yTGluaygqbGlua0VsZW1lbnQpKSB7Cisg ICAgICAgICAgICAgICAgICAgICAgICBSZWZQdHI8UmFuZ2U+IGxpbmtSYW5nZSA9IHJhbmdlT2ZD b250ZW50cygqbGlua0VsZW1lbnQpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGxpbmtS YW5nZSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsb2F0IGRldmljZVNjYWxlRmFj dG9yID0gY29yZVBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBmbG9hdCBtYXJnaW5JblBvaW50cyA9IDQ7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgUmVmUHRyPFRleHRJbmRpY2F0b3I+IHRleHRJbmRpY2F0b3IgPSBUZXh0 SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2UoKmxpbmtSYW5nZSwgVGV4dEluZGljYXRvclByZXNl bnRhdGlvblRyYW5zaXRpb246Ok5vbmUsIG1hcmdpbkluUG9pbnRzICogZGV2aWNlU2NhbGVGYWN0 b3IpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh0ZXh0SW5kaWNhdG9yKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLmxpbmtJbmRpY2F0b3IgPSB0ZXh0SW5k aWNhdG9yLT5kYXRhKCk7CisgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGVsZW1lbnQtPnJlbmRlcmVyKCkg JiYgZWxlbWVudC0+cmVuZGVyZXIoKS0+aXNSZW5kZXJJbWFnZSgpKSB7CiAgICAgICAgICAgICAg ICAgICAgIGF1dG8mIHJlbmRlckltYWdlID0gZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCooZWxlbWVu dC0+cmVuZGVyZXIoKSkpOwo=