35418 2010-02-25 20:13:27 -0800 [Gtk] Every table, including layout tables, should be exposed as a table 2010-02-26 12:30:20 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 25531 0 jdiggs webkit-unassigned apinheiro commit-queue sam walker.willie webkit.review.bot xan.lopez oldest_to_newest 193987 0 jdiggs 2010-02-25 20:13:27 -0800 By default, WebKit only exposes "data tables" as tables; "layout tables" get turned into a series of panels (GroupRole). And some of these subsequently get ignored as being unnecessary hierarchical elements. ATs providing access to the GNOME desktop expect all tables to be exposed as tables. It is then up to the individual AT to determine if a given object of ATK_ROLE_TABLE should be treated as a proper table or not. (One of the ways it does this, at least for Gecko, is through an object attribute indicating that a given table is suspected as being a layout table. I'll open a separate bug for this.) One example of the impact of this issue is downstream: https://bugs.launchpad.net/ubuntu/+source/software-center/+bug/433104. The primary issue is that focus is being given to a table cell which WebKit is treating as a panel -- and ignoring. This problem can largely be addressed simply by exposing the software center's "layout table" as a proper table, at which point Orca will (for the most part) do the RightThing(tm) automatically. 193989 1 49562 jdiggs 2010-02-25 20:28:31 -0800 Created attachment 49562 proposed fix This causes Orca to (for the most part*) do the right thing automatically when a user arrows within the layout table of the Software Center. *Note that when focus is initially given to the table, Orca will speak the entire contents of the table. This is, I believe, due to the problematic table hierarchy (aka bug 30895) which I'll tackle next. Also note that I'm not including a test at this point for a couple of reasons: 1. The most logical type of test for this situation/bug is, I believe, the same sorts of tests being worked on as part of bug 34449. 2. There's no point IMHO in creating a test which will largely need to be changed just as soon as I fix the problematic table hierarchy. Please review. Thanks! 193990 2 webkit.review.bot 2010-02-25 20:30:07 -0800 Attachment 49562 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp:55: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 193992 3 49563 jdiggs 2010-02-25 20:35:39 -0800 Created attachment 49563 proposed fix - style nit corrected Added the whitespace to the comment as per the stylebot error. Please review. Thanks! 194007 4 49563 xan.lopez 2010-02-25 23:14:29 -0800 Comment on attachment 49563 proposed fix - style nit corrected >+#if PLATFORM(GTK) >+ // Gtk ATs expect all tables, data and layout, to be exposed as tables. >+ if (node && (node->hasTagName(tdTag))) >+ return CellRole; >+ >+ if (node && (node->hasTagName(tableTag))) >+ return TableRole; >+#endif The parenthesis around the second term in each if are not reeded. Other that that looks good, if you can attach a new patch with that detail fixed I'll r+ it. 194008 5 49565 jdiggs 2010-02-25 23:36:16 -0800 Created attachment 49565 proposed fix - nuke unneed parens > The parenthesis around the second term in each if are not reeded. D'oh! Thank you Xan. :-) > Other that that looks good, if you can attach a new patch with that detail > fixed I'll r+ it. Awesome. I appreciate it. 194010 6 49565 xan.lopez 2010-02-25 23:38:37 -0800 Comment on attachment 49565 proposed fix - nuke unneed parens Bam! 194198 7 49565 commit-queue 2010-02-26 12:08:12 -0800 Comment on attachment 49565 proposed fix - nuke unneed parens Clearing flags on attachment: 49565 Committed r55297: <http://trac.webkit.org/changeset/55297> 194199 8 commit-queue 2010-02-26 12:08:16 -0800 All reviewed patches have been landed. Closing bug. 194201 9 sam 2010-02-26 12:10:41 -0800 This patch was missing a test case. Any reason one could not be provided? 194216 10 jdiggs 2010-02-26 12:30:20 -0800 (In reply to comment #9) > This patch was missing a test case. Any reason one could not be provided? Please see comment 1. 49562 2010-02-25 20:28:31 -0800 2010-02-25 20:35:39 -0800 proposed fix 35418-1.patch text/plain 3629 jdiggs RnJvbSBjYzE4YmZjYmYwMDdmN2FhM2VlNGQ2YWJjYmVhMTQ2ZTMzODc0YjBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpkQHZibG9ja2hlYWQuKG5vbmUp PgpEYXRlOiBUaHUsIDI1IEZlYiAyMDEwIDIzOjE1OjEzIC0wNTAwClN1YmplY3Q6IFtQQVRDSCAx MzcvMTM3XSAyMDA5LTAyLTI1ICBKb2FubWFyaWUgRGlnZ3MgIDxqb2FubWFyaWUuZGlnZ3NAZ21h aWwuY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NDE4CiAgICAgICAgW0d0a10g RXZlcnkgdGFibGUsIGluY2x1ZGluZyBsYXlvdXQgdGFibGVzLCBzaG91bGQgYmUgZXhwb3NlZCBh cyBhIHRhYmxlCgogICAgICAgIFRoaXMgcGF0Y2ggZXhwb3NlcyBsYXlvdXQgdGFibGVzIGFzIHRh Ymxlcy4gKEFkZHJlc3NpbmcgdGhlIHByb2JsZW1hdGljIHRhYmxlCiAgICAgICAgaGllcmFyY2h5 IHJlbWFpbnMgdG8gYmUgZG9uZS4pCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNz aWJpbGl0eU9iamVjdEF0ay5jcHA6CiAgICAgICAgKEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vz c2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CiAgICAgICAgKEFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKLS0tCiBXZWJDb3JlL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTUgKysrKysrKysrKysr KysrCiAuLi4vYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCAgICB8 ICAgMTEgKysrKysrKysrKy0KIC4uLi9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2Jq ZWN0QXRrLmNwcCAgIHwgICAgOCArKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YxYTg3ZC4uNmE1MDMyZCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAor MjAwOS0wMi0yNSAgSm9hbm1hcmllIERpZ2dzICA8am9hbm1hcmllLmRpZ2dzQGdtYWlsLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU0MTgKKyAgICAgICAgW0d0a10gRXZl cnkgdGFibGUsIGluY2x1ZGluZyBsYXlvdXQgdGFibGVzLCBzaG91bGQgYmUgZXhwb3NlZCBhcyBh IHRhYmxlCisKKyAgICAgICAgVGhpcyBwYXRjaCBleHBvc2VzIGxheW91dCB0YWJsZXMgYXMgdGFi bGVzLiAoQWRkcmVzc2luZyB0aGUgcHJvYmxlbWF0aWMgdGFibGUKKyAgICAgICAgaGllcmFyY2h5 IHJlbWFpbnMgdG8gYmUgZG9uZS4pCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nl c3NpYmlsaXR5T2JqZWN0QXRrLmNwcDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFj Y2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGUpOgorCiAyMDEwLTAyLTI0 ICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCA3YjczMDEyLi4zYjYwODU4IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0y NzI2LDcgKzI3MjYsMTYgQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGUoKQogCiAgICAgaWYgKG5vZGUgJiYgKG5v ZGUtPmhhc1RhZ05hbWUocnBUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUocnRUYWcpKSkKICAgICAg ICAgcmV0dXJuIEFubm90YXRpb25Sb2xlOwotICAgIAorCisjaWYgUExBVEZPUk0oR1RLKQorICAg IC8vIEd0ayBBVHMgZXhwZWN0IGFsbCB0YWJsZXMsIGRhdGEgYW5kIGxheW91dCwgdG8gYmUgZXhw b3NlZCBhcyB0YWJsZXMuCisgICAgaWYgKG5vZGUgJiYgKG5vZGUtPmhhc1RhZ05hbWUodGRUYWcp KSkKKyAgICAgICAgcmV0dXJuIENlbGxSb2xlOworCisgICAgaWYgKG5vZGUgJiYgKG5vZGUtPmhh c1RhZ05hbWUodGFibGVUYWcpKSkKKyAgICAgICAgcmV0dXJuIFRhYmxlUm9sZTsKKyNlbmRpZiAg IAorCiAgICAgaWYgKG1fcmVuZGVyZXItPmlzQmxvY2tGbG93KCkgfHwgKG5vZGUgJiYgbm9kZS0+ aGFzVGFnTmFtZShsYWJlbFRhZykpKQogICAgICAgICByZXR1cm4gR3JvdXBSb2xlOwogICAgIApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0 QXRrLmNwcCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0 ay5jcHAKaW5kZXggZjQ4NzcwZi4uOWVmMTQ2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwCkBAIC01MCw4ICs1MCwxNCBA QCBBY2Nlc3NpYmlsaXR5T2JqZWN0UGxhdGZvcm1JbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVj dDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSQogICAgIGlmIChwYXJlbnQtPmlzUGFzc3dvcmRGaWVs ZCgpIHx8IHBhcmVudC0+aXNUZXh0Q29udHJvbCgpKQogICAgICAgICByZXR1cm4gSWdub3JlT2Jq ZWN0OwogCisgICAgQWNjZXNzaWJpbGl0eVJvbGUgcm9sZSA9IHJvbGVWYWx1ZSgpOworCisgICAg Ly9JbmNsdWRlIGFsbCB0YWJsZXMsIGV2ZW4gbGF5b3V0IHRhYmxlcy4gVGhlIEFUIGNhbiBkZWNp ZGUgd2hhdCB0byBkbyB3aXRoIGVhY2guCisgICAgaWYgKHJvbGUgPT0gQ2VsbFJvbGUgfHwgcm9s ZSA9PSBUYWJsZVJvbGUpCisgICAgICAgIHJldHVybiBJbmNsdWRlT2JqZWN0OworCiAgICAgLy8g VGhlIG9iamVjdCBjb250YWluaW5nIHRoZSB0ZXh0IHNob3VsZCBpbXBsZW1lbnQgQXRrVGV4dCBp dHNlbGYuCi0gICAgaWYgKHJvbGVWYWx1ZSgpID09IFN0YXRpY1RleHRSb2xlKQorICAgIGlmIChy b2xlID09IFN0YXRpY1RleHRSb2xlKQogICAgICAgICByZXR1cm4gSWdub3JlT2JqZWN0OwogCiAg ICAgcmV0dXJuIERlZmF1bHRCZWhhdmlvcjsKLS0gCjEuNy4wCgo= 49563 2010-02-25 20:35:39 -0800 2010-02-25 23:37:12 -0800 proposed fix - style nit corrected 35418-1.patch text/plain 3630 jdiggs RnJvbSBjYzE4YmZjYmYwMDdmN2FhM2VlNGQ2YWJjYmVhMTQ2ZTMzODc0YjBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpkQHZibG9ja2hlYWQuKG5vbmUp PgpEYXRlOiBUaHUsIDI1IEZlYiAyMDEwIDIzOjE1OjEzIC0wNTAwClN1YmplY3Q6IFtQQVRDSCAx MzcvMTM3XSAyMDA5LTAyLTI1ICBKb2FubWFyaWUgRGlnZ3MgIDxqb2FubWFyaWUuZGlnZ3NAZ21h aWwuY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NDE4CiAgICAgICAgW0d0a10g RXZlcnkgdGFibGUsIGluY2x1ZGluZyBsYXlvdXQgdGFibGVzLCBzaG91bGQgYmUgZXhwb3NlZCBh cyBhIHRhYmxlCgogICAgICAgIFRoaXMgcGF0Y2ggZXhwb3NlcyBsYXlvdXQgdGFibGVzIGFzIHRh Ymxlcy4gKEFkZHJlc3NpbmcgdGhlIHByb2JsZW1hdGljIHRhYmxlCiAgICAgICAgaGllcmFyY2h5 IHJlbWFpbnMgdG8gYmUgZG9uZS4pCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNz aWJpbGl0eU9iamVjdEF0ay5jcHA6CiAgICAgICAgKEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vz c2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CiAgICAgICAgKEFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKLS0tCiBXZWJDb3JlL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTUgKysrKysrKysrKysr KysrCiAuLi4vYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCAgICB8 ICAgMTEgKysrKysrKysrKy0KIC4uLi9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2Jq ZWN0QXRrLmNwcCAgIHwgICAgOCArKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YxYTg3ZC4uNmE1MDMyZCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAor MjAwOS0wMi0yNSAgSm9hbm1hcmllIERpZ2dzICA8am9hbm1hcmllLmRpZ2dzQGdtYWlsLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU0MTgKKyAgICAgICAgW0d0a10gRXZl cnkgdGFibGUsIGluY2x1ZGluZyBsYXlvdXQgdGFibGVzLCBzaG91bGQgYmUgZXhwb3NlZCBhcyBh IHRhYmxlCisKKyAgICAgICAgVGhpcyBwYXRjaCBleHBvc2VzIGxheW91dCB0YWJsZXMgYXMgdGFi bGVzLiAoQWRkcmVzc2luZyB0aGUgcHJvYmxlbWF0aWMgdGFibGUKKyAgICAgICAgaGllcmFyY2h5 IHJlbWFpbnMgdG8gYmUgZG9uZS4pCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nl c3NpYmlsaXR5T2JqZWN0QXRrLmNwcDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFj Y2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGUpOgorCiAyMDEwLTAyLTI0 ICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCA3YjczMDEyLi4zYjYwODU4IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0y NzI2LDcgKzI3MjYsMTYgQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGUoKQogCiAgICAgaWYgKG5vZGUgJiYgKG5v ZGUtPmhhc1RhZ05hbWUocnBUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUocnRUYWcpKSkKICAgICAg ICAgcmV0dXJuIEFubm90YXRpb25Sb2xlOwotICAgIAorCisjaWYgUExBVEZPUk0oR1RLKQorICAg IC8vIEd0ayBBVHMgZXhwZWN0IGFsbCB0YWJsZXMsIGRhdGEgYW5kIGxheW91dCwgdG8gYmUgZXhw b3NlZCBhcyB0YWJsZXMuCisgICAgaWYgKG5vZGUgJiYgKG5vZGUtPmhhc1RhZ05hbWUodGRUYWcp KSkKKyAgICAgICAgcmV0dXJuIENlbGxSb2xlOworCisgICAgaWYgKG5vZGUgJiYgKG5vZGUtPmhh c1RhZ05hbWUodGFibGVUYWcpKSkKKyAgICAgICAgcmV0dXJuIFRhYmxlUm9sZTsKKyNlbmRpZiAg IAorCiAgICAgaWYgKG1fcmVuZGVyZXItPmlzQmxvY2tGbG93KCkgfHwgKG5vZGUgJiYgbm9kZS0+ aGFzVGFnTmFtZShsYWJlbFRhZykpKQogICAgICAgICByZXR1cm4gR3JvdXBSb2xlOwogICAgIApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0 QXRrLmNwcCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0 ay5jcHAKaW5kZXggZjQ4NzcwZi4uOWVmMTQ2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwCkBAIC01MCw4ICs1MCwxNCBA QCBBY2Nlc3NpYmlsaXR5T2JqZWN0UGxhdGZvcm1JbmNsdXNpb24gQWNjZXNzaWJpbGl0eU9iamVj dDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSQogICAgIGlmIChwYXJlbnQtPmlzUGFzc3dvcmRGaWVs ZCgpIHx8IHBhcmVudC0+aXNUZXh0Q29udHJvbCgpKQogICAgICAgICByZXR1cm4gSWdub3JlT2Jq ZWN0OwogCisgICAgQWNjZXNzaWJpbGl0eVJvbGUgcm9sZSA9IHJvbGVWYWx1ZSgpOworCisgICAg Ly8gSW5jbHVkZSBhbGwgdGFibGVzLCBldmVuIGxheW91dCB0YWJsZXMuIFRoZSBBVCBjYW4gZGVj aWRlIHdoYXQgdG8gZG8gd2l0aCBlYWNoLgorICAgIGlmIChyb2xlID09IENlbGxSb2xlIHx8IHJv bGUgPT0gVGFibGVSb2xlKQorICAgICAgICByZXR1cm4gSW5jbHVkZU9iamVjdDsKKwogICAgIC8v IFRoZSBvYmplY3QgY29udGFpbmluZyB0aGUgdGV4dCBzaG91bGQgaW1wbGVtZW50IEF0a1RleHQg aXRzZWxmLgotICAgIGlmIChyb2xlVmFsdWUoKSA9PSBTdGF0aWNUZXh0Um9sZSkKKyAgICBpZiAo cm9sZSA9PSBTdGF0aWNUZXh0Um9sZSkKICAgICAgICAgcmV0dXJuIElnbm9yZU9iamVjdDsKIAog ICAgIHJldHVybiBEZWZhdWx0QmVoYXZpb3I7Ci0tIAoxLjcuMAoK 49565 2010-02-25 23:36:16 -0800 2010-02-26 12:08:12 -0800 proposed fix - nuke unneed parens 35418-2.patch text/plain 3626 jdiggs RnJvbSBjYzE4YmZjYmYwMDdmN2FhM2VlNGQ2YWJjYmVhMTQ2ZTMzODc0YjBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpkQHZibG9ja2hlYWQuKG5vbmUp PgpEYXRlOiBUaHUsIDI1IEZlYiAyMDEwIDIzOjE1OjEzIC0wNTAwClN1YmplY3Q6IFtQQVRDSCAx MzcvMTM3XSAyMDA5LTAyLTI1ICBKb2FubWFyaWUgRGlnZ3MgIDxqb2FubWFyaWUuZGlnZ3NAZ21h aWwuY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1NDE4CiAgICAgICAgW0d0a10g RXZlcnkgdGFibGUsIGluY2x1ZGluZyBsYXlvdXQgdGFibGVzLCBzaG91bGQgYmUgZXhwb3NlZCBh cyBhIHRhYmxlCgogICAgICAgIFRoaXMgcGF0Y2ggZXhwb3NlcyBsYXlvdXQgdGFibGVzIGFzIHRh Ymxlcy4gKEFkZHJlc3NpbmcgdGhlIHByb2JsZW1hdGljIHRhYmxlCiAgICAgICAgaGllcmFyY2h5 IHJlbWFpbnMgdG8gYmUgZG9uZS4pCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNz aWJpbGl0eU9iamVjdEF0ay5jcHA6CiAgICAgICAgKEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vz c2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CiAgICAgICAgKEFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3Q6OmRldGVybWluZUFjY2Vzc2liaWxpdHlSb2xlKToKLS0tCiBXZWJDb3JlL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTUgKysrKysrKysrKysr KysrCiAuLi4vYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCAgICB8 ICAgMTEgKysrKysrKysrKy0KIC4uLi9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2Jq ZWN0QXRrLmNwcCAgIHwgICAgOCArKysrKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YxYTg3ZC4uNmE1MDMyZCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAor MjAwOS0wMi0yNSAgSm9hbm1hcmllIERpZ2dzICA8am9hbm1hcmllLmRpZ2dzQGdtYWlsLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU0MTgKKyAgICAgICAgW0d0a10gRXZl cnkgdGFibGUsIGluY2x1ZGluZyBsYXlvdXQgdGFibGVzLCBzaG91bGQgYmUgZXhwb3NlZCBhcyBh IHRhYmxlCisKKyAgICAgICAgVGhpcyBwYXRjaCBleHBvc2VzIGxheW91dCB0YWJsZXMgYXMgdGFi bGVzLiAoQWRkcmVzc2luZyB0aGUgcHJvYmxlbWF0aWMgdGFibGUKKyAgICAgICAgaGllcmFyY2h5 IHJlbWFpbnMgdG8gYmUgZG9uZS4pCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nl c3NpYmlsaXR5T2JqZWN0QXRrLmNwcDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFj Y2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGUpOgorCiAyMDEwLTAyLTI0 ICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCA3YjczMDEyLi4zYjYwODU4IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0y NzI2LDcgKzI3MjYsMTYgQEAgQWNjZXNzaWJpbGl0eVJvbGUgQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6ZGV0ZXJtaW5lQWNjZXNzaWJpbGl0eVJvbGUoKQogCiAgICAgaWYgKG5vZGUgJiYgKG5v ZGUtPmhhc1RhZ05hbWUocnBUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUocnRUYWcpKSkKICAgICAg ICAgcmV0dXJuIEFubm90YXRpb25Sb2xlOwotICAgIAorCisjaWYgUExBVEZPUk0oR1RLKQorICAg IC8vIEd0ayBBVHMgZXhwZWN0IGFsbCB0YWJsZXMsIGRhdGEgYW5kIGxheW91dCwgdG8gYmUgZXhw b3NlZCBhcyB0YWJsZXMuCisgICAgaWYgKG5vZGUgJiYgbm9kZS0+aGFzVGFnTmFtZSh0ZFRhZykp CisgICAgICAgIHJldHVybiBDZWxsUm9sZTsKKworICAgIGlmIChub2RlICYmIG5vZGUtPmhhc1Rh Z05hbWUodGFibGVUYWcpKQorICAgICAgICByZXR1cm4gVGFibGVSb2xlOworI2VuZGlmICAgCisK ICAgICBpZiAobV9yZW5kZXJlci0+aXNCbG9ja0Zsb3coKSB8fCAobm9kZSAmJiBub2RlLT5oYXNU YWdOYW1lKGxhYmVsVGFnKSkpCiAgICAgICAgIHJldHVybiBHcm91cFJvbGU7CiAgICAgCmRpZmYg LS1naXQgYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsu Y3BwIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNw cAppbmRleCBmNDg3NzBmLi45ZWYxNDZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwCisrKyBiL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHAKQEAgLTUwLDggKzUwLDE0IEBAIEFj Y2Vzc2liaWxpdHlPYmplY3RQbGF0Zm9ybUluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojph Y2Nlc3NpYmlsaXR5UGxhdGZvcm1JCiAgICAgaWYgKHBhcmVudC0+aXNQYXNzd29yZEZpZWxkKCkg fHwgcGFyZW50LT5pc1RleHRDb250cm9sKCkpCiAgICAgICAgIHJldHVybiBJZ25vcmVPYmplY3Q7 CiAKKyAgICBBY2Nlc3NpYmlsaXR5Um9sZSByb2xlID0gcm9sZVZhbHVlKCk7CisKKyAgICAvLyBJ bmNsdWRlIGFsbCB0YWJsZXMsIGV2ZW4gbGF5b3V0IHRhYmxlcy4gVGhlIEFUIGNhbiBkZWNpZGUg d2hhdCB0byBkbyB3aXRoIGVhY2guCisgICAgaWYgKHJvbGUgPT0gQ2VsbFJvbGUgfHwgcm9sZSA9 PSBUYWJsZVJvbGUpCisgICAgICAgIHJldHVybiBJbmNsdWRlT2JqZWN0OworCiAgICAgLy8gVGhl IG9iamVjdCBjb250YWluaW5nIHRoZSB0ZXh0IHNob3VsZCBpbXBsZW1lbnQgQXRrVGV4dCBpdHNl bGYuCi0gICAgaWYgKHJvbGVWYWx1ZSgpID09IFN0YXRpY1RleHRSb2xlKQorICAgIGlmIChyb2xl ID09IFN0YXRpY1RleHRSb2xlKQogICAgICAgICByZXR1cm4gSWdub3JlT2JqZWN0OwogCiAgICAg cmV0dXJuIERlZmF1bHRCZWhhdmlvcjsKLS0gCjEuNy4wCgo=