50153 2010-11-29 07:09:52 -0800 Spatial Navigation: Store more information in FocusCandidate 2010-11-29 07:45:34 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46905 1 yael webkit-unassigned tonikitoo oldest_to_newest 314388 0 yael 2010-11-29 07:09:52 -0800 This is based on comment https://bugs.webkit.org/show_bug.cgi?id=47142#c6. More information should be stored in FocusCandidate, to avoid recalculating it when running the spatial navigation algorithm. 314395 1 75025 yael 2010-11-29 07:15:56 -0800 Created attachment 75025 Patch. 314405 2 yael 2010-11-29 07:45:13 -0800 Committed r72797: <http://trac.webkit.org/changeset/72797> 75025 2010-11-29 07:15:56 -0800 2010-11-29 07:34:04 -0800 Patch. 50153.patch text/plain 6765 yael SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3Mjc5NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMTEtMjkgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFNwYXRpYWwgTmF2aWdhdGlvbjogU3RvcmUgbW9yZSBpbmZvcm1hdGlvbiBpbiBGb2N1c0NhbmRp ZGF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAx NTMKKworICAgICAgICBNb3JlIGluZm9ybWF0aW9uIHNob3VsZCBiZSBzdG9yZWQgaW4gRm9jdXND YW5kaWRhdGUsIHRvIGF2b2lkCisgICAgICAgIHJlY2FsY3VsYXRpbmcgaXQgd2hlbiBydW5uaW5n IHRoZSBzcGF0aWFsIG5hdmlnYXRpb24gYWxnb3JpdGhtLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cywgc2luY2UgdGhpcyBpcyBjb2RlIHJlZmFjdG9yaW5nIG9ubHkuCisKKyAgICAgICAgKiBwYWdl L0ZvY3VzQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjp1cGRhdGVGb2N1c0NhbmRp ZGF0ZUlmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6ZmluZEZv Y3VzQ2FuZGlkYXRlSW5Db250YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNDb250cm9s bGVyOjphZHZhbmNlRm9jdXNEaXJlY3Rpb25hbGx5SW5Db250YWluZXIpOgorICAgICAgICAqIHBh Z2UvU3BhdGlhbE5hdmlnYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNDYW5kaWRh dGU6OkZvY3VzQ2FuZGlkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OmNhbkJlU2Nyb2xsZWRJbnRv Vmlldyk6CisgICAgICAgICogcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5oOgorICAgICAgICAoV2Vi Q29yZTo6Rm9jdXNDYW5kaWRhdGU6OkZvY3VzQ2FuZGlkYXRlKToKKwogMjAxMC0xMS0yOSAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2luZG93cyBidWlsZCBmaXgg YWZ0ZXIgcjcyNzE1CkluZGV4OiBXZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNzI3 OTMpCisrKyBXZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDIyLDcgKzQyMiw3IEBAIHZvaWQgdXBkYXRlRm9jdXNDYW5kaWRhdGVJZk5lZWRlZChGb2N1 c0QKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gSWdub3JlIG9mZiBzY3JlZW4gY2hpbGQgbm9k ZXMgb2YgY29udGFpbmVycyB0aGF0IGRvIG5vdCBzY3JvbGwgKG92ZXJmbG93OmhpZGRlbikKLSAg ICBpZiAoaGFzT2Zmc2NyZWVuUmVjdChjYW5kaWRhdGUubm9kZSkgJiYgIWNhbkJlU2Nyb2xsZWRJ bnRvVmlldyhkaXJlY3Rpb24sIGNhbmRpZGF0ZSkpCisgICAgaWYgKGNhbmRpZGF0ZS5pc09mZnNj cmVlbiAmJiAhY2FuQmVTY3JvbGxlZEludG9WaWV3KGRpcmVjdGlvbiwgY2FuZGlkYXRlKSkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgRm9jdXNDYW5kaWRhdGUgY3VycmVudDsKQEAgLTQzMSw3ICs0 MzEsNyBAQCB2b2lkIHVwZGF0ZUZvY3VzQ2FuZGlkYXRlSWZOZWVkZWQoRm9jdXNECiAgICAgaWYg KGNhbmRpZGF0ZS5kaXN0YW5jZSA9PSBtYXhEaXN0YW5jZSgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAoaGFzT2Zmc2NyZWVuUmVjdChjYW5kaWRhdGUubm9kZSwgZGlyZWN0aW9uKSAmJiBj YW5kaWRhdGUuYWxpZ25tZW50IDwgRnVsbCkKKyAgICBpZiAoY2FuZGlkYXRlLmlzT2Zmc2NyZWVu QWZ0ZXJTY3JvbGxpbmcgJiYgY2FuZGlkYXRlLmFsaWdubWVudCA8IEZ1bGwpCiAgICAgICAgIHJl dHVybjsKIAogICAgIGlmIChjbG9zZXN0LmlzTnVsbCgpKSB7CkBAIC00MzksNyArNDM5LDcgQEAg dm9pZCB1cGRhdGVGb2N1c0NhbmRpZGF0ZUlmTmVlZGVkKEZvY3VzRAogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgSW50UmVjdCBpbnRlcnNlY3Rpb25SZWN0ID0gaW50ZXJzZWN0aW9uKG5v ZGVSZWN0SW5BYnNvbHV0ZUNvb3JkaW5hdGVzKGNhbmRpZGF0ZS5ub2RlLCB0cnVlKSwgbm9kZVJl Y3RJbkFic29sdXRlQ29vcmRpbmF0ZXMoY2xvc2VzdC5ub2RlLCB0cnVlKSk7CisgICAgSW50UmVj dCBpbnRlcnNlY3Rpb25SZWN0ID0gaW50ZXJzZWN0aW9uKGNhbmRpZGF0ZS5yZWN0LCBjbG9zZXN0 LnJlY3QpOwogICAgIGlmICghaW50ZXJzZWN0aW9uUmVjdC5pc0VtcHR5KCkpIHsKICAgICAgICAg Ly8gSWYgMiBub2RlcyBhcmUgaW50ZXJzZWN0aW5nLCBkbyBoaXQgdGVzdCB0byBmaW5kIHdoaWNo IG5vZGUgaW4gb24gdG9wLgogICAgICAgICBpbnQgeCA9IGludGVyc2VjdGlvblJlY3QueCgpICsg aW50ZXJzZWN0aW9uUmVjdC53aWR0aCgpIC8gMjsKQEAgLTQ3OSw3ICs0NzksNyBAQCB2b2lkIEZv Y3VzQ29udHJvbGxlcjo6ZmluZEZvY3VzQ2FuZGlkYXRlCiAgICAgICAgIGlmICghbm9kZS0+aXNL ZXlib2FyZEZvY3VzYWJsZShldmVudCkgJiYgIW5vZGUtPmlzRnJhbWVPd25lckVsZW1lbnQoKSAm JiAhY2FuU2Nyb2xsSW5EaXJlY3Rpb24oZGlyZWN0aW9uLCBub2RlKSkKICAgICAgICAgICAgIGNv bnRpbnVlOwogCi0gICAgICAgIEZvY3VzQ2FuZGlkYXRlIGNhbmRpZGF0ZShub2RlKTsKKyAgICAg ICAgRm9jdXNDYW5kaWRhdGUgY2FuZGlkYXRlKG5vZGUsIGRpcmVjdGlvbik7CiAgICAgICAgIGNh bmRpZGF0ZS5lbmNsb3NpbmdTY3JvbGxhYmxlQm94ID0gY29udGFpbmVyOwogICAgICAgICB1cGRh dGVGb2N1c0NhbmRpZGF0ZUlmTmVlZGVkKGRpcmVjdGlvbiwgc3RhcnRpbmdSZWN0LCBjYW5kaWRh dGUsIGNsb3Nlc3QpOwogICAgIH0KQEAgLTUxNSw3ICs1MTUsNyBAQCBib29sIEZvY3VzQ29udHJv bGxlcjo6YWR2YW5jZUZvY3VzRGlyZWN0CiAgICAgICAgIC8vIHVwZGF0ZUZvY3VzQ2FuZGlkYXRl SWZOZWVkZWQoKSB3aWxsIG5ldmVyIGNvbnNpZGVyIHN1Y2ggYW4gaWZyYW1lIGFzIGEgY2FuZGlk YXRlLgogICAgICAgICBBU1NFUlQoZnJhbWVFbGVtZW50LT5jb250ZW50RnJhbWUoKSk7CiAKLSAg ICAgICAgaWYgKGhhc09mZnNjcmVlblJlY3QoZm9jdXNDYW5kaWRhdGUubm9kZSwgZGlyZWN0aW9u KSkgeworICAgICAgICBpZiAoZm9jdXNDYW5kaWRhdGUuaXNPZmZzY3JlZW5BZnRlclNjcm9sbGlu ZykgewogICAgICAgICAgICAgc2Nyb2xsSW5EaXJlY3Rpb24oZm9jdXNDYW5kaWRhdGUubm9kZS0+ ZG9jdW1lbnQoKSwgZGlyZWN0aW9uKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAg ICB9CkBAIC01MzIsNyArNTMyLDcgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6OmFkdmFuY2VGb2N1 c0RpcmVjdAogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgaWYgKGNhblNjcm9sbElu RGlyZWN0aW9uKGRpcmVjdGlvbiwgZm9jdXNDYW5kaWRhdGUubm9kZSkpIHsKLSAgICAgICAgaWYg KGhhc09mZnNjcmVlblJlY3QoZm9jdXNDYW5kaWRhdGUubm9kZSwgZGlyZWN0aW9uKSkgeworICAg ICAgICBpZiAoZm9jdXNDYW5kaWRhdGUuaXNPZmZzY3JlZW5BZnRlclNjcm9sbGluZykgewogICAg ICAgICAgICAgc2Nyb2xsSW5EaXJlY3Rpb24oZm9jdXNDYW5kaWRhdGUubm9kZSwgZGlyZWN0aW9u KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CkBAIC01NDMsNyArNTQzLDcg QEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6OmFkdmFuY2VGb2N1c0RpcmVjdAogICAgICAgICAgICAg c3RhcnRpbmdSZWN0ID0gbm9kZVJlY3RJbkFic29sdXRlQ29vcmRpbmF0ZXMoZm9jdXNlZE5vZGUs IHRydWUpOwogICAgICAgICByZXR1cm4gYWR2YW5jZUZvY3VzRGlyZWN0aW9uYWxseUluQ29udGFp bmVyKGZvY3VzQ2FuZGlkYXRlLm5vZGUsIHN0YXJ0aW5nUmVjdCwgZGlyZWN0aW9uLCBldmVudCk7 CiAgICAgfQotICAgIGlmIChoYXNPZmZzY3JlZW5SZWN0KGZvY3VzQ2FuZGlkYXRlLm5vZGUsIGRp cmVjdGlvbikpIHsKKyAgICBpZiAoZm9jdXNDYW5kaWRhdGUuaXNPZmZzY3JlZW5BZnRlclNjcm9s bGluZykgewogICAgICAgICBOb2RlKiBjb250YWluZXIgPSBmb2N1c0NhbmRpZGF0ZS5lbmNsb3Np bmdTY3JvbGxhYmxlQm94OwogICAgICAgICBzY3JvbGxJbkRpcmVjdGlvbihjb250YWluZXIsIGRp cmVjdGlvbik7CiAgICAgICAgIHJldHVybiB0cnVlOwpJbmRleDogV2ViQ29yZS9wYWdlL1NwYXRp YWxOYXZpZ2F0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvU3BhdGlhbE5hdmln YXRpb24uY3BwCShyZXZpc2lvbiA3Mjc5MykKKysrIFdlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdh dGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDcgQEAgc3RhdGljIEludFJlY3Qg cmVjdFRvQWJzb2x1dGVDb29yZGluYXRlcwogc3RhdGljIHZvaWQgZW50cnlBbmRFeGl0UG9pbnRz Rm9yRGlyZWN0aW9uKEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiwgY29uc3QgSW50UmVjdCYgc3Rh cnRpbmdSZWN0LCBjb25zdCBJbnRSZWN0JiBwb3RlbnRpYWxSZWN0LCBJbnRQb2ludCYgZXhpdFBv aW50LCBJbnRQb2ludCYgZW50cnlQb2ludCk7CiAKIAotRm9jdXNDYW5kaWRhdGU6OkZvY3VzQ2Fu ZGlkYXRlKE5vZGUqIG4pCitGb2N1c0NhbmRpZGF0ZTo6Rm9jdXNDYW5kaWRhdGUoTm9kZSogbiwg Rm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uKQogICAgIDogbm9kZShuKQogICAgICwgZW5jbG9zaW5n U2Nyb2xsYWJsZUJveCgwKQogICAgICwgZGlzdGFuY2UobWF4RGlzdGFuY2UoKSkKQEAgLTU5LDYg KzU5LDggQEAgRm9jdXNDYW5kaWRhdGU6OkZvY3VzQ2FuZGlkYXRlKE5vZGUqIG4pCiAgICAgLCBh bGlnbm1lbnQoTm9uZSkKICAgICAsIHBhcmVudEFsaWdubWVudChOb25lKQogICAgICwgcmVjdChu b2RlUmVjdEluQWJzb2x1dGVDb29yZGluYXRlcyhuLCB0cnVlIC8qIGlnbm9yZSBib3JkZXIgKi8p KQorICAgICwgaXNPZmZzY3JlZW4oaGFzT2Zmc2NyZWVuUmVjdChuKSkKKyAgICAsIGlzT2Zmc2Ny ZWVuQWZ0ZXJTY3JvbGxpbmcoaGFzT2Zmc2NyZWVuUmVjdChuLCBkaXJlY3Rpb24pKQogewogfQog CkBAIC02MjIsNyArNjI0LDcgQEAgdm9pZCBkaXN0YW5jZURhdGFGb3JOb2RlKEZvY3VzRGlyZWN0 aW9uIAogCiBib29sIGNhbkJlU2Nyb2xsZWRJbnRvVmlldyhGb2N1c0RpcmVjdGlvbiBkaXJlY3Rp b24sIGNvbnN0IEZvY3VzQ2FuZGlkYXRlJiBjYW5kaWRhdGUpCiB7Ci0gICAgQVNTRVJUKGNhbmRp ZGF0ZS5ub2RlICYmIGhhc09mZnNjcmVlblJlY3QoY2FuZGlkYXRlLm5vZGUpKTsKKyAgICBBU1NF UlQoY2FuZGlkYXRlLm5vZGUgJiYgY2FuZGlkYXRlLmlzT2Zmc2NyZWVuKTsKICAgICBJbnRSZWN0 IGNhbmRpZGF0ZVJlY3QgPSBjYW5kaWRhdGUucmVjdDsKICAgICBmb3IgKE5vZGUqIHBhcmVudE5v ZGUgPSBjYW5kaWRhdGUubm9kZS0+cGFyZW50KCk7IHBhcmVudE5vZGU7IHBhcmVudE5vZGUgPSBw YXJlbnROb2RlLT5wYXJlbnQoKSkgewogICAgICAgICBJbnRSZWN0IHBhcmVudFJlY3QgPSBub2Rl UmVjdEluQWJzb2x1dGVDb29yZGluYXRlcyhwYXJlbnROb2RlKTsKSW5kZXg6IFdlYkNvcmUvcGFn ZS9TcGF0aWFsTmF2aWdhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9TcGF0aWFs TmF2aWdhdGlvbi5oCShyZXZpc2lvbiA3Mjc5MykKKysrIFdlYkNvcmUvcGFnZS9TcGF0aWFsTmF2 aWdhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsMTAgKzEwNSwxMiBAQCBzdHJ1Y3QgRm9j dXNDYW5kaWRhdGUgewogICAgICAgICAsIHBhcmVudERpc3RhbmNlKG1heERpc3RhbmNlKCkpCiAg ICAgICAgICwgYWxpZ25tZW50KE5vbmUpCiAgICAgICAgICwgcGFyZW50QWxpZ25tZW50KE5vbmUp CisgICAgICAgICwgaXNPZmZzY3JlZW4odHJ1ZSkKKyAgICAgICAgLCBpc09mZnNjcmVlbkFmdGVy U2Nyb2xsaW5nKHRydWUpCiAgICAgewogICAgIH0KIAotICAgIEZvY3VzQ2FuZGlkYXRlKE5vZGUq IG4pOworICAgIEZvY3VzQ2FuZGlkYXRlKE5vZGUqIG4sIEZvY3VzRGlyZWN0aW9uKTsKICAgICBi b29sIGlzTnVsbCgpIGNvbnN0IHsgcmV0dXJuICFub2RlOyB9CiAgICAgYm9vbCBpblNjcm9sbGFi bGVDb250YWluZXIoKSBjb25zdCB7IHJldHVybiBub2RlICYmIGVuY2xvc2luZ1Njcm9sbGFibGVC b3g7IH0KICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBjb25zdCB7IHJldHVybiBub2RlID8gbm9k ZS0+ZG9jdW1lbnQoKSA6IDA7IH0KQEAgLTEyMCw2ICsxMjIsOCBAQCBzdHJ1Y3QgRm9jdXNDYW5k aWRhdGUgewogICAgIFJlY3RzQWxpZ25tZW50IGFsaWdubWVudDsKICAgICBSZWN0c0FsaWdubWVu dCBwYXJlbnRBbGlnbm1lbnQ7CiAgICAgSW50UmVjdCByZWN0OworICAgIGJvb2wgaXNPZmZzY3Jl ZW47CisgICAgYm9vbCBpc09mZnNjcmVlbkFmdGVyU2Nyb2xsaW5nOwogfTsKIAogYm9vbCBzY3Jv bGxJbkRpcmVjdGlvbihGcmFtZSosIEZvY3VzRGlyZWN0aW9uKTsK