71308 2011-11-01 11:45:24 -0700 Switch PopupMenuClient to layout abstraction 2011-11-01 17:15:31 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae tkent webkit.review.bot oldest_to_newest 494050 0 eae 2011-11-01 11:45:24 -0700 Switch PopupMenuClient and rendering classes implementing it to layout type abstraction. 494065 1 113203 eae 2011-11-01 12:11:45 -0700 Created attachment 113203 Patch 494122 2 113203 darin 2011-11-01 14:01:33 -0700 Comment on attachment 113203 Patch Change log does not offer a rationale for the sites being changed back from LayoutUnit to int. 494123 3 eae 2011-11-01 14:03:02 -0700 Thanks, I'll make sure to update the ChangeLog to include a justification. 494218 4 113239 eae 2011-11-01 15:35:13 -0700 Created attachment 113239 Patch for landing 494329 5 113239 webkit.review.bot 2011-11-01 17:15:26 -0700 Comment on attachment 113239 Patch for landing Clearing flags on attachment: 113239 Committed r99016: <http://trac.webkit.org/changeset/99016> 494330 6 webkit.review.bot 2011-11-01 17:15:31 -0700 All reviewed patches have been landed. Closing bug. 113203 2011-11-01 12:11:45 -0700 2011-11-01 15:35:11 -0700 Patch bug-71308-20111101121144.patch text/plain 11483 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4OTg4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTEtMTEtMDEgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBQb3B1cE1lbnVDbGll bnQgdG8gbGF5b3V0IGFic3RyYWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MTMwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFN3aXRjaCBQb3B1cE1lbnVDbGllbnQgYW5kIHJlbmRlcmluZyBjbGFz c2VzIGltcGxlbWVudGluZyBpdCB0byBsYXlvdXQKKyAgICAgICAgdHlwZSBhYnN0cmFjdGlvbi4K KworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Qb3B1cE1lbnVD bGllbnQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMaXN0Qm94OjpsaXN0SW5kZXhBdE9mZnNldCk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMaXN0Qm94OjpwYW5TY3JvbGwpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGlzdEJveDo6c2Nyb2xsVG93YXJkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RC b3g6OnNjcm9sbFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6c2Nyb2xs UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6c2V0U2Nyb2xsT2Zm c2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnZlcnRpY2FsU2Nyb2xsYmFy V2lkdGgpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94Lmg6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1l bnVMaXN0OjpzaG93UG9wdXApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OmNs aWVudFBhZGRpbmdMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lbnVMaXN0OjpjbGll bnRQYWRkaW5nUmlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5oOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUZXh0Q29udHJvbDo6aGl0SW5uZXJUZXh0RWxlbWVudCk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNsaWVudFBhZGRpbmdMZWZ0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Y2xpZW50UGFkZGlu Z1JpZ2h0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5l Lmg6CisKIDIwMTEtMTEtMDEgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAg ICAgICAgRm91ciBtZWRpYSB0ZXN0cyBmYWlsaW5nIG9uIExpb24gZHVlIHRvIGluY29ycmVjdCBj YWNoZWQgdGltZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Qb3B1cE1lbnVDbGll bnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Qb3B1cE1lbnVDbGll bnQuaAkocmV2aXNpb24gOTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Qb3B1cE1l bnVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjIsNiArMjIsNyBAQAogI2lmbmRlZiBQb3B1 cE1lbnVDbGllbnRfaAogI2RlZmluZSBQb3B1cE1lbnVDbGllbnRfaAogCisjaW5jbHVkZSAiTGF5 b3V0VHlwZXMuaCIKICNpbmNsdWRlICJQb3B1cE1lbnVTdHlsZS5oIgogI2luY2x1ZGUgIlNjcm9s bFR5cGVzLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTUxLDggKzUyLDggQEAgcHVi bGljOgogICAgIHZpcnR1YWwgUG9wdXBNZW51U3R5bGUgbWVudVN0eWxlKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgaW50IGNsaWVudEluc2V0TGVmdCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFs IGludCBjbGllbnRJbnNldFJpZ2h0KCkgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgaW50IGNsaWVu dFBhZGRpbmdMZWZ0KCkgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgaW50IGNsaWVudFBhZGRpbmdS aWdodCgpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgY2xpZW50UGFkZGluZ0xl ZnQoKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IGNsaWVudFBhZGRpbmdSaWdo dCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGludCBsaXN0U2l6ZSgpIGNvbnN0ID0gMDsKICAg ICB2aXJ0dWFsIGludCBzZWxlY3RlZEluZGV4KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9p ZCBwb3B1cERpZEhpZGUoKSA9IDA7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGlzdEJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxpc3RCb3guY3BwCShyZXZpc2lvbiA5ODg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMaXN0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDY3LDcgKzQ2Nyw3IEBA IGludCBSZW5kZXJMaXN0Qm94OjpsaXN0SW5kZXhBdE9mZnNldChjb24KICAgICBpZiAob2Zmc2V0 LmhlaWdodCgpIDwgYm9yZGVyVG9wKCkgKyBwYWRkaW5nVG9wKCkgfHwgb2Zmc2V0LmhlaWdodCgp ID4gaGVpZ2h0KCkgLSBwYWRkaW5nQm90dG9tKCkgLSBib3JkZXJCb3R0b20oKSkKICAgICAgICAg cmV0dXJuIC0xOwogCi0gICAgTGF5b3V0VW5pdCBzY3JvbGxiYXJXaWR0aCA9IG1fdkJhciA/IG1f dkJhci0+d2lkdGgoKSA6IDA7CisgICAgTGF5b3V0VW5pdCBzY3JvbGxiYXJXaWR0aCA9IG1fdkJh ciA/IG1fdkJhci0+d2lkdGgoKSA6IExheW91dFVuaXQoMCk7CiAgICAgaWYgKG9mZnNldC53aWR0 aCgpIDwgYm9yZGVyTGVmdCgpICsgcGFkZGluZ0xlZnQoKSB8fCBvZmZzZXQud2lkdGgoKSA+IHdp ZHRoKCkgLSBib3JkZXJSaWdodCgpIC0gcGFkZGluZ1JpZ2h0KCkgLSBzY3JvbGxiYXJXaWR0aCkK ICAgICAgICAgcmV0dXJuIC0xOwogCkBAIC00OTIsMTAgKzQ5MiwxMCBAQCB2b2lkIFJlbmRlckxp c3RCb3g6OnBhblNjcm9sbChjb25zdCBJbnRQCiAgICAgZWxzZQogICAgICAgICBwcmV2aW91c01v dXNlUG9zaXRpb24gPSBjdXJyZW50TW91c2VQb3NpdGlvbjsKIAotICAgIExheW91dFVuaXQgeURl bHRhID0gY3VycmVudE1vdXNlUG9zaXRpb24ueSgpIC0gcGFuU3RhcnRNb3VzZVBvc2l0aW9uLnko KTsKKyAgICBpbnQgeURlbHRhID0gY3VycmVudE1vdXNlUG9zaXRpb24ueSgpIC0gcGFuU3RhcnRN b3VzZVBvc2l0aW9uLnkoKTsKIAogICAgIC8vIElmIHRoZSBwb2ludCBpcyB0b28gZmFyIGZyb20g dGhlIGNlbnRlciB3ZSBsaW1pdCB0aGUgc3BlZWQKLSAgICB5RGVsdGEgPSBtYXg8TGF5b3V0VW5p dD4obWluPExheW91dFVuaXQ+KHlEZWx0YSwgbWF4U3BlZWQpLCAtbWF4U3BlZWQpOworICAgIHlE ZWx0YSA9IG1heDxpbnQ+KG1pbjxpbnQ+KHlEZWx0YSwgbWF4U3BlZWQpLCAtbWF4U3BlZWQpOwog ICAgIAogICAgIGlmIChhYnMoeURlbHRhKSA8IGljb25SYWRpdXMpIC8vIGF0IHRoZSBjZW50ZXIg d2UgbGV0IHRoZSBzcGFjZSBmb3IgdGhlIGljb24KICAgICAgICAgcmV0dXJuOwpAQCAtNTA5LDkg KzUwOSw5IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6cGFuU2Nyb2xsKGNvbnN0IEludFAKICAgICAv LyBMZXQncyBhdHRlbnVhdGUgdGhlIHNwZWVkCiAgICAgeURlbHRhIC89IHNwZWVkUmVkdWNlcjsK IAotICAgIExheW91dFBvaW50IHNjcm9sbFBvaW50KDAsIDApOworICAgIEludFBvaW50IHNjcm9s bFBvaW50KDAsIDApOwogICAgIHNjcm9sbFBvaW50LnNldFkoYWJzT2Zmc2V0LnkoKSArIHlEZWx0 YSk7Ci0gICAgTGF5b3V0VW5pdCBuZXdPZmZzZXQgPSBzY3JvbGxUb3dhcmQoc2Nyb2xsUG9pbnQp OworICAgIGludCBuZXdPZmZzZXQgPSBzY3JvbGxUb3dhcmQoc2Nyb2xsUG9pbnQpOwogICAgIGlm IChuZXdPZmZzZXQgPCAwKSAKICAgICAgICAgcmV0dXJuOwogCkBAIC01MjEsMTEgKzUyMSwxMSBA QCB2b2lkIFJlbmRlckxpc3RCb3g6OnBhblNjcm9sbChjb25zdCBJbnRQCiAgICAgbV9pbkF1dG9z Y3JvbGwgPSBmYWxzZTsKIH0KIAotaW50IFJlbmRlckxpc3RCb3g6OnNjcm9sbFRvd2FyZChjb25z dCBMYXlvdXRQb2ludCYgZGVzdGluYXRpb24pCitpbnQgUmVuZGVyTGlzdEJveDo6c2Nyb2xsVG93 YXJkKGNvbnN0IEludFBvaW50JiBkZXN0aW5hdGlvbikKIHsKICAgICAvLyBGSVhNRTogVGhpcyBk b2Vzbid0IHdvcmsgY29ycmVjdGx5IHdpdGggdHJhbnNmb3Jtcy4KICAgICBGbG9hdFBvaW50IGFi c1BvcyA9IGxvY2FsVG9BYnNvbHV0ZSgpOwotICAgIExheW91dFNpemUgcG9zaXRpb25PZmZzZXQg PSByb3VuZGVkTGF5b3V0U2l6ZShkZXN0aW5hdGlvbiAtIGFic1Bvcyk7CisgICAgSW50U2l6ZSBw b3NpdGlvbk9mZnNldCA9IHJvdW5kZWRJbnRTaXplKGRlc3RpbmF0aW9uIC0gYWJzUG9zKTsKIAog ICAgIGludCByb3dzID0gbnVtVmlzaWJsZUl0ZW1zKCk7CiAgICAgaW50IG9mZnNldCA9IG1faW5k ZXhPZmZzZXQ7CkBAIC02MDAsMTcgKzYwMCwxNyBAQCB2b2lkIFJlbmRlckxpc3RCb3g6OnZhbHVl Q2hhbmdlZCh1bnNpZ25lCiAgICAgZWxlbWVudC0+ZGlzcGF0Y2hGb3JtQ29udHJvbENoYW5nZUV2 ZW50KCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyTGlzdEJveDo6c2Nyb2xsU2l6ZShTY3JvbGxi YXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikgY29uc3QKK2ludCBSZW5kZXJMaXN0Qm94OjpzY3Jv bGxTaXplKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKSBjb25zdAogewogICAgIHJl dHVybiAoKG9yaWVudGF0aW9uID09IFZlcnRpY2FsU2Nyb2xsYmFyKSAmJiBtX3ZCYXIpID8gKG1f dkJhci0+dG90YWxTaXplKCkgLSBtX3ZCYXItPnZpc2libGVTaXplKCkpIDogMDsKIH0KIAotTGF5 b3V0VW5pdCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxQb3NpdGlvbihTY3JvbGxiYXIqKSBjb25zdAor aW50IFJlbmRlckxpc3RCb3g6OnNjcm9sbFBvc2l0aW9uKFNjcm9sbGJhciopIGNvbnN0CiB7CiAg ICAgcmV0dXJuIG1faW5kZXhPZmZzZXQ7CiB9CiAKLXZvaWQgUmVuZGVyTGlzdEJveDo6c2V0U2Ny b2xsT2Zmc2V0KGNvbnN0IExheW91dFBvaW50JiBvZmZzZXQpCit2b2lkIFJlbmRlckxpc3RCb3g6 OnNldFNjcm9sbE9mZnNldChjb25zdCBJbnRQb2ludCYgb2Zmc2V0KQogewogICAgIHNjcm9sbFRv KG9mZnNldC55KCkpOwogfQpAQCAtNjMyLDcgKzYzMiw3IEBAIExheW91dFVuaXQgUmVuZGVyTGlz dEJveDo6aXRlbUhlaWdodCgpIGMKIAogTGF5b3V0VW5pdCBSZW5kZXJMaXN0Qm94Ojp2ZXJ0aWNh bFNjcm9sbGJhcldpZHRoKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV92QmFyICYmICFtX3ZCYXIt PmlzT3ZlcmxheVNjcm9sbGJhcigpID8gbV92QmFyLT53aWR0aCgpIDogMDsKKyAgICByZXR1cm4g bV92QmFyICYmICFtX3ZCYXItPmlzT3ZlcmxheVNjcm9sbGJhcigpID8gbV92QmFyLT53aWR0aCgp IDogTGF5b3V0VW5pdCgwKTsKIH0KIAogLy8gRklYTUU6IFdlIGlnbm9yZSBwYWRkaW5nIGluIHRo ZSB2ZXJ0aWNhbCBkaXJlY3Rpb24gYXMgZmFyIGFzIHRoZXNlIHZhbHVlcyBhcmUgY29uY2VybmVk LCBzaW5jZSB0aGF0J3MKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0 Qm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RC b3guaAkocmV2aXNpb24gOTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGlzdEJveC5oCSh3b3JraW5nIGNvcHkpCkBAIC01MSw3ICs1MSw3IEBAIHB1YmxpYzoKICAgICBi b29sIHNjcm9sbFRvUmV2ZWFsRWxlbWVudEF0TGlzdEluZGV4KGludCBpbmRleCk7CiAgICAgYm9v bCBsaXN0SW5kZXhJc1Zpc2libGUoaW50IGluZGV4KTsKIAotICAgIGludCBzY3JvbGxUb3dhcmQo Y29uc3QgTGF5b3V0UG9pbnQmKTsgLy8gUmV0dXJucyB0aGUgbmV3IGluZGV4IG9yIC0xIGlmIG5v IHNjcm9sbCBvY2N1cnJlZAorICAgIGludCBzY3JvbGxUb3dhcmQoY29uc3QgSW50UG9pbnQmKTsg Ly8gUmV0dXJucyB0aGUgbmV3IGluZGV4IG9yIC0xIGlmIG5vIHNjcm9sbCBvY2N1cnJlZAogCiAg ICAgaW50IHNpemUoKSBjb25zdDsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck1lbnVMaXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTWVudUxpc3QuY3BwCShyZXZpc2lvbiA5ODg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwNSw3ICszMDUs NyBAQCB2b2lkIFJlbmRlck1lbnVMaXN0OjpzaG93UG9wdXAoKQogICAgIC8vIHRoZSBhY3R1YWwg d2lkdGggb2YgdGhlIGVsZW1lbnQgdG8gc2l6ZSB0aGUgcG9wdXAuCiAgICAgRmxvYXRQb2ludCBh YnNUb3BMZWZ0ID0gbG9jYWxUb0Fic29sdXRlKEZsb2F0UG9pbnQoKSwgZmFsc2UsIHRydWUpOwog ICAgIExheW91dFJlY3QgYWJzQm91bmRzID0gYWJzb2x1dGVCb3VuZGluZ0JveFJlY3RJZ25vcmlu Z1RyYW5zZm9ybXMoKTsKLSAgICBhYnNCb3VuZHMuc2V0TG9jYXRpb24ocm91bmRlZEludFBvaW50 KGFic1RvcExlZnQpKTsKKyAgICBhYnNCb3VuZHMuc2V0TG9jYXRpb24ocm91bmRlZExheW91dFBv aW50KGFic1RvcExlZnQpKTsKICAgICBIVE1MU2VsZWN0RWxlbWVudCogc2VsZWN0ID0gdG9IVE1M U2VsZWN0RWxlbWVudChub2RlKCkpOwogICAgIG1fcG9wdXAtPnNob3coYWJzQm91bmRzLCBkb2N1 bWVudCgpLT52aWV3KCksIHNlbGVjdC0+b3B0aW9uVG9MaXN0SW5kZXgoc2VsZWN0LT5zZWxlY3Rl ZEluZGV4KCkpKTsKIH0KQEAgLTUwMiwxMyArNTAyLDEzIEBAIGludCBSZW5kZXJNZW51TGlzdDo6 Y2xpZW50SW5zZXRSaWdodCgpIGMKICAgICByZXR1cm4gMDsKIH0KIAotaW50IFJlbmRlck1lbnVM aXN0OjpjbGllbnRQYWRkaW5nTGVmdCgpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlck1lbnVMaXN0 OjpjbGllbnRQYWRkaW5nTGVmdCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHBhZGRpbmdMZWZ0KCkg KyBtX2lubmVyQmxvY2stPnBhZGRpbmdMZWZ0KCk7CiB9CiAKIGNvbnN0IGludCBlbmRPZkxpbmVQ YWRkaW5nID0gMjsKLWludCBSZW5kZXJNZW51TGlzdDo6Y2xpZW50UGFkZGluZ1JpZ2h0KCkgY29u c3QKK0xheW91dFVuaXQgUmVuZGVyTWVudUxpc3Q6OmNsaWVudFBhZGRpbmdSaWdodCgpIGNvbnN0 CiB7CiAgICAgaWYgKHN0eWxlKCktPmFwcGVhcmFuY2UoKSA9PSBNZW51bGlzdFBhcnQgfHwgc3R5 bGUoKS0+YXBwZWFyYW5jZSgpID09IE1lbnVsaXN0QnV0dG9uUGFydCkgewogICAgICAgICAvLyBG b3IgdGhlc2UgYXBwZWFyYW5jZSB2YWx1ZXMsIHRoZSB0aGVtZSBhcHBsaWVzIHBhZGRpbmcgdG8g bGVhdmUgcm9vbSBmb3IgdGhlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TWVudUxpc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TWVudUxpc3QuaAkocmV2aXNpb24gOTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTWVudUxpc3QuaAkod29ya2luZyBjb3B5KQpAQCAtMjQsNiArMjQsNyBAQAogI2lmbmRl ZiBSZW5kZXJNZW51TGlzdF9oCiAjZGVmaW5lIFJlbmRlck1lbnVMaXN0X2gKIAorI2luY2x1ZGUg IkxheW91dFR5cGVzLmgiCiAjaW5jbHVkZSAiUG9wdXBNZW51LmgiCiAjaW5jbHVkZSAiUG9wdXBN ZW51Q2xpZW50LmgiCiAjaW5jbHVkZSAiUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmgiCkBA IC05MSw4ICs5Miw4IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBQb3B1cE1lbnVTdHlsZSBtZW51 U3R5bGUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBjbGllbnRJbnNldExlZnQoKSBjb25zdDsK ICAgICB2aXJ0dWFsIGludCBjbGllbnRJbnNldFJpZ2h0KCkgY29uc3Q7Ci0gICAgdmlydHVhbCBp bnQgY2xpZW50UGFkZGluZ0xlZnQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIGludCBjbGllbnRQYWRk aW5nUmlnaHQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgY2xpZW50UGFkZGluZ0xl ZnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgY2xpZW50UGFkZGluZ1JpZ2h0KCkg Y29uc3Q7CiAgICAgdmlydHVhbCBpbnQgbGlzdFNpemUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGlu dCBzZWxlY3RlZEluZGV4KCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIHBvcHVwRGlkSGlkZSgp OwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wu Y3BwCShyZXZpc2lvbiA5ODg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0Q29udHJvbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4Nyw3ICsxODcsNyBAQCB2b2lkIFJl bmRlclRleHRDb250cm9sOjpoaXRJbm5lclRleHRFbGVtCiAgICAgSFRNTEVsZW1lbnQqIGlubmVy VGV4dCA9IGlubmVyVGV4dEVsZW1lbnQoKTsKICAgICByZXN1bHQuc2V0SW5uZXJOb2RlKGlubmVy VGV4dCk7CiAgICAgcmVzdWx0LnNldElubmVyTm9uU2hhcmVkTm9kZShpbm5lclRleHQpOwotICAg IHJlc3VsdC5zZXRMb2NhbFBvaW50KHBvaW50SW5Db250YWluZXIgLSB0b1NpemUoYWRqdXN0ZWRM b2NhdGlvbiArIGlubmVyVGV4dC0+cmVuZGVyQm94KCktPmxvY2F0aW9uKCkpKTsKKyAgICByZXN1 bHQuc2V0TG9jYWxQb2ludChwb2ludEluQ29udGFpbmVyIC0gdG9MYXlvdXRTaXplKGFkanVzdGVk TG9jYXRpb24gKyBpbm5lclRleHQtPnJlbmRlckJveCgpLT5sb2NhdGlvbigpKSk7CiB9CiAKIHN0 YXRpYyBjb25zdCBjaGFyKiBmb250RmFtaWxpZXNXaXRoSW52YWxpZENoYXJXaWR0aFtdID0gewpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGlu ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRD b250cm9sU2luZ2xlTGluZS5jcHAJKHJldmlzaW9uIDk4ODYxKQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTYyOCw5ICs2MjgsOSBAQCBpbnQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjbGll bnRJCiAgICAgcmV0dXJuIGhlaWdodCgpIC8gMjsKIH0KIAotaW50IFJlbmRlclRleHRDb250cm9s U2luZ2xlTGluZTo6Y2xpZW50UGFkZGluZ0xlZnQoKSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJU ZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNsaWVudFBhZGRpbmdMZWZ0KCkgY29uc3QKIHsKLSAgICBp bnQgcGFkZGluZyA9IHBhZGRpbmdMZWZ0KCk7CisgICAgTGF5b3V0VW5pdCBwYWRkaW5nID0gcGFk ZGluZ0xlZnQoKTsKIAogICAgIEhUTUxFbGVtZW50KiByZXN1bHRzQnV0dG9uID0gcmVzdWx0c0J1 dHRvbkVsZW1lbnQoKTsKICAgICBpZiAoUmVuZGVyQm94KiByZXN1bHRzUmVuZGVyZXIgPSByZXN1 bHRzQnV0dG9uID8gcmVzdWx0c0J1dHRvbi0+cmVuZGVyQm94KCkgOiAwKQpAQCAtNjM5LDkgKzYz OSw5IEBAIGludCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNsaWVudFAKICAgICByZXR1 cm4gcGFkZGluZzsKIH0KIAotaW50IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Y2xpZW50 UGFkZGluZ1JpZ2h0KCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lOjpjbGllbnRQYWRkaW5nUmlnaHQoKSBjb25zdAogewotICAgIGludCBwYWRkaW5nID0gcGFk ZGluZ1JpZ2h0KCk7CisgICAgTGF5b3V0VW5pdCBwYWRkaW5nID0gcGFkZGluZ1JpZ2h0KCk7CiAK ICAgICBIVE1MRWxlbWVudCogY2FuY2VsQnV0dG9uID0gY2FuY2VsQnV0dG9uRWxlbWVudCgpOwog ICAgIGlmIChSZW5kZXJCb3gqIGNhbmNlbFJlbmRlcmVyID0gY2FuY2VsQnV0dG9uID8gY2FuY2Vs QnV0dG9uLT5yZW5kZXJCb3goKSA6IDApCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5oCShyZXZpc2lvbiA5ODg2 MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxp bmUuaAkod29ya2luZyBjb3B5KQpAQCAtMTAyLDggKzEwMiw4IEBAIHByaXZhdGU6CiAgICAgdmly dHVhbCBQb3B1cE1lbnVTdHlsZSBtZW51U3R5bGUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBj bGllbnRJbnNldExlZnQoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBjbGllbnRJbnNldFJpZ2h0 KCkgY29uc3Q7Ci0gICAgdmlydHVhbCBpbnQgY2xpZW50UGFkZGluZ0xlZnQoKSBjb25zdDsKLSAg ICB2aXJ0dWFsIGludCBjbGllbnRQYWRkaW5nUmlnaHQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIExh eW91dFVuaXQgY2xpZW50UGFkZGluZ0xlZnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIExheW91dFVu aXQgY2xpZW50UGFkZGluZ1JpZ2h0KCkgY29uc3Q7CiAgICAgdmlydHVhbCBpbnQgbGlzdFNpemUo KSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBzZWxlY3RlZEluZGV4KCkgY29uc3Q7CiAgICAgdmly dHVhbCB2b2lkIHBvcHVwRGlkSGlkZSgpOwo= 113239 2011-11-01 15:35:13 -0700 2011-11-01 17:15:26 -0700 Patch for landing bug-71308-20111101153512.patch text/plain 11593 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MDAyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDAgQEAKKzIwMTEtMTEtMDEgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBQb3B1cE1lbnVDbGll bnQgdG8gbGF5b3V0IGFic3RyYWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MTMwOAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgorCisgICAgICAgIFN3aXRjaCBQb3B1cE1lbnVDbGllbnQgYW5kIHJlbmRlcmluZyBjbGFzc2Vz IGltcGxlbWVudGluZyBpdCB0byBsYXlvdXQKKyAgICAgICAgdHlwZSBhYnN0cmFjdGlvbi4KKwor ICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Qb3B1cE1lbnVDbGll bnQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMaXN0Qm94OjpsaXN0SW5kZXhBdE9mZnNldCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMaXN0Qm94OjpwYW5TY3JvbGwpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGlzdEJveDo6c2Nyb2xsVG93YXJkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6 OnNjcm9sbFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6c2Nyb2xsUG9z aXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6c2V0U2Nyb2xsT2Zmc2V0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OnZlcnRpY2FsU2Nyb2xsYmFyV2lk dGgpOgorICAgICAgICBSZXZlcnQgc2Nyb2xsIHBvc2l0aW9ucyBhbmQgc2Nyb2xsIG9mZnNldHMg dG8gaW50cyB0byBhbGlnbiB3aXRoIGRldmljZQorICAgICAgICBwaXhlbHMuCisgICAgICAgIAor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94Lmg6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck1lbnVMaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lbnVMaXN0Ojpz aG93UG9wdXApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OmNsaWVudFBhZGRp bmdMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lbnVMaXN0OjpjbGllbnRQYWRkaW5n UmlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUZXh0Q29udHJvbDo6aGl0SW5uZXJUZXh0RWxlbWVudCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNsaWVudFBhZGRpbmdMZWZ0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Y2xpZW50UGFkZGluZ1JpZ2h0KToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmg6CisKIDIw MTEtMTEtMDEgIFhpYW9tZWkgSmkgIDx4amlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlZmFj dG9yOiBjaGFuZ2UgU2Nyb2xsYWJsZTo6bV9zY3JvbGxPcmlnaW4gZnJvbSBwcm90ZWN0ZWQgdG8g cHJpdmF0ZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudUNsaWVudC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudUNsaWVudC5o CShyZXZpc2lvbiA5OTAwMikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BvcHVwTWVudUNs aWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw2ICsyMiw3IEBACiAjaWZuZGVmIFBvcHVwTWVu dUNsaWVudF9oCiAjZGVmaW5lIFBvcHVwTWVudUNsaWVudF9oCiAKKyNpbmNsdWRlICJMYXlvdXRU eXBlcy5oIgogI2luY2x1ZGUgIlBvcHVwTWVudVN0eWxlLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVHlw ZXMuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgpAQCAtNTEsOCArNTIsOCBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCBQb3B1cE1lbnVTdHlsZSBtZW51U3R5bGUoKSBjb25zdCA9IDA7CiAgICAg dmlydHVhbCBpbnQgY2xpZW50SW5zZXRMZWZ0KCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgaW50 IGNsaWVudEluc2V0UmlnaHQoKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBpbnQgY2xpZW50UGFk ZGluZ0xlZnQoKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCBpbnQgY2xpZW50UGFkZGluZ1JpZ2h0 KCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBjbGllbnRQYWRkaW5nTGVmdCgp IGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgY2xpZW50UGFkZGluZ1JpZ2h0KCkg Y29uc3QgPSAwOwogICAgIHZpcnR1YWwgaW50IGxpc3RTaXplKCkgY29uc3QgPSAwOwogICAgIHZp cnR1YWwgaW50IHNlbGVjdGVkSW5kZXgoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB2b2lkIHBv cHVwRGlkSGlkZSgpID0gMDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM aXN0Qm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGlzdEJveC5jcHAJKHJldmlzaW9uIDk5MDAyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxpc3RCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NjcsNyArNDY3LDcgQEAgaW50 IFJlbmRlckxpc3RCb3g6Omxpc3RJbmRleEF0T2Zmc2V0KGNvbgogICAgIGlmIChvZmZzZXQuaGVp Z2h0KCkgPCBib3JkZXJUb3AoKSArIHBhZGRpbmdUb3AoKSB8fCBvZmZzZXQuaGVpZ2h0KCkgPiBo ZWlnaHQoKSAtIHBhZGRpbmdCb3R0b20oKSAtIGJvcmRlckJvdHRvbSgpKQogICAgICAgICByZXR1 cm4gLTE7CiAKLSAgICBMYXlvdXRVbml0IHNjcm9sbGJhcldpZHRoID0gbV92QmFyID8gbV92QmFy LT53aWR0aCgpIDogMDsKKyAgICBMYXlvdXRVbml0IHNjcm9sbGJhcldpZHRoID0gbV92QmFyID8g bV92QmFyLT53aWR0aCgpIDogTGF5b3V0VW5pdCgwKTsKICAgICBpZiAob2Zmc2V0LndpZHRoKCkg PCBib3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpIHx8IG9mZnNldC53aWR0aCgpID4gd2lkdGgo KSAtIGJvcmRlclJpZ2h0KCkgLSBwYWRkaW5nUmlnaHQoKSAtIHNjcm9sbGJhcldpZHRoKQogICAg ICAgICByZXR1cm4gLTE7CiAKQEAgLTQ5MiwxMCArNDkyLDEwIEBAIHZvaWQgUmVuZGVyTGlzdEJv eDo6cGFuU2Nyb2xsKGNvbnN0IEludFAKICAgICBlbHNlCiAgICAgICAgIHByZXZpb3VzTW91c2VQ b3NpdGlvbiA9IGN1cnJlbnRNb3VzZVBvc2l0aW9uOwogCi0gICAgTGF5b3V0VW5pdCB5RGVsdGEg PSBjdXJyZW50TW91c2VQb3NpdGlvbi55KCkgLSBwYW5TdGFydE1vdXNlUG9zaXRpb24ueSgpOwor ICAgIGludCB5RGVsdGEgPSBjdXJyZW50TW91c2VQb3NpdGlvbi55KCkgLSBwYW5TdGFydE1vdXNl UG9zaXRpb24ueSgpOwogCiAgICAgLy8gSWYgdGhlIHBvaW50IGlzIHRvbyBmYXIgZnJvbSB0aGUg Y2VudGVyIHdlIGxpbWl0IHRoZSBzcGVlZAotICAgIHlEZWx0YSA9IG1heDxMYXlvdXRVbml0Piht aW48TGF5b3V0VW5pdD4oeURlbHRhLCBtYXhTcGVlZCksIC1tYXhTcGVlZCk7CisgICAgeURlbHRh ID0gbWF4PGludD4obWluPGludD4oeURlbHRhLCBtYXhTcGVlZCksIC1tYXhTcGVlZCk7CiAgICAg CiAgICAgaWYgKGFicyh5RGVsdGEpIDwgaWNvblJhZGl1cykgLy8gYXQgdGhlIGNlbnRlciB3ZSBs ZXQgdGhlIHNwYWNlIGZvciB0aGUgaWNvbgogICAgICAgICByZXR1cm47CkBAIC01MDksOSArNTA5 LDkgQEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpwYW5TY3JvbGwoY29uc3QgSW50UAogICAgIC8vIExl dCdzIGF0dGVudWF0ZSB0aGUgc3BlZWQKICAgICB5RGVsdGEgLz0gc3BlZWRSZWR1Y2VyOwogCi0g ICAgTGF5b3V0UG9pbnQgc2Nyb2xsUG9pbnQoMCwgMCk7CisgICAgSW50UG9pbnQgc2Nyb2xsUG9p bnQoMCwgMCk7CiAgICAgc2Nyb2xsUG9pbnQuc2V0WShhYnNPZmZzZXQueSgpICsgeURlbHRhKTsK LSAgICBMYXlvdXRVbml0IG5ld09mZnNldCA9IHNjcm9sbFRvd2FyZChzY3JvbGxQb2ludCk7Cisg ICAgaW50IG5ld09mZnNldCA9IHNjcm9sbFRvd2FyZChzY3JvbGxQb2ludCk7CiAgICAgaWYgKG5l d09mZnNldCA8IDApIAogICAgICAgICByZXR1cm47CiAKQEAgLTUyMSwxMSArNTIxLDExIEBAIHZv aWQgUmVuZGVyTGlzdEJveDo6cGFuU2Nyb2xsKGNvbnN0IEludFAKICAgICBtX2luQXV0b3Njcm9s bCA9IGZhbHNlOwogfQogCi1pbnQgUmVuZGVyTGlzdEJveDo6c2Nyb2xsVG93YXJkKGNvbnN0IExh eW91dFBvaW50JiBkZXN0aW5hdGlvbikKK2ludCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxUb3dhcmQo Y29uc3QgSW50UG9pbnQmIGRlc3RpbmF0aW9uKQogewogICAgIC8vIEZJWE1FOiBUaGlzIGRvZXNu J3Qgd29yayBjb3JyZWN0bHkgd2l0aCB0cmFuc2Zvcm1zLgogICAgIEZsb2F0UG9pbnQgYWJzUG9z ID0gbG9jYWxUb0Fic29sdXRlKCk7Ci0gICAgTGF5b3V0U2l6ZSBwb3NpdGlvbk9mZnNldCA9IHJv dW5kZWRMYXlvdXRTaXplKGRlc3RpbmF0aW9uIC0gYWJzUG9zKTsKKyAgICBJbnRTaXplIHBvc2l0 aW9uT2Zmc2V0ID0gcm91bmRlZEludFNpemUoZGVzdGluYXRpb24gLSBhYnNQb3MpOwogCiAgICAg aW50IHJvd3MgPSBudW1WaXNpYmxlSXRlbXMoKTsKICAgICBpbnQgb2Zmc2V0ID0gbV9pbmRleE9m ZnNldDsKQEAgLTYwMCwxNyArNjAwLDE3IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6dmFsdWVDaGFu Z2VkKHVuc2lnbmUKICAgICBlbGVtZW50LT5kaXNwYXRjaEZvcm1Db250cm9sQ2hhbmdlRXZlbnQo KTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxTaXplKFNjcm9sbGJhck9y aWVudGF0aW9uIG9yaWVudGF0aW9uKSBjb25zdAoraW50IFJlbmRlckxpc3RCb3g6OnNjcm9sbFNp emUoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pIGNvbnN0CiB7CiAgICAgcmV0dXJu ICgob3JpZW50YXRpb24gPT0gVmVydGljYWxTY3JvbGxiYXIpICYmIG1fdkJhcikgPyAobV92QmFy LT50b3RhbFNpemUoKSAtIG1fdkJhci0+dmlzaWJsZVNpemUoKSkgOiAwOwogfQogCi1MYXlvdXRV bml0IFJlbmRlckxpc3RCb3g6OnNjcm9sbFBvc2l0aW9uKFNjcm9sbGJhciopIGNvbnN0CitpbnQg UmVuZGVyTGlzdEJveDo6c2Nyb2xsUG9zaXRpb24oU2Nyb2xsYmFyKikgY29uc3QKIHsKICAgICBy ZXR1cm4gbV9pbmRleE9mZnNldDsKIH0KIAotdm9pZCBSZW5kZXJMaXN0Qm94OjpzZXRTY3JvbGxP ZmZzZXQoY29uc3QgTGF5b3V0UG9pbnQmIG9mZnNldCkKK3ZvaWQgUmVuZGVyTGlzdEJveDo6c2V0 U2Nyb2xsT2Zmc2V0KGNvbnN0IEludFBvaW50JiBvZmZzZXQpCiB7CiAgICAgc2Nyb2xsVG8ob2Zm c2V0LnkoKSk7CiB9CkBAIC02MzIsNyArNjMyLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJMaXN0Qm94 OjppdGVtSGVpZ2h0KCkgYwogCiBMYXlvdXRVbml0IFJlbmRlckxpc3RCb3g6OnZlcnRpY2FsU2Ny b2xsYmFyV2lkdGgoKSBjb25zdAogewotICAgIHJldHVybiBtX3ZCYXIgJiYgIW1fdkJhci0+aXNP dmVybGF5U2Nyb2xsYmFyKCkgPyBtX3ZCYXItPndpZHRoKCkgOiAwOworICAgIHJldHVybiBtX3ZC YXIgJiYgIW1fdkJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCkgPyBtX3ZCYXItPndpZHRoKCkgOiBM YXlvdXRVbml0KDApOwogfQogCiAvLyBGSVhNRTogV2UgaWdub3JlIHBhZGRpbmcgaW4gdGhlIHZl cnRpY2FsIGRpcmVjdGlvbiBhcyBmYXIgYXMgdGhlc2UgdmFsdWVzIGFyZSBjb25jZXJuZWQsIHNp bmNlIHRoYXQncwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3gu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5o CShyZXZpc2lvbiA5OTAwMikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0 Qm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTUxLDcgKzUxLDcgQEAgcHVibGljOgogICAgIGJvb2wg c2Nyb2xsVG9SZXZlYWxFbGVtZW50QXRMaXN0SW5kZXgoaW50IGluZGV4KTsKICAgICBib29sIGxp c3RJbmRleElzVmlzaWJsZShpbnQgaW5kZXgpOwogCi0gICAgaW50IHNjcm9sbFRvd2FyZChjb25z dCBMYXlvdXRQb2ludCYpOyAvLyBSZXR1cm5zIHRoZSBuZXcgaW5kZXggb3IgLTEgaWYgbm8gc2Ny b2xsIG9jY3VycmVkCisgICAgaW50IHNjcm9sbFRvd2FyZChjb25zdCBJbnRQb2ludCYpOyAvLyBS ZXR1cm5zIHRoZSBuZXcgaW5kZXggb3IgLTEgaWYgbm8gc2Nyb2xsIG9jY3VycmVkCiAKICAgICBp bnQgc2l6ZSgpIGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TWVudUxpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNZW51TGlzdC5jcHAJKHJldmlzaW9uIDk5MDAyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck1lbnVMaXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzA1LDcgKzMwNSw3IEBA IHZvaWQgUmVuZGVyTWVudUxpc3Q6OnNob3dQb3B1cCgpCiAgICAgLy8gdGhlIGFjdHVhbCB3aWR0 aCBvZiB0aGUgZWxlbWVudCB0byBzaXplIHRoZSBwb3B1cC4KICAgICBGbG9hdFBvaW50IGFic1Rv cExlZnQgPSBsb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludCgpLCBmYWxzZSwgdHJ1ZSk7CiAgICAg TGF5b3V0UmVjdCBhYnNCb3VuZHMgPSBhYnNvbHV0ZUJvdW5kaW5nQm94UmVjdElnbm9yaW5nVHJh bnNmb3JtcygpOwotICAgIGFic0JvdW5kcy5zZXRMb2NhdGlvbihyb3VuZGVkSW50UG9pbnQoYWJz VG9wTGVmdCkpOworICAgIGFic0JvdW5kcy5zZXRMb2NhdGlvbihyb3VuZGVkTGF5b3V0UG9pbnQo YWJzVG9wTGVmdCkpOwogICAgIEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QgPSB0b0hUTUxTZWxl Y3RFbGVtZW50KG5vZGUoKSk7CiAgICAgbV9wb3B1cC0+c2hvdyhhYnNCb3VuZHMsIGRvY3VtZW50 KCktPnZpZXcoKSwgc2VsZWN0LT5vcHRpb25Ub0xpc3RJbmRleChzZWxlY3QtPnNlbGVjdGVkSW5k ZXgoKSkpOwogfQpAQCAtNTAyLDEzICs1MDIsMTMgQEAgaW50IFJlbmRlck1lbnVMaXN0OjpjbGll bnRJbnNldFJpZ2h0KCkgYwogICAgIHJldHVybiAwOwogfQogCi1pbnQgUmVuZGVyTWVudUxpc3Q6 OmNsaWVudFBhZGRpbmdMZWZ0KCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyTWVudUxpc3Q6OmNs aWVudFBhZGRpbmdMZWZ0KCkgY29uc3QKIHsKICAgICByZXR1cm4gcGFkZGluZ0xlZnQoKSArIG1f aW5uZXJCbG9jay0+cGFkZGluZ0xlZnQoKTsKIH0KIAogY29uc3QgaW50IGVuZE9mTGluZVBhZGRp bmcgPSAyOwotaW50IFJlbmRlck1lbnVMaXN0OjpjbGllbnRQYWRkaW5nUmlnaHQoKSBjb25zdAor TGF5b3V0VW5pdCBSZW5kZXJNZW51TGlzdDo6Y2xpZW50UGFkZGluZ1JpZ2h0KCkgY29uc3QKIHsK ICAgICBpZiAoc3R5bGUoKS0+YXBwZWFyYW5jZSgpID09IE1lbnVsaXN0UGFydCB8fCBzdHlsZSgp LT5hcHBlYXJhbmNlKCkgPT0gTWVudWxpc3RCdXR0b25QYXJ0KSB7CiAgICAgICAgIC8vIEZvciB0 aGVzZSBhcHBlYXJhbmNlIHZhbHVlcywgdGhlIHRoZW1lIGFwcGxpZXMgcGFkZGluZyB0byBsZWF2 ZSByb29tIGZvciB0aGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51 TGlzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51 TGlzdC5oCShyZXZpc2lvbiA5OTAwMikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNZW51TGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw2ICsyNCw3IEBACiAjaWZuZGVmIFJl bmRlck1lbnVMaXN0X2gKICNkZWZpbmUgUmVuZGVyTWVudUxpc3RfaAogCisjaW5jbHVkZSAiTGF5 b3V0VHlwZXMuaCIKICNpbmNsdWRlICJQb3B1cE1lbnUuaCIKICNpbmNsdWRlICJQb3B1cE1lbnVD bGllbnQuaCIKICNpbmNsdWRlICJSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guaCIKQEAgLTkx LDggKzkyLDggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIFBvcHVwTWVudVN0eWxlIG1lbnVTdHls ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50IGNsaWVudEluc2V0TGVmdCgpIGNvbnN0OwogICAg IHZpcnR1YWwgaW50IGNsaWVudEluc2V0UmlnaHQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIGludCBj bGllbnRQYWRkaW5nTGVmdCgpIGNvbnN0OwotICAgIHZpcnR1YWwgaW50IGNsaWVudFBhZGRpbmdS aWdodCgpIGNvbnN0OworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBjbGllbnRQYWRkaW5nTGVmdCgp IGNvbnN0OworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBjbGllbnRQYWRkaW5nUmlnaHQoKSBjb25z dDsKICAgICB2aXJ0dWFsIGludCBsaXN0U2l6ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50IHNl bGVjdGVkSW5kZXgoKSBjb25zdDsKICAgICB2aXJ0dWFsIHZvaWQgcG9wdXBEaWRIaWRlKCk7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAJ KHJldmlzaW9uIDk5MDAyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRD b250cm9sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg3LDcgKzE4Nyw3IEBAIHZvaWQgUmVuZGVy VGV4dENvbnRyb2w6OmhpdElubmVyVGV4dEVsZW0KICAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0 ID0gaW5uZXJUZXh0RWxlbWVudCgpOwogICAgIHJlc3VsdC5zZXRJbm5lck5vZGUoaW5uZXJUZXh0 KTsKICAgICByZXN1bHQuc2V0SW5uZXJOb25TaGFyZWROb2RlKGlubmVyVGV4dCk7Ci0gICAgcmVz dWx0LnNldExvY2FsUG9pbnQocG9pbnRJbkNvbnRhaW5lciAtIHRvU2l6ZShhZGp1c3RlZExvY2F0 aW9uICsgaW5uZXJUZXh0LT5yZW5kZXJCb3goKS0+bG9jYXRpb24oKSkpOworICAgIHJlc3VsdC5z ZXRMb2NhbFBvaW50KHBvaW50SW5Db250YWluZXIgLSB0b0xheW91dFNpemUoYWRqdXN0ZWRMb2Nh dGlvbiArIGlubmVyVGV4dC0+cmVuZGVyQm94KCktPmxvY2F0aW9uKCkpKTsKIH0KIAogc3RhdGlj IGNvbnN0IGNoYXIqIGZvbnRGYW1pbGllc1dpdGhJbnZhbGlkQ2hhcldpZHRoW10gPSB7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lLmNwcAkocmV2aXNpb24gOTkwMDIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NjI4LDkgKzYyOCw5IEBAIGludCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNsaWVudEkK ICAgICByZXR1cm4gaGVpZ2h0KCkgLyAyOwogfQogCi1pbnQgUmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaW5lOjpjbGllbnRQYWRkaW5nTGVmdCgpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlclRleHRD b250cm9sU2luZ2xlTGluZTo6Y2xpZW50UGFkZGluZ0xlZnQoKSBjb25zdAogewotICAgIGludCBw YWRkaW5nID0gcGFkZGluZ0xlZnQoKTsKKyAgICBMYXlvdXRVbml0IHBhZGRpbmcgPSBwYWRkaW5n TGVmdCgpOwogCiAgICAgSFRNTEVsZW1lbnQqIHJlc3VsdHNCdXR0b24gPSByZXN1bHRzQnV0dG9u RWxlbWVudCgpOwogICAgIGlmIChSZW5kZXJCb3gqIHJlc3VsdHNSZW5kZXJlciA9IHJlc3VsdHNC dXR0b24gPyByZXN1bHRzQnV0dG9uLT5yZW5kZXJCb3goKSA6IDApCkBAIC02MzksOSArNjM5LDkg QEAgaW50IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Y2xpZW50UAogICAgIHJldHVybiBw YWRkaW5nOwogfQogCi1pbnQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjbGllbnRQYWRk aW5nUmlnaHQoKSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6 OmNsaWVudFBhZGRpbmdSaWdodCgpIGNvbnN0CiB7Ci0gICAgaW50IHBhZGRpbmcgPSBwYWRkaW5n UmlnaHQoKTsKKyAgICBMYXlvdXRVbml0IHBhZGRpbmcgPSBwYWRkaW5nUmlnaHQoKTsKIAogICAg IEhUTUxFbGVtZW50KiBjYW5jZWxCdXR0b24gPSBjYW5jZWxCdXR0b25FbGVtZW50KCk7CiAgICAg aWYgKFJlbmRlckJveCogY2FuY2VsUmVuZGVyZXIgPSBjYW5jZWxCdXR0b24gPyBjYW5jZWxCdXR0 b24tPnJlbmRlckJveCgpIDogMCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmgJKHJldmlzaW9uIDk5MDAyKQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsOCArMTAyLDggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IFBvcHVwTWVudVN0eWxlIG1lbnVTdHlsZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50IGNsaWVu dEluc2V0TGVmdCgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50IGNsaWVudEluc2V0UmlnaHQoKSBj b25zdDsKLSAgICB2aXJ0dWFsIGludCBjbGllbnRQYWRkaW5nTGVmdCgpIGNvbnN0OwotICAgIHZp cnR1YWwgaW50IGNsaWVudFBhZGRpbmdSaWdodCgpIGNvbnN0OworICAgIHZpcnR1YWwgTGF5b3V0 VW5pdCBjbGllbnRQYWRkaW5nTGVmdCgpIGNvbnN0OworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBj bGllbnRQYWRkaW5nUmlnaHQoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBsaXN0U2l6ZSgpIGNv bnN0OwogICAgIHZpcnR1YWwgaW50IHNlbGVjdGVkSW5kZXgoKSBjb25zdDsKICAgICB2aXJ0dWFs IHZvaWQgcG9wdXBEaWRIaWRlKCk7Cg==