42979 2010-07-26 10:55:40 -0700 AX: replace m_renderer->document->axObjectCache() with just axObjectCache() 2010-07-27 09:33:52 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach bdakin ddkilzer oldest_to_newest 256106 0 cfleizach 2010-07-26 10:55:40 -0700 that will allow us to consolidate a lot of checking that m_renderer is valid and document is valid and reduce the length of lines 256114 1 62585 cfleizach 2010-07-26 11:11:03 -0700 Created attachment 62585 Patch 256183 2 cfleizach 2010-07-26 12:46:24 -0700 r? 256596 3 62585 abarth 2010-07-27 07:59:56 -0700 Comment on attachment 62585 Patch Ok. 256652 4 cfleizach 2010-07-27 09:33:52 -0700 http://trac.webkit.org/changeset/64137 62585 2010-07-26 11:11:03 -0700 2010-07-27 07:59:56 -0700 Patch bug-42979-20100726111102.patch text/plain 7432 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDA1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDctMjYgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWDogcmVwbGFjZSBtX3JlbmRlcmVyLT5kb2N1bWVudC0+YXhPYmplY3RDYWNoZSgpIHdpdGgg anVzdCBheE9iamVjdENhY2hlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQyOTc5CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBDb2RlIGNsZWFudXAg b25seS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpmaXJz dENoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omxh c3RDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpw cmV2aW91c1NpYmxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6bmV4dFNpYmxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6cGFyZW50T2JqZWN0SWZFeGlzdHMpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdDo6cGFyZW50T2JqZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Om1lbnVGb3JNZW51QnV0dG9uKToKKyAgICAgICAgKFdl YkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Om1lbnVCdXR0b25Gb3JNZW51KToKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFkZFJhZGlvQnV0dG9u R3JvdXBNZW1iZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3Q6OmF4T2JqZWN0Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6Y29udGVudENoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6YWRkQ2hpbGRyZW4pOgorCiAyMDEwLTA3LTI2ICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBD YXJsc3Nvbi4KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDY0MDU0KQorKysgV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x ODksNyArMTg5LDcgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgog ICAgIGlmICghZmlyc3RDaGlsZCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCi0gICAgcmV0dXJu IG1fcmVuZGVyZXItPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoZmly c3RDaGlsZCk7CisgICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoZmlyc3RD aGlsZCk7CiB9CiAKIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmpl Y3Q6Omxhc3RDaGlsZCgpIGNvbnN0CkBAIC0yMDIsNyArMjAyLDcgQEAgQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAgIGlmICghbGFzdENoaWxkKQogICAgICAgICBy ZXR1cm4gMDsKICAgICAKLSAgICByZXR1cm4gbV9yZW5kZXJlci0+ZG9jdW1lbnQoKS0+YXhPYmpl Y3RDYWNoZSgpLT5nZXRPckNyZWF0ZShsYXN0Q2hpbGQpOworICAgIHJldHVybiBheE9iamVjdENh Y2hlKCktPmdldE9yQ3JlYXRlKGxhc3RDaGlsZCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgUmVuZGVy SW5saW5lKiBzdGFydE9mQ29udGludWF0aW9ucyhSZW5kZXJPYmplY3QqIHIpCkBAIC0zMDQsNyAr MzA0LDcgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAgIGlm ICghcHJldmlvdXNTaWJsaW5nKQogICAgICAgICByZXR1cm4gMDsKICAgICAKLSAgICByZXR1cm4g bV9yZW5kZXJlci0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShwcmV2 aW91c1NpYmxpbmcpOworICAgIHJldHVybiBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKHBy ZXZpb3VzU2libGluZyk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBsYXN0Q2hpbGRIYXNDb250 aW51YXRpb24oUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKQEAgLTM1NCw3ICszNTQsNyBAQCBBY2Nl c3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5UmVuZGVyCiAgICAgaWYgKCFuZXh0U2libGlu ZykKICAgICAgICAgcmV0dXJuIDA7CiAgICAgCi0gICAgcmV0dXJuIG1fcmVuZGVyZXItPmRvY3Vt ZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUobmV4dFNpYmxpbmcpOworICAgIHJl dHVybiBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKG5leHRTaWJsaW5nKTsKIH0KIAogQWNj ZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6cGFyZW50T2JqZWN0 SWZFeGlzdHMoKSBjb25zdApAQCAtMzc4LDcgKzM3OCw3IEBAIEFjY2Vzc2liaWxpdHlPYmplY3Qq IEFjY2Vzc2liaWxpdHlSZW5kZXIKICAgICBpZiAoIXBhcmVudCkKICAgICAgICAgcmV0dXJuIDA7 CiAKLSAgICByZXR1cm4gbV9yZW5kZXJlci0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5n ZXQocGFyZW50KTsKKyAgICByZXR1cm4gYXhPYmplY3RDYWNoZSgpLT5nZXQocGFyZW50KTsKIH0K ICAgICAKIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnBh cmVudE9iamVjdCgpIGNvbnN0CkBAIC00MDMsNyArNDAzLDcgQEAgQWNjZXNzaWJpbGl0eU9iamVj dCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAgICAgICByZXR1cm4gMDsKICAgICAKICAgICBpZiAo YXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBNZW51QmFyUm9sZSkKLSAgICAgICAgcmV0dXJuIG1fcmVu ZGVyZXItPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocGFyZW50KTsK KyAgICAgICAgcmV0dXJuIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocGFyZW50KTsKIAog ICAgIC8vIG1lbnVCdXR0b24gYW5kIGl0cyBjb3JyZXNwb25kaW5nIG1lbnUgYXJlIERPTSBzaWJs aW5ncywgYnV0IEFjY2Vzc2liaWxpdHkgbmVlZHMgdGhlbSB0byBiZSBwYXJlbnQvY2hpbGQKICAg ICBpZiAoYXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBNZW51Um9sZSkgewpAQCAtNDEyLDcgKzQxMiw3 IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXIKICAgICAgICAgICAg IHJldHVybiBwYXJlbnQ7CiAgICAgfQogICAgIAotICAgIHJldHVybiBtX3JlbmRlcmVyLT5kb2N1 bWVudCgpLT5heE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKHBhcmVudCk7CisgICAgcmV0dXJu IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocGFyZW50KTsKIH0KIAogYm9vbCBBY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0Ojppc1dlYkFyZWEoKSBjb25zdApAQCAtODgyLDcgKzg4Miw3IEBA IEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXIKIHsKICAgICBFbGVtZW50 KiBtZW51ID0gbWVudUVsZW1lbnRGb3JNZW51QnV0dG9uKCk7CiAgICAgaWYgKG1lbnUgJiYgbWVu dS0+cmVuZGVyZXIoKSkKLSAgICAgICAgcmV0dXJuIG1fcmVuZGVyZXItPmRvY3VtZW50KCktPmF4 T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUobWVudS0+cmVuZGVyZXIoKSk7CisgICAgICAgIHJl dHVybiBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKG1lbnUtPnJlbmRlcmVyKCkpOwogICAg IHJldHVybiAwOwogfQogCkBAIC05MDAsNyArOTAwLDcgQEAgQWNjZXNzaWJpbGl0eU9iamVjdCog QWNjZXNzaWJpbGl0eVJlbmRlcgogCiAgICAgaWYgKG1lbnVJdGVtICYmIG1lbnVJdGVtLT5yZW5k ZXJlcigpKSB7CiAgICAgICAgIC8vIEFSSUEganVzdCBoYXMgZ2VuZXJpYyBtZW51IGl0ZW1zLiAg QXBwS2l0IG5lZWRzIHRvIGtub3cgaWYgdGhpcyBpcyBhIHRvcCBsZXZlbCBpdGVtcyBsaWtlIE1l bnVCYXJCdXR0b24gb3IgTWVudUJhckl0ZW0KLSAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCog bWVudUl0ZW1BWCA9IG1fcmVuZGVyZXItPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0 T3JDcmVhdGUobWVudUl0ZW0tPnJlbmRlcmVyKCkpOworICAgICAgICBBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBtZW51SXRlbUFYID0gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShtZW51SXRlbS0+ cmVuZGVyZXIoKSk7CiAgICAgICAgIGlmIChtZW51SXRlbUFYLT5pc01lbnVCdXR0b24oKSkKICAg ICAgICAgICAgIHJldHVybiBtZW51SXRlbUFYOwogICAgIH0KQEAgLTE0NjgsNyArMTQ2OCw3IEBA IHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YWRkUmFkaW8KICAgICAgICAgdW5zaWdu ZWQgbGVuID0gZm9ybUVsZW1lbnRzLnNpemUoKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IGxlbjsgKytpKSB7CiAgICAgICAgICAgICBOb2RlKiBhc3NvY2lhdGVFbGVtZW50ID0g Zm9ybUVsZW1lbnRzW2ldLmdldCgpOwotICAgICAgICAgICAgaWYgKEFjY2Vzc2liaWxpdHlPYmpl Y3QqIG9iamVjdCA9IG1fcmVuZGVyZXItPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0 T3JDcmVhdGUoYXNzb2NpYXRlRWxlbWVudC0+cmVuZGVyZXIoKSkpCisgICAgICAgICAgICBpZiAo QWNjZXNzaWJpbGl0eU9iamVjdCogb2JqZWN0ID0gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0 ZShhc3NvY2lhdGVFbGVtZW50LT5yZW5kZXJlcigpKSkKICAgICAgICAgICAgICAgICBsaW5rZWRV SUVsZW1lbnRzLmFwcGVuZChvYmplY3QpOyAgICAgICAgCiAgICAgICAgIH0gCiAgICAgfSBlbHNl IHsKQEAgLTE0NzgsNyArMTQ3OCw3IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 YWRkUmFkaW8KICAgICAgICAgICAgIGlmIChsaXN0LT5pdGVtKGkpLT5oYXNUYWdOYW1lKGlucHV0 VGFnKSkgewogICAgICAgICAgICAgICAgIEhUTUxJbnB1dEVsZW1lbnQqIGFzc29jaWF0ZUVsZW1l bnQgPSBzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVtZW50Kj4obGlzdC0+aXRlbShpKSk7CiAgICAg ICAgICAgICAgICAgaWYgKGFzc29jaWF0ZUVsZW1lbnQtPmlzUmFkaW9CdXR0b24oKSAmJiBhc3Nv Y2lhdGVFbGVtZW50LT5uYW1lKCkgPT0gaW5wdXQtPm5hbWUoKSkgewotICAgICAgICAgICAgICAg ICAgICBpZiAoQWNjZXNzaWJpbGl0eU9iamVjdCogb2JqZWN0ID0gbV9yZW5kZXJlci0+ZG9jdW1l bnQoKS0+YXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShhc3NvY2lhdGVFbGVtZW50LT5yZW5k ZXJlcigpKSkKKyAgICAgICAgICAgICAgICAgICAgaWYgKEFjY2Vzc2liaWxpdHlPYmplY3QqIG9i amVjdCA9IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoYXNzb2NpYXRlRWxlbWVudC0+cmVu ZGVyZXIoKSkpCiAgICAgICAgICAgICAgICAgICAgICAgICBsaW5rZWRVSUVsZW1lbnRzLmFwcGVu ZChvYmplY3QpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTIyNjcsNiAr MjI2Nyw3IEBAIFdpZGdldCogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6d2lkZ2UKIAogQVhP YmplY3RDYWNoZSogQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXhPYmplY3RDYWNoZSgpIGNv bnN0CiB7CisgICAgQVNTRVJUKG1fcmVuZGVyZXIpOwogICAgIHJldHVybiBtX3JlbmRlcmVyLT5k b2N1bWVudCgpLT5heE9iamVjdENhY2hlKCk7CiB9CiAKQEAgLTMxNzYsNyArMzE3Nyw3IEBAIGJv b2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2FuU2V0VGUKIHZvaWQgQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6Y29udGVudENoYW5nZWQoKQogewogICAgIC8vIElmIHRoaXMgZWxlbWVu dCBzdXBwb3J0cyBBUklBIGxpdmUgcmVnaW9ucywgdGhlbiBub3RpZnkgdGhlIEFUIG9mIGNoYW5n ZXMuCi0gICAgQVhPYmplY3RDYWNoZSogY2FjaGUgPSBtX3JlbmRlcmVyLT5kb2N1bWVudCgpLT5h eE9iamVjdENhY2hlKCk7CisgICAgQVhPYmplY3RDYWNoZSogY2FjaGUgPSBheE9iamVjdENhY2hl KCk7CiAgICAgZm9yIChSZW5kZXJPYmplY3QqIHJlbmRlclBhcmVudCA9IG1fcmVuZGVyZXI7IHJl bmRlclBhcmVudDsgcmVuZGVyUGFyZW50ID0gcmVuZGVyUGFyZW50LT5wYXJlbnQoKSkgewogICAg ICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBwYXJlbnQgPSBjYWNoZS0+Z2V0KHJlbmRlclBhcmVu dCk7CiAgICAgICAgIGlmICghcGFyZW50KQpAQCAtMzI5OCw3ICszMjk5LDcgQEAgdm9pZCBBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphZGRDaGlsZAogCiAgICAgICAgICAgICAgICAgLy8gYWRk IGFuIDxhcmVhPiBlbGVtZW50IGZvciB0aGlzIGNoaWxkIGlmIGl0IGhhcyBhIGxpbmsKICAgICAg ICAgICAgICAgICBpZiAoY3VycmVudC0+aGFzVGFnTmFtZShhcmVhVGFnKSAmJiBjdXJyZW50LT5p c0xpbmsoKSkgewotICAgICAgICAgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBMaW5r KiBhcmVhT2JqZWN0ID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eUltYWdlTWFwTGluayo+KG1f cmVuZGVyZXItPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoSW1hZ2VN YXBMaW5rUm9sZSkpOworICAgICAgICAgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5SW1hZ2VNYXBM aW5rKiBhcmVhT2JqZWN0ID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eUltYWdlTWFwTGluayo+ KGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUoSW1hZ2VNYXBMaW5rUm9sZSkpOwogICAgICAg ICAgICAgICAgICAgICBhcmVhT2JqZWN0LT5zZXRIVE1MQXJlYUVsZW1lbnQoc3RhdGljX2Nhc3Q8 SFRNTEFyZWFFbGVtZW50Kj4oY3VycmVudCkpOwogICAgICAgICAgICAgICAgICAgICBhcmVhT2Jq ZWN0LT5zZXRIVE1MTWFwRWxlbWVudChtYXApOwogICAgICAgICAgICAgICAgICAgICBhcmVhT2Jq ZWN0LT5zZXRQYXJlbnQodGhpcyk7Cg==