118259 2013-07-01 11:47:00 -0700 AX: Items the img aria role aren't inserting an object replacement character 2013-07-03 22:29:09 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach oldest_to_newest 905118 0 cfleizach 2013-07-01 11:47:00 -0700 The object replacement character is not being emitted when encountering an element with <div role="img"> However, native images do get an emission 905148 1 205835 cfleizach 2013-07-01 14:22:06 -0700 Created attachment 205835 patch 905266 2 205835 thorton 2013-07-01 23:33:51 -0700 Comment on attachment 205835 patch View in context: https://bugs.webkit.org/attachment.cgi?id=205835&action=review patch doesn't apply. > Source/WebCore/ChangeLog:3 > + AX: Items the img aria role aren't inserting an object replacement character This title is missing some words (or has some extras?). > LayoutTests/platform/mac/accessibility/aria-image-emits-object-replacement.html~:1 > +<!DOCTYPE HTML> please don't commit this extraneous html~ file :D 906015 3 206039 cfleizach 2013-07-03 17:53:06 -0700 Created attachment 206039 patch for landing 906047 4 cfleizach 2013-07-03 22:29:09 -0700 http://trac.webkit.org/changeset/152388 205835 2013-07-01 14:22:06 -0700 2013-07-03 17:53:06 -0700 patch patch text/plain 7983 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjIzNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA3LTAxICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEl0ZW1zIHRoZSBp bWcgYXJpYSByb2xlIGFyZW4ndCBpbnNlcnRpbmcgYW4gb2JqZWN0IHJlcGxhY2VtZW50IGNoYXJh Y3RlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4 MjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVm9p Y2VPdmVyIHJlbGllcyBvbiBvYmplY3QgcmVwbGFjZW1lbnQgY2hhcmFjdGVycyBiZWluZyBlbWl0 dGVkIHdoZW4gYXNraW5nIGZvciBzZWxlY3RlZCB0ZXh0LgorICAgICAgICBUaGlzIGhhcyB3b3Jr ZWQgaWYgYSByZWFsIDxpbWc+IGlzIHVzZWQsIGJ1dCBpZiByb2xlPSJpbWciIGlzIHVzZWQgb24g YSA8ZGl2PiwgZm9yIGV4YW1wbGUsCisgICAgICAgIG5vIGVtaXNzaW9uIGlzIHBlcmZvcm1lZCwg d2hpY2ggbGVhZHMgdG8gbWlzc2VkIGVsZW1lbnRzIGluIHRleHQuCisKKyAgICAgICAgVGVzdDog cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0cy1vYmplY3QtcmVwbGFj ZW1lbnQuaHRtbAorCisgICAgICAgICogZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6aXNSZW5kZXJlclJlcGxhY2VkRWxlbWVudCk6CisgICAgICAgIChXZWJDb3Jl OjpUZXh0SXRlcmF0b3I6OmFkdmFuY2UpOgorCiAyMDEzLTA3LTAxICBGcsOpZMOpcmljIFdhbmcg IDxmcmVkLndhbmdAZnJlZS5mcj4KIAogICAgICAgICBBZGQgU3VwcG9ydCBmb3IgbXNwYWNlIGVs ZW1lbnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAJKHJldmlz aW9uIDE1MTgyNSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjQ0LDYgKzI0NCwyNyBAQAogCiAgICAgQVNTRVJUKHN0YWNrLnNp emUoKSA9PSAxICsgZGVwdGhDcm9zc2luZ1NoYWRvd0JvdW5kYXJpZXMobm9kZSkpOwogfQorICAg IAorc3RhdGljIGJvb2wgaXNSZW5kZXJlclJlcGxhY2VkRWxlbWVudChSZW5kZXJPYmplY3QqIHJl bmRlcmVyKQoreworICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAKKyAgICBpZiAocmVuZGVyZXItPmlzSW1hZ2UoKSB8fCByZW5kZXJlci0+aXNXaWRnZXQoKSkK KyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgCisgICAgaWYgKHJlbmRlcmVyLT5ub2RlKCkgJiYg cmVuZGVyZXItPm5vZGUoKS0+aXNFbGVtZW50Tm9kZSgpKSB7CisgICAgICAgIEVsZW1lbnQqIGVs ZW1lbnQgPSB0b0VsZW1lbnQocmVuZGVyZXItPm5vZGUoKSk7CisgICAgICAgIGlmIChlbGVtZW50 LT5pc0Zvcm1Db250cm9sRWxlbWVudCgpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUobGVnZW5kVGFn KQorICAgICAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShtZXRlclRhZykgfHwgZWxlbWVu dC0+aGFzVGFnTmFtZShwcm9ncmVzc1RhZykpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgCisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShlbGVtZW50LT5nZXRBdHRyaWJ1 dGUocm9sZUF0dHIpLCAiaW1nIikpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9Cisg ICAgCisgICAgcmV0dXJuIGZhbHNlOworfQogCiAvLyAtLS0tLS0tLQogCkBAIC0zODQsMTIgKzQw NSw3IEBACiAgICAgICAgICAgICBpZiAoIW1faGFuZGxlZE5vZGUpIHsKICAgICAgICAgICAgICAg ICBpZiAocmVuZGVyZXItPmlzVGV4dCgpICYmIG1fbm9kZS0+bm9kZVR5cGUoKSA9PSBOb2RlOjpU RVhUX05PREUpIC8vIEZJWE1FOiBXaGF0IGFib3V0IENEQVRBX1NFQ1RJT05fTk9ERT8KICAgICAg ICAgICAgICAgICAgICAgbV9oYW5kbGVkTm9kZSA9IGhhbmRsZVRleHROb2RlKCk7Ci0gICAgICAg ICAgICAgICAgZWxzZSBpZiAocmVuZGVyZXIgJiYgKHJlbmRlcmVyLT5pc0ltYWdlKCkgfHwgcmVu ZGVyZXItPmlzV2lkZ2V0KCkgfHwKLSAgICAgICAgICAgICAgICAgICAgICAgICAocmVuZGVyZXIt Pm5vZGUoKSAmJiByZW5kZXJlci0+bm9kZSgpLT5pc0VsZW1lbnROb2RlKCkgJiYKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgKHRvRWxlbWVudChyZW5kZXJlci0+bm9kZSgpKS0+aXNGb3JtQ29u dHJvbEVsZW1lbnQoKQotICAgICAgICAgICAgICAgICAgICAgICAgICB8fCB0b0VsZW1lbnQocmVu ZGVyZXItPm5vZGUoKSktPmhhc1RhZ05hbWUobGVnZW5kVGFnKQotICAgICAgICAgICAgICAgICAg ICAgICAgICB8fCB0b0VsZW1lbnQocmVuZGVyZXItPm5vZGUoKSktPmhhc1RhZ05hbWUobWV0ZXJU YWcpCi0gICAgICAgICAgICAgICAgICAgICAgICAgIHx8IHRvRWxlbWVudChyZW5kZXJlci0+bm9k ZSgpKS0+aGFzVGFnTmFtZShwcm9ncmVzc1RhZykpKSkpCisgICAgICAgICAgICAgICAgZWxzZSBp ZiAoaXNSZW5kZXJlclJlcGxhY2VkRWxlbWVudChyZW5kZXJlcikpCiAgICAgICAgICAgICAgICAg ICAgIG1faGFuZGxlZE5vZGUgPSBoYW5kbGVSZXBsYWNlZEVsZW1lbnQoKTsKICAgICAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIG1faGFuZGxlZE5vZGUgPSBoYW5kbGVOb25U ZXh0Tm9kZSgpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTUyMjM1KQorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDctMDEgIENocmlz IEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogSXRlbXMgdGhl IGltZyBhcmlhIHJvbGUgYXJlbid0IGluc2VydGluZyBhbiBvYmplY3QgcmVwbGFjZW1lbnQgY2hh cmFjdGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTgyNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtaW1hZ2UtZW1pdHMtb2JqZWN0LXJlcGxh Y2VtZW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vz c2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0cy1vYmplY3QtcmVwbGFjZW1lbnQuaHRtbDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0cy1v YmplY3QtcmVwbGFjZW1lbnQuaHRtbH46IEFkZGVkLgorCiAyMDEzLTA3LTAxICBGcsOpZMOpcmlj IFdhbmcgIDxmcmVkLndhbmdAZnJlZS5mcj4KIAogICAgICAgICBBZGQgU3VwcG9ydCBmb3IgbXNw YWNlIGVsZW1lbnQKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5 L2FyaWEtaW1hZ2UtZW1pdHMtb2JqZWN0LXJlcGxhY2VtZW50LWV4cGVjdGVkLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWltYWdl LWVtaXRzLW9iamVjdC1yZXBsYWNlbWVudC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWltYWdlLWVtaXRzLW9i amVjdC1yZXBsYWNlbWVudC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwx NCBAQAorCitUaGlzIHRlc3RzIGVuc3VyZXMgdGhhdCBpZiBhbiBBUklBIGltYWdlIGlzIHVzZWQg aXQgd2lsbCBlbWl0IGFuIG9iamVjdCByZXBsYWNlbWVudCBjaGFyYWN0ZXIgaW4gYSByYW5nZSBm b3Igc3RyaW5nIG9wZXJhdGlvbi4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVz IG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BB U1MgdGV4dDEudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHRleHRNYXJrZXJSYW5nZSkgaXMgNQorT2Jq ZWN0IHN0cmluZyBmb3IgcmFuZ2U6IGEg77+8IGIKK1BBU1MgdGV4dDEudGV4dE1hcmtlclJhbmdl TGVuZ3RoKHRleHRNYXJrZXJSYW5nZSkgaXMgNQorT2JqZWN0IHN0cmluZyBmb3IgcmFuZ2U6IGMg 77+8IGQKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQor CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWltYWdl LWVtaXRzLW9iamVjdC1yZXBsYWNlbWVudC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtaW1hZ2UtZW1pdHMtb2JqZWN0LXJlcGxh Y2VtZW50Lmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj ZXNzaWJpbGl0eS9hcmlhLWltYWdlLWVtaXRzLW9iamVjdC1yZXBsYWNlbWVudC5odG1sCSh3b3Jr aW5nIGNvcHkpCkBAIC0wLDAgKzEsNDQgQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8Ym9k eT4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5q cyI+PC9zY3JpcHQ+CisKKzxkaXYgaWQ9ImNvbnRlbnQiIHRhYmluZGV4PSIwIj4KKworPGRpdiBp ZD0idGV4dDEiPgorYSA8ZGl2IHJvbGU9ImltZyIgYXJpYS1sYWJlbD0iYmxhaCIgc3R5bGU9ImJh Y2tncm91bmQtY29sb3I6ICNhYWFhYWE7IHdpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsgZGlz cGxheTppbmxpbmUtYmxvY2s7Ij48L2Rpdj4gYgorPC9kaXY+CisKKzxicj4KKworPGRpdiBpZD0i dGV4dDIiPgorYyA8aW1nIHNyYz0iIyIgYXJpYS1sYWJlbD0iYmxhaCIgc3R5bGU9ImJhY2tncm91 bmQtY29sb3I6ICNhYWFhYWE7IHdpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsiPiBkCis8L2Rp dj4KKworPC9kaXY+CisKKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KKworZGVz Y3JpcHRpb24oIlRoaXMgdGVzdHMgZW5zdXJlcyB0aGF0IGlmIGFuIEFSSUEgaW1hZ2UgaXMgdXNl ZCBpdCB3aWxsIGVtaXQgYW4gb2JqZWN0IHJlcGxhY2VtZW50IGNoYXJhY3RlciBpbiBhIHJhbmdl IGZvciBzdHJpbmcgb3BlcmF0aW9uLiIpCisKK2lmICh3aW5kb3cudGVzdFJ1bm5lciAmJiB3aW5k b3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKworICAgdmFyIHRleHQxID0gYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJ0ZXh0MSIpOworICAgdmFyIHRl eHRNYXJrZXJSYW5nZSA9IHRleHQxLnRleHRNYXJrZXJSYW5nZUZvckVsZW1lbnQodGV4dDEpOwor ICAgc2hvdWxkQmUoInRleHQxLnRleHRNYXJrZXJSYW5nZUxlbmd0aCh0ZXh0TWFya2VyUmFuZ2Up IiwgIjUiKTsKKyAgIGRlYnVnKCJPYmplY3Qgc3RyaW5nIGZvciByYW5nZTogIiArIHRleHQxLnN0 cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0TWFya2VyUmFuZ2UpKTsKKworICAgdmFyIHRleHQy ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJ0ZXh0MiIp OworICAgdGV4dE1hcmtlclJhbmdlID0gdGV4dDIudGV4dE1hcmtlclJhbmdlRm9yRWxlbWVudCh0 ZXh0Mik7CisgICBzaG91bGRCZSgidGV4dDEudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHRleHRNYXJr ZXJSYW5nZSkiLCAiNSIpOworICAgZGVidWcoIk9iamVjdCBzdHJpbmcgZm9yIHJhbmdlOiAiICsg dGV4dDIuc3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHRleHRNYXJrZXJSYW5nZSkpOworCisgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGVudCIpLnN0eWxlLnZpc2liaWxpdHkgPSAnaGlk ZGVuJzsKK30KKworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jl c291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpJbmRl eDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0 cy1vYmplY3QtcmVwbGFjZW1lbnQuaHRtbH4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0cy1vYmplY3QtcmVwbGFjZW1l bnQuaHRtbH4JKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS9hcmlhLWltYWdlLWVtaXRzLW9iamVjdC1yZXBsYWNlbWVudC5odG1sfgkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDQxIEBACis8IURPQ1RZUEUgSFRNTD4KKzxodG1sPgorPGJvZHk+ Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgorCis8ZGl2IGlkPSJjb250ZW50IiB0YWJpbmRleD0iMCI+CisKKzxkaXYgaWQ9 InRleHQxIj4KK2EgPGRpdiByb2xlPSJpbWciIGFyaWEtbGFiZWw9ImJsYWgiIHN0eWxlPSJiYWNr Z3JvdW5kLWNvbG9yOiAjYWFhYWFhOyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGRpc3Bs YXk6aW5saW5lLWJsb2NrOyI+PC9kaXY+IGIKKzwvZGl2PgorCis8YnI+CisKKzxkaXYgaWQ9InRl eHQyIj4KK2EgPGltZyBzcmM9IiMiIGFyaWEtbGFiZWw9ImJsYWgiIHN0eWxlPSJiYWNrZ3JvdW5k LWNvbG9yOiAjYWFhYWFhOyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7Ij4gYgorPC9kaXY+ CisKKworCis8L2Rpdj4KKworPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0PgorCitk ZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyBlbnN1cmVzIHRoYXQgaWYgYW4gQVJJQSBpbWFnZSBpcyB1 c2VkIGl0IHdpbGwgZW1pdCBhbiBvYmplY3QgcmVwbGFjZW1lbnQgY2hhcmFjdGVyIGluIGEgcmFu Z2UgZm9yIHN0cmluZyBvcGVyYXRpb24uIikKKworaWYgKHdpbmRvdy50ZXN0UnVubmVyICYmIHdp bmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworCisgICB2YXIgY29udGVudCA9IGFjY2Vz c2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiY29udGVudCIpOworICAg dmFyIHRleHRNYXJrZXJSYW5nZSA9IGNvbnRlbnQudGV4dE1hcmtlclJhbmdlRm9yRWxlbWVudChj b250ZW50KTsKKyAgIHNob3VsZEJlKCJjb250ZW50LnRleHRNYXJrZXJSYW5nZUxlbmd0aCh0ZXh0 TWFya2VyUmFuZ2UpIiwgIjExIik7CisgICBkZWJ1ZygiT2JqZWN0IHN0cmluZyBmb3IgcmFuZ2U6 ICIgKyBjb250ZW50LnN0cmluZ0ZvclRleHRNYXJrZXJSYW5nZSh0ZXh0TWFya2VyUmFuZ2UpKTsK KworICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnRlbnQiKS5zdHlsZS52aXNpYmlsaXR5 ID0gJ2hpZGRlbic7Cit9CisKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFz dC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt bD4K 206039 2013-07-03 17:53:06 -0700 2013-07-03 17:53:06 -0700 patch for landing patch text/plain 7740 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAJKHJldmlzaW9uIDE1 MjM3NCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjQ0LDYgKzI0NCwyNyBAQAogCiAgICAgQVNTRVJUKHN0YWNrLnNpemUoKSA9 PSAxICsgZGVwdGhDcm9zc2luZ1NoYWRvd0JvdW5kYXJpZXMobm9kZSkpOwogfQorICAgIAorc3Rh dGljIGJvb2wgaXNSZW5kZXJlclJlcGxhY2VkRWxlbWVudChSZW5kZXJPYmplY3QqIHJlbmRlcmVy KQoreworICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAg ICBpZiAocmVuZGVyZXItPmlzSW1hZ2UoKSB8fCByZW5kZXJlci0+aXNXaWRnZXQoKSkKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgCisgICAgaWYgKHJlbmRlcmVyLT5ub2RlKCkgJiYgcmVuZGVy ZXItPm5vZGUoKS0+aXNFbGVtZW50Tm9kZSgpKSB7CisgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQg PSB0b0VsZW1lbnQocmVuZGVyZXItPm5vZGUoKSk7CisgICAgICAgIGlmIChlbGVtZW50LT5pc0Zv cm1Db250cm9sRWxlbWVudCgpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUobGVnZW5kVGFnKQorICAg ICAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShtZXRlclRhZykgfHwgZWxlbWVudC0+aGFz VGFnTmFtZShwcm9ncmVzc1RhZykpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAg CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShlbGVtZW50LT5nZXRBdHRyaWJ1dGUocm9s ZUF0dHIpLCAiaW1nIikpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgCisg ICAgcmV0dXJuIGZhbHNlOworfQogCiAvLyAtLS0tLS0tLQogCkBAIC0zODQsMTIgKzQwNSw3IEBA CiAgICAgICAgICAgICBpZiAoIW1faGFuZGxlZE5vZGUpIHsKICAgICAgICAgICAgICAgICBpZiAo cmVuZGVyZXItPmlzVGV4dCgpICYmIG1fbm9kZS0+bm9kZVR5cGUoKSA9PSBOb2RlOjpURVhUX05P REUpIC8vIEZJWE1FOiBXaGF0IGFib3V0IENEQVRBX1NFQ1RJT05fTk9ERT8KICAgICAgICAgICAg ICAgICAgICAgbV9oYW5kbGVkTm9kZSA9IGhhbmRsZVRleHROb2RlKCk7Ci0gICAgICAgICAgICAg ICAgZWxzZSBpZiAocmVuZGVyZXIgJiYgKHJlbmRlcmVyLT5pc0ltYWdlKCkgfHwgcmVuZGVyZXIt PmlzV2lkZ2V0KCkgfHwKLSAgICAgICAgICAgICAgICAgICAgICAgICAocmVuZGVyZXItPm5vZGUo KSAmJiByZW5kZXJlci0+bm9kZSgpLT5pc0VsZW1lbnROb2RlKCkgJiYKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgKHRvRWxlbWVudChyZW5kZXJlci0+bm9kZSgpKS0+aXNGb3JtQ29udHJvbEVs ZW1lbnQoKQotICAgICAgICAgICAgICAgICAgICAgICAgICB8fCB0b0VsZW1lbnQocmVuZGVyZXIt Pm5vZGUoKSktPmhhc1RhZ05hbWUobGVnZW5kVGFnKQotICAgICAgICAgICAgICAgICAgICAgICAg ICB8fCB0b0VsZW1lbnQocmVuZGVyZXItPm5vZGUoKSktPmhhc1RhZ05hbWUobWV0ZXJUYWcpCi0g ICAgICAgICAgICAgICAgICAgICAgICAgIHx8IHRvRWxlbWVudChyZW5kZXJlci0+bm9kZSgpKS0+ aGFzVGFnTmFtZShwcm9ncmVzc1RhZykpKSkpCisgICAgICAgICAgICAgICAgZWxzZSBpZiAoaXNS ZW5kZXJlclJlcGxhY2VkRWxlbWVudChyZW5kZXJlcikpCiAgICAgICAgICAgICAgICAgICAgIG1f aGFuZGxlZE5vZGUgPSBoYW5kbGVSZXBsYWNlZEVsZW1lbnQoKTsKICAgICAgICAgICAgICAgICBl bHNlCiAgICAgICAgICAgICAgICAgICAgIG1faGFuZGxlZE5vZGUgPSBoYW5kbGVOb25UZXh0Tm9k ZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTUyMzc0KQorKysgU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDctMDMgIENo cmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogSXRlbXMg dGhlIGltZyBhcmlhIHJvbGUgYXJlbid0IGluc2VydGluZyBhbiBvYmplY3QgcmVwbGFjZW1lbnQg Y2hhcmFjdGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTgyNTkKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIFZv aWNlT3ZlciByZWxpZXMgb24gb2JqZWN0IHJlcGxhY2VtZW50IGNoYXJhY3RlcnMgYmVpbmcgZW1p dHRlZCB3aGVuIGFza2luZyBmb3Igc2VsZWN0ZWQgdGV4dC4KKyAgICAgICAgVGhpcyBoYXMgd29y a2VkIGlmIGEgcmVhbCA8aW1nPiBpcyB1c2VkLCBidXQgaWYgcm9sZT0iaW1nIiBpcyB1c2VkIG9u IGEgPGRpdj4sIGZvciBleGFtcGxlLAorICAgICAgICBubyBlbWlzc2lvbiBpcyBwZXJmb3JtZWQs IHdoaWNoIGxlYWRzIHRvIG1pc3NlZCBlbGVtZW50cyBpbiB0ZXh0LgorCisgICAgICAgIFRlc3Q6 IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtaW1hZ2UtZW1pdHMtb2JqZWN0LXJlcGxh Y2VtZW50Lmh0bWwKKworICAgICAgICAqIGVkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmlzUmVuZGVyZXJSZXBsYWNlZEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6VGV4dEl0ZXJhdG9yOjphZHZhbmNlKToKKwogMjAxMy0wNy0wMyAgSmVzc2llIEJlcmxpbiAg PGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFNwZWN1bGF0aXZlIGJ1aWxkIGZpeCBhZnRl ciByMTUyMzQwLgpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTUyMzg2KQorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMDctMDMgIENocmlz IEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogSXRlbXMgdGhl IGltZyBhcmlhIHJvbGUgYXJlbid0IGluc2VydGluZyBhbiBvYmplY3QgcmVwbGFjZW1lbnQgY2hh cmFjdGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTgyNTkKKworICAgICAgICBSZXZpZXdlZCBieSBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9ub24tbmF0aXZlLWltYWdlLWNyYXNoLWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWltYWdlLWVtaXRz LW9iamVjdC1yZXBsYWNlbWVudC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRm b3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtaW1hZ2UtZW1pdHMtb2JqZWN0LXJlcGxhY2VtZW50 Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ltZy1m YWxsc2JhY2stdG8tdGl0bGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAgICAgIFVwZGF0ZSBleHBl Y3RlZCB0ZXN0cyB3aGVyZSByb2xlPSJpbWciIG5vdyBlbWl0cyByZXBsYWNlbWVudCBjaGFyYWN0 ZXIuCisKIDIwMTMtMDctMDMgIFNpbW9uIFBlbmEgIDxzaW1vbi5wZW5hQHNhbXN1bmcuY29tPgog CiAgICAgICAgIFdlYlRleHRDaGVja2VyQ2xpZW50IGRvZXNuJ3QgaW5pdGlhbGl6ZSBvdXRwdXQg YXJndW1lbnRzLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv YXJpYS1pbWFnZS1lbWl0cy1vYmplY3QtcmVwbGFjZW1lbnQuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWltYWdlLWVtaXRzLW9i amVjdC1yZXBsYWNlbWVudC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0cy1vYmplY3QtcmVwbGFjZW1lbnQu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0NCBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRt bD4KKzxib2R5PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRl c3QtcHJlLmpzIj48L3NjcmlwdD4KKworPGRpdiBpZD0iY29udGVudCIgdGFiaW5kZXg9IjAiPgor Cis8ZGl2IGlkPSJ0ZXh0MSI+CithIDxkaXYgcm9sZT0iaW1nIiBhcmlhLWxhYmVsPSJibGFoIiBz dHlsZT0iYmFja2dyb3VuZC1jb2xvcjogI2FhYWFhYTsgd2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDEw MHB4OyBkaXNwbGF5OmlubGluZS1ibG9jazsiPjwvZGl2PiBiCis8L2Rpdj4KKworPGJyPgorCis8 ZGl2IGlkPSJ0ZXh0MiI+CitjIDxpbWcgc3JjPSIjIiBhcmlhLWxhYmVsPSJibGFoIiBzdHlsZT0i YmFja2dyb3VuZC1jb2xvcjogI2FhYWFhYTsgd2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDEwMHB4OyI+ IGQKKzwvZGl2PgorCis8L2Rpdj4KKworPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0 PgorCitkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyBlbnN1cmVzIHRoYXQgaWYgYW4gQVJJQSBpbWFn ZSBpcyB1c2VkIGl0IHdpbGwgZW1pdCBhbiBvYmplY3QgcmVwbGFjZW1lbnQgY2hhcmFjdGVyIGlu IGEgcmFuZ2UgZm9yIHN0cmluZyBvcGVyYXRpb24uIikKKworaWYgKHdpbmRvdy50ZXN0UnVubmVy ICYmIHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworCisgICB2YXIgdGV4dDEgPSBh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRleHQxIik7Cisg ICB2YXIgdGV4dE1hcmtlclJhbmdlID0gdGV4dDEudGV4dE1hcmtlclJhbmdlRm9yRWxlbWVudCh0 ZXh0MSk7CisgICBzaG91bGRCZSgidGV4dDEudGV4dE1hcmtlclJhbmdlTGVuZ3RoKHRleHRNYXJr ZXJSYW5nZSkiLCAiNSIpOworICAgZGVidWcoIk9iamVjdCBzdHJpbmcgZm9yIHJhbmdlOiAiICsg dGV4dDEuc3RyaW5nRm9yVGV4dE1hcmtlclJhbmdlKHRleHRNYXJrZXJSYW5nZSkpOworCisgICB2 YXIgdGV4dDIgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQo InRleHQyIik7CisgICB0ZXh0TWFya2VyUmFuZ2UgPSB0ZXh0Mi50ZXh0TWFya2VyUmFuZ2VGb3JF bGVtZW50KHRleHQyKTsKKyAgIHNob3VsZEJlKCJ0ZXh0MS50ZXh0TWFya2VyUmFuZ2VMZW5ndGgo dGV4dE1hcmtlclJhbmdlKSIsICI1Iik7CisgICBkZWJ1ZygiT2JqZWN0IHN0cmluZyBmb3IgcmFu Z2U6ICIgKyB0ZXh0Mi5zdHJpbmdGb3JUZXh0TWFya2VyUmFuZ2UodGV4dE1hcmtlclJhbmdlKSk7 CisKKyAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb250ZW50Iikuc3R5bGUudmlzaWJpbGl0 eSA9ICdoaWRkZW4nOworfQorCis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zh c3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWlt YWdlLWVtaXRzLW9iamVjdC1yZXBsYWNlbWVudC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0cy1v YmplY3QtcmVwbGFjZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1pbWFnZS1lbWl0cy1vYmplY3QtcmVw bGFjZW1lbnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE0IEBACisKK1Ro aXMgdGVzdHMgZW5zdXJlcyB0aGF0IGlmIGFuIEFSSUEgaW1hZ2UgaXMgdXNlZCBpdCB3aWxsIGVt aXQgYW4gb2JqZWN0IHJlcGxhY2VtZW50IGNoYXJhY3RlciBpbiBhIHJhbmdlIGZvciBzdHJpbmcg b3BlcmF0aW9uLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyB0ZXh0MS50 ZXh0TWFya2VyUmFuZ2VMZW5ndGgodGV4dE1hcmtlclJhbmdlKSBpcyA1CitPYmplY3Qgc3RyaW5n IGZvciByYW5nZTogYSDvv7wgYgorUEFTUyB0ZXh0MS50ZXh0TWFya2VyUmFuZ2VMZW5ndGgodGV4 dE1hcmtlclJhbmdlKSBpcyA1CitPYmplY3Qgc3RyaW5nIGZvciByYW5nZTogYyDvv7wgZAorUEFT UyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ltZy1mYWxsc2JhY2stdG8tdGl0 bGUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9h Y2Nlc3NpYmlsaXR5L2ltZy1mYWxsc2JhY2stdG8tdGl0bGUtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAxNTIzNzQpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9pbWct ZmFsbHNiYWNrLXRvLXRpdGxlLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsx LDUgQEAKLSAgICAKKyAgICAgdGVzdAogdGVzdAotdGVzdAogVGhpcyB0ZXN0cyB0aGF0IGltYWdl cyB3aWxsIGZhbGxiYWNrIHRvIHVzaW5nIHRoZSB0aXRsZSBhdHRyaWJ1dGUgaWYgbm8gb3RoZXIg ZGVzY3JpcHRpdmUgdGV4dCBpcyBwcmVzZW50LgogCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L25vbi1uYXRpdmUtaW1hZ2UtY3Jhc2gt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbm9u LW5hdGl2ZS1pbWFnZS1jcmFzaC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE1MjM3NCkKKysrIExh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbm9uLW5hdGl2ZS1pbWFnZS1jcmFzaC1leHBlY3RlZC50 eHQJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSw0IEBACisKID09PT09PT09PT09PT09PT09PT09 PT09PSBfX19dW19fX19fICogX18vIFtfX19dXCAqKio9PT09X19fIFwgKiBcX19fX19fX19fX19d IEkgSSAtLS0tLS0tLS0tLS0vCiBUaGlzIHRlc3RzIHRoYXQgYSBub24gbmF0aXZlIGltYWdlIChv bmUgY3JlYXRlZCB0aHJvdWdoIEFSSUEpIGRvZXMgbm90IGNhdXNlIGFuIGFzc2VydC4gVGVzdCBw YXNzZXMgaWYgaXQgZG9lcyBub3QgY3Jhc2ggaW4gZGVidWcgYnVpbGRzCiAK