47737 2010-10-15 13:49:29 -0700 Hide the find indicator/overlay when necessary 2010-10-15 14:06:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 294904 0 andersca 2010-10-15 13:49:29 -0700 Hide the find indicator/overlay when necessary 294907 1 70893 andersca 2010-10-15 13:51:12 -0700 Created attachment 70893 Patch 294913 2 andersca 2010-10-15 14:06:04 -0700 Committed r69877: <http://trac.webkit.org/changeset/69877> 70893 2010-10-15 13:51:12 -0700 2010-10-15 13:52:19 -0700 Patch bug-47737-20101015135110.patch text/plain 7366 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg OGE2MmI2NjIyMGRlYjNjMGNmYjEwNzA4ZTVmNjRmNjUzNzQzMjdhOC4uYWQ2NmRmYWYwMzkyN2Ey ZDUwNTliZjg3MDQwZWI5ODFlMGUzYWE4MSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOCBAQAogMjAxMC0xMC0xNSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhpZGUgdGhlIGZpbmQgaW5kaWNhdG9yL292ZXJs YXkgd2hlbiBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ3NzM3CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6aW52 YWxpZGF0ZUNvbnRlbnRzRm9yU2xvd1Njcm9sbCk6CisgICAgICAgIEhpZGUgdGhlIGZpbmQgaW5k aWNhdG9yLgorCisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6c2Nyb2xsKToKKyAg ICAgICAgRGl0dG8uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25hbExvYWQpOgorICAgICAgICBIaWRlIHRoZSBm aW5kIGluZGljYXRvciBhbmQgdGhlIGZpbmQgb3ZlcmxheS4KKworICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250 cm9sbGVyOjpmaW5kU3RyaW5nKToKKyAgICAgICAgQWx3YXlzIGhpZGUgYWxsIHByZXZpb3VzIGZp bmQgbWF0Y2hlcy4gT25seSBjbGVhciB0aGUgc2VsZWN0aW9uIGlmIHRoZSBzdHJpbmcKKyAgICAg ICAgbm90IGZvdW5kIHdhc24ndCBlbXB0eS4KKworICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJv bGxlcjo6aGlkZUZpbmRVSSk6CisgICAgICAgIFVuaW5zdGFsbCB0aGUgcGFnZSBvdmVybGF5IGFu ZCBoaWRlIHRoZSBmaW5kIGluZGljYXRvci4KKworICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJv bGxlcjo6aGlkZUZpbmRJbmRpY2F0b3IpOgorICAgICAgICBSZW5hbWUgcmVzZXRGaW5kSW5kaWNh dG9yIHRvIGhpZGVGaW5kSW5kaWNhdG9yLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1bmluc3RhbGxQYWdlT3Zl cmxheSk6CisgICAgICAgIEludmFsaWRhdGUgdGhlIGVudGlyZSBwYWdlLgorCisyMDEwLTEwLTE1 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2FtIFdlaW5pZy4KIAogICAgICAgICBBZGQgRmluZEluZGljYXRvcldpbmRvdyBjbGFz cwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l Q2xpZW50LmNwcAppbmRleCAwOTllYzRlNTEyODFlYTlhODk1ZDc1YjUwYzcwM2ViYThlZGViNTBj Li5lNGZmMDBjNWI0YWM3YjMwOGYzYzIxODk2ZGI0NTQwOWVjMDVlZDQ4IDEwMDY0NAotLS0gYS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAorKysg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApA QCAtMzIyLDExICszMjIsMTcgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmludmFsaWRhdGVDb250 ZW50c0FuZFdpbmRvdyhjb25zdCBJbnRSZWN0JiByZWN0LCBib29sIGltbWUKIAogdm9pZCBXZWJD aHJvbWVDbGllbnQ6OmludmFsaWRhdGVDb250ZW50c0ZvclNsb3dTY3JvbGwoY29uc3QgSW50UmVj dCYgcmVjdCwgYm9vbCBpbW1lZGlhdGUpCiB7CisgICAgLy8gSGlkZSB0aGUgZmluZCBpbmRpY2F0 b3IuCisgICAgbV9wYWdlLT5maW5kQ29udHJvbGxlcigpLmhpZGVGaW5kSW5kaWNhdG9yKCk7CisK ICAgICBtX3BhZ2UtPmRyYXdpbmdBcmVhKCktPmludmFsaWRhdGVDb250ZW50c0ZvclNsb3dTY3Jv bGwocmVjdCwgaW1tZWRpYXRlKTsKIH0KIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnNjcm9sbChj b25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSwgY29uc3QgSW50UmVjdCYgcmVjdFRvU2Nyb2xsLCBj b25zdCBJbnRSZWN0JiBjbGlwUmVjdCkKIHsKKyAgICAvLyBIaWRlIHRoZSBmaW5kIGluZGljYXRv ci4KKyAgICBtX3BhZ2UtPmZpbmRDb250cm9sbGVyKCkuaGlkZUZpbmRJbmRpY2F0b3IoKTsKKwog ICAgIG1fcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2Nyb2xsKHNjcm9sbERlbHRhLCByZWN0VG9TY3Jv bGwsIGNsaXBSZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggYWZlMDA3NWE0NmJi ZDM0YWMyMWY3MWVjZGQ1MWIzYjExMDAxMjJiNC4uMGNjZGRjOGFhZmRiOTM1YTQwYzdlOGJjNGI1 Y2RkODBiZDBiN2E0NCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC0yODksNiArMjg5LDggQEAg dm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRTdGFydFByb3Zpc2lvbmFsTG9h ZCgpCiAgICAgaWYgKCF3ZWJQYWdlKQogICAgICAgICByZXR1cm47CiAKKyAgICB3ZWJQYWdlLT5m aW5kQ29udHJvbGxlcigpLmhpZGVGaW5kVUkoKTsKKyAgICAKICAgICBEb2N1bWVudExvYWRlciog cHJvdmlzaW9uYWxMb2FkZXIgPSBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCktPnByb3Zp c2lvbmFsRG9jdW1lbnRMb2FkZXIoKTsKICAgICBjb25zdCBTdHJpbmcmIHVybCA9IHByb3Zpc2lv bmFsTG9hZGVyLT51cmwoKS5zdHJpbmcoKTsKICAgICBSZWZQdHI8QVBJT2JqZWN0PiB1c2VyRGF0 YTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVy LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAppbmRl eCAzM2ZjYWM5ZmQ2NDgzMmNiMTEzNWQ4ZGZlZWI2MTNiYzI1NDFmMjMwLi5lMzZhNDQ3YzcyOTlj NDhjZThiYjE2NGI2ODAzY2JmYzBkY2Y2YjJkIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCkBAIC01OCw2ICs1OCw4IEBAIHN0YXRpYyBGcmFtZSog ZnJhbWVXaXRoU2VsZWN0aW9uKFBhZ2UqIHBhZ2UpCiAKIHZvaWQgRmluZENvbnRyb2xsZXI6OmZp bmRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmREaXJlY3Rpb24gZmluZERpcmVjdGlv biwgRmluZE9wdGlvbnMgZmluZE9wdGlvbnMsIHVuc2lnbmVkIG1heE51bU1hdGNoZXMpCiB7Cisg ICAgbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT51bm1hcmtBbGxUZXh0TWF0Y2hlcygpOworCiAgICAg VGV4dENhc2VTZW5zaXRpdml0eSBjYXNlU2Vuc2l0aXZpdHkgPSBmaW5kT3B0aW9ucyAmIEZpbmRP cHRpb25zQ2FzZUluc2Vuc2l0aXZlID8gVGV4dENhc2VJbnNlbnNpdGl2ZSA6IFRleHRDYXNlU2Vu c2l0aXZlOwogICAgIGJvb2wgZm91bmQgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPmZpbmRTdHJp bmcoc3RyaW5nLCBjYXNlU2Vuc2l0aXZpdHksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBmaW5kRGlyZWN0aW9uID09IEZpbmREaXJlY3Rpb25Gb3J3 YXJkID8gV2ViQ29yZTo6RmluZERpcmVjdGlvbkZvcndhcmQgOiBXZWJDb3JlOjpGaW5kRGlyZWN0 aW9uQmFja3dhcmQsCkBAIC02OCwxNCArNzAsMTEgQEAgdm9pZCBGaW5kQ29udHJvbGxlcjo6Zmlu ZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywgRmluZERpcmVjdGlvbiBmaW5kRGlyZWN0aW8K ICAgICBib29sIHNob3VsZFNob3dPdmVybGF5ID0gZmFsc2U7CiAKICAgICBpZiAoIWZvdW5kKSB7 Ci0gICAgICAgIC8vIFdlIGRpZG4ndCBmaW5kIHRoZSBzdHJpbmcsIGNsZWFyIGFsbCB0ZXh0IG1h dGNoZXMuCi0gICAgICAgIG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+dW5tYXJrQWxsVGV4dE1hdGNo ZXMoKTsKLQogICAgICAgICAvLyBBbmQgY2xlYXIgdGhlIHNlbGVjdGlvbi4KLSAgICAgICAgaWYg KHNlbGVjdGVkRnJhbWUpCisgICAgICAgIGlmICghc3RyaW5nLmlzRW1wdHkoKSAmJiBzZWxlY3Rl ZEZyYW1lKQogICAgICAgICAgICAgc2VsZWN0ZWRGcmFtZS0+c2VsZWN0aW9uKCktPmNsZWFyKCk7 CiAKLSAgICAgICAgcmVzZXRGaW5kSW5kaWNhdG9yKCk7CisgICAgICAgIGhpZGVGaW5kSW5kaWNh dG9yKCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgc2hvdWxkU2hvd092ZXJsYXkgPSBmaW5kT3B0 aW9ucyAmIEZpbmRPcHRpb25zU2hvd092ZXJsYXk7CiAKQEAgLTg5LDcgKzg4LDcgQEAgdm9pZCBG aW5kQ29udHJvbGxlcjo6ZmluZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywgRmluZERpcmVj dGlvbiBmaW5kRGlyZWN0aW8KIAogICAgICAgICBpZiAoIShmaW5kT3B0aW9ucyAmIEZpbmRPcHRp b25zU2hvd0ZpbmRJbmRpY2F0b3IpIHx8ICF1cGRhdGVGaW5kSW5kaWNhdG9yKHNlbGVjdGVkRnJh bWUsIHNob3VsZFNob3dPdmVybGF5KSkgewogICAgICAgICAgICAgLy8gRWl0aGVyIHdlIHNob3Vs ZG4ndCBzaG93IHRoZSBmaW5kIGluZGljYXRvciwgb3Igd2UgY291bGRuJ3QgdXBkYXRlIGl0Lgot ICAgICAgICAgICAgcmVzZXRGaW5kSW5kaWNhdG9yKCk7CisgICAgICAgICAgICBoaWRlRmluZElu ZGljYXRvcigpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0xMTUsNyArMTE0LDEwIEBAIHZvaWQg RmluZENvbnRyb2xsZXI6OmZpbmRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmREaXJl Y3Rpb24gZmluZERpcmVjdGlvCiAKIHZvaWQgRmluZENvbnRyb2xsZXI6OmhpZGVGaW5kVUkoKQog ewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgaWYgKG1fZmluZFBhZ2VPdmVybGF5KQor ICAgICAgICBtX3dlYlBhZ2UtPnVuaW5zdGFsbFBhZ2VPdmVybGF5KCk7CisKKyAgICBoaWRlRmlu ZEluZGljYXRvcigpOwogfQogCiB2b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kUGFnZU92ZXJsYXlE ZXN0cm95ZWQoKQpAQCAtMTY4LDcgKzE3MCw3IEBAIGJvb2wgRmluZENvbnRyb2xsZXI6OnVwZGF0 ZUZpbmRJbmRpY2F0b3IoRnJhbWUqIHNlbGVjdGVkRnJhbWUsIGJvb2wgaXNTaG93aW5nT3ZlCiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgRmluZENvbnRyb2xsZXI6OnJlc2V0RmluZEluZGlj YXRvcigpCit2b2lkIEZpbmRDb250cm9sbGVyOjpoaWRlRmluZEluZGljYXRvcigpCiB7CiAgICAg aWYgKCFtX2lzU2hvd2luZ0ZpbmRJbmRpY2F0b3IpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdp dCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmggYi9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5oCmluZGV4IDVhYjMyMjY3YjM2YzA3 YzgyNDExOGZjODE4NWVhYzQ2MzljNWUyOGQuLjNhYThiMTBmNGFhMDg4Zjk4NjEwZDkyY2NjNTU0 YWNmOWZlYzNkZDMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRD b250cm9sbGVyLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xs ZXIuaApAQCAtNTAsOSArNTAsMTAgQEAgcHVibGljOgogCiAgICAgdm9pZCBmaW5kUGFnZU92ZXJs YXlEZXN0cm95ZWQoKTsKIAorICAgIHZvaWQgaGlkZUZpbmRJbmRpY2F0b3IoKTsKKwogcHJpdmF0 ZToKICAgICBib29sIHVwZGF0ZUZpbmRJbmRpY2F0b3IoV2ViQ29yZTo6RnJhbWUqIHNlbGVjdGVk RnJhbWUsIGJvb2wgaXNTaG93aW5nT3ZlcmxheSk7Ci0gICAgdm9pZCByZXNldEZpbmRJbmRpY2F0 b3IoKTsKICAgICAKICAgICBXZWJQYWdlKiBtX3dlYlBhZ2U7CiAgICAgRmluZFBhZ2VPdmVybGF5 KiBtX2ZpbmRQYWdlT3ZlcmxheTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK aW5kZXggNjBhMjE4YzYyZmFjY2ZjMGFlN2Y1YjlhNjU1Mjc4NDI1OWUyMDM2MS4uOWU1MmQ0OGUz NmM4MWUzOTA0ZDljZDdiZTU0YjFkMmI5ZDBhNmQ3MiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKQEAgLTQyNCw2ICs0MjQsNyBAQCB2b2lkIFdlYlBhZ2U6Omluc3RhbGxQ YWdlT3ZlcmxheShQYXNzT3duUHRyPFBhZ2VPdmVybGF5PiBwYWdlT3ZlcmxheSkKIHZvaWQgV2Vi UGFnZTo6dW5pbnN0YWxsUGFnZU92ZXJsYXkoKQogewogICAgIG1fcGFnZU92ZXJsYXkgPSAwOwor ICAgIG1fZHJhd2luZ0FyZWEtPnNldE5lZWRzRGlzcGxheShJbnRSZWN0KEludFBvaW50KDAsIDAp LCBtX3ZpZXdTaXplKSk7CiB9CiAKIC8vIEV2ZW50cyAKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaAppbmRleCA1YzJiZjE5YzNkZmZhZWRiNjYwYTA5MTI5OWZmNGEwYWUyYjk0MGNiLi45 YmUyNzJhNjIzNTAxNjFiNDdhZjIzODdlNDY0ZmJmM2FiNGI3N2Q1IDEwMDY0NAotLS0gYS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0xNjMsNiArMTYzLDggQEAgcHVibGljOgogCiAgICAgc3Rh dGljIGNvbnN0IFdlYkV2ZW50KiBjdXJyZW50RXZlbnQoKTsKIAorICAgIEZpbmRDb250cm9sbGVy JiBmaW5kQ29udHJvbGxlcigpIHsgcmV0dXJuIG1fZmluZENvbnRyb2xsZXI7IH0KKwogcHJpdmF0 ZToKICAgICBXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFy YW1ldGVycyYpOwogCg==