132988 2014-05-16 04:56:32 -0700 Link search area for touch events is too large in some cases 2014-05-16 13:54:53 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned enrica simon.fraser oldest_to_newest 1009744 0 koivisto 2014-05-16 04:56:32 -0700 We select nearby links too eagerly with some devices and zoom levels. 1009746 1 koivisto 2014-05-16 04:56:59 -0700 <rdar://problem/16917843> 1009747 2 231568 koivisto 2014-05-16 05:06:20 -0700 Created attachment 231568 patch 1009756 3 231570 koivisto 2014-05-16 06:45:44 -0700 Created attachment 231570 patch2 1009770 4 231570 simon.fraser 2014-05-16 09:13:13 -0700 Comment on attachment 231570 patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=231570&action=review > Source/WebCore/platform/PlatformScreen.h:69 > + float mainScreenRelativePPI(); Relative to what? 1009819 5 231585 koivisto 2014-05-16 12:41:06 -0700 Created attachment 231585 patch3 now with missing PlatformScreen implementation 1009821 6 koivisto 2014-05-16 12:42:50 -0700 (In reply to comment #4) > Relative to what? Relative to the regular iPhone PPI 163. 1009828 7 231585 simon.fraser 2014-05-16 13:14:01 -0700 Comment on attachment 231585 patch3 View in context: https://bugs.webkit.org/attachment.cgi?id=231585&action=review > Source/WebCore/page/ios/FrameIOS.mm:435 > + float scale = page() ? page()->pageScaleFactor() : 1; I don't know how we'd ever get here with a null page. > Source/WebCore/page/ios/FrameIOS.mm:-469 > - // We don't approximate the node if we are dragging, we instead force the user to be precise. Did the code related to this comment disappear some time in the past? > Source/WebCore/platform/ios/PlatformScreenIOS.mm:102 > +float mainScreenRelativePPI() This name still confuses me. It sounds more like a screenPPIFactor(), and a comment in the header should say what it's relative to. 1009829 8 koivisto 2014-05-16 13:22:57 -0700 (In reply to comment #7) > I don't know how we'd ever get here with a null page. Probably can't. > Did the code related to this comment disappear some time in the past? I think so. It didn't make sense where it was. > > Source/WebCore/platform/ios/PlatformScreenIOS.mm:102 > > +float mainScreenRelativePPI() > > This name still confuses me. It sounds more like a screenPPIFactor(), and a comment in the header should say what it's relative to. Will rename, thanks. 1009833 9 koivisto 2014-05-16 13:54:53 -0700 http://trac.webkit.org/changeset/168977 231568 2014-05-16 05:06:20 -0700 2014-05-16 06:45:44 -0700 patch touch-link-search-webcore.patch text/plain 3843 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODk2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA1LTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5rIHNlYXJjaCBhcmVhIGZv ciB0b3VjaCBldmVudHMgaXMgdG9vIGxhcmdlIGluIHNvbWUgY2FzZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjk4OAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTY5MTc4NDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwYWdlL2lvcy9GcmFtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lOjpxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbik6CisgICAgICAgIAorICAgICAg ICAgICAgLSBBZGp1c3QgdGhlIHNlYXJjaCBhcmVhIHRvIHNjcmVlbiBwcGkuCisgICAgICAgICAg ICAtIFJlbW92ZSBjdXQtb2ZmIGF0IHNjYWxlIDEuIFRoaXMgbWFkZSB1cyBwaWNrIHBoeXNpY2Fs bHkgZmFyLWF3YXkgZWxlbWVudHMgd2hlbiB6b29tZWQgaW4uCisKIDIwMTQtMDUtMTYgIEtpcmFu ICA8a2lyYW4uZ3VkdXJ1QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJUQ0R0bWZTZW5kZXIgZGVm YXVsdCB2YWx1ZXMgbmVlZCB0byBiZSB1cGRhdGVkLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFn ZS9pb3MvRnJhbWVJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9pb3Mv RnJhbWVJT1MubW0JKHJldmlzaW9uIDE2ODg5NikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvaW9z L0ZyYW1lSU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03MCw2ICs3MCw4IEBACiAjaW1wb3J0ICJX ZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgiCiAjaW1wb3J0IDxydW50aW1lL0pTTG9jay5oPgogCisj aW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvRnJhbWVJT1NUb3VjaC5jcHA+CisKIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOjpIVE1MTmFtZXM7CiB1c2luZyBuYW1lc3BhY2UgV1RGOjpVbmljb2RlOwog CkBAIC00MjksMTIgKzQzMSwxNSBAQCBOb2RlKiBGcmFtZTo6cXVhbGlmeWluZ05vZGVBdFZpZXdw b3J0TG9jCiAgICAgICAgICAgICBzaG91bGRBcHByb3hpbWF0ZSA9IGZhbHNlOwogICAgIH0KICNl bmRpZgotICAgIGlmIChhcHByb3hpbWF0ZU5vZGUgJiYgc2hvdWxkQXBwcm94aW1hdGUpIHsKLSAg ICAgICAgZmxvYXQgc2NhbGUgPSBwYWdlKCkgPyBwYWdlKCktPnBhZ2VTY2FsZUZhY3RvcigpIDog MTsKIAotICAgICAgICBjb25zdCBpbnQgZGVmYXVsdE1heFJhZGl1cyA9IDE1OwotICAgICAgICBp bnQgbWF4UmFkaXVzID0gc2NhbGUgPCAxID8gc3RhdGljX2Nhc3Q8aW50PihkZWZhdWx0TWF4UmFk aXVzIC8gc2NhbGUpIDogZGVmYXVsdE1heFJhZGl1czsKIAorICAgIGZsb2F0IHNjYWxlID0gcGFn ZSgpID8gcGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKSA6IDE7CisgICAgZmxvYXQgcHBpQWRqdXN0 ID0gbWFpblNjcmVlblBQSUFkanVzdCgpOworCisgICAgc3RhdGljIGNvbnN0IGZsb2F0IHVuc2Nh bGVkU2VhcmNoUmFkaXVzID0gMTU7CisgICAgaW50IHNlYXJjaFJhZGl1cyA9IHN0YXRpY19jYXN0 PGludD4odW5zY2FsZWRTZWFyY2hSYWRpdXMgKiBwcGlBZGp1c3QgLyBzY2FsZSk7CisKKyAgICBp ZiAoYXBwcm94aW1hdGVOb2RlICYmIHNob3VsZEFwcHJveGltYXRlKSB7CiAgICAgICAgIGNvbnN0 IGZsb2F0IHRlc3RPZmZzZXRzW10gPSB7CiAgICAgICAgICAgICAtLjNmLCAtLjNmLAogICAgICAg ICAgICAgLS42ZiwgLS42ZiwKQEAgLTQ0NCw3ICs0NDksNyBAQCBOb2RlKiBGcmFtZTo6cXVhbGlm eWluZ05vZGVBdFZpZXdwb3J0TG9jCiAKICAgICAgICAgTm9kZSogb3JpZ2luYWxBcHByb3hpbWF0 ZU5vZGUgPSBhcHByb3hpbWF0ZU5vZGU7CiAgICAgICAgIGZvciAodW5zaWduZWQgbiA9IDA7IG4g PCBXVEZfQVJSQVlfTEVOR1RIKHRlc3RPZmZzZXRzKTsgbiArPSAyKSB7Ci0gICAgICAgICAgICBJ bnRTaXplIHRlc3RPZmZzZXQodGVzdE9mZnNldHNbbl0gKiBtYXhSYWRpdXMsIHRlc3RPZmZzZXRz W24gKyAxXSAqIG1heFJhZGl1cyk7CisgICAgICAgICAgICBJbnRTaXplIHRlc3RPZmZzZXQodGVz dE9mZnNldHNbbl0gKiBzZWFyY2hSYWRpdXMsIHRlc3RPZmZzZXRzW24gKyAxXSAqIHNlYXJjaFJh ZGl1cyk7CiAgICAgICAgICAgICBJbnRQb2ludCB0ZXN0UG9pbnQgPSB0ZXN0Q2VudGVyICsgdGVz dE9mZnNldDsKIAogICAgICAgICAgICAgSGl0VGVzdFJlc3VsdCBjYW5kaWRhdGVJbmZvID0gZXZl bnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0UG9pbnQodGVzdFBvaW50KTsKQEAgLTQ2NiwxMiAr NDcxLDYgQEAgTm9kZSogRnJhbWU6OnF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvYwogICAgICAg ICBpZiAoY2FuZGlkYXRlKQogICAgICAgICAgICAgZmFpbGVkTm9kZSA9IGNhbmRpZGF0ZTsKIAot ICAgICAgICAvLyBXZSBkb24ndCBhcHByb3hpbWF0ZSB0aGUgbm9kZSBpZiB3ZSBhcmUgZHJhZ2dp bmcsIHdlIGluc3RlYWQgZm9yY2UgdGhlIHVzZXIgdG8gYmUgcHJlY2lzZS4KLSAgICAgICAgZmxv YXQgc2NhbGUgPSBwYWdlKCkgPyBwYWdlKCktPnBhZ2VTY2FsZUZhY3RvcigpIDogMTsKLQotICAg ICAgICBjb25zdCBpbnQgZGVmYXVsdE1heFJhZGl1cyA9IDE1OwotICAgICAgICBpbnQgbWF4UmFk aXVzID0gKHNjYWxlIDwgMS4wKSA/IHN0YXRpY19jYXN0PGludD4oZGVmYXVsdE1heFJhZGl1cyAv IHNjYWxlKSA6IGRlZmF1bHRNYXhSYWRpdXM7Ci0KICAgICAgICAgLy8gVGhlIGNlbnRlciBwb2lu dCB3YXMgdGVzdGVkIGVhcmxpZXIuCiAgICAgICAgIGNvbnN0IGZsb2F0IHRlc3RPZmZzZXRzW10g PSB7CiAgICAgICAgICAgICAtLjNmLCAtLjNmLApAQCAtNDg5LDEwICs0ODgsMTAgQEAgTm9kZSog RnJhbWU6OnF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvYwogICAgICAgICB9OwogICAgICAgICBJ bnRSZWN0IGJlc3RGcmFtZTsKICAgICAgICAgSW50UmVjdCB0ZXN0UmVjdCh0ZXN0Q2VudGVyLCBJ bnRTaXplKCkpOwotICAgICAgICB0ZXN0UmVjdC5pbmZsYXRlKG1heFJhZGl1cyk7CisgICAgICAg IHRlc3RSZWN0LmluZmxhdGUoc2VhcmNoUmFkaXVzKTsKICAgICAgICAgaW50IGN1cnJlbnRUZXN0 UmFkaXVzID0gMDsKICAgICAgICAgZm9yICh1bnNpZ25lZCBuID0gMDsgbiA8IFdURl9BUlJBWV9M RU5HVEgodGVzdE9mZnNldHMpOyBuICs9IDIpIHsKLSAgICAgICAgICAgIEludFNpemUgdGVzdE9m ZnNldCh0ZXN0T2Zmc2V0c1tuXSAqIG1heFJhZGl1cywgdGVzdE9mZnNldHNbbiArIDFdICogbWF4 UmFkaXVzKTsKKyAgICAgICAgICAgIEludFNpemUgdGVzdE9mZnNldCh0ZXN0T2Zmc2V0c1tuXSAq IHNlYXJjaFJhZGl1cywgdGVzdE9mZnNldHNbbiArIDFdICogc2VhcmNoUmFkaXVzKTsKICAgICAg ICAgICAgIEludFBvaW50IHRlc3RQb2ludCA9IHRlc3RDZW50ZXIgKyB0ZXN0T2Zmc2V0OwogICAg ICAgICAgICAgaW50IHRlc3RSYWRpdXMgPSBzdGQ6Om1heChhYnModGVzdE9mZnNldC53aWR0aCgp KSwgYWJzKHRlc3RPZmZzZXQuaGVpZ2h0KCkpKTsKICAgICAgICAgICAgIGlmICh0ZXN0UmFkaXVz ID4gY3VycmVudFRlc3RSYWRpdXMpIHsK 231570 2014-05-16 06:45:44 -0700 2014-05-16 12:41:06 -0700 patch2 touch-link-search-webcore-2.patch text/plain 4891 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODk2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA1LTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5rIHNlYXJjaCBhcmVhIGZv ciB0b3VjaCBldmVudHMgaXMgdG9vIGxhcmdlIGluIHNvbWUgY2FzZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjk4OAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTY5MTc4NDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwYWdlL2lvcy9GcmFtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lOjpxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbik6CisgICAgICAgIAorICAgICAg ICAgICAgLSBBZGp1c3QgdGhlIHNlYXJjaCBhcmVhIHRvIHNjcmVlbiBwcGkuCisgICAgICAgICAg ICAtIFJlbW92ZSBjdXQtb2ZmIGF0IHNjYWxlIDEuIFRoaXMgbWFkZSB1cyBwaWNrIHBoeXNpY2Fs bHkgZmFyLWF3YXkgZWxlbWVudHMgd2hlbiB6b29tZWQgaW4uCisgICAgICAgICAgICAKKyAgICAg ICAgKiBwbGF0Zm9ybS9QbGF0Zm9ybVNjcmVlbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9Q bGF0Zm9ybVNjcmVlbklPUy5tbToKKwogMjAxNC0wNS0xNiAgS2lyYW4gIDxraXJhbi5ndWR1cnVA c2Ftc3VuZy5jb20+CiAKICAgICAgICAgUlRDRHRtZlNlbmRlciBkZWZhdWx0IHZhbHVlcyBuZWVk IHRvIGJlIHVwZGF0ZWQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQkocmV2 aXNpb24gMTY4ODk2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0JKHdv cmtpbmcgY29weSkKQEAgLTU3LDYgKzU3LDcgQEAKICNpbXBvcnQgIk5vZGVUcmF2ZXJzYWwuaCIK ICNpbXBvcnQgIlBhZ2UuaCIKICNpbXBvcnQgIlBhZ2VUcmFuc2l0aW9uRXZlbnQuaCIKKyNpbXBv cnQgIlBsYXRmb3JtU2NyZWVuLmgiCiAjaW1wb3J0ICJQcm9wZXJ0eVNldENTU1N0eWxlRGVjbGFy YXRpb24uaCIKICNpbXBvcnQgIlJlbmRlckxheWVyLmgiCiAjaW1wb3J0ICJSZW5kZXJMYXllckNv bXBvc2l0b3IuaCIKQEAgLTQyOSwxMiArNDMwLDE1IEBAIE5vZGUqIEZyYW1lOjpxdWFsaWZ5aW5n Tm9kZUF0Vmlld3BvcnRMb2MKICAgICAgICAgICAgIHNob3VsZEFwcHJveGltYXRlID0gZmFsc2U7 CiAgICAgfQogI2VuZGlmCi0gICAgaWYgKGFwcHJveGltYXRlTm9kZSAmJiBzaG91bGRBcHByb3hp bWF0ZSkgewotICAgICAgICBmbG9hdCBzY2FsZSA9IHBhZ2UoKSA/IHBhZ2UoKS0+cGFnZVNjYWxl RmFjdG9yKCkgOiAxOwogCi0gICAgICAgIGNvbnN0IGludCBkZWZhdWx0TWF4UmFkaXVzID0gMTU7 Ci0gICAgICAgIGludCBtYXhSYWRpdXMgPSBzY2FsZSA8IDEgPyBzdGF0aWNfY2FzdDxpbnQ+KGRl ZmF1bHRNYXhSYWRpdXMgLyBzY2FsZSkgOiBkZWZhdWx0TWF4UmFkaXVzOwogCisgICAgZmxvYXQg c2NhbGUgPSBwYWdlKCkgPyBwYWdlKCktPnBhZ2VTY2FsZUZhY3RvcigpIDogMTsKKyAgICBmbG9h dCBwcGlBZGp1c3RtZW50ID0gbWFpblNjcmVlblJlbGF0aXZlUFBJKCk7CisKKyAgICBzdGF0aWMg Y29uc3QgZmxvYXQgdW5zY2FsZWRTZWFyY2hSYWRpdXMgPSAxNTsKKyAgICBpbnQgc2VhcmNoUmFk aXVzID0gc3RhdGljX2Nhc3Q8aW50Pih1bnNjYWxlZFNlYXJjaFJhZGl1cyAqIHBwaUFkanVzdG1l bnQgLyBzY2FsZSk7CisKKyAgICBpZiAoYXBwcm94aW1hdGVOb2RlICYmIHNob3VsZEFwcHJveGlt YXRlKSB7CiAgICAgICAgIGNvbnN0IGZsb2F0IHRlc3RPZmZzZXRzW10gPSB7CiAgICAgICAgICAg ICAtLjNmLCAtLjNmLAogICAgICAgICAgICAgLS42ZiwgLS42ZiwKQEAgLTQ0NCw3ICs0NDgsNyBA QCBOb2RlKiBGcmFtZTo6cXVhbGlmeWluZ05vZGVBdFZpZXdwb3J0TG9jCiAKICAgICAgICAgTm9k ZSogb3JpZ2luYWxBcHByb3hpbWF0ZU5vZGUgPSBhcHByb3hpbWF0ZU5vZGU7CiAgICAgICAgIGZv ciAodW5zaWduZWQgbiA9IDA7IG4gPCBXVEZfQVJSQVlfTEVOR1RIKHRlc3RPZmZzZXRzKTsgbiAr PSAyKSB7Ci0gICAgICAgICAgICBJbnRTaXplIHRlc3RPZmZzZXQodGVzdE9mZnNldHNbbl0gKiBt YXhSYWRpdXMsIHRlc3RPZmZzZXRzW24gKyAxXSAqIG1heFJhZGl1cyk7CisgICAgICAgICAgICBJ bnRTaXplIHRlc3RPZmZzZXQodGVzdE9mZnNldHNbbl0gKiBzZWFyY2hSYWRpdXMsIHRlc3RPZmZz ZXRzW24gKyAxXSAqIHNlYXJjaFJhZGl1cyk7CiAgICAgICAgICAgICBJbnRQb2ludCB0ZXN0UG9p bnQgPSB0ZXN0Q2VudGVyICsgdGVzdE9mZnNldDsKIAogICAgICAgICAgICAgSGl0VGVzdFJlc3Vs dCBjYW5kaWRhdGVJbmZvID0gZXZlbnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0UG9pbnQodGVz dFBvaW50KTsKQEAgLTQ2NiwxMiArNDcwLDYgQEAgTm9kZSogRnJhbWU6OnF1YWxpZnlpbmdOb2Rl QXRWaWV3cG9ydExvYwogICAgICAgICBpZiAoY2FuZGlkYXRlKQogICAgICAgICAgICAgZmFpbGVk Tm9kZSA9IGNhbmRpZGF0ZTsKIAotICAgICAgICAvLyBXZSBkb24ndCBhcHByb3hpbWF0ZSB0aGUg bm9kZSBpZiB3ZSBhcmUgZHJhZ2dpbmcsIHdlIGluc3RlYWQgZm9yY2UgdGhlIHVzZXIgdG8gYmUg cHJlY2lzZS4KLSAgICAgICAgZmxvYXQgc2NhbGUgPSBwYWdlKCkgPyBwYWdlKCktPnBhZ2VTY2Fs ZUZhY3RvcigpIDogMTsKLQotICAgICAgICBjb25zdCBpbnQgZGVmYXVsdE1heFJhZGl1cyA9IDE1 OwotICAgICAgICBpbnQgbWF4UmFkaXVzID0gKHNjYWxlIDwgMS4wKSA/IHN0YXRpY19jYXN0PGlu dD4oZGVmYXVsdE1heFJhZGl1cyAvIHNjYWxlKSA6IGRlZmF1bHRNYXhSYWRpdXM7Ci0KICAgICAg ICAgLy8gVGhlIGNlbnRlciBwb2ludCB3YXMgdGVzdGVkIGVhcmxpZXIuCiAgICAgICAgIGNvbnN0 IGZsb2F0IHRlc3RPZmZzZXRzW10gPSB7CiAgICAgICAgICAgICAtLjNmLCAtLjNmLApAQCAtNDg5 LDEwICs0ODcsMTAgQEAgTm9kZSogRnJhbWU6OnF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExvYwog ICAgICAgICB9OwogICAgICAgICBJbnRSZWN0IGJlc3RGcmFtZTsKICAgICAgICAgSW50UmVjdCB0 ZXN0UmVjdCh0ZXN0Q2VudGVyLCBJbnRTaXplKCkpOwotICAgICAgICB0ZXN0UmVjdC5pbmZsYXRl KG1heFJhZGl1cyk7CisgICAgICAgIHRlc3RSZWN0LmluZmxhdGUoc2VhcmNoUmFkaXVzKTsKICAg ICAgICAgaW50IGN1cnJlbnRUZXN0UmFkaXVzID0gMDsKICAgICAgICAgZm9yICh1bnNpZ25lZCBu ID0gMDsgbiA8IFdURl9BUlJBWV9MRU5HVEgodGVzdE9mZnNldHMpOyBuICs9IDIpIHsKLSAgICAg ICAgICAgIEludFNpemUgdGVzdE9mZnNldCh0ZXN0T2Zmc2V0c1tuXSAqIG1heFJhZGl1cywgdGVz dE9mZnNldHNbbiArIDFdICogbWF4UmFkaXVzKTsKKyAgICAgICAgICAgIEludFNpemUgdGVzdE9m ZnNldCh0ZXN0T2Zmc2V0c1tuXSAqIHNlYXJjaFJhZGl1cywgdGVzdE9mZnNldHNbbiArIDFdICog c2VhcmNoUmFkaXVzKTsKICAgICAgICAgICAgIEludFBvaW50IHRlc3RQb2ludCA9IHRlc3RDZW50 ZXIgKyB0ZXN0T2Zmc2V0OwogICAgICAgICAgICAgaW50IHRlc3RSYWRpdXMgPSBzdGQ6Om1heChh YnModGVzdE9mZnNldC53aWR0aCgpKSwgYWJzKHRlc3RPZmZzZXQuaGVpZ2h0KCkpKTsKICAgICAg ICAgICAgIGlmICh0ZXN0UmFkaXVzID4gY3VycmVudFRlc3RSYWRpdXMpIHsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtU2NyZWVuLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAkocmV2aXNpb24gMTY4ODk2KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGxhdGZvcm1TY3JlZW4uaAkod29ya2luZyBjb3B5KQpA QCAtNjUsNiArNjUsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIE5TUG9pbnQgZmxpcFNj cmVlblBvaW50KGNvbnN0IE5TUG9pbnQmLCBOU1NjcmVlbiAqKTsKICNlbmRpZgogCisjaWYgUExB VEZPUk0oSU9TKQorICAgIGZsb2F0IG1haW5TY3JlZW5SZWxhdGl2ZVBQSSgpOworI2VuZGlmCisK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFBsYXRmb3JtU2NyZWVuX2gKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVNjcmVlbklPUy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1TY3JlZW5JT1Mu bW0JKHJldmlzaW9uIDE2ODg5NikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0 Zm9ybVNjcmVlbklPUy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzQsNiArMzQsOCBAQAogI2ltcG9y dCAiV2ViQ29yZVN5c3RlbUludGVyZmFjZS5oIgogI2ltcG9ydCAiV2lkZ2V0LmgiCiAKKyNpbXBv cnQgPFdlYktpdEFkZGl0aW9ucy9QbGF0Zm9ybVNjcmVlbklPU0FkZGl0aW9ucy5jcHA+CisKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogaW50IHNjcmVlbkRlcHRoKFdpZGdldCopCg== 231585 2014-05-16 12:41:06 -0700 2014-05-16 13:14:01 -0700 patch3 touch-link-search-webcore-3.patch text/plain 6078 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODk2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA1LTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBMaW5rIHNlYXJjaCBhcmVhIGZv ciB0b3VjaCBldmVudHMgaXMgdG9vIGxhcmdlIGluIHNvbWUgY2FzZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjk4OAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTY5MTc4NDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwYWdlL2lvcy9GcmFtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lOjpxdWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2NhdGlvbik6CisgICAgICAgIAorICAgICAg ICAgICAgLSBBZGp1c3QgdGhlIHNlYXJjaCBhcmVhIHRvIHNjcmVlbiBwcGkuCisgICAgICAgICAg ICAtIFJlbW92ZSBjdXQtb2ZmIGF0IHNjYWxlIDEuIFRoaXMgbWFkZSB1cyBwaWNrIHBoeXNpY2Fs bHkgZmFyLWF3YXkgZWxlbWVudHMgd2hlbiB6b29tZWQgaW4uCisgICAgICAgICAgICAKKyAgICAg ICAgKiBwbGF0Zm9ybS9QbGF0Zm9ybVNjcmVlbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9Q bGF0Zm9ybVNjcmVlbklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6Om1vYmlsZUdlc3RhbHRGbG9h dFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6Om1haW5TY3JlZW5SZWxhdGl2ZVBQSSk6CisKKyAg ICAgICAgICAgIEZpZ3VyZSBvdXQgc2NyZWVucyBwaHlzaWNhbCBQUEkgcmVsYXRpdmUgdG8gYSBi YXNlLgorCiAyMDE0LTA1LTE2ICBLaXJhbiAgPGtpcmFuLmd1ZHVydUBzYW1zdW5nLmNvbT4KIAog ICAgICAgICBSVENEdG1mU2VuZGVyIGRlZmF1bHQgdmFsdWVzIG5lZWQgdG8gYmUgdXBkYXRlZC4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0ZyYW1lSU9TLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0ZyYW1lSU9TLm1tCShyZXZpc2lvbiAxNjg4OTYpCisr KyBTb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQkod29ya2luZyBjb3B5KQpAQCAt NTcsNiArNTcsNyBAQAogI2ltcG9ydCAiTm9kZVRyYXZlcnNhbC5oIgogI2ltcG9ydCAiUGFnZS5o IgogI2ltcG9ydCAiUGFnZVRyYW5zaXRpb25FdmVudC5oIgorI2ltcG9ydCAiUGxhdGZvcm1TY3Jl ZW4uaCIKICNpbXBvcnQgIlByb3BlcnR5U2V0Q1NTU3R5bGVEZWNsYXJhdGlvbi5oIgogI2ltcG9y dCAiUmVuZGVyTGF5ZXIuaCIKICNpbXBvcnQgIlJlbmRlckxheWVyQ29tcG9zaXRvci5oIgpAQCAt NDI5LDEyICs0MzAsMTUgQEAgTm9kZSogRnJhbWU6OnF1YWxpZnlpbmdOb2RlQXRWaWV3cG9ydExv YwogICAgICAgICAgICAgc2hvdWxkQXBwcm94aW1hdGUgPSBmYWxzZTsKICAgICB9CiAjZW5kaWYK LSAgICBpZiAoYXBwcm94aW1hdGVOb2RlICYmIHNob3VsZEFwcHJveGltYXRlKSB7Ci0gICAgICAg IGZsb2F0IHNjYWxlID0gcGFnZSgpID8gcGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKSA6IDE7CiAK LSAgICAgICAgY29uc3QgaW50IGRlZmF1bHRNYXhSYWRpdXMgPSAxNTsKLSAgICAgICAgaW50IG1h eFJhZGl1cyA9IHNjYWxlIDwgMSA/IHN0YXRpY19jYXN0PGludD4oZGVmYXVsdE1heFJhZGl1cyAv IHNjYWxlKSA6IGRlZmF1bHRNYXhSYWRpdXM7CiAKKyAgICBmbG9hdCBzY2FsZSA9IHBhZ2UoKSA/ IHBhZ2UoKS0+cGFnZVNjYWxlRmFjdG9yKCkgOiAxOworICAgIGZsb2F0IHBwaUFkanVzdG1lbnQg PSBtYWluU2NyZWVuUmVsYXRpdmVQUEkoKTsKKworICAgIHN0YXRpYyBjb25zdCBmbG9hdCB1bnNj YWxlZFNlYXJjaFJhZGl1cyA9IDE1OworICAgIGludCBzZWFyY2hSYWRpdXMgPSBzdGF0aWNfY2Fz dDxpbnQ+KHVuc2NhbGVkU2VhcmNoUmFkaXVzICogcHBpQWRqdXN0bWVudCAvIHNjYWxlKTsKKwor ICAgIGlmIChhcHByb3hpbWF0ZU5vZGUgJiYgc2hvdWxkQXBwcm94aW1hdGUpIHsKICAgICAgICAg Y29uc3QgZmxvYXQgdGVzdE9mZnNldHNbXSA9IHsKICAgICAgICAgICAgIC0uM2YsIC0uM2YsCiAg ICAgICAgICAgICAtLjZmLCAtLjZmLApAQCAtNDQ0LDcgKzQ0OCw3IEBAIE5vZGUqIEZyYW1lOjpx dWFsaWZ5aW5nTm9kZUF0Vmlld3BvcnRMb2MKIAogICAgICAgICBOb2RlKiBvcmlnaW5hbEFwcHJv eGltYXRlTm9kZSA9IGFwcHJveGltYXRlTm9kZTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBuID0g MDsgbiA8IFdURl9BUlJBWV9MRU5HVEgodGVzdE9mZnNldHMpOyBuICs9IDIpIHsKLSAgICAgICAg ICAgIEludFNpemUgdGVzdE9mZnNldCh0ZXN0T2Zmc2V0c1tuXSAqIG1heFJhZGl1cywgdGVzdE9m ZnNldHNbbiArIDFdICogbWF4UmFkaXVzKTsKKyAgICAgICAgICAgIEludFNpemUgdGVzdE9mZnNl dCh0ZXN0T2Zmc2V0c1tuXSAqIHNlYXJjaFJhZGl1cywgdGVzdE9mZnNldHNbbiArIDFdICogc2Vh cmNoUmFkaXVzKTsKICAgICAgICAgICAgIEludFBvaW50IHRlc3RQb2ludCA9IHRlc3RDZW50ZXIg KyB0ZXN0T2Zmc2V0OwogCiAgICAgICAgICAgICBIaXRUZXN0UmVzdWx0IGNhbmRpZGF0ZUluZm8g PSBldmVudEhhbmRsZXIoKS5oaXRUZXN0UmVzdWx0QXRQb2ludCh0ZXN0UG9pbnQpOwpAQCAtNDY2 LDEyICs0NzAsNiBAQCBOb2RlKiBGcmFtZTo6cXVhbGlmeWluZ05vZGVBdFZpZXdwb3J0TG9jCiAg ICAgICAgIGlmIChjYW5kaWRhdGUpCiAgICAgICAgICAgICBmYWlsZWROb2RlID0gY2FuZGlkYXRl OwogCi0gICAgICAgIC8vIFdlIGRvbid0IGFwcHJveGltYXRlIHRoZSBub2RlIGlmIHdlIGFyZSBk cmFnZ2luZywgd2UgaW5zdGVhZCBmb3JjZSB0aGUgdXNlciB0byBiZSBwcmVjaXNlLgotICAgICAg ICBmbG9hdCBzY2FsZSA9IHBhZ2UoKSA/IHBhZ2UoKS0+cGFnZVNjYWxlRmFjdG9yKCkgOiAxOwot Ci0gICAgICAgIGNvbnN0IGludCBkZWZhdWx0TWF4UmFkaXVzID0gMTU7Ci0gICAgICAgIGludCBt YXhSYWRpdXMgPSAoc2NhbGUgPCAxLjApID8gc3RhdGljX2Nhc3Q8aW50PihkZWZhdWx0TWF4UmFk aXVzIC8gc2NhbGUpIDogZGVmYXVsdE1heFJhZGl1czsKLQogICAgICAgICAvLyBUaGUgY2VudGVy IHBvaW50IHdhcyB0ZXN0ZWQgZWFybGllci4KICAgICAgICAgY29uc3QgZmxvYXQgdGVzdE9mZnNl dHNbXSA9IHsKICAgICAgICAgICAgIC0uM2YsIC0uM2YsCkBAIC00ODksMTAgKzQ4NywxMCBAQCBO b2RlKiBGcmFtZTo6cXVhbGlmeWluZ05vZGVBdFZpZXdwb3J0TG9jCiAgICAgICAgIH07CiAgICAg ICAgIEludFJlY3QgYmVzdEZyYW1lOwogICAgICAgICBJbnRSZWN0IHRlc3RSZWN0KHRlc3RDZW50 ZXIsIEludFNpemUoKSk7Ci0gICAgICAgIHRlc3RSZWN0LmluZmxhdGUobWF4UmFkaXVzKTsKKyAg ICAgICAgdGVzdFJlY3QuaW5mbGF0ZShzZWFyY2hSYWRpdXMpOwogICAgICAgICBpbnQgY3VycmVu dFRlc3RSYWRpdXMgPSAwOwogICAgICAgICBmb3IgKHVuc2lnbmVkIG4gPSAwOyBuIDwgV1RGX0FS UkFZX0xFTkdUSCh0ZXN0T2Zmc2V0cyk7IG4gKz0gMikgewotICAgICAgICAgICAgSW50U2l6ZSB0 ZXN0T2Zmc2V0KHRlc3RPZmZzZXRzW25dICogbWF4UmFkaXVzLCB0ZXN0T2Zmc2V0c1tuICsgMV0g KiBtYXhSYWRpdXMpOworICAgICAgICAgICAgSW50U2l6ZSB0ZXN0T2Zmc2V0KHRlc3RPZmZzZXRz W25dICogc2VhcmNoUmFkaXVzLCB0ZXN0T2Zmc2V0c1tuICsgMV0gKiBzZWFyY2hSYWRpdXMpOwog ICAgICAgICAgICAgSW50UG9pbnQgdGVzdFBvaW50ID0gdGVzdENlbnRlciArIHRlc3RPZmZzZXQ7 CiAgICAgICAgICAgICBpbnQgdGVzdFJhZGl1cyA9IHN0ZDo6bWF4KGFicyh0ZXN0T2Zmc2V0Lndp ZHRoKCkpLCBhYnModGVzdE9mZnNldC5oZWlnaHQoKSkpOwogICAgICAgICAgICAgaWYgKHRlc3RS YWRpdXMgPiBjdXJyZW50VGVzdFJhZGl1cykgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vUGxhdGZvcm1TY3JlZW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9QbGF0Zm9ybVNjcmVlbi5oCShyZXZpc2lvbiAxNjg4OTYpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9QbGF0Zm9ybVNjcmVlbi5oCSh3b3JraW5nIGNvcHkpCkBAIC02NSw2ICs2NSwxMCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgTlNQb2ludCBmbGlwU2NyZWVuUG9pbnQoY29uc3Qg TlNQb2ludCYsIE5TU2NyZWVuICopOwogI2VuZGlmCiAKKyNpZiBQTEFURk9STShJT1MpCisgICAg ZmxvYXQgbWFpblNjcmVlblJlbGF0aXZlUFBJKCk7CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQogCiAjZW5kaWYgLy8gUGxhdGZvcm1TY3JlZW5faApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtU2NyZWVuSU9TLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVNjcmVlbklPUy5tbQkocmV2aXNpb24gMTY4 ODk2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtU2NyZWVuSU9TLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW1wb3J0ICJXQUtXaW5kb3cuaCIK ICNpbXBvcnQgIldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKICNpbXBvcnQgIldpZGdldC5oIgor I2ltcG9ydCA8TW9iaWxlR2VzdGFsdC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTg3 LDQgKzg4LDMyIEBAIEZsb2F0UmVjdCBzY3JlZW5BdmFpbGFibGVSZWN0KFdpZGdldCogd2kKICAg ICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCB3aWRnZXQt PnJvb3QoKS0+aG9zdFdpbmRvdygpLT5hdmFpbGFibGVTY3JlZW5TaXplKCkpKTsKIH0KIAorc3Rh dGljIGZsb2F0IG1vYmlsZUdlc3RhbHRGbG9hdFZhbHVlKENGU3RyaW5nUmVmIHF1ZXN0aW9uKQor eworICAgIGZsb2F0IHJlc3VsdCA9IDA7CisgICAgaWYgKENGVHlwZVJlZiB2YWx1ZSA9IE1HQ29w eUFuc3dlcihxdWVzdGlvbiwgMCkpIHsKKyAgICAgICAgaWYgKENGR2V0VHlwZUlEKHZhbHVlKSA9 PSBDRk51bWJlckdldFR5cGVJRCgpKQorICAgICAgICAgICAgQ0ZOdW1iZXJHZXRWYWx1ZShzdGF0 aWNfY2FzdDxDRk51bWJlclJlZj4odmFsdWUpLCBrQ0ZOdW1iZXJGbG9hdFR5cGUsICZyZXN1bHQp OworICAgICAgICBDRlJlbGVhc2UodmFsdWUpOworICAgIH0KKyAgICByZXR1cm4gcmVzdWx0Owor fQorCitmbG9hdCBtYWluU2NyZWVuUmVsYXRpdmVQUEkoKQoreworICAgIHN0YXRpYyBmbG9hdCBy ZWxhdGl2ZVBQSTsKKworICAgIHN0YXRpYyBkaXNwYXRjaF9vbmNlX3Qgb25jZVRva2VuOworICAg IGRpc3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKKyAgICAgICAgZmxvYXQgcGl0Y2ggPSBtb2Jp bGVHZXN0YWx0RmxvYXRWYWx1ZShrTUdRTWFpblNjcmVlblBpdGNoKTsKKyAgICAgICAgZmxvYXQg c2NhbGUgPSBtb2JpbGVHZXN0YWx0RmxvYXRWYWx1ZShrTUdRTWFpblNjcmVlblNjYWxlKTsKKwor ICAgICAgICBzdGF0aWMgY29uc3QgZmxvYXQgb3JpZ2luYWxJUGhvbmVQUEkgPSAxNjM7CisgICAg ICAgIGZsb2F0IG1haW5TY3JlZW5QUEkgPSAocGl0Y2ggJiYgc2NhbGUpID8gcGl0Y2ggLyBzY2Fs ZSA6IG9yaWdpbmFsSVBob25lUFBJOworICAgICAgICByZWxhdGl2ZVBQSSA9IG1haW5TY3JlZW5Q UEkgLyBvcmlnaW5hbElQaG9uZVBQSTsKKyAgICB9KTsKKyAgICAKKyAgICByZXR1cm4gcmVsYXRp dmVQUEk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK