44724 2010-08-26 15:14:08 -0700 [Chromium] Implement LayoutTestController::markerTextForListItem() 2010-08-26 21:34:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi abarth dglazkov eric fishd webkit.review.bot oldest_to_newest 270149 0 dumi 2010-08-26 15:14:08 -0700 Add markerTextForListItem() to Chromium's LayoutTestController. 270194 1 65641 dumi 2010-08-26 16:14:39 -0700 Created attachment 65641 patch WebKit's side of the patch. Chromium's side is at http://codereview.chromium.org/3213001. 270210 2 65641 fishd 2010-08-26 16:49:08 -0700 Comment on attachment 65641 patch WebKit/chromium/public/WebFrame.h:522 + virtual WebString markerTextForListItem(const WebElement& webElement) const = 0; nit: no parameter name here since the parameter name does not add information. WebKit/chromium/src/WebFrameImpl.cpp:1696 + return WebCore::markerTextForListItem(element.get()); nit: change this to the following: WebString WebFrameImpl::markerTextForListItem(const WebElement& element) const { return WebCore::markerTextForListItem(element.unwrap<Element>()); } 270227 3 65648 dumi 2010-08-26 17:13:52 -0700 Created attachment 65648 patch 270273 4 webkit.review.bot 2010-08-26 19:23:30 -0700 Attachment 65648 did not build on chromium: Build output: http://queues.webkit.org/results/3865003 270290 5 65648 fishd 2010-08-26 20:33:31 -0700 Comment on attachment 65648 patch WebKit/chromium/src/WebFrameImpl.h:179 + virtual WebString markerTextForListItem(const WebElement& webElement) const; nit: no parameter name here. R=me w/ that fix 270293 6 dumi 2010-08-26 20:37:12 -0700 (In reply to comment #5) > (From update of attachment 65648 [details]) > WebKit/chromium/src/WebFrameImpl.h:179 > + virtual WebString markerTextForListItem(const WebElement& webElement) const; > nit: no parameter name here. > > R=me w/ that fix done. 270303 7 webkit.review.bot 2010-08-26 21:08:28 -0700 http://trac.webkit.org/changeset/66176 might have broken Chromium Linux Release 270308 8 dumi 2010-08-26 21:34:35 -0700 landed: r66176. fixed the build breakage in r66180. 65641 2010-08-26 16:14:39 -0700 2010-08-26 17:13:52 -0700 patch patch text/plain 5506 dumi SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjYxNDgpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMjYgIER1bWl0 cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgbWFya2VyVGV4dEZvckxp c3RJdGVtKCkgdG8gQ2hyb21pdW0ncyBMYXlvdXRUZXN0Q29udHJvbGxlci4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NzI0CisKKyAgICAgICAgKiBw dWJsaWMvV2ViQmluZGluZ3MuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAg ICAgKiBzcmMvV2ViQmluZGluZ3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpnZXRFbGVtZW50SW1w bCk6CisgICAgICAgIChXZWJLaXQ6OldlYkJpbmRpbmdzOjpnZXRFbGVtZW50KToKKyAgICAgICAg KiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpt YXJrZXJUZXh0Rm9yTGlzdEl0ZW0pOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuaDoKKwog MjAxMC0wOC0yNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi QmluZGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkJpbmRp bmdzLmgJKHJldmlzaW9uIDY2MTQzKQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJCaW5k aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNyw3IEBACiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAogY2xhc3MgV2ViRHJhZ0RhdGE7CitjbGFzcyBXZWJFbGVtZW50OwogY2xhc3MgV2ViUmFu Z2U7CiAKIC8vIEEgaGFwaGF6YXJkIGNvbGxlY3Rpb24gb2YgZnVuY3Rpb25zIGZvciBkZWFsaW5n IHdpdGggcGx1Z2lucy4KQEAgLTEzOSw2ICsxNDAsMTAgQEAgcHVibGljOgogICAgIC8vIElmIHNv LCByZXR1cm4gdGhhdCByYW5nZSBhcyBhIFdlYlJhbmdlIG9iamVjdC4KICAgICBXRUJLSVRfQVBJ IHN0YXRpYyBib29sIGdldFJhbmdlKE5QT2JqZWN0KiByYW5nZSwgV2ViUmFuZ2UqKTsKIAorICAg IC8vIFJldHVybiB0cnVlIChzdWNjZXNzKSBpZiB0aGUgZ2l2ZW4gbnBvYmogaXMgYW4gZWxlbWVu dC4KKyAgICAvLyBJZiBzbywgcmV0dXJuIHRoYXQgZWxlbWVudCBhcyBhIFdlYkVsZW1lbnQgb2Jq ZWN0LgorICAgIFdFQktJVF9BUEkgc3RhdGljIGJvb2wgZ2V0RWxlbWVudChOUE9iamVjdCogZWxl bWVudCwgV2ViRWxlbWVudCopOworCiAgICAgLy8gRXhjZXB0aW9ucyAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKICAgICB0eXBl ZGVmIHZvaWQgKEV4Y2VwdGlvbkhhbmRsZXIpKHZvaWQqIGRhdGEsIGNvbnN0IE5QVVRGOCogbWVz c2FnZSk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCShyZXZpc2lvbiA2NjE0MykK KysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAt NTE4LDYgKzUxOCw4IEBAIHB1YmxpYzoKICAgICAvLyB1c2VkIHRvIHN1cHBvcnQgbGF5b3V0IHRl c3RzLgogICAgIHZpcnR1YWwgV2ViU3RyaW5nIGNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKGNv bnN0IFdlYlN0cmluZyYgaWQpIGNvbnN0ID0gMDsKIAorICAgIC8vIENhbGxzIG1hcmtlclRleHRG b3JMaXN0SXRlbSgpIGRlZmluZWQgaW4gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4 dC5oLgorICAgIHZpcnR1YWwgV2ViU3RyaW5nIG1hcmtlclRleHRGb3JMaXN0SXRlbShjb25zdCBX ZWJFbGVtZW50JiB3ZWJFbGVtZW50KSBjb25zdCA9IDA7CiAKICAgICAvLyBSZXR1cm5zIHRoZSBu dW1iZXIgb2YgcGFnZSB3aGVyZSB0aGUgc3BlY2lmaWVkIGVsZW1lbnQgd2lsbCBiZSBwdXQuCiAg ICAgLy8gVGhpcyBtZXRob2QgaXMgdXNlZCB0byBzdXBwb3J0IGxheW91dCB0ZXN0cy4KSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3BwCShyZXZpc2lvbiA2NjE0MykKKysrIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViQmluZGluZ3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0 Myw3IEBACiAjaW5jbHVkZSAiUmFuZ2UuaCIKICNpbmNsdWRlICJWOEJpbmRpbmdTdGF0ZS5oIgog I2luY2x1ZGUgIlY4RE9NV3JhcHBlci5oIgorI2luY2x1ZGUgIlY4RWxlbWVudC5oIgogI2luY2x1 ZGUgIlY4RXZlbnQuaCIKICNpbmNsdWRlICJWOEhlbHBlcnMuaCIKICNpbmNsdWRlICJWOEhpZGRl blByb3BlcnR5TmFtZS5oIgpAQCAtNTMsNiArNTQsNyBAQAogI2luY2x1ZGUgImJyaWRnZS9jL2Nf dXRpbGl0eS5oIgogI2VuZGlmCiAjaW5jbHVkZSAiV2ViRHJhZ0RhdGEuaCIKKyNpbmNsdWRlICJX ZWJFbGVtZW50LmgiCiAjaW5jbHVkZSAiV2ViUmFuZ2UuaCIKIAogI2lmIFVTRShKQVZBU0NSSVBU Q09SRV9CSU5ESU5HUykKQEAgLTI5NSw2ICsyOTcsMjEgQEAgc3RhdGljIGJvb2wgZ2V0UmFuZ2VJ bXBsKE5QT2JqZWN0KiBucG9iagogICAgIHJldHVybiB0cnVlOwogfQogCitzdGF0aWMgYm9vbCBn ZXRFbGVtZW50SW1wbChOUE9iamVjdCogbnBPYmosIFdlYkVsZW1lbnQqIHdlYkVsZW1lbnQpCit7 CisgICAgaWYgKCFucE9iaiB8fCAobnBPYmotPl9jbGFzcyAhPSBucFNjcmlwdE9iamVjdENsYXNz KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgVjhOUE9iamVjdCogdjhOUE9iamVjdCA9 IHJlaW50ZXJwcmV0X2Nhc3Q8VjhOUE9iamVjdCo+KG5wT2JqKTsKKyAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IHY4T2JqZWN0KHY4TlBPYmplY3QtPnY4T2JqZWN0KTsKKyAgICBFbGVtZW50KiBu YXRpdmUgPSBWOEVsZW1lbnQ6OnRvTmF0aXZlKHY4T2JqZWN0KTsKKyAgICBpZiAoIW5hdGl2ZSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgKndlYkVsZW1lbnQgPSBXZWJFbGVtZW50KG5h dGl2ZSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKICNlbmRpZgogCiBib29sIFdlYkJpbmRpbmdz OjpnZXREcmFnRGF0YShOUE9iamVjdCogZXZlbnQsIGludCogZXZlbnRJZCwgV2ViRHJhZ0RhdGEq IGRhdGEpCkBAIC0zMjMsNiArMzQwLDE2IEBAIGJvb2wgV2ViQmluZGluZ3M6OmdldFJhbmdlKE5Q T2JqZWN0KiByYW4KICNlbmRpZgogfQogCitib29sIFdlYkJpbmRpbmdzOjpnZXRFbGVtZW50KE5Q T2JqZWN0KiBlbGVtZW50LCBXZWJFbGVtZW50KiB3ZWJFbGVtZW50KQoreworI2lmIFVTRShWOCkK KyAgICByZXR1cm4gZ2V0RWxlbWVudEltcGwoZWxlbWVudCwgd2ViRWxlbWVudCk7CisjZWxzZQor ICAgIC8vIE5vdCBzdXBwb3J0ZWQgb24gb3RoZXIgcG9ydHMgKEpTQywgZXRjLikuCisgICAgcmV0 dXJuIGZhbHNlOworI2VuZGlmCit9CisKIHZvaWQgV2ViQmluZGluZ3M6OnB1c2hFeGNlcHRpb25I YW5kbGVyKEV4Y2VwdGlvbkhhbmRsZXIgaGFuZGxlciwgdm9pZCogZGF0YSkKIHsKICAgICBXZWJD b3JlOjpwdXNoRXhjZXB0aW9uSGFuZGxlcihoYW5kbGVyLCBkYXRhKTsKSW5kZXg6IFdlYktpdC9j aHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAJKHJldmlzaW9uIDY2MTQzKQorKysgV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjkwLDYgKzE2OTAs MTIgQEAgV2ViU3RyaW5nIFdlYkZyYW1lSW1wbDo6Y291bnRlclZhbHVlRm9yRQogICAgIHJldHVy biBjb3VudGVyVmFsdWVGb3JFbGVtZW50KGVsZW1lbnQpOwogfQogCitXZWJTdHJpbmcgV2ViRnJh bWVJbXBsOjptYXJrZXJUZXh0Rm9yTGlzdEl0ZW0oY29uc3QgV2ViRWxlbWVudCYgd2ViRWxlbWVu dCkgY29uc3QKK3sKKyAgICBSZWZQdHI8RWxlbWVudD4gZWxlbWVudCA9IFBhc3NSZWZQdHI8RWxl bWVudD4od2ViRWxlbWVudCk7CisgICAgcmV0dXJuIFdlYkNvcmU6Om1hcmtlclRleHRGb3JMaXN0 SXRlbShlbGVtZW50LmdldCgpKTsKK30KKwogaW50IFdlYkZyYW1lSW1wbDo6cGFnZU51bWJlckZv ckVsZW1lbnRCeUlkKGNvbnN0IFdlYlN0cmluZyYgaWQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZmxvYXQgcGFnZVdpZHRoSW5QaXhlbHMsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxvYXQgcGFnZUhlaWdodEluUGl4ZWxz KSBjb25zdApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCShyZXZpc2lvbiA2NjE0 MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHdvcmtpbmcgY29weSkK QEAgLTE3Niw2ICsxNzYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgY29udGVu dEFzTWFya3VwKCkgY29uc3Q7CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgcmVuZGVyVHJlZUFzVGV4 dCgpIGNvbnN0OwogICAgIHZpcnR1YWwgV2ViU3RyaW5nIGNvdW50ZXJWYWx1ZUZvckVsZW1lbnRC eUlkKGNvbnN0IFdlYlN0cmluZyYgaWQpIGNvbnN0OworICAgIHZpcnR1YWwgV2ViU3RyaW5nIG1h cmtlclRleHRGb3JMaXN0SXRlbShjb25zdCBXZWJFbGVtZW50JiB3ZWJFbGVtZW50KSBjb25zdDsK ICAgICB2aXJ0dWFsIGludCBwYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoY29uc3QgV2ViU3RyaW5n JiBpZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxvYXQgcGFn ZVdpZHRoSW5QaXhlbHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGZsb2F0IHBhZ2VIZWlnaHRJblBpeGVscykgY29uc3Q7Cg== 65648 2010-08-26 17:13:52 -0700 2010-08-26 20:33:31 -0700 patch patch text/plain 5443 dumi SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjYxNDgpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMjYgIER1bWl0 cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgbWFya2VyVGV4dEZvckxp c3RJdGVtKCkgdG8gQ2hyb21pdW0ncyBMYXlvdXRUZXN0Q29udHJvbGxlci4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NzI0CisKKyAgICAgICAgKiBw dWJsaWMvV2ViQmluZGluZ3MuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAg ICAgKiBzcmMvV2ViQmluZGluZ3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpnZXRFbGVtZW50SW1w bCk6CisgICAgICAgIChXZWJLaXQ6OldlYkJpbmRpbmdzOjpnZXRFbGVtZW50KToKKyAgICAgICAg KiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpt YXJrZXJUZXh0Rm9yTGlzdEl0ZW0pOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuaDoKKwog MjAxMC0wOC0yNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi QmluZGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkJpbmRp bmdzLmgJKHJldmlzaW9uIDY2MTQzKQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJCaW5k aW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNyw3IEBACiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAogY2xhc3MgV2ViRHJhZ0RhdGE7CitjbGFzcyBXZWJFbGVtZW50OwogY2xhc3MgV2ViUmFu Z2U7CiAKIC8vIEEgaGFwaGF6YXJkIGNvbGxlY3Rpb24gb2YgZnVuY3Rpb25zIGZvciBkZWFsaW5n IHdpdGggcGx1Z2lucy4KQEAgLTEzOSw2ICsxNDAsMTAgQEAgcHVibGljOgogICAgIC8vIElmIHNv LCByZXR1cm4gdGhhdCByYW5nZSBhcyBhIFdlYlJhbmdlIG9iamVjdC4KICAgICBXRUJLSVRfQVBJ IHN0YXRpYyBib29sIGdldFJhbmdlKE5QT2JqZWN0KiByYW5nZSwgV2ViUmFuZ2UqKTsKIAorICAg IC8vIFJldHVybiB0cnVlIChzdWNjZXNzKSBpZiB0aGUgZ2l2ZW4gbnBvYmogaXMgYW4gZWxlbWVu dC4KKyAgICAvLyBJZiBzbywgcmV0dXJuIHRoYXQgZWxlbWVudCBhcyBhIFdlYkVsZW1lbnQgb2Jq ZWN0LgorICAgIFdFQktJVF9BUEkgc3RhdGljIGJvb2wgZ2V0RWxlbWVudChOUE9iamVjdCogZWxl bWVudCwgV2ViRWxlbWVudCopOworCiAgICAgLy8gRXhjZXB0aW9ucyAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKICAgICB0eXBl ZGVmIHZvaWQgKEV4Y2VwdGlvbkhhbmRsZXIpKHZvaWQqIGRhdGEsIGNvbnN0IE5QVVRGOCogbWVz c2FnZSk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCShyZXZpc2lvbiA2NjE0MykK KysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAt NTE4LDYgKzUxOCw4IEBAIHB1YmxpYzoKICAgICAvLyB1c2VkIHRvIHN1cHBvcnQgbGF5b3V0IHRl c3RzLgogICAgIHZpcnR1YWwgV2ViU3RyaW5nIGNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKGNv bnN0IFdlYlN0cmluZyYgaWQpIGNvbnN0ID0gMDsKIAorICAgIC8vIENhbGxzIG1hcmtlclRleHRG b3JMaXN0SXRlbSgpIGRlZmluZWQgaW4gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4 dC5oLgorICAgIHZpcnR1YWwgV2ViU3RyaW5nIG1hcmtlclRleHRGb3JMaXN0SXRlbShjb25zdCBX ZWJFbGVtZW50JikgY29uc3QgPSAwOwogCiAgICAgLy8gUmV0dXJucyB0aGUgbnVtYmVyIG9mIHBh Z2Ugd2hlcmUgdGhlIHNwZWNpZmllZCBlbGVtZW50IHdpbGwgYmUgcHV0LgogICAgIC8vIFRoaXMg bWV0aG9kIGlzIHVzZWQgdG8gc3VwcG9ydCBsYXlvdXQgdGVzdHMuCkluZGV4OiBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYkJpbmRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYkJpbmRpbmdzLmNwcAkocmV2aXNpb24gNjYxNDMpCisrKyBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYkJpbmRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQAogI2lu Y2x1ZGUgIlJhbmdlLmgiCiAjaW5jbHVkZSAiVjhCaW5kaW5nU3RhdGUuaCIKICNpbmNsdWRlICJW OERPTVdyYXBwZXIuaCIKKyNpbmNsdWRlICJWOEVsZW1lbnQuaCIKICNpbmNsdWRlICJWOEV2ZW50 LmgiCiAjaW5jbHVkZSAiVjhIZWxwZXJzLmgiCiAjaW5jbHVkZSAiVjhIaWRkZW5Qcm9wZXJ0eU5h bWUuaCIKQEAgLTUzLDYgKzU0LDcgQEAKICNpbmNsdWRlICJicmlkZ2UvYy9jX3V0aWxpdHkuaCIK ICNlbmRpZgogI2luY2x1ZGUgIldlYkRyYWdEYXRhLmgiCisjaW5jbHVkZSAiV2ViRWxlbWVudC5o IgogI2luY2x1ZGUgIldlYlJhbmdlLmgiCiAKICNpZiBVU0UoSkFWQVNDUklQVENPUkVfQklORElO R1MpCkBAIC0yOTUsNiArMjk3LDIxIEBAIHN0YXRpYyBib29sIGdldFJhbmdlSW1wbChOUE9iamVj dCogbnBvYmoKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGJvb2wgZ2V0RWxlbWVudElt cGwoTlBPYmplY3QqIG5wT2JqLCBXZWJFbGVtZW50KiB3ZWJFbGVtZW50KQoreworICAgIGlmICgh bnBPYmogfHwgKG5wT2JqLT5fY2xhc3MgIT0gbnBTY3JpcHRPYmplY3RDbGFzcykpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIFY4TlBPYmplY3QqIHY4TlBPYmplY3QgPSByZWludGVycHJl dF9jYXN0PFY4TlBPYmplY3QqPihucE9iaik7CisgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB2 OE9iamVjdCh2OE5QT2JqZWN0LT52OE9iamVjdCk7CisgICAgRWxlbWVudCogbmF0aXZlID0gVjhF bGVtZW50Ojp0b05hdGl2ZSh2OE9iamVjdCk7CisgICAgaWYgKCFuYXRpdmUpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgICp3ZWJFbGVtZW50ID0gV2ViRWxlbWVudChuYXRpdmUpOworICAg IHJldHVybiB0cnVlOworfQorCiAjZW5kaWYKIAogYm9vbCBXZWJCaW5kaW5nczo6Z2V0RHJhZ0Rh dGEoTlBPYmplY3QqIGV2ZW50LCBpbnQqIGV2ZW50SWQsIFdlYkRyYWdEYXRhKiBkYXRhKQpAQCAt MzIzLDYgKzM0MCwxNiBAQCBib29sIFdlYkJpbmRpbmdzOjpnZXRSYW5nZShOUE9iamVjdCogcmFu CiAjZW5kaWYKIH0KIAorYm9vbCBXZWJCaW5kaW5nczo6Z2V0RWxlbWVudChOUE9iamVjdCogZWxl bWVudCwgV2ViRWxlbWVudCogd2ViRWxlbWVudCkKK3sKKyNpZiBVU0UoVjgpCisgICAgcmV0dXJu IGdldEVsZW1lbnRJbXBsKGVsZW1lbnQsIHdlYkVsZW1lbnQpOworI2Vsc2UKKyAgICAvLyBOb3Qg c3VwcG9ydGVkIG9uIG90aGVyIHBvcnRzIChKU0MsIGV0Yy4pLgorICAgIHJldHVybiBmYWxzZTsK KyNlbmRpZgorfQorCiB2b2lkIFdlYkJpbmRpbmdzOjpwdXNoRXhjZXB0aW9uSGFuZGxlcihFeGNl cHRpb25IYW5kbGVyIGhhbmRsZXIsIHZvaWQqIGRhdGEpCiB7CiAgICAgV2ViQ29yZTo6cHVzaEV4 Y2VwdGlvbkhhbmRsZXIoaGFuZGxlciwgZGF0YSk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJG cmFtZUltcGwuY3BwCShyZXZpc2lvbiA2NjE0MykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2Vi RnJhbWVJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY5MCw2ICsxNjkwLDExIEBAIFdlYlN0 cmluZyBXZWJGcmFtZUltcGw6OmNvdW50ZXJWYWx1ZUZvckUKICAgICByZXR1cm4gY291bnRlclZh bHVlRm9yRWxlbWVudChlbGVtZW50KTsKIH0KIAorV2ViU3RyaW5nIFdlYkZyYW1lSW1wbDo6bWFy a2VyVGV4dEZvckxpc3RJdGVtKGNvbnN0IFdlYkVsZW1lbnQmIHdlYkVsZW1lbnQpIGNvbnN0Cit7 CisgICAgcmV0dXJuIFdlYkNvcmU6Om1hcmtlclRleHRGb3JMaXN0SXRlbShlbGVtZW50LnVud3Jh cDxFbGVtZW50PigpKTsKK30KKwogaW50IFdlYkZyYW1lSW1wbDo6cGFnZU51bWJlckZvckVsZW1l bnRCeUlkKGNvbnN0IFdlYlN0cmluZyYgaWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZmxvYXQgcGFnZVdpZHRoSW5QaXhlbHMsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxvYXQgcGFnZUhlaWdodEluUGl4ZWxzKSBjb25z dApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCShyZXZpc2lvbiA2NjE0MykKKysr IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3 Niw2ICsxNzYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgY29udGVudEFzTWFy a3VwKCkgY29uc3Q7CiAgICAgdmlydHVhbCBXZWJTdHJpbmcgcmVuZGVyVHJlZUFzVGV4dCgpIGNv bnN0OwogICAgIHZpcnR1YWwgV2ViU3RyaW5nIGNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKGNv bnN0IFdlYlN0cmluZyYgaWQpIGNvbnN0OworICAgIHZpcnR1YWwgV2ViU3RyaW5nIG1hcmtlclRl eHRGb3JMaXN0SXRlbShjb25zdCBXZWJFbGVtZW50JiB3ZWJFbGVtZW50KSBjb25zdDsKICAgICB2 aXJ0dWFsIGludCBwYWdlTnVtYmVyRm9yRWxlbWVudEJ5SWQoY29uc3QgV2ViU3RyaW5nJiBpZCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmxvYXQgcGFnZVdpZHRo SW5QaXhlbHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsb2F0 IHBhZ2VIZWlnaHRJblBpeGVscykgY29uc3Q7Cg==