110663 2013-02-22 16:52:28 -0800 SelectorChecker should not know about SelectorCheckerFastPath. 2013-02-23 22:20:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89879 1 dglazkov dglazkov allan.jensen eric esprehn+autocc koivisto macpherson menard ojan.autocc webkit.review.bot oldest_to_newest 840129 0 dglazkov 2013-02-22 16:52:28 -0800 SelectorChecker should not know about SelectorCheckerFastPath. 840138 1 189868 dglazkov 2013-02-22 17:01:16 -0800 Created attachment 189868 Patch 840355 2 189868 koivisto 2013-02-23 04:00:39 -0800 Comment on attachment 189868 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189868&action=review > Source/WebCore/css/SelectorChecker.cpp:77 > -bool SelectorChecker::matches(const CSSSelector* selector, Element* element, bool isFastCheckableSelector) const > +bool SelectorChecker::matches(const CSSSelector* selector, Element* element) const > { > - if (isFastCheckableSelector && !element->isSVGElement()) { > - SelectorCheckerFastPath selectorCheckerFastPath(selector, element); > - if (!selectorCheckerFastPath.matchesRightmostSelector(VisitedMatchDisabled)) > - return false; > - return selectorCheckerFastPath.matches(); > - } > - > PseudoId ignoreDynamicPseudo = NOPSEUDO; > return match(SelectorCheckingContext(selector, element, SelectorChecker::VisitedMatchDisabled), ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorMatches; > } Maybe you should just remove this whole function? It does not serve much purpose anymore. 840375 3 dglazkov 2013-02-23 08:40:31 -0800 (In reply to comment #2) > Maybe you should just remove this whole function? It does not serve much purpose anymore. Will do! 840397 4 189931 dglazkov 2013-02-23 10:14:46 -0800 Created attachment 189931 Patch for landing 840440 5 189931 webkit.review.bot 2013-02-23 12:54:31 -0800 Comment on attachment 189931 Patch for landing Rejecting attachment 189931 from commit-queue. New failing tests: fast/regions/region-style-color.html Full output: http://queues.webkit.org/results/16718889 840525 6 189955 dglazkov 2013-02-23 20:54:59 -0800 Created attachment 189955 Patch for landing 840539 7 189955 webkit.review.bot 2013-02-23 22:20:29 -0800 Comment on attachment 189955 Patch for landing Clearing flags on attachment: 189955 Committed r143858: <http://trac.webkit.org/changeset/143858> 840540 8 webkit.review.bot 2013-02-23 22:20:34 -0800 All reviewed patches have been landed. Closing bug. 189868 2013-02-22 17:01:16 -0800 2013-02-23 10:14:43 -0800 Patch bug-110663-20130222165735.patch text/plain 7146 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk1MWM4MzgwNmIwZjZh ZjE0Y2RiNTExMzU3OWIxYjJmNzQ4ODQyOC4uYTA0NWQwYzk2ZjU4NzhjNDAxYTk1Mjg0NTU2ZWJj NzgyOGFkZjVmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTIyICBEaW1p dHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2VsZWN0b3JD aGVja2VyIHNob3VsZCBub3Qga25vdyBhYm91dCBTZWxlY3RvckNoZWNrZXJGYXN0UGF0aC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDY2MworCisg ICAgICAgIEJvdGggU2VsZWN0b3JDaGVja2VyIGFuZCBpdCdzIHNwZWVkeSBjb3VzaW4gdW5mb3J0 dW5hdGVseSBpbmNsdWRlIGVhY2ggb3RoZXIuCisgICAgICAgIEx1Y2tpbHksIHRoZSBwYXJ0aWN1 bGFyIHdheSBpbiB3aGljaCBTZWxlY3RvclF1ZXJ5IHVzZXMgU2VsZWN0b3JDaGVja2VyIHlpZWxk cworICAgICAgICB0byBhIGZhaXJseSBzaW1wbGUgZGVjb3VwbGluZy4gTm93IG9ubHkgdGhlIGNv dXNpbiBrbm93cyBvZiBTZWxlY3RvckNoZWNrZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IGZ1bmN0aW9uYWxpdHksIGNvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6bWF0Y2hlcyk6IE1vdmVkIGZhc3QtcGF0 aCBsb2dpYyBmcm9tIGhlcmUgdG8gU2VsZWN0b3JEYXRhTGlzdDo6c2VsZWN0b3JNYXRjaGVzLgor ICAgICAgICAqIGNzcy9TZWxlY3RvckNoZWNrZXIuaDoKKyAgICAgICAgKFNlbGVjdG9yQ2hlY2tl cik6IFVwZGF0ZWQgdGhlIGRlY2xzIHRvIHJlbW92ZSBmYXN0LXBhdGggZmxhZy4KKyAgICAgICAg KiBkb20vU2VsZWN0b3JRdWVyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckRhdGFM aXN0OjpzZWxlY3Rvck1hdGNoZXMpOiBBZGRlZCBhIGhlbHBlciBqdXN0IGZvciBTZWxlY3RvclF1 ZXJ5LgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JEYXRhTGlzdDo6bWF0Y2hlcyk6IENoYW5n ZWQgdGhlIGNhbGxzaXRlIHRvIHVzZSBuZXcgaGVscGVyLgorICAgICAgICAoV2ViQ29yZTo6U2Vs ZWN0b3JEYXRhTGlzdDo6ZXhlY3V0ZSk6IERpdHRvLgorICAgICAgICAqIGRvbS9TZWxlY3RvclF1 ZXJ5Lmg6CisgICAgICAgIChTZWxlY3RvckRhdGFMaXN0KTogVXBkYXRlZCBkZWNscy4KKwogMjAx My0wMi0yMiAgTGV2aSBXZWludHJhdWIgIDxsZXZpd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg QWRkIGRlc2NyaXB0aXZlIG5hbWVzIGZvciBkaWZmZXJlbnQgYWRkTWlkcG9pbnQgdXNlIGNhc2Vz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCmluZGV4IGYzZTYxZTgzNGI5ZTQ0 YmQ5YWQwNjMxZDIzZWIxMjFkOTUwMDc3ZDEuLmY3M2MyNDZhMGI2ZWVjNGZkOWQ3MDFiN2U1NzZh MDQzZGM5ZDdjODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNr ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCkBAIC01 MCw3ICs1MCw2IEBACiAjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJTY3JvbGxh YmxlQXJlYS5oIgogI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1lLmgiCi0jaW5jbHVkZSAiU2VsZWN0 b3JDaGVja2VyRmFzdFBhdGguaCIKICNpbmNsdWRlICJTaGFkb3dSb290LmgiCiAjaW5jbHVkZSAi U2libGluZ1RyYXZlcnNhbFN0cmF0ZWdpZXMuaCIKICNpbmNsdWRlICJTdHlsZWRFbGVtZW50Lmgi CkBAIC03MSwxNSArNzAsOCBAQCBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yQ2hlY2tlcihEb2N1 bWVudCogZG9jdW1lbnQsIE1vZGUgbW9kZSkKIHsKIH0KIAotYm9vbCBTZWxlY3RvckNoZWNrZXI6 Om1hdGNoZXMoY29uc3QgQ1NTU2VsZWN0b3IqIHNlbGVjdG9yLCBFbGVtZW50KiBlbGVtZW50LCBi b29sIGlzRmFzdENoZWNrYWJsZVNlbGVjdG9yKSBjb25zdAorYm9vbCBTZWxlY3RvckNoZWNrZXI6 Om1hdGNoZXMoY29uc3QgQ1NTU2VsZWN0b3IqIHNlbGVjdG9yLCBFbGVtZW50KiBlbGVtZW50KSBj b25zdAogewotICAgIGlmIChpc0Zhc3RDaGVja2FibGVTZWxlY3RvciAmJiAhZWxlbWVudC0+aXNT VkdFbGVtZW50KCkpIHsKLSAgICAgICAgU2VsZWN0b3JDaGVja2VyRmFzdFBhdGggc2VsZWN0b3JD aGVja2VyRmFzdFBhdGgoc2VsZWN0b3IsIGVsZW1lbnQpOwotICAgICAgICBpZiAoIXNlbGVjdG9y Q2hlY2tlckZhc3RQYXRoLm1hdGNoZXNSaWdodG1vc3RTZWxlY3RvcihWaXNpdGVkTWF0Y2hEaXNh YmxlZCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIHJldHVybiBzZWxlY3Rv ckNoZWNrZXJGYXN0UGF0aC5tYXRjaGVzKCk7Ci0gICAgfQotCiAgICAgUHNldWRvSWQgaWdub3Jl RHluYW1pY1BzZXVkbyA9IE5PUFNFVURPOwogICAgIHJldHVybiBtYXRjaChTZWxlY3RvckNoZWNr aW5nQ29udGV4dChzZWxlY3RvciwgZWxlbWVudCwgU2VsZWN0b3JDaGVja2VyOjpWaXNpdGVkTWF0 Y2hEaXNhYmxlZCksIGlnbm9yZUR5bmFtaWNQc2V1ZG8sIERPTVNpYmxpbmdUcmF2ZXJzYWxTdHJh dGVneSgpKSA9PSBTZWxlY3Rvck1hdGNoZXM7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvU2VsZWN0b3JDaGVja2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVj a2VyLmgKaW5kZXggMDM1NWNkZTVkYTQ3MWYzZDgwZWYyMzA1ZTAxOWE2YzBkNzUyMWYxYi4uMjdj NzM1YzVjNDAzZGQzMmI4MDZkZjFkZmI5ZTBhNTQwYjk3ODJjNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T ZWxlY3RvckNoZWNrZXIuaApAQCAtNzcsNyArNzcsNyBAQCBwdWJsaWM6CiAgICAgICAgIEJlaGF2 aW9yQXRCb3VuZGFyeSBiZWhhdmlvckF0Qm91bmRhcnk7CiAgICAgfTsKIAotICAgIGJvb2wgbWF0 Y2hlcyhjb25zdCBDU1NTZWxlY3RvciosIEVsZW1lbnQqLCBib29sIGlzRmFzdENoZWNrYWJsZVNl bGVjdG9yID0gZmFsc2UpIGNvbnN0OworICAgIGJvb2wgbWF0Y2hlcyhjb25zdCBDU1NTZWxlY3Rv ciosIEVsZW1lbnQqKSBjb25zdDsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBTaWJsaW5nVHJhdmVy c2FsU3RyYXRlZ3k+CiAgICAgTWF0Y2ggbWF0Y2goY29uc3QgU2VsZWN0b3JDaGVja2luZ0NvbnRl eHQmLCBQc2V1ZG9JZCYsIGNvbnN0IFNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneSYpIGNvbnN0Owog ICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneT4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAppbmRleCBlYTQyOWNkNTc3ODk3MzRlZTlhZWFjNjg3MTNk ZDBhMDMxZDkwN2YxLi5hOWI4Mzk3OWI2MGRjMDg3ZmMwNWM3MGI0NjFlMzBiOWViN2NjMjBkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCkBAIC00OSwxNCArNDksMjYgQEAgdm9p ZCBTZWxlY3RvckRhdGFMaXN0Ojppbml0aWFsaXplKGNvbnN0IENTU1NlbGVjdG9yTGlzdCYgc2Vs ZWN0b3JMaXN0KQogICAgICAgICBtX3NlbGVjdG9ycy51bmNoZWNrZWRBcHBlbmQoU2VsZWN0b3JE YXRhKHNlbGVjdG9yLCBTZWxlY3RvckNoZWNrZXJGYXN0UGF0aDo6Y2FuVXNlKHNlbGVjdG9yKSkp OwogfQogCitpbmxpbmUgYm9vbCBTZWxlY3RvckRhdGFMaXN0OjpzZWxlY3Rvck1hdGNoZXMoY29u c3QgU2VsZWN0b3JEYXRhJiBzZWxlY3RvckRhdGEsIEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0Cit7 CisgICAgaWYgKHNlbGVjdG9yRGF0YS5pc0Zhc3RDaGVja2FibGUgJiYgIWVsZW1lbnQtPmlzU1ZH RWxlbWVudCgpKSB7CisgICAgICAgIFNlbGVjdG9yQ2hlY2tlckZhc3RQYXRoIHNlbGVjdG9yQ2hl Y2tlckZhc3RQYXRoKHNlbGVjdG9yRGF0YS5zZWxlY3RvciwgZWxlbWVudCk7CisgICAgICAgIGlm ICghc2VsZWN0b3JDaGVja2VyRmFzdFBhdGgubWF0Y2hlc1JpZ2h0bW9zdFNlbGVjdG9yKFNlbGVj dG9yQ2hlY2tlcjo6VmlzaXRlZE1hdGNoRGlzYWJsZWQpKQorICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgICAgICByZXR1cm4gc2VsZWN0b3JDaGVja2VyRmFzdFBhdGgubWF0Y2hlcygpOwor ICAgIH0KKworICAgIFNlbGVjdG9yQ2hlY2tlciBzZWxlY3RvckNoZWNrZXIoZWxlbWVudC0+ZG9j dW1lbnQoKSwgU2VsZWN0b3JDaGVja2VyOjpSZXNvbHZpbmdTdHlsZSk7CisgICAgcmV0dXJuIHNl bGVjdG9yQ2hlY2tlci5tYXRjaGVzKHNlbGVjdG9yRGF0YS5zZWxlY3RvciwgZWxlbWVudCk7Cit9 CisKIGJvb2wgU2VsZWN0b3JEYXRhTGlzdDo6bWF0Y2hlcyhFbGVtZW50KiB0YXJnZXRFbGVtZW50 KSBjb25zdAogewogICAgIEFTU0VSVCh0YXJnZXRFbGVtZW50KTsKIAotICAgIFNlbGVjdG9yQ2hl Y2tlciBzZWxlY3RvckNoZWNrZXIodGFyZ2V0RWxlbWVudC0+ZG9jdW1lbnQoKSwgU2VsZWN0b3JD aGVja2VyOjpSZXNvbHZpbmdTdHlsZSk7CiAgICAgdW5zaWduZWQgc2VsZWN0b3JDb3VudCA9IG1f c2VsZWN0b3JzLnNpemUoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2VsZWN0b3JD b3VudDsgKytpKSB7Ci0gICAgICAgIGlmIChzZWxlY3RvckNoZWNrZXIubWF0Y2hlcyhtX3NlbGVj dG9yc1tpXS5zZWxlY3RvciwgdGFyZ2V0RWxlbWVudCwgbV9zZWxlY3RvcnNbaV0uaXNGYXN0Q2hl Y2thYmxlKSkKKyAgICAgICAgaWYgKHNlbGVjdG9yTWF0Y2hlcyhtX3NlbGVjdG9yc1tpXSwgdGFy Z2V0RWxlbWVudCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTEwNywx NSArMTE5LDEzIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1RyZWVTY29wZVJvb3QoTm9kZSogbm9k ZSkKIHRlbXBsYXRlIDxib29sIGZpcnN0TWF0Y2hPbmx5Pgogdm9pZCBTZWxlY3RvckRhdGFMaXN0 OjpleGVjdXRlKE5vZGUqIHJvb3ROb2RlLCBWZWN0b3I8UmVmUHRyPE5vZGU+ID4mIG1hdGNoZWRF bGVtZW50cykgY29uc3QKIHsKLSAgICBTZWxlY3RvckNoZWNrZXIgc2VsZWN0b3JDaGVja2VyKHJv b3ROb2RlLT5kb2N1bWVudCgpLCBTZWxlY3RvckNoZWNrZXI6OlF1ZXJ5aW5nUnVsZXMpOwotCiAg ICAgaWYgKGNhblVzZUlkTG9va3VwKHJvb3ROb2RlKSkgewogICAgICAgICBBU1NFUlQobV9zZWxl Y3RvcnMuc2l6ZSgpID09IDEpOwogICAgICAgICBjb25zdCBDU1NTZWxlY3Rvciogc2VsZWN0b3Ig PSBtX3NlbGVjdG9yc1swXS5zZWxlY3RvcjsKICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IHJv b3ROb2RlLT50cmVlU2NvcGUoKS0+Z2V0RWxlbWVudEJ5SWQoc2VsZWN0b3ItPnZhbHVlKCkpOwog ICAgICAgICBpZiAoIWVsZW1lbnQgfHwgIShpc1RyZWVTY29wZVJvb3Qocm9vdE5vZGUpIHx8IGVs ZW1lbnQtPmlzRGVzY2VuZGFudE9mKHJvb3ROb2RlKSkpCiAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIGlmIChzZWxlY3RvckNoZWNrZXIubWF0Y2hlcyhtX3NlbGVjdG9yc1swXS5zZWxlY3Rv ciwgZWxlbWVudCwgbV9zZWxlY3RvcnNbMF0uaXNGYXN0Q2hlY2thYmxlKSkKKyAgICAgICAgaWYg KHNlbGVjdG9yTWF0Y2hlcyhtX3NlbGVjdG9yc1swXSwgZWxlbWVudCkpCiAgICAgICAgICAgICBt YXRjaGVkRWxlbWVudHMuYXBwZW5kKGVsZW1lbnQpOwogICAgICAgICByZXR1cm47CiAgICAgfQpA QCAtMTI3LDcgKzEzNyw3IEBAIHZvaWQgU2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0ZShOb2RlKiBy b290Tm9kZSwgVmVjdG9yPFJlZlB0cjxOb2RlPiA+JiBtYXRjaGVkRWxlCiAgICAgICAgIGlmIChu LT5pc0VsZW1lbnROb2RlKCkpIHsKICAgICAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0 aWNfY2FzdDxFbGVtZW50Kj4obik7CiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgc2VsZWN0b3JDb3VudDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKHNlbGVjdG9yQ2hl Y2tlci5tYXRjaGVzKG1fc2VsZWN0b3JzW2ldLnNlbGVjdG9yLCBlbGVtZW50LCBtX3NlbGVjdG9y c1tpXS5pc0Zhc3RDaGVja2FibGUpKSB7CisgICAgICAgICAgICAgICAgaWYgKHNlbGVjdG9yTWF0 Y2hlcyhtX3NlbGVjdG9yc1tpXSwgZWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICAgICAgbWF0 Y2hlZEVsZW1lbnRzLmFwcGVuZChlbGVtZW50KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGZp cnN0TWF0Y2hPbmx5KQogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9TZWxlY3RvclF1ZXJ5LmgKaW5kZXggYThmZDg3YTI0MDk5MjlkMGFjM2Q3ZjZkMjkxMTc3NGQ2 MjA5OGI0OC4uNGI5MjM5NGFjOTAyMWExNmQ5MTY3OTQ1NzIwYmI1N2I3MzVmODg5ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vU2VsZWN0b3JRdWVyeS5oCkBAIC01NSw2ICs1NSw3IEBAIHByaXZhdGU6CiAgICAg ICAgIGJvb2wgaXNGYXN0Q2hlY2thYmxlOwogICAgIH07CiAKKyAgICBib29sIHNlbGVjdG9yTWF0 Y2hlcyhjb25zdCBTZWxlY3RvckRhdGEmLCBFbGVtZW50KikgY29uc3Q7CiAgICAgYm9vbCBjYW5V c2VJZExvb2t1cChOb2RlKiByb290Tm9kZSkgY29uc3Q7CiAgICAgdGVtcGxhdGUgPGJvb2wgZmly c3RNYXRjaE9ubHk+CiAgICAgdm9pZCBleGVjdXRlKE5vZGUqIHJvb3ROb2RlLCBWZWN0b3I8UmVm UHRyPE5vZGU+ID4mKSBjb25zdDsK 189931 2013-02-23 10:14:46 -0800 2013-02-23 20:54:56 -0800 Patch for landing bug-110663-20130223101104.patch text/plain 8679 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M1YmNlYmRkNzJmNzAy YmZkYzljZDUzZjYyYWIxNjU2ZGUzNjI1OC4uMzFhZWE0NTE4NTBhMGMzNTIxN2JlZjE2NTljNjY5 N2UzYzk0MGYyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTIyICBEaW1p dHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2VsZWN0b3JD aGVja2VyIHNob3VsZCBub3Qga25vdyBhYm91dCBTZWxlY3RvckNoZWNrZXJGYXN0UGF0aC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDY2MworCisg ICAgICAgIEJvdGggU2VsZWN0b3JDaGVja2VyIGFuZCBpdCdzIHNwZWVkeSBjb3VzaW4gdW5mb3J0 dW5hdGVseSBpbmNsdWRlIGVhY2ggb3RoZXIuCisgICAgICAgIEx1Y2tpbHksIHRoZSBwYXJ0aWN1 bGFyIHdheSBpbiB3aGljaCBTZWxlY3RvclF1ZXJ5IHVzZXMgU2VsZWN0b3JDaGVja2VyIHlpZWxk cworICAgICAgICB0byBhIGZhaXJseSBzaW1wbGUgZGVjb3VwbGluZy4gTm93IG9ubHkgdGhlIGNv dXNpbiBrbm93cyBvZiBTZWxlY3RvckNoZWNrZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50 dGkgS29pdmlzdG8uCisKKyAgICAgICAgTm8gbmV3IGZ1bmN0aW9uYWxpdHksIGNvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6bWF0Y2hlcyk6IFJlbW92ZWQuCisgICAg ICAgICogY3NzL1NlbGVjdG9yQ2hlY2tlci5oOgorICAgICAgICAoU2VsZWN0b3JDaGVja2VyKTog VXBkYXRlZCB0aGUgZGVjbHMgdG8gcmVtb3ZlIGZhc3QtcGF0aCBmbGFnLgorICAgICAgICAqIGRv bS9TZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yRGF0YUxpc3Q6 OnNlbGVjdG9yTWF0Y2hlcyk6IEFkZGVkIGEgaGVscGVyIGp1c3QgZm9yIFNlbGVjdG9yUXVlcnku CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckRhdGFMaXN0OjptYXRjaGVzKTogQ2hhbmdlZCB0 aGUgY2FsbHNpdGUgdG8gdXNlIG5ldyBoZWxwZXIuCisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rv ckRhdGFMaXN0OjpleGVjdXRlKTogRGl0dG8uCisgICAgICAgICogZG9tL1NlbGVjdG9yUXVlcnku aDoKKyAgICAgICAgKFNlbGVjdG9yRGF0YUxpc3QpOiBVcGRhdGVkIGRlY2xzLgorCiAyMDEzLTAy LTIzICBLb25kYXBhbGx5IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4KIAog ICAgICAgICBbRUZMXVtXZWJHTF0gUmVmYWN0b3IgR0xQbGF0Zm9ybVN1cmZhY2UuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCmluZGV4IDM0NDk4M2FiNTQwNWUzOTNkMTAyMmY2 ZTVhNThlNTYwMzlhMzZjODMuLjUyY2I0YzNjY2U2YTQzYzExYjVhNWI1ODNkMTNkZjgyNjRkN2Rl M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCkBAIC01MCw3ICs1MCw2 IEBACiAjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJTY3JvbGxhYmxlQXJlYS5o IgogI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1lLmgiCi0jaW5jbHVkZSAiU2VsZWN0b3JDaGVja2Vy RmFzdFBhdGguaCIKICNpbmNsdWRlICJTaGFkb3dSb290LmgiCiAjaW5jbHVkZSAiU2libGluZ1Ry YXZlcnNhbFN0cmF0ZWdpZXMuaCIKICNpbmNsdWRlICJTdHlsZWRFbGVtZW50LmgiCkBAIC03MSwx OSArNzAsNiBAQCBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yQ2hlY2tlcihEb2N1bWVudCogZG9j dW1lbnQsIE1vZGUgbW9kZSkKIHsKIH0KIAotYm9vbCBTZWxlY3RvckNoZWNrZXI6Om1hdGNoZXMo Y29uc3QgQ1NTU2VsZWN0b3IqIHNlbGVjdG9yLCBFbGVtZW50KiBlbGVtZW50LCBib29sIGlzRmFz dENoZWNrYWJsZVNlbGVjdG9yKSBjb25zdAotewotICAgIGlmIChpc0Zhc3RDaGVja2FibGVTZWxl Y3RvciAmJiAhZWxlbWVudC0+aXNTVkdFbGVtZW50KCkpIHsKLSAgICAgICAgU2VsZWN0b3JDaGVj a2VyRmFzdFBhdGggc2VsZWN0b3JDaGVja2VyRmFzdFBhdGgoc2VsZWN0b3IsIGVsZW1lbnQpOwot ICAgICAgICBpZiAoIXNlbGVjdG9yQ2hlY2tlckZhc3RQYXRoLm1hdGNoZXNSaWdodG1vc3RTZWxl Y3RvcihWaXNpdGVkTWF0Y2hEaXNhYmxlZCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgICAgIHJldHVybiBzZWxlY3RvckNoZWNrZXJGYXN0UGF0aC5tYXRjaGVzKCk7Ci0gICAgfQot Ci0gICAgUHNldWRvSWQgaWdub3JlRHluYW1pY1BzZXVkbyA9IE5PUFNFVURPOwotICAgIHJldHVy biBtYXRjaChTZWxlY3RvckNoZWNraW5nQ29udGV4dChzZWxlY3RvciwgZWxlbWVudCwgU2VsZWN0 b3JDaGVja2VyOjpWaXNpdGVkTWF0Y2hEaXNhYmxlZCksIGlnbm9yZUR5bmFtaWNQc2V1ZG8sIERP TVNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneSgpKSA9PSBTZWxlY3Rvck1hdGNoZXM7Ci19Ci0KIC8v IFJlY3Vyc2l2ZSBjaGVjayBvZiBzZWxlY3RvcnMgYW5kIGNvbWJpbmF0b3JzCiAvLyBJdCBjYW4g cmV0dXJuIDQgZGlmZmVyZW50IHZhbHVlczoKIC8vICogU2VsZWN0b3JNYXRjaGVzICAgICAgICAg IC0gdGhlIHNlbGVjdG9yIG1hdGNoZXMgdGhlIGVsZW1lbnQgZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVj dG9yQ2hlY2tlci5oCmluZGV4IDAzNTVjZGU1ZGE0NzFmM2Q4MGVmMjMwNWUwMTlhNmMwZDc1MjFm MWIuLjhjNzU0NzAzZTFjYWI1ODVmMWNkNGY0Y2VlMjNmZTcxZDkyMDhjY2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvU2VsZWN0b3JDaGVja2VyLmgKQEAgLTc3LDcgKzc3LDYgQEAgcHVibGljOgogICAgICAg ICBCZWhhdmlvckF0Qm91bmRhcnkgYmVoYXZpb3JBdEJvdW5kYXJ5OwogICAgIH07CiAKLSAgICBi b29sIG1hdGNoZXMoY29uc3QgQ1NTU2VsZWN0b3IqLCBFbGVtZW50KiwgYm9vbCBpc0Zhc3RDaGVj a2FibGVTZWxlY3RvciA9IGZhbHNlKSBjb25zdDsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBTaWJs aW5nVHJhdmVyc2FsU3RyYXRlZ3k+CiAgICAgTWF0Y2ggbWF0Y2goY29uc3QgU2VsZWN0b3JDaGVj a2luZ0NvbnRleHQmLCBQc2V1ZG9JZCYsIGNvbnN0IFNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneSYp IGNvbnN0OwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneT4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCBiZDg1YmY2YmVkNTJjYWQyNDI5 NDM4Y2M3OGM1ZTQzMTg2NmI4ZGIzLi4xNDA2NTQ4MGYwOWFjMGIyYmEyNDQ1ZjdmYjE3MTFjNTAz NjU2MTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0yMTEzLDkgKzIx MTMsMTIgQEAgYm9vbCBTdHlsZVJlc29sdmVyOjpjaGVja1JlZ2lvblNlbGVjdG9yKGNvbnN0IENT U1NlbGVjdG9yKiByZWdpb25TZWxlY3RvciwgRWxlbWUKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgU2VsZWN0b3JDaGVja2VyIHNlbGVjdG9yQ2hlY2tlcihkb2N1bWVudCgpLCBTZWxlY3Rv ckNoZWNrZXI6OlF1ZXJ5aW5nUnVsZXMpOwotICAgIGZvciAoY29uc3QgQ1NTU2VsZWN0b3IqIHMg PSByZWdpb25TZWxlY3RvcjsgczsgcyA9IENTU1NlbGVjdG9yTGlzdDo6bmV4dChzKSkKLSAgICAg ICAgaWYgKHNlbGVjdG9yQ2hlY2tlci5tYXRjaGVzKHMsIHJlZ2lvbkVsZW1lbnQpKQorICAgIGZv ciAoY29uc3QgQ1NTU2VsZWN0b3IqIHMgPSByZWdpb25TZWxlY3RvcjsgczsgcyA9IENTU1NlbGVj dG9yTGlzdDo6bmV4dChzKSkgeworICAgICAgICBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yQ2hl Y2tpbmdDb250ZXh0IHNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0KHJlZ2lvblNlbGVjdG9yLCByZWdp b25FbGVtZW50LCBTZWxlY3RvckNoZWNrZXI6OlZpc2l0ZWRNYXRjaERpc2FibGVkKTsKKyAgICAg ICAgUHNldWRvSWQgaWdub3JlRHluYW1pY1BzZXVkbyA9IE5PUFNFVURPOworICAgICAgICBpZiAo c2VsZWN0b3JDaGVja2VyLm1hdGNoKHNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0LCBpZ25vcmVEeW5h bWljUHNldWRvLCBET01TaWJsaW5nVHJhdmVyc2FsU3RyYXRlZ3koKSkgPT0gU2VsZWN0b3JDaGVj a2VyOjpTZWxlY3Rvck1hdGNoZXMpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CiAK ICAgICByZXR1cm4gZmFsc2U7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2Vs ZWN0b3JRdWVyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKaW5k ZXggZWE0MjljZDU3Nzg5NzM0ZWU5YWVhYzY4NzEzZGQwYTAzMWQ5MDdmMS4uMmQ5MGY4ZDZmODY4 ZGIxNzgxN2RiMDkyOGZhMjlhNjhlNzBmNGJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL1NlbGVjdG9yUXVlcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1 ZXJ5LmNwcApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVk ZSAiU2VsZWN0b3JDaGVja2VyLmgiCiAjaW5jbHVkZSAiU2VsZWN0b3JDaGVja2VyRmFzdFBhdGgu aCIKKyNpbmNsdWRlICJTaWJsaW5nVHJhdmVyc2FsU3RyYXRlZ2llcy5oIgogI2luY2x1ZGUgIlN0 YXRpY05vZGVMaXN0LmgiCiAjaW5jbHVkZSAiU3R5bGVkRWxlbWVudC5oIgogCkBAIC00OSwxNCAr NTAsMjggQEAgdm9pZCBTZWxlY3RvckRhdGFMaXN0Ojppbml0aWFsaXplKGNvbnN0IENTU1NlbGVj dG9yTGlzdCYgc2VsZWN0b3JMaXN0KQogICAgICAgICBtX3NlbGVjdG9ycy51bmNoZWNrZWRBcHBl bmQoU2VsZWN0b3JEYXRhKHNlbGVjdG9yLCBTZWxlY3RvckNoZWNrZXJGYXN0UGF0aDo6Y2FuVXNl KHNlbGVjdG9yKSkpOwogfQogCitpbmxpbmUgYm9vbCBTZWxlY3RvckRhdGFMaXN0OjpzZWxlY3Rv ck1hdGNoZXMoY29uc3QgU2VsZWN0b3JEYXRhJiBzZWxlY3RvckRhdGEsIEVsZW1lbnQqIGVsZW1l bnQpIGNvbnN0Cit7CisgICAgaWYgKHNlbGVjdG9yRGF0YS5pc0Zhc3RDaGVja2FibGUgJiYgIWVs ZW1lbnQtPmlzU1ZHRWxlbWVudCgpKSB7CisgICAgICAgIFNlbGVjdG9yQ2hlY2tlckZhc3RQYXRo IHNlbGVjdG9yQ2hlY2tlckZhc3RQYXRoKHNlbGVjdG9yRGF0YS5zZWxlY3RvciwgZWxlbWVudCk7 CisgICAgICAgIGlmICghc2VsZWN0b3JDaGVja2VyRmFzdFBhdGgubWF0Y2hlc1JpZ2h0bW9zdFNl bGVjdG9yKFNlbGVjdG9yQ2hlY2tlcjo6VmlzaXRlZE1hdGNoRGlzYWJsZWQpKQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gc2VsZWN0b3JDaGVja2VyRmFzdFBhdGgu bWF0Y2hlcygpOworICAgIH0KKworICAgIFNlbGVjdG9yQ2hlY2tlciBzZWxlY3RvckNoZWNrZXIo ZWxlbWVudC0+ZG9jdW1lbnQoKSwgU2VsZWN0b3JDaGVja2VyOjpSZXNvbHZpbmdTdHlsZSk7Cisg ICAgU2VsZWN0b3JDaGVja2VyOjpTZWxlY3RvckNoZWNraW5nQ29udGV4dCBzZWxlY3RvckNoZWNr aW5nQ29udGV4dChzZWxlY3RvckRhdGEuc2VsZWN0b3IsIGVsZW1lbnQsIFNlbGVjdG9yQ2hlY2tl cjo6VmlzaXRlZE1hdGNoRGlzYWJsZWQpOworICAgIFBzZXVkb0lkIGlnbm9yZUR5bmFtaWNQc2V1 ZG8gPSBOT1BTRVVETzsKKyAgICByZXR1cm4gc2VsZWN0b3JDaGVja2VyLm1hdGNoKHNlbGVjdG9y Q2hlY2tpbmdDb250ZXh0LCBpZ25vcmVEeW5hbWljUHNldWRvLCBET01TaWJsaW5nVHJhdmVyc2Fs U3RyYXRlZ3koKSkgPT0gU2VsZWN0b3JDaGVja2VyOjpTZWxlY3Rvck1hdGNoZXM7Cit9CisKIGJv b2wgU2VsZWN0b3JEYXRhTGlzdDo6bWF0Y2hlcyhFbGVtZW50KiB0YXJnZXRFbGVtZW50KSBjb25z dAogewogICAgIEFTU0VSVCh0YXJnZXRFbGVtZW50KTsKIAotICAgIFNlbGVjdG9yQ2hlY2tlciBz ZWxlY3RvckNoZWNrZXIodGFyZ2V0RWxlbWVudC0+ZG9jdW1lbnQoKSwgU2VsZWN0b3JDaGVja2Vy OjpSZXNvbHZpbmdTdHlsZSk7CiAgICAgdW5zaWduZWQgc2VsZWN0b3JDb3VudCA9IG1fc2VsZWN0 b3JzLnNpemUoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2VsZWN0b3JDb3VudDsg KytpKSB7Ci0gICAgICAgIGlmIChzZWxlY3RvckNoZWNrZXIubWF0Y2hlcyhtX3NlbGVjdG9yc1tp XS5zZWxlY3RvciwgdGFyZ2V0RWxlbWVudCwgbV9zZWxlY3RvcnNbaV0uaXNGYXN0Q2hlY2thYmxl KSkKKyAgICAgICAgaWYgKHNlbGVjdG9yTWF0Y2hlcyhtX3NlbGVjdG9yc1tpXSwgdGFyZ2V0RWxl bWVudCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTEwNywxNSArMTIy LDEzIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1RyZWVTY29wZVJvb3QoTm9kZSogbm9kZSkKIHRl bXBsYXRlIDxib29sIGZpcnN0TWF0Y2hPbmx5Pgogdm9pZCBTZWxlY3RvckRhdGFMaXN0OjpleGVj dXRlKE5vZGUqIHJvb3ROb2RlLCBWZWN0b3I8UmVmUHRyPE5vZGU+ID4mIG1hdGNoZWRFbGVtZW50 cykgY29uc3QKIHsKLSAgICBTZWxlY3RvckNoZWNrZXIgc2VsZWN0b3JDaGVja2VyKHJvb3ROb2Rl LT5kb2N1bWVudCgpLCBTZWxlY3RvckNoZWNrZXI6OlF1ZXJ5aW5nUnVsZXMpOwotCiAgICAgaWYg KGNhblVzZUlkTG9va3VwKHJvb3ROb2RlKSkgewogICAgICAgICBBU1NFUlQobV9zZWxlY3RvcnMu c2l6ZSgpID09IDEpOwogICAgICAgICBjb25zdCBDU1NTZWxlY3Rvciogc2VsZWN0b3IgPSBtX3Nl bGVjdG9yc1swXS5zZWxlY3RvcjsKICAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IHJvb3ROb2Rl LT50cmVlU2NvcGUoKS0+Z2V0RWxlbWVudEJ5SWQoc2VsZWN0b3ItPnZhbHVlKCkpOwogICAgICAg ICBpZiAoIWVsZW1lbnQgfHwgIShpc1RyZWVTY29wZVJvb3Qocm9vdE5vZGUpIHx8IGVsZW1lbnQt PmlzRGVzY2VuZGFudE9mKHJvb3ROb2RlKSkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IGlmIChzZWxlY3RvckNoZWNrZXIubWF0Y2hlcyhtX3NlbGVjdG9yc1swXS5zZWxlY3RvciwgZWxl bWVudCwgbV9zZWxlY3RvcnNbMF0uaXNGYXN0Q2hlY2thYmxlKSkKKyAgICAgICAgaWYgKHNlbGVj dG9yTWF0Y2hlcyhtX3NlbGVjdG9yc1swXSwgZWxlbWVudCkpCiAgICAgICAgICAgICBtYXRjaGVk RWxlbWVudHMuYXBwZW5kKGVsZW1lbnQpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTI3 LDcgKzE0MCw3IEBAIHZvaWQgU2VsZWN0b3JEYXRhTGlzdDo6ZXhlY3V0ZShOb2RlKiByb290Tm9k ZSwgVmVjdG9yPFJlZlB0cjxOb2RlPiA+JiBtYXRjaGVkRWxlCiAgICAgICAgIGlmIChuLT5pc0Vs ZW1lbnROb2RlKCkpIHsKICAgICAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2Fz dDxFbGVtZW50Kj4obik7CiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2Vs ZWN0b3JDb3VudDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKHNlbGVjdG9yQ2hlY2tlci5t YXRjaGVzKG1fc2VsZWN0b3JzW2ldLnNlbGVjdG9yLCBlbGVtZW50LCBtX3NlbGVjdG9yc1tpXS5p c0Zhc3RDaGVja2FibGUpKSB7CisgICAgICAgICAgICAgICAgaWYgKHNlbGVjdG9yTWF0Y2hlcyht X3NlbGVjdG9yc1tpXSwgZWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICAgICAgbWF0Y2hlZEVs ZW1lbnRzLmFwcGVuZChlbGVtZW50KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGZpcnN0TWF0 Y2hPbmx5KQogICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxl Y3RvclF1ZXJ5LmgKaW5kZXggYThmZDg3YTI0MDk5MjlkMGFjM2Q3ZjZkMjkxMTc3NGQ2MjA5OGI0 OC4uNGI5MjM5NGFjOTAyMWExNmQ5MTY3OTQ1NzIwYmI1N2I3MzVmODg5ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k b20vU2VsZWN0b3JRdWVyeS5oCkBAIC01NSw2ICs1NSw3IEBAIHByaXZhdGU6CiAgICAgICAgIGJv b2wgaXNGYXN0Q2hlY2thYmxlOwogICAgIH07CiAKKyAgICBib29sIHNlbGVjdG9yTWF0Y2hlcyhj b25zdCBTZWxlY3RvckRhdGEmLCBFbGVtZW50KikgY29uc3Q7CiAgICAgYm9vbCBjYW5Vc2VJZExv b2t1cChOb2RlKiByb290Tm9kZSkgY29uc3Q7CiAgICAgdGVtcGxhdGUgPGJvb2wgZmlyc3RNYXRj aE9ubHk+CiAgICAgdm9pZCBleGVjdXRlKE5vZGUqIHJvb3ROb2RlLCBWZWN0b3I8UmVmUHRyPE5v ZGU+ID4mKSBjb25zdDsK 189955 2013-02-23 20:54:59 -0800 2013-02-23 22:20:29 -0800 Patch for landing bug-110663-20130223205116.patch text/plain 8651 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmEzMTVlZWJjNjJiYzNh YjJmNDNjM2NmZjQ4YTYxM2I3NDRkMzRiYS4uMjJiZWRjOWE3ZjgzMDkyNzA1NzdhY2I3NjM0NDlk MWJiYjc4ZDQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAyLTIyICBEaW1p dHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2VsZWN0b3JD aGVja2VyIHNob3VsZCBub3Qga25vdyBhYm91dCBTZWxlY3RvckNoZWNrZXJGYXN0UGF0aC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDY2MworCisg ICAgICAgIEJvdGggU2VsZWN0b3JDaGVja2VyIGFuZCBpdCdzIHNwZWVkeSBjb3VzaW4gdW5mb3J0 dW5hdGVseSBpbmNsdWRlIGVhY2ggb3RoZXIuCisgICAgICAgIEx1Y2tpbHksIHRoZSBwYXJ0aWN1 bGFyIHdheSBpbiB3aGljaCBTZWxlY3RvclF1ZXJ5IHVzZXMgU2VsZWN0b3JDaGVja2VyIHlpZWxk cworICAgICAgICB0byBhIGZhaXJseSBzaW1wbGUgZGVjb3VwbGluZy4gTm93IG9ubHkgdGhlIGNv dXNpbiBrbm93cyBvZiBTZWxlY3RvckNoZWNrZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50 dGkgS29pdmlzdG8uCisKKyAgICAgICAgTm8gbmV3IGZ1bmN0aW9uYWxpdHksIGNvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6bWF0Y2hlcyk6IFJlbW92ZWQuCisgICAg ICAgICogY3NzL1NlbGVjdG9yQ2hlY2tlci5oOgorICAgICAgICAoU2VsZWN0b3JDaGVja2VyKTog VXBkYXRlZCB0aGUgZGVjbHMgdG8gcmVtb3ZlIGZhc3QtcGF0aCBmbGFnLgorICAgICAgICAqIGRv bS9TZWxlY3RvclF1ZXJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yRGF0YUxpc3Q6 OnNlbGVjdG9yTWF0Y2hlcyk6IEFkZGVkIGEgaGVscGVyIGp1c3QgZm9yIFNlbGVjdG9yUXVlcnku CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckRhdGFMaXN0OjptYXRjaGVzKTogQ2hhbmdlZCB0 aGUgY2FsbHNpdGUgdG8gdXNlIG5ldyBoZWxwZXIuCisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rv ckRhdGFMaXN0OjpleGVjdXRlKTogRGl0dG8uCisgICAgICAgICogZG9tL1NlbGVjdG9yUXVlcnku aDoKKyAgICAgICAgKFNlbGVjdG9yRGF0YUxpc3QpOiBVcGRhdGVkIGRlY2xzLgorCiAyMDEzLTAy LTIyICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhd IEdlbmVyYXRlIHh4eEF0dHJHZXR0ZXJDYWxsYmFjaygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3Rv ckNoZWNrZXIuY3BwCmluZGV4IGM0MWU2ZTBlNjRkMjNmNWI5ODczYzMzN2ZiNjZlYTkxY2I2MDI1 YTguLmVhZjAzZTMyNzNkMDE3ODlhNjAwOGU5OTEzMzZiMDIwNDE2ZGEwOGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCkBAIC01MCw3ICs1MCw2IEBACiAjaW5jbHVkZSAi UmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJTY3JvbGxhYmxlQXJlYS5oIgogI2luY2x1ZGUgIlNj cm9sbGJhclRoZW1lLmgiCi0jaW5jbHVkZSAiU2VsZWN0b3JDaGVja2VyRmFzdFBhdGguaCIKICNp bmNsdWRlICJTaGFkb3dSb290LmgiCiAjaW5jbHVkZSAiU2libGluZ1RyYXZlcnNhbFN0cmF0ZWdp ZXMuaCIKICNpbmNsdWRlICJTdHlsZWRFbGVtZW50LmgiCkBAIC03MSwxOSArNzAsNiBAQCBTZWxl Y3RvckNoZWNrZXI6OlNlbGVjdG9yQ2hlY2tlcihEb2N1bWVudCogZG9jdW1lbnQsIE1vZGUgbW9k ZSkKIHsKIH0KIAotYm9vbCBTZWxlY3RvckNoZWNrZXI6Om1hdGNoZXMoY29uc3QgQ1NTU2VsZWN0 b3IqIHNlbGVjdG9yLCBFbGVtZW50KiBlbGVtZW50LCBib29sIGlzRmFzdENoZWNrYWJsZVNlbGVj dG9yKSBjb25zdAotewotICAgIGlmIChpc0Zhc3RDaGVja2FibGVTZWxlY3RvciAmJiAhZWxlbWVu dC0+aXNTVkdFbGVtZW50KCkpIHsKLSAgICAgICAgU2VsZWN0b3JDaGVja2VyRmFzdFBhdGggc2Vs ZWN0b3JDaGVja2VyRmFzdFBhdGgoc2VsZWN0b3IsIGVsZW1lbnQpOwotICAgICAgICBpZiAoIXNl bGVjdG9yQ2hlY2tlckZhc3RQYXRoLm1hdGNoZXNSaWdodG1vc3RTZWxlY3RvcihWaXNpdGVkTWF0 Y2hEaXNhYmxlZCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIHJldHVybiBz ZWxlY3RvckNoZWNrZXJGYXN0UGF0aC5tYXRjaGVzKCk7Ci0gICAgfQotCi0gICAgUHNldWRvSWQg aWdub3JlRHluYW1pY1BzZXVkbyA9IE5PUFNFVURPOwotICAgIHJldHVybiBtYXRjaChTZWxlY3Rv ckNoZWNraW5nQ29udGV4dChzZWxlY3RvciwgZWxlbWVudCwgU2VsZWN0b3JDaGVja2VyOjpWaXNp dGVkTWF0Y2hEaXNhYmxlZCksIGlnbm9yZUR5bmFtaWNQc2V1ZG8sIERPTVNpYmxpbmdUcmF2ZXJz YWxTdHJhdGVneSgpKSA9PSBTZWxlY3Rvck1hdGNoZXM7Ci19Ci0KIC8vIFJlY3Vyc2l2ZSBjaGVj ayBvZiBzZWxlY3RvcnMgYW5kIGNvbWJpbmF0b3JzCiAvLyBJdCBjYW4gcmV0dXJuIDQgZGlmZmVy ZW50IHZhbHVlczoKIC8vICogU2VsZWN0b3JNYXRjaGVzICAgICAgICAgIC0gdGhlIHNlbGVjdG9y IG1hdGNoZXMgdGhlIGVsZW1lbnQgZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1Nl bGVjdG9yQ2hlY2tlci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5oCmlu ZGV4IGYxMTBjMDBlMGZlN2VlNDZjMmJiOTY0ZGFmMDZiYTkyZWEyNzUzYTkuLmVhNDRkZDkzMzI0 OTI4NjkwMWMyZmVhNDYzNzM2MGUzNDhiOWYxYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TZWxlY3RvckNoZWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JD aGVja2VyLmgKQEAgLTgyLDcgKzgyLDYgQEAgcHVibGljOgogICAgICAgICBCZWhhdmlvckF0Qm91 bmRhcnkgYmVoYXZpb3JBdEJvdW5kYXJ5OwogICAgIH07CiAKLSAgICBib29sIG1hdGNoZXMoY29u c3QgQ1NTU2VsZWN0b3IqLCBFbGVtZW50KiwgYm9vbCBpc0Zhc3RDaGVja2FibGVTZWxlY3RvciA9 IGZhbHNlKSBjb25zdDsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBTaWJsaW5nVHJhdmVyc2FsU3Ry YXRlZ3k+CiAgICAgTWF0Y2ggbWF0Y2goY29uc3QgU2VsZWN0b3JDaGVja2luZ0NvbnRleHQmLCBQ c2V1ZG9JZCYsIGNvbnN0IFNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneSYpIGNvbnN0OwogICAgIHRl bXBsYXRlPHR5cGVuYW1lIFNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneT4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZVJlc29sdmVyLmNwcAppbmRleCBhOTUxOTFjZjI0ZGM3YThmMzZjMGMxYmFiNGJhOGFlMGM4 YTZjZTc4Li4xZTg1MzkwOTY4YjUzOWZiNjVmMWMyZDBlM2ExNGI2Y2U3NWY1MDgxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0yMTE1LDkgKzIxMTUsMTIgQEAgYm9vbCBT dHlsZVJlc29sdmVyOjpjaGVja1JlZ2lvblNlbGVjdG9yKGNvbnN0IENTU1NlbGVjdG9yKiByZWdp b25TZWxlY3RvciwgRWxlbWUKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgU2VsZWN0b3JD aGVja2VyIHNlbGVjdG9yQ2hlY2tlcihkb2N1bWVudCgpLCBTZWxlY3RvckNoZWNrZXI6OlF1ZXJ5 aW5nUnVsZXMpOwotICAgIGZvciAoY29uc3QgQ1NTU2VsZWN0b3IqIHMgPSByZWdpb25TZWxlY3Rv cjsgczsgcyA9IENTU1NlbGVjdG9yTGlzdDo6bmV4dChzKSkKLSAgICAgICAgaWYgKHNlbGVjdG9y Q2hlY2tlci5tYXRjaGVzKHMsIHJlZ2lvbkVsZW1lbnQpKQorICAgIGZvciAoY29uc3QgQ1NTU2Vs ZWN0b3IqIHMgPSByZWdpb25TZWxlY3RvcjsgczsgcyA9IENTU1NlbGVjdG9yTGlzdDo6bmV4dChz KSkgeworICAgICAgICBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0IHNl bGVjdG9yQ2hlY2tpbmdDb250ZXh0KHMsIHJlZ2lvbkVsZW1lbnQsIFNlbGVjdG9yQ2hlY2tlcjo6 VmlzaXRlZE1hdGNoRGlzYWJsZWQpOworICAgICAgICBQc2V1ZG9JZCBpZ25vcmVEeW5hbWljUHNl dWRvID0gTk9QU0VVRE87CisgICAgICAgIGlmIChzZWxlY3RvckNoZWNrZXIubWF0Y2goc2VsZWN0 b3JDaGVja2luZ0NvbnRleHQsIGlnbm9yZUR5bmFtaWNQc2V1ZG8sIERPTVNpYmxpbmdUcmF2ZXJz YWxTdHJhdGVneSgpKSA9PSBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yTWF0Y2hlcykKICAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgIH0KIAogICAgIHJldHVybiBmYWxzZTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmNwcAppbmRleCBlYTQyOWNkNTc3ODk3MzRlZTlhZWFjNjg3 MTNkZDBhMDMxZDkwN2YxLi4yZDkwZjhkNmY4NjhkYjE3ODE3ZGIwOTI4ZmEyOWE2OGU3MGY0YmM3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVyeS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAj aW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJTZWxlY3RvckNoZWNrZXIuaCIKICNpbmNs dWRlICJTZWxlY3RvckNoZWNrZXJGYXN0UGF0aC5oIgorI2luY2x1ZGUgIlNpYmxpbmdUcmF2ZXJz YWxTdHJhdGVnaWVzLmgiCiAjaW5jbHVkZSAiU3RhdGljTm9kZUxpc3QuaCIKICNpbmNsdWRlICJT dHlsZWRFbGVtZW50LmgiCiAKQEAgLTQ5LDE0ICs1MCwyOCBAQCB2b2lkIFNlbGVjdG9yRGF0YUxp c3Q6OmluaXRpYWxpemUoY29uc3QgQ1NTU2VsZWN0b3JMaXN0JiBzZWxlY3Rvckxpc3QpCiAgICAg ICAgIG1fc2VsZWN0b3JzLnVuY2hlY2tlZEFwcGVuZChTZWxlY3RvckRhdGEoc2VsZWN0b3IsIFNl bGVjdG9yQ2hlY2tlckZhc3RQYXRoOjpjYW5Vc2Uoc2VsZWN0b3IpKSk7CiB9CiAKK2lubGluZSBi b29sIFNlbGVjdG9yRGF0YUxpc3Q6OnNlbGVjdG9yTWF0Y2hlcyhjb25zdCBTZWxlY3RvckRhdGEm IHNlbGVjdG9yRGF0YSwgRWxlbWVudCogZWxlbWVudCkgY29uc3QKK3sKKyAgICBpZiAoc2VsZWN0 b3JEYXRhLmlzRmFzdENoZWNrYWJsZSAmJiAhZWxlbWVudC0+aXNTVkdFbGVtZW50KCkpIHsKKyAg ICAgICAgU2VsZWN0b3JDaGVja2VyRmFzdFBhdGggc2VsZWN0b3JDaGVja2VyRmFzdFBhdGgoc2Vs ZWN0b3JEYXRhLnNlbGVjdG9yLCBlbGVtZW50KTsKKyAgICAgICAgaWYgKCFzZWxlY3RvckNoZWNr ZXJGYXN0UGF0aC5tYXRjaGVzUmlnaHRtb3N0U2VsZWN0b3IoU2VsZWN0b3JDaGVja2VyOjpWaXNp dGVkTWF0Y2hEaXNhYmxlZCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJl dHVybiBzZWxlY3RvckNoZWNrZXJGYXN0UGF0aC5tYXRjaGVzKCk7CisgICAgfQorCisgICAgU2Vs ZWN0b3JDaGVja2VyIHNlbGVjdG9yQ2hlY2tlcihlbGVtZW50LT5kb2N1bWVudCgpLCBTZWxlY3Rv ckNoZWNrZXI6OlJlc29sdmluZ1N0eWxlKTsKKyAgICBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9y Q2hlY2tpbmdDb250ZXh0IHNlbGVjdG9yQ2hlY2tpbmdDb250ZXh0KHNlbGVjdG9yRGF0YS5zZWxl Y3RvciwgZWxlbWVudCwgU2VsZWN0b3JDaGVja2VyOjpWaXNpdGVkTWF0Y2hEaXNhYmxlZCk7Cisg ICAgUHNldWRvSWQgaWdub3JlRHluYW1pY1BzZXVkbyA9IE5PUFNFVURPOworICAgIHJldHVybiBz ZWxlY3RvckNoZWNrZXIubWF0Y2goc2VsZWN0b3JDaGVja2luZ0NvbnRleHQsIGlnbm9yZUR5bmFt aWNQc2V1ZG8sIERPTVNpYmxpbmdUcmF2ZXJzYWxTdHJhdGVneSgpKSA9PSBTZWxlY3RvckNoZWNr ZXI6OlNlbGVjdG9yTWF0Y2hlczsKK30KKwogYm9vbCBTZWxlY3RvckRhdGFMaXN0OjptYXRjaGVz KEVsZW1lbnQqIHRhcmdldEVsZW1lbnQpIGNvbnN0CiB7CiAgICAgQVNTRVJUKHRhcmdldEVsZW1l bnQpOwogCi0gICAgU2VsZWN0b3JDaGVja2VyIHNlbGVjdG9yQ2hlY2tlcih0YXJnZXRFbGVtZW50 LT5kb2N1bWVudCgpLCBTZWxlY3RvckNoZWNrZXI6OlJlc29sdmluZ1N0eWxlKTsKICAgICB1bnNp Z25lZCBzZWxlY3RvckNvdW50ID0gbV9zZWxlY3RvcnMuc2l6ZSgpOwogICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBzZWxlY3RvckNvdW50OyArK2kpIHsKLSAgICAgICAgaWYgKHNlbGVjdG9y Q2hlY2tlci5tYXRjaGVzKG1fc2VsZWN0b3JzW2ldLnNlbGVjdG9yLCB0YXJnZXRFbGVtZW50LCBt X3NlbGVjdG9yc1tpXS5pc0Zhc3RDaGVja2FibGUpKQorICAgICAgICBpZiAoc2VsZWN0b3JNYXRj aGVzKG1fc2VsZWN0b3JzW2ldLCB0YXJnZXRFbGVtZW50KSkKICAgICAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIApAQCAtMTA3LDE1ICsxMjIsMTMgQEAgc3RhdGljIGlubGluZSBib29sIGlz VHJlZVNjb3BlUm9vdChOb2RlKiBub2RlKQogdGVtcGxhdGUgPGJvb2wgZmlyc3RNYXRjaE9ubHk+ CiB2b2lkIFNlbGVjdG9yRGF0YUxpc3Q6OmV4ZWN1dGUoTm9kZSogcm9vdE5vZGUsIFZlY3RvcjxS ZWZQdHI8Tm9kZT4gPiYgbWF0Y2hlZEVsZW1lbnRzKSBjb25zdAogewotICAgIFNlbGVjdG9yQ2hl Y2tlciBzZWxlY3RvckNoZWNrZXIocm9vdE5vZGUtPmRvY3VtZW50KCksIFNlbGVjdG9yQ2hlY2tl cjo6UXVlcnlpbmdSdWxlcyk7Ci0KICAgICBpZiAoY2FuVXNlSWRMb29rdXAocm9vdE5vZGUpKSB7 CiAgICAgICAgIEFTU0VSVChtX3NlbGVjdG9ycy5zaXplKCkgPT0gMSk7CiAgICAgICAgIGNvbnN0 IENTU1NlbGVjdG9yKiBzZWxlY3RvciA9IG1fc2VsZWN0b3JzWzBdLnNlbGVjdG9yOwogICAgICAg ICBFbGVtZW50KiBlbGVtZW50ID0gcm9vdE5vZGUtPnRyZWVTY29wZSgpLT5nZXRFbGVtZW50QnlJ ZChzZWxlY3Rvci0+dmFsdWUoKSk7CiAgICAgICAgIGlmICghZWxlbWVudCB8fCAhKGlzVHJlZVNj b3BlUm9vdChyb290Tm9kZSkgfHwgZWxlbWVudC0+aXNEZXNjZW5kYW50T2Yocm9vdE5vZGUpKSkK ICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgaWYgKHNlbGVjdG9yQ2hlY2tlci5tYXRjaGVz KG1fc2VsZWN0b3JzWzBdLnNlbGVjdG9yLCBlbGVtZW50LCBtX3NlbGVjdG9yc1swXS5pc0Zhc3RD aGVja2FibGUpKQorICAgICAgICBpZiAoc2VsZWN0b3JNYXRjaGVzKG1fc2VsZWN0b3JzWzBdLCBl bGVtZW50KSkKICAgICAgICAgICAgIG1hdGNoZWRFbGVtZW50cy5hcHBlbmQoZWxlbWVudCk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xMjcsNyArMTQwLDcgQEAgdm9pZCBTZWxlY3RvckRh dGFMaXN0OjpleGVjdXRlKE5vZGUqIHJvb3ROb2RlLCBWZWN0b3I8UmVmUHRyPE5vZGU+ID4mIG1h dGNoZWRFbGUKICAgICAgICAgaWYgKG4tPmlzRWxlbWVudE5vZGUoKSkgewogICAgICAgICAgICAg RWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihuKTsKICAgICAgICAgICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzZWxlY3RvckNvdW50OyArK2kpIHsKLSAgICAgICAg ICAgICAgICBpZiAoc2VsZWN0b3JDaGVja2VyLm1hdGNoZXMobV9zZWxlY3RvcnNbaV0uc2VsZWN0 b3IsIGVsZW1lbnQsIG1fc2VsZWN0b3JzW2ldLmlzRmFzdENoZWNrYWJsZSkpIHsKKyAgICAgICAg ICAgICAgICBpZiAoc2VsZWN0b3JNYXRjaGVzKG1fc2VsZWN0b3JzW2ldLCBlbGVtZW50KSkgewog ICAgICAgICAgICAgICAgICAgICBtYXRjaGVkRWxlbWVudHMuYXBwZW5kKGVsZW1lbnQpOwogICAg ICAgICAgICAgICAgICAgICBpZiAoZmlyc3RNYXRjaE9ubHkpCiAgICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JRdWVy eS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlbGVjdG9yUXVlcnkuaAppbmRleCBhOGZkODdhMjQw OTkyOWQwYWMzZDdmNmQyOTExNzc0ZDYyMDk4YjQ4Li40YjkyMzk0YWM5MDIxYTE2ZDkxNjc5NDU3 MjBiYjU3YjczNWY4ODlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VsZWN0b3JR dWVyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWxlY3RvclF1ZXJ5LmgKQEAgLTU1LDYg KzU1LDcgQEAgcHJpdmF0ZToKICAgICAgICAgYm9vbCBpc0Zhc3RDaGVja2FibGU7CiAgICAgfTsK IAorICAgIGJvb2wgc2VsZWN0b3JNYXRjaGVzKGNvbnN0IFNlbGVjdG9yRGF0YSYsIEVsZW1lbnQq KSBjb25zdDsKICAgICBib29sIGNhblVzZUlkTG9va3VwKE5vZGUqIHJvb3ROb2RlKSBjb25zdDsK ICAgICB0ZW1wbGF0ZSA8Ym9vbCBmaXJzdE1hdGNoT25seT4KICAgICB2b2lkIGV4ZWN1dGUoTm9k ZSogcm9vdE5vZGUsIFZlY3RvcjxSZWZQdHI8Tm9kZT4gPiYpIGNvbnN0Owo=