48089 2010-10-21 13:13:55 -0700 Find indicator does not draw found text in WebKit2 when page is not scrolled to top 2010-10-21 13:26:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 andersca andersca oldest_to_newest 297592 0 andersca 2010-10-21 13:13:55 -0700 Find indicator does not draw found text in WebKit2 when page is not scrolled to top 297595 1 andersca 2010-10-21 13:17:31 -0700 <rdar://problem/8562647> 297597 2 71478 andersca 2010-10-21 13:20:45 -0700 Created attachment 71478 Patch 297600 3 andersca 2010-10-21 13:26:16 -0700 Committed r70261: <http://trac.webkit.org/changeset/70261> 71478 2010-10-21 13:20:45 -0700 2010-10-21 13:22:14 -0700 Patch bug-48089-20101021132042.patch text/plain 3289 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MGVlZmIwMjZiNWZjYmE0MmY5YjgwYWFjYTg4OTZlNTIxYWFkMGZkMy4uMWRjMzk1M2JjMDNlYmE1 OTM5NjY4N2NiNGE2ZmY0ZTlhYzc5OGUwYiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAxMC0xMC0yMSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpbmQgaW5kaWNhdG9yIGRvZXMgbm90IGRyYXcg Zm91bmQgdGV4dCBpbiBXZWJLaXQyIHdoZW4gcGFnZSBpcyBub3Qgc2Nyb2xsZWQgdG8gdG9wCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODA4OQorCisg ICAgICAgIFdlIGFsd2F5cyB3YW50IHRoZSBzZWxlY3Rpb24gcmVjdGFuZ2xlIGluICJXZWJDb3Jl IHdpbmRvdyBjb29yZGluYXRlcyIgd2hpY2ggaXMgdGhlIHNhbWUKKyAgICAgICAgYXMgV0tWaWV3 IGNvb3JkaW5hdGVzIGluIFdlYktpdDIuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6dXBk YXRlRmluZEluZGljYXRvcik6CisKKzIwMTAtMTAtMjEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBIeWF0dC4KIAogICAg ICAgICBBbHdheXMgY2xlYXIgdGhlIHNlbGVjdGlvbiB3aGVuIHRoZSBmaW5kIHN0cmluZyBpc24n dCBmb3VuZApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRy b2xsZXIuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3Bw CmluZGV4IDIyOGM1YWRjZTNmZjhhYjNkNTgyODFjM2U5ZGIxOWZlZTE5OTZjMTIuLmMxMDQ3ZmQy ODdiZDQ0Y2NjYjIyZmQ3YmQ4YWE2OWMzYTBiNTc0NDUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAgLTE0MywyOSArMTQzLDI4IEBAIGJvb2wg RmluZENvbnRyb2xsZXI6OnVwZGF0ZUZpbmRJbmRpY2F0b3IoRnJhbWUqIHNlbGVjdGVkRnJhbWUs IGJvb2wgaXNTaG93aW5nT3ZlCiAgICAgaWYgKCFzZWxlY3RlZEZyYW1lKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICBJbnRSZWN0IHNlbGVjdGlvblJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0 KHNlbGVjdGVkRnJhbWUtPnNlbGVjdGlvbigpLT5ib3VuZHMoKSk7CisgICAgLy8gV2Ugd2FudCB0 aGUgc2VsZWN0aW9uIHJlY3QgaW4gd2luZG93IGNvb3JkaW5hdGVzLgorICAgIEludFJlY3Qgc2Vs ZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBzZWxlY3RlZEZyYW1lLT52aWV3KCktPmNv bnRlbnRzVG9XaW5kb3coZW5jbG9zaW5nSW50UmVjdChzZWxlY3RlZEZyYW1lLT5zZWxlY3Rpb24o KS0+Ym91bmRzKCkpKTsKKyAgICAKICAgICBWZWN0b3I8RmxvYXRSZWN0PiB0ZXh0UmVjdHM7CiAg ICAgc2VsZWN0ZWRGcmFtZS0+c2VsZWN0aW9uKCktPmdldENsaXBwZWRWaXNpYmxlVGV4dFJlY3Rh bmdsZXModGV4dFJlY3RzKTsKIAogICAgIC8vIENyZWF0ZSBhIGJhY2tpbmcgc3RvcmUgYW5kIHBh aW50IHRoZSBmaW5kIGluZGljYXRvciB0ZXh0IGludG8gaXQuCi0gICAgUmVmUHRyPEJhY2tpbmdT dG9yZT4gZmluZEluZGljYXRvclRleHRCYWNraW5nU3RvcmUgPSBCYWNraW5nU3RvcmU6OmNyZWF0 ZVNoYXJhYmxlKHNlbGVjdGlvblJlY3Quc2l6ZSgpKTsKKyAgICBSZWZQdHI8QmFja2luZ1N0b3Jl PiBmaW5kSW5kaWNhdG9yVGV4dEJhY2tpbmdTdG9yZSA9IEJhY2tpbmdTdG9yZTo6Y3JlYXRlU2hh cmFibGUoc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMuc2l6ZSgpKTsKICAgICBPd25Q dHI8R3JhcGhpY3NDb250ZXh0PiBncmFwaGljc0NvbnRleHQgPSBmaW5kSW5kaWNhdG9yVGV4dEJh Y2tpbmdTdG9yZS0+Y3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7CiAKLSAgICBncmFwaGljc0NvbnRl eHQtPnRyYW5zbGF0ZSgtc2VsZWN0aW9uUmVjdC54KCksIC1zZWxlY3Rpb25SZWN0LnkoKSk7Cisg ICAgZ3JhcGhpY3NDb250ZXh0LT50cmFuc2xhdGUoLXNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzLngoKSwgLXNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLnkoKSk7CiAgICAg c2VsZWN0ZWRGcmFtZS0+dmlldygpLT5zZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JTZWxl Y3Rpb25Pbmx5IHwgUGFpbnRCZWhhdmlvckZvcmNlQmxhY2tUZXh0IHwgUGFpbnRCZWhhdmlvckZs YXR0ZW5Db21wb3NpdGluZ0xheWVycyk7CiAgICAgc2VsZWN0ZWRGcmFtZS0+ZG9jdW1lbnQoKS0+ dXBkYXRlTGF5b3V0KCk7Ci0gICAgCi0gICAgZ3JhcGhpY3NDb250ZXh0LT5jbGlwKHNlbGVjdGlv blJlY3QpOwotICAgIHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+cGFpbnQoZ3JhcGhpY3NDb250ZXh0 LmdldCgpLCBzZWxlY3Rpb25SZWN0KTsKKworICAgIGdyYXBoaWNzQ29udGV4dC0+Y2xpcChzZWxl Y3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcyk7CisgICAgc2VsZWN0ZWRGcmFtZS0+dmlldygp LT5wYWludChncmFwaGljc0NvbnRleHQuZ2V0KCksIHNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzKTsKICAgICBzZWxlY3RlZEZyYW1lLT52aWV3KCktPnNldFBhaW50QmVoYXZpb3IoUGFp bnRCZWhhdmlvck5vcm1hbCk7CiAgICAgCiAgICAgU2hhcmVkTWVtb3J5OjpIYW5kbGUgaGFuZGxl OwogICAgIGlmICghZmluZEluZGljYXRvclRleHRCYWNraW5nU3RvcmUtPmNyZWF0ZUhhbmRsZSho YW5kbGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAvLyBXZSB3YW50IHRoZSBzZWxl Y3Rpb24gcmVjdCBpbiB3aW5kb3cgY29vcmRpbmF0ZXMuCi0gICAgSW50UmVjdCBzZWxlY3Rpb25S ZWN0SW5XaW5kb3dDb29yZGluYXRlcyA9IHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+Y29udGVudHNU b1dpbmRvdyhzZWxlY3Rpb25SZWN0KTsKLQogICAgIC8vIFdlIHdhbnQgdGhlIHRleHQgcmVjdHMg aW4gc2VsZWN0aW9uIHJlY3QgY29vcmRpbmF0ZXMuCiAgICAgVmVjdG9yPEZsb2F0UmVjdD4gdGV4 dFJlY3RzSW5TZWxlY3Rpb25SZWN0Q29vcmRpbmF0ZXM7CiAgICAgCg==