83435 2012-04-08 11:45:38 -0700 [Gtk] atk_text_get_text_at_offset() fails to provide the correct line for paragraphs in list items whose text wraps 2012-08-15 11:14:05 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 25531 0 jdiggs webkit-unassigned cfleizach mario webkit.review.bot oldest_to_newest 598047 0 136151 jdiggs 2012-04-08 11:45:38 -0700 Created attachment 136151 test case +++ This bug was initially created as a clone of Bug #73431 +++ Steps to reproduce: 1. View the attached test case in Epiphany 2. Resize the window so that the text wraps 3. Enable caret browsing 4. Launch the attached test script in a terminal 5. Arrow Up and Down amongst the lines of text Expected results: The test script would always print the correct text for the current line. Actual results: The test script fails to present the correct text for the second list item. 598048 1 136152 jdiggs 2012-04-08 11:46:09 -0700 Created attachment 136152 test script 598418 2 136264 jdiggs 2012-04-09 10:47:38 -0700 Created attachment 136264 Another test case An additional get_text_at_offset() failure/test case. (Not sure if it's a variant of the same bug or a different bug.) 695567 3 158452 jdiggs 2012-08-14 17:09:42 -0700 Created attachment 158452 proposed patch with updated unit test 695832 4 158452 mario 2012-08-15 01:39:02 -0700 Comment on attachment 158452 proposed patch with updated unit test View in context: https://bugs.webkit.org/attachment.cgi?id=158452&action=review Thanks for the patch. It looks good to me with the exception of the missing comments in the ChangeLog. You should still ask for an official review, though > Source/WebCore/ChangeLog:11 > + (textForRenderer): A brief description of the change for textForRenderer would be nice here. > Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp:82 > + if (object->isReplaced() && !object->isListMarker()) Oh! It indeed looks like a mistake in the code (and not coherent withthe comment). Good catch (/me runs and hides) > Source/WebKit/gtk/ChangeLog:11 > + (testWebkitAtkGetTextAtOffsetWithSpecialCharacters): Something like "Updated unit test" would be nice here 695854 5 jdiggs 2012-08-15 02:11:55 -0700 (In reply to comment #4) > (From update of attachment 158452 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=158452&action=review > > Thanks for the patch. It looks good to me with the exception of the missing comments in the ChangeLog. Thanks for the review! :) Perhaps I should have coffee first and then respond, but.... What missing comments? Looking at: https://bugs.webkit.org/attachment.cgi?id=158452&action=prettypatch, I see: Source/WebCore/ChangeLog 8 Be sure the list item marker to be ignored is actually a list item marker prior to ignoring it. Source/WebKit/gtk/ChangeLog 8 Include a paragraph in a list item when testing atk_text_get_text_at_offset(). 695880 6 jdiggs 2012-08-15 03:07:26 -0700 Adding Chris to CC for review. (It's a one-line bug fix.) 695883 7 mario 2012-08-15 03:19:46 -0700 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 158452 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=158452&action=review > > > > Thanks for the patch. It looks good to me with the exception of the missing comments in the ChangeLog. > > Thanks for the review! :) Perhaps I should have coffee first and then respond, but.... What missing comments? Looks like I should be the one drinking coffee first :-). I meant the missing comments _per-function_, but it's true that in this case it maybe makes not much sense since it would be duplicating the stuff in the general description. Anyway, in my defense I must say I should not be here today as it's a bank day and so I'm officially not working :). 696047 8 158452 cfleizach 2012-08-15 09:13:31 -0700 Comment on attachment 158452 proposed patch with updated unit test View in context: https://bugs.webkit.org/attachment.cgi?id=158452&action=review > Source/WebCore/ChangeLog:8 > + Be sure the list item marker to be ignored is actually a list item marker prior to ignoring it. i think this comment is a little hard to follow Maybe something like "Fix a logic error when checking if an object is a list marker" >> Source/WebKit/gtk/ChangeLog:11 >> + (testWebkitAtkGetTextAtOffsetWithSpecialCharacters): > > Something like "Updated unit test" would be nice here Agreed "Updated unit test to include a paragraph in a list ..." 696075 9 158583 jdiggs 2012-08-15 09:46:43 -0700 Created attachment 158583 Updated patch to address review comments 696167 10 158583 webkit.review.bot 2012-08-15 11:14:02 -0700 Comment on attachment 158583 Updated patch to address review comments Clearing flags on attachment: 158583 Committed r125685: <http://trac.webkit.org/changeset/125685> 696168 11 webkit.review.bot 2012-08-15 11:14:05 -0700 All reviewed patches have been landed. Closing bug. 136151 2012-04-08 11:45:38 -0700 2012-04-08 11:45:38 -0700 test case ListTest.html text/html 227 jdiggs PGh0bWw+Cjxib2R5Pgo8b2w+CjxsaT4KVGhpcyB0ZXh0IHdpbGwgTk9UIGhhdmUgdGhlIGJ1ZyBi ZWNhdXNlIHRoZSBwYXJhZ3JhcGggaXMgTk9UIGluc2lkZSBhIGxpc3QgaXRlbS4KPC9saT4KPGxp PgogIDxwPlRoaXMgdGV4dCB3aWxsIGhhdmUgdGhlIGJ1ZyBiZWNhdXNlIHRoZSBwYXJhZ3JhcGgg aXMgaW5zaWRlIGEgbGlzdCBpdGVtLjwvcD4KPC9saT4KPC9vbD4KPC9ib2R5Pgo8L2h0bWw+Cgo= 136152 2012-04-08 11:46:09 -0700 2012-04-08 11:46:09 -0700 test script tester.py text/plain 439 jdiggs IyEvdXNyL2Jpbi9weXRob24KCmltcG9ydCBweWF0c3BpCgpkZWYgbGlzdGVuZXIoZXZlbnQpOgog ICAgdHJ5OgogICAgICAgIHRleHQgPSBldmVudC5zb3VyY2UucXVlcnlUZXh0KCkKICAgIGV4Y2Vw dCBOb3RJbXBsZW1lbnRlZEVycm9yOgogICAgICAgIHByaW50ICJib2d1cyBldmVudCIKICAgICAg ICByZXR1cm4KCiAgICBjdXJyZW50TGluZSwgc3RhcnQsIGVuZCA9IFwKICAgICAgICB0ZXh0Lmdl dFRleHRBdE9mZnNldCh0ZXh0LmNhcmV0T2Zmc2V0LCBweWF0c3BpLlRFWFRfQk9VTkRBUllfTElO RV9TVEFSVCkKICAgIHByaW50ICJDdXJyZW50IGxpbmU6ICVzIiAlIGN1cnJlbnRMaW5lCgpweWF0 c3BpLlJlZ2lzdHJ5LnJlZ2lzdGVyRXZlbnRMaXN0ZW5lcihsaXN0ZW5lciwgIm9iamVjdDp0ZXh0 LWNhcmV0LW1vdmVkIikKcHlhdHNwaS5SZWdpc3RyeS5zdGFydCgpCg== 136264 2012-04-09 10:47:38 -0700 2012-04-09 10:47:38 -0700 Another test case bugzilla.html text/html 1746 jdiggs PGh0bWw+CjxoZWFkPgo8c3R5bGU+CiAgICBib2R5LCB0ZCwgdGgsIGlucHV0IHsKICAgICAgICBm b250LWZhbWlseTogVmVyZGFuYSwgc2Fucy1zZXJpZjsKICAgICAgICBmb250LXNpemU6IHNtYWxs OwogICAgfQogICAgI2hlYWRlciBmb3JtLCAjaGVhZGVyIGZvcm0gaW5wdXQsCiAgICAjZm9vdGVy IGZvcm0sICNmb290ZXIgZm9ybSBpbnB1dAogICAgewogICAgICAgIGZvbnQtc2l6ZTogOTUlOwog ICAgICAgIGRpc3BsYXk6IGlubGluZTsKICAgIH0KICAgIHVsLmxpbmtzIGxpIHsKICAgICAgICBk aXNwbGF5OiBpbmxpbmU7CiAgICAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsKICAgIH0KPC9zdHls ZT4KPC9oZWFkPgo8Ym9keT4KPGRpdiBpZD0iaGVhZGVyIj4KPHRhYmxlIGJvcmRlcj0iMCIgY2Vs bHNwYWNpbmc9IjAiIGNlbGxwYWRkaW5nPSIwIiBpZD0idGl0bGVzIj4KPHRyPgogICAgPHRkIGlk PSJ0aXRsZSI+PHA+R05PTUUgQnVnemlsbGEgJm5kYXNoOyBNYWluIFBhZ2U8L3A+PC90ZD4KICAg IDx0ZCBpZD0iaW5mb3JtYXRpb24iPjxwIGNsYXNzPSJoZWFkZXJfYWRkbF9pbmZvIj52ZXJzaW9u IDMuNC4xMzwvcD48L3RkPgo8L3RyPgo8L3RhYmxlPgo8dWwgY2xhc3M9ImxpbmtzIj4KICA8bGk+ PGEgaHJlZj0iLi8iPkhvbWU8L2E+PC9saT4KICA8bGk+PHNwYW4gY2xhc3M9InNlcGFyYXRvciI+ fCA8L3NwYW4+PGEgaHJlZj0iZW50ZXJfYnVnLmNnaSI+TmV3PC9hPjwvbGk+CiAgPGxpPjxzcGFu IGNsYXNzPSJzZXBhcmF0b3IiPnwgPC9zcGFuPjxhIGhyZWY9ImJyb3dzZS5jZ2kiPkJyb3dzZTwv YT48L2xpPgogIDxsaT48c3BhbiBjbGFzcz0ic2VwYXJhdG9yIj58IDwvc3Bhbj48YSBocmVmPSJx dWVyeS5jZ2kiPlNlYXJjaDwvYT48L2xpPgogIDxsaSBjbGFzcz0iZm9ybSI+CiAgICA8c3BhbiBj bGFzcz0ic2VwYXJhdG9yIj58IDwvc3Bhbj4KICAgIDxmb3JtPgogICAgPGlucHV0IGNsYXNzPSJ0 eHQiIHR5cGU9InRleHQiIGlkPSJxdWlja3NlYXJjaF90b3AiIG5hbWU9InF1aWNrc2VhcmNoIj4K ICAgIDxpbnB1dCBjbGFzcz0iYnRuIiB0eXBlPSJzdWJtaXQiIHZhbHVlPSJGaW5kIiBpZD0iZmlu ZF90b3AiPjwvZm9ybT4KICA8L2xpPgogIDxsaT48c3BhbiBjbGFzcz0ic2VwYXJhdG9yIj58IDwv c3Bhbj48YSBocmVmPSJwYWdlLmNnaT9pZD1yZXBvcnRzLmh0bWwiPlJlcG9ydHM8L2E+PC9saT4K ICA8bGk+CiAgICAgIDxzcGFuIGNsYXNzPSJzZXBhcmF0b3IiPnwgPC9zcGFuPgogICAgICAgIDxh IGhyZWY9InJlcXVlc3QuY2dpP3JlcXVlc3Rlcj1qZGlnZ3MlNDBpZ2FsaWEuY29tJmFtcDtyZXF1 ZXN0ZWU9amRpZ2dzJTQwaWdhbGlhLmNvbSZhbXA7ZG9fdW5pb249MSZhbXA7Z3JvdXA9dHlwZSZh bXA7YWN0aW9uPXF1ZXVlIj5NeSBSZXF1ZXN0czwvYT48L2xpPgogICAgPGxpPjxzcGFuIGNsYXNz PSJzZXBhcmF0b3IiPnwgPC9zcGFuPjxhIGhyZWY9InVzZXJwcmVmcy5jZ2kiPlByZWZlcmVuY2Vz PC9hPjwvbGk+CiAgICAgIDxsaT48c3BhbiBjbGFzcz0ic2VwYXJhdG9yIj58IDwvc3Bhbj48YSBo cmVmPSJhZG1pbi5jZ2kiPkFkbWluaXN0cmF0aW9uPC9hPjwvbGk+CiAgICA8bGk+CiAgICAgIDxz cGFuIGNsYXNzPSJzZXBhcmF0b3IiPnwgPC9zcGFuPgogICAgICAgIDxhIGhyZWY9ImluZGV4LmNn aT9sb2dvdXQ9MSI+TG9nJm5ic3A7b3V0PC9hPgogICAgICAgIGpkaWdncyYjNjQ7aWdhbGlhLmNv bTwvbGk+CjwvdWw+CjwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4K 158452 2012-08-14 17:09:42 -0700 2012-08-15 09:46:43 -0700 proposed patch with updated unit test 83435.patch text/plain 5682 jdiggs RnJvbSBmNjY4NjdkMzVlNGVmMTUxNGY2MmY1OTM2NmQ5OTljNjk0YWVmY2VkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpkaWdnc0BpZ2FsaWEuY29tPgpE YXRlOiBUdWUsIDE0IEF1ZyAyMDEyIDIwOjA1OjM1IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gRml4 IGZvciBidWcgODM0MzUgLSBbR3RrXSBhdGtfdGV4dF9nZXRfdGV4dF9hdF9vZmZzZXQoKQogZmFp bHMgdG8gcHJvdmlkZSB0aGUgY29ycmVjdCBsaW5lIGZvciBwYXJhZ3JhcGhzIGluIGxpc3QKIGl0 ZW1zIHdob3NlIHRleHQgd3JhcHMKCi0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IDEyICsrKysrKysrKysrKwogLi4uL2FjY2Vzc2li aWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VUZXh0LmNwcCB8ICAyICstCiBTb3Vy Y2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTIg KysrKysrKysrKysrCiBTb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMgICAgICAgICAg ICAgICAgICAgICAgIHwgMTcgKysrKysrKysrKysrKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwgNDEg aW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjUxYzViMy4uMWI2 MmQ3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTE0ICBKb2FubWFyaWUg RGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBbR3RrXSBhdGtfdGV4dF9nZXRf dGV4dF9hdF9vZmZzZXQoKSBmYWlscyB0byBwcm92aWRlIHRoZSBjb3JyZWN0IGxpbmUgZm9yIHBh cmFncmFwaHMgaW4gbGlzdCBpdGVtcyB3aG9zZSB0ZXh0IHdyYXBzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzQzNQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJlIHN1cmUgdGhlIGxpc3QgaXRlbSBtYXJr ZXIgdG8gYmUgaWdub3JlZCBpcyBhY3R1YWxseSBhIGxpc3QgaXRlbSBtYXJrZXIgcHJpb3IgdG8g aWdub3JpbmcgaXQuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3Np YmxlSW50ZXJmYWNlVGV4dC5jcHA6CisgICAgICAgICh0ZXh0Rm9yUmVuZGVyZXIpOgorCiAyMDEy LTA4LTE0ICBBbGV4YW5kcnUgQ2hpY3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KIAogICAgICAg ICBMYXlvdXQgVGVzdCBjc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0ZXItYW5pbWF0aW9u Lmh0bWwgaXMgZmFpbGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZVRleHQuY3BwCmluZGV4 IDZhN2U3NDQuLmM4ZGYzNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvZ3RrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlVGV4dC5jcHAK QEAgLTc5LDcgKzc5LDcgQEAgc3RhdGljIGdjaGFyKiB0ZXh0Rm9yUmVuZGVyZXIoUmVuZGVyT2Jq ZWN0KiByZW5kZXJlcikKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAvLyBMaXN0IGl0ZW0n cyBtYXJrZXJzIHdpbGwgYmUgdHJlYXRlZCBpbiBhbiBzcGVjaWFsIHdheQogICAgICAgICAgICAg Ly8gbGF0ZXIgb24gdGhpcyBmdW5jdGlvbiwgc28gaWdub3JlIHRoZW0gaGVyZS4KLSAgICAgICAg ICAgIGlmIChvYmplY3QtPmlzUmVwbGFjZWQoKSAmJiAhcmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkK KyAgICAgICAgICAgIGlmIChvYmplY3QtPmlzUmVwbGFjZWQoKSAmJiAhb2JqZWN0LT5pc0xpc3RN YXJrZXIoKSkKICAgICAgICAgICAgICAgICBnX3N0cmluZ19hcHBlbmRfdW5pY2hhcihyZXN1bHRU ZXh0LCBvYmplY3RSZXBsYWNlbWVudENoYXJhY3Rlcik7CiAKICAgICAgICAgICAgIC8vIFdlIG5l ZWQgdG8gY2hlY2sgY2hpbGRyZW4sIGlmIGFueSwgdG8gY29uc2lkZXIgd2hlbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdl TG9nCmluZGV4IDI1ODY2ODMuLmU5ZjgwZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxMi0wOC0xNCAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGlnYWxpYS5jb20+CisK KyAgICAgICAgW0d0a10gYXRrX3RleHRfZ2V0X3RleHRfYXRfb2Zmc2V0KCkgZmFpbHMgdG8gcHJv dmlkZSB0aGUgY29ycmVjdCBsaW5lIGZvciBwYXJhZ3JhcGhzIGluIGxpc3QgaXRlbXMgd2hvc2Ug dGV4dCB3cmFwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODM0MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbmNsdWRlIGEgcGFyYWdyYXBoIGluIGEgbGlzdCBpdGVtIHdoZW4gdGVzdGluZyBhdGtfdGV4 dF9nZXRfdGV4dF9hdF9vZmZzZXQoKS4KKworICAgICAgICAqIHRlc3RzL3Rlc3RhdGsuYzoKKyAg ICAgICAgKHRlc3RXZWJraXRBdGtHZXRUZXh0QXRPZmZzZXRXaXRoU3BlY2lhbENoYXJhY3RlcnMp OgorCiAyMDEyLTA4LTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgRGVsZXRlIEZyYW1lOjpkb21XaW5kb3coKSBhbmQgRnJhbWU6OmV4aXN0aW5nRE9NV2luZG93 KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYyBiL1NvdXJj ZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYwppbmRleCA1MDMxMDkxLi4yOTVhZWQwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKKysrIGIvU291cmNlL1dl YktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jCkBAIC0zNSw3ICszNSw3IEBAIHN0YXRpYyBjb25zdCBj aGFyKiBjb250ZW50c1dpdGhOZXdsaW5lcyA9ICI8aHRtbD48Ym9keT48cD5UaGlzIGlzIGEgdGVz dC4gXG5cblRoCiAKIHN0YXRpYyBjb25zdCBjaGFyKiBjb250ZW50c1dpdGhQcmVmb3JtYXR0ZWRU ZXh0ID0gIjxodG1sPjxib2R5PjxwcmU+XG5cdFxuXHRmaXJzdCBsaW5lXG5cdHNlY29uZCBsaW5l XG48L3ByZT48L2JvZHk+PC9odG1sPiI7CiAKLXN0YXRpYyBjb25zdCBjaGFyKiBjb250ZW50c1dp dGhTcGVjaWFsQ2hhcnMgPSAiPGh0bWw+PGJvZHk+PHA+JmxhcXVvOyZuYnNwO1RoaXMgaXMgYSBw YXJhZ3JhcGggd2l0aCAmbGRxdW87c3BlY2lhbCZyZHF1bzsgY2hhcmFjdGVycyBpbnNpZGUuJm5i c3A7JnJhcXVvOzwvcD48dWw+PGxpIHN0eWxlPSdtYXgtd2lkdGg6MTAwcHg7Jz5MaXN0IGl0ZW0g d2l0aCBzb21lIHRleHQgdGhhdCB3cmFwcyBhY3Jvc3MgZGlmZmVyZW50IGxpbmVzLjwvbGk+PC91 bD48L2JvZHk+PC9odG1sPiI7CitzdGF0aWMgY29uc3QgY2hhciogY29udGVudHNXaXRoU3BlY2lh bENoYXJzID0gIjxodG1sPjxib2R5PjxwPiZsYXF1bzsmbmJzcDtUaGlzIGlzIGEgcGFyYWdyYXBo IHdpdGggJmxkcXVvO3NwZWNpYWwmcmRxdW87IGNoYXJhY3RlcnMgaW5zaWRlLiZuYnNwOyZyYXF1 bzs8L3A+PHVsPjxsaSBzdHlsZT0nbWF4LXdpZHRoOjEwMHB4Oyc+TGlzdCBpdGVtIHdpdGggc29t ZSB0ZXh0IHRoYXQgd3JhcHMgYWNyb3NzIGRpZmZlcmVudCBsaW5lcy48L2xpPjxsaSBzdHlsZT0n bWF4LXdpZHRoOjEwMHB4Oyc+PHA+TGlzdCBpdGVtIHdpdGggc29tZSB0ZXh0IHRoYXQgd3JhcHMg YWNyb3NzIGRpZmZlcmVudCBsaW5lcy48L3A+PC9saT48L3VsPjwvYm9keT48L2h0bWw+IjsKIAog c3RhdGljIGNvbnN0IGNoYXIqIGNvbnRlbnRzSW5UZXh0YXJlYSA9ICI8aHRtbD48Ym9keT48dGV4 dGFyZWEgY29scz0nODAnPlRoaXMgaXMgYSB0ZXN0LiBUaGlzIGlzIHRoZSBzZWNvbmQgc2VudGVu Y2UuIEFuZCB0aGlzIHRoZSB0aGlyZC48L3RleHRhcmVhPjwvYm9keT48L2h0bWw+IjsKIApAQCAt ODQ1LDYgKzg0NSwyMSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrR2V0VGV4dEF0T2Zmc2V0 V2l0aFNwZWNpYWxDaGFyYWN0ZXJzKCkKICAgICB0ZXN0R2V0VGV4dEZ1bmN0aW9uKEFUS19URVhU KGxpc3RJdGVtKSwgYXRrX3RleHRfZ2V0X3RleHRfYXRfb2Zmc2V0LCBBVEtfVEVYVF9CT1VOREFS WV9MSU5FX0VORCwgMCwgIlwzNDJcMjAwXDI0MiBMaXN0IGl0ZW0iLCAwLCAxMSk7CiAgICAgdGVz dEdldFRleHRGdW5jdGlvbihBVEtfVEVYVChsaXN0SXRlbSksIGF0a190ZXh0X2dldF90ZXh0X2F0 X29mZnNldCwgQVRLX1RFWFRfQk9VTkRBUllfTElORV9FTkQsIDEyLCAiIHdpdGggc29tZSIsIDEx LCAyMSk7CiAKKyAgICBnX29iamVjdF91bnJlZihsaXN0SXRlbSk7CisKKyAgICBsaXN0SXRlbSA9 IEFUS19URVhUKGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQobGlzdCwgMSkpOworICAg IGdfYXNzZXJ0KEFUS19JU19URVhUKGxpc3RJdGVtKSk7CisKKyAgICAvKiBDaGVjayB0aGF0IHBs YWNpbmcgdGhlIHNhbWUgdGV4dCBpbiBhIHBhcmFncmFwaCBkb2Vzbid0IGJyZWFrIHRoaW5ncy4g Ki8KKyAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQobGlzdEl0ZW0pLCAwLCAt MSk7CisgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiXDM0MlwyMDBcMjQyIExpc3QgaXRl bSB3aXRoIHNvbWUgdGV4dCB0aGF0IHdyYXBzIGFjcm9zcyBkaWZmZXJlbnQgbGluZXMuIik7Cisg ICAgZ19mcmVlKHRleHQpOworCisgICAgdGVzdEdldFRleHRGdW5jdGlvbihBVEtfVEVYVChsaXN0 SXRlbSksIGF0a190ZXh0X2dldF90ZXh0X2F0X29mZnNldCwgQVRLX1RFWFRfQk9VTkRBUllfTElO RV9TVEFSVCwgMywgIlwzNDJcMjAwXDI0MiBMaXN0IGl0ZW0gIiwgMCwgMTIpOworICAgIHRlc3RH ZXRUZXh0RnVuY3Rpb24oQVRLX1RFWFQobGlzdEl0ZW0pLCBhdGtfdGV4dF9nZXRfdGV4dF9hdF9v ZmZzZXQsIEFUS19URVhUX0JPVU5EQVJZX0xJTkVfU1RBUlQsIDEzLCAid2l0aCBzb21lICIsIDEy LCAyMik7CisgICAgdGVzdEdldFRleHRGdW5jdGlvbihBVEtfVEVYVChsaXN0SXRlbSksIGF0a190 ZXh0X2dldF90ZXh0X2F0X29mZnNldCwgQVRLX1RFWFRfQk9VTkRBUllfTElORV9FTkQsIDAsICJc MzQyXDIwMFwyNDIgTGlzdCBpdGVtIiwgMCwgMTEpOworICAgIHRlc3RHZXRUZXh0RnVuY3Rpb24o QVRLX1RFWFQobGlzdEl0ZW0pLCBhdGtfdGV4dF9nZXRfdGV4dF9hdF9vZmZzZXQsIEFUS19URVhU X0JPVU5EQVJZX0xJTkVfRU5ELCAxMiwgIiB3aXRoIHNvbWUiLCAxMSwgMjEpOworCiAgICAgZ19v YmplY3RfdW5yZWYobGlzdCk7CiAgICAgZ19vYmplY3RfdW5yZWYobGlzdEl0ZW0pOwogICAgIGdf b2JqZWN0X3VucmVmKHBhcmFncmFwaCk7Ci0tIAoxLjcuMTEuMgoK 158583 2012-08-15 09:46:43 -0700 2012-08-15 11:14:01 -0700 Updated patch to address review comments 0001-Fix-for-bug-83435.patch text/plain 5733 jdiggs RnJvbSA2ZGU0OGI5NGFjMDMwZjRlMTg4MTcyYzQ2MjlhODdmNzgzMTE4MWUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpkaWdnc0BpZ2FsaWEuY29tPgpE YXRlOiBXZWQsIDE1IEF1ZyAyMDEyIDEyOjQwOjIwIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gRml4 IGZvciBidWcgODM0MzUKCltHdGtdIGF0a190ZXh0X2dldF90ZXh0X2F0X29mZnNldCgpIGZhaWxz IHRvIHByb3ZpZGUgdGhlIGNvcnJlY3QgbGluZSBmb3IgcGFyYWdyYXBocyBpbiBsaXN0IGl0ZW1z IHdob3NlIHRleHQKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNDM1 Ci0tLQogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8IDEyICsrKysrKysrKysrKwogLi4uL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vz c2libGVJbnRlcmZhY2VUZXh0LmNwcCB8ICAyICstCiBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTIgKysrKysrKysrKysrCiBTb3VyY2Uv V2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMgICAgICAgICAgICAgICAgICAgICAgIHwgMTcgKysr KysrKysrKysrKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwgNDEgaW5zZXJ0aW9ucygrKSwgMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM4OTU0Mi4uNGRlZjExNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDEyLTA4LTE1ICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlh LmNvbT4KKworICAgICAgICBbR3RrXSBhdGtfdGV4dF9nZXRfdGV4dF9hdF9vZmZzZXQoKSBmYWls cyB0byBwcm92aWRlIHRoZSBjb3JyZWN0IGxpbmUgZm9yIHBhcmFncmFwaHMgaW4gbGlzdCBpdGVt cyB3aG9zZSB0ZXh0IHdyYXBzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04MzQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBhIGxvZ2ljIGVycm9yIHdoZW4gY2hlY2tpbmcgaWYgYW4gb2JqZWN0IGlz IGEgbGlzdCBtYXJrZXIuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nl c3NpYmxlSW50ZXJmYWNlVGV4dC5jcHA6CisgICAgICAgICh0ZXh0Rm9yUmVuZGVyZXIpOgorCiAy MDEyLTA4LTE1ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFtSRUdSRVNTSU9OXSAic2F2ZSBhcyIgb2YgZWRpdGVkIHNvdXJj ZSBpbiBkZXZlbG9wZXIgbW9kZSBmYWlscyB0byB1cGRhdGUgc2F2ZWQgZmlsZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVy ZmFjZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNj ZXNzaWJsZUludGVyZmFjZVRleHQuY3BwCmluZGV4IDZhN2U3NDQuLmM4ZGYzNjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVJbnRl cmZhY2VUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJL aXRBY2Nlc3NpYmxlSW50ZXJmYWNlVGV4dC5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgc3RhdGljIGdj aGFyKiB0ZXh0Rm9yUmVuZGVyZXIoUmVuZGVyT2JqZWN0KiByZW5kZXJlcikKICAgICAgICAgZWxz ZSB7CiAgICAgICAgICAgICAvLyBMaXN0IGl0ZW0ncyBtYXJrZXJzIHdpbGwgYmUgdHJlYXRlZCBp biBhbiBzcGVjaWFsIHdheQogICAgICAgICAgICAgLy8gbGF0ZXIgb24gdGhpcyBmdW5jdGlvbiwg c28gaWdub3JlIHRoZW0gaGVyZS4KLSAgICAgICAgICAgIGlmIChvYmplY3QtPmlzUmVwbGFjZWQo KSAmJiAhcmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkKKyAgICAgICAgICAgIGlmIChvYmplY3QtPmlz UmVwbGFjZWQoKSAmJiAhb2JqZWN0LT5pc0xpc3RNYXJrZXIoKSkKICAgICAgICAgICAgICAgICBn X3N0cmluZ19hcHBlbmRfdW5pY2hhcihyZXN1bHRUZXh0LCBvYmplY3RSZXBsYWNlbWVudENoYXJh Y3Rlcik7CiAKICAgICAgICAgICAgIC8vIFdlIG5lZWQgdG8gY2hlY2sgY2hpbGRyZW4sIGlmIGFu eSwgdG8gY29uc2lkZXIgd2hlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDI1ODY2ODMuLjg3MDBhNjIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0xNSAgSm9hbm1hcmll IERpZ2dzICA8amRpZ2dzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0d0a10gYXRrX3RleHRfZ2V0 X3RleHRfYXRfb2Zmc2V0KCkgZmFpbHMgdG8gcHJvdmlkZSB0aGUgY29ycmVjdCBsaW5lIGZvciBw YXJhZ3JhcGhzIGluIGxpc3QgaXRlbXMgd2hvc2UgdGV4dCB3cmFwcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM0MzUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGVkIHVuaXQgdGVzdCB0byBpbmNs dWRlIGEgcGFyYWdyYXBoIGluIGEgbGlzdCBpdGVtIHdoZW4gdGVzdGluZyBhdGtfdGV4dF9nZXRf dGV4dF9hdF9vZmZzZXQoKS4KKworICAgICAgICAqIHRlc3RzL3Rlc3RhdGsuYzoKKyAgICAgICAg KHRlc3RXZWJraXRBdGtHZXRUZXh0QXRPZmZzZXRXaXRoU3BlY2lhbENoYXJhY3RlcnMpOgorCiAy MDEyLTA4LTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGVs ZXRlIEZyYW1lOjpkb21XaW5kb3coKSBhbmQgRnJhbWU6OmV4aXN0aW5nRE9NV2luZG93KCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYyBiL1NvdXJjZS9XZWJL aXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYwppbmRleCA1MDMxMDkxLi4yOTVhZWQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKKysrIGIvU291cmNlL1dlYktpdC9n dGsvdGVzdHMvdGVzdGF0ay5jCkBAIC0zNSw3ICszNSw3IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBj b250ZW50c1dpdGhOZXdsaW5lcyA9ICI8aHRtbD48Ym9keT48cD5UaGlzIGlzIGEgdGVzdC4gXG5c blRoCiAKIHN0YXRpYyBjb25zdCBjaGFyKiBjb250ZW50c1dpdGhQcmVmb3JtYXR0ZWRUZXh0ID0g IjxodG1sPjxib2R5PjxwcmU+XG5cdFxuXHRmaXJzdCBsaW5lXG5cdHNlY29uZCBsaW5lXG48L3By ZT48L2JvZHk+PC9odG1sPiI7CiAKLXN0YXRpYyBjb25zdCBjaGFyKiBjb250ZW50c1dpdGhTcGVj aWFsQ2hhcnMgPSAiPGh0bWw+PGJvZHk+PHA+JmxhcXVvOyZuYnNwO1RoaXMgaXMgYSBwYXJhZ3Jh cGggd2l0aCAmbGRxdW87c3BlY2lhbCZyZHF1bzsgY2hhcmFjdGVycyBpbnNpZGUuJm5ic3A7JnJh cXVvOzwvcD48dWw+PGxpIHN0eWxlPSdtYXgtd2lkdGg6MTAwcHg7Jz5MaXN0IGl0ZW0gd2l0aCBz b21lIHRleHQgdGhhdCB3cmFwcyBhY3Jvc3MgZGlmZmVyZW50IGxpbmVzLjwvbGk+PC91bD48L2Jv ZHk+PC9odG1sPiI7CitzdGF0aWMgY29uc3QgY2hhciogY29udGVudHNXaXRoU3BlY2lhbENoYXJz ID0gIjxodG1sPjxib2R5PjxwPiZsYXF1bzsmbmJzcDtUaGlzIGlzIGEgcGFyYWdyYXBoIHdpdGgg JmxkcXVvO3NwZWNpYWwmcmRxdW87IGNoYXJhY3RlcnMgaW5zaWRlLiZuYnNwOyZyYXF1bzs8L3A+ PHVsPjxsaSBzdHlsZT0nbWF4LXdpZHRoOjEwMHB4Oyc+TGlzdCBpdGVtIHdpdGggc29tZSB0ZXh0 IHRoYXQgd3JhcHMgYWNyb3NzIGRpZmZlcmVudCBsaW5lcy48L2xpPjxsaSBzdHlsZT0nbWF4LXdp ZHRoOjEwMHB4Oyc+PHA+TGlzdCBpdGVtIHdpdGggc29tZSB0ZXh0IHRoYXQgd3JhcHMgYWNyb3Nz IGRpZmZlcmVudCBsaW5lcy48L3A+PC9saT48L3VsPjwvYm9keT48L2h0bWw+IjsKIAogc3RhdGlj IGNvbnN0IGNoYXIqIGNvbnRlbnRzSW5UZXh0YXJlYSA9ICI8aHRtbD48Ym9keT48dGV4dGFyZWEg Y29scz0nODAnPlRoaXMgaXMgYSB0ZXN0LiBUaGlzIGlzIHRoZSBzZWNvbmQgc2VudGVuY2UuIEFu ZCB0aGlzIHRoZSB0aGlyZC48L3RleHRhcmVhPjwvYm9keT48L2h0bWw+IjsKIApAQCAtODQ1LDYg Kzg0NSwyMSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrR2V0VGV4dEF0T2Zmc2V0V2l0aFNw ZWNpYWxDaGFyYWN0ZXJzKCkKICAgICB0ZXN0R2V0VGV4dEZ1bmN0aW9uKEFUS19URVhUKGxpc3RJ dGVtKSwgYXRrX3RleHRfZ2V0X3RleHRfYXRfb2Zmc2V0LCBBVEtfVEVYVF9CT1VOREFSWV9MSU5F X0VORCwgMCwgIlwzNDJcMjAwXDI0MiBMaXN0IGl0ZW0iLCAwLCAxMSk7CiAgICAgdGVzdEdldFRl eHRGdW5jdGlvbihBVEtfVEVYVChsaXN0SXRlbSksIGF0a190ZXh0X2dldF90ZXh0X2F0X29mZnNl dCwgQVRLX1RFWFRfQk9VTkRBUllfTElORV9FTkQsIDEyLCAiIHdpdGggc29tZSIsIDExLCAyMSk7 CiAKKyAgICBnX29iamVjdF91bnJlZihsaXN0SXRlbSk7CisKKyAgICBsaXN0SXRlbSA9IEFUS19U RVhUKGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQobGlzdCwgMSkpOworICAgIGdfYXNz ZXJ0KEFUS19JU19URVhUKGxpc3RJdGVtKSk7CisKKyAgICAvKiBDaGVjayB0aGF0IHBsYWNpbmcg dGhlIHNhbWUgdGV4dCBpbiBhIHBhcmFncmFwaCBkb2Vzbid0IGJyZWFrIHRoaW5ncy4gKi8KKyAg ICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQobGlzdEl0ZW0pLCAwLCAtMSk7Cisg ICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiXDM0MlwyMDBcMjQyIExpc3QgaXRlbSB3aXRo IHNvbWUgdGV4dCB0aGF0IHdyYXBzIGFjcm9zcyBkaWZmZXJlbnQgbGluZXMuIik7CisgICAgZ19m cmVlKHRleHQpOworCisgICAgdGVzdEdldFRleHRGdW5jdGlvbihBVEtfVEVYVChsaXN0SXRlbSks IGF0a190ZXh0X2dldF90ZXh0X2F0X29mZnNldCwgQVRLX1RFWFRfQk9VTkRBUllfTElORV9TVEFS VCwgMywgIlwzNDJcMjAwXDI0MiBMaXN0IGl0ZW0gIiwgMCwgMTIpOworICAgIHRlc3RHZXRUZXh0 RnVuY3Rpb24oQVRLX1RFWFQobGlzdEl0ZW0pLCBhdGtfdGV4dF9nZXRfdGV4dF9hdF9vZmZzZXQs IEFUS19URVhUX0JPVU5EQVJZX0xJTkVfU1RBUlQsIDEzLCAid2l0aCBzb21lICIsIDEyLCAyMik7 CisgICAgdGVzdEdldFRleHRGdW5jdGlvbihBVEtfVEVYVChsaXN0SXRlbSksIGF0a190ZXh0X2dl dF90ZXh0X2F0X29mZnNldCwgQVRLX1RFWFRfQk9VTkRBUllfTElORV9FTkQsIDAsICJcMzQyXDIw MFwyNDIgTGlzdCBpdGVtIiwgMCwgMTEpOworICAgIHRlc3RHZXRUZXh0RnVuY3Rpb24oQVRLX1RF WFQobGlzdEl0ZW0pLCBhdGtfdGV4dF9nZXRfdGV4dF9hdF9vZmZzZXQsIEFUS19URVhUX0JPVU5E QVJZX0xJTkVfRU5ELCAxMiwgIiB3aXRoIHNvbWUiLCAxMSwgMjEpOworCiAgICAgZ19vYmplY3Rf dW5yZWYobGlzdCk7CiAgICAgZ19vYmplY3RfdW5yZWYobGlzdEl0ZW0pOwogICAgIGdfb2JqZWN0 X3VucmVmKHBhcmFncmFwaCk7Ci0tIAoxLjcuMTEuMgoK