42981 2010-07-26 11:00:30 -0700 AX: consolidate parentObjectIfExists() and parentObject() code 2010-07-27 10:14:34 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin oldest_to_newest 256108 0 cfleizach 2010-07-26 11:00:30 -0700 these two methods seem to use nearly the same code. That code should be factored into a common method 256669 1 62704 cfleizach 2010-07-27 09:59:51 -0700 Created attachment 62704 Patch 256675 2 cfleizach 2010-07-27 10:14:34 -0700 http://trac.webkit.org/changeset/64139 62704 2010-07-27 09:59:51 -0700 2010-07-27 10:12:10 -0700 Patch bug-42981-20100727095950.patch text/plain 4100 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDEzOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDctMjcgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogY29uc29saWRhdGUgcGFyZW50T2JqZWN0SWZFeGlzdHMoKSBhbmQgcGFyZW50T2JqZWN0 KCkgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDI5ODEKKworICAgICAgICBDb25zb2xpZGF0ZSBkdXBsaWNhdGUgY29kZSBpbiBwYXJlbnRPYmpl Y3QgYW5kIHBhcmVudE9iamVjdElmRXhpc3RzCisKKyAgICAgICAgTm8gdGVzdHMuIE5vIGZ1bmN0 aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0OjpyZW5kZXJQYXJlbnRPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdDo6cGFyZW50T2JqZWN0SWZFeGlzdHMpOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6cGFyZW50T2JqZWN0KToKKyAgICAgICAgKiBh Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKwogMjAxMC0wNy0yNyAg Q2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkYW0gQmFydGguCkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA2NDEzNykKKysrIFdlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzU3LDcgKzM1Nyw3IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlS ZW5kZXIKICAgICByZXR1cm4gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShuZXh0U2libGlu Zyk7CiB9CiAKLUFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OnBhcmVudE9iamVjdElmRXhpc3RzKCkgY29uc3QKK1JlbmRlck9iamVjdCogQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6cmVuZGVyUGFyZW50T2JqZWN0KCkgY29uc3QKIHsKICAgICBpZiAoIW1f cmVuZGVyZXIpCiAgICAgICAgIHJldHVybiAwOwpAQCAtMzc0LDExICszNzQsMTMgQEAgQWNjZXNz aWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAgIC8vIHRoZSBlYXJsaWVzdCBu b2RlIGluIHRoZSBjb250aW51YXRpb24gY2hhaW4uCiAgICAgZWxzZSBpZiAocGFyZW50ICYmIHBh cmVudC0+aXNSZW5kZXJJbmxpbmUoKSAmJiAoc3RhcnRPZkNvbnRzID0gc3RhcnRPZkNvbnRpbnVh dGlvbnMocGFyZW50KSkpCiAgICAgICAgIHBhcmVudCA9IHN0YXJ0T2ZDb250czsKLQotICAgIGlm ICghcGFyZW50KQotICAgICAgICByZXR1cm4gMDsKLQotICAgIHJldHVybiBheE9iamVjdENhY2hl KCktPmdldChwYXJlbnQpOworICAgIAorICAgIHJldHVybiBwYXJlbnQ7Cit9CisgICAgCitBY2Nl c3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpwYXJlbnRPYmplY3RJ ZkV4aXN0cygpIGNvbnN0Cit7CisgICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0KHJlbmRl clBhcmVudE9iamVjdCgpKTsKIH0KICAgICAKIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3Q6OnBhcmVudE9iamVjdCgpIGNvbnN0CkBAIC0zODYsMjQgKzM4OCw4 IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXIKICAgICBpZiAoIW1f cmVuZGVyZXIpCiAgICAgICAgIHJldHVybiAwOwogICAgIAotICAgIFJlbmRlck9iamVjdCogcGFy ZW50ID0gbV9yZW5kZXJlci0+cGFyZW50KCk7Ci0KLSAgICAvLyBDYXNlIDE6IG5vZGUgaXMgYSBi bG9jayBhbmQgaXMgYW4gaW5saW5lJ3MgY29udGludWF0aW9uLiBQYXJlbnQKLSAgICAvLyBpcyB0 aGUgc3RhcnQgb2YgdGhlIGNvbnRpbnVhdGlvbiBjaGFpbi4KLSAgICBSZW5kZXJJbmxpbmUqIHN0 YXJ0T2ZDb250cyA9IDA7Ci0gICAgaWYgKG1fcmVuZGVyZXItPmlzUmVuZGVyQmxvY2soKSAmJiAo c3RhcnRPZkNvbnRzID0gc3RhcnRPZkNvbnRpbnVhdGlvbnMobV9yZW5kZXJlcikpKQotICAgICAg ICBwYXJlbnQgPSBzdGFydE9mQ29udHM7Ci0KLSAgICAvLyBDYXNlIDI6IG5vZGUncyBwYXJlbnQg aXMgYW4gaW5saW5lIHdoaWNoIGlzIHNvbWUgbm9kZSdzIGNvbnRpbnVhdGlvbjsgcGFyZW50IGlz IAotICAgIC8vIHRoZSBlYXJsaWVzdCBub2RlIGluIHRoZSBjb250aW51YXRpb24gY2hhaW4uCi0g ICAgZWxzZSBpZiAocGFyZW50ICYmIHBhcmVudC0+aXNSZW5kZXJJbmxpbmUoKSAmJiAoc3RhcnRP ZkNvbnRzID0gc3RhcnRPZkNvbnRpbnVhdGlvbnMocGFyZW50KSkpCi0gICAgICAgIHBhcmVudCA9 IHN0YXJ0T2ZDb250czsKLQotICAgIGlmICghcGFyZW50KQotICAgICAgICByZXR1cm4gMDsKLSAg ICAKICAgICBpZiAoYXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBNZW51QmFyUm9sZSkKLSAgICAgICAg cmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocGFyZW50KTsKKyAgICAgICAgcmV0 dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUobV9yZW5kZXJlci0+cGFyZW50KCkpOwog CiAgICAgLy8gbWVudUJ1dHRvbiBhbmQgaXRzIGNvcnJlc3BvbmRpbmcgbWVudSBhcmUgRE9NIHNp YmxpbmdzLCBidXQgQWNjZXNzaWJpbGl0eSBuZWVkcyB0aGVtIHRvIGJlIHBhcmVudC9jaGlsZAog ICAgIGlmIChhcmlhUm9sZUF0dHJpYnV0ZSgpID09IE1lbnVSb2xlKSB7CkBAIC00MTIsNyArMzk4 LDcgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAgICAgICAg ICAgcmV0dXJuIHBhcmVudDsKICAgICB9CiAgICAgCi0gICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUo KS0+Z2V0T3JDcmVhdGUocGFyZW50KTsKKyAgICByZXR1cm4gYXhPYmplY3RDYWNoZSgpLT5nZXRP ckNyZWF0ZShyZW5kZXJQYXJlbnRPYmplY3QoKSk7CiB9CiAKIGJvb2wgQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6aXNXZWJBcmVhKCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAkocmV2aXNpb24gNjQxMzYpCisr KyBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0yOTAsNiArMjkwLDcgQEAgcHJpdmF0ZToKICAgICBBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBhY2Nlc3NpYmlsaXR5SW1hZ2VNYXBIaXRUZXN0KEhUTUxBcmVhRWxlbWVudCosIGNv bnN0IEludFBvaW50JikgY29uc3Q7CiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogYWNjZXNzaWJp bGl0eVBhcmVudEZvckltYWdlTWFwKEhUTUxNYXBFbGVtZW50KiBtYXApIGNvbnN0OwogICAgIGJv b2wgcmVuZGVyT2JqZWN0SXNPYnNlcnZhYmxlKFJlbmRlck9iamVjdCopIGNvbnN0OworICAgIFJl bmRlck9iamVjdCogcmVuZGVyUGFyZW50T2JqZWN0KCkgY29uc3Q7CiAgICAgCiAgICAgdm9pZCBh cmlhU2VsZWN0ZWRSb3dzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYpOwogICAgIAo=