45383 2010-09-08 05:18:43 -0700 [Gtk] Incorrect exposure of list items whose children are elements 2010-09-22 00:49:52 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 25531 0 jdiggs webkit-unassigned apinheiro commit-queue mario xan.lopez oldest_to_newest 275768 0 66882 jdiggs 2010-09-08 05:18:43 -0700 Created attachment 66882 test case As a result of the fix for bug #45190, the bullet/number of a list item was made part of the text. (Thanks!) This change seems to have had an unintended side effect for list items whose children are elements. Steps to reproduce: 1. Open the attached test case. 2. In Accerciser, examine the accessible hierarchy. Prior to the fix for bug #45190, each child of the list was a list item. Now, the list item whose immediate child is a paragraph is exposed to us as a paragraph. (And the bullet seems to be missing.) 280197 1 mario 2010-09-16 10:39:56 -0700 (In reply to comment #0) > [...] > Prior to the fix for bug #45190, each child of the list was a list item. Now, the list item whose > immediate child is a paragraph is exposed to us as a paragraph. (And the bullet seems to be > missing.) I was able to reproduce this, but also with the patch 45190 reverted so the problem must be somewhere else. Keep looking... 280578 2 mario 2010-09-17 02:14:29 -0700 It looks this could be related to stuff done for bug 27085 280731 3 67918 mario 2010-09-17 10:47:24 -0700 Created attachment 67918 Patch proposal After some work I think the most simple way to fix this is by just forcing inclusion in accessibility of the list items in the platform-dependant part of the accessibilityIsIgnored() mechanism, as I found the behaviour of not exposing the list item when its immediate child is a non inline object is the expected behaviour, as coded in AccessibilityRenderObject::accessibilityIsIgnored(): [...] if (m_renderer->isBlockFlow() && m_renderer->childrenInline()) return !toRenderBlock(m_renderer)->firstLineBox() && !mouseButtonListener(); [...] As that part of code is what it's making the difference between a <li>plain text</li> item and a <li><p>paragraph text</p></li> item, I thought the best way to fix this for GTK without bothering other ports was the exposed above. Then there's an ugly part in the patch that is required to deal with the special case of the list item markers, which are not exposed to AT's but must be taken into account anyway when considering offets and those kind of things. Hence, now asking for review. Shoot your questions, I'm eager to continue working on this patch. 280734 4 mario 2010-09-17 10:48:39 -0700 Btw, while working on this bug I found another strange behaviour with the markers of items with non inline children so I filed this bug: https://bugs.webkit.org/show_bug.cgi?id=45973 281685 5 67918 cfleizach 2010-09-20 11:19:10 -0700 Comment on attachment 67918 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=67918&action=review > WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp:76 > + // Include all list items, regardless they have or not inline children seems like you already have "role" here, so you shouldn't have to call roleValue() again > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:2031 > + if (role != TableRole && axRenderObject->renderer()->childrenInline()) you should verify renderer() is not nil before accessing inline children > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:2036 > + AccessibilityObject* axRenderChild = axRenderObject->firstChild(); Can't you just access ->children() of the axRenderObject and then check if it has an item in it? that would be the first accessible element. 282175 6 68206 mario 2010-09-21 03:25:46 -0700 Created attachment 68206 Patch proposal (In reply to comment #5) > (From update of attachment 67918 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67918&action=review > > > WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp:76 > > + // Include all list items, regardless they have or not inline children > > seems like you already have "role" here, so you shouldn't have to call roleValue() again Done and also fixed the same mistake in the next line (introduced some commits ago). > > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:2031 > > + if (role != TableRole && axRenderObject->renderer()->childrenInline()) > > you should verify renderer() is not nil before accessing inline children Done. > > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:2036 > > + AccessibilityObject* axRenderChild = axRenderObject->firstChild(); > > Can't you just access ->children() of the axRenderObject and then check if it has an item in it? that would be the first accessible element. Done. 282376 7 68206 cfleizach 2010-09-21 09:59:45 -0700 Comment on attachment 68206 Patch proposal can we get a layout test for this behavior. this has the appearance that if something upstream in WebCore changed, it could cause breakage. 282434 8 68261 mario 2010-09-21 11:00:45 -0700 Created attachment 68261 Patch proposal (In reply to comment #7) > (From update of attachment 68206 [details]) > can we get a layout test for this behavior. this has the appearance that if something upstream in WebCore changed, it could cause breakage. Attaching a new version of the patch with a Layout Test (GTK specific) to check that list items are always exposed like that 282543 9 68261 cfleizach 2010-09-21 13:53:51 -0700 Comment on attachment 68261 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=68261&action=review > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:2038 > + if (children.size() > 0) { sorry... this should just be if (children.size()) 282551 10 68289 mario 2010-09-21 14:09:43 -0700 Created attachment 68289 Patch proposal (In reply to comment #9) > (From update of attachment 68261 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=68261&action=review > > > WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:2038 > > + if (children.size() > 0) { > > sorry... > > this should just be > if (children.size()) No problem. Attaching a new patch with that issue fixed. 282558 11 68289 cfleizach 2010-09-21 14:26:49 -0700 Comment on attachment 68289 Patch proposal r=me 282819 12 68289 commit-queue 2010-09-22 00:49:44 -0700 Comment on attachment 68289 Patch proposal Clearing flags on attachment: 68289 Committed r68023: <http://trac.webkit.org/changeset/68023> 282820 13 commit-queue 2010-09-22 00:49:52 -0700 All reviewed patches have been landed. Closing bug. 66882 2010-09-08 05:18:43 -0700 2010-09-08 05:18:43 -0700 test case list-items2.html text/html 137 jdiggs PGh0bWw+CjxoZWFkPgo8dGl0bGU+TGlzdCBJdGVtczwvdGl0bGU+CjwvaGVhZD4KPGJvZHk+Cjx1 bD4KPGxpPnRleHQgb25seTwvbGk+CjxsaT48cD50ZXh0IGluIGEgcGFyYWdyYXBoPC9wPjwvbGk+ CjwvdWw+CjwvYm9keT4KPC9odG1sPgo= 67918 2010-09-17 10:47:24 -0700 2010-09-21 03:25:46 -0700 Patch proposal 0001-2010-09-17-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 4479 mario RnJvbSBiYmRiZWFmZTdlOTI4OTdiOGZkY2M0N2JlMjVhOTg4MjUwNTNkZWFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBGcmksIDE3IFNlcCAyMDEwIDE4OjQ5OjQzICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMC0wOS0xNyAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR3RrXSBJbmNv cnJlY3QgZXhwb3N1cmUgb2YgbGlzdCBpdGVtcyB3aG9zZSBjaGlsZHJlbiBhcmUgZWxlbWVudHMK ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUzODMKCiAg ICAgICAgU2V0IEFUS19ST0xFX0xJU1RfSVRFTSBsb29raW5nIGZvciB0aGUgcm9sZSBvZiB0aGUg cGFyZW50IG9iamVjdAoKICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlP YmplY3RBdGsuY3BwOgogICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nl c3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCk6CiAgICAgICAgQWx3YXlzIGluY2x1ZGUg b2JqZWN0cyB3aXRoIExpc3RJdGVtUm9sZSBpbiBhY2Nlc3NpYmlsaXR5IGZvciBHVEsuCiAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6 CiAgICAgICAgKGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KTogQWRkIHNvbWUgc3BlY2lmaWMg Y29kZSB0byBoYW5kbGUgdGhlCiAgICAgICAgc3BlY2lhbCBjYXNlIG9mIGxpc3QgbWFya2VycyBi eSBpbXBsZW1lbnRpbmcgQXRrVGV4dCB3aGVuIG5lZWRlZC4KLS0tCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTYgKysrKysrKysrKysrKysr KwogLi4uL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwICAgfCAg ICA0ICsrKysKIC4uLi9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwICAgICAg ICAgIHwgICAxNiArKysrKysrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlv bnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NDFjYzVhLi43MGE4NzU5IDEwMDY0NAotLS0gYS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisy MDEwLTA5LTE3ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBJbmNv cnJlY3QgZXhwb3N1cmUgb2YgbGlzdCBpdGVtcyB3aG9zZSBjaGlsZHJlbiBhcmUgZWxlbWVudHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MzgzCisK KyAgICAgICAgU2V0IEFUS19ST0xFX0xJU1RfSVRFTSBsb29raW5nIGZvciB0aGUgcm9sZSBvZiB0 aGUgcGFyZW50IG9iamVjdAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJp bGl0eU9iamVjdEF0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0 OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCk6CisgICAgICAgIEFsd2F5cyBp bmNsdWRlIG9iamVjdHMgd2l0aCBMaXN0SXRlbVJvbGUgaW4gYWNjZXNzaWJpbGl0eSBmb3IgR1RL LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVy QXRrLmNwcDoKKyAgICAgICAgKGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KTogQWRkIHNvbWUg c3BlY2lmaWMgY29kZSB0byBoYW5kbGUgdGhlCisgICAgICAgIHNwZWNpYWwgY2FzZSBvZiBsaXN0 IG1hcmtlcnMgYnkgaW1wbGVtZW50aW5nIEF0a1RleHQgd2hlbiBuZWVkZWQuCisKIDIwMTAtMDkt MTQgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBSZXZp ZXdlZCBieSBLZW50IFRhbXVyYS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9n dGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHAgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3Rr L0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwCmluZGV4IDdmOWZkMWEuLjJjNzdiNTggMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5j cHAKKysrIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRr LmNwcApAQCAtNzMsNiArNzMsMTAgQEAgQWNjZXNzaWJpbGl0eU9iamVjdEluY2x1c2lvbiBBY2Nl c3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc08KICAgICBpZiAo cm9sZSA9PSBTdGF0aWNUZXh0Um9sZSkKICAgICAgICAgcmV0dXJuIElnbm9yZU9iamVjdDsKIAor ICAgIC8vIEluY2x1ZGUgYWxsIGxpc3QgaXRlbXMsIHJlZ2FyZGxlc3MgdGhleSBoYXZlIG9yIG5v dCBpbmxpbmUgY2hpbGRyZW4KKyAgICBpZiAocm9sZVZhbHVlKCkgPT0gTGlzdEl0ZW1Sb2xlKQor ICAgICAgICByZXR1cm4gSW5jbHVkZU9iamVjdDsKKwogICAgIC8vIEJ1bGxldHMvbnVtYmVycyBm b3IgbGlzdCBpdGVtcyBzaG91bGRuJ3QgYmUgZXhwb3NlZCBhcyBBdGtPYmplY3RzLgogICAgIGlm IChyb2xlVmFsdWUoKSA9PSBMaXN0TWFya2VyUm9sZSkKICAgICAgICAgcmV0dXJuIElnbm9yZU9i amVjdDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXJBdGsuY3BwIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKaW5kZXggMDFkZGRkMS4uNzlkNjMxMCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckF0ay5jcHAKKysrIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlckF0ay5jcHAKQEAgLTIwMjYsOCArMjAyNiwyMCBAQCBzdGF0aWMgZ3VpbnQxNiBn ZXRJbnRlcmZhY2VNYXNrRnJvbU9iamVjdChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0 KQogICAgICAgICAgICAgaW50ZXJmYWNlTWFzayB8PSAxIDw8IFdBSV9URVhUOwogICAgICAgICAg ICAgaWYgKCFjb3JlT2JqZWN0LT5pc1JlYWRPbmx5KCkpCiAgICAgICAgICAgICAgICAgaW50ZXJm YWNlTWFzayB8PSAxIDw8IFdBSV9FRElUQUJMRV9URVhUOwotICAgICAgICB9IGVsc2UgaWYgKHJv bGUgIT0gVGFibGVSb2xlICYmIHN0YXRpY19jYXN0PEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Qq Pihjb3JlT2JqZWN0KS0+cmVuZGVyZXIoKS0+Y2hpbGRyZW5JbmxpbmUoKSkKLSAgICAgICAgICAg IGludGVyZmFjZU1hc2sgfD0gMSA8PCBXQUlfVEVYVDsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgICAgIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QqIGF4UmVuZGVyT2JqZWN0ID0gc3RhdGlj X2Nhc3Q8QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCo+KGNvcmVPYmplY3QpOworICAgICAgICAg ICAgaWYgKHJvbGUgIT0gVGFibGVSb2xlICYmIGF4UmVuZGVyT2JqZWN0LT5yZW5kZXJlcigpLT5j aGlsZHJlbklubGluZSgpKQorICAgICAgICAgICAgICAgIGludGVyZmFjZU1hc2sgfD0gMSA8PCBX QUlfVEVYVDsKKyAgICAgICAgICAgIGVsc2UgaWYgKHJvbGUgPT0gTGlzdEl0ZW1Sb2xlKSB7Cisg ICAgICAgICAgICAgICAgLy8gQWRkIHRoZSBURVhUIGludGVyZmFjZSBmb3IgbGlzdCBpdGVtcyB3 aG9zZQorICAgICAgICAgICAgICAgIC8vIGZpcnN0IGFjY2Vzc2libGUgY2hpbGQgaGFzIGEgdGV4 dCByZW5kZXJlcgorICAgICAgICAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGF4UmVuZGVy Q2hpbGQgPSBheFJlbmRlck9iamVjdC0+Zmlyc3RDaGlsZCgpOworICAgICAgICAgICAgICAgIHdo aWxlIChheFJlbmRlckNoaWxkICYmIGF4UmVuZGVyQ2hpbGQtPmFjY2Vzc2liaWxpdHlJc0lnbm9y ZWQoKSkKKyAgICAgICAgICAgICAgICAgICAgYXhSZW5kZXJDaGlsZCA9IHN0YXRpY19jYXN0PEFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3QqPihheFJlbmRlckNoaWxkLT5uZXh0U2libGluZygpKTsK KyAgICAgICAgICAgICAgICBpZiAoYXhSZW5kZXJDaGlsZCkKKyAgICAgICAgICAgICAgICAgICAg aW50ZXJmYWNlTWFzayB8PSBnZXRJbnRlcmZhY2VNYXNrRnJvbU9iamVjdChheFJlbmRlckNoaWxk KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogCiAgICAgLy8gSW1hZ2UKICAgICBpZiAoY29y ZU9iamVjdC0+aXNJbWFnZSgpKQotLSAKMS43LjAuNAoK 68206 2010-09-21 03:25:46 -0700 2010-09-21 11:00:45 -0700 Patch proposal 0001-2010-09-21-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 4549 mario RnJvbSAwMjhlM2U4Y2FhZDA3MTk3MDY1YTQwNGJhNzExNGE0NGE5NGU2NDI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUdWUsIDIxIFNlcCAyMDEwIDEyOjIyOjUyICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMC0wOS0yMSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR3RrXSBJbmNv cnJlY3QgZXhwb3N1cmUgb2YgbGlzdCBpdGVtcyB3aG9zZSBjaGlsZHJlbiBhcmUgZWxlbWVudHMK ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUzODMKCiAg ICAgICAgU2V0IEFUS19ST0xFX0xJU1RfSVRFTSBsb29raW5nIGZvciB0aGUgcm9sZSBvZiB0aGUg cGFyZW50IG9iamVjdAoKICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlP YmplY3RBdGsuY3BwOgogICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nl c3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCk6CiAgICAgICAgQWx3YXlzIGluY2x1ZGUg b2JqZWN0cyB3aXRoIExpc3RJdGVtUm9sZSBpbiBhY2Nlc3NpYmlsaXR5IGZvciBHVEsuCiAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6 CiAgICAgICAgKGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KTogQWRkIHNvbWUgc3BlY2lmaWMg Y29kZSB0byBoYW5kbGUgdGhlCiAgICAgICAgc3BlY2lhbCBjYXNlIG9mIGxpc3QgbWFya2VycyBi eSBpbXBsZW1lbnRpbmcgQXRrVGV4dCB3aGVuIG5lZWRlZC4KLS0tCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTYgKysrKysrKysrKysrKysr KwogLi4uL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwICAgfCAg ICA2ICsrKysrLQogLi4uL2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgICAg ICAgICAgfCAgIDE3ICsrKysrKysrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDM2IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhY2ZmNjc1Li4yZTQzYjQ2IDEwMDY0NAotLS0gYS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBA CisyMDEwLTA5LTIxICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBJ bmNvcnJlY3QgZXhwb3N1cmUgb2YgbGlzdCBpdGVtcyB3aG9zZSBjaGlsZHJlbiBhcmUgZWxlbWVu dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1Mzgz CisKKyAgICAgICAgU2V0IEFUS19ST0xFX0xJU1RfSVRFTSBsb29raW5nIGZvciB0aGUgcm9sZSBv ZiB0aGUgcGFyZW50IG9iamVjdAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNz aWJpbGl0eU9iamVjdEF0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2Jq ZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNsdWRlc09iamVjdCk6CisgICAgICAgIEFsd2F5 cyBpbmNsdWRlIG9iamVjdHMgd2l0aCBMaXN0SXRlbVJvbGUgaW4gYWNjZXNzaWJpbGl0eSBmb3Ig R1RLLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFw cGVyQXRrLmNwcDoKKyAgICAgICAgKGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KTogQWRkIHNv bWUgc3BlY2lmaWMgY29kZSB0byBoYW5kbGUgdGhlCisgICAgICAgIHNwZWNpYWwgY2FzZSBvZiBs aXN0IG1hcmtlcnMgYnkgaW1wbGVtZW50aW5nIEF0a1RleHQgd2hlbiBuZWVkZWQuCisKIDIwMTAt MDktMTkgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI2Nzc0OS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHAgYi9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwCmluZGV4IDdmOWZkMWEu Ljk3NzJiNDMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJp bGl0eU9iamVjdEF0ay5jcHAKKysrIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3Np YmlsaXR5T2JqZWN0QXRrLmNwcApAQCAtNzMsOCArNzMsMTIgQEAgQWNjZXNzaWJpbGl0eU9iamVj dEluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZvcm1JbmNs dWRlc08KICAgICBpZiAocm9sZSA9PSBTdGF0aWNUZXh0Um9sZSkKICAgICAgICAgcmV0dXJuIEln bm9yZU9iamVjdDsKIAorICAgIC8vIEluY2x1ZGUgYWxsIGxpc3QgaXRlbXMsIHJlZ2FyZGxlc3Mg dGhleSBoYXZlIG9yIG5vdCBpbmxpbmUgY2hpbGRyZW4KKyAgICBpZiAocm9sZSA9PSBMaXN0SXRl bVJvbGUpCisgICAgICAgIHJldHVybiBJbmNsdWRlT2JqZWN0OworCiAgICAgLy8gQnVsbGV0cy9u dW1iZXJzIGZvciBsaXN0IGl0ZW1zIHNob3VsZG4ndCBiZSBleHBvc2VkIGFzIEF0a09iamVjdHMu Ci0gICAgaWYgKHJvbGVWYWx1ZSgpID09IExpc3RNYXJrZXJSb2xlKQorICAgIGlmIChyb2xlID09 IExpc3RNYXJrZXJSb2xlKQogICAgICAgICByZXR1cm4gSWdub3JlT2JqZWN0OwogCiAgICAgcmV0 dXJuIERlZmF1bHRCZWhhdmlvcjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9n dGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwIGIvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKaW5kZXggMDFkZGRkMS4u YzY2OTQ0MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKKysrIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9B Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKQEAgLTIwMjYsOCArMjAyNiwyMSBAQCBz dGF0aWMgZ3VpbnQxNiBnZXRJbnRlcmZhY2VNYXNrRnJvbU9iamVjdChBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBjb3JlT2JqZWN0KQogICAgICAgICAgICAgaW50ZXJmYWNlTWFzayB8PSAxIDw8IFdBSV9U RVhUOwogICAgICAgICAgICAgaWYgKCFjb3JlT2JqZWN0LT5pc1JlYWRPbmx5KCkpCiAgICAgICAg ICAgICAgICAgaW50ZXJmYWNlTWFzayB8PSAxIDw8IFdBSV9FRElUQUJMRV9URVhUOwotICAgICAg ICB9IGVsc2UgaWYgKHJvbGUgIT0gVGFibGVSb2xlICYmIHN0YXRpY19jYXN0PEFjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3QqPihjb3JlT2JqZWN0KS0+cmVuZGVyZXIoKS0+Y2hpbGRyZW5JbmxpbmUo KSkKLSAgICAgICAgICAgIGludGVyZmFjZU1hc2sgfD0gMSA8PCBXQUlfVEVYVDsKKyAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QqIGF4UmVuZGVy T2JqZWN0ID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCo+KGNvcmVPYmpl Y3QpOworICAgICAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGF4UmVuZGVyT2JqZWN0 LT5yZW5kZXJlcigpOworICAgICAgICAgICAgaWYgKHJvbGUgIT0gVGFibGVSb2xlICYmIHJlbmRl cmVyICYmIHJlbmRlcmVyLT5jaGlsZHJlbklubGluZSgpKQorICAgICAgICAgICAgICAgIGludGVy ZmFjZU1hc2sgfD0gMSA8PCBXQUlfVEVYVDsKKyAgICAgICAgICAgIGVsc2UgaWYgKHJvbGUgPT0g TGlzdEl0ZW1Sb2xlKSB7CisgICAgICAgICAgICAgICAgLy8gQWRkIHRoZSBURVhUIGludGVyZmFj ZSBmb3IgbGlzdCBpdGVtcyB3aG9zZQorICAgICAgICAgICAgICAgIC8vIGZpcnN0IGFjY2Vzc2li bGUgY2hpbGQgaGFzIGEgdGV4dCByZW5kZXJlcgorICAgICAgICAgICAgICAgIEFjY2Vzc2liaWxp dHlPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBjaGlsZHJlbiA9IGF4UmVuZGVy T2JqZWN0LT5jaGlsZHJlbigpOworICAgICAgICAgICAgICAgIGlmIChjaGlsZHJlbi5zaXplKCkg PiAwKSB7CisgICAgICAgICAgICAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGF4UmVuZGVy Q2hpbGQgPSBjaGlsZHJlbi5hdCgwKS5nZXQoKTsKKyAgICAgICAgICAgICAgICAgICAgaW50ZXJm YWNlTWFzayB8PSBnZXRJbnRlcmZhY2VNYXNrRnJvbU9iamVjdChheFJlbmRlckNoaWxkKTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0KIAogICAgIC8vIEltYWdl CiAgICAgaWYgKGNvcmVPYmplY3QtPmlzSW1hZ2UoKSkKLS0gCjEuNy4wLjQKCg== 68261 2010-09-21 11:00:45 -0700 2010-09-21 14:09:43 -0700 Patch proposal 0001-2010-09-21-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 8595 mario RnJvbSAxYmE1NzUwMzZkOTQ1MDU4NTQ1MzRiM2U4OGE2YmY2ODQ5OWFmMWY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUdWUsIDIxIFNlcCAyMDEwIDE5OjU5OjEyICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMC0wOS0yMSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR3RrXSBJbmNv cnJlY3QgZXhwb3N1cmUgb2YgbGlzdCBpdGVtcyB3aG9zZSBjaGlsZHJlbiBhcmUgZWxlbWVudHMK ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUzODMKCiAg ICAgICAgU2V0IEFUS19ST0xFX0xJU1RfSVRFTSBsb29raW5nIGZvciB0aGUgcm9sZSBvZiB0aGUg cGFyZW50IG9iamVjdAoKICAgICAgICBUZXN0OiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9s aXN0LWl0ZW1zLWFsd2F5cy1leHBvc2VkLmh0bWwKCiAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0 ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcDoKICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJp bGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QpOgogICAgICAg IEFsd2F5cyBpbmNsdWRlIG9iamVjdHMgd2l0aCBMaXN0SXRlbVJvbGUgaW4gYWNjZXNzaWJpbGl0 eSBmb3IgR1RLLgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJBdGsuY3BwOgogICAgICAgIChnZXRJbnRlcmZhY2VNYXNrRnJvbU9iamVjdCk6IEFk ZCBzb21lIHNwZWNpZmljIGNvZGUgdG8gaGFuZGxlIHRoZQogICAgICAgIHNwZWNpYWwgY2FzZSBv ZiBsaXN0IG1hcmtlcnMgYnkgaW1wbGVtZW50aW5nIEF0a1RleHQgd2hlbiBuZWVkZWQuCgoyMDEw LTA5LTIxICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtHdGtdIEluY29ycmVjdCBl eHBvc3VyZSBvZiBsaXN0IGl0ZW1zIHdob3NlIGNoaWxkcmVuIGFyZSBlbGVtZW50cwogICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTM4MwoKICAgICAgICBD aGVjayB0aGF0IGxpc3QgaXRlbXMgd2lsbCBiZSBhbHdheXMgZXhwb3NlZCBsaWtlIHRoYXQgZm9y IEdUSwoKICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3 YXlzLWV4cG9zZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KICAgICAgICAqIHBsYXRmb3JtL2d0ay9h Y2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3YXlzLWV4cG9zZWQuaHRtbDogQWRkZWQuCi0tLQog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEy ICsrKysrCiAuLi4vbGlzdC1pdGVtcy1hbHdheXMtZXhwb3NlZC1leHBlY3RlZC50eHQgICAgICAg ICB8ICAgMTYgKysrKysrKwogLi4uL2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1hbHdheXMtZXhw b3NlZC5odG1sICAgfCAgIDQ0ICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysrKysrKysKIC4uLi9h Y2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcCAgIHwgICAgNiArKy0K IC4uLi9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwICAgICAgICAgIHwgICAx NyArKysrKysrLQogNiBmaWxlcyBjaGFuZ2VkLCAxMTAgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9saXN0LWl0ZW1zLWFsd2F5cy1leHBvc2VkLWV4cGVjdGVkLnR4dAogY3JlYXRlIG1v ZGUgMTAwNjQ0IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRl bXMtYWx3YXlzLWV4cG9zZWQuaHRtbAoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxNzIyNmRhLi4yNDU2MTNlIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMjEgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hl ekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtHdGtdIEluY29ycmVjdCBleHBvc3VyZSBvZiBsaXN0IGl0ZW1zIHdob3NlIGNoaWxk cmVuIGFyZSBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDUzODMKKworICAgICAgICBDaGVjayB0aGF0IGxpc3QgaXRlbXMgd2lsbCBiZSBh bHdheXMgZXhwb3NlZCBsaWtlIHRoYXQgZm9yIEdUSworCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1hbHdheXMtZXhwb3NlZC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3 YXlzLWV4cG9zZWQuaHRtbDogQWRkZWQuCisKIDIwMTAtMDktMTkgIERpbWl0cmkgR2xhemtvdiAg PGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBNb3ZlIHdpbi14cC1zcGVjaWZpYyBi YXNlbGluZXMgdG8gdGhlaXIgcHJvcGVyIHBsYWNlcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3YXlzLWV4cG9zZWQtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlzdC1p dGVtcy1hbHdheXMtZXhwb3NlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uYmFiNjQ4MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3YXlzLWV4cG9zZWQtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMTYgQEAKK3BsYWluIHRleHQKK3RleHQgaW4gYSBwYXJhZ3JhcGgKKwor VGhpcyB0ZXN0cyBhIGxpc3QgaXRlbSBpcyBhbHdheXMgZXhwb3NlZCByZWdhcmRsZXNzIG9mIGhh dmluZyBpbmxpbmUgY2hpbGRyZW4gb3Igbm90LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CisKKworUEFTUyBsaXN0LnJvbGUgaXMgJ0FYUm9sZTogbGlzdCcKK1BBU1MgaXRlbTEucm9sZSBp cyAnQVhSb2xlOiBsaXN0IGl0ZW0nCitQQVNTIGl0ZW0yLnJvbGUgaXMgJ0FYUm9sZTogbGlzdCBp dGVtJworUEFTUyBwYXJhZ3JhcGgucm9sZSBpcyAnQVhSb2xlOiBwYXJhZ3JhcGgnCitQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1hbHdheXMt ZXhwb3NlZC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlz dC1pdGVtcy1hbHdheXMtZXhwb3NlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjQ2OWNjNTQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvYWNjZXNzaWJpbGl0eS9saXN0LWl0ZW1zLWFsd2F5cy1leHBvc2VkLmh0bWwKQEAgLTAsMCAr MSw0NCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgor PGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9qcy9y ZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQ YXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMv cmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJi b2R5Ij4KKzx1bD4KKzxsaT5wbGFpbiB0ZXh0PC9saT4KKzxsaT48cD50ZXh0IGluIGEgcGFyYWdy YXBoPC9wPjwvbGk+Cis8L3VsPgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJj b25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyBhIGxpc3Qg aXRlbSBpcyBhbHdheXMgZXhwb3NlZCByZWdhcmRsZXNzIG9mIGhhdmluZyBpbmxpbmUgY2hpbGRy ZW4gb3Igbm90LiIpOworCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICBpZiAod2luZG93LmFjY2Vzc2li aWxpdHlDb250cm9sbGVyKSB7CisKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYm9keSIp LmZvY3VzKCk7CisgICAgdmFyIHdlYkFyZWEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1 c2VkRWxlbWVudDsKKworICAgIHZhciBsaXN0ID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMCk7Cisg ICAgdmFyIGl0ZW0xID0gbGlzdC5jaGlsZEF0SW5kZXgoMCk7CisgICAgdmFyIGl0ZW0yID0gbGlz dC5jaGlsZEF0SW5kZXgoMSk7CisgICAgdmFyIHBhcmFncmFwaCA9IGl0ZW0yLmNoaWxkQXRJbmRl eCgwKTsKKworICAgIHNob3VsZEJlKCJsaXN0LnJvbGUiLCAiJ0FYUm9sZTogbGlzdCciKTsKKyAg ICBzaG91bGRCZSgiaXRlbTEucm9sZSIsICInQVhSb2xlOiBsaXN0IGl0ZW0nIik7CisgICAgc2hv dWxkQmUoIml0ZW0yLnJvbGUiLCAiJ0FYUm9sZTogbGlzdCBpdGVtJyIpOworICAgIHNob3VsZEJl KCJwYXJhZ3JhcGgucm9sZSIsICInQVhSb2xlOiBwYXJhZ3JhcGgnIik7CisgIH0KK30KKworc3Vj Y2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGFjZmY2NzUuLmM3YTcyMzIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDktMjEgIE1hcmlv IFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIEluY29ycmVjdCBleHBvc3VyZSBv ZiBsaXN0IGl0ZW1zIHdob3NlIGNoaWxkcmVuIGFyZSBlbGVtZW50cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUzODMKKworICAgICAgICBTZXQgQVRL X1JPTEVfTElTVF9JVEVNIGxvb2tpbmcgZm9yIHRoZSByb2xlIG9mIHRoZSBwYXJlbnQgb2JqZWN0 CisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1h bHdheXMtZXhwb3NlZC5odG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3Np YmlsaXR5T2JqZWN0QXRrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmpl Y3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKKyAgICAgICAgQWx3YXlz IGluY2x1ZGUgb2JqZWN0cyB3aXRoIExpc3RJdGVtUm9sZSBpbiBhY2Nlc3NpYmlsaXR5IGZvciBH VEsuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJBdGsuY3BwOgorICAgICAgICAoZ2V0SW50ZXJmYWNlTWFza0Zyb21PYmplY3QpOiBBZGQgc29t ZSBzcGVjaWZpYyBjb2RlIHRvIGhhbmRsZSB0aGUKKyAgICAgICAgc3BlY2lhbCBjYXNlIG9mIGxp c3QgbWFya2VycyBieSBpbXBsZW1lbnRpbmcgQXRrVGV4dCB3aGVuIG5lZWRlZC4KKwogMjAxMC0w OS0xOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjY3NzQ5LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcCBiL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHAKaW5kZXggN2Y5ZmQxYS4u OTc3MmI0MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmls aXR5T2JqZWN0QXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2li aWxpdHlPYmplY3RBdGsuY3BwCkBAIC03Myw4ICs3MywxMiBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0 SW5jbHVzaW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1 ZGVzTwogICAgIGlmIChyb2xlID09IFN0YXRpY1RleHRSb2xlKQogICAgICAgICByZXR1cm4gSWdu b3JlT2JqZWN0OwogCisgICAgLy8gSW5jbHVkZSBhbGwgbGlzdCBpdGVtcywgcmVnYXJkbGVzcyB0 aGV5IGhhdmUgb3Igbm90IGlubGluZSBjaGlsZHJlbgorICAgIGlmIChyb2xlID09IExpc3RJdGVt Um9sZSkKKyAgICAgICAgcmV0dXJuIEluY2x1ZGVPYmplY3Q7CisKICAgICAvLyBCdWxsZXRzL251 bWJlcnMgZm9yIGxpc3QgaXRlbXMgc2hvdWxkbid0IGJlIGV4cG9zZWQgYXMgQXRrT2JqZWN0cy4K LSAgICBpZiAocm9sZVZhbHVlKCkgPT0gTGlzdE1hcmtlclJvbGUpCisgICAgaWYgKHJvbGUgPT0g TGlzdE1hcmtlclJvbGUpCiAgICAgICAgIHJldHVybiBJZ25vcmVPYmplY3Q7CiAKICAgICByZXR1 cm4gRGVmYXVsdEJlaGF2aW9yOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0 ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgYi9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcAppbmRleCAwMWRkZGQxLi5j NjY5NDQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyQXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0Fj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcApAQCAtMjAyNiw4ICsyMDI2LDIxIEBAIHN0 YXRpYyBndWludDE2IGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmpl Y3QqIGNvcmVPYmplY3QpCiAgICAgICAgICAgICBpbnRlcmZhY2VNYXNrIHw9IDEgPDwgV0FJX1RF WFQ7CiAgICAgICAgICAgICBpZiAoIWNvcmVPYmplY3QtPmlzUmVhZE9ubHkoKSkKICAgICAgICAg ICAgICAgICBpbnRlcmZhY2VNYXNrIHw9IDEgPDwgV0FJX0VESVRBQkxFX1RFWFQ7Ci0gICAgICAg IH0gZWxzZSBpZiAocm9sZSAhPSBUYWJsZVJvbGUgJiYgc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdCo+KGNvcmVPYmplY3QpLT5yZW5kZXJlcigpLT5jaGlsZHJlbklubGluZSgp KQotICAgICAgICAgICAgaW50ZXJmYWNlTWFzayB8PSAxIDw8IFdBSV9URVhUOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCogYXhSZW5kZXJP YmplY3QgPSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Kj4oY29yZU9iamVj dCk7CisgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gYXhSZW5kZXJPYmplY3Qt PnJlbmRlcmVyKCk7CisgICAgICAgICAgICBpZiAocm9sZSAhPSBUYWJsZVJvbGUgJiYgcmVuZGVy ZXIgJiYgcmVuZGVyZXItPmNoaWxkcmVuSW5saW5lKCkpCisgICAgICAgICAgICAgICAgaW50ZXJm YWNlTWFzayB8PSAxIDw8IFdBSV9URVhUOworICAgICAgICAgICAgZWxzZSBpZiAocm9sZSA9PSBM aXN0SXRlbVJvbGUpIHsKKyAgICAgICAgICAgICAgICAvLyBBZGQgdGhlIFRFWFQgaW50ZXJmYWNl IGZvciBsaXN0IGl0ZW1zIHdob3NlCisgICAgICAgICAgICAgICAgLy8gZmlyc3QgYWNjZXNzaWJs ZSBjaGlsZCBoYXMgYSB0ZXh0IHJlbmRlcmVyCisgICAgICAgICAgICAgICAgQWNjZXNzaWJpbGl0 eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGNoaWxkcmVuID0gYXhSZW5kZXJP YmplY3QtPmNoaWxkcmVuKCk7CisgICAgICAgICAgICAgICAgaWYgKGNoaWxkcmVuLnNpemUoKSA+ IDApIHsKKyAgICAgICAgICAgICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogYXhSZW5kZXJD aGlsZCA9IGNoaWxkcmVuLmF0KDApLmdldCgpOworICAgICAgICAgICAgICAgICAgICBpbnRlcmZh Y2VNYXNrIHw9IGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KGF4UmVuZGVyQ2hpbGQpOworICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQogCiAgICAgLy8gSW1hZ2UK ICAgICBpZiAoY29yZU9iamVjdC0+aXNJbWFnZSgpKQotLSAKMS43LjAuNAoK 68289 2010-09-21 14:09:43 -0700 2010-09-22 00:49:44 -0700 Patch proposal 0001-2010-09-21-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 8591 mario RnJvbSAwYzU3ZjUzYTY4NzE4M2MxZDUxOWI3OTMxZTFmOWUwNTQxNDFjMGRlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUdWUsIDIxIFNlcCAyMDEwIDE5OjU5OjEyICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMC0wOS0yMSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR3RrXSBJbmNv cnJlY3QgZXhwb3N1cmUgb2YgbGlzdCBpdGVtcyB3aG9zZSBjaGlsZHJlbiBhcmUgZWxlbWVudHMK ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUzODMKCiAg ICAgICAgU2V0IEFUS19ST0xFX0xJU1RfSVRFTSBsb29raW5nIGZvciB0aGUgcm9sZSBvZiB0aGUg cGFyZW50IG9iamVjdAoKICAgICAgICBUZXN0OiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9s aXN0LWl0ZW1zLWFsd2F5cy1leHBvc2VkLmh0bWwKCiAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0 ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcDoKICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJp bGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QpOgogICAgICAg IEFsd2F5cyBpbmNsdWRlIG9iamVjdHMgd2l0aCBMaXN0SXRlbVJvbGUgaW4gYWNjZXNzaWJpbGl0 eSBmb3IgR1RLLgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXJBdGsuY3BwOgogICAgICAgIChnZXRJbnRlcmZhY2VNYXNrRnJvbU9iamVjdCk6IEFk ZCBzb21lIHNwZWNpZmljIGNvZGUgdG8gaGFuZGxlIHRoZQogICAgICAgIHNwZWNpYWwgY2FzZSBv ZiBsaXN0IG1hcmtlcnMgYnkgaW1wbGVtZW50aW5nIEF0a1RleHQgd2hlbiBuZWVkZWQuCgoyMDEw LTA5LTIxICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtHdGtdIEluY29ycmVjdCBl eHBvc3VyZSBvZiBsaXN0IGl0ZW1zIHdob3NlIGNoaWxkcmVuIGFyZSBlbGVtZW50cwogICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTM4MwoKICAgICAgICBD aGVjayB0aGF0IGxpc3QgaXRlbXMgd2lsbCBiZSBhbHdheXMgZXhwb3NlZCBsaWtlIHRoYXQgZm9y IEdUSwoKICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3 YXlzLWV4cG9zZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KICAgICAgICAqIHBsYXRmb3JtL2d0ay9h Y2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3YXlzLWV4cG9zZWQuaHRtbDogQWRkZWQuCi0tLQog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEy ICsrKysrCiAuLi4vbGlzdC1pdGVtcy1hbHdheXMtZXhwb3NlZC1leHBlY3RlZC50eHQgICAgICAg ICB8ICAgMTYgKysrKysrKwogLi4uL2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1hbHdheXMtZXhw b3NlZC5odG1sICAgfCAgIDQ0ICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysrKysrKysKIC4uLi9h Y2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcCAgIHwgICAgNiArKy0K IC4uLi9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwICAgICAgICAgIHwgICAx NyArKysrKysrLQogNiBmaWxlcyBjaGFuZ2VkLCAxMTAgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlv bnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9saXN0LWl0ZW1zLWFsd2F5cy1leHBvc2VkLWV4cGVjdGVkLnR4dAogY3JlYXRlIG1v ZGUgMTAwNjQ0IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRl bXMtYWx3YXlzLWV4cG9zZWQuaHRtbAoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxNzIyNmRhLi4yNDU2MTNlIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMjEgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hl ekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtHdGtdIEluY29ycmVjdCBleHBvc3VyZSBvZiBsaXN0IGl0ZW1zIHdob3NlIGNoaWxk cmVuIGFyZSBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDUzODMKKworICAgICAgICBDaGVjayB0aGF0IGxpc3QgaXRlbXMgd2lsbCBiZSBh bHdheXMgZXhwb3NlZCBsaWtlIHRoYXQgZm9yIEdUSworCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1hbHdheXMtZXhwb3NlZC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3 YXlzLWV4cG9zZWQuaHRtbDogQWRkZWQuCisKIDIwMTAtMDktMTkgIERpbWl0cmkgR2xhemtvdiAg PGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBNb3ZlIHdpbi14cC1zcGVjaWZpYyBi YXNlbGluZXMgdG8gdGhlaXIgcHJvcGVyIHBsYWNlcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3YXlzLWV4cG9zZWQtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlzdC1p dGVtcy1hbHdheXMtZXhwb3NlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uYmFiNjQ4MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9hY2Nlc3NpYmlsaXR5L2xpc3QtaXRlbXMtYWx3YXlzLWV4cG9zZWQtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMTYgQEAKK3BsYWluIHRleHQKK3RleHQgaW4gYSBwYXJhZ3JhcGgKKwor VGhpcyB0ZXN0cyBhIGxpc3QgaXRlbSBpcyBhbHdheXMgZXhwb3NlZCByZWdhcmRsZXNzIG9mIGhh dmluZyBpbmxpbmUgY2hpbGRyZW4gb3Igbm90LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CisKKworUEFTUyBsaXN0LnJvbGUgaXMgJ0FYUm9sZTogbGlzdCcKK1BBU1MgaXRlbTEucm9sZSBp cyAnQVhSb2xlOiBsaXN0IGl0ZW0nCitQQVNTIGl0ZW0yLnJvbGUgaXMgJ0FYUm9sZTogbGlzdCBp dGVtJworUEFTUyBwYXJhZ3JhcGgucm9sZSBpcyAnQVhSb2xlOiBwYXJhZ3JhcGgnCitQQVNTIHN1 Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1hbHdheXMt ZXhwb3NlZC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlz dC1pdGVtcy1hbHdheXMtZXhwb3NlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLjQ2OWNjNTQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvYWNjZXNzaWJpbGl0eS9saXN0LWl0ZW1zLWFsd2F5cy1leHBvc2VkLmh0bWwKQEAgLTAsMCAr MSw0NCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgor PGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9qcy9y ZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQ YXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMv cmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJi b2R5Ij4KKzx1bD4KKzxsaT5wbGFpbiB0ZXh0PC9saT4KKzxsaT48cD50ZXh0IGluIGEgcGFyYWdy YXBoPC9wPjwvbGk+Cis8L3VsPgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJj b25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyBhIGxpc3Qg aXRlbSBpcyBhbHdheXMgZXhwb3NlZCByZWdhcmRsZXNzIG9mIGhhdmluZyBpbmxpbmUgY2hpbGRy ZW4gb3Igbm90LiIpOworCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgIGxh eW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICBpZiAod2luZG93LmFjY2Vzc2li aWxpdHlDb250cm9sbGVyKSB7CisKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYm9keSIp LmZvY3VzKCk7CisgICAgdmFyIHdlYkFyZWEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1 c2VkRWxlbWVudDsKKworICAgIHZhciBsaXN0ID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMCk7Cisg ICAgdmFyIGl0ZW0xID0gbGlzdC5jaGlsZEF0SW5kZXgoMCk7CisgICAgdmFyIGl0ZW0yID0gbGlz dC5jaGlsZEF0SW5kZXgoMSk7CisgICAgdmFyIHBhcmFncmFwaCA9IGl0ZW0yLmNoaWxkQXRJbmRl eCgwKTsKKworICAgIHNob3VsZEJlKCJsaXN0LnJvbGUiLCAiJ0FYUm9sZTogbGlzdCciKTsKKyAg ICBzaG91bGRCZSgiaXRlbTEucm9sZSIsICInQVhSb2xlOiBsaXN0IGl0ZW0nIik7CisgICAgc2hv dWxkQmUoIml0ZW0yLnJvbGUiLCAiJ0FYUm9sZTogbGlzdCBpdGVtJyIpOworICAgIHNob3VsZEJl KCJwYXJhZ3JhcGgucm9sZSIsICInQVhSb2xlOiBwYXJhZ3JhcGgnIik7CisgIH0KK30KKworc3Vj Y2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGFjZmY2NzUuLmM3YTcyMzIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDktMjEgIE1hcmlv IFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIEluY29ycmVjdCBleHBvc3VyZSBv ZiBsaXN0IGl0ZW1zIHdob3NlIGNoaWxkcmVuIGFyZSBlbGVtZW50cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUzODMKKworICAgICAgICBTZXQgQVRL X1JPTEVfTElTVF9JVEVNIGxvb2tpbmcgZm9yIHRoZSByb2xlIG9mIHRoZSBwYXJlbnQgb2JqZWN0 CisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvbGlzdC1pdGVtcy1h bHdheXMtZXhwb3NlZC5odG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3Np YmlsaXR5T2JqZWN0QXRrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmpl Y3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKKyAgICAgICAgQWx3YXlz IGluY2x1ZGUgb2JqZWN0cyB3aXRoIExpc3RJdGVtUm9sZSBpbiBhY2Nlc3NpYmlsaXR5IGZvciBH VEsuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJBdGsuY3BwOgorICAgICAgICAoZ2V0SW50ZXJmYWNlTWFza0Zyb21PYmplY3QpOiBBZGQgc29t ZSBzcGVjaWZpYyBjb2RlIHRvIGhhbmRsZSB0aGUKKyAgICAgICAgc3BlY2lhbCBjYXNlIG9mIGxp c3QgbWFya2VycyBieSBpbXBsZW1lbnRpbmcgQXRrVGV4dCB3aGVuIG5lZWRlZC4KKwogMjAxMC0w OS0xOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjY3NzQ5LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcCBiL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHAKaW5kZXggN2Y5ZmQxYS4u OTc3MmI0MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmls aXR5T2JqZWN0QXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2li aWxpdHlPYmplY3RBdGsuY3BwCkBAIC03Myw4ICs3MywxMiBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0 SW5jbHVzaW9uIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFjY2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1 ZGVzTwogICAgIGlmIChyb2xlID09IFN0YXRpY1RleHRSb2xlKQogICAgICAgICByZXR1cm4gSWdu b3JlT2JqZWN0OwogCisgICAgLy8gSW5jbHVkZSBhbGwgbGlzdCBpdGVtcywgcmVnYXJkbGVzcyB0 aGV5IGhhdmUgb3Igbm90IGlubGluZSBjaGlsZHJlbgorICAgIGlmIChyb2xlID09IExpc3RJdGVt Um9sZSkKKyAgICAgICAgcmV0dXJuIEluY2x1ZGVPYmplY3Q7CisKICAgICAvLyBCdWxsZXRzL251 bWJlcnMgZm9yIGxpc3QgaXRlbXMgc2hvdWxkbid0IGJlIGV4cG9zZWQgYXMgQXRrT2JqZWN0cy4K LSAgICBpZiAocm9sZVZhbHVlKCkgPT0gTGlzdE1hcmtlclJvbGUpCisgICAgaWYgKHJvbGUgPT0g TGlzdE1hcmtlclJvbGUpCiAgICAgICAgIHJldHVybiBJZ25vcmVPYmplY3Q7CiAKICAgICByZXR1 cm4gRGVmYXVsdEJlaGF2aW9yOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0 ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAgYi9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcAppbmRleCAwMWRkZGQxLi5m MzRhMDNlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyQXRrLmNwcAorKysgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0Fj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcApAQCAtMjAyNiw4ICsyMDI2LDIxIEBAIHN0 YXRpYyBndWludDE2IGdldEludGVyZmFjZU1hc2tGcm9tT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmpl Y3QqIGNvcmVPYmplY3QpCiAgICAgICAgICAgICBpbnRlcmZhY2VNYXNrIHw9IDEgPDwgV0FJX1RF WFQ7CiAgICAgICAgICAgICBpZiAoIWNvcmVPYmplY3QtPmlzUmVhZE9ubHkoKSkKICAgICAgICAg ICAgICAgICBpbnRlcmZhY2VNYXNrIHw9IDEgPDwgV0FJX0VESVRBQkxFX1RFWFQ7Ci0gICAgICAg IH0gZWxzZSBpZiAocm9sZSAhPSBUYWJsZVJvbGUgJiYgc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdCo+KGNvcmVPYmplY3QpLT5yZW5kZXJlcigpLT5jaGlsZHJlbklubGluZSgp KQotICAgICAgICAgICAgaW50ZXJmYWNlTWFzayB8PSAxIDw8IFdBSV9URVhUOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCogYXhSZW5kZXJP YmplY3QgPSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Kj4oY29yZU9iamVj dCk7CisgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gYXhSZW5kZXJPYmplY3Qt PnJlbmRlcmVyKCk7CisgICAgICAgICAgICBpZiAocm9sZSAhPSBUYWJsZVJvbGUgJiYgcmVuZGVy ZXIgJiYgcmVuZGVyZXItPmNoaWxkcmVuSW5saW5lKCkpCisgICAgICAgICAgICAgICAgaW50ZXJm YWNlTWFzayB8PSAxIDw8IFdBSV9URVhUOworICAgICAgICAgICAgZWxzZSBpZiAocm9sZSA9PSBM aXN0SXRlbVJvbGUpIHsKKyAgICAgICAgICAgICAgICAvLyBBZGQgdGhlIFRFWFQgaW50ZXJmYWNl IGZvciBsaXN0IGl0ZW1zIHdob3NlCisgICAgICAgICAgICAgICAgLy8gZmlyc3QgYWNjZXNzaWJs ZSBjaGlsZCBoYXMgYSB0ZXh0IHJlbmRlcmVyCisgICAgICAgICAgICAgICAgQWNjZXNzaWJpbGl0 eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGNoaWxkcmVuID0gYXhSZW5kZXJP YmplY3QtPmNoaWxkcmVuKCk7CisgICAgICAgICAgICAgICAgaWYgKGNoaWxkcmVuLnNpemUoKSkg eworICAgICAgICAgICAgICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBheFJlbmRlckNoaWxk ID0gY2hpbGRyZW4uYXQoMCkuZ2V0KCk7CisgICAgICAgICAgICAgICAgICAgIGludGVyZmFjZU1h c2sgfD0gZ2V0SW50ZXJmYWNlTWFza0Zyb21PYmplY3QoYXhSZW5kZXJDaGlsZCk7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CiAKICAgICAvLyBJbWFnZQogICAg IGlmIChjb3JlT2JqZWN0LT5pc0ltYWdlKCkpCi0tIAoxLjcuMC40Cgo=