92328 2012-07-25 19:07:21 -0700 [chromium] When computing surface content scale, use top level device scale 2012-07-26 16:55:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 91815 1 enne enne cc-bugs danakj enne jamesr kbr senorblanco vollick webkit.review.bot oldest_to_newest 678744 0 enne 2012-07-25 19:07:21 -0700 [chromium] When computing surface content scale, use top level device scale 678749 1 154523 enne 2012-07-25 19:09:33 -0700 Created attachment 154523 Patch 678757 2 154523 danakj 2012-07-25 19:14:44 -0700 Comment on attachment 154523 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154523&action=review > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:-569 > - float contentsScale = layer->contentsScale(); can we remove CCLayerImpl::contentsScale then? 678775 3 enne 2012-07-25 19:24:27 -0700 (In reply to comment #2) > (From update of attachment 154523 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154523&action=review > > > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:-569 > > - float contentsScale = layer->contentsScale(); > > can we remove CCLayerImpl::contentsScale then? Maybe we shouldn't have layer->contentsScale at all, and setContentsScale should setContentBounds, where appropriate? 678783 4 154523 danakj 2012-07-25 19:29:32 -0700 Comment on attachment 154523 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154523&action=review >>> Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:-569 >>> - float contentsScale = layer->contentsScale(); >> >> can we remove CCLayerImpl::contentsScale then? > > Maybe we shouldn't have layer->contentsScale at all, and setContentsScale should setContentBounds, where appropriate? I mean, contentsScale on LayerChromium makes sense as a hint to help create the contentBounds (tho maybe we should push that down to GraphicsLayerChromium)? But I think we should remove it from CCLayerImpl again if we can now, we plumbed it thru just for this code which is now going away here. 678786 5 danakj 2012-07-25 19:30:20 -0700 (In reply to comment #4) > (From update of attachment 154523 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=154523&action=review > > >>> Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:-569 > >>> - float contentsScale = layer->contentsScale(); > >> > >> can we remove CCLayerImpl::contentsScale then? > > > > Maybe we shouldn't have layer->contentsScale at all, and setContentsScale should setContentBounds, where appropriate? > > I mean, contentsScale on LayerChromium makes sense as a hint to help create the contentBounds (tho maybe we should push that down to GraphicsLayerChromium)? But I think we should remove it from CCLayerImpl again if we can now, we plumbed it thru just for this code which is now going away here. Or.. ya I get what you mean now.. that sounds like it could be very nice. 678801 6 154529 enne 2012-07-25 19:47:38 -0700 Created attachment 154529 Remove CCLayerImpl contents scale 678802 7 enne 2012-07-25 19:48:08 -0700 (In reply to comment #6) > Created an attachment (id=154529) [details] > Remove CCLayerImpl contents scale Yeah, removing it from the LayerChromium side *sounds* nice but is way more complicated. Punt! 678864 8 154529 danakj 2012-07-25 22:35:19 -0700 Comment on attachment 154529 Remove CCLayerImpl contents scale yup! LGTM! 679564 9 154695 enne 2012-07-26 11:27:03 -0700 Created attachment 154695 Rebased 679628 10 danakj 2012-07-26 12:04:08 -0700 prpl :( 679648 11 154722 enne 2012-07-26 12:31:55 -0700 Created attachment 154722 Rebased 679652 12 vollick 2012-07-26 12:38:08 -0700 I love this patch. LGTM, too. 679733 13 danakj 2012-07-26 13:59:07 -0700 Yay green, still lgtm :) 679826 14 danakj 2012-07-26 15:19:50 -0700 kbr or senorblanco for review, as jamesr is still in catch-up mode? 679866 15 154722 kbr 2012-07-26 15:54:40 -0700 Comment on attachment 154722 Rebased rs=me 679867 16 154722 enne 2012-07-26 15:55:40 -0700 Comment on attachment 154722 Rebased Thanks, kbr. :) 679922 17 154722 webkit.review.bot 2012-07-26 16:55:35 -0700 Comment on attachment 154722 Rebased Clearing flags on attachment: 154722 Committed r123814: <http://trac.webkit.org/changeset/123814> 679923 18 webkit.review.bot 2012-07-26 16:55:40 -0700 All reviewed patches have been landed. Closing bug. 154523 2012-07-25 19:09:33 -0700 2012-07-25 19:47:36 -0700 Patch bug-92328-20120725190923.patch text/plain 10440 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFiMzU5YjBmMTA1YWUy Nzk0NDcwZWY0ZTI5N2JjMzMyMGNkYmFlMy4uMjExNGIwYjkwYmEzNDgxMGI1MWVkMjhiMjRhYzFm ODFhM2QyZTc4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA3LTI1ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBXaGVu IGNvbXB1dGluZyBzdXJmYWNlIGNvbnRlbnQgc2NhbGUsIHVzZSB0b3AgbGV2ZWwgZGV2aWNlIHNj YWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjMy OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZp b3VzbHksIHN1cmZhY2Ugc2NhbGUgd2FzIGNhbGN1bGF0ZWQgd2l0aCBsYXllci0+Y29udGVudHNT Y2FsZSgpLAorICAgICAgICBob3dldmVyIHRoaXMgdmFsdWUgaXMgMSBmb3IgYW55IGxheWVyIHRo YXQgaXMgbm90IENvbnRlbnRMYXllckNocm9taXVtCisgICAgICAgIGJlY2F1c2Ugb2YgbGF5ZXIt Pm5lZWRzQ29udGVudHNTY2FsZSgpLiBUaGlzIHdvdWxkIGNhdXNlIGFueSBzdXJmYWNlCisgICAg ICAgIGNyZWF0ZWQgd2l0aCBhIG5vbi1jb250ZW50IG93bmVyIGxheWVyIHRvIGxvb2sgZnV6enkg b24gYSBoaWdoIERQSQorICAgICAgICBkZXZpY2UuIEZpeCBieSB1c2luZyB0aGUgdG9wIGxldmVs IGRldmljZSBzY2FsZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjYWxjdWxhdGVE cmF3VHJhbnNmb3Jtc0ludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9z dENvbW1vbjo6Y2FsY3VsYXRlRHJhd1RyYW5zZm9ybXMpOgorCiAyMDEyLTA3LTE5ICBBZHJpZW5u ZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBDbGVhbiB1 cCBMYXllclJlbmRlcmVyQ2hyb21pdW06OmRyYXdUZXh0dXJlZFF1YWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9z dENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ0xheWVyVHJlZUhvc3RDb21tb24uY3BwCmluZGV4IDU2YWRmY2NiYjg4YmI3NzJjYzJkOTlj MjMwOGFjYjIxMGZjNThmMzEuLjE4MzZmNjMxNTI4ZTI4MjZjMDYzY2ZhZjI0OWM1NTJiZGUyN2Rm YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcApAQCAtNDEw LDcgKzQxMCw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwo TGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgY29uc3QgV2ViVHJhbnNm b3JtYXRpb25NYXRyaXgmIGZ1bGxIaWVyYXJjaHlNYXRyaXgsIGNvbnN0IFdlYlRyYW5zZm9ybWF0 aW9uTWF0cml4JiBjdXJyZW50U2Nyb2xsQ29tcGVuc2F0aW9uTWF0cml4LAogICAgIGNvbnN0IElu dFJlY3QmIGNsaXBSZWN0RnJvbUFuY2VzdG9yLCBib29sIGFuY2VzdG9yQ2xpcHNTdWJ0cmVlLAog ICAgIFJlbmRlclN1cmZhY2VUeXBlKiBuZWFyZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHMsIExh eWVyTGlzdCYgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgTGF5ZXJMaXN0JiBsYXllckxpc3QsCi0g ICAgTGF5ZXJTb3J0ZXIqIGxheWVyU29ydGVyLCBpbnQgbWF4VGV4dHVyZVNpemUsIEludFJlY3Qm IGRyYXdhYmxlQ29udGVudFJlY3RPZlN1YnRyZWUpCisgICAgTGF5ZXJTb3J0ZXIqIGxheWVyU29y dGVyLCBpbnQgbWF4VGV4dHVyZVNpemUsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBJbnRSZWN0 JiBkcmF3YWJsZUNvbnRlbnRSZWN0T2ZTdWJ0cmVlKQogewogICAgIC8vIFRoaXMgZnVuY3Rpb24g Y29tcHV0ZXMgdGhlIG5ldyBtYXRyaXggdHJhbnNmb3JtYXRpb25zIHJlY3Vyc2l2ZWx5IGZvciB0 aGlzCiAgICAgLy8gbGF5ZXIgYW5kIGFsbCBpdHMgZGVzY2VuZGFudHMuIEl0IGFsc28gY29tcHV0 ZXMgdGhlIGFwcHJvcHJpYXRlIHJlbmRlciBzdXJmYWNlcy4KQEAgLTQ4NCwxNiArNDg0LDE2IEBA IHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBs YXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgLy8gV2hlbiBhIHJlbmRlciBzdXJmYWNlIGhh cyBhIHJlcGxpY2EgbGF5ZXIsIHRoYXQgbGF5ZXIncyB0cmFuc2Zvcm0gaXMgdXNlZCB0byBkcmF3 IGEgc2Vjb25kIGNvcHkgb2YgdGhlIHN1cmZhY2UuCiAgICAgLy8gVHJhbnNmb3JtcyBuYW1lZCBo ZXJlIGFyZSByZWxhdGl2ZSB0byB0aGUgc3VyZmFjZSwgdW5sZXNzIHRoZXkgc3BlY2lmeSB0aGV5 IGFyZSByZWxhdGl2ZSB0byB0aGUgcmVwbGljYSBsYXllci4KICAgICAvLwotICAgIC8vIFdlIHdp bGwgZGVub3RlIGEgc2NhbGUgYnkgY29udGVudHMgc2NhbGUgU1tjb250ZW50c1NjYWxlXQorICAg IC8vIFdlIHdpbGwgZGVub3RlIGEgc2NhbGUgYnkgZGV2aWNlIHNjYWxlIFNbZGV2aWNlU2NhbGVd CiAgICAgLy8KICAgICAvLyBUaGUgcmVuZGVyIHN1cmZhY2UgZHJhdyB0cmFuc2Zvcm0gdG8gaXRz IHRhcmdldCBzdXJmYWNlIG9yaWdpbiBpczoKICAgICAvLyAgICAgICAgTVtzdXJmYWNlRHJhd10g PSBNW293bmluZ0xheWVyLT5EcmF3XQogICAgIC8vCiAgICAgLy8gVGhlIHJlbmRlciBzdXJmYWNl IG9yaWdpbiB0cmFuc2Zvcm0gdG8gaXRzIHRoZSByb290IChzY3JlZW4gc3BhY2UpIG9yaWdpbiBp czoKLSAgICAvLyAgICAgICAgTVtzdXJmYWNlMnJvb3RdID0gIE1bb3duaW5nTGF5ZXItPnNjcmVl bnNwYWNlXSAqIFNbY29udGVudHNTY2FsZV0uaW52ZXJzZSgpCisgICAgLy8gICAgICAgIE1bc3Vy ZmFjZTJyb290XSA9ICBNW293bmluZ0xheWVyLT5zY3JlZW5zcGFjZV0gKiBTW2RldmljZVNjYWxl XS5pbnZlcnNlKCkKICAgICAvLwogICAgIC8vIFRoZSByZXBsaWNhIGRyYXcgdHJhbnNmb3JtIHRv IGl0cyB0YXJnZXQgc3VyZmFjZSBvcmlnaW4gaXM6Ci0gICAgLy8gICAgICAgIE1bcmVwbGljYURy YXddID0gU1tjb250ZW50c1NjYWxlXSAqIE1bc3VyZmFjZURyYXddICogVHJbcmVwbGljYS0+cG9z aXRpb24oKSArIHJlcGxpY2EtPmFuY2hvcigpXSAqIFRyW3JlcGxpY2FdICogVHJbb3JpZ2luMmFu Y2hvcl0uaW52ZXJzZSgpICogU1tjb250ZW50c1NjYWxlXS5pbnZlcnNlKCkKKyAgICAvLyAgICAg ICAgTVtyZXBsaWNhRHJhd10gPSBTW2RldmljZVNjYWxlXSAqIE1bc3VyZmFjZURyYXddICogVHJb cmVwbGljYS0+cG9zaXRpb24oKSArIHJlcGxpY2EtPmFuY2hvcigpXSAqIFRyW3JlcGxpY2FdICog VHJbb3JpZ2luMmFuY2hvcl0uaW52ZXJzZSgpICogU1tjb250ZW50c1NjYWxlXS5pbnZlcnNlKCkK ICAgICAvLwogICAgIC8vIFRoZSByZXBsaWNhIGRyYXcgdHJhbnNmb3JtIHRvIHRoZSByb290IChz Y3JlZW4gc3BhY2UpIG9yaWdpbiBpczoKICAgICAvLyAgICAgICAgTVtyZXBsaWNhMnJvb3RdID0g TVtzdXJmYWNlMnJvb3RdICogVHJbcmVwbGljYS0+cG9zaXRpb24oKV0gKiBUcltyZXBsaWNhXSAq IFRyW29yaWdpbjJhbmNob3JdLmludmVyc2UoKQpAQCAtNTY2LDcgKzU2Niw2IEBAIHN0YXRpYyB2 b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5 ZXJUeXBlKiByb290TGF5CiAgICAgICAgIGFuaW1hdGluZ1RyYW5zZm9ybVRvU2NyZWVuIHw9IGxh eWVyLT5wYXJlbnQoKS0+c2NyZWVuU3BhY2VUcmFuc2Zvcm1Jc0FuaW1hdGluZygpOwogICAgIH0K IAotICAgIGZsb2F0IGNvbnRlbnRzU2NhbGUgPSBsYXllci0+Y29udGVudHNTY2FsZSgpOwogICAg IEZsb2F0UmVjdCBjb250ZW50UmVjdChGbG9hdFBvaW50KCksIGxheWVyLT5jb250ZW50Qm91bmRz KCkpOwogCiAgICAgLy8gZnVsbEhpZXJhcmNoeU1hdHJpeCBpcyB0aGUgbWF0cml4IHRoYXQgdHJh bnNmb3JtcyBvYmplY3RzIGJldHdlZW4gc2NyZWVuIHNwYWNlIChleGNlcHQgcHJvamVjdGlvbiBt YXRyaXgpIGFuZCB0aGUgbW9zdCByZWNlbnQgUmVuZGVyU3VyZmFjZSdzIHNwYWNlLgpAQCAtNTg4 LDcgKzU4Nyw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwo TGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgICAgIC8vIFRoZSBvcmln aW4gb2YgdGhlIG5ldyBzdXJmYWNlIGlzIHRoZSB1cHBlciBsZWZ0IGNvcm5lciBvZiB0aGUgbGF5 ZXIuCiAgICAgICAgIHJlbmRlclN1cmZhY2UtPnNldERyYXdUcmFuc2Zvcm0oZHJhd1RyYW5zZm9y bSk7CiAgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGxheWVyRHJhd1RyYW5zZm9ybTsK LSAgICAgICAgbGF5ZXJEcmF3VHJhbnNmb3JtLnNjYWxlKGNvbnRlbnRzU2NhbGUpOworICAgICAg ICBsYXllckRyYXdUcmFuc2Zvcm0uc2NhbGUoZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgICAgICBp ZiAoIWxheWVyLT5jb250ZW50Qm91bmRzKCkuaXNFbXB0eSgpICYmICFsYXllci0+Ym91bmRzKCku aXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBsYXllckRyYXdUcmFuc2Zvcm0uc2NhbGVOb25Vbmlm b3JtKGxheWVyLT5ib3VuZHMoKS53aWR0aCgpIC8gc3RhdGljX2Nhc3Q8ZG91YmxlPihsYXllci0+ Y29udGVudEJvdW5kcygpLndpZHRoKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBsYXllci0+Ym91bmRzKCkuaGVpZ2h0KCkgLyBzdGF0aWNfY2FzdDxk b3VibGU+KGxheWVyLT5jb250ZW50Qm91bmRzKCkuaGVpZ2h0KCkpKTsKQEAgLTU5OCw3ICs1OTcs NyBAQCBzdGF0aWMgdm9pZCBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVybmFsKExheWVyVHlw ZSogbGF5ZXIsIExheWVyVHlwZSogcm9vdExheQogICAgICAgICAvLyBUaGUgc3VibGF5ZXIgbWF0 cml4IHRyYW5zZm9ybXMgY2VudGVyZWQgbGF5ZXIgcmVjdHMgaW50byB0YXJnZXQKICAgICAgICAg Ly8gc3VyZmFjZSBjb250ZW50IHNwYWNlLgogICAgICAgICBzdWJsYXllck1hdHJpeC5tYWtlSWRl bnRpdHkoKTsKLSAgICAgICAgc3VibGF5ZXJNYXRyaXguc2NhbGUoY29udGVudHNTY2FsZSk7Cisg ICAgICAgIHN1YmxheWVyTWF0cml4LnNjYWxlKGRldmljZVNjYWxlRmFjdG9yKTsKICAgICAgICAg c3VibGF5ZXJNYXRyaXgudHJhbnNsYXRlKDAuNSAqIGJvdW5kcy53aWR0aCgpLCAwLjUgKiBib3Vu ZHMuaGVpZ2h0KCkpOwogCiAgICAgICAgIC8vIFRoZSBvcGFjaXR5IHZhbHVlIGlzIG1vdmVkIGZy b20gdGhlIGxheWVyIHRvIGl0cyBzdXJmYWNlLCBzbyB0aGF0IHRoZSBlbnRpcmUgc3VidHJlZSBw cm9wZXJseSBpbmhlcml0cyBvcGFjaXR5LgpAQCAtNzEyLDcgKzcxMSw3IEBAIHN0YXRpYyB2b2lk IGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJU eXBlKiByb290TGF5CiAgICAgICAgIEludFJlY3QgZHJhd2FibGVDb250ZW50UmVjdE9mQ2hpbGRT dWJ0cmVlOwogICAgICAgICBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVybmFsPExheWVyVHlw ZSwgTGF5ZXJMaXN0LCBSZW5kZXJTdXJmYWNlVHlwZSwgTGF5ZXJTb3J0ZXI+KGNoaWxkLCByb290 TGF5ZXIsIHN1YmxheWVyTWF0cml4LCBuZXh0SGllcmFyY2h5TWF0cml4LCBuZXh0U2Nyb2xsQ29t cGVuc2F0aW9uTWF0cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNs aXBSZWN0Rm9yU3VidHJlZSwgc3VidHJlZVNob3VsZEJlQ2xpcHBlZCwgbmVhcmVzdEFuY2VzdG9y VGhhdE1vdmVzUGl4ZWxzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJl bmRlclN1cmZhY2VMYXllckxpc3QsIGRlc2NlbmRhbnRzLCBsYXllclNvcnRlciwgbWF4VGV4dHVy ZVNpemUsIGRyYXdhYmxlQ29udGVudFJlY3RPZkNoaWxkU3VidHJlZSk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgZGVzY2VuZGFu dHMsIGxheWVyU29ydGVyLCBtYXhUZXh0dXJlU2l6ZSwgZGV2aWNlU2NhbGVGYWN0b3IsIGRyYXdh YmxlQ29udGVudFJlY3RPZkNoaWxkU3VidHJlZSk7CiAgICAgICAgIGlmICghZHJhd2FibGVDb250 ZW50UmVjdE9mQ2hpbGRTdWJ0cmVlLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgYWNjdW11bGF0 ZWREcmF3YWJsZUNvbnRlbnRSZWN0T2ZDaGlsZHJlbi51bml0ZShkcmF3YWJsZUNvbnRlbnRSZWN0 T2ZDaGlsZFN1YnRyZWUpOwogICAgICAgICAgICAgaWYgKGNoaWxkLT5yZW5kZXJTdXJmYWNlKCkp CkBAIC03NjksMTIgKzc2OCwxMiBAQCBzdGF0aWMgdm9pZCBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jt c0ludGVybmFsKExheWVyVHlwZSogbGF5ZXIsIExheWVyVHlwZSogcm9vdExheQogCiAgICAgICAg IGlmIChsYXllci0+cmVwbGljYUxheWVyKCkpIHsKICAgICAgICAgICAgIFdlYlRyYW5zZm9ybWF0 aW9uTWF0cml4IHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm07Ci0gICAgICAg ICAgICBzdXJmYWNlT3JpZ2luVG9SZXBsaWNhT3JpZ2luVHJhbnNmb3JtLnNjYWxlKGNvbnRlbnRz U2NhbGUpOworICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5zZm9y bS5zY2FsZShkZXZpY2VTY2FsZUZhY3Rvcik7CiAgICAgICAgICAgICBzdXJmYWNlT3JpZ2luVG9S ZXBsaWNhT3JpZ2luVHJhbnNmb3JtLnRyYW5zbGF0ZShsYXllci0+cmVwbGljYUxheWVyKCktPnBv c2l0aW9uKCkueCgpICsgbGF5ZXItPnJlcGxpY2FMYXllcigpLT5hbmNob3JQb2ludCgpLngoKSAq IGJvdW5kcy53aWR0aCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbGF5ZXItPnJlcGxpY2FMYXllcigpLT5wb3NpdGlvbigpLnko KSArIGxheWVyLT5yZXBsaWNhTGF5ZXIoKS0+YW5jaG9yUG9pbnQoKS55KCkgKiBib3VuZHMuaGVp Z2h0KCkpOwogICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5zZm9y bS5tdWx0aXBseShsYXllci0+cmVwbGljYUxheWVyKCktPnRyYW5zZm9ybSgpKTsKICAgICAgICAg ICAgIHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0udHJhbnNsYXRlKC1sYXll ci0+cmVwbGljYUxheWVyKCktPmFuY2hvclBvaW50KCkueCgpICogYm91bmRzLndpZHRoKCksIC1s YXllci0+cmVwbGljYUxheWVyKCktPmFuY2hvclBvaW50KCkueSgpICogYm91bmRzLmhlaWdodCgp KTsKLSAgICAgICAgICAgIHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0uc2Nh bGUoMSAvIGNvbnRlbnRzU2NhbGUpOworICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGlj YU9yaWdpblRyYW5zZm9ybS5zY2FsZSgxIC8gZGV2aWNlU2NhbGVGYWN0b3IpOwogCiAgICAgICAg ICAgICAvLyBDb21wdXRlIHRoZSByZXBsaWNhJ3MgIm9yaWdpblRyYW5zZm9ybSIgdGhhdCBtYXBz IGZyb20gdGhlIHJlcGxpY2EncyBvcmlnaW4gc3BhY2UgdG8gdGhlIHRhcmdldCBzdXJmYWNlIG9y aWdpbiBzcGFjZS4KICAgICAgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IHJlcGxpY2FP cmlnaW5UcmFuc2Zvcm0gPSBsYXllci0+cmVuZGVyU3VyZmFjZSgpLT5kcmF3VHJhbnNmb3JtKCkg KiBzdXJmYWNlT3JpZ2luVG9SZXBsaWNhT3JpZ2luVHJhbnNmb3JtOwpAQCAtODYzLDcgKzg2Miw3 IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0Q29tbW9uOjpjYWxjdWxhdGVEcmF3VHJhbnNmb3JtcyhM YXllckNocm9taXVtKiByb290TGF5ZXIsIGNvCiAKICAgICBXZWJDb3JlOjpjYWxjdWxhdGVEcmF3 VHJhbnNmb3Jtc0ludGVybmFsPExheWVyQ2hyb21pdW0sIFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJv bWl1bT4gPiwgUmVuZGVyU3VyZmFjZUNocm9taXVtLCB2b2lkPihyb290TGF5ZXIsIHJvb3RMYXll ciwgZGV2aWNlU2NhbGVUcmFuc2Zvcm0sIGlkZW50aXR5TWF0cml4LCBpZGVudGl0eU1hdHJpeCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByb290TGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+Y29udGVudFJlY3QoKSwgdHJ1ZSwg MCwgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByb290TGF5ZXItPnJlbmRlclN1cmZh Y2UoKS0+bGF5ZXJMaXN0KCksIDAsIG1heFRleHR1cmVTaXplLCB0b3RhbERyYXdhYmxlQ29udGVu dFJlY3QpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5sYXllckxpc3QoKSwg MCwgbWF4VGV4dHVyZVNpemUsIGRldmljZVNjYWxlRmFjdG9yLCB0b3RhbERyYXdhYmxlQ29udGVu dFJlY3QpOwogfQogCiB2b2lkIENDTGF5ZXJUcmVlSG9zdENvbW1vbjo6Y2FsY3VsYXRlRHJhd1Ry YW5zZm9ybXMoQ0NMYXllckltcGwqIHJvb3RMYXllciwgY29uc3QgSW50U2l6ZSYgZGV2aWNlVmll d3BvcnRTaXplLCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgQ0NMYXllclNvcnRlciogbGF5ZXJT b3J0ZXIsIGludCBtYXhUZXh0dXJlU2l6ZSwgVmVjdG9yPENDTGF5ZXJJbXBsKj4mIHJlbmRlclN1 cmZhY2VMYXllckxpc3QpCkBAIC04NzcsNyArODc2LDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RD b21tb246OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zKENDTGF5ZXJJbXBsKiByb290TGF5ZXIsIGNv bnMKIAogICAgIFdlYkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWw8Q0NMYXll ckltcGwsIFZlY3RvcjxDQ0xheWVySW1wbCo+LCBDQ1JlbmRlclN1cmZhY2UsIENDTGF5ZXJTb3J0 ZXI+KHJvb3RMYXllciwgcm9vdExheWVyLCBkZXZpY2VTY2FsZVRyYW5zZm9ybSwgaWRlbnRpdHlN YXRyaXgsIGlkZW50aXR5TWF0cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5jb250ZW50 UmVjdCgpLCB0cnVlLCAwLCByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVy U3VyZmFjZSgpLT5sYXllckxpc3QoKSwgbGF5ZXJTb3J0ZXIsIG1heFRleHR1cmVTaXplLCB0b3Rh bERyYXdhYmxlQ29udGVudFJlY3QpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5sYXllckxp c3QoKSwgbGF5ZXJTb3J0ZXIsIG1heFRleHR1cmVTaXplLCBkZXZpY2VTY2FsZUZhY3RvciwgdG90 YWxEcmF3YWJsZUNvbnRlbnRSZWN0KTsKIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3RDb21tb246 OmNhbGN1bGF0ZVZpc2libGVBbmRTY2lzc29yUmVjdHMoVmVjdG9yPFJlZlB0cjxMYXllckNocm9t aXVtPiA+JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LCBjb25zdCBGbG9hdFJlY3QmIHJvb3RTY2lz c29yUmVjdCkK 154529 2012-07-25 19:47:38 -0700 2012-07-26 11:27:01 -0700 Remove CCLayerImpl contents scale bug-92328-20120725194728.patch text/plain 13569 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNjg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFiMzU5YjBmMTA1YWUy Nzk0NDcwZWY0ZTI5N2JjMzMyMGNkYmFlMy4uNGE4YTkxODk4YWY4MmVjZmM2YmVmY2Q5NjMzZjBi ZWI0YjYyNGVmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTI1ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBXaGVu IGNvbXB1dGluZyBzdXJmYWNlIGNvbnRlbnQgc2NhbGUsIHVzZSB0b3AgbGV2ZWwgZGV2aWNlIHNj YWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjMy OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZp b3VzbHksIHN1cmZhY2Ugc2NhbGUgd2FzIGNhbGN1bGF0ZWQgd2l0aCBsYXllci0+Y29udGVudHNT Y2FsZSgpLAorICAgICAgICBob3dldmVyIHRoaXMgdmFsdWUgaXMgMSBmb3IgYW55IGxheWVyIHRo YXQgaXMgbm90IENvbnRlbnRMYXllckNocm9taXVtCisgICAgICAgIGJlY2F1c2Ugb2YgbGF5ZXIt Pm5lZWRzQ29udGVudHNTY2FsZSgpLiBUaGlzIHdvdWxkIGNhdXNlIGFueSBzdXJmYWNlCisgICAg ICAgIGNyZWF0ZWQgd2l0aCBhIG5vbi1jb250ZW50IG93bmVyIGxheWVyIHRvIGxvb2sgZnV6enkg b24gYSBoaWdoIERQSQorICAgICAgICBkZXZpY2UuIEZpeCBieSB1c2luZyB0aGUgdG9wIGxldmVs IGRldmljZSBzY2FsZS4KKworICAgICAgICBBZGRpdGlvbmFsbHksIHJlbW92ZSBjb250ZW50c1Nj YWxlIGZyb20gQ0NMYXllckltcGwgYXMgaXQgaXMgbm8gbG9uZ2VyCisgICAgICAgIHVzZWQuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8pOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpDQ0xheWVySW1wbCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuaDoKKyAgICAgICAgKENDTGF5 ZXJJbXBsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3RDb21tb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlRHJhd1RyYW5z Zm9ybXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RDb21tb246 OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zKToKKwogMjAxMi0wNy0xOSAgQWRyaWVubmUgV2Fsa2Vy ICA8ZW5uZUBnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQ2xlYW4gdXAgTGF5ZXJS ZW5kZXJlckNocm9taXVtOjpkcmF3VGV4dHVyZWRRdWFkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCmlu ZGV4IDI0ODI3ZTk0NjgxNzdmNDAyNjBlMjIwN2JlOWRlOWJhNWU1NDcwMTUuLjc2YzA2NWI1MjBi ODNhMjA4OWEwZjU3NWM1YzA4YmE4YTU2OTQ3YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCkBA IC01MzQsNyArNTM0LDYgQEAgdm9pZCBMYXllckNocm9taXVtOjpwdXNoUHJvcGVydGllc1RvKEND TGF5ZXJJbXBsKiBsYXllcikKICAgICBsYXllci0+c2V0QmFja2dyb3VuZENvbG9yKG1fYmFja2dy b3VuZENvbG9yKTsKICAgICBsYXllci0+c2V0Qm91bmRzKG1fYm91bmRzKTsKICAgICBsYXllci0+ c2V0Q29udGVudEJvdW5kcyhjb250ZW50Qm91bmRzKCkpOwotICAgIGxheWVyLT5zZXRDb250ZW50 c1NjYWxlKGNvbnRlbnRzU2NhbGUoKSk7CiAgICAgbGF5ZXItPnNldERlYnVnQm9yZGVyQ29sb3Io bV9kZWJ1Z0JvcmRlckNvbG9yKTsKICAgICBsYXllci0+c2V0RGVidWdCb3JkZXJXaWR0aChtX2Rl YnVnQm9yZGVyV2lkdGgpOwogICAgIGxheWVyLT5zZXREZWJ1Z05hbWUobV9kZWJ1Z05hbWUuaXNv bGF0ZWRDb3B5KCkpOyAvLyBXZSBoYXZlIHRvIHVzZSBpc29sYXRlZENvcHkoKSBoZXJlIHRvIHNh ZmVseSBwYXNzIG93bmVyc2hpcCB0byBhbm90aGVyIHRocmVhZC4KQEAgLTYxNSw3ICs2MTQsNiBA QCB2b2lkIExheWVyQ2hyb21pdW06OnNldERlYnVnTmFtZShjb25zdCBTdHJpbmcmIGRlYnVnTmFt ZSkKICAgICBzZXROZWVkc0NvbW1pdCgpOwogfQogCi0KIHZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0 Q29udGVudHNTY2FsZShmbG9hdCBjb250ZW50c1NjYWxlKQogewogICAgIGlmICghbmVlZHNDb250 ZW50c1NjYWxlKCkgfHwgbV9jb250ZW50c1NjYWxlID09IGNvbnRlbnRzU2NhbGUpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy SW1wbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVySW1wbC5jcHAKaW5kZXggMjNhMzhhMjBkMjczMGE2YmJhMDAxMTgxYjhlNjAyZWY4YzJh YWNlZi4uMmI2ZWY5MTc3ZmM3ZDJlYWFmNTQ1Yjk3Zjk5MjUzN2FlMThkMjU2MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllcklt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJJbXBsLmNwcApAQCAtNTAsNyArNTAsNiBAQCBDQ0xheWVySW1wbDo6Q0NMYXllcklt cGwoaW50IGlkKQogICAgICwgbV9sYXllclRyZWVIb3N0SW1wbCgwKQogICAgICwgbV9hbmNob3JQ b2ludCgwLjUsIDAuNSkKICAgICAsIG1fYW5jaG9yUG9pbnRaKDApCi0gICAgLCBtX2NvbnRlbnRz U2NhbGUoMSkKICAgICAsIG1fc2Nyb2xsYWJsZShmYWxzZSkKICAgICAsIG1fc2hvdWxkU2Nyb2xs T25NYWluVGhyZWFkKGZhbHNlKQogICAgICwgbV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzKGZhbHNl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NMYXllckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDTGF5ZXJJbXBsLmgKaW5kZXggNDJjZjlmY2JhNzZmOWJjZTI2NjE0Yzg3YzE4OWM3 MmY2YmU1NzAxNC4uZGVjZGRmZjdhMTM0NDlkNWUzYzQwYzA2YmM4MmNkZGUxN2UyYzA3NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllckltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVySW1wbC5oCkBAIC0xODcsOSArMTg3LDYgQEAgcHVibGljOgogICAgIGNvbnN0 IEludFNpemUmIGNvbnRlbnRCb3VuZHMoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRCb3VuZHM7 IH0KICAgICB2b2lkIHNldENvbnRlbnRCb3VuZHMoY29uc3QgSW50U2l6ZSYpOwogCi0gICAgdm9p ZCBzZXRDb250ZW50c1NjYWxlKGZsb2F0IGNvbnRlbnRzU2NhbGUpIHsgbV9jb250ZW50c1NjYWxl ID0gY29udGVudHNTY2FsZTsgfQotICAgIGZsb2F0IGNvbnRlbnRzU2NhbGUoKSBjb25zdCB7IHJl dHVybiBtX2NvbnRlbnRzU2NhbGU7IH0KLQogICAgIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3Np dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsUG9zaXRpb247IH0KICAgICB2b2lkIHNldFNj cm9sbFBvc2l0aW9uKGNvbnN0IEludFBvaW50Jik7CiAKQEAgLTMwNCw3ICszMDEsNiBAQCBwcml2 YXRlOgogICAgIGZsb2F0IG1fYW5jaG9yUG9pbnRaOwogICAgIEludFNpemUgbV9ib3VuZHM7CiAg ICAgSW50U2l6ZSBtX2NvbnRlbnRCb3VuZHM7Ci0gICAgZmxvYXQgbV9jb250ZW50c1NjYWxlOwog ICAgIEludFBvaW50IG1fc2Nyb2xsUG9zaXRpb247CiAgICAgYm9vbCBtX3Njcm9sbGFibGU7CiAg ICAgYm9vbCBtX3Nob3VsZFNjcm9sbE9uTWFpblRocmVhZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1v bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xh eWVyVHJlZUhvc3RDb21tb24uY3BwCmluZGV4IDU2YWRmY2NiYjg4YmI3NzJjYzJkOTljMjMwOGFj YjIxMGZjNThmMzEuLjE4MzZmNjMxNTI4ZTI4MjZjMDYzY2ZhZjI0OWM1NTJiZGUyN2RmYzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcApAQCAtNDEwLDcgKzQx MCw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJU eXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgY29uc3QgV2ViVHJhbnNmb3JtYXRp b25NYXRyaXgmIGZ1bGxIaWVyYXJjaHlNYXRyaXgsIGNvbnN0IFdlYlRyYW5zZm9ybWF0aW9uTWF0 cml4JiBjdXJyZW50U2Nyb2xsQ29tcGVuc2F0aW9uTWF0cml4LAogICAgIGNvbnN0IEludFJlY3Qm IGNsaXBSZWN0RnJvbUFuY2VzdG9yLCBib29sIGFuY2VzdG9yQ2xpcHNTdWJ0cmVlLAogICAgIFJl bmRlclN1cmZhY2VUeXBlKiBuZWFyZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHMsIExheWVyTGlz dCYgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgTGF5ZXJMaXN0JiBsYXllckxpc3QsCi0gICAgTGF5 ZXJTb3J0ZXIqIGxheWVyU29ydGVyLCBpbnQgbWF4VGV4dHVyZVNpemUsIEludFJlY3QmIGRyYXdh YmxlQ29udGVudFJlY3RPZlN1YnRyZWUpCisgICAgTGF5ZXJTb3J0ZXIqIGxheWVyU29ydGVyLCBp bnQgbWF4VGV4dHVyZVNpemUsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBJbnRSZWN0JiBkcmF3 YWJsZUNvbnRlbnRSZWN0T2ZTdWJ0cmVlKQogewogICAgIC8vIFRoaXMgZnVuY3Rpb24gY29tcHV0 ZXMgdGhlIG5ldyBtYXRyaXggdHJhbnNmb3JtYXRpb25zIHJlY3Vyc2l2ZWx5IGZvciB0aGlzCiAg ICAgLy8gbGF5ZXIgYW5kIGFsbCBpdHMgZGVzY2VuZGFudHMuIEl0IGFsc28gY29tcHV0ZXMgdGhl IGFwcHJvcHJpYXRlIHJlbmRlciBzdXJmYWNlcy4KQEAgLTQ4NCwxNiArNDg0LDE2IEBAIHN0YXRp YyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwg TGF5ZXJUeXBlKiByb290TGF5CiAgICAgLy8gV2hlbiBhIHJlbmRlciBzdXJmYWNlIGhhcyBhIHJl cGxpY2EgbGF5ZXIsIHRoYXQgbGF5ZXIncyB0cmFuc2Zvcm0gaXMgdXNlZCB0byBkcmF3IGEgc2Vj b25kIGNvcHkgb2YgdGhlIHN1cmZhY2UuCiAgICAgLy8gVHJhbnNmb3JtcyBuYW1lZCBoZXJlIGFy ZSByZWxhdGl2ZSB0byB0aGUgc3VyZmFjZSwgdW5sZXNzIHRoZXkgc3BlY2lmeSB0aGV5IGFyZSBy ZWxhdGl2ZSB0byB0aGUgcmVwbGljYSBsYXllci4KICAgICAvLwotICAgIC8vIFdlIHdpbGwgZGVu b3RlIGEgc2NhbGUgYnkgY29udGVudHMgc2NhbGUgU1tjb250ZW50c1NjYWxlXQorICAgIC8vIFdl IHdpbGwgZGVub3RlIGEgc2NhbGUgYnkgZGV2aWNlIHNjYWxlIFNbZGV2aWNlU2NhbGVdCiAgICAg Ly8KICAgICAvLyBUaGUgcmVuZGVyIHN1cmZhY2UgZHJhdyB0cmFuc2Zvcm0gdG8gaXRzIHRhcmdl dCBzdXJmYWNlIG9yaWdpbiBpczoKICAgICAvLyAgICAgICAgTVtzdXJmYWNlRHJhd10gPSBNW293 bmluZ0xheWVyLT5EcmF3XQogICAgIC8vCiAgICAgLy8gVGhlIHJlbmRlciBzdXJmYWNlIG9yaWdp biB0cmFuc2Zvcm0gdG8gaXRzIHRoZSByb290IChzY3JlZW4gc3BhY2UpIG9yaWdpbiBpczoKLSAg ICAvLyAgICAgICAgTVtzdXJmYWNlMnJvb3RdID0gIE1bb3duaW5nTGF5ZXItPnNjcmVlbnNwYWNl XSAqIFNbY29udGVudHNTY2FsZV0uaW52ZXJzZSgpCisgICAgLy8gICAgICAgIE1bc3VyZmFjZTJy b290XSA9ICBNW293bmluZ0xheWVyLT5zY3JlZW5zcGFjZV0gKiBTW2RldmljZVNjYWxlXS5pbnZl cnNlKCkKICAgICAvLwogICAgIC8vIFRoZSByZXBsaWNhIGRyYXcgdHJhbnNmb3JtIHRvIGl0cyB0 YXJnZXQgc3VyZmFjZSBvcmlnaW4gaXM6Ci0gICAgLy8gICAgICAgIE1bcmVwbGljYURyYXddID0g U1tjb250ZW50c1NjYWxlXSAqIE1bc3VyZmFjZURyYXddICogVHJbcmVwbGljYS0+cG9zaXRpb24o KSArIHJlcGxpY2EtPmFuY2hvcigpXSAqIFRyW3JlcGxpY2FdICogVHJbb3JpZ2luMmFuY2hvcl0u aW52ZXJzZSgpICogU1tjb250ZW50c1NjYWxlXS5pbnZlcnNlKCkKKyAgICAvLyAgICAgICAgTVty ZXBsaWNhRHJhd10gPSBTW2RldmljZVNjYWxlXSAqIE1bc3VyZmFjZURyYXddICogVHJbcmVwbGlj YS0+cG9zaXRpb24oKSArIHJlcGxpY2EtPmFuY2hvcigpXSAqIFRyW3JlcGxpY2FdICogVHJbb3Jp Z2luMmFuY2hvcl0uaW52ZXJzZSgpICogU1tjb250ZW50c1NjYWxlXS5pbnZlcnNlKCkKICAgICAv LwogICAgIC8vIFRoZSByZXBsaWNhIGRyYXcgdHJhbnNmb3JtIHRvIHRoZSByb290IChzY3JlZW4g c3BhY2UpIG9yaWdpbiBpczoKICAgICAvLyAgICAgICAgTVtyZXBsaWNhMnJvb3RdID0gTVtzdXJm YWNlMnJvb3RdICogVHJbcmVwbGljYS0+cG9zaXRpb24oKV0gKiBUcltyZXBsaWNhXSAqIFRyW29y aWdpbjJhbmNob3JdLmludmVyc2UoKQpAQCAtNTY2LDcgKzU2Niw2IEBAIHN0YXRpYyB2b2lkIGNh bGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBl KiByb290TGF5CiAgICAgICAgIGFuaW1hdGluZ1RyYW5zZm9ybVRvU2NyZWVuIHw9IGxheWVyLT5w YXJlbnQoKS0+c2NyZWVuU3BhY2VUcmFuc2Zvcm1Jc0FuaW1hdGluZygpOwogICAgIH0KIAotICAg IGZsb2F0IGNvbnRlbnRzU2NhbGUgPSBsYXllci0+Y29udGVudHNTY2FsZSgpOwogICAgIEZsb2F0 UmVjdCBjb250ZW50UmVjdChGbG9hdFBvaW50KCksIGxheWVyLT5jb250ZW50Qm91bmRzKCkpOwog CiAgICAgLy8gZnVsbEhpZXJhcmNoeU1hdHJpeCBpcyB0aGUgbWF0cml4IHRoYXQgdHJhbnNmb3Jt cyBvYmplY3RzIGJldHdlZW4gc2NyZWVuIHNwYWNlIChleGNlcHQgcHJvamVjdGlvbiBtYXRyaXgp IGFuZCB0aGUgbW9zdCByZWNlbnQgUmVuZGVyU3VyZmFjZSdzIHNwYWNlLgpAQCAtNTg4LDcgKzU4 Nyw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJU eXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgICAgIC8vIFRoZSBvcmlnaW4gb2Yg dGhlIG5ldyBzdXJmYWNlIGlzIHRoZSB1cHBlciBsZWZ0IGNvcm5lciBvZiB0aGUgbGF5ZXIuCiAg ICAgICAgIHJlbmRlclN1cmZhY2UtPnNldERyYXdUcmFuc2Zvcm0oZHJhd1RyYW5zZm9ybSk7CiAg ICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGxheWVyRHJhd1RyYW5zZm9ybTsKLSAgICAg ICAgbGF5ZXJEcmF3VHJhbnNmb3JtLnNjYWxlKGNvbnRlbnRzU2NhbGUpOworICAgICAgICBsYXll ckRyYXdUcmFuc2Zvcm0uc2NhbGUoZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgICAgICBpZiAoIWxh eWVyLT5jb250ZW50Qm91bmRzKCkuaXNFbXB0eSgpICYmICFsYXllci0+Ym91bmRzKCkuaXNFbXB0 eSgpKSB7CiAgICAgICAgICAgICBsYXllckRyYXdUcmFuc2Zvcm0uc2NhbGVOb25Vbmlmb3JtKGxh eWVyLT5ib3VuZHMoKS53aWR0aCgpIC8gc3RhdGljX2Nhc3Q8ZG91YmxlPihsYXllci0+Y29udGVu dEJvdW5kcygpLndpZHRoKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBsYXllci0+Ym91bmRzKCkuaGVpZ2h0KCkgLyBzdGF0aWNfY2FzdDxkb3VibGU+ KGxheWVyLT5jb250ZW50Qm91bmRzKCkuaGVpZ2h0KCkpKTsKQEAgLTU5OCw3ICs1OTcsNyBAQCBz dGF0aWMgdm9pZCBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVybmFsKExheWVyVHlwZSogbGF5 ZXIsIExheWVyVHlwZSogcm9vdExheQogICAgICAgICAvLyBUaGUgc3VibGF5ZXIgbWF0cml4IHRy YW5zZm9ybXMgY2VudGVyZWQgbGF5ZXIgcmVjdHMgaW50byB0YXJnZXQKICAgICAgICAgLy8gc3Vy ZmFjZSBjb250ZW50IHNwYWNlLgogICAgICAgICBzdWJsYXllck1hdHJpeC5tYWtlSWRlbnRpdHko KTsKLSAgICAgICAgc3VibGF5ZXJNYXRyaXguc2NhbGUoY29udGVudHNTY2FsZSk7CisgICAgICAg IHN1YmxheWVyTWF0cml4LnNjYWxlKGRldmljZVNjYWxlRmFjdG9yKTsKICAgICAgICAgc3VibGF5 ZXJNYXRyaXgudHJhbnNsYXRlKDAuNSAqIGJvdW5kcy53aWR0aCgpLCAwLjUgKiBib3VuZHMuaGVp Z2h0KCkpOwogCiAgICAgICAgIC8vIFRoZSBvcGFjaXR5IHZhbHVlIGlzIG1vdmVkIGZyb20gdGhl IGxheWVyIHRvIGl0cyBzdXJmYWNlLCBzbyB0aGF0IHRoZSBlbnRpcmUgc3VidHJlZSBwcm9wZXJs eSBpbmhlcml0cyBvcGFjaXR5LgpAQCAtNzEyLDcgKzcxMSw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1 bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBlKiBy b290TGF5CiAgICAgICAgIEludFJlY3QgZHJhd2FibGVDb250ZW50UmVjdE9mQ2hpbGRTdWJ0cmVl OwogICAgICAgICBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVybmFsPExheWVyVHlwZSwgTGF5 ZXJMaXN0LCBSZW5kZXJTdXJmYWNlVHlwZSwgTGF5ZXJTb3J0ZXI+KGNoaWxkLCByb290TGF5ZXIs IHN1YmxheWVyTWF0cml4LCBuZXh0SGllcmFyY2h5TWF0cml4LCBuZXh0U2Nyb2xsQ29tcGVuc2F0 aW9uTWF0cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaXBSZWN0 Rm9yU3VidHJlZSwgc3VidHJlZVNob3VsZEJlQ2xpcHBlZCwgbmVhcmVzdEFuY2VzdG9yVGhhdE1v dmVzUGl4ZWxzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbmRlclN1 cmZhY2VMYXllckxpc3QsIGRlc2NlbmRhbnRzLCBsYXllclNvcnRlciwgbWF4VGV4dHVyZVNpemUs IGRyYXdhYmxlQ29udGVudFJlY3RPZkNoaWxkU3VidHJlZSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgZGVzY2VuZGFudHMsIGxh eWVyU29ydGVyLCBtYXhUZXh0dXJlU2l6ZSwgZGV2aWNlU2NhbGVGYWN0b3IsIGRyYXdhYmxlQ29u dGVudFJlY3RPZkNoaWxkU3VidHJlZSk7CiAgICAgICAgIGlmICghZHJhd2FibGVDb250ZW50UmVj dE9mQ2hpbGRTdWJ0cmVlLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgYWNjdW11bGF0ZWREcmF3 YWJsZUNvbnRlbnRSZWN0T2ZDaGlsZHJlbi51bml0ZShkcmF3YWJsZUNvbnRlbnRSZWN0T2ZDaGls ZFN1YnRyZWUpOwogICAgICAgICAgICAgaWYgKGNoaWxkLT5yZW5kZXJTdXJmYWNlKCkpCkBAIC03 NjksMTIgKzc2OCwxMiBAQCBzdGF0aWMgdm9pZCBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVy bmFsKExheWVyVHlwZSogbGF5ZXIsIExheWVyVHlwZSogcm9vdExheQogCiAgICAgICAgIGlmIChs YXllci0+cmVwbGljYUxheWVyKCkpIHsKICAgICAgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0 cml4IHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm07Ci0gICAgICAgICAgICBz dXJmYWNlT3JpZ2luVG9SZXBsaWNhT3JpZ2luVHJhbnNmb3JtLnNjYWxlKGNvbnRlbnRzU2NhbGUp OworICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5zZm9ybS5zY2Fs ZShkZXZpY2VTY2FsZUZhY3Rvcik7CiAgICAgICAgICAgICBzdXJmYWNlT3JpZ2luVG9SZXBsaWNh T3JpZ2luVHJhbnNmb3JtLnRyYW5zbGF0ZShsYXllci0+cmVwbGljYUxheWVyKCktPnBvc2l0aW9u KCkueCgpICsgbGF5ZXItPnJlcGxpY2FMYXllcigpLT5hbmNob3JQb2ludCgpLngoKSAqIGJvdW5k cy53aWR0aCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbGF5ZXItPnJlcGxpY2FMYXllcigpLT5wb3NpdGlvbigpLnkoKSArIGxh eWVyLT5yZXBsaWNhTGF5ZXIoKS0+YW5jaG9yUG9pbnQoKS55KCkgKiBib3VuZHMuaGVpZ2h0KCkp OwogICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5zZm9ybS5tdWx0 aXBseShsYXllci0+cmVwbGljYUxheWVyKCktPnRyYW5zZm9ybSgpKTsKICAgICAgICAgICAgIHN1 cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0udHJhbnNsYXRlKC1sYXllci0+cmVw bGljYUxheWVyKCktPmFuY2hvclBvaW50KCkueCgpICogYm91bmRzLndpZHRoKCksIC1sYXllci0+ cmVwbGljYUxheWVyKCktPmFuY2hvclBvaW50KCkueSgpICogYm91bmRzLmhlaWdodCgpKTsKLSAg ICAgICAgICAgIHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0uc2NhbGUoMSAv IGNvbnRlbnRzU2NhbGUpOworICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdp blRyYW5zZm9ybS5zY2FsZSgxIC8gZGV2aWNlU2NhbGVGYWN0b3IpOwogCiAgICAgICAgICAgICAv LyBDb21wdXRlIHRoZSByZXBsaWNhJ3MgIm9yaWdpblRyYW5zZm9ybSIgdGhhdCBtYXBzIGZyb20g dGhlIHJlcGxpY2EncyBvcmlnaW4gc3BhY2UgdG8gdGhlIHRhcmdldCBzdXJmYWNlIG9yaWdpbiBz cGFjZS4KICAgICAgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IHJlcGxpY2FPcmlnaW5U cmFuc2Zvcm0gPSBsYXllci0+cmVuZGVyU3VyZmFjZSgpLT5kcmF3VHJhbnNmb3JtKCkgKiBzdXJm YWNlT3JpZ2luVG9SZXBsaWNhT3JpZ2luVHJhbnNmb3JtOwpAQCAtODYzLDcgKzg2Miw3IEBAIHZv aWQgQ0NMYXllclRyZWVIb3N0Q29tbW9uOjpjYWxjdWxhdGVEcmF3VHJhbnNmb3JtcyhMYXllckNo cm9taXVtKiByb290TGF5ZXIsIGNvCiAKICAgICBXZWJDb3JlOjpjYWxjdWxhdGVEcmF3VHJhbnNm b3Jtc0ludGVybmFsPExheWVyQ2hyb21pdW0sIFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJvbWl1bT4g PiwgUmVuZGVyU3VyZmFjZUNocm9taXVtLCB2b2lkPihyb290TGF5ZXIsIHJvb3RMYXllciwgZGV2 aWNlU2NhbGVUcmFuc2Zvcm0sIGlkZW50aXR5TWF0cml4LCBpZGVudGl0eU1hdHJpeCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByb290TGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+Y29udGVudFJlY3QoKSwgdHJ1ZSwgMCwgcmVu ZGVyU3VyZmFjZUxheWVyTGlzdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByb290TGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+ bGF5ZXJMaXN0KCksIDAsIG1heFRleHR1cmVTaXplLCB0b3RhbERyYXdhYmxlQ29udGVudFJlY3Qp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5sYXllckxpc3QoKSwgMCwgbWF4 VGV4dHVyZVNpemUsIGRldmljZVNjYWxlRmFjdG9yLCB0b3RhbERyYXdhYmxlQ29udGVudFJlY3Qp OwogfQogCiB2b2lkIENDTGF5ZXJUcmVlSG9zdENvbW1vbjo6Y2FsY3VsYXRlRHJhd1RyYW5zZm9y bXMoQ0NMYXllckltcGwqIHJvb3RMYXllciwgY29uc3QgSW50U2l6ZSYgZGV2aWNlVmlld3BvcnRT aXplLCBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgQ0NMYXllclNvcnRlciogbGF5ZXJTb3J0ZXIs IGludCBtYXhUZXh0dXJlU2l6ZSwgVmVjdG9yPENDTGF5ZXJJbXBsKj4mIHJlbmRlclN1cmZhY2VM YXllckxpc3QpCkBAIC04NzcsNyArODc2LDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RDb21tb246 OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zKENDTGF5ZXJJbXBsKiByb290TGF5ZXIsIGNvbnMKIAog ICAgIFdlYkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWw8Q0NMYXllckltcGws IFZlY3RvcjxDQ0xheWVySW1wbCo+LCBDQ1JlbmRlclN1cmZhY2UsIENDTGF5ZXJTb3J0ZXI+KHJv b3RMYXllciwgcm9vdExheWVyLCBkZXZpY2VTY2FsZVRyYW5zZm9ybSwgaWRlbnRpdHlNYXRyaXgs IGlkZW50aXR5TWF0cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5jb250ZW50UmVjdCgp LCB0cnVlLCAwLCByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFj ZSgpLT5sYXllckxpc3QoKSwgbGF5ZXJTb3J0ZXIsIG1heFRleHR1cmVTaXplLCB0b3RhbERyYXdh YmxlQ29udGVudFJlY3QpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5sYXllckxpc3QoKSwg bGF5ZXJTb3J0ZXIsIG1heFRleHR1cmVTaXplLCBkZXZpY2VTY2FsZUZhY3RvciwgdG90YWxEcmF3 YWJsZUNvbnRlbnRSZWN0KTsKIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3RDb21tb246OmNhbGN1 bGF0ZVZpc2libGVBbmRTY2lzc29yUmVjdHMoVmVjdG9yPFJlZlB0cjxMYXllckNocm9taXVtPiA+ JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LCBjb25zdCBGbG9hdFJlY3QmIHJvb3RTY2lzc29yUmVj dCkK 154695 2012-07-26 11:27:03 -0700 2012-07-26 12:31:52 -0700 Rebased bug-92328-20120726112652.patch text/plain 13563 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM0NDYzZTc4Mzc2YmFh NjQ1NzEwMzg1YmZmZGYxYjcwZWFiZDMwOC4uOTU0YmI2YjNiZmNlNmRmNGU0YTc0YzdiZWY3ZjY1 ZWE0MGU0OTRjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTI1ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBXaGVu IGNvbXB1dGluZyBzdXJmYWNlIGNvbnRlbnQgc2NhbGUsIHVzZSB0b3AgbGV2ZWwgZGV2aWNlIHNj YWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjMy OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZp b3VzbHksIHN1cmZhY2Ugc2NhbGUgd2FzIGNhbGN1bGF0ZWQgd2l0aCBsYXllci0+Y29udGVudHNT Y2FsZSgpLAorICAgICAgICBob3dldmVyIHRoaXMgdmFsdWUgaXMgMSBmb3IgYW55IGxheWVyIHRo YXQgaXMgbm90IENvbnRlbnRMYXllckNocm9taXVtCisgICAgICAgIGJlY2F1c2Ugb2YgbGF5ZXIt Pm5lZWRzQ29udGVudHNTY2FsZSgpLiBUaGlzIHdvdWxkIGNhdXNlIGFueSBzdXJmYWNlCisgICAg ICAgIGNyZWF0ZWQgd2l0aCBhIG5vbi1jb250ZW50IG93bmVyIGxheWVyIHRvIGxvb2sgZnV6enkg b24gYSBoaWdoIERQSQorICAgICAgICBkZXZpY2UuIEZpeCBieSB1c2luZyB0aGUgdG9wIGxldmVs IGRldmljZSBzY2FsZS4KKworICAgICAgICBBZGRpdGlvbmFsbHksIHJlbW92ZSBjb250ZW50c1Nj YWxlIGZyb20gQ0NMYXllckltcGwgYXMgaXQgaXMgbm8gbG9uZ2VyCisgICAgICAgIHVzZWQuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8pOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpDQ0xheWVySW1wbCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuaDoKKyAgICAgICAgKENDTGF5 ZXJJbXBsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3RDb21tb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlRHJhd1RyYW5z Zm9ybXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RDb21tb246 OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zKToKKwogMjAxMi0wNy0yNiAgQWRyaWVubmUgV2Fsa2Vy ICA8ZW5uZUBnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIHJlZHVuZGFu dCBzdXJmYWNlIG9yaWdpbiB0cmFuc2Zvcm1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IDI0 ODI3ZTk0NjgxNzdmNDAyNjBlMjIwN2JlOWRlOWJhNWU1NDcwMTUuLjc2YzA2NWI1MjBiODNhMjA4 OWEwZjU3NWM1YzA4YmE4YTU2OTQ3YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCkBAIC01MzQs NyArNTM0LDYgQEAgdm9pZCBMYXllckNocm9taXVtOjpwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJ bXBsKiBsYXllcikKICAgICBsYXllci0+c2V0QmFja2dyb3VuZENvbG9yKG1fYmFja2dyb3VuZENv bG9yKTsKICAgICBsYXllci0+c2V0Qm91bmRzKG1fYm91bmRzKTsKICAgICBsYXllci0+c2V0Q29u dGVudEJvdW5kcyhjb250ZW50Qm91bmRzKCkpOwotICAgIGxheWVyLT5zZXRDb250ZW50c1NjYWxl KGNvbnRlbnRzU2NhbGUoKSk7CiAgICAgbGF5ZXItPnNldERlYnVnQm9yZGVyQ29sb3IobV9kZWJ1 Z0JvcmRlckNvbG9yKTsKICAgICBsYXllci0+c2V0RGVidWdCb3JkZXJXaWR0aChtX2RlYnVnQm9y ZGVyV2lkdGgpOwogICAgIGxheWVyLT5zZXREZWJ1Z05hbWUobV9kZWJ1Z05hbWUuaXNvbGF0ZWRD b3B5KCkpOyAvLyBXZSBoYXZlIHRvIHVzZSBpc29sYXRlZENvcHkoKSBoZXJlIHRvIHNhZmVseSBw YXNzIG93bmVyc2hpcCB0byBhbm90aGVyIHRocmVhZC4KQEAgLTYxNSw3ICs2MTQsNiBAQCB2b2lk IExheWVyQ2hyb21pdW06OnNldERlYnVnTmFtZShjb25zdCBTdHJpbmcmIGRlYnVnTmFtZSkKICAg ICBzZXROZWVkc0NvbW1pdCgpOwogfQogCi0KIHZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVu dHNTY2FsZShmbG9hdCBjb250ZW50c1NjYWxlKQogewogICAgIGlmICghbmVlZHNDb250ZW50c1Nj YWxlKCkgfHwgbV9jb250ZW50c1NjYWxlID09IGNvbnRlbnRzU2NhbGUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy SW1wbC5jcHAKaW5kZXggMjNhMzhhMjBkMjczMGE2YmJhMDAxMTgxYjhlNjAyZWY4YzJhYWNlZi4u MmI2ZWY5MTc3ZmM3ZDJlYWFmNTQ1Yjk3Zjk5MjUzN2FlMThkMjU2MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJJbXBsLmNwcApAQCAtNTAsNyArNTAsNiBAQCBDQ0xheWVySW1wbDo6Q0NMYXllckltcGwoaW50 IGlkKQogICAgICwgbV9sYXllclRyZWVIb3N0SW1wbCgwKQogICAgICwgbV9hbmNob3JQb2ludCgw LjUsIDAuNSkKICAgICAsIG1fYW5jaG9yUG9pbnRaKDApCi0gICAgLCBtX2NvbnRlbnRzU2NhbGUo MSkKICAgICAsIG1fc2Nyb2xsYWJsZShmYWxzZSkKICAgICAsIG1fc2hvdWxkU2Nyb2xsT25NYWlu VGhyZWFkKGZhbHNlKQogICAgICwgbV9oYXZlV2hlZWxFdmVudEhhbmRsZXJzKGZhbHNlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJJbXBsLmgKaW5kZXggNDJjZjlmY2JhNzZmOWJjZTI2NjE0Yzg3YzE4OWM3MmY2YmU1 NzAxNC4uZGVjZGRmZjdhMTM0NDlkNWUzYzQwYzA2YmM4MmNkZGUxN2UyYzA3NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllcklt cGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9D Q0xheWVySW1wbC5oCkBAIC0xODcsOSArMTg3LDYgQEAgcHVibGljOgogICAgIGNvbnN0IEludFNp emUmIGNvbnRlbnRCb3VuZHMoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRCb3VuZHM7IH0KICAg ICB2b2lkIHNldENvbnRlbnRCb3VuZHMoY29uc3QgSW50U2l6ZSYpOwogCi0gICAgdm9pZCBzZXRD b250ZW50c1NjYWxlKGZsb2F0IGNvbnRlbnRzU2NhbGUpIHsgbV9jb250ZW50c1NjYWxlID0gY29u dGVudHNTY2FsZTsgfQotICAgIGZsb2F0IGNvbnRlbnRzU2NhbGUoKSBjb25zdCB7IHJldHVybiBt X2NvbnRlbnRzU2NhbGU7IH0KLQogICAgIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbigp IGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsUG9zaXRpb247IH0KICAgICB2b2lkIHNldFNjcm9sbFBv c2l0aW9uKGNvbnN0IEludFBvaW50Jik7CiAKQEAgLTMwNCw3ICszMDEsNiBAQCBwcml2YXRlOgog ICAgIGZsb2F0IG1fYW5jaG9yUG9pbnRaOwogICAgIEludFNpemUgbV9ib3VuZHM7CiAgICAgSW50 U2l6ZSBtX2NvbnRlbnRCb3VuZHM7Ci0gICAgZmxvYXQgbV9jb250ZW50c1NjYWxlOwogICAgIElu dFBvaW50IG1fc2Nyb2xsUG9zaXRpb247CiAgICAgYm9vbCBtX3Njcm9sbGFibGU7CiAgICAgYm9v bCBtX3Nob3VsZFNjcm9sbE9uTWFpblRocmVhZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3RDb21tb24uY3BwCmluZGV4IDU2YWRmY2NiYjg4YmI3NzJjYzJkOTljMjMwOGFjYjIxMGZj NThmMzEuLjE4MzZmNjMxNTI4ZTI4MjZjMDYzY2ZhZjI0OWM1NTJiZGUyN2RmYzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJU cmVlSG9zdENvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcApAQCAtNDEwLDcgKzQxMCw3IEBA IHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBs YXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgY29uc3QgV2ViVHJhbnNmb3JtYXRpb25NYXRy aXgmIGZ1bGxIaWVyYXJjaHlNYXRyaXgsIGNvbnN0IFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4JiBj dXJyZW50U2Nyb2xsQ29tcGVuc2F0aW9uTWF0cml4LAogICAgIGNvbnN0IEludFJlY3QmIGNsaXBS ZWN0RnJvbUFuY2VzdG9yLCBib29sIGFuY2VzdG9yQ2xpcHNTdWJ0cmVlLAogICAgIFJlbmRlclN1 cmZhY2VUeXBlKiBuZWFyZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHMsIExheWVyTGlzdCYgcmVu ZGVyU3VyZmFjZUxheWVyTGlzdCwgTGF5ZXJMaXN0JiBsYXllckxpc3QsCi0gICAgTGF5ZXJTb3J0 ZXIqIGxheWVyU29ydGVyLCBpbnQgbWF4VGV4dHVyZVNpemUsIEludFJlY3QmIGRyYXdhYmxlQ29u dGVudFJlY3RPZlN1YnRyZWUpCisgICAgTGF5ZXJTb3J0ZXIqIGxheWVyU29ydGVyLCBpbnQgbWF4 VGV4dHVyZVNpemUsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBJbnRSZWN0JiBkcmF3YWJsZUNv bnRlbnRSZWN0T2ZTdWJ0cmVlKQogewogICAgIC8vIFRoaXMgZnVuY3Rpb24gY29tcHV0ZXMgdGhl IG5ldyBtYXRyaXggdHJhbnNmb3JtYXRpb25zIHJlY3Vyc2l2ZWx5IGZvciB0aGlzCiAgICAgLy8g bGF5ZXIgYW5kIGFsbCBpdHMgZGVzY2VuZGFudHMuIEl0IGFsc28gY29tcHV0ZXMgdGhlIGFwcHJv cHJpYXRlIHJlbmRlciBzdXJmYWNlcy4KQEAgLTQ4NCwxNiArNDg0LDE2IEBAIHN0YXRpYyB2b2lk IGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJU eXBlKiByb290TGF5CiAgICAgLy8gV2hlbiBhIHJlbmRlciBzdXJmYWNlIGhhcyBhIHJlcGxpY2Eg bGF5ZXIsIHRoYXQgbGF5ZXIncyB0cmFuc2Zvcm0gaXMgdXNlZCB0byBkcmF3IGEgc2Vjb25kIGNv cHkgb2YgdGhlIHN1cmZhY2UuCiAgICAgLy8gVHJhbnNmb3JtcyBuYW1lZCBoZXJlIGFyZSByZWxh dGl2ZSB0byB0aGUgc3VyZmFjZSwgdW5sZXNzIHRoZXkgc3BlY2lmeSB0aGV5IGFyZSByZWxhdGl2 ZSB0byB0aGUgcmVwbGljYSBsYXllci4KICAgICAvLwotICAgIC8vIFdlIHdpbGwgZGVub3RlIGEg c2NhbGUgYnkgY29udGVudHMgc2NhbGUgU1tjb250ZW50c1NjYWxlXQorICAgIC8vIFdlIHdpbGwg ZGVub3RlIGEgc2NhbGUgYnkgZGV2aWNlIHNjYWxlIFNbZGV2aWNlU2NhbGVdCiAgICAgLy8KICAg ICAvLyBUaGUgcmVuZGVyIHN1cmZhY2UgZHJhdyB0cmFuc2Zvcm0gdG8gaXRzIHRhcmdldCBzdXJm YWNlIG9yaWdpbiBpczoKICAgICAvLyAgICAgICAgTVtzdXJmYWNlRHJhd10gPSBNW293bmluZ0xh eWVyLT5EcmF3XQogICAgIC8vCiAgICAgLy8gVGhlIHJlbmRlciBzdXJmYWNlIG9yaWdpbiB0cmFu c2Zvcm0gdG8gaXRzIHRoZSByb290IChzY3JlZW4gc3BhY2UpIG9yaWdpbiBpczoKLSAgICAvLyAg ICAgICAgTVtzdXJmYWNlMnJvb3RdID0gIE1bb3duaW5nTGF5ZXItPnNjcmVlbnNwYWNlXSAqIFNb Y29udGVudHNTY2FsZV0uaW52ZXJzZSgpCisgICAgLy8gICAgICAgIE1bc3VyZmFjZTJyb290XSA9 ICBNW293bmluZ0xheWVyLT5zY3JlZW5zcGFjZV0gKiBTW2RldmljZVNjYWxlXS5pbnZlcnNlKCkK ICAgICAvLwogICAgIC8vIFRoZSByZXBsaWNhIGRyYXcgdHJhbnNmb3JtIHRvIGl0cyB0YXJnZXQg c3VyZmFjZSBvcmlnaW4gaXM6Ci0gICAgLy8gICAgICAgIE1bcmVwbGljYURyYXddID0gU1tjb250 ZW50c1NjYWxlXSAqIE1bc3VyZmFjZURyYXddICogVHJbcmVwbGljYS0+cG9zaXRpb24oKSArIHJl cGxpY2EtPmFuY2hvcigpXSAqIFRyW3JlcGxpY2FdICogVHJbb3JpZ2luMmFuY2hvcl0uaW52ZXJz ZSgpICogU1tjb250ZW50c1NjYWxlXS5pbnZlcnNlKCkKKyAgICAvLyAgICAgICAgTVtyZXBsaWNh RHJhd10gPSBTW2RldmljZVNjYWxlXSAqIE1bc3VyZmFjZURyYXddICogVHJbcmVwbGljYS0+cG9z aXRpb24oKSArIHJlcGxpY2EtPmFuY2hvcigpXSAqIFRyW3JlcGxpY2FdICogVHJbb3JpZ2luMmFu Y2hvcl0uaW52ZXJzZSgpICogU1tjb250ZW50c1NjYWxlXS5pbnZlcnNlKCkKICAgICAvLwogICAg IC8vIFRoZSByZXBsaWNhIGRyYXcgdHJhbnNmb3JtIHRvIHRoZSByb290IChzY3JlZW4gc3BhY2Up IG9yaWdpbiBpczoKICAgICAvLyAgICAgICAgTVtyZXBsaWNhMnJvb3RdID0gTVtzdXJmYWNlMnJv b3RdICogVHJbcmVwbGljYS0+cG9zaXRpb24oKV0gKiBUcltyZXBsaWNhXSAqIFRyW29yaWdpbjJh bmNob3JdLmludmVyc2UoKQpAQCAtNTY2LDcgKzU2Niw2IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0 ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290 TGF5CiAgICAgICAgIGFuaW1hdGluZ1RyYW5zZm9ybVRvU2NyZWVuIHw9IGxheWVyLT5wYXJlbnQo KS0+c2NyZWVuU3BhY2VUcmFuc2Zvcm1Jc0FuaW1hdGluZygpOwogICAgIH0KIAotICAgIGZsb2F0 IGNvbnRlbnRzU2NhbGUgPSBsYXllci0+Y29udGVudHNTY2FsZSgpOwogICAgIEZsb2F0UmVjdCBj b250ZW50UmVjdChGbG9hdFBvaW50KCksIGxheWVyLT5jb250ZW50Qm91bmRzKCkpOwogCiAgICAg Ly8gZnVsbEhpZXJhcmNoeU1hdHJpeCBpcyB0aGUgbWF0cml4IHRoYXQgdHJhbnNmb3JtcyBvYmpl Y3RzIGJldHdlZW4gc2NyZWVuIHNwYWNlIChleGNlcHQgcHJvamVjdGlvbiBtYXRyaXgpIGFuZCB0 aGUgbW9zdCByZWNlbnQgUmVuZGVyU3VyZmFjZSdzIHNwYWNlLgpAQCAtNTg4LDcgKzU4Nyw3IEBA IHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBs YXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgICAgIC8vIFRoZSBvcmlnaW4gb2YgdGhlIG5l dyBzdXJmYWNlIGlzIHRoZSB1cHBlciBsZWZ0IGNvcm5lciBvZiB0aGUgbGF5ZXIuCiAgICAgICAg IHJlbmRlclN1cmZhY2UtPnNldERyYXdUcmFuc2Zvcm0oZHJhd1RyYW5zZm9ybSk7CiAgICAgICAg IFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IGxheWVyRHJhd1RyYW5zZm9ybTsKLSAgICAgICAgbGF5 ZXJEcmF3VHJhbnNmb3JtLnNjYWxlKGNvbnRlbnRzU2NhbGUpOworICAgICAgICBsYXllckRyYXdU cmFuc2Zvcm0uc2NhbGUoZGV2aWNlU2NhbGVGYWN0b3IpOwogICAgICAgICBpZiAoIWxheWVyLT5j b250ZW50Qm91bmRzKCkuaXNFbXB0eSgpICYmICFsYXllci0+Ym91bmRzKCkuaXNFbXB0eSgpKSB7 CiAgICAgICAgICAgICBsYXllckRyYXdUcmFuc2Zvcm0uc2NhbGVOb25Vbmlmb3JtKGxheWVyLT5i b3VuZHMoKS53aWR0aCgpIC8gc3RhdGljX2Nhc3Q8ZG91YmxlPihsYXllci0+Y29udGVudEJvdW5k cygpLndpZHRoKCkpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBsYXllci0+Ym91bmRzKCkuaGVpZ2h0KCkgLyBzdGF0aWNfY2FzdDxkb3VibGU+KGxheWVy LT5jb250ZW50Qm91bmRzKCkuaGVpZ2h0KCkpKTsKQEAgLTU5OCw3ICs1OTcsNyBAQCBzdGF0aWMg dm9pZCBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVybmFsKExheWVyVHlwZSogbGF5ZXIsIExh eWVyVHlwZSogcm9vdExheQogICAgICAgICAvLyBUaGUgc3VibGF5ZXIgbWF0cml4IHRyYW5zZm9y bXMgY2VudGVyZWQgbGF5ZXIgcmVjdHMgaW50byB0YXJnZXQKICAgICAgICAgLy8gc3VyZmFjZSBj b250ZW50IHNwYWNlLgogICAgICAgICBzdWJsYXllck1hdHJpeC5tYWtlSWRlbnRpdHkoKTsKLSAg ICAgICAgc3VibGF5ZXJNYXRyaXguc2NhbGUoY29udGVudHNTY2FsZSk7CisgICAgICAgIHN1Ymxh eWVyTWF0cml4LnNjYWxlKGRldmljZVNjYWxlRmFjdG9yKTsKICAgICAgICAgc3VibGF5ZXJNYXRy aXgudHJhbnNsYXRlKDAuNSAqIGJvdW5kcy53aWR0aCgpLCAwLjUgKiBib3VuZHMuaGVpZ2h0KCkp OwogCiAgICAgICAgIC8vIFRoZSBvcGFjaXR5IHZhbHVlIGlzIG1vdmVkIGZyb20gdGhlIGxheWVy IHRvIGl0cyBzdXJmYWNlLCBzbyB0aGF0IHRoZSBlbnRpcmUgc3VidHJlZSBwcm9wZXJseSBpbmhl cml0cyBvcGFjaXR5LgpAQCAtNzEyLDcgKzcxMSw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURy YXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290TGF5 CiAgICAgICAgIEludFJlY3QgZHJhd2FibGVDb250ZW50UmVjdE9mQ2hpbGRTdWJ0cmVlOwogICAg ICAgICBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVybmFsPExheWVyVHlwZSwgTGF5ZXJMaXN0 LCBSZW5kZXJTdXJmYWNlVHlwZSwgTGF5ZXJTb3J0ZXI+KGNoaWxkLCByb290TGF5ZXIsIHN1Ymxh eWVyTWF0cml4LCBuZXh0SGllcmFyY2h5TWF0cml4LCBuZXh0U2Nyb2xsQ29tcGVuc2F0aW9uTWF0 cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaXBSZWN0Rm9yU3Vi dHJlZSwgc3VidHJlZVNob3VsZEJlQ2xpcHBlZCwgbmVhcmVzdEFuY2VzdG9yVGhhdE1vdmVzUGl4 ZWxzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbmRlclN1cmZhY2VM YXllckxpc3QsIGRlc2NlbmRhbnRzLCBsYXllclNvcnRlciwgbWF4VGV4dHVyZVNpemUsIGRyYXdh YmxlQ29udGVudFJlY3RPZkNoaWxkU3VidHJlZSk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgZGVzY2VuZGFudHMsIGxheWVyU29y dGVyLCBtYXhUZXh0dXJlU2l6ZSwgZGV2aWNlU2NhbGVGYWN0b3IsIGRyYXdhYmxlQ29udGVudFJl Y3RPZkNoaWxkU3VidHJlZSk7CiAgICAgICAgIGlmICghZHJhd2FibGVDb250ZW50UmVjdE9mQ2hp bGRTdWJ0cmVlLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgYWNjdW11bGF0ZWREcmF3YWJsZUNv bnRlbnRSZWN0T2ZDaGlsZHJlbi51bml0ZShkcmF3YWJsZUNvbnRlbnRSZWN0T2ZDaGlsZFN1YnRy ZWUpOwogICAgICAgICAgICAgaWYgKGNoaWxkLT5yZW5kZXJTdXJmYWNlKCkpCkBAIC03NjksMTIg Kzc2OCwxMiBAQCBzdGF0aWMgdm9pZCBjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0ludGVybmFsKExh eWVyVHlwZSogbGF5ZXIsIExheWVyVHlwZSogcm9vdExheQogCiAgICAgICAgIGlmIChsYXllci0+ cmVwbGljYUxheWVyKCkpIHsKICAgICAgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IHN1 cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm07Ci0gICAgICAgICAgICBzdXJmYWNl T3JpZ2luVG9SZXBsaWNhT3JpZ2luVHJhbnNmb3JtLnNjYWxlKGNvbnRlbnRzU2NhbGUpOworICAg ICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5zZm9ybS5zY2FsZShkZXZp Y2VTY2FsZUZhY3Rvcik7CiAgICAgICAgICAgICBzdXJmYWNlT3JpZ2luVG9SZXBsaWNhT3JpZ2lu VHJhbnNmb3JtLnRyYW5zbGF0ZShsYXllci0+cmVwbGljYUxheWVyKCktPnBvc2l0aW9uKCkueCgp ICsgbGF5ZXItPnJlcGxpY2FMYXllcigpLT5hbmNob3JQb2ludCgpLngoKSAqIGJvdW5kcy53aWR0 aCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbGF5ZXItPnJlcGxpY2FMYXllcigpLT5wb3NpdGlvbigpLnkoKSArIGxheWVyLT5y ZXBsaWNhTGF5ZXIoKS0+YW5jaG9yUG9pbnQoKS55KCkgKiBib3VuZHMuaGVpZ2h0KCkpOwogICAg ICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5zZm9ybS5tdWx0aXBseShs YXllci0+cmVwbGljYUxheWVyKCktPnRyYW5zZm9ybSgpKTsKICAgICAgICAgICAgIHN1cmZhY2VP cmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0udHJhbnNsYXRlKC1sYXllci0+cmVwbGljYUxh eWVyKCktPmFuY2hvclBvaW50KCkueCgpICogYm91bmRzLndpZHRoKCksIC1sYXllci0+cmVwbGlj YUxheWVyKCktPmFuY2hvclBvaW50KCkueSgpICogYm91bmRzLmhlaWdodCgpKTsKLSAgICAgICAg ICAgIHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0uc2NhbGUoMSAvIGNvbnRl bnRzU2NhbGUpOworICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5z Zm9ybS5zY2FsZSgxIC8gZGV2aWNlU2NhbGVGYWN0b3IpOwogCiAgICAgICAgICAgICAvLyBDb21w dXRlIHRoZSByZXBsaWNhJ3MgIm9yaWdpblRyYW5zZm9ybSIgdGhhdCBtYXBzIGZyb20gdGhlIHJl cGxpY2EncyBvcmlnaW4gc3BhY2UgdG8gdGhlIHRhcmdldCBzdXJmYWNlIG9yaWdpbiBzcGFjZS4K ICAgICAgICAgICAgIFdlYlRyYW5zZm9ybWF0aW9uTWF0cml4IHJlcGxpY2FPcmlnaW5UcmFuc2Zv cm0gPSBsYXllci0+cmVuZGVyU3VyZmFjZSgpLT5kcmF3VHJhbnNmb3JtKCkgKiBzdXJmYWNlT3Jp Z2luVG9SZXBsaWNhT3JpZ2luVHJhbnNmb3JtOwpAQCAtODYzLDcgKzg2Miw3IEBAIHZvaWQgQ0NM YXllclRyZWVIb3N0Q29tbW9uOjpjYWxjdWxhdGVEcmF3VHJhbnNmb3JtcyhMYXllckNocm9taXVt KiByb290TGF5ZXIsIGNvCiAKICAgICBXZWJDb3JlOjpjYWxjdWxhdGVEcmF3VHJhbnNmb3Jtc0lu dGVybmFsPExheWVyQ2hyb21pdW0sIFZlY3RvcjxSZWZQdHI8TGF5ZXJDaHJvbWl1bT4gPiwgUmVu ZGVyU3VyZmFjZUNocm9taXVtLCB2b2lkPihyb290TGF5ZXIsIHJvb3RMYXllciwgZGV2aWNlU2Nh bGVUcmFuc2Zvcm0sIGlkZW50aXR5TWF0cml4LCBpZGVudGl0eU1hdHJpeCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByb290 TGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+Y29udGVudFJlY3QoKSwgdHJ1ZSwgMCwgcmVuZGVyU3Vy ZmFjZUxheWVyTGlzdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICByb290TGF5ZXItPnJlbmRlclN1cmZhY2UoKS0+bGF5ZXJM aXN0KCksIDAsIG1heFRleHR1cmVTaXplLCB0b3RhbERyYXdhYmxlQ29udGVudFJlY3QpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5sYXllckxpc3QoKSwgMCwgbWF4VGV4dHVy ZVNpemUsIGRldmljZVNjYWxlRmFjdG9yLCB0b3RhbERyYXdhYmxlQ29udGVudFJlY3QpOwogfQog CiB2b2lkIENDTGF5ZXJUcmVlSG9zdENvbW1vbjo6Y2FsY3VsYXRlRHJhd1RyYW5zZm9ybXMoQ0NM YXllckltcGwqIHJvb3RMYXllciwgY29uc3QgSW50U2l6ZSYgZGV2aWNlVmlld3BvcnRTaXplLCBm bG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgQ0NMYXllclNvcnRlciogbGF5ZXJTb3J0ZXIsIGludCBt YXhUZXh0dXJlU2l6ZSwgVmVjdG9yPENDTGF5ZXJJbXBsKj4mIHJlbmRlclN1cmZhY2VMYXllckxp c3QpCkBAIC04NzcsNyArODc2LDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RDb21tb246OmNhbGN1 bGF0ZURyYXdUcmFuc2Zvcm1zKENDTGF5ZXJJbXBsKiByb290TGF5ZXIsIGNvbnMKIAogICAgIFdl YkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWw8Q0NMYXllckltcGwsIFZlY3Rv cjxDQ0xheWVySW1wbCo+LCBDQ1JlbmRlclN1cmZhY2UsIENDTGF5ZXJTb3J0ZXI+KHJvb3RMYXll ciwgcm9vdExheWVyLCBkZXZpY2VTY2FsZVRyYW5zZm9ybSwgaWRlbnRpdHlNYXRyaXgsIGlkZW50 aXR5TWF0cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5jb250ZW50UmVjdCgpLCB0cnVl LCAwLCByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5s YXllckxpc3QoKSwgbGF5ZXJTb3J0ZXIsIG1heFRleHR1cmVTaXplLCB0b3RhbERyYXdhYmxlQ29u dGVudFJlY3QpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5sYXllckxpc3QoKSwgbGF5ZXJT b3J0ZXIsIG1heFRleHR1cmVTaXplLCBkZXZpY2VTY2FsZUZhY3RvciwgdG90YWxEcmF3YWJsZUNv bnRlbnRSZWN0KTsKIH0KIAogdm9pZCBDQ0xheWVyVHJlZUhvc3RDb21tb246OmNhbGN1bGF0ZVZp c2libGVBbmRTY2lzc29yUmVjdHMoVmVjdG9yPFJlZlB0cjxMYXllckNocm9taXVtPiA+JiByZW5k ZXJTdXJmYWNlTGF5ZXJMaXN0LCBjb25zdCBGbG9hdFJlY3QmIHJvb3RTY2lzc29yUmVjdCkK 154722 2012-07-26 12:31:55 -0700 2012-07-26 16:55:35 -0700 Rebased bug-92328-20120726123144.patch text/plain 13538 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ5ZjU3ZjZjYmQ3OTE3 ZmNmN2FkNGU0ZDBhMjY5OTU3NjBkOTdkZi4uMGU2ODAzODM5N2Q5YWRlZGRhYzFiNTE5MjRlYmY0 YmExNWFmODVhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTI1ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBXaGVu IGNvbXB1dGluZyBzdXJmYWNlIGNvbnRlbnQgc2NhbGUsIHVzZSB0b3AgbGV2ZWwgZGV2aWNlIHNj YWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjMy OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZp b3VzbHksIHN1cmZhY2Ugc2NhbGUgd2FzIGNhbGN1bGF0ZWQgd2l0aCBsYXllci0+Y29udGVudHNT Y2FsZSgpLAorICAgICAgICBob3dldmVyIHRoaXMgdmFsdWUgaXMgMSBmb3IgYW55IGxheWVyIHRo YXQgaXMgbm90IENvbnRlbnRMYXllckNocm9taXVtCisgICAgICAgIGJlY2F1c2Ugb2YgbGF5ZXIt Pm5lZWRzQ29udGVudHNTY2FsZSgpLiBUaGlzIHdvdWxkIGNhdXNlIGFueSBzdXJmYWNlCisgICAg ICAgIGNyZWF0ZWQgd2l0aCBhIG5vbi1jb250ZW50IG93bmVyIGxheWVyIHRvIGxvb2sgZnV6enkg b24gYSBoaWdoIERQSQorICAgICAgICBkZXZpY2UuIEZpeCBieSB1c2luZyB0aGUgdG9wIGxldmVs IGRldmljZSBzY2FsZS4KKworICAgICAgICBBZGRpdGlvbmFsbHksIHJlbW92ZSBjb250ZW50c1Nj YWxlIGZyb20gQ0NMYXllckltcGwgYXMgaXQgaXMgbm8gbG9uZ2VyCisgICAgICAgIHVzZWQuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8pOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJJbXBsOjpDQ0xheWVySW1wbCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuaDoKKyAgICAgICAgKENDTGF5 ZXJJbXBsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3RDb21tb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlRHJhd1RyYW5z Zm9ybXNJbnRlcm5hbCk6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RDb21tb246 OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zKToKKwogMjAxMi0wNy0yNiAgQ2hhbmcgU2h1ICA8Y3No dUB3ZWJraXQub3JnPgogCiAgICAgICAgIEJ1aWxkIGJyb2tlbiB3aGVuIHN2ZyBpcyBkaXNhYmxl ZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggMjQ4MjdlOTQ2ODE3N2Y0MDI2MGUyMjA3YmU5 ZGU5YmE1ZTU0NzAxNS4uNzZjMDY1YjUyMGI4M2EyMDg5YTBmNTc1YzVjMDhiYThhNTY5NDdiMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTUzNCw3ICs1MzQsNiBAQCB2b2lkIExheWVyQ2hy b21pdW06OnB1c2hQcm9wZXJ0aWVzVG8oQ0NMYXllckltcGwqIGxheWVyKQogICAgIGxheWVyLT5z ZXRCYWNrZ3JvdW5kQ29sb3IobV9iYWNrZ3JvdW5kQ29sb3IpOwogICAgIGxheWVyLT5zZXRCb3Vu ZHMobV9ib3VuZHMpOwogICAgIGxheWVyLT5zZXRDb250ZW50Qm91bmRzKGNvbnRlbnRCb3VuZHMo KSk7Ci0gICAgbGF5ZXItPnNldENvbnRlbnRzU2NhbGUoY29udGVudHNTY2FsZSgpKTsKICAgICBs YXllci0+c2V0RGVidWdCb3JkZXJDb2xvcihtX2RlYnVnQm9yZGVyQ29sb3IpOwogICAgIGxheWVy LT5zZXREZWJ1Z0JvcmRlcldpZHRoKG1fZGVidWdCb3JkZXJXaWR0aCk7CiAgICAgbGF5ZXItPnNl dERlYnVnTmFtZShtX2RlYnVnTmFtZS5pc29sYXRlZENvcHkoKSk7IC8vIFdlIGhhdmUgdG8gdXNl IGlzb2xhdGVkQ29weSgpIGhlcmUgdG8gc2FmZWx5IHBhc3Mgb3duZXJzaGlwIHRvIGFub3RoZXIg dGhyZWFkLgpAQCAtNjE1LDcgKzYxNCw2IEBAIHZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0RGVidWdO YW1lKGNvbnN0IFN0cmluZyYgZGVidWdOYW1lKQogICAgIHNldE5lZWRzQ29tbWl0KCk7CiB9CiAK LQogdm9pZCBMYXllckNocm9taXVtOjpzZXRDb250ZW50c1NjYWxlKGZsb2F0IGNvbnRlbnRzU2Nh bGUpCiB7CiAgICAgaWYgKCFuZWVkc0NvbnRlbnRzU2NhbGUoKSB8fCBtX2NvbnRlbnRzU2NhbGUg PT0gY29udGVudHNTY2FsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmNwcAppbmRleCAyM2EzOGEyMGQy NzMwYTZiYmEwMDExODFiOGU2MDJlZjhjMmFhY2VmLi4yYjZlZjkxNzdmYzdkMmVhYWY1NDViOTdm OTkyNTM3YWUxOGQyNTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuY3BwCkBAIC01MCw3ICs1MCw2 IEBAIENDTGF5ZXJJbXBsOjpDQ0xheWVySW1wbChpbnQgaWQpCiAgICAgLCBtX2xheWVyVHJlZUhv c3RJbXBsKDApCiAgICAgLCBtX2FuY2hvclBvaW50KDAuNSwgMC41KQogICAgICwgbV9hbmNob3JQ b2ludFooMCkKLSAgICAsIG1fY29udGVudHNTY2FsZSgxKQogICAgICwgbV9zY3JvbGxhYmxlKGZh bHNlKQogICAgICwgbV9zaG91bGRTY3JvbGxPbk1haW5UaHJlYWQoZmFsc2UpCiAgICAgLCBtX2hh dmVXaGVlbEV2ZW50SGFuZGxlcnMoZmFsc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckltcGwuaAppbmRleCA0MmNm OWZjYmE3NmY5YmNlMjY2MTRjODdjMTg5YzcyZjZiZTU3MDE0Li5kZWNkZGZmN2ExMzQ0OWQ1ZTNj NDBjMDZiYzgyY2RkZTE3ZTJjMDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJJbXBsLmgKQEAgLTE4Nyw5ICsx ODcsNiBAQCBwdWJsaWM6CiAgICAgY29uc3QgSW50U2l6ZSYgY29udGVudEJvdW5kcygpIGNvbnN0 IHsgcmV0dXJuIG1fY29udGVudEJvdW5kczsgfQogICAgIHZvaWQgc2V0Q29udGVudEJvdW5kcyhj b25zdCBJbnRTaXplJik7CiAKLSAgICB2b2lkIHNldENvbnRlbnRzU2NhbGUoZmxvYXQgY29udGVu dHNTY2FsZSkgeyBtX2NvbnRlbnRzU2NhbGUgPSBjb250ZW50c1NjYWxlOyB9Ci0gICAgZmxvYXQg Y29udGVudHNTY2FsZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNTY2FsZTsgfQotCiAgICAg Y29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxQ b3NpdGlvbjsgfQogICAgIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmKTsK IApAQCAtMzA0LDcgKzMwMSw2IEBAIHByaXZhdGU6CiAgICAgZmxvYXQgbV9hbmNob3JQb2ludFo7 CiAgICAgSW50U2l6ZSBtX2JvdW5kczsKICAgICBJbnRTaXplIG1fY29udGVudEJvdW5kczsKLSAg ICBmbG9hdCBtX2NvbnRlbnRzU2NhbGU7CiAgICAgSW50UG9pbnQgbV9zY3JvbGxQb3NpdGlvbjsK ICAgICBib29sIG1fc2Nyb2xsYWJsZTsKICAgICBib29sIG1fc2hvdWxkU2Nyb2xsT25NYWluVGhy ZWFkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdENvbW1vbi5jcHAKaW5kZXggNTZh ZGZjY2JiODhiYjc3MmNjMmQ5OWMyMzA4YWNiMjEwZmM1OGYzMS4uMTgzNmY2MzE1MjhlMjgyNmMw NjNjZmFmMjQ5YzU1MmJkZTI3ZGZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0Q29tbW9uLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhv c3RDb21tb24uY3BwCkBAIC00MTAsNyArNDEwLDcgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJh d1RyYW5zZm9ybXNJbnRlcm5hbChMYXllclR5cGUqIGxheWVyLCBMYXllclR5cGUqIHJvb3RMYXkK ICAgICBjb25zdCBXZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgZnVsbEhpZXJhcmNoeU1hdHJpeCwg Y29uc3QgV2ViVHJhbnNmb3JtYXRpb25NYXRyaXgmIGN1cnJlbnRTY3JvbGxDb21wZW5zYXRpb25N YXRyaXgsCiAgICAgY29uc3QgSW50UmVjdCYgY2xpcFJlY3RGcm9tQW5jZXN0b3IsIGJvb2wgYW5j ZXN0b3JDbGlwc1N1YnRyZWUsCiAgICAgUmVuZGVyU3VyZmFjZVR5cGUqIG5lYXJlc3RBbmNlc3Rv clRoYXRNb3Zlc1BpeGVscywgTGF5ZXJMaXN0JiByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LCBMYXll ckxpc3QmIGxheWVyTGlzdCwKLSAgICBMYXllclNvcnRlciogbGF5ZXJTb3J0ZXIsIGludCBtYXhU ZXh0dXJlU2l6ZSwgSW50UmVjdCYgZHJhd2FibGVDb250ZW50UmVjdE9mU3VidHJlZSkKKyAgICBM YXllclNvcnRlciogbGF5ZXJTb3J0ZXIsIGludCBtYXhUZXh0dXJlU2l6ZSwgZmxvYXQgZGV2aWNl U2NhbGVGYWN0b3IsIEludFJlY3QmIGRyYXdhYmxlQ29udGVudFJlY3RPZlN1YnRyZWUpCiB7CiAg ICAgLy8gVGhpcyBmdW5jdGlvbiBjb21wdXRlcyB0aGUgbmV3IG1hdHJpeCB0cmFuc2Zvcm1hdGlv bnMgcmVjdXJzaXZlbHkgZm9yIHRoaXMKICAgICAvLyBsYXllciBhbmQgYWxsIGl0cyBkZXNjZW5k YW50cy4gSXQgYWxzbyBjb21wdXRlcyB0aGUgYXBwcm9wcmlhdGUgcmVuZGVyIHN1cmZhY2VzLgpA QCAtNDg0LDE2ICs0ODQsMTYgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNJ bnRlcm5hbChMYXllclR5cGUqIGxheWVyLCBMYXllclR5cGUqIHJvb3RMYXkKICAgICAvLyBXaGVu IGEgcmVuZGVyIHN1cmZhY2UgaGFzIGEgcmVwbGljYSBsYXllciwgdGhhdCBsYXllcidzIHRyYW5z Zm9ybSBpcyB1c2VkIHRvIGRyYXcgYSBzZWNvbmQgY29weSBvZiB0aGUgc3VyZmFjZS4KICAgICAv LyBUcmFuc2Zvcm1zIG5hbWVkIGhlcmUgYXJlIHJlbGF0aXZlIHRvIHRoZSBzdXJmYWNlLCB1bmxl c3MgdGhleSBzcGVjaWZ5IHRoZXkgYXJlIHJlbGF0aXZlIHRvIHRoZSByZXBsaWNhIGxheWVyLgog ICAgIC8vCi0gICAgLy8gV2Ugd2lsbCBkZW5vdGUgYSBzY2FsZSBieSBjb250ZW50cyBzY2FsZSBT W2NvbnRlbnRzU2NhbGVdCisgICAgLy8gV2Ugd2lsbCBkZW5vdGUgYSBzY2FsZSBieSBkZXZpY2Ug c2NhbGUgU1tkZXZpY2VTY2FsZV0KICAgICAvLwogICAgIC8vIFRoZSByZW5kZXIgc3VyZmFjZSBk cmF3IHRyYW5zZm9ybSB0byBpdHMgdGFyZ2V0IHN1cmZhY2Ugb3JpZ2luIGlzOgogICAgIC8vICAg ICAgICBNW3N1cmZhY2VEcmF3XSA9IE1bb3duaW5nTGF5ZXItPkRyYXddCiAgICAgLy8KICAgICAv LyBUaGUgcmVuZGVyIHN1cmZhY2Ugb3JpZ2luIHRyYW5zZm9ybSB0byBpdHMgdGhlIHJvb3QgKHNj cmVlbiBzcGFjZSkgb3JpZ2luIGlzOgotICAgIC8vICAgICAgICBNW3N1cmZhY2Uycm9vdF0gPSAg TVtvd25pbmdMYXllci0+c2NyZWVuc3BhY2VdICogU1tjb250ZW50c1NjYWxlXS5pbnZlcnNlKCkK KyAgICAvLyAgICAgICAgTVtzdXJmYWNlMnJvb3RdID0gIE1bb3duaW5nTGF5ZXItPnNjcmVlbnNw YWNlXSAqIFNbZGV2aWNlU2NhbGVdLmludmVyc2UoKQogICAgIC8vCiAgICAgLy8gVGhlIHJlcGxp Y2EgZHJhdyB0cmFuc2Zvcm0gdG8gaXRzIHRhcmdldCBzdXJmYWNlIG9yaWdpbiBpczoKLSAgICAv LyAgICAgICAgTVtyZXBsaWNhRHJhd10gPSBTW2NvbnRlbnRzU2NhbGVdICogTVtzdXJmYWNlRHJh d10gKiBUcltyZXBsaWNhLT5wb3NpdGlvbigpICsgcmVwbGljYS0+YW5jaG9yKCldICogVHJbcmVw bGljYV0gKiBUcltvcmlnaW4yYW5jaG9yXS5pbnZlcnNlKCkgKiBTW2NvbnRlbnRzU2NhbGVdLmlu dmVyc2UoKQorICAgIC8vICAgICAgICBNW3JlcGxpY2FEcmF3XSA9IFNbZGV2aWNlU2NhbGVdICog TVtzdXJmYWNlRHJhd10gKiBUcltyZXBsaWNhLT5wb3NpdGlvbigpICsgcmVwbGljYS0+YW5jaG9y KCldICogVHJbcmVwbGljYV0gKiBUcltvcmlnaW4yYW5jaG9yXS5pbnZlcnNlKCkgKiBTW2NvbnRl bnRzU2NhbGVdLmludmVyc2UoKQogICAgIC8vCiAgICAgLy8gVGhlIHJlcGxpY2EgZHJhdyB0cmFu c2Zvcm0gdG8gdGhlIHJvb3QgKHNjcmVlbiBzcGFjZSkgb3JpZ2luIGlzOgogICAgIC8vICAgICAg ICBNW3JlcGxpY2Eycm9vdF0gPSBNW3N1cmZhY2Uycm9vdF0gKiBUcltyZXBsaWNhLT5wb3NpdGlv bigpXSAqIFRyW3JlcGxpY2FdICogVHJbb3JpZ2luMmFuY2hvcl0uaW52ZXJzZSgpCkBAIC01NjYs NyArNTY2LDYgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNJbnRlcm5hbChM YXllclR5cGUqIGxheWVyLCBMYXllclR5cGUqIHJvb3RMYXkKICAgICAgICAgYW5pbWF0aW5nVHJh bnNmb3JtVG9TY3JlZW4gfD0gbGF5ZXItPnBhcmVudCgpLT5zY3JlZW5TcGFjZVRyYW5zZm9ybUlz QW5pbWF0aW5nKCk7CiAgICAgfQogCi0gICAgZmxvYXQgY29udGVudHNTY2FsZSA9IGxheWVyLT5j b250ZW50c1NjYWxlKCk7CiAgICAgRmxvYXRSZWN0IGNvbnRlbnRSZWN0KEZsb2F0UG9pbnQoKSwg bGF5ZXItPmNvbnRlbnRCb3VuZHMoKSk7CiAKICAgICAvLyBmdWxsSGllcmFyY2h5TWF0cml4IGlz IHRoZSBtYXRyaXggdGhhdCB0cmFuc2Zvcm1zIG9iamVjdHMgYmV0d2VlbiBzY3JlZW4gc3BhY2Ug KGV4Y2VwdCBwcm9qZWN0aW9uIG1hdHJpeCkgYW5kIHRoZSBtb3N0IHJlY2VudCBSZW5kZXJTdXJm YWNlJ3Mgc3BhY2UuCkBAIC01ODgsNyArNTg3LDcgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJh d1RyYW5zZm9ybXNJbnRlcm5hbChMYXllclR5cGUqIGxheWVyLCBMYXllclR5cGUqIHJvb3RMYXkK ICAgICAgICAgLy8gVGhlIG9yaWdpbiBvZiB0aGUgbmV3IHN1cmZhY2UgaXMgdGhlIHVwcGVyIGxl ZnQgY29ybmVyIG9mIHRoZSBsYXllci4KICAgICAgICAgcmVuZGVyU3VyZmFjZS0+c2V0RHJhd1Ry YW5zZm9ybShkcmF3VHJhbnNmb3JtKTsKICAgICAgICAgV2ViVHJhbnNmb3JtYXRpb25NYXRyaXgg bGF5ZXJEcmF3VHJhbnNmb3JtOwotICAgICAgICBsYXllckRyYXdUcmFuc2Zvcm0uc2NhbGUoY29u dGVudHNTY2FsZSk7CisgICAgICAgIGxheWVyRHJhd1RyYW5zZm9ybS5zY2FsZShkZXZpY2VTY2Fs ZUZhY3Rvcik7CiAgICAgICAgIGlmICghbGF5ZXItPmNvbnRlbnRCb3VuZHMoKS5pc0VtcHR5KCkg JiYgIWxheWVyLT5ib3VuZHMoKS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIGxheWVyRHJhd1Ry YW5zZm9ybS5zY2FsZU5vblVuaWZvcm0obGF5ZXItPmJvdW5kcygpLndpZHRoKCkgLyBzdGF0aWNf Y2FzdDxkb3VibGU+KGxheWVyLT5jb250ZW50Qm91bmRzKCkud2lkdGgoKSksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxheWVyLT5ib3VuZHMoKS5oZWln aHQoKSAvIHN0YXRpY19jYXN0PGRvdWJsZT4obGF5ZXItPmNvbnRlbnRCb3VuZHMoKS5oZWlnaHQo KSkpOwpAQCAtNTk4LDcgKzU5Nyw3IEBAIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZURyYXdUcmFuc2Zv cm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBlKiByb290TGF5CiAgICAgICAg IC8vIFRoZSBzdWJsYXllciBtYXRyaXggdHJhbnNmb3JtcyBjZW50ZXJlZCBsYXllciByZWN0cyBp bnRvIHRhcmdldAogICAgICAgICAvLyBzdXJmYWNlIGNvbnRlbnQgc3BhY2UuCiAgICAgICAgIHN1 YmxheWVyTWF0cml4Lm1ha2VJZGVudGl0eSgpOwotICAgICAgICBzdWJsYXllck1hdHJpeC5zY2Fs ZShjb250ZW50c1NjYWxlKTsKKyAgICAgICAgc3VibGF5ZXJNYXRyaXguc2NhbGUoZGV2aWNlU2Nh bGVGYWN0b3IpOwogICAgICAgICBzdWJsYXllck1hdHJpeC50cmFuc2xhdGUoMC41ICogYm91bmRz LndpZHRoKCksIDAuNSAqIGJvdW5kcy5oZWlnaHQoKSk7CiAKICAgICAgICAgLy8gVGhlIG9wYWNp dHkgdmFsdWUgaXMgbW92ZWQgZnJvbSB0aGUgbGF5ZXIgdG8gaXRzIHN1cmZhY2UsIHNvIHRoYXQg dGhlIGVudGlyZSBzdWJ0cmVlIHByb3Blcmx5IGluaGVyaXRzIG9wYWNpdHkuCkBAIC03MTIsNyAr NzExLDcgQEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlRHJhd1RyYW5zZm9ybXNJbnRlcm5hbChMYXll clR5cGUqIGxheWVyLCBMYXllclR5cGUqIHJvb3RMYXkKICAgICAgICAgSW50UmVjdCBkcmF3YWJs ZUNvbnRlbnRSZWN0T2ZDaGlsZFN1YnRyZWU7CiAgICAgICAgIGNhbGN1bGF0ZURyYXdUcmFuc2Zv cm1zSW50ZXJuYWw8TGF5ZXJUeXBlLCBMYXllckxpc3QsIFJlbmRlclN1cmZhY2VUeXBlLCBMYXll clNvcnRlcj4oY2hpbGQsIHJvb3RMYXllciwgc3VibGF5ZXJNYXRyaXgsIG5leHRIaWVyYXJjaHlN YXRyaXgsIG5leHRTY3JvbGxDb21wZW5zYXRpb25NYXRyaXgsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY2xpcFJlY3RGb3JTdWJ0cmVlLCBzdWJ0cmVlU2hvdWxkQmVDbGlw cGVkLCBuZWFyZXN0QW5jZXN0b3JUaGF0TW92ZXNQaXhlbHMsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCwgZGVzY2VuZGFudHMsIGxh eWVyU29ydGVyLCBtYXhUZXh0dXJlU2l6ZSwgZHJhd2FibGVDb250ZW50UmVjdE9mQ2hpbGRTdWJ0 cmVlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZW5kZXJTdXJmYWNl TGF5ZXJMaXN0LCBkZXNjZW5kYW50cywgbGF5ZXJTb3J0ZXIsIG1heFRleHR1cmVTaXplLCBkZXZp Y2VTY2FsZUZhY3RvciwgZHJhd2FibGVDb250ZW50UmVjdE9mQ2hpbGRTdWJ0cmVlKTsKICAgICAg ICAgaWYgKCFkcmF3YWJsZUNvbnRlbnRSZWN0T2ZDaGlsZFN1YnRyZWUuaXNFbXB0eSgpKSB7CiAg ICAgICAgICAgICBhY2N1bXVsYXRlZERyYXdhYmxlQ29udGVudFJlY3RPZkNoaWxkcmVuLnVuaXRl KGRyYXdhYmxlQ29udGVudFJlY3RPZkNoaWxkU3VidHJlZSk7CiAgICAgICAgICAgICBpZiAoY2hp bGQtPnJlbmRlclN1cmZhY2UoKSkKQEAgLTc2OSwxMiArNzY4LDEyIEBAIHN0YXRpYyB2b2lkIGNh bGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWwoTGF5ZXJUeXBlKiBsYXllciwgTGF5ZXJUeXBl KiByb290TGF5CiAKICAgICAgICAgaWYgKGxheWVyLT5yZXBsaWNhTGF5ZXIoKSkgewogICAgICAg ICAgICAgV2ViVHJhbnNmb3JtYXRpb25NYXRyaXggc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdp blRyYW5zZm9ybTsKLSAgICAgICAgICAgIHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFu c2Zvcm0uc2NhbGUoY29udGVudHNTY2FsZSk7CisgICAgICAgICAgICBzdXJmYWNlT3JpZ2luVG9S ZXBsaWNhT3JpZ2luVHJhbnNmb3JtLnNjYWxlKGRldmljZVNjYWxlRmFjdG9yKTsKICAgICAgICAg ICAgIHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zvcm0udHJhbnNsYXRlKGxheWVy LT5yZXBsaWNhTGF5ZXIoKS0+cG9zaXRpb24oKS54KCkgKyBsYXllci0+cmVwbGljYUxheWVyKCkt PmFuY2hvclBvaW50KCkueCgpICogYm91bmRzLndpZHRoKCksCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsYXllci0+cmVwbGljYUxh eWVyKCktPnBvc2l0aW9uKCkueSgpICsgbGF5ZXItPnJlcGxpY2FMYXllcigpLT5hbmNob3JQb2lu dCgpLnkoKSAqIGJvdW5kcy5oZWlnaHQoKSk7CiAgICAgICAgICAgICBzdXJmYWNlT3JpZ2luVG9S ZXBsaWNhT3JpZ2luVHJhbnNmb3JtLm11bHRpcGx5KGxheWVyLT5yZXBsaWNhTGF5ZXIoKS0+dHJh bnNmb3JtKCkpOwogICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGljYU9yaWdpblRyYW5z Zm9ybS50cmFuc2xhdGUoLWxheWVyLT5yZXBsaWNhTGF5ZXIoKS0+YW5jaG9yUG9pbnQoKS54KCkg KiBib3VuZHMud2lkdGgoKSwgLWxheWVyLT5yZXBsaWNhTGF5ZXIoKS0+YW5jaG9yUG9pbnQoKS55 KCkgKiBib3VuZHMuaGVpZ2h0KCkpOwotICAgICAgICAgICAgc3VyZmFjZU9yaWdpblRvUmVwbGlj YU9yaWdpblRyYW5zZm9ybS5zY2FsZSgxIC8gY29udGVudHNTY2FsZSk7CisgICAgICAgICAgICBz dXJmYWNlT3JpZ2luVG9SZXBsaWNhT3JpZ2luVHJhbnNmb3JtLnNjYWxlKDEgLyBkZXZpY2VTY2Fs ZUZhY3Rvcik7CiAKICAgICAgICAgICAgIC8vIENvbXB1dGUgdGhlIHJlcGxpY2EncyAib3JpZ2lu VHJhbnNmb3JtIiB0aGF0IG1hcHMgZnJvbSB0aGUgcmVwbGljYSdzIG9yaWdpbiBzcGFjZSB0byB0 aGUgdGFyZ2V0IHN1cmZhY2Ugb3JpZ2luIHNwYWNlLgogICAgICAgICAgICAgV2ViVHJhbnNmb3Jt YXRpb25NYXRyaXggcmVwbGljYU9yaWdpblRyYW5zZm9ybSA9IGxheWVyLT5yZW5kZXJTdXJmYWNl KCktPmRyYXdUcmFuc2Zvcm0oKSAqIHN1cmZhY2VPcmlnaW5Ub1JlcGxpY2FPcmlnaW5UcmFuc2Zv cm07CkBAIC04NjMsNyArODYyLDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RDb21tb246OmNhbGN1 bGF0ZURyYXdUcmFuc2Zvcm1zKExheWVyQ2hyb21pdW0qIHJvb3RMYXllciwgY28KIAogICAgIFdl YkNvcmU6OmNhbGN1bGF0ZURyYXdUcmFuc2Zvcm1zSW50ZXJuYWw8TGF5ZXJDaHJvbWl1bSwgVmVj dG9yPFJlZlB0cjxMYXllckNocm9taXVtPiA+LCBSZW5kZXJTdXJmYWNlQ2hyb21pdW0sIHZvaWQ+ KHJvb3RMYXllciwgcm9vdExheWVyLCBkZXZpY2VTY2FsZVRyYW5zZm9ybSwgaWRlbnRpdHlNYXRy aXgsIGlkZW50aXR5TWF0cml4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvb3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5j b250ZW50UmVjdCgpLCB0cnVlLCAwLCByZW5kZXJTdXJmYWNlTGF5ZXJMaXN0LAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJv b3RMYXllci0+cmVuZGVyU3VyZmFjZSgpLT5sYXllckxpc3QoKSwgMCwgbWF4VGV4dHVyZVNpemUs IHRvdGFsRHJhd2FibGVDb250ZW50UmVjdCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcm9vdExheWVyLT5yZW5kZXJTdXJm YWNlKCktPmxheWVyTGlzdCgpLCAwLCBtYXhUZXh0dXJlU2l6ZSwgZGV2aWNlU2NhbGVGYWN0b3Is IHRvdGFsRHJhd2FibGVDb250ZW50UmVjdCk7CiB9CiAKIHZvaWQgQ0NMYXllclRyZWVIb3N0Q29t bW9uOjpjYWxjdWxhdGVEcmF3VHJhbnNmb3JtcyhDQ0xheWVySW1wbCogcm9vdExheWVyLCBjb25z dCBJbnRTaXplJiBkZXZpY2VWaWV3cG9ydFNpemUsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBD Q0xheWVyU29ydGVyKiBsYXllclNvcnRlciwgaW50IG1heFRleHR1cmVTaXplLCBWZWN0b3I8Q0NM YXllckltcGwqPiYgcmVuZGVyU3VyZmFjZUxheWVyTGlzdCkKQEAgLTg3Nyw3ICs4NzYsNyBAQCB2 b2lkIENDTGF5ZXJUcmVlSG9zdENvbW1vbjo6Y2FsY3VsYXRlRHJhd1RyYW5zZm9ybXMoQ0NMYXll ckltcGwqIHJvb3RMYXllciwgY29ucwogCiAgICAgV2ViQ29yZTo6Y2FsY3VsYXRlRHJhd1RyYW5z Zm9ybXNJbnRlcm5hbDxDQ0xheWVySW1wbCwgVmVjdG9yPENDTGF5ZXJJbXBsKj4sIENDUmVuZGVy U3VyZmFjZSwgQ0NMYXllclNvcnRlcj4ocm9vdExheWVyLCByb290TGF5ZXIsIGRldmljZVNjYWxl VHJhbnNmb3JtLCBpZGVudGl0eU1hdHJpeCwgaWRlbnRpdHlNYXRyaXgsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcm9vdExheWVyLT5yZW5k ZXJTdXJmYWNlKCktPmNvbnRlbnRSZWN0KCksIHRydWUsIDAsIHJlbmRlclN1cmZhY2VMYXllckxp c3QsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcm9vdExheWVyLT5yZW5kZXJTdXJmYWNlKCktPmxheWVyTGlzdCgpLCBsYXllclNvcnRlciwg bWF4VGV4dHVyZVNpemUsIHRvdGFsRHJhd2FibGVDb250ZW50UmVjdCk7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcm9vdExheWVyLT5yZW5k ZXJTdXJmYWNlKCktPmxheWVyTGlzdCgpLCBsYXllclNvcnRlciwgbWF4VGV4dHVyZVNpemUsIGRl dmljZVNjYWxlRmFjdG9yLCB0b3RhbERyYXdhYmxlQ29udGVudFJlY3QpOwogfQogCiB2b2lkIEND TGF5ZXJUcmVlSG9zdENvbW1vbjo6Y2FsY3VsYXRlVmlzaWJsZUFuZFNjaXNzb3JSZWN0cyhWZWN0 b3I8UmVmUHRyPExheWVyQ2hyb21pdW0+ID4mIHJlbmRlclN1cmZhY2VMYXllckxpc3QsIGNvbnN0 IEZsb2F0UmVjdCYgcm9vdFNjaXNzb3JSZWN0KQo=