130563 2014-03-20 22:19:46 -0700 AX: AccessibilityObject::children() returns invalid results sometimes 2014-04-03 01:28:01 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 130721 1 jcraig cfleizach commit-queue jcraig joepeck mario timothy webkit-bug-importer oldest_to_newest 992905 0 jcraig 2014-03-20 22:19:46 -0700 At least one of the test elements in the inspector-protocol tests gets an invalid result for children(). It should either be including the <span> as an child, or promoting the <span>'s descendant nodes (because the <span> is ignored), but WebCore is doing neither of these things. Somehow it's coming out right in the AX API (the ignored <span> is being exposed as an AXGroup) but that output need to be reconciled with this output. Test case is in LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode.html <div role="group" class="ex"> <!-- FIXME: accessibilityChildNodeIds.length should be 3 (foo, bar, baz). WebCore only reports 1 (foo). --> <div>foo</div> <span> bar <span role="button">baz</span> </span> <div></div> <div></div> </div> Source/WebCore/accessibility/AccessibilityObject.cpp:1389 Blocked by http://webkit.org/b/130264 Probably related to http://webkit.org/b/130181 If there is a reason it's done this way, kick this back to me in the Web Inspector component. It's possible I'll need to add a new method for AccessibilityObject::unignoredChildren() 992906 1 webkit-bug-importer 2014-03-20 22:25:21 -0700 <rdar://problem/16388161> 993996 2 227699 cfleizach 2014-03-24 16:09:00 -0700 Created attachment 227699 patch 993998 3 commit-queue 2014-03-24 16:11:30 -0700 Attachment 227699 did not pass style-queue: ERROR: Source/WebCore/inspector/InspectorDOMAgent.h:237: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] ERROR: Source/WebCore/inspector/InspectorDOMAgent.cpp:1418: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 994006 4 227701 cfleizach 2014-03-24 16:20:43 -0700 Created attachment 227701 patch 994013 5 227701 jcraig 2014-03-24 16:28:29 -0700 Comment on attachment 227701 patch View in context: https://bugs.webkit.org/attachment.cgi?id=227701&action=review > Source/WebCore/inspector/InspectorDOMAgent.cpp:1418 > +void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObject> axObject, RefPtr<Inspector::TypeBuilder::Array<int>>& childNodeIds) Wouldn't this be better as AccessibilityObject::childrenPromoted() similar to AccessibilityObject::parentObjectUnignored()? This is is the approach I was planning to take if you determined AccessibilityObject::children() behaved correctly. > LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt:397 > - childNodeIds.length: 1 > + childNodeIds.length: 3 There's a FIXME comment in the layout test that should be removed, too. 994017 6 227701 cfleizach 2014-03-24 16:34:13 -0700 Comment on attachment 227701 patch View in context: https://bugs.webkit.org/attachment.cgi?id=227701&action=review >> Source/WebCore/inspector/InspectorDOMAgent.cpp:1418 >> +void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObject> axObject, RefPtr<Inspector::TypeBuilder::Array<int>>& childNodeIds) > > Wouldn't this be better as AccessibilityObject::childrenPromoted() similar to AccessibilityObject::parentObjectUnignored()? This is is the approach I was planning to take if you determined AccessibilityObject::children() behaved correctly. No. The DOM inspector only cares about Nodes, while the AXTree also cares about render objects. 994019 7 227703 cfleizach 2014-03-24 16:34:49 -0700 Created attachment 227703 patch 994022 8 227703 jcraig 2014-03-24 16:36:52 -0700 Comment on attachment 227703 patch View in context: https://bugs.webkit.org/attachment.cgi?id=227703&action=review > LayoutTests/inspector-protocol/dom/getAccessibilityPropertiesForNode-expected.txt:397 > - childNodeIds.length: 1 > + childNodeIds.length: 3 You need to regenerate the layout test result again now that you've removed the comment. The outerHTML (including FIXME comment) gets output. 994024 9 227704 cfleizach 2014-03-24 16:43:09 -0700 Created attachment 227704 patch 996592 10 227704 joepeck 2014-04-01 22:54:02 -0700 Comment on attachment 227704 patch r+ Is this likely to produce very large lists of children if you select something like <body>? 996611 11 jcraig 2014-04-02 00:04:40 -0700 It doesn't return all the leaf nodes of the entire tree if that's what you mean. It stops at accessible group boundaries (e.g. a list, but not all it's listitem children). This will return long lists in places, but the UI tweak for that should be covered in bug 130911. 997080 12 cfleizach 2014-04-03 01:28:01 -0700 http://trac.webkit.org/changeset/166703 227699 2014-03-24 16:09:00 -0700 2014-03-24 16:20:43 -0700 patch patch text/plain 5087 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjIwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTI0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxp dHlPYmplY3Q6OmNoaWxkcmVuKCkgcmV0dXJucyBpbnZhbGlkIHJlc3VsdHMgc29tZXRpbWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1NjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0aGUg RE9NIGluc3BlY3RvciB0byBoYW5kbGUgQVggb2JqZWN0cyB0aGF0IGRvIG5vdCBoYXZlIE5vZGUg ZXF1aXZhbGVudHMKKyAgICAgICAgKGUuZy4gYW5vbnltb3VzIHJlbmRlcmVycykuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NQWdlbnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4pOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0 eVByb3BlcnRpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgor CiAyMDE0LTAzLTI0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAg ICAgIEFjdGl2YXRlIFdlYlZUVCBUZXN0cyBPbmNlIE1lcmdpbmcgaXMgQ29tcGxldGUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAkocmV2 aXNpb24gMTY2MTkzKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxNCw3ICsxNDE0LDI0IEBACiAgICAgfQogICAg IHJldHVybiB2YWx1ZS5yZWxlYXNlKCk7CiB9Ci0KKyAgICAKK3ZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmpl Y3Q+IGF4T2JqZWN0LCBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6QXJyYXk8aW50Pj4m IGNoaWxkTm9kZUlkcykKK3sKKyAgICBjb25zdCBhdXRvJiBjaGlsZHJlbiA9IGF4T2JqZWN0LT5j aGlsZHJlbigpOworICAgIGlmICghY2hpbGRyZW4uc2l6ZSgpKQorICAgICAgICByZXR1cm47Cisg ICAgCisgICAgaWYgKCFjaGlsZE5vZGVJZHMpCisgICAgICAgIGNoaWxkTm9kZUlkcyA9IEluc3Bl Y3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PGludD46OmNyZWF0ZSgpOworICAgIAorICAgIGZvciAo Y29uc3QgYXV0byYgY2hpbGRPYmplY3QgOiBjaGlsZHJlbikgeworICAgICAgICBpZiAoTm9kZSog Y2hpbGROb2RlID0gY2hpbGRPYmplY3QtPm5vZGUoKSkKKyAgICAgICAgICAgIGNoaWxkTm9kZUlk cy0+YWRkSXRlbShwdXNoTm9kZVBhdGhUb0Zyb250ZW5kKGNoaWxkTm9kZSkpOworICAgICAgICBl bHNlCisgICAgICAgICAgICBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVuKGNoaWxkT2JqZWN0 LCBjaGlsZE5vZGVJZHMpOworICAgIH0KK30KKyAgICAKIFBhc3NSZWZQdHI8VHlwZUJ1aWxkZXI6 OkRPTTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM+IEluc3BlY3RvckRPTUFnZW50OjpidWlsZE9i amVjdEZvckFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzKE5vZGUqIG5vZGUpCiB7CiAgICAgQVNTRVJU KG5vZGUpOwpAQCAtMTQ2NCwxNSArMTQ4MSw4IEBACiAgICAgICAgICAgICAgICAgICAgIGNoZWNr ZWQgPSBUeXBlQnVpbGRlcjo6RE9NOjpBY2Nlc3NpYmlsaXR5UHJvcGVydGllczo6Q2hlY2tlZDo6 VHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAotICAgICAgICAgICAgY29uc3QgYXV0 byYgY2hpbGRyZW4gPSBheE9iamVjdC0+Y2hpbGRyZW4oKTsKLSAgICAgICAgICAgIGlmIChjaGls ZHJlbi5zaXplKCkpIHsKLSAgICAgICAgICAgICAgICBjaGlsZE5vZGVJZHMgPSBJbnNwZWN0b3I6 OlR5cGVCdWlsZGVyOjpBcnJheTxpbnQ+OjpjcmVhdGUoKTsKLSAgICAgICAgICAgICAgICBmb3Ig KGNvbnN0IGF1dG8mIGNoaWxkT2JqZWN0IDogY2hpbGRyZW4pIHsKLSAgICAgICAgICAgICAgICAg ICAgaWYgKE5vZGUqIGNoaWxkTm9kZSA9IGNoaWxkT2JqZWN0LT5ub2RlKCkpCi0gICAgICAgICAg ICAgICAgICAgICAgICBjaGlsZE5vZGVJZHMtPmFkZEl0ZW0ocHVzaE5vZGVQYXRoVG9Gcm9udGVu ZChjaGlsZE5vZGUpKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0KKyAgICAg ICAgICAgIHByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oYXhPYmplY3QsIGNoaWxkTm9kZUlk cyk7CisgICAgICAgICAgICAKICAgICAgICAgICAgIGlmIChheE9iamVjdC0+c3VwcG9ydHNBUklB Q29udHJvbHMoKSkgewogICAgICAgICAgICAgICAgIFZlY3RvcjxFbGVtZW50Kj4gY29udHJvbGxl ZEVsZW1lbnRzOwogICAgICAgICAgICAgICAgIGF4T2JqZWN0LT5lbGVtZW50c0Zyb21BdHRyaWJ1 dGUoY29udHJvbGxlZEVsZW1lbnRzLCBhcmlhX2NvbnRyb2xzQXR0cik7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAkocmV2aXNpb24gMTY2MTkz KQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTU0LDcgKzU0LDggQEAKIH0KIAogbmFtZXNwYWNlIFdlYkNvcmUgewotCisg ICAgCitjbGFzcyBBY2Nlc3NpYmlsaXR5T2JqZWN0OwogY2xhc3MgQ29udGFpbmVyTm9kZTsKIGNs YXNzIENoYXJhY3RlckRhdGE7CiBjbGFzcyBET01FZGl0b3I7CkBAIC0yMzMsNyArMjM0LDggQEAK ICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvcjo6 VHlwZUJ1aWxkZXI6OkRPTTo6Tm9kZT4+IGJ1aWxkQXJyYXlGb3JDb250YWluZXJDaGlsZHJlbihO b2RlKiBjb250YWluZXIsIGludCBkZXB0aCwgTm9kZVRvSWRNYXAqIG5vZGVzTWFwKTsKICAgICBQ YXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkRPTTo6RXZlbnRMaXN0ZW5lcj4gYnVp bGRPYmplY3RGb3JFdmVudExpc3RlbmVyKGNvbnN0IFJlZ2lzdGVyZWRFdmVudExpc3RlbmVyJiwg Y29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIE5vZGUqLCBjb25zdCBTdHJpbmcqIG9iamVj dEdyb3VwSWQpOwogICAgIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6RE9NOjpB Y2Nlc3NpYmlsaXR5UHJvcGVydGllcz4gYnVpbGRPYmplY3RGb3JBY2Nlc3NpYmlsaXR5UHJvcGVy dGllcyhOb2RlKik7Ci0KKyAgICB2b2lkIHByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUmVm UHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+LCBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6 QXJyYXk8aW50Pj4mKTsKKyAgICAKICAgICBOb2RlKiBub2RlRm9yUGF0aChjb25zdCBTdHJpbmcm IHBhdGgpOwogICAgIE5vZGUqIG5vZGVGb3JPYmplY3RJZChjb25zdCBTdHJpbmcmIG9iamVjdElk KTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY2MjAxKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTQtMDMtMjQgIENocmlzIEZsZWl6 YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogQWNjZXNzaWJpbGl0eU9i amVjdDo6Y2hpbGRyZW4oKSByZXR1cm5zIGludmFsaWQgcmVzdWx0cyBzb21ldGltZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDU2MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yLXBy b3RvY29sL2RvbS9nZXRBY2Nlc3NpYmlsaXR5UHJvcGVydGllc0Zvck5vZGUtZXhwZWN0ZWQudHh0 OgorCiAyMDE0LTAzLTI0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIEFjdGl2YXRlIFdlYlZUVCBUZXN0cyBPbmNlIE1lcmdpbmcgaXMgQ29tcGxldGUKSW5k ZXg6IExheW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVBy b3BlcnRpZXNGb3JOb2RlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9p bnNwZWN0b3ItcHJvdG9jb2wvZG9tL2dldEFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzRm9yTm9kZS1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDE2NjE5MykKKysrIExheW91dFRlc3RzL2luc3BlY3Rvci1w cm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVByb3BlcnRpZXNGb3JOb2RlLWV4cGVjdGVkLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMzk0LDcgKzM5NCw3IEBACiAgICAgZXhpc3RzOiB0cnVlCiAg ICAgbGFiZWw6IAogICAgIHJvbGU6IGdyb3VwCi0gICAgY2hpbGROb2RlSWRzLmxlbmd0aDogMQor ICAgIGNoaWxkTm9kZUlkcy5sZW5ndGg6IDMKIAogPGRpdj48ZGl2PjwvZGl2PjwvZGl2PgogICAg IGV4aXN0czogdHJ1ZQo= 227701 2014-03-24 16:20:43 -0700 2014-03-24 16:34:49 -0700 patch patch text/plain 5095 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjIwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTI0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxp dHlPYmplY3Q6OmNoaWxkcmVuKCkgcmV0dXJucyBpbnZhbGlkIHJlc3VsdHMgc29tZXRpbWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1NjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0aGUg RE9NIGluc3BlY3RvciB0byBoYW5kbGUgQVggb2JqZWN0cyB0aGF0IGRvIG5vdCBoYXZlIE5vZGUg ZXF1aXZhbGVudHMKKyAgICAgICAgKGUuZy4gYW5vbnltb3VzIHJlbmRlcmVycykuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NQWdlbnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4pOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0 eVByb3BlcnRpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgor CiAyMDE0LTAzLTI0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAg ICAgIEFjdGl2YXRlIFdlYlZUVCBUZXN0cyBPbmNlIE1lcmdpbmcgaXMgQ29tcGxldGUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAkocmV2 aXNpb24gMTY2MTkzKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxNCw3ICsxNDE0LDI0IEBACiAgICAgfQogICAg IHJldHVybiB2YWx1ZS5yZWxlYXNlKCk7CiB9Ci0KKyAgICAKK3ZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5 T2JqZWN0PiBheE9iamVjdCwgUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PGlu dD4+JiBjaGlsZE5vZGVJZHMpCit7CisgICAgY29uc3QgYXV0byYgY2hpbGRyZW4gPSBheE9iamVj dC0+Y2hpbGRyZW4oKTsKKyAgICBpZiAoIWNoaWxkcmVuLnNpemUoKSkKKyAgICAgICAgcmV0dXJu OworICAgIAorICAgIGlmICghY2hpbGROb2RlSWRzKQorICAgICAgICBjaGlsZE5vZGVJZHMgPSBJ bnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxpbnQ+OjpjcmVhdGUoKTsKKyAgICAKKyAgICBm b3IgKGNvbnN0IGF1dG8mIGNoaWxkT2JqZWN0IDogY2hpbGRyZW4pIHsKKyAgICAgICAgaWYgKE5v ZGUqIGNoaWxkTm9kZSA9IGNoaWxkT2JqZWN0LT5ub2RlKCkpCisgICAgICAgICAgICBjaGlsZE5v ZGVJZHMtPmFkZEl0ZW0ocHVzaE5vZGVQYXRoVG9Gcm9udGVuZChjaGlsZE5vZGUpKTsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgcHJvY2Vzc0FjY2Vzc2liaWxpdHlDaGlsZHJlbihjaGlsZE9i amVjdCwgY2hpbGROb2RlSWRzKTsKKyAgICB9Cit9CisgICAgCiBQYXNzUmVmUHRyPFR5cGVCdWls ZGVyOjpET006OkFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzPiBJbnNwZWN0b3JET01BZ2VudDo6YnVp bGRPYmplY3RGb3JBY2Nlc3NpYmlsaXR5UHJvcGVydGllcyhOb2RlKiBub2RlKQogewogICAgIEFT U0VSVChub2RlKTsKQEAgLTE0NjQsMTUgKzE0ODEsOCBAQAogICAgICAgICAgICAgICAgICAgICBj aGVja2VkID0gVHlwZUJ1aWxkZXI6OkRPTTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM6OkNoZWNr ZWQ6OlRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGNvbnN0 IGF1dG8mIGNoaWxkcmVuID0gYXhPYmplY3QtPmNoaWxkcmVuKCk7Ci0gICAgICAgICAgICBpZiAo Y2hpbGRyZW4uc2l6ZSgpKSB7Ci0gICAgICAgICAgICAgICAgY2hpbGROb2RlSWRzID0gSW5zcGVj dG9yOjpUeXBlQnVpbGRlcjo6QXJyYXk8aW50Pjo6Y3JlYXRlKCk7Ci0gICAgICAgICAgICAgICAg Zm9yIChjb25zdCBhdXRvJiBjaGlsZE9iamVjdCA6IGNoaWxkcmVuKSB7Ci0gICAgICAgICAgICAg ICAgICAgIGlmIChOb2RlKiBjaGlsZE5vZGUgPSBjaGlsZE9iamVjdC0+bm9kZSgpKQotICAgICAg ICAgICAgICAgICAgICAgICAgY2hpbGROb2RlSWRzLT5hZGRJdGVtKHB1c2hOb2RlUGF0aFRvRnJv bnRlbmQoY2hpbGROb2RlKSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotCisg ICAgICAgICAgICBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVuKGF4T2JqZWN0LCBjaGlsZE5v ZGVJZHMpOworICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAoYXhPYmplY3QtPnN1cHBvcnRz QVJJQUNvbnRyb2xzKCkpIHsKICAgICAgICAgICAgICAgICBWZWN0b3I8RWxlbWVudCo+IGNvbnRy b2xsZWRFbGVtZW50czsKICAgICAgICAgICAgICAgICBheE9iamVjdC0+ZWxlbWVudHNGcm9tQXR0 cmlidXRlKGNvbnRyb2xsZWRFbGVtZW50cywgYXJpYV9jb250cm9sc0F0dHIpOwpJbmRleDogU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgJKHJldmlzaW9uIDE2 NjE5MykKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw4IEBACiB9CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK LQorICAgIAorY2xhc3MgQWNjZXNzaWJpbGl0eU9iamVjdDsKIGNsYXNzIENvbnRhaW5lck5vZGU7 CiBjbGFzcyBDaGFyYWN0ZXJEYXRhOwogY2xhc3MgRE9NRWRpdG9yOwpAQCAtMjMzLDcgKzIzNCw4 IEBACiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0 b3I6OlR5cGVCdWlsZGVyOjpET006Ok5vZGU+PiBidWlsZEFycmF5Rm9yQ29udGFpbmVyQ2hpbGRy ZW4oTm9kZSogY29udGFpbmVyLCBpbnQgZGVwdGgsIE5vZGVUb0lkTWFwKiBub2Rlc01hcCk7CiAg ICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpET006OkV2ZW50TGlzdGVuZXI+ IGJ1aWxkT2JqZWN0Rm9yRXZlbnRMaXN0ZW5lcihjb25zdCBSZWdpc3RlcmVkRXZlbnRMaXN0ZW5l ciYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBOb2RlKiwgY29uc3QgU3RyaW5nKiBv YmplY3RHcm91cElkKTsKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkRP TTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM+IGJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0eVBy b3BlcnRpZXMoTm9kZSopOwotCisgICAgdm9pZCBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVu KFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4sIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVC dWlsZGVyOjpBcnJheTxpbnQ+PiYpOworICAgIAogICAgIE5vZGUqIG5vZGVGb3JQYXRoKGNvbnN0 IFN0cmluZyYgcGF0aCk7CiAgICAgTm9kZSogbm9kZUZvck9iamVjdElkKGNvbnN0IFN0cmluZyYg b2JqZWN0SWQpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjYyMDEpCisrKyBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0wMy0yNCAgQ2hy aXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBBY2Nlc3Np YmlsaXR5T2JqZWN0OjpjaGlsZHJlbigpIHJldHVybnMgaW52YWxpZCByZXN1bHRzIHNvbWV0aW1l cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNTYz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3ItcHJvdG9jb2wvZG9tL2dldEFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzRm9yTm9kZS1leHBl Y3RlZC50eHQ6CisKIDIwMTQtMDMtMjQgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5j b20+CiAKICAgICAgICAgQWN0aXZhdGUgV2ViVlRUIFRlc3RzIE9uY2UgTWVyZ2luZyBpcyBDb21w bGV0ZQpJbmRleDogTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3Np YmlsaXR5UHJvcGVydGllc0Zvck5vZGUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVByb3BlcnRpZXNG b3JOb2RlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTY2MTkzKQorKysgTGF5b3V0VGVzdHMvaW5z cGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3NpYmlsaXR5UHJvcGVydGllc0Zvck5vZGUtZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zOTQsNyArMzk0LDcgQEAKICAgICBleGlzdHM6 IHRydWUKICAgICBsYWJlbDogCiAgICAgcm9sZTogZ3JvdXAKLSAgICBjaGlsZE5vZGVJZHMubGVu Z3RoOiAxCisgICAgY2hpbGROb2RlSWRzLmxlbmd0aDogMwogCiA8ZGl2PjxkaXY+PC9kaXY+PC9k aXY+CiAgICAgZXhpc3RzOiB0cnVlCg== 227703 2014-03-24 16:34:49 -0700 2014-03-24 16:43:09 -0700 patch patch text/plain 5691 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjIwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTI0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxp dHlPYmplY3Q6OmNoaWxkcmVuKCkgcmV0dXJucyBpbnZhbGlkIHJlc3VsdHMgc29tZXRpbWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1NjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0aGUg RE9NIGluc3BlY3RvciB0byBoYW5kbGUgQVggb2JqZWN0cyB0aGF0IGRvIG5vdCBoYXZlIE5vZGUg ZXF1aXZhbGVudHMKKyAgICAgICAgKGUuZy4gYW5vbnltb3VzIHJlbmRlcmVycykuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NQWdlbnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4pOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0 eVByb3BlcnRpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgor CiAyMDE0LTAzLTI0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAg ICAgIEFjdGl2YXRlIFdlYlZUVCBUZXN0cyBPbmNlIE1lcmdpbmcgaXMgQ29tcGxldGUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAkocmV2 aXNpb24gMTY2MTkzKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxNCw3ICsxNDE0LDI0IEBACiAgICAgfQogICAg IHJldHVybiB2YWx1ZS5yZWxlYXNlKCk7CiB9Ci0KKyAgICAKK3ZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5 T2JqZWN0PiBheE9iamVjdCwgUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PGlu dD4+JiBjaGlsZE5vZGVJZHMpCit7CisgICAgY29uc3QgYXV0byYgY2hpbGRyZW4gPSBheE9iamVj dC0+Y2hpbGRyZW4oKTsKKyAgICBpZiAoIWNoaWxkcmVuLnNpemUoKSkKKyAgICAgICAgcmV0dXJu OworICAgIAorICAgIGlmICghY2hpbGROb2RlSWRzKQorICAgICAgICBjaGlsZE5vZGVJZHMgPSBJ bnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxpbnQ+OjpjcmVhdGUoKTsKKyAgICAKKyAgICBm b3IgKGNvbnN0IGF1dG8mIGNoaWxkT2JqZWN0IDogY2hpbGRyZW4pIHsKKyAgICAgICAgaWYgKE5v ZGUqIGNoaWxkTm9kZSA9IGNoaWxkT2JqZWN0LT5ub2RlKCkpCisgICAgICAgICAgICBjaGlsZE5v ZGVJZHMtPmFkZEl0ZW0ocHVzaE5vZGVQYXRoVG9Gcm9udGVuZChjaGlsZE5vZGUpKTsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgcHJvY2Vzc0FjY2Vzc2liaWxpdHlDaGlsZHJlbihjaGlsZE9i amVjdCwgY2hpbGROb2RlSWRzKTsKKyAgICB9Cit9CisgICAgCiBQYXNzUmVmUHRyPFR5cGVCdWls ZGVyOjpET006OkFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzPiBJbnNwZWN0b3JET01BZ2VudDo6YnVp bGRPYmplY3RGb3JBY2Nlc3NpYmlsaXR5UHJvcGVydGllcyhOb2RlKiBub2RlKQogewogICAgIEFT U0VSVChub2RlKTsKQEAgLTE0NjQsMTUgKzE0ODEsOCBAQAogICAgICAgICAgICAgICAgICAgICBj aGVja2VkID0gVHlwZUJ1aWxkZXI6OkRPTTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM6OkNoZWNr ZWQ6OlRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGNvbnN0 IGF1dG8mIGNoaWxkcmVuID0gYXhPYmplY3QtPmNoaWxkcmVuKCk7Ci0gICAgICAgICAgICBpZiAo Y2hpbGRyZW4uc2l6ZSgpKSB7Ci0gICAgICAgICAgICAgICAgY2hpbGROb2RlSWRzID0gSW5zcGVj dG9yOjpUeXBlQnVpbGRlcjo6QXJyYXk8aW50Pjo6Y3JlYXRlKCk7Ci0gICAgICAgICAgICAgICAg Zm9yIChjb25zdCBhdXRvJiBjaGlsZE9iamVjdCA6IGNoaWxkcmVuKSB7Ci0gICAgICAgICAgICAg ICAgICAgIGlmIChOb2RlKiBjaGlsZE5vZGUgPSBjaGlsZE9iamVjdC0+bm9kZSgpKQotICAgICAg ICAgICAgICAgICAgICAgICAgY2hpbGROb2RlSWRzLT5hZGRJdGVtKHB1c2hOb2RlUGF0aFRvRnJv bnRlbmQoY2hpbGROb2RlKSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotCisg ICAgICAgICAgICBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVuKGF4T2JqZWN0LCBjaGlsZE5v ZGVJZHMpOworICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAoYXhPYmplY3QtPnN1cHBvcnRz QVJJQUNvbnRyb2xzKCkpIHsKICAgICAgICAgICAgICAgICBWZWN0b3I8RWxlbWVudCo+IGNvbnRy b2xsZWRFbGVtZW50czsKICAgICAgICAgICAgICAgICBheE9iamVjdC0+ZWxlbWVudHNGcm9tQXR0 cmlidXRlKGNvbnRyb2xsZWRFbGVtZW50cywgYXJpYV9jb250cm9sc0F0dHIpOwpJbmRleDogU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgJKHJldmlzaW9uIDE2 NjE5MykKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw4IEBACiB9CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK LQorICAgIAorY2xhc3MgQWNjZXNzaWJpbGl0eU9iamVjdDsKIGNsYXNzIENvbnRhaW5lck5vZGU7 CiBjbGFzcyBDaGFyYWN0ZXJEYXRhOwogY2xhc3MgRE9NRWRpdG9yOwpAQCAtMjMzLDcgKzIzNCw4 IEBACiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0 b3I6OlR5cGVCdWlsZGVyOjpET006Ok5vZGU+PiBidWlsZEFycmF5Rm9yQ29udGFpbmVyQ2hpbGRy ZW4oTm9kZSogY29udGFpbmVyLCBpbnQgZGVwdGgsIE5vZGVUb0lkTWFwKiBub2Rlc01hcCk7CiAg ICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpET006OkV2ZW50TGlzdGVuZXI+ IGJ1aWxkT2JqZWN0Rm9yRXZlbnRMaXN0ZW5lcihjb25zdCBSZWdpc3RlcmVkRXZlbnRMaXN0ZW5l ciYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBOb2RlKiwgY29uc3QgU3RyaW5nKiBv YmplY3RHcm91cElkKTsKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkRP TTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM+IGJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0eVBy b3BlcnRpZXMoTm9kZSopOwotCisgICAgdm9pZCBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVu KFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4sIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVC dWlsZGVyOjpBcnJheTxpbnQ+PiYpOworICAgIAogICAgIE5vZGUqIG5vZGVGb3JQYXRoKGNvbnN0 IFN0cmluZyYgcGF0aCk7CiAgICAgTm9kZSogbm9kZUZvck9iamVjdElkKGNvbnN0IFN0cmluZyYg b2JqZWN0SWQpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjYyMDEpCisrKyBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0wMy0yNCAgQ2hy aXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBBY2Nlc3Np YmlsaXR5T2JqZWN0OjpjaGlsZHJlbigpIHJldHVybnMgaW52YWxpZCByZXN1bHRzIHNvbWV0aW1l cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNTYz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3ItcHJvdG9jb2wvZG9tL2dldEFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzRm9yTm9kZS1leHBl Y3RlZC50eHQ6CisKIDIwMTQtMDMtMjQgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5j b20+CiAKICAgICAgICAgQWN0aXZhdGUgV2ViVlRUIFRlc3RzIE9uY2UgTWVyZ2luZyBpcyBDb21w bGV0ZQpJbmRleDogTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3Np YmlsaXR5UHJvcGVydGllc0Zvck5vZGUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVByb3BlcnRpZXNG b3JOb2RlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTY2MTkzKQorKysgTGF5b3V0VGVzdHMvaW5z cGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3NpYmlsaXR5UHJvcGVydGllc0Zvck5vZGUtZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zOTQsNyArMzk0LDcgQEAKICAgICBleGlzdHM6 IHRydWUKICAgICBsYWJlbDogCiAgICAgcm9sZTogZ3JvdXAKLSAgICBjaGlsZE5vZGVJZHMubGVu Z3RoOiAxCisgICAgY2hpbGROb2RlSWRzLmxlbmd0aDogMwogCiA8ZGl2PjxkaXY+PC9kaXY+PC9k aXY+CiAgICAgZXhpc3RzOiB0cnVlCkluZGV4OiBMYXlvdXRUZXN0cy9pbnNwZWN0b3ItcHJvdG9j b2wvZG9tL2dldEFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzRm9yTm9kZS5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVBy b3BlcnRpZXNGb3JOb2RlLmh0bWwJKHJldmlzaW9uIDE2NjE5MykKKysrIExheW91dFRlc3RzL2lu c3BlY3Rvci1wcm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVByb3BlcnRpZXNGb3JOb2RlLmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTE0LDcgKzE0LDYgQEAKIDxkaXYgY2xhc3M9ImV4Ij48ZGl2 PjwvZGl2PjwvZGl2PgogCiA8ZGl2IHJvbGU9Imdyb3VwIiBjbGFzcz0iZXgiPgotICAgIDwhLS0g RklYTUU6IGNoaWxkTm9kZUlkcy5sZW5ndGggc2hvdWxkIGJlIDMgKGZvbywgYmFyLCBiYXopLiBX ZWJDb3JlIG9ubHkgcmVwb3J0cyAxIChmb28pLiBodHRwOi8vd2Via2l0Lm9yZy9iLzEzMDU2MyAt LT4KICAgICA8ZGl2PmZvbzwvZGl2PgogICAgIDxzcGFuPgogICAgICAgICBiYXIK 227704 2014-03-24 16:43:09 -0700 2014-04-01 22:54:01 -0700 patch patch text/plain 5924 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjIwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTI0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEFjY2Vzc2liaWxp dHlPYmplY3Q6OmNoaWxkcmVuKCkgcmV0dXJucyBpbnZhbGlkIHJlc3VsdHMgc29tZXRpbWVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA1NjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyB0aGUg RE9NIGluc3BlY3RvciB0byBoYW5kbGUgQVggb2JqZWN0cyB0aGF0IGRvIG5vdCBoYXZlIE5vZGUg ZXF1aXZhbGVudHMKKyAgICAgICAgKGUuZy4gYW5vbnltb3VzIHJlbmRlcmVycykuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yRE9NQWdlbnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4pOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0 eVByb3BlcnRpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oOgor CiAyMDE0LTAzLTI0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAg ICAgIEFjdGl2YXRlIFdlYlZUVCBUZXN0cyBPbmNlIE1lcmdpbmcgaXMgQ29tcGxldGUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAkocmV2 aXNpb24gMTY2MTkzKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxNCw3ICsxNDE0LDI0IEBACiAgICAgfQogICAg IHJldHVybiB2YWx1ZS5yZWxlYXNlKCk7CiB9Ci0KKyAgICAKK3ZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OnByb2Nlc3NBY2Nlc3NpYmlsaXR5Q2hpbGRyZW4oUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5 T2JqZWN0PiBheE9iamVjdCwgUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PGlu dD4+JiBjaGlsZE5vZGVJZHMpCit7CisgICAgY29uc3QgYXV0byYgY2hpbGRyZW4gPSBheE9iamVj dC0+Y2hpbGRyZW4oKTsKKyAgICBpZiAoIWNoaWxkcmVuLnNpemUoKSkKKyAgICAgICAgcmV0dXJu OworICAgIAorICAgIGlmICghY2hpbGROb2RlSWRzKQorICAgICAgICBjaGlsZE5vZGVJZHMgPSBJ bnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxpbnQ+OjpjcmVhdGUoKTsKKyAgICAKKyAgICBm b3IgKGNvbnN0IGF1dG8mIGNoaWxkT2JqZWN0IDogY2hpbGRyZW4pIHsKKyAgICAgICAgaWYgKE5v ZGUqIGNoaWxkTm9kZSA9IGNoaWxkT2JqZWN0LT5ub2RlKCkpCisgICAgICAgICAgICBjaGlsZE5v ZGVJZHMtPmFkZEl0ZW0ocHVzaE5vZGVQYXRoVG9Gcm9udGVuZChjaGlsZE5vZGUpKTsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgcHJvY2Vzc0FjY2Vzc2liaWxpdHlDaGlsZHJlbihjaGlsZE9i amVjdCwgY2hpbGROb2RlSWRzKTsKKyAgICB9Cit9CisgICAgCiBQYXNzUmVmUHRyPFR5cGVCdWls ZGVyOjpET006OkFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzPiBJbnNwZWN0b3JET01BZ2VudDo6YnVp bGRPYmplY3RGb3JBY2Nlc3NpYmlsaXR5UHJvcGVydGllcyhOb2RlKiBub2RlKQogewogICAgIEFT U0VSVChub2RlKTsKQEAgLTE0NjQsMTUgKzE0ODEsOCBAQAogICAgICAgICAgICAgICAgICAgICBj aGVja2VkID0gVHlwZUJ1aWxkZXI6OkRPTTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM6OkNoZWNr ZWQ6OlRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGNvbnN0 IGF1dG8mIGNoaWxkcmVuID0gYXhPYmplY3QtPmNoaWxkcmVuKCk7Ci0gICAgICAgICAgICBpZiAo Y2hpbGRyZW4uc2l6ZSgpKSB7Ci0gICAgICAgICAgICAgICAgY2hpbGROb2RlSWRzID0gSW5zcGVj dG9yOjpUeXBlQnVpbGRlcjo6QXJyYXk8aW50Pjo6Y3JlYXRlKCk7Ci0gICAgICAgICAgICAgICAg Zm9yIChjb25zdCBhdXRvJiBjaGlsZE9iamVjdCA6IGNoaWxkcmVuKSB7Ci0gICAgICAgICAgICAg ICAgICAgIGlmIChOb2RlKiBjaGlsZE5vZGUgPSBjaGlsZE9iamVjdC0+bm9kZSgpKQotICAgICAg ICAgICAgICAgICAgICAgICAgY2hpbGROb2RlSWRzLT5hZGRJdGVtKHB1c2hOb2RlUGF0aFRvRnJv bnRlbmQoY2hpbGROb2RlKSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotCisg ICAgICAgICAgICBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVuKGF4T2JqZWN0LCBjaGlsZE5v ZGVJZHMpOworICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAoYXhPYmplY3QtPnN1cHBvcnRz QVJJQUNvbnRyb2xzKCkpIHsKICAgICAgICAgICAgICAgICBWZWN0b3I8RWxlbWVudCo+IGNvbnRy b2xsZWRFbGVtZW50czsKICAgICAgICAgICAgICAgICBheE9iamVjdC0+ZWxlbWVudHNGcm9tQXR0 cmlidXRlKGNvbnRyb2xsZWRFbGVtZW50cywgYXJpYV9jb250cm9sc0F0dHIpOwpJbmRleDogU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmgJKHJldmlzaW9uIDE2 NjE5MykKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw4IEBACiB9CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK LQorICAgIAorY2xhc3MgQWNjZXNzaWJpbGl0eU9iamVjdDsKIGNsYXNzIENvbnRhaW5lck5vZGU7 CiBjbGFzcyBDaGFyYWN0ZXJEYXRhOwogY2xhc3MgRE9NRWRpdG9yOwpAQCAtMjMzLDcgKzIzNCw4 IEBACiAgICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0 b3I6OlR5cGVCdWlsZGVyOjpET006Ok5vZGU+PiBidWlsZEFycmF5Rm9yQ29udGFpbmVyQ2hpbGRy ZW4oTm9kZSogY29udGFpbmVyLCBpbnQgZGVwdGgsIE5vZGVUb0lkTWFwKiBub2Rlc01hcCk7CiAg ICAgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpET006OkV2ZW50TGlzdGVuZXI+ IGJ1aWxkT2JqZWN0Rm9yRXZlbnRMaXN0ZW5lcihjb25zdCBSZWdpc3RlcmVkRXZlbnRMaXN0ZW5l ciYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBOb2RlKiwgY29uc3QgU3RyaW5nKiBv YmplY3RHcm91cElkKTsKICAgICBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkRP TTo6QWNjZXNzaWJpbGl0eVByb3BlcnRpZXM+IGJ1aWxkT2JqZWN0Rm9yQWNjZXNzaWJpbGl0eVBy b3BlcnRpZXMoTm9kZSopOwotCisgICAgdm9pZCBwcm9jZXNzQWNjZXNzaWJpbGl0eUNoaWxkcmVu KFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4sIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVC dWlsZGVyOjpBcnJheTxpbnQ+PiYpOworICAgIAogICAgIE5vZGUqIG5vZGVGb3JQYXRoKGNvbnN0 IFN0cmluZyYgcGF0aCk7CiAgICAgTm9kZSogbm9kZUZvck9iamVjdElkKGNvbnN0IFN0cmluZyYg b2JqZWN0SWQpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjYyMDEpCisrKyBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAxNC0wMy0yNCAgQ2hy aXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBBY2Nlc3Np YmlsaXR5T2JqZWN0OjpjaGlsZHJlbigpIHJldHVybnMgaW52YWxpZCByZXN1bHRzIHNvbWV0aW1l cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNTYz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3ItcHJvdG9jb2wvZG9tL2dldEFjY2Vzc2liaWxpdHlQcm9wZXJ0aWVzRm9yTm9kZS1leHBl Y3RlZC50eHQ6CisKIDIwMTQtMDMtMjQgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5j b20+CiAKICAgICAgICAgQWN0aXZhdGUgV2ViVlRUIFRlc3RzIE9uY2UgTWVyZ2luZyBpcyBDb21w bGV0ZQpJbmRleDogTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3Np YmlsaXR5UHJvcGVydGllc0Zvck5vZGUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2luc3BlY3Rvci1wcm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVByb3BlcnRpZXNG b3JOb2RlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTY2MTkzKQorKysgTGF5b3V0VGVzdHMvaW5z cGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3NpYmlsaXR5UHJvcGVydGllc0Zvck5vZGUtZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zODIsNyArMzgyLDYgQEAKICAgICBpZ25vcmVk OiB0cnVlCiAKIDxkaXYgcm9sZT0iZ3JvdXAiPgotICAgIDwhLS0gRklYTUU6IGNoaWxkTm9kZUlk cy5sZW5ndGggc2hvdWxkIGJlIDMgKGZvbywgYmFyLCBiYXopLiBXZWJDb3JlIG9ubHkgcmVwb3J0 cyAxIChmb28pLiBodHRwOi8vd2Via2l0Lm9yZy9iLzEzMDU2MyAtLT4KICAgICA8ZGl2PmZvbzwv ZGl2PgogICAgIDxzcGFuPgogICAgICAgICBiYXIKQEAgLTM5NCw3ICszOTMsNyBAQAogICAgIGV4 aXN0czogdHJ1ZQogICAgIGxhYmVsOiAKICAgICByb2xlOiBncm91cAotICAgIGNoaWxkTm9kZUlk cy5sZW5ndGg6IDEKKyAgICBjaGlsZE5vZGVJZHMubGVuZ3RoOiAzCiAKIDxkaXY+PGRpdj48L2Rp dj48L2Rpdj4KICAgICBleGlzdHM6IHRydWUKSW5kZXg6IExheW91dFRlc3RzL2luc3BlY3Rvci1w cm90b2NvbC9kb20vZ2V0QWNjZXNzaWJpbGl0eVByb3BlcnRpZXNGb3JOb2RlLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvaW5zcGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3NpYmls aXR5UHJvcGVydGllc0Zvck5vZGUuaHRtbAkocmV2aXNpb24gMTY2MTkzKQorKysgTGF5b3V0VGVz dHMvaW5zcGVjdG9yLXByb3RvY29sL2RvbS9nZXRBY2Nlc3NpYmlsaXR5UHJvcGVydGllc0Zvck5v ZGUuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTQsNyArMTQsNiBAQAogPGRpdiBjbGFzcz0iZXgi PjxkaXY+PC9kaXY+PC9kaXY+CiAKIDxkaXYgcm9sZT0iZ3JvdXAiIGNsYXNzPSJleCI+Ci0gICAg PCEtLSBGSVhNRTogY2hpbGROb2RlSWRzLmxlbmd0aCBzaG91bGQgYmUgMyAoZm9vLCBiYXIsIGJh eikuIFdlYkNvcmUgb25seSByZXBvcnRzIDEgKGZvbykuIGh0dHA6Ly93ZWJraXQub3JnL2IvMTMw NTYzIC0tPgogICAgIDxkaXY+Zm9vPC9kaXY+CiAgICAgPHNwYW4+CiAgICAgICAgIGJhcgo=