91564 2012-07-17 17:28:47 -0700 Element wants to have userAgentShadowRoot() 2012-07-18 22:09:09 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 82313 1 morrita shinyak cmarcelo dglazkov eric.carlson feature-media-reviews shinyak webkit.review.bot oldest_to_newest 671790 0 morrita 2012-07-17 17:28:47 -0700 This is a follow up t bug 77936. userAgentShadowRoot() could have an assertion to type debug field. Also, it will make ua-shadow related code more readable. 671865 1 shinyak 2012-07-17 18:53:36 -0700 I think Element should have this method, right? A lot of code use the following pattern shadow()->oldestShadowRoot()->... But we should be able to do: userAgentShadowRoot()->... 671966 2 152919 shinyak 2012-07-17 22:22:56 -0700 Created attachment 152919 Patch 671986 3 152919 webkit-ews 2012-07-17 22:37:55 -0700 Comment on attachment 152919 Patch Attachment 152919 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13269368 671989 4 152919 webkit-ews 2012-07-17 22:40:24 -0700 Comment on attachment 152919 Patch Attachment 152919 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/13273405 671991 5 152919 webkit.review.bot 2012-07-17 22:42:38 -0700 Comment on attachment 152919 Patch Attachment 152919 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13277399 671994 6 152930 shinyak 2012-07-17 22:46:12 -0700 Created attachment 152930 Patch 672441 7 152930 eric.carlson 2012-07-18 09:39:30 -0700 Comment on attachment 152930 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152930&action=review This is much cleaner, thanks! > Source/WebCore/html/HTMLMediaElement.cpp:4185 > + if (ShadowRoot* userAgent = userAgentShadowRoot()) { > + Node* node = userAgent->firstChild(); > + return node && node->isMediaControls(); > + } Isn't it true that userAgentShadowRoot()->firstChild() *must* be the media controls? If so, I think "&& node->isMediaControls()" could be replaced with "ASSERT(node->isMediaControls())". 673034 8 shinyak 2012-07-18 17:58:00 -0700 (In reply to comment #7) > (From update of attachment 152930 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152930&action=review > > This is much cleaner, thanks! > > > Source/WebCore/html/HTMLMediaElement.cpp:4185 > > + if (ShadowRoot* userAgent = userAgentShadowRoot()) { > > + Node* node = userAgent->firstChild(); > > + return node && node->isMediaControls(); > > + } > > Isn't it true that userAgentShadowRoot()->firstChild() *must* be the media controls? If so, I think "&& node->isMediaControls()" could be replaced with "ASSERT(node->isMediaControls())". If firstChild() exists, it must be the media control, I believe. I'll update the patch, and if it passes tests, I'll land it. 673042 9 153150 shinyak 2012-07-18 18:11:38 -0700 Created attachment 153150 Patch for landing 673164 10 153150 webkit.review.bot 2012-07-18 22:09:03 -0700 Comment on attachment 153150 Patch for landing Clearing flags on attachment: 153150 Committed r123071: <http://trac.webkit.org/changeset/123071> 673165 11 webkit.review.bot 2012-07-18 22:09:09 -0700 All reviewed patches have been landed. Closing bug. 152919 2012-07-17 22:22:56 -0700 2012-07-17 22:46:06 -0700 Patch bug-91564-20120718142255.patch text/plain 5209 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTE2ZTRmZTliMWFkMjNl YWU3YjU4NWYyYTBlOTYxMjFjOTA0ZDBkOS4uODYwMDAyZmU1ODM0MDk3ZjgyM2E4ZTRlZTA0YTgz MTc5MjYxMzhkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA3LTE3ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBFbGVtZW50IHdh bnRzIHRvIGhhdmUgdXNlckFnZW50U2hhZG93Um9vdCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTU2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGludHJvZHVjZSBFbGVtZW50Ojp1c2VyQWdlbnRT aGFkb3dSb290KCkgdG8gcmV0dXJuIGEgVXNlckFnZW50U2hhZG93Um9vdC4KKyAgICAgICAgSXQg cmV0dXJucyB0aGUgb2xkZXN0IHNoYWRvdyByb290IGlmIGFueSwgYW5kIGNoZWNrcyB0aGUgdHlw ZSBvZiBTaGFkb3dSb290IGluIGRlYnVnIGJ1aWxkLgorCisgICAgICAgIFByZXZpb3VzbHksIHdl IGhhdmUgdXNlZCBlbGVtZW50U2hhZG93KCktPm9sZGVzdFNoYWRvd1Jvb3QoKSB0byBnZXQgVXNl ckFnZW50U2hhZG93Um9vdC4KKyAgICAgICAgVGhlIGNsYXNzIGltcGxlbWVudG9yIHdpbGwga25v dyB0aGUgb2xkZXN0IHNoYWRvdyByb290IGlzIFVzZXJBZ2VudFNoYWRvd1Jvb3QsIGJ1dCBpdCBp cyBub3QKKyAgICAgICAgY2xlYXIgZm9yIHRoZSBvdGhlciBwZW9wbGUuIFRoaXMgbWV0aG9kIHdp bGwgbWFrZSB0aGUgY29kZSBpbnRlbnRpb24gY2xlYXJlci4KKworICAgICAgICBXZSB3aWxsIGlu dHJvZHVjZSB1c2VyQWdlbnRTaGFkb3dSb290IHRvIHRoZSBvdGhlciBlbGVtZW50cyAoZS5nLiBI VE1MSW5wdXRFbGVtZW50KSBhZnRlciB0aGlzIHBhdGNoLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cywgc2ltcGxlIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RWxlbWVudDo6dXNlckFnZW50U2hhZG93Um9vdCk6CisgICAgICAgIChX ZWJDb3JlKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorICAgICAgICAoRWxlbWVudCk6Cisg ICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZVNoYWRvd1N1YnRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6d2lsbEFkZEF1dGhvclNoYWRvd1Jvb3QpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFDb250cm9scyk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpoYXNNZWRpYUNvbnRyb2xzKToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhQ29udHJvbHMpOgorCiAyMDEyLTA3LTE3ICBB bGVjIEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbmRleGVkREI6 IGNyZWF0ZUluZGV4IHNob3VsZCB0aHJvdyBJTlZBTElEX0FDQ0VTU19FUlIgaW5zdGVhZCBvZiBO T1RfU1VQUE9SVEVEX0VSUgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDQyYjQ2OGY5ODI2Yjhm ZThhODhiODJhOGZhODMwYzExMzFiODAxODAuLjA5NGE5NWQ3Zjk4ZGRlM2VmMTVlNWU5ZWJmODA5 NTJlNGVhZDVhZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTExODUsNiArMTE4NSwxOCBA QCBFbGVtZW50U2hhZG93KiBFbGVtZW50OjplbnN1cmVTaGFkb3coKQogICAgIHJldHVybiBlbGVt ZW50UmFyZURhdGEoKS0+bV9zaGFkb3cuZ2V0KCk7CiB9CiAKK1NoYWRvd1Jvb3QqIEVsZW1lbnQ6 OnVzZXJBZ2VudFNoYWRvd1Jvb3QoKSBjb25zdAoreworICAgIGlmIChFbGVtZW50U2hhZG93KiBl bGVtZW50U2hhZG93ID0gc2hhZG93KCkpIHsKKyAgICAgICAgaWYgKFNoYWRvd1Jvb3QqIHNoYWRv d1Jvb3QgPSBlbGVtZW50U2hhZG93LT5vbGRlc3RTaGFkb3dSb290KCkpIHsKKyAgICAgICAgICAg IEFTU0VSVChzaGFkb3dSb290LT50eXBlKCkgPT0gU2hhZG93Um9vdDo6VXNlckFnZW50U2hhZG93 Um9vdCk7CisgICAgICAgICAgICByZXR1cm4gZWxlbWVudFNoYWRvdy0+b2xkZXN0U2hhZG93Um9v dCgpOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisKIFNoYWRvd1Jvb3Qq IEVsZW1lbnQ6OmVuc3VyZVNoYWRvd1Jvb3QoKQogewogICAgIGlmIChFbGVtZW50U2hhZG93KiBz aGFkb3cgPSB0aGlzLT5zaGFkb3coKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9F bGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCmluZGV4IDgwYTFiM2NhYmNm MTU5ZmNlOTllMjYzMWUzY2Q0ODg3MzJmYWU1ZDguLmI1YjIyNTEyZjBlMDU4MWM3Mjk1YWRmNTRi ZjhiNmFmOTcwZDEzZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaApAQCAtMjcwLDYgKzI3MCw4IEBAIHB1 YmxpYzoKICAgICBFbGVtZW50U2hhZG93KiBlbnN1cmVTaGFkb3coKTsKICAgICB2aXJ0dWFsIHZv aWQgd2lsbEFkZEF1dGhvclNoYWRvd1Jvb3QoKSB7IH0KIAorICAgIFNoYWRvd1Jvb3QqIHVzZXJB Z2VudFNoYWRvd1Jvb3QoKSBjb25zdDsKKwogICAgIC8vIEZJWE1FOiBSZW1vdmUgRWxlbWVudDo6 ZW5zdXJlU2hhZG93Um9vdAogICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NzYwOAogICAgIFNoYWRvd1Jvb3QqIGVuc3VyZVNoYWRvd1Jvb3QoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDcwNWEwNWM1ZjhkYjUxNmM2 OGI4NTA4NWE3YjNiNTA3ODY2ZmQ2MTAuLmI3OGEwNjk3OGYwYWVmYTI5MGEwODEwYzI0YzcxODc3 YzFiMjU0OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAt MTg2MiwyMCArMTg2MiwxNCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnByb2dyZXNzRXZlbnRU aW1lckZpcmVkKFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+KikKIAogdm9pZCBIVE1MTWVkaWFFbGVt ZW50OjpjcmVhdGVTaGFkb3dTdWJ0cmVlKCkKIHsKLSAgICBBU1NFUlQoIXNoYWRvdygpIHx8ICFz aGFkb3coKS0+b2xkZXN0U2hhZG93Um9vdCgpKTsKLQorICAgIEFTU0VSVCghdXNlckFnZW50U2hh ZG93Um9vdCgpKTsKICAgICBTaGFkb3dSb290OjpjcmVhdGUodGhpcywgU2hhZG93Um9vdDo6VXNl ckFnZW50U2hhZG93Um9vdCk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6d2lsbEFkZEF1 dGhvclNoYWRvd1Jvb3QoKQogewotICAgIEFTU0VSVChzaGFkb3coKSk7Ci0gICAgaWYgKHNoYWRv dygpLT5vbGRlc3RTaGFkb3dSb290KCkpIHsKLSAgICAgICAgQVNTRVJUKHNoYWRvdygpLT5vbGRl c3RTaGFkb3dSb290KCktPnR5cGUoKSA9PSBTaGFkb3dSb290OjpVc2VyQWdlbnRTaGFkb3dSb290 KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGNyZWF0ZVNoYWRvd1N1YnRyZWUoKTsK KyAgICBpZiAoIXVzZXJBZ2VudFNoYWRvd1Jvb3QoKSkKKyAgICAgICAgY3JlYXRlU2hhZG93U3Vi dHJlZSgpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnJld2luZChmbG9hdCB0aW1lRGVs dGEpCkBAIC00MTgwLDE3ICs0MTc0LDE3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cHJpdmF0 ZUJyb3dzaW5nU3RhdGVEaWRDaGFuZ2UoKQogCiBNZWRpYUNvbnRyb2xzKiBIVE1MTWVkaWFFbGVt ZW50OjptZWRpYUNvbnRyb2xzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gdG9NZWRpYUNvbnRyb2xz KHNoYWRvdygpLT5vbGRlc3RTaGFkb3dSb290KCktPmZpcnN0Q2hpbGQoKSk7CisgICAgcmV0dXJu IHRvTWVkaWFDb250cm9scyh1c2VyQWdlbnRTaGFkb3dSb290KCktPmZpcnN0Q2hpbGQoKSk7CiB9 CiAKIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6aGFzTWVkaWFDb250cm9scygpIGNvbnN0CiB7Ci0g ICAgRWxlbWVudFNoYWRvdyogZWxlbWVudFNoYWRvdyA9IHNoYWRvdygpOwotICAgIGlmICghZWxl bWVudFNoYWRvdykKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChTaGFkb3dSb290KiB1 c2VyQWdlbnQgPSB1c2VyQWdlbnRTaGFkb3dSb290KCkpIHsKKyAgICAgICAgTm9kZSogbm9kZSA9 IHVzZXJBZ2VudC0+Zmlyc3RDaGlsZCgpOworICAgICAgICByZXR1cm4gbm9kZSAmJiBub2RlLT5p c01lZGlhQ29udHJvbHMoKTsKKyAgICB9CiAKLSAgICBOb2RlKiBub2RlID0gZWxlbWVudFNoYWRv dy0+b2xkZXN0U2hhZG93Um9vdCgpLT5maXJzdENoaWxkKCk7Ci0gICAgcmV0dXJuIG5vZGUgJiYg bm9kZS0+aXNNZWRpYUNvbnRyb2xzKCk7CisgICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29sIEhU TUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhQ29udHJvbHMoKQpAQCAtNDIxMSw4ICs0MjA1LDgg QEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjpjcmVhdGVNZWRpYUNvbnRyb2xzKCkKICAgICBpZiAo IXNoYWRvdygpKQogICAgICAgICBjcmVhdGVTaGFkb3dTdWJ0cmVlKCk7CiAKLSAgICBBU1NFUlQo c2hhZG93KCktPm9sZGVzdFNoYWRvd1Jvb3QoKS0+dHlwZSgpID09IFNoYWRvd1Jvb3Q6OlVzZXJB Z2VudFNoYWRvd1Jvb3QpOwotICAgIHNoYWRvdygpLT5vbGRlc3RTaGFkb3dSb290KCktPmFwcGVu ZENoaWxkKGNvbnRyb2xzLCBlYyk7CisgICAgQVNTRVJUKHVzZXJBZ2VudFNoYWRvd1Jvb3QoKSk7 CisgICAgdXNlckFnZW50U2hhZG93Um9vdCgpLT5hcHBlbmRDaGlsZChjb250cm9scywgZWMpOwog ICAgIHJldHVybiB0cnVlOwogfQogCg== 152930 2012-07-17 22:46:12 -0700 2012-07-18 18:11:32 -0700 Patch bug-91564-20120718144611.patch text/plain 5186 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTE2ZTRmZTliMWFkMjNl YWU3YjU4NWYyYTBlOTYxMjFjOTA0ZDBkOS4uODYwMDAyZmU1ODM0MDk3ZjgyM2E4ZTRlZTA0YTgz MTc5MjYxMzhkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA3LTE3ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBFbGVtZW50IHdh bnRzIHRvIGhhdmUgdXNlckFnZW50U2hhZG93Um9vdCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTU2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGludHJvZHVjZSBFbGVtZW50Ojp1c2VyQWdlbnRT aGFkb3dSb290KCkgdG8gcmV0dXJuIGEgVXNlckFnZW50U2hhZG93Um9vdC4KKyAgICAgICAgSXQg cmV0dXJucyB0aGUgb2xkZXN0IHNoYWRvdyByb290IGlmIGFueSwgYW5kIGNoZWNrcyB0aGUgdHlw ZSBvZiBTaGFkb3dSb290IGluIGRlYnVnIGJ1aWxkLgorCisgICAgICAgIFByZXZpb3VzbHksIHdl IGhhdmUgdXNlZCBlbGVtZW50U2hhZG93KCktPm9sZGVzdFNoYWRvd1Jvb3QoKSB0byBnZXQgVXNl ckFnZW50U2hhZG93Um9vdC4KKyAgICAgICAgVGhlIGNsYXNzIGltcGxlbWVudG9yIHdpbGwga25v dyB0aGUgb2xkZXN0IHNoYWRvdyByb290IGlzIFVzZXJBZ2VudFNoYWRvd1Jvb3QsIGJ1dCBpdCBp cyBub3QKKyAgICAgICAgY2xlYXIgZm9yIHRoZSBvdGhlciBwZW9wbGUuIFRoaXMgbWV0aG9kIHdp bGwgbWFrZSB0aGUgY29kZSBpbnRlbnRpb24gY2xlYXJlci4KKworICAgICAgICBXZSB3aWxsIGlu dHJvZHVjZSB1c2VyQWdlbnRTaGFkb3dSb290IHRvIHRoZSBvdGhlciBlbGVtZW50cyAoZS5nLiBI VE1MSW5wdXRFbGVtZW50KSBhZnRlciB0aGlzIHBhdGNoLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cywgc2ltcGxlIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RWxlbWVudDo6dXNlckFnZW50U2hhZG93Um9vdCk6CisgICAgICAgIChX ZWJDb3JlKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorICAgICAgICAoRWxlbWVudCk6Cisg ICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZVNoYWRvd1N1YnRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6d2lsbEFkZEF1dGhvclNoYWRvd1Jvb3QpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFDb250cm9scyk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpoYXNNZWRpYUNvbnRyb2xzKToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhQ29udHJvbHMpOgorCiAyMDEyLTA3LTE3ICBB bGVjIEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbmRleGVkREI6 IGNyZWF0ZUluZGV4IHNob3VsZCB0aHJvdyBJTlZBTElEX0FDQ0VTU19FUlIgaW5zdGVhZCBvZiBO T1RfU1VQUE9SVEVEX0VSUgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDQyYjQ2OGY5ODI2Yjhm ZThhODhiODJhOGZhODMwYzExMzFiODAxODAuLjM0OTk0NDdlZDkxNGFlOWMwMDBiZjc1N2JmZjYy OGM5NzEwZDFjNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTExODUsNiArMTE4NSwxOCBA QCBFbGVtZW50U2hhZG93KiBFbGVtZW50OjplbnN1cmVTaGFkb3coKQogICAgIHJldHVybiBlbGVt ZW50UmFyZURhdGEoKS0+bV9zaGFkb3cuZ2V0KCk7CiB9CiAKK1NoYWRvd1Jvb3QqIEVsZW1lbnQ6 OnVzZXJBZ2VudFNoYWRvd1Jvb3QoKSBjb25zdAoreworICAgIGlmIChFbGVtZW50U2hhZG93KiBl bGVtZW50U2hhZG93ID0gc2hhZG93KCkpIHsKKyAgICAgICAgaWYgKFNoYWRvd1Jvb3QqIHNoYWRv d1Jvb3QgPSBlbGVtZW50U2hhZG93LT5vbGRlc3RTaGFkb3dSb290KCkpIHsKKyAgICAgICAgICAg IEFTU0VSVChzaGFkb3dSb290LT50eXBlKCkgPT0gU2hhZG93Um9vdDo6VXNlckFnZW50U2hhZG93 Um9vdCk7CisgICAgICAgICAgICByZXR1cm4gc2hhZG93Um9vdDsKKyAgICAgICAgfQorICAgIH0K KworICAgIHJldHVybiAwOworfQorCiBTaGFkb3dSb290KiBFbGVtZW50OjplbnN1cmVTaGFkb3dS b290KCkKIHsKICAgICBpZiAoRWxlbWVudFNoYWRvdyogc2hhZG93ID0gdGhpcy0+c2hhZG93KCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnQuaAppbmRleCA4MGExYjNjYWJjZjE1OWZjZTk5ZTI2MzFlM2NkNDg4NzMy ZmFlNWQ4Li5iNWIyMjUxMmYwZTA1ODFjNzI5NWFkZjU0YmY4YjZhZjk3MGQxM2UyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmgKQEAgLTI3MCw2ICsyNzAsOCBAQCBwdWJsaWM6CiAgICAgRWxlbWVudFNoYWRv dyogZW5zdXJlU2hhZG93KCk7CiAgICAgdmlydHVhbCB2b2lkIHdpbGxBZGRBdXRob3JTaGFkb3dS b290KCkgeyB9CiAKKyAgICBTaGFkb3dSb290KiB1c2VyQWdlbnRTaGFkb3dSb290KCkgY29uc3Q7 CisKICAgICAvLyBGSVhNRTogUmVtb3ZlIEVsZW1lbnQ6OmVuc3VyZVNoYWRvd1Jvb3QKICAgICAv LyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc2MDgKICAgICBTaGFk b3dSb290KiBlbnN1cmVTaGFkb3dSb290KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcAppbmRleCA3MDVhMDVjNWY4ZGI1MTZjNjhiODUwODVhN2IzYjUwNzg2NmZkNjEw Li5iNzhhMDY5NzhmMGFlZmEyOTBhMDgxMGMyNGM3MTg3N2MxYjI1NDhmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTE4NjIsMjAgKzE4NjIsMTQgQEAgdm9p ZCBIVE1MTWVkaWFFbGVtZW50Ojpwcm9ncmVzc0V2ZW50VGltZXJGaXJlZChUaW1lcjxIVE1MTWVk aWFFbGVtZW50PiopCiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6Y3JlYXRlU2hhZG93U3VidHJl ZSgpCiB7Ci0gICAgQVNTRVJUKCFzaGFkb3coKSB8fCAhc2hhZG93KCktPm9sZGVzdFNoYWRvd1Jv b3QoKSk7Ci0KKyAgICBBU1NFUlQoIXVzZXJBZ2VudFNoYWRvd1Jvb3QoKSk7CiAgICAgU2hhZG93 Um9vdDo6Y3JlYXRlKHRoaXMsIFNoYWRvd1Jvb3Q6OlVzZXJBZ2VudFNoYWRvd1Jvb3QpOwogfQog CiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OndpbGxBZGRBdXRob3JTaGFkb3dSb290KCkKIHsKLSAg ICBBU1NFUlQoc2hhZG93KCkpOwotICAgIGlmIChzaGFkb3coKS0+b2xkZXN0U2hhZG93Um9vdCgp KSB7Ci0gICAgICAgIEFTU0VSVChzaGFkb3coKS0+b2xkZXN0U2hhZG93Um9vdCgpLT50eXBlKCkg PT0gU2hhZG93Um9vdDo6VXNlckFnZW50U2hhZG93Um9vdCk7Ci0gICAgICAgIHJldHVybjsKLSAg ICB9Ci0KLSAgICBjcmVhdGVTaGFkb3dTdWJ0cmVlKCk7CisgICAgaWYgKCF1c2VyQWdlbnRTaGFk b3dSb290KCkpCisgICAgICAgIGNyZWF0ZVNoYWRvd1N1YnRyZWUoKTsKIH0KIAogdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpyZXdpbmQoZmxvYXQgdGltZURlbHRhKQpAQCAtNDE4MCwxNyArNDE3NCwx NyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnByaXZhdGVCcm93c2luZ1N0YXRlRGlkQ2hhbmdl KCkKIAogTWVkaWFDb250cm9scyogSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFDb250cm9scygpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIHRvTWVkaWFDb250cm9scyhzaGFkb3coKS0+b2xkZXN0U2hhZG93 Um9vdCgpLT5maXJzdENoaWxkKCkpOworICAgIHJldHVybiB0b01lZGlhQ29udHJvbHModXNlckFn ZW50U2hhZG93Um9vdCgpLT5maXJzdENoaWxkKCkpOwogfQogCiBib29sIEhUTUxNZWRpYUVsZW1l bnQ6Omhhc01lZGlhQ29udHJvbHMoKSBjb25zdAogewotICAgIEVsZW1lbnRTaGFkb3cqIGVsZW1l bnRTaGFkb3cgPSBzaGFkb3coKTsKLSAgICBpZiAoIWVsZW1lbnRTaGFkb3cpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICBpZiAoU2hhZG93Um9vdCogdXNlckFnZW50ID0gdXNlckFnZW50U2hh ZG93Um9vdCgpKSB7CisgICAgICAgIE5vZGUqIG5vZGUgPSB1c2VyQWdlbnQtPmZpcnN0Q2hpbGQo KTsKKyAgICAgICAgcmV0dXJuIG5vZGUgJiYgbm9kZS0+aXNNZWRpYUNvbnRyb2xzKCk7CisgICAg fQogCi0gICAgTm9kZSogbm9kZSA9IGVsZW1lbnRTaGFkb3ctPm9sZGVzdFNoYWRvd1Jvb3QoKS0+ Zmlyc3RDaGlsZCgpOwotICAgIHJldHVybiBub2RlICYmIG5vZGUtPmlzTWVkaWFDb250cm9scygp OworICAgIHJldHVybiBmYWxzZTsKIH0KIAogYm9vbCBIVE1MTWVkaWFFbGVtZW50OjpjcmVhdGVN ZWRpYUNvbnRyb2xzKCkKQEAgLTQyMTEsOCArNDIwNSw4IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVu dDo6Y3JlYXRlTWVkaWFDb250cm9scygpCiAgICAgaWYgKCFzaGFkb3coKSkKICAgICAgICAgY3Jl YXRlU2hhZG93U3VidHJlZSgpOwogCi0gICAgQVNTRVJUKHNoYWRvdygpLT5vbGRlc3RTaGFkb3dS b290KCktPnR5cGUoKSA9PSBTaGFkb3dSb290OjpVc2VyQWdlbnRTaGFkb3dSb290KTsKLSAgICBz aGFkb3coKS0+b2xkZXN0U2hhZG93Um9vdCgpLT5hcHBlbmRDaGlsZChjb250cm9scywgZWMpOwor ICAgIEFTU0VSVCh1c2VyQWdlbnRTaGFkb3dSb290KCkpOworICAgIHVzZXJBZ2VudFNoYWRvd1Jv b3QoKS0+YXBwZW5kQ2hpbGQoY29udHJvbHMsIGVjKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAo= 153150 2012-07-18 18:11:38 -0700 2012-07-18 22:09:03 -0700 Patch for landing bug-91564-20120719101137.patch text/plain 5182 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGRiYjA1MTk2YWQ5ZDBj NzkxNDNkNGUwYmQ4NWZiMTA2M2UzYzkyNS4uMzliMTQyNDg5ZmJhZjA1NDc0YjJmYzdjZjY0NTcw YjNjNWJiYjYzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA3LTE3ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBFbGVtZW50IHdh bnRzIHRvIGhhdmUgdXNlckFnZW50U2hhZG93Um9vdCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTU2NAorCisgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgQ2FybHNvbi4KKworICAgICAgICBXZSBpbnRyb2R1Y2UgRWxlbWVudDo6dXNlckFnZW50U2hh ZG93Um9vdCgpIHRvIHJldHVybiBhIFVzZXJBZ2VudFNoYWRvd1Jvb3QuCisgICAgICAgIEl0IHJl dHVybnMgdGhlIG9sZGVzdCBzaGFkb3cgcm9vdCBpZiBhbnksIGFuZCBjaGVja3MgdGhlIHR5cGUg b2YgU2hhZG93Um9vdCBpbiBkZWJ1ZyBidWlsZC4KKworICAgICAgICBQcmV2aW91c2x5LCB3ZSBo YXZlIHVzZWQgZWxlbWVudFNoYWRvdygpLT5vbGRlc3RTaGFkb3dSb290KCkgdG8gZ2V0IFVzZXJB Z2VudFNoYWRvd1Jvb3QuCisgICAgICAgIFRoZSBjbGFzcyBpbXBsZW1lbnRvciB3aWxsIGtub3cg dGhlIG9sZGVzdCBzaGFkb3cgcm9vdCBpcyBVc2VyQWdlbnRTaGFkb3dSb290LCBidXQgaXQgaXMg bm90CisgICAgICAgIGNsZWFyIGZvciB0aGUgb3RoZXIgcGVvcGxlLiBUaGlzIG1ldGhvZCB3aWxs IG1ha2UgdGhlIGNvZGUgaW50ZW50aW9uIGNsZWFyZXIuCisKKyAgICAgICAgV2Ugd2lsbCBpbnRy b2R1Y2UgdXNlckFnZW50U2hhZG93Um9vdCB0byB0aGUgb3RoZXIgZWxlbWVudHMgKGUuZy4gSFRN TElucHV0RWxlbWVudCkgYWZ0ZXIgdGhpcyBwYXRjaC4KKworICAgICAgICBObyBuZXcgdGVzdHMs IHNpbXBsZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnVzZXJBZ2VudFNoYWRvd1Jvb3QpOgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKEVsZW1lbnQpOgorICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjpjcmVhdGVTaGFkb3dTdWJ0cmVlKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OndpbGxBZGRBdXRob3JTaGFkb3dSb290KToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHMpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTE1lZGlhRWxlbWVudDo6aGFzTWVkaWFDb250cm9scyk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MTWVkaWFFbGVtZW50OjpjcmVhdGVNZWRpYUNvbnRyb2xzKToKKwogMjAxMi0wNy0xOCAgRGFu IEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIEhpdCB0ZXN0aW5nIGluIHRo ZSBnYXAgYmV0d2VlbiBwYWdlcyByZXR1cm5zIGluY29ycmVjdCByZXN1bHRzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxl bWVudC5jcHAKaW5kZXggNDJiNDY4Zjk4MjZiOGZlOGE4OGI4MmE4ZmE4MzBjMTEzMWI4MDE4MC4u MzQ5OTQ0N2VkOTE0YWU5YzAwMGJmNzU3YmZmNjI4Yzk3MTBkMWM1ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcApAQCAtMTE4NSw2ICsxMTg1LDE4IEBAIEVsZW1lbnRTaGFkb3cqIEVsZW1lbnQ6OmVu c3VyZVNoYWRvdygpCiAgICAgcmV0dXJuIGVsZW1lbnRSYXJlRGF0YSgpLT5tX3NoYWRvdy5nZXQo KTsKIH0KIAorU2hhZG93Um9vdCogRWxlbWVudDo6dXNlckFnZW50U2hhZG93Um9vdCgpIGNvbnN0 Cit7CisgICAgaWYgKEVsZW1lbnRTaGFkb3cqIGVsZW1lbnRTaGFkb3cgPSBzaGFkb3coKSkgewor ICAgICAgICBpZiAoU2hhZG93Um9vdCogc2hhZG93Um9vdCA9IGVsZW1lbnRTaGFkb3ctPm9sZGVz dFNoYWRvd1Jvb3QoKSkgeworICAgICAgICAgICAgQVNTRVJUKHNoYWRvd1Jvb3QtPnR5cGUoKSA9 PSBTaGFkb3dSb290OjpVc2VyQWdlbnRTaGFkb3dSb290KTsKKyAgICAgICAgICAgIHJldHVybiBz aGFkb3dSb290OworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIDA7Cit9CisKIFNoYWRv d1Jvb3QqIEVsZW1lbnQ6OmVuc3VyZVNoYWRvd1Jvb3QoKQogewogICAgIGlmIChFbGVtZW50U2hh ZG93KiBzaGFkb3cgPSB0aGlzLT5zaGFkb3coKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCmluZGV4IDgwYTFi M2NhYmNmMTU5ZmNlOTllMjYzMWUzY2Q0ODg3MzJmYWU1ZDguLmI1YjIyNTEyZjBlMDU4MWM3Mjk1 YWRmNTRiZjhiNmFmOTcwZDEzZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaApAQCAtMjcwLDYgKzI3MCw4 IEBAIHB1YmxpYzoKICAgICBFbGVtZW50U2hhZG93KiBlbnN1cmVTaGFkb3coKTsKICAgICB2aXJ0 dWFsIHZvaWQgd2lsbEFkZEF1dGhvclNoYWRvd1Jvb3QoKSB7IH0KIAorICAgIFNoYWRvd1Jvb3Qq IHVzZXJBZ2VudFNoYWRvd1Jvb3QoKSBjb25zdDsKKwogICAgIC8vIEZJWE1FOiBSZW1vdmUgRWxl bWVudDo6ZW5zdXJlU2hhZG93Um9vdAogICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03NzYwOAogICAgIFNoYWRvd1Jvb3QqIGVuc3VyZVNoYWRvd1Jvb3QoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDcwNWEwNWM1Zjhk YjUxNmM2OGI4NTA4NWE3YjNiNTA3ODY2ZmQ2MTAuLmYxNjI3MWJjZDEzY2JkZjVlMmUwZTBkMjgw ZTg2NDI4ZjUwMTNkMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cApAQCAtMTg2MiwyMCArMTg2MiwxNCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnByb2dyZXNz RXZlbnRUaW1lckZpcmVkKFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+KikKIAogdm9pZCBIVE1MTWVk aWFFbGVtZW50OjpjcmVhdGVTaGFkb3dTdWJ0cmVlKCkKIHsKLSAgICBBU1NFUlQoIXNoYWRvdygp IHx8ICFzaGFkb3coKS0+b2xkZXN0U2hhZG93Um9vdCgpKTsKLQorICAgIEFTU0VSVCghdXNlckFn ZW50U2hhZG93Um9vdCgpKTsKICAgICBTaGFkb3dSb290OjpjcmVhdGUodGhpcywgU2hhZG93Um9v dDo6VXNlckFnZW50U2hhZG93Um9vdCk7CiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6d2ls bEFkZEF1dGhvclNoYWRvd1Jvb3QoKQogewotICAgIEFTU0VSVChzaGFkb3coKSk7Ci0gICAgaWYg KHNoYWRvdygpLT5vbGRlc3RTaGFkb3dSb290KCkpIHsKLSAgICAgICAgQVNTRVJUKHNoYWRvdygp LT5vbGRlc3RTaGFkb3dSb290KCktPnR5cGUoKSA9PSBTaGFkb3dSb290OjpVc2VyQWdlbnRTaGFk b3dSb290KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGNyZWF0ZVNoYWRvd1N1YnRy ZWUoKTsKKyAgICBpZiAoIXVzZXJBZ2VudFNoYWRvd1Jvb3QoKSkKKyAgICAgICAgY3JlYXRlU2hh ZG93U3VidHJlZSgpOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnJld2luZChmbG9hdCB0 aW1lRGVsdGEpCkBAIC00MTgwLDE3ICs0MTc0LDE4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 cHJpdmF0ZUJyb3dzaW5nU3RhdGVEaWRDaGFuZ2UoKQogCiBNZWRpYUNvbnRyb2xzKiBIVE1MTWVk aWFFbGVtZW50OjptZWRpYUNvbnRyb2xzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gdG9NZWRpYUNv bnRyb2xzKHNoYWRvdygpLT5vbGRlc3RTaGFkb3dSb290KCktPmZpcnN0Q2hpbGQoKSk7CisgICAg cmV0dXJuIHRvTWVkaWFDb250cm9scyh1c2VyQWdlbnRTaGFkb3dSb290KCktPmZpcnN0Q2hpbGQo KSk7CiB9CiAKIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6aGFzTWVkaWFDb250cm9scygpIGNvbnN0 CiB7Ci0gICAgRWxlbWVudFNoYWRvdyogZWxlbWVudFNoYWRvdyA9IHNoYWRvdygpOwotICAgIGlm ICghZWxlbWVudFNoYWRvdykKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChTaGFkb3dS b290KiB1c2VyQWdlbnQgPSB1c2VyQWdlbnRTaGFkb3dSb290KCkpIHsKKyAgICAgICAgTm9kZSog bm9kZSA9IHVzZXJBZ2VudC0+Zmlyc3RDaGlsZCgpOworICAgICAgICBBU1NFUlQoIW5vZGUgfHwg bm9kZS0+aXNNZWRpYUNvbnRyb2xzKCkpOworICAgICAgICByZXR1cm4gbm9kZTsKKyAgICB9CiAK LSAgICBOb2RlKiBub2RlID0gZWxlbWVudFNoYWRvdy0+b2xkZXN0U2hhZG93Um9vdCgpLT5maXJz dENoaWxkKCk7Ci0gICAgcmV0dXJuIG5vZGUgJiYgbm9kZS0+aXNNZWRpYUNvbnRyb2xzKCk7Cisg ICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlh Q29udHJvbHMoKQpAQCAtNDIxMSw4ICs0MjA2LDggQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50Ojpj cmVhdGVNZWRpYUNvbnRyb2xzKCkKICAgICBpZiAoIXNoYWRvdygpKQogICAgICAgICBjcmVhdGVT aGFkb3dTdWJ0cmVlKCk7CiAKLSAgICBBU1NFUlQoc2hhZG93KCktPm9sZGVzdFNoYWRvd1Jvb3Qo KS0+dHlwZSgpID09IFNoYWRvd1Jvb3Q6OlVzZXJBZ2VudFNoYWRvd1Jvb3QpOwotICAgIHNoYWRv dygpLT5vbGRlc3RTaGFkb3dSb290KCktPmFwcGVuZENoaWxkKGNvbnRyb2xzLCBlYyk7CisgICAg QVNTRVJUKHVzZXJBZ2VudFNoYWRvd1Jvb3QoKSk7CisgICAgdXNlckFnZW50U2hhZG93Um9vdCgp LT5hcHBlbmRDaGlsZChjb250cm9scywgZWMpOwogICAgIHJldHVybiB0cnVlOwogfQogCg==