108222 2013-01-29 13:28:33 -0800 Touch disambiguation blacklist is not being queried properly 2013-02-01 00:49:43 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dfalcantara dfalcantara abarth aelias trchen webkit.review.bot oldest_to_newest 819279 0 dfalcantara 2013-01-29 13:28:33 -0800 In TouchDisambiguation.cpp, a blacklist is built to prevent containers from counting as legitimate touch targets. However, it is not being queried properly. I believe the issue is in this block of code: 121 HashMap<Node*, TouchTargetData> touchTargets; 122 float bestScore = 0; 123 for (ListHashSet<RefPtr<Node> >::const_iterator it = hitResults.begin(); it != hitResults.end(); ++it) { 124 for (Node* node = it->get(); node; node = node->parentNode()) { 125 if (blackList.contains(it->get())) 126 continue; 127 if (node->isDocumentNode() || node->hasTagName(HTMLNames::htmlTag) || node->hasTagName(HTMLNames::bodyTag)) 128 break; 129 if (node->willRespondToMouseClickEvents()) { 130 TouchTargetData& targetData = touchTargets.add(node, TouchTargetData()).iterator->value; 131 targetData.windowBoundingBox = boundingBoxForEventNodes(node); 132 targetData.score = scoreTouchTarget(touchPoint, touchPointPadding, targetData.windowBoundingBox); 133 bestScore = max(bestScore, targetData.score); 134 break; 135 } 136 } 137 } Line 125 should be checking if the current node is part of the blacklist, not its parent: if (blackList.contains(node)) 819289 1 185299 dfalcantara 2013-01-29 13:35:36 -0800 Created attachment 185299 Patch 819330 2 trchen 2013-01-29 14:26:59 -0800 Good catch! Great thanks for figuring out the mess. I think we need to also change the blacklisting loop to handle this case: <div onclick="foo" class="outer"> <div onclick="foo" class="middle"><div class="inner">Link1</div></div> <div onclick="foo" class="middle"><div class="inner">Link2</div></div> </div> In this case the hit test will return both the inner <div> block, and we'll end up blacklist the <div> in the middle. HashSet<Node*> blackList; for (ListHashSet<RefPtr<Node> >::const_iterator it = hitResults.begin(); it != hitResults.end(); ++it) { RenderObject* renderer = it->get()->renderer(); if (!renderer) continue; >>>> Should traverse up until we find the actual touch target before we start to blacklist stuff. for (RenderBlock* container = renderer->containingBlock(); container; container = container->containingBlock()) { Node* containerNode = container->node(); if (!containerNode) continue; if (!blackList.add(containerNode).isNewEntry) break; } } 819525 3 185349 dfalcantara 2013-01-29 17:04:46 -0800 Created attachment 185349 Patch 819539 4 trchen 2013-01-29 17:11:27 -0800 LGTM. Now we only need to update the tests. 820726 5 185602 dfalcantara 2013-01-30 15:52:00 -0800 Created attachment 185602 Patch 820732 6 185604 dfalcantara 2013-01-30 15:54:48 -0800 Created attachment 185604 Patch 820783 7 trchen 2013-01-30 16:30:42 -0800 LGTM. Thank you! 821731 8 185604 abarth 2013-01-31 11:16:48 -0800 Comment on attachment 185604 Patch Looks great! 821754 9 185604 webkit.review.bot 2013-01-31 11:32:47 -0800 Comment on attachment 185604 Patch Rejecting attachment 185604 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 185604, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: mit-queue/Source/WebKit/chromium/third_party/skia/src --revision 7453 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 51>At revision 7453. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/16272316 821819 10 abarth 2013-01-31 12:21:20 -0800 The following ChangeLog files contain OOPS: trunk/Source/WebCore/ChangeLog Please don't ever say "OOPS" in a ChangeLog file. 821821 11 185604 abarth 2013-01-31 12:22:01 -0800 Comment on attachment 185604 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185604&action=review > Source/WebCore/ChangeLog:8 > + No new tests (OOPS!). You should fill out this line to list the tests. (The OOPS on the "reviewed by" line is fine---the bots will fill that one out for you.) 821878 12 185845 dfalcantara 2013-01-31 13:09:21 -0800 Created attachment 185845 Patch 821879 13 185845 dfalcantara 2013-01-31 13:12:36 -0800 Comment on attachment 185845 Patch Take 2... 821985 14 185845 aelias 2013-01-31 14:48:44 -0800 Comment on attachment 185845 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185845&action=review > Source/WebKit/chromium/tests/WebFrameTest.cpp:1911 > + webViewImpl->resize(WebSize(viewportWidth, viewportHeight)); Please add setApplyPageScaleFactorInCompositor and setApplyDeviceScaleFactorInCompositor here like the other tests, and verify it still works. 822018 15 185878 dfalcantara 2013-01-31 15:17:48 -0800 Created attachment 185878 Patch 822028 16 aelias 2013-01-31 15:21:24 -0800 LGTM, Adam? 822451 17 185878 webkit.review.bot 2013-02-01 00:49:39 -0800 Comment on attachment 185878 Patch Clearing flags on attachment: 185878 Committed r141554: <http://trac.webkit.org/changeset/141554> 822452 18 webkit.review.bot 2013-02-01 00:49:43 -0800 All reviewed patches have been landed. Closing bug. 185299 2013-01-29 13:35:36 -0800 2013-01-29 17:04:44 -0800 Patch bug-108222-20130129133222.patch text/plain 1525 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTE2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTI5ICBEYW4gQWxj YW50YXJhICA8ZGZhbGNhbnRhcmFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRvdWNoIGRpc2Ft YmlndWF0aW9uIGJsYWNrbGlzdCBpcyBub3QgYmVpbmcgcXVlcmllZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgRml4IHRoZSBibGFja2xpc3Qgc28gdGhhdCB3ZSBjaGVjayBpdCBm b3IgdGhlIHJpZ2h0IG5vZGVzLgorCisgICAgICAgICogcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRHb29kVG91Y2hUYXJnZXRzKToKKwogMjAxMy0w MS0yOSAgSnVzdGluIE5vdm9zYWQgIDxqdW5vdkBnb29nbGUuY29tPgogCiAgICAgICAgIFJFR1JF U1NJT04gKHIxMzU2MjgtMTM1NjMyKTogRG91YmxlIGJveCBzaGFkb3cgZmFpbHVyZSB0byByZW5k ZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcAko cmV2aXNpb24gMTQxMTM3KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0 aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIyLDcgKzEyMiw3IEBAIHZvaWQgZmluZEdvb2RU b3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYKICAgICBmbG9hdCBiZXN0U2NvcmUgPSAwOwogICAg IGZvciAoTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gaGl0 UmVzdWx0cy5iZWdpbigpOyBpdCAhPSBoaXRSZXN1bHRzLmVuZCgpOyArK2l0KSB7CiAgICAgICAg IGZvciAoTm9kZSogbm9kZSA9IGl0LT5nZXQoKTsgbm9kZTsgbm9kZSA9IG5vZGUtPnBhcmVudE5v ZGUoKSkgewotICAgICAgICAgICAgaWYgKGJsYWNrTGlzdC5jb250YWlucyhpdC0+Z2V0KCkpKQor ICAgICAgICAgICAgaWYgKGJsYWNrTGlzdC5jb250YWlucyhub2RlKSkKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgIGlmIChub2RlLT5pc0RvY3VtZW50Tm9kZSgpIHx8IG5v ZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpodG1sVGFnKSB8fCBub2RlLT5oYXNUYWdOYW1lKEhU TUxOYW1lczo6Ym9keVRhZykpCiAgICAgICAgICAgICAgICAgYnJlYWs7Cg== 185349 2013-01-29 17:04:46 -0800 2013-01-30 15:51:59 -0800 Patch bug-108222-20130129170132.patch text/plain 2079 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTE4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTI5ICBEYW4gQWxj YW50YXJhICA8ZGZhbGNhbnRhcmFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRvdWNoIGRpc2Ft YmlndWF0aW9uIGJsYWNrbGlzdCBpcyBub3QgYmVpbmcgcXVlcmllZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgRml4IHRoZSBibGFja2xpc3Qgc28gdGhhdCB3ZSBjaGVjayBpdCBm b3IgdGhlIHJpZ2h0IG5vZGVzLgorCisgICAgICAgICogcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRHb29kVG91Y2hUYXJnZXRzKToKKwogMjAxMy0w MS0yOSAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFY OiBBZGQgc3VwcG9ydCBmb3IgYXJpYS1hdXRvY29tcGxldGU9Imxpc3QiIG9uIEFSSUEgY29tYm9i b3gKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcAko cmV2aXNpb24gMTQxMTc4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0 aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA3LDcgKzEwNyw3IEBAIHZvaWQgZmluZEdvb2RU b3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYKICAgICBIYXNoU2V0PE5vZGUqPiBibGFja0xpc3Q7 CiAgICAgZm9yIChMaXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPjo6Y29uc3RfaXRlcmF0b3IgaXQg PSBoaXRSZXN1bHRzLmJlZ2luKCk7IGl0ICE9IGhpdFJlc3VsdHMuZW5kKCk7ICsraXQpIHsKICAg ICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGl0LT5nZXQoKS0+cmVuZGVyZXIoKTsKLSAg ICAgICAgaWYgKCFyZW5kZXJlcikKKyAgICAgICAgaWYgKCFyZW5kZXJlciB8fCAhaXQtPmdldCgp LT53aWxsUmVzcG9uZFRvTW91c2VDbGlja0V2ZW50cygpKQogICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgIGZvciAoUmVuZGVyQmxvY2sqIGNvbnRhaW5lciA9IHJlbmRlcmVyLT5jb250YWlu aW5nQmxvY2soKTsgY29udGFpbmVyOyBjb250YWluZXIgPSBjb250YWluZXItPmNvbnRhaW5pbmdC bG9jaygpKSB7CiAgICAgICAgICAgICBOb2RlKiBjb250YWluZXJOb2RlID0gY29udGFpbmVyLT5u b2RlKCk7CkBAIC0xMjIsNyArMTIyLDcgQEAgdm9pZCBmaW5kR29vZFRvdWNoVGFyZ2V0cyhjb25z dCBJbnRSZWN0JgogICAgIGZsb2F0IGJlc3RTY29yZSA9IDA7CiAgICAgZm9yIChMaXN0SGFzaFNl dDxSZWZQdHI8Tm9kZT4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBoaXRSZXN1bHRzLmJlZ2luKCk7 IGl0ICE9IGhpdFJlc3VsdHMuZW5kKCk7ICsraXQpIHsKICAgICAgICAgZm9yIChOb2RlKiBub2Rl ID0gaXQtPmdldCgpOyBub2RlOyBub2RlID0gbm9kZS0+cGFyZW50Tm9kZSgpKSB7Ci0gICAgICAg ICAgICBpZiAoYmxhY2tMaXN0LmNvbnRhaW5zKGl0LT5nZXQoKSkpCisgICAgICAgICAgICBpZiAo YmxhY2tMaXN0LmNvbnRhaW5zKG5vZGUpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICAgICAgaWYgKG5vZGUtPmlzRG9jdW1lbnROb2RlKCkgfHwgbm9kZS0+aGFzVGFnTmFtZShI VE1MTmFtZXM6Omh0bWxUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpib2R5VGFn KSkKICAgICAgICAgICAgICAgICBicmVhazsK 185602 2013-01-30 15:52:00 -0800 2013-01-30 15:54:46 -0800 Patch bug-108222-20130130154845.patch text/plain 4847 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTMzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAxLTMwICBEYW4gQWxj YW50YXJhICA8ZGZhbGNhbnRhcmFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRvdWNoIGRpc2Ft YmlndWF0aW9uIGJsYWNrbGlzdCBpcyBub3QgYmVpbmcgcXVlcmllZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHRoZSBibGFja2xp c3Qgc28gdGhhdCB3ZSBjaGVjayBpdCBmb3IgdGhlIHJpZ2h0IG5vZGVzLgorCisgICAgICAgICog cGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRHb29k VG91Y2hUYXJnZXRzKToKKwogMjAxMy0wMS0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5j b20+CiAKICAgICAgICAgQ29udGVudEZpbHRlciBzaG91bGQgYmUgYSByZWYtY291bnRlZCBjbGFz cwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwCShy ZXZpc2lvbiAxNDEzMDMpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRp b24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsOSArMTA2LDEyIEBAIHZvaWQgZmluZEdvb2RU b3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYKICAgICAvLyBUaGlzIGhldXJpc3RpYyBhdm9pZHMg ZXhjZXNzaXZlIGRpc2FtYmlndWF0aW9uIGluIHRoYXQgY2FzZS4KICAgICBIYXNoU2V0PE5vZGUq PiBibGFja0xpc3Q7CiAgICAgZm9yIChMaXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPjo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBoaXRSZXN1bHRzLmJlZ2luKCk7IGl0ICE9IGhpdFJlc3VsdHMuZW5kKCk7 ICsraXQpIHsKKyAgICAgICAgLy8gSWdub3JlIGFueSBOb2RlcyB0aGF0IGNhbid0IGJlIGNsaWNr ZWQgb24uCiAgICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBpdC0+Z2V0KCktPnJlbmRl cmVyKCk7Ci0gICAgICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIGlmICghcmVuZGVyZXIgfHwg IWl0LT5nZXQoKS0+d2lsbFJlc3BvbmRUb01vdXNlQ2xpY2tFdmVudHMoKSkKICAgICAgICAgICAg IGNvbnRpbnVlOworCisgICAgICAgIC8vIEJsYWNrbGlzdCBhbGwgb2YgdGhlIE5vZGUncyBjb250 YWluZXJzLgogICAgICAgICBmb3IgKFJlbmRlckJsb2NrKiBjb250YWluZXIgPSByZW5kZXJlci0+ Y29udGFpbmluZ0Jsb2NrKCk7IGNvbnRhaW5lcjsgY29udGFpbmVyID0gY29udGFpbmVyLT5jb250 YWluaW5nQmxvY2soKSkgewogICAgICAgICAgICAgTm9kZSogY29udGFpbmVyTm9kZSA9IGNvbnRh aW5lci0+bm9kZSgpOwogICAgICAgICAgICAgaWYgKCFjb250YWluZXJOb2RlKQpAQCAtMTIyLDcg KzEyNSw3IEBAIHZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYKICAgICBm bG9hdCBiZXN0U2NvcmUgPSAwOwogICAgIGZvciAoTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID46 OmNvbnN0X2l0ZXJhdG9yIGl0ID0gaGl0UmVzdWx0cy5iZWdpbigpOyBpdCAhPSBoaXRSZXN1bHRz LmVuZCgpOyArK2l0KSB7CiAgICAgICAgIGZvciAoTm9kZSogbm9kZSA9IGl0LT5nZXQoKTsgbm9k ZTsgbm9kZSA9IG5vZGUtPnBhcmVudE5vZGUoKSkgewotICAgICAgICAgICAgaWYgKGJsYWNrTGlz dC5jb250YWlucyhpdC0+Z2V0KCkpKQorICAgICAgICAgICAgaWYgKGJsYWNrTGlzdC5jb250YWlu cyhub2RlKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGlmIChub2Rl LT5pc0RvY3VtZW50Tm9kZSgpIHx8IG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpodG1sVGFn KSB8fCBub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6Ym9keVRhZykpCiAgICAgICAgICAgICAg ICAgYnJlYWs7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTQxMzM0 KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxNiBAQAorMjAxMy0wMS0zMCAgRGFuIEFsY2FudGFyYSAgPGRmYWxjYW50YXJhQGNo cm9taXVtLm9yZz4KKworICAgICAgICBUb3VjaCBkaXNhbWJpZ3VhdGlvbiBibGFja2xpc3QgaXMg bm90IGJlaW5nIHF1ZXJpZWQgcHJvcGVybHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwODIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgYmxhY2tsaXN0IHNvIHRoYXQgd2UgY2hlY2sgaXQg Zm9yIHRoZSByaWdodCBub2Rlcy4KKyAgICAgICAgQWRkIGEgdGVzdCB0byBjaGVjayB0aGF0IHRo ZSBibGFja2xpc3QgaXMgYmVpbmcgYnVpbHQgYW5kIHVzZWQKKyAgICAgICAgY29ycmVjdGx5Lgor CisgICAgICAgICogdGVzdHMvV2ViRnJhbWVUZXN0LmNwcDoKKwogMjAxMy0wMS0zMCAgS2VudGFy byBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW1wbGVtZW50IFdoZWVs RXZlbnQgY29uc3RydWN0b3IKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2Vi RnJhbWVUZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1dlYkZyYW1lVGVzdC5jcHAJKHJldmlzaW9uIDE0MTMwMykKKysrIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA5Nyw2ICsy MDk3LDM4IEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIERJU0FCTEVEX0Rpc2FtYmlndWEKICAgICB9 CiB9CiAKK1RFU1RfRihXZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9wdXBCbGFja2xpc3Qp Cit7CisgICAgY29uc3QgdW5zaWduZWQgdmlld3BvcnRXaWR0aCA9IDUwMDsKKyAgICBjb25zdCB1 bnNpZ25lZCB2aWV3cG9ydEhlaWdodCA9IDEwMDA7CisgICAgY29uc3QgdW5zaWduZWQgZGl2SGVp Z2h0ID0gMTAwOworICAgIGNvbnN0IHN0ZDo6c3RyaW5nIGh0bWxGaWxlID0gImRpc2FtYmlndWF0 aW9uX3BvcHVwX2JsYWNrbGlzdC5odG1sIjsKKyAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2Fk KGh0bWxGaWxlKTsKKworICAgIERpc2FtYmlndWF0aW9uUG9wdXBUZXN0V2ViVmlld0NsaWVudCBj bGllbnQ7CisKKyAgICAvLyBNYWtlIHN1cmUgd2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxl LCBldmVuIGlmIHRoZSB3aW5kb3cgc2l6ZQorICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUg YWZ0ZXIgdGhlIGxvYWQgYmVnaW5zLgorICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0 YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0Fu ZExvYWQobV9iYXNlVVJMICsgaHRtbEZpbGUsIHRydWUsIDAsICZjbGllbnQpKTsKKyAgICB3ZWJW aWV3SW1wbC0+cmVzaXplKFdlYlNpemUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpKTsK KyAgICB3ZWJWaWV3SW1wbC0+bGF5b3V0KCk7CisKKyAgICAvLyBDbGljayBzb21ld2hlcmUgd2hl cmUgdGhlIHBvcHVwIHNob3VsZG4ndCBhcHBlYXIuCisgICAgY2xpZW50LnJlc2V0VHJpZ2dlcmVk KCk7CisgICAgd2ViVmlld0ltcGwtPmhhbmRsZUlucHV0RXZlbnQoZmF0VGFwKHZpZXdwb3J0V2lk dGggLyAyLCAwKSk7CisgICAgRVhQRUNUX0ZBTFNFKGNsaWVudC50cmlnZ2VyZWQoKSk7CisKKyAg ICAvLyBDbGljayBkaXJlY3RseSBpbiBiZXR3ZWVuIHR3byBjb250YWluZXIgZGl2cyB3aXRoIGNs aWNrIGhhbmRsZXJzLCB3aXRoIGNoaWxkcmVuIHRoYXQgZG9uJ3QgaGFuZGxlIGNsaWNrcy4KKyAg ICBjbGllbnQucmVzZXRUcmlnZ2VyZWQoKTsKKyAgICB3ZWJWaWV3SW1wbC0+aGFuZGxlSW5wdXRF dmVudChmYXRUYXAodmlld3BvcnRXaWR0aCAvIDIsIGRpdkhlaWdodCkpOworICAgIEVYUEVDVF9U UlVFKGNsaWVudC50cmlnZ2VyZWQoKSk7CisKKyAgICAvLyBUaGUgdGhpcmQgZGl2IGNvbnRhaW5l ciBzaG91bGQgYmUgYmxhY2tsaXN0ZWQgaWYgeW91IGNsaWNrIG9uIHRoZSBsaW5rIGl0IGNvbnRh aW5zLgorICAgIGNsaWVudC5yZXNldFRyaWdnZXJlZCgpOworICAgIHdlYlZpZXdJbXBsLT5oYW5k bGVJbnB1dEV2ZW50KGZhdFRhcCh2aWV3cG9ydFdpZHRoIC8gMiwgZGl2SGVpZ2h0ICogMy4yNSkp OworICAgIEVYUEVDVF9GQUxTRShjbGllbnQudHJpZ2dlcmVkKCkpOworfQorCiBURVNUX0YoV2Vi RnJhbWVUZXN0LCBEaXNhbWJpZ3VhdGlvblBvcHVwUGFnZVNjYWxlKQogewogICAgIHJlZ2lzdGVy TW9ja2VkSHR0cFVSTExvYWQoImRpc2FtYmlndWF0aW9uX3BvcHVwX3BhZ2Vfc2NhbGUuaHRtbCIp Owo= 185604 2013-01-30 15:54:48 -0800 2013-01-31 13:09:19 -0800 Patch bug-108222-20130130155132.patch text/plain 6120 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTMzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTMwICBEYW4gQWxj YW50YXJhICA8ZGZhbGNhbnRhcmFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRvdWNoIGRpc2Ft YmlndWF0aW9uIGJsYWNrbGlzdCBpcyBub3QgYmVpbmcgcXVlcmllZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgRml4IHRoZSBibGFja2xpc3Qgc28gdGhhdCB3ZSBjaGVjayBpdCBm b3IgdGhlIHJpZ2h0IG5vZGVzLgorCisgICAgICAgICogcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRHb29kVG91Y2hUYXJnZXRzKToKKwogMjAxMy0w MS0zMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgQ29udGVudEZp bHRlciBzaG91bGQgYmUgYSByZWYtY291bnRlZCBjbGFzcwpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwCShyZXZpc2lvbiAxNDEzMDMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMDYsOSArMTA2LDEyIEBAIHZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3QgSW50UmVj dCYKICAgICAvLyBUaGlzIGhldXJpc3RpYyBhdm9pZHMgZXhjZXNzaXZlIGRpc2FtYmlndWF0aW9u IGluIHRoYXQgY2FzZS4KICAgICBIYXNoU2V0PE5vZGUqPiBibGFja0xpc3Q7CiAgICAgZm9yIChM aXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBoaXRSZXN1bHRz LmJlZ2luKCk7IGl0ICE9IGhpdFJlc3VsdHMuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgLy8gSWdu b3JlIGFueSBOb2RlcyB0aGF0IGNhbid0IGJlIGNsaWNrZWQgb24uCiAgICAgICAgIFJlbmRlck9i amVjdCogcmVuZGVyZXIgPSBpdC0+Z2V0KCktPnJlbmRlcmVyKCk7Ci0gICAgICAgIGlmICghcmVu ZGVyZXIpCisgICAgICAgIGlmICghcmVuZGVyZXIgfHwgIWl0LT5nZXQoKS0+d2lsbFJlc3BvbmRU b01vdXNlQ2xpY2tFdmVudHMoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIC8v IEJsYWNrbGlzdCBhbGwgb2YgdGhlIE5vZGUncyBjb250YWluZXJzLgogICAgICAgICBmb3IgKFJl bmRlckJsb2NrKiBjb250YWluZXIgPSByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7IGNvbnRh aW5lcjsgY29udGFpbmVyID0gY29udGFpbmVyLT5jb250YWluaW5nQmxvY2soKSkgewogICAgICAg ICAgICAgTm9kZSogY29udGFpbmVyTm9kZSA9IGNvbnRhaW5lci0+bm9kZSgpOwogICAgICAgICAg ICAgaWYgKCFjb250YWluZXJOb2RlKQpAQCAtMTIyLDcgKzEyNSw3IEBAIHZvaWQgZmluZEdvb2RU b3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYKICAgICBmbG9hdCBiZXN0U2NvcmUgPSAwOwogICAg IGZvciAoTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gaGl0 UmVzdWx0cy5iZWdpbigpOyBpdCAhPSBoaXRSZXN1bHRzLmVuZCgpOyArK2l0KSB7CiAgICAgICAg IGZvciAoTm9kZSogbm9kZSA9IGl0LT5nZXQoKTsgbm9kZTsgbm9kZSA9IG5vZGUtPnBhcmVudE5v ZGUoKSkgewotICAgICAgICAgICAgaWYgKGJsYWNrTGlzdC5jb250YWlucyhpdC0+Z2V0KCkpKQor ICAgICAgICAgICAgaWYgKGJsYWNrTGlzdC5jb250YWlucyhub2RlKSkKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgICAgIGlmIChub2RlLT5pc0RvY3VtZW50Tm9kZSgpIHx8IG5v ZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpodG1sVGFnKSB8fCBub2RlLT5oYXNUYWdOYW1lKEhU TUxOYW1lczo6Ym9keVRhZykpCiAgICAgICAgICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTQxMzM0KQorKysgU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wMS0z MCAgRGFuIEFsY2FudGFyYSAgPGRmYWxjYW50YXJhQGNocm9taXVtLm9yZz4KKworICAgICAgICBU b3VjaCBkaXNhbWJpZ3VhdGlvbiBibGFja2xpc3QgaXMgbm90IGJlaW5nIHF1ZXJpZWQgcHJvcGVy bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODIy MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCB0 aGUgYmxhY2tsaXN0IHNvIHRoYXQgd2UgY2hlY2sgaXQgZm9yIHRoZSByaWdodCBub2Rlcy4KKyAg ICAgICAgQWRkIGEgdGVzdCB0byBjaGVjayB0aGF0IHRoZSBibGFja2xpc3QgaXMgYmVpbmcgYnVp bHQgYW5kIHVzZWQKKyAgICAgICAgY29ycmVjdGx5LgorCisgICAgICAgICogdGVzdHMvV2ViRnJh bWVUZXN0LmNwcDoKKyAgICAgICAgKiB0ZXN0cy9kYXRhL2Rpc2FtYmlndWF0aW9uX3BvcHVwX2Js YWNrbGlzdC5odG1sOiBBZGRlZC4KKwogMjAxMy0wMS0zMCAgS2VudGFybyBIYXJhICA8aGFyYWtl bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW1wbGVtZW50IFdoZWVsRXZlbnQgY29uc3RydWN0 b3IKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5j cHAJKHJldmlzaW9uIDE0MTMwMykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2Vi RnJhbWVUZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA5Nyw2ICsyMDk3LDM4IEBAIFRFU1Rf RihXZWJGcmFtZVRlc3QsIERJU0FCTEVEX0Rpc2FtYmlndWEKICAgICB9CiB9CiAKK1RFU1RfRihX ZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9wdXBCbGFja2xpc3QpCit7CisgICAgY29uc3Qg dW5zaWduZWQgdmlld3BvcnRXaWR0aCA9IDUwMDsKKyAgICBjb25zdCB1bnNpZ25lZCB2aWV3cG9y dEhlaWdodCA9IDEwMDA7CisgICAgY29uc3QgdW5zaWduZWQgZGl2SGVpZ2h0ID0gMTAwOworICAg IGNvbnN0IHN0ZDo6c3RyaW5nIGh0bWxGaWxlID0gImRpc2FtYmlndWF0aW9uX3BvcHVwX2JsYWNr bGlzdC5odG1sIjsKKyAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKGh0bWxGaWxlKTsKKwor ICAgIERpc2FtYmlndWF0aW9uUG9wdXBUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CisKKyAgICAv LyBNYWtlIHN1cmUgd2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlmIHRoZSB3 aW5kb3cgc2l6ZQorICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxvYWQg YmVnaW5zLgorICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19jYXN0PFdlYlZp ZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJM ICsgaHRtbEZpbGUsIHRydWUsIDAsICZjbGllbnQpKTsKKyAgICB3ZWJWaWV3SW1wbC0+cmVzaXpl KFdlYlNpemUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQpKTsKKyAgICB3ZWJWaWV3SW1w bC0+bGF5b3V0KCk7CisKKyAgICAvLyBDbGljayBzb21ld2hlcmUgd2hlcmUgdGhlIHBvcHVwIHNo b3VsZG4ndCBhcHBlYXIuCisgICAgY2xpZW50LnJlc2V0VHJpZ2dlcmVkKCk7CisgICAgd2ViVmll d0ltcGwtPmhhbmRsZUlucHV0RXZlbnQoZmF0VGFwKHZpZXdwb3J0V2lkdGggLyAyLCAwKSk7Cisg ICAgRVhQRUNUX0ZBTFNFKGNsaWVudC50cmlnZ2VyZWQoKSk7CisKKyAgICAvLyBDbGljayBkaXJl Y3RseSBpbiBiZXR3ZWVuIHR3byBjb250YWluZXIgZGl2cyB3aXRoIGNsaWNrIGhhbmRsZXJzLCB3 aXRoIGNoaWxkcmVuIHRoYXQgZG9uJ3QgaGFuZGxlIGNsaWNrcy4KKyAgICBjbGllbnQucmVzZXRU cmlnZ2VyZWQoKTsKKyAgICB3ZWJWaWV3SW1wbC0+aGFuZGxlSW5wdXRFdmVudChmYXRUYXAodmll d3BvcnRXaWR0aCAvIDIsIGRpdkhlaWdodCkpOworICAgIEVYUEVDVF9UUlVFKGNsaWVudC50cmln Z2VyZWQoKSk7CisKKyAgICAvLyBUaGUgdGhpcmQgZGl2IGNvbnRhaW5lciBzaG91bGQgYmUgYmxh Y2tsaXN0ZWQgaWYgeW91IGNsaWNrIG9uIHRoZSBsaW5rIGl0IGNvbnRhaW5zLgorICAgIGNsaWVu dC5yZXNldFRyaWdnZXJlZCgpOworICAgIHdlYlZpZXdJbXBsLT5oYW5kbGVJbnB1dEV2ZW50KGZh dFRhcCh2aWV3cG9ydFdpZHRoIC8gMiwgZGl2SGVpZ2h0ICogMy4yNSkpOworICAgIEVYUEVDVF9G QUxTRShjbGllbnQudHJpZ2dlcmVkKCkpOworfQorCiBURVNUX0YoV2ViRnJhbWVUZXN0LCBEaXNh bWJpZ3VhdGlvblBvcHVwUGFnZVNjYWxlKQogewogICAgIHJlZ2lzdGVyTW9ja2VkSHR0cFVSTExv YWQoImRpc2FtYmlndWF0aW9uX3BvcHVwX3BhZ2Vfc2NhbGUuaHRtbCIpOwpJbmRleDogU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhL2Rpc2FtYmlndWF0aW9uX3BvcHVwX2JsYWNrbGlz dC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9k aXNhbWJpZ3VhdGlvbl9wb3B1cF9ibGFja2xpc3QuaHRtbAkocmV2aXNpb24gMCkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9kaXNhbWJpZ3VhdGlvbl9wb3B1cF9ibGFja2xp c3QuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzNiBAQAorPGh0bWw+CisgIDxoZWFkPgor ICAgIDxzdHlsZT4KKyAgICAgIGRpdiB7CisgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAg IG1hcmdpbjogMHB4OworICAgICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CisgICAgICAgIHdpZHRo OiAxMDAlOworICAgICAgfQorICAgICAgZGl2LnRpZ2h0bHlQYWNrZWQgeworICAgICAgICBiYWNr Z3JvdW5kLWNvbG9yOiBwaW5rOworICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKKyAg ICAgIH0KKyAgICAgIGRpdi5idWdDb250YWluZXIgeworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9y OiBjeWFuOworICAgICAgfQorICAgIDwvc3R5bGU+CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAg PGRpdiBjbGFzcz0idGlnaHRseVBhY2tlZCIgb25jbGljaz0id2luZG93LmxvY2F0aW9uPScjZmly c3QnOyI+CisgICAgICA8ZGl2PkxlYWYgbm9kZSAjMTwvZGl2PgorICAgIDwvZGl2PgorICAgIDxk aXYgY2xhc3M9InRpZ2h0bHlQYWNrZWQiIG9uY2xpY2s9IndpbmRvdy5sb2NhdGlvbj0nI3NlY29u ZCc7Ij4KKyAgICAgIDxkaXY+TGVhZiBub2RlICMyPC9kaXY+CisgICAgPC9kaXY+CisgICAgPGRp dj48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJidWdDb250YWluZXIiIG9uY2xpY2s9IndpbmRvdy5s b2NhdGlvbj0nI3RoaXJkJzsiPgorICAgICAgPHAgY2xhc3M9InRpdGxlIj4KKyAgICAgICAgPGEg Y2xhc3M9InRpdGxlIiBocmVmPSIjZm91cnRoIj5SYW5kb20gbGluazwvYT4KKyAgICAgIDwvcD4K KyAgICAgIDxwPgorICAgICAgICBCcmVha2luZyBub2RlCisgICAgICA8L3A+CisgICAgPC9kaXY+ CisgIDwvYm9keT4KKzwvaHRtbD4K 185845 2013-01-31 13:09:21 -0800 2013-01-31 15:17:46 -0800 Patch bug-108222-20130131130605.patch text/plain 6375 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTQ3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTMxICBEYW4gQWxj YW50YXJhICA8ZGZhbGNhbnRhcmFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRvdWNoIGRpc2Ft YmlndWF0aW9uIGJsYWNrbGlzdCBpcyBub3QgYmVpbmcgcXVlcmllZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVEVTVD1XZWJGcmFtZVRl c3Q6OkRpc2FtYmlndWF0aW9uUG9wdXBCbGFja2xpc3QKKworICAgICAgICBGaXggdGhlIGJsYWNr bGlzdCBzbyB0aGF0IHdlIGNoZWNrIGl0IGZvciB0aGUgcmlnaHQgbm9kZXMuCisgICAgICAgIEFk ZCBhIGNocm9taXVtIHRlc3QgdG8gY2hlY2sgdGhhdCB0aGUgYmxhY2tsaXN0IGlzIGJlaW5nIGJ1 aWx0IGFuZCB1c2VkCisgICAgICAgIGNvcnJlY3RseS4KKworICAgICAgICAqIHBhZ2UvVG91Y2hE aXNhbWJpZ3VhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaW5kR29vZFRvdWNoVGFyZ2V0 cyk6CisKIDIwMTMtMDEtMzEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBVc2UgT1MoKSBhbmQgUExBVEZPUk0oKSBtYWNyb3MgaW4gV2ViQ29yZVByZWZpeC5o IGZvciByZWFkYWJpbGl0eQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmln dWF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1i aWd1YXRpb24uY3BwCShyZXZpc2lvbiAxNDE0NzEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1Rv dWNoRGlzYW1iaWd1YXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsOSArMTA2LDEyIEBA IHZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYKICAgICAvLyBUaGlzIGhl dXJpc3RpYyBhdm9pZHMgZXhjZXNzaXZlIGRpc2FtYmlndWF0aW9uIGluIHRoYXQgY2FzZS4KICAg ICBIYXNoU2V0PE5vZGUqPiBibGFja0xpc3Q7CiAgICAgZm9yIChMaXN0SGFzaFNldDxSZWZQdHI8 Tm9kZT4gPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBoaXRSZXN1bHRzLmJlZ2luKCk7IGl0ICE9IGhp dFJlc3VsdHMuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgLy8gSWdub3JlIGFueSBOb2RlcyB0aGF0 IGNhbid0IGJlIGNsaWNrZWQgb24uCiAgICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBp dC0+Z2V0KCktPnJlbmRlcmVyKCk7Ci0gICAgICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIGlm ICghcmVuZGVyZXIgfHwgIWl0LT5nZXQoKS0+d2lsbFJlc3BvbmRUb01vdXNlQ2xpY2tFdmVudHMo KSkKICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIC8vIEJsYWNrbGlzdCBhbGwgb2Yg dGhlIE5vZGUncyBjb250YWluZXJzLgogICAgICAgICBmb3IgKFJlbmRlckJsb2NrKiBjb250YWlu ZXIgPSByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7IGNvbnRhaW5lcjsgY29udGFpbmVyID0g Y29udGFpbmVyLT5jb250YWluaW5nQmxvY2soKSkgewogICAgICAgICAgICAgTm9kZSogY29udGFp bmVyTm9kZSA9IGNvbnRhaW5lci0+bm9kZSgpOwogICAgICAgICAgICAgaWYgKCFjb250YWluZXJO b2RlKQpAQCAtMTIyLDcgKzEyNSw3IEBAIHZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3Qg SW50UmVjdCYKICAgICBmbG9hdCBiZXN0U2NvcmUgPSAwOwogICAgIGZvciAoTGlzdEhhc2hTZXQ8 UmVmUHRyPE5vZGU+ID46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gaGl0UmVzdWx0cy5iZWdpbigpOyBp dCAhPSBoaXRSZXN1bHRzLmVuZCgpOyArK2l0KSB7CiAgICAgICAgIGZvciAoTm9kZSogbm9kZSA9 IGl0LT5nZXQoKTsgbm9kZTsgbm9kZSA9IG5vZGUtPnBhcmVudE5vZGUoKSkgewotICAgICAgICAg ICAgaWYgKGJsYWNrTGlzdC5jb250YWlucyhpdC0+Z2V0KCkpKQorICAgICAgICAgICAgaWYgKGJs YWNrTGlzdC5jb250YWlucyhub2RlKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgICAgIGlmIChub2RlLT5pc0RvY3VtZW50Tm9kZSgpIHx8IG5vZGUtPmhhc1RhZ05hbWUoSFRN TE5hbWVzOjpodG1sVGFnKSB8fCBub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6Ym9keVRhZykp CiAgICAgICAgICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwko cmV2aXNpb24gMTQxNDcyKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMS0zMSAgRGFuIEFsY2FudGFyYSAg PGRmYWxjYW50YXJhQGNocm9taXVtLm9yZz4KKworICAgICAgICBUb3VjaCBkaXNhbWJpZ3VhdGlv biBibGFja2xpc3QgaXMgbm90IGJlaW5nIHF1ZXJpZWQgcHJvcGVybHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODIyMgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRFU1Q9V2ViRnJhbWVUZXN0OjpEaXNh bWJpZ3VhdGlvblBvcHVwQmxhY2tsaXN0CisKKyAgICAgICAgRml4IHRoZSBibGFja2xpc3Qgc28g dGhhdCB3ZSBjaGVjayBpdCBmb3IgdGhlIHJpZ2h0IG5vZGVzLgorICAgICAgICBBZGQgYSB0ZXN0 IHRvIGNoZWNrIHRoYXQgdGhlIGJsYWNrbGlzdCBpcyBiZWluZyBidWlsdCBhbmQgdXNlZAorICAg ICAgICBjb3JyZWN0bHkuCisKKyAgICAgICAgKiB0ZXN0cy9XZWJGcmFtZVRlc3QuY3BwOgorICAg ICAgICAqIHRlc3RzL2RhdGEvZGlzYW1iaWd1YXRpb25fcG9wdXBfYmxhY2tsaXN0Lmh0bWw6IEFk ZGVkLgorCiAyMDEzLTAxLTMxICBDaHJpcyBIb3BtYW4gIDxjamhvcG1hbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgW2Nocm9taXVtXSBNYWtlIHNlbGVjdGlvbiBoYW5kbGluZyB3b3JrIGluIGFw cGx5UGFnZVNjYWxlSW5Db21wb3NpdG9yIG1vZGUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAJKHJldmlzaW9uIDE0MTQ3MSkKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTg5NSw2ICsxODk1LDM4IEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9u UG9wdXAKICAgICB9CiB9CiAKK1RFU1RfRihXZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9w dXBCbGFja2xpc3QpCit7CisgICAgY29uc3QgdW5zaWduZWQgdmlld3BvcnRXaWR0aCA9IDUwMDsK KyAgICBjb25zdCB1bnNpZ25lZCB2aWV3cG9ydEhlaWdodCA9IDEwMDA7CisgICAgY29uc3QgdW5z aWduZWQgZGl2SGVpZ2h0ID0gMTAwOworICAgIGNvbnN0IHN0ZDo6c3RyaW5nIGh0bWxGaWxlID0g ImRpc2FtYmlndWF0aW9uX3BvcHVwX2JsYWNrbGlzdC5odG1sIjsKKyAgICByZWdpc3Rlck1vY2tl ZEh0dHBVUkxMb2FkKGh0bWxGaWxlKTsKKworICAgIERpc2FtYmlndWF0aW9uUG9wdXBUZXN0V2Vi Vmlld0NsaWVudCBjbGllbnQ7CisKKyAgICAvLyBNYWtlIHN1cmUgd2UgaW5pdGlhbGl6ZSB0byBt aW5pbXVtIHNjYWxlLCBldmVuIGlmIHRoZSB3aW5kb3cgc2l6ZQorICAgIC8vIG9ubHkgYmVjb21l cyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxvYWQgYmVnaW5zLgorICAgIFdlYlZpZXdJbXBsKiB3ZWJW aWV3SW1wbCA9IHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3Jl YXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgaHRtbEZpbGUsIHRydWUsIDAsICZjbGllbnQp KTsKKyAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdlYlNpemUodmlld3BvcnRXaWR0aCwgdmlld3Bv cnRIZWlnaHQpKTsKKyAgICB3ZWJWaWV3SW1wbC0+bGF5b3V0KCk7CisKKyAgICAvLyBDbGljayBz b21ld2hlcmUgd2hlcmUgdGhlIHBvcHVwIHNob3VsZG4ndCBhcHBlYXIuCisgICAgY2xpZW50LnJl c2V0VHJpZ2dlcmVkKCk7CisgICAgd2ViVmlld0ltcGwtPmhhbmRsZUlucHV0RXZlbnQoZmF0VGFw KHZpZXdwb3J0V2lkdGggLyAyLCAwKSk7CisgICAgRVhQRUNUX0ZBTFNFKGNsaWVudC50cmlnZ2Vy ZWQoKSk7CisKKyAgICAvLyBDbGljayBkaXJlY3RseSBpbiBiZXR3ZWVuIHR3byBjb250YWluZXIg ZGl2cyB3aXRoIGNsaWNrIGhhbmRsZXJzLCB3aXRoIGNoaWxkcmVuIHRoYXQgZG9uJ3QgaGFuZGxl IGNsaWNrcy4KKyAgICBjbGllbnQucmVzZXRUcmlnZ2VyZWQoKTsKKyAgICB3ZWJWaWV3SW1wbC0+ aGFuZGxlSW5wdXRFdmVudChmYXRUYXAodmlld3BvcnRXaWR0aCAvIDIsIGRpdkhlaWdodCkpOwor ICAgIEVYUEVDVF9UUlVFKGNsaWVudC50cmlnZ2VyZWQoKSk7CisKKyAgICAvLyBUaGUgdGhpcmQg ZGl2IGNvbnRhaW5lciBzaG91bGQgYmUgYmxhY2tsaXN0ZWQgaWYgeW91IGNsaWNrIG9uIHRoZSBs aW5rIGl0IGNvbnRhaW5zLgorICAgIGNsaWVudC5yZXNldFRyaWdnZXJlZCgpOworICAgIHdlYlZp ZXdJbXBsLT5oYW5kbGVJbnB1dEV2ZW50KGZhdFRhcCh2aWV3cG9ydFdpZHRoIC8gMiwgZGl2SGVp Z2h0ICogMy4yNSkpOworICAgIEVYUEVDVF9GQUxTRShjbGllbnQudHJpZ2dlcmVkKCkpOworfQor CiBURVNUX0YoV2ViRnJhbWVUZXN0LCBEaXNhbWJpZ3VhdGlvblBvcHVwUGFnZVNjYWxlKQogewog ICAgIHJlZ2lzdGVyTW9ja2VkSHR0cFVSTExvYWQoImRpc2FtYmlndWF0aW9uX3BvcHVwX3BhZ2Vf c2NhbGUuaHRtbCIpOwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhL2Rp c2FtYmlndWF0aW9uX3BvcHVwX2JsYWNrbGlzdC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9kaXNhbWJpZ3VhdGlvbl9wb3B1cF9ibGFja2xpc3Qu aHRtbAkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9k aXNhbWJpZ3VhdGlvbl9wb3B1cF9ibGFja2xpc3QuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSwzNiBAQAorPGh0bWw+CisgIDxoZWFkPgorICAgIDxzdHlsZT4KKyAgICAgIGRpdiB7CisgICAg ICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgIG1hcmdpbjogMHB4OworICAgICAgICB0ZXh0LWFs aWduOiBjZW50ZXI7CisgICAgICAgIHdpZHRoOiAxMDAlOworICAgICAgfQorICAgICAgZGl2LnRp Z2h0bHlQYWNrZWQgeworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBwaW5rOworICAgICAgICBi b3JkZXI6IDFweCBzb2xpZCBibGFjazsKKyAgICAgIH0KKyAgICAgIGRpdi5idWdDb250YWluZXIg eworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBjeWFuOworICAgICAgfQorICAgIDwvc3R5bGU+ CisgIDwvaGVhZD4KKyAgPGJvZHk+CisgICAgPGRpdiBjbGFzcz0idGlnaHRseVBhY2tlZCIgb25j bGljaz0id2luZG93LmxvY2F0aW9uPScjZmlyc3QnOyI+CisgICAgICA8ZGl2PkxlYWYgbm9kZSAj MTwvZGl2PgorICAgIDwvZGl2PgorICAgIDxkaXYgY2xhc3M9InRpZ2h0bHlQYWNrZWQiIG9uY2xp Y2s9IndpbmRvdy5sb2NhdGlvbj0nI3NlY29uZCc7Ij4KKyAgICAgIDxkaXY+TGVhZiBub2RlICMy PC9kaXY+CisgICAgPC9kaXY+CisgICAgPGRpdj48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJidWdD b250YWluZXIiIG9uY2xpY2s9IndpbmRvdy5sb2NhdGlvbj0nI3RoaXJkJzsiPgorICAgICAgPHAg Y2xhc3M9InRpdGxlIj4KKyAgICAgICAgPGEgY2xhc3M9InRpdGxlIiBocmVmPSIjZm91cnRoIj5S YW5kb20gbGluazwvYT4KKyAgICAgIDwvcD4KKyAgICAgIDxwPgorICAgICAgICBCcmVha2luZyBu b2RlCisgICAgICA8L3A+CisgICAgPC9kaXY+CisgIDwvYm9keT4KKzwvaHRtbD4K 185878 2013-01-31 15:17:48 -0800 2013-02-01 00:49:38 -0800 Patch bug-108222-20130131151432.patch text/plain 8383 dfalcantara SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTQ5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAxLTMxICBEYW4gQWxj YW50YXJhICA8ZGZhbGNhbnRhcmFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRvdWNoIGRpc2Ft YmlndWF0aW9uIGJsYWNrbGlzdCBpcyBub3QgYmVpbmcgcXVlcmllZCBwcm9wZXJseQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjIyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVEVTVD1XZWJGcmFtZVRl c3Q6OkRpc2FtYmlndWF0aW9uUG9wdXBCbGFja2xpc3QKKworICAgICAgICBGaXggdGhlIGJsYWNr bGlzdCBzbyB0aGF0IHdlIGNoZWNrIGl0IGZvciB0aGUgcmlnaHQgbm9kZXMuCisgICAgICAgIEFk ZCBhIGNocm9taXVtIHRlc3QgdG8gY2hlY2sgdGhhdCB0aGUgYmxhY2tsaXN0IGlzIGJlaW5nIGJ1 aWx0IGFuZCB1c2VkCisgICAgICAgIGNvcnJlY3RseS4gIEFsc28gdXBkYXRlIHRoZSBvdGhlciBE aXNhbWJpZ3VhdGlvblBvcHVwIHRlc3RzIHRvCisgICAgICAgIHVzZSB0aGUgbmV3IHBhZ2Ugc2Nh bGUgbWV0aG9kLgorCisgICAgICAgICogcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmZpbmRHb29kVG91Y2hUYXJnZXRzKToKKwogMjAxMy0wMS0zMSAgVWRh eSBLaXJhbiAgPHVkYXlraXJhbkBtb3Rvcm9sYS5jb20+CiAKICAgICAgICAgQ1NTMydzIHZoIGF0 dHJpYnV0ZSBpcyBub3QgYWRqdXN0aW5nIHdoaWxlIGJyb3dzZXIgcmVzaXplcwpJbmRleDogU291 cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwCShyZXZpc2lvbiAxNDE0 OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDYsOSArMTA2LDEyIEBAIHZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMo Y29uc3QgSW50UmVjdCYKICAgICAvLyBUaGlzIGhldXJpc3RpYyBhdm9pZHMgZXhjZXNzaXZlIGRp c2FtYmlndWF0aW9uIGluIHRoYXQgY2FzZS4KICAgICBIYXNoU2V0PE5vZGUqPiBibGFja0xpc3Q7 CiAgICAgZm9yIChMaXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPjo6Y29uc3RfaXRlcmF0b3IgaXQg PSBoaXRSZXN1bHRzLmJlZ2luKCk7IGl0ICE9IGhpdFJlc3VsdHMuZW5kKCk7ICsraXQpIHsKKyAg ICAgICAgLy8gSWdub3JlIGFueSBOb2RlcyB0aGF0IGNhbid0IGJlIGNsaWNrZWQgb24uCiAgICAg ICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBpdC0+Z2V0KCktPnJlbmRlcmVyKCk7Ci0gICAg ICAgIGlmICghcmVuZGVyZXIpCisgICAgICAgIGlmICghcmVuZGVyZXIgfHwgIWl0LT5nZXQoKS0+ d2lsbFJlc3BvbmRUb01vdXNlQ2xpY2tFdmVudHMoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwor CisgICAgICAgIC8vIEJsYWNrbGlzdCBhbGwgb2YgdGhlIE5vZGUncyBjb250YWluZXJzLgogICAg ICAgICBmb3IgKFJlbmRlckJsb2NrKiBjb250YWluZXIgPSByZW5kZXJlci0+Y29udGFpbmluZ0Js b2NrKCk7IGNvbnRhaW5lcjsgY29udGFpbmVyID0gY29udGFpbmVyLT5jb250YWluaW5nQmxvY2so KSkgewogICAgICAgICAgICAgTm9kZSogY29udGFpbmVyTm9kZSA9IGNvbnRhaW5lci0+bm9kZSgp OwogICAgICAgICAgICAgaWYgKCFjb250YWluZXJOb2RlKQpAQCAtMTIyLDcgKzEyNSw3IEBAIHZv aWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYKICAgICBmbG9hdCBiZXN0U2Nv cmUgPSAwOwogICAgIGZvciAoTGlzdEhhc2hTZXQ8UmVmUHRyPE5vZGU+ID46OmNvbnN0X2l0ZXJh dG9yIGl0ID0gaGl0UmVzdWx0cy5iZWdpbigpOyBpdCAhPSBoaXRSZXN1bHRzLmVuZCgpOyArK2l0 KSB7CiAgICAgICAgIGZvciAoTm9kZSogbm9kZSA9IGl0LT5nZXQoKTsgbm9kZTsgbm9kZSA9IG5v ZGUtPnBhcmVudE5vZGUoKSkgewotICAgICAgICAgICAgaWYgKGJsYWNrTGlzdC5jb250YWlucyhp dC0+Z2V0KCkpKQorICAgICAgICAgICAgaWYgKGJsYWNrTGlzdC5jb250YWlucyhub2RlKSkKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGlmIChub2RlLT5pc0RvY3VtZW50 Tm9kZSgpIHx8IG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpodG1sVGFnKSB8fCBub2RlLT5o YXNUYWdOYW1lKEhUTUxOYW1lczo6Ym9keVRhZykpCiAgICAgICAgICAgICAgICAgYnJlYWs7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTQxNDkzKQorKysgU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBA QAorMjAxMy0wMS0zMSAgRGFuIEFsY2FudGFyYSAgPGRmYWxjYW50YXJhQGNocm9taXVtLm9yZz4K KworICAgICAgICBUb3VjaCBkaXNhbWJpZ3VhdGlvbiBibGFja2xpc3QgaXMgbm90IGJlaW5nIHF1 ZXJpZWQgcHJvcGVybHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwODIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRFU1Q9V2ViRnJhbWVUZXN0OjpEaXNhbWJpZ3VhdGlvblBvcHVwQmxhY2tsaXN0CisK KyAgICAgICAgRml4IHRoZSBibGFja2xpc3Qgc28gdGhhdCB3ZSBjaGVjayBpdCBmb3IgdGhlIHJp Z2h0IG5vZGVzLgorICAgICAgICBBZGQgYSB0ZXN0IHRvIGNoZWNrIHRoYXQgdGhlIGJsYWNrbGlz dCBpcyBiZWluZyBidWlsdCBhbmQgdXNlZAorICAgICAgICBjb3JyZWN0bHkuICBBbHNvIHVwZGF0 ZSB0aGUgb3RoZXIgRGlzYW1iaWd1YXRpb25Qb3B1cCB0ZXN0cyB0bworICAgICAgICB1c2UgdGhl IG5ldyBwYWdlIHNjYWxlIG1ldGhvZC4KKworICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5j cHA6CisgICAgICAgICogdGVzdHMvZGF0YS9kaXNhbWJpZ3VhdGlvbl9wb3B1cF9ibGFja2xpc3Qu aHRtbDogQWRkZWQuCisKIDIwMTMtMDEtMzEgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZXdvcmsgcGFnZSBzY2FsZSBmYWN0b3Ig bGltaXRzIGluaXRpYWxpemF0aW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1dlYkZyYW1lVGVzdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCShyZXZpc2lvbiAxNDE0OTMpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MTgs NiArMTgxOCw4IEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9wdXAKICAg ICAvLyBNYWtlIHN1cmUgd2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlmIHRo ZSB3aW5kb3cgc2l6ZQogICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxv YWQgYmVnaW5zLgogICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19jYXN0PFdl YlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNl VVJMICsgaHRtbEZpbGUsIHRydWUsIDAsICZjbGllbnQpKTsKKyAgICB3ZWJWaWV3SW1wbC0+c2V0 dGluZ3MoKS0+c2V0QXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcih0cnVlKTsKKyAg ICB3ZWJWaWV3SW1wbC0+c2V0dGluZ3MoKS0+c2V0QXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBv c2l0b3IodHJ1ZSk7CiAgICAgd2ViVmlld0ltcGwtPnJlc2l6ZShXZWJTaXplKDEwMDAsIDEwMDAp KTsKICAgICB3ZWJWaWV3SW1wbC0+bGF5b3V0KCk7CiAKQEAgLTE4NjIsNiArMTg2NCw4IEBAIFRF U1RfRihXZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9wdXAKICAgICAvLyBNYWtlIHN1cmUg d2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlmIHRoZSB3aW5kb3cgc2l6ZQog ICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhlIGxvYWQgYmVnaW5zLgogICAg IFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19jYXN0PFdlYlZpZXdJbXBsKj4oRnJh bWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJMICsgImRpc2FtYmln dWF0aW9uX3BvcHVwX25vX2NvbnRhaW5lci5odG1sIiwgdHJ1ZSwgMCwgJmNsaWVudCkpOworICAg IHdlYlZpZXdJbXBsLT5zZXR0aW5ncygpLT5zZXRBcHBseURldmljZVNjYWxlRmFjdG9ySW5Db21w b3NpdG9yKHRydWUpOworICAgIHdlYlZpZXdJbXBsLT5zZXR0aW5ncygpLT5zZXRBcHBseVBhZ2VT Y2FsZUZhY3RvckluQ29tcG9zaXRvcih0cnVlKTsKICAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdl YlNpemUoMTAwMCwgMTAwMCkpOwogICAgIHdlYlZpZXdJbXBsLT5sYXlvdXQoKTsKIApAQCAtMTg4 MCw2ICsxODg0LDggQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgRGlzYW1iaWd1YXRpb25Qb3B1cAog ICAgIC8vIE1ha2Ugc3VyZSB3ZSBpbml0aWFsaXplIHRvIG1pbmltdW0gc2NhbGUsIGV2ZW4gaWYg dGhlIHdpbmRvdyBzaXplCiAgICAgLy8gb25seSBiZWNvbWVzIGF2YWlsYWJsZSBhZnRlciB0aGUg bG9hZCBiZWdpbnMuCiAgICAgV2ViVmlld0ltcGwqIHdlYlZpZXdJbXBsID0gc3RhdGljX2Nhc3Q8 V2ViVmlld0ltcGwqPihGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jh c2VVUkwgKyBodG1sRmlsZSwgdHJ1ZSwgMCwgJmNsaWVudCkpOworICAgIHdlYlZpZXdJbXBsLT5z ZXR0aW5ncygpLT5zZXRBcHBseURldmljZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKHRydWUpOwor ICAgIHdlYlZpZXdJbXBsLT5zZXR0aW5ncygpLT5zZXRBcHBseVBhZ2VTY2FsZUZhY3RvckluQ29t cG9zaXRvcih0cnVlKTsKICAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdlYlNpemUoMTAwMCwgMTAw MCkpOwogICAgIHdlYlZpZXdJbXBsLT5sYXlvdXQoKTsKIApAQCAtMTkwNCw2ICsxOTEwLDQwIEBA IFRFU1RfRihXZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9wdXAKICAgICB9CiB9CiAKK1RF U1RfRihXZWJGcmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9wdXBCbGFja2xpc3QpCit7CisgICAg Y29uc3QgdW5zaWduZWQgdmlld3BvcnRXaWR0aCA9IDUwMDsKKyAgICBjb25zdCB1bnNpZ25lZCB2 aWV3cG9ydEhlaWdodCA9IDEwMDA7CisgICAgY29uc3QgdW5zaWduZWQgZGl2SGVpZ2h0ID0gMTAw OworICAgIGNvbnN0IHN0ZDo6c3RyaW5nIGh0bWxGaWxlID0gImRpc2FtYmlndWF0aW9uX3BvcHVw X2JsYWNrbGlzdC5odG1sIjsKKyAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKGh0bWxGaWxl KTsKKworICAgIERpc2FtYmlndWF0aW9uUG9wdXBUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CisK KyAgICAvLyBNYWtlIHN1cmUgd2UgaW5pdGlhbGl6ZSB0byBtaW5pbXVtIHNjYWxlLCBldmVuIGlm IHRoZSB3aW5kb3cgc2l6ZQorICAgIC8vIG9ubHkgYmVjb21lcyBhdmFpbGFibGUgYWZ0ZXIgdGhl IGxvYWQgYmVnaW5zLgorICAgIFdlYlZpZXdJbXBsKiB3ZWJWaWV3SW1wbCA9IHN0YXRpY19jYXN0 PFdlYlZpZXdJbXBsKj4oRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9i YXNlVVJMICsgaHRtbEZpbGUsIHRydWUsIDAsICZjbGllbnQpKTsKKyAgICB3ZWJWaWV3SW1wbC0+ c2V0dGluZ3MoKS0+c2V0QXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcih0cnVlKTsK KyAgICB3ZWJWaWV3SW1wbC0+c2V0dGluZ3MoKS0+c2V0QXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNv bXBvc2l0b3IodHJ1ZSk7CisgICAgd2ViVmlld0ltcGwtPnJlc2l6ZShXZWJTaXplKHZpZXdwb3J0 V2lkdGgsIHZpZXdwb3J0SGVpZ2h0KSk7CisgICAgd2ViVmlld0ltcGwtPmxheW91dCgpOworCisg ICAgLy8gQ2xpY2sgc29tZXdoZXJlIHdoZXJlIHRoZSBwb3B1cCBzaG91bGRuJ3QgYXBwZWFyLgor ICAgIGNsaWVudC5yZXNldFRyaWdnZXJlZCgpOworICAgIHdlYlZpZXdJbXBsLT5oYW5kbGVJbnB1 dEV2ZW50KGZhdFRhcCh2aWV3cG9ydFdpZHRoIC8gMiwgMCkpOworICAgIEVYUEVDVF9GQUxTRShj bGllbnQudHJpZ2dlcmVkKCkpOworCisgICAgLy8gQ2xpY2sgZGlyZWN0bHkgaW4gYmV0d2VlbiB0 d28gY29udGFpbmVyIGRpdnMgd2l0aCBjbGljayBoYW5kbGVycywgd2l0aCBjaGlsZHJlbiB0aGF0 IGRvbid0IGhhbmRsZSBjbGlja3MuCisgICAgY2xpZW50LnJlc2V0VHJpZ2dlcmVkKCk7CisgICAg d2ViVmlld0ltcGwtPmhhbmRsZUlucHV0RXZlbnQoZmF0VGFwKHZpZXdwb3J0V2lkdGggLyAyLCBk aXZIZWlnaHQpKTsKKyAgICBFWFBFQ1RfVFJVRShjbGllbnQudHJpZ2dlcmVkKCkpOworCisgICAg Ly8gVGhlIHRoaXJkIGRpdiBjb250YWluZXIgc2hvdWxkIGJlIGJsYWNrbGlzdGVkIGlmIHlvdSBj bGljayBvbiB0aGUgbGluayBpdCBjb250YWlucy4KKyAgICBjbGllbnQucmVzZXRUcmlnZ2VyZWQo KTsKKyAgICB3ZWJWaWV3SW1wbC0+aGFuZGxlSW5wdXRFdmVudChmYXRUYXAodmlld3BvcnRXaWR0 aCAvIDIsIGRpdkhlaWdodCAqIDMuMjUpKTsKKyAgICBFWFBFQ1RfRkFMU0UoY2xpZW50LnRyaWdn ZXJlZCgpKTsKK30KKwogVEVTVF9GKFdlYkZyYW1lVGVzdCwgRGlzYW1iaWd1YXRpb25Qb3B1cFBh Z2VTY2FsZSkKIHsKICAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJkaXNhbWJpZ3VhdGlv bl9wb3B1cF9wYWdlX3NjYWxlLmh0bWwiKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvZGF0YS9kaXNhbWJpZ3VhdGlvbl9wb3B1cF9ibGFja2xpc3QuaHRtbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvZGlzYW1iaWd1YXRpb25fcG9w dXBfYmxhY2tsaXN0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL2RhdGEvZGlzYW1iaWd1YXRpb25fcG9wdXBfYmxhY2tsaXN0Lmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMzYgQEAKKzxodG1sPgorICA8aGVhZD4KKyAgICA8c3R5bGU+CisgICAg ICBkaXYgeworICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICBtYXJnaW46IDBweDsKKyAg ICAgICAgdGV4dC1hbGlnbjogY2VudGVyOworICAgICAgICB3aWR0aDogMTAwJTsKKyAgICAgIH0K KyAgICAgIGRpdi50aWdodGx5UGFja2VkIHsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogcGlu azsKKyAgICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7CisgICAgICB9CisgICAgICBkaXYu YnVnQ29udGFpbmVyIHsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogY3lhbjsKKyAgICAgIH0K KyAgICA8L3N0eWxlPgorICA8L2hlYWQ+CisgIDxib2R5PgorICAgIDxkaXYgY2xhc3M9InRpZ2h0 bHlQYWNrZWQiIG9uY2xpY2s9IndpbmRvdy5sb2NhdGlvbj0nI2ZpcnN0JzsiPgorICAgICAgPGRp dj5MZWFmIG5vZGUgIzE8L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJ0aWdodGx5 UGFja2VkIiBvbmNsaWNrPSJ3aW5kb3cubG9jYXRpb249JyNzZWNvbmQnOyI+CisgICAgICA8ZGl2 PkxlYWYgbm9kZSAjMjwvZGl2PgorICAgIDwvZGl2PgorICAgIDxkaXY+PC9kaXY+CisgICAgPGRp diBjbGFzcz0iYnVnQ29udGFpbmVyIiBvbmNsaWNrPSJ3aW5kb3cubG9jYXRpb249JyN0aGlyZCc7 Ij4KKyAgICAgIDxwIGNsYXNzPSJ0aXRsZSI+CisgICAgICAgIDxhIGNsYXNzPSJ0aXRsZSIgaHJl Zj0iI2ZvdXJ0aCI+UmFuZG9tIGxpbms8L2E+CisgICAgICA8L3A+CisgICAgICA8cD4KKyAgICAg ICAgQnJlYWtpbmcgbm9kZQorICAgICAgPC9wPgorICAgIDwvZGl2PgorICA8L2JvZHk+Cis8L2h0 bWw+Cg==