133347 2014-05-28 09:01:43 -0700 Remove redundant GraphicsContext::drawImage() function. 2014-05-30 07:17:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan agomez calvaris cgarcia cmarcelo commit-queue eric.carlson esprehn+autocc glenn gustavo gyuyoung.kim jer.noble kondapallykalyan luiz menard mrobinson noam philipj pnormand sergio simon.fraser vjaquez oldest_to_newest 1012222 0 zalan 2014-05-28 09:01:43 -0700 These 2 functions have very similar parameter list and by looking at WebCore code, people sometimes get confused which one to call. (and provide default values for parameters when they are not needed at all) void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false); void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator, BlendMode, ImageOrientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false); 1012227 1 232201 zalan 2014-05-28 09:20:33 -0700 Created attachment 232201 Patch 1012235 2 232203 zalan 2014-05-28 09:31:48 -0700 Created attachment 232203 Patch 1012549 3 232277 zalan 2014-05-29 18:59:01 -0700 Created attachment 232277 Patch 1012551 4 zalan 2014-05-29 19:05:01 -0700 A follow-up patch will consolidate the drawImage parameters to a struct. 1012566 5 232277 simon.fraser 2014-05-29 21:51:29 -0700 Comment on attachment 232277 Patch ImageOrientationDescription() is so mysterious. 1012604 6 232277 commit-queue 2014-05-30 07:17:25 -0700 Comment on attachment 232277 Patch Clearing flags on attachment: 232277 Committed r169484: <http://trac.webkit.org/changeset/169484> 1012605 7 commit-queue 2014-05-30 07:17:32 -0700 All reviewed patches have been landed. Closing bug. 232201 2014-05-28 09:20:33 -0700 2014-05-28 09:31:43 -0700 Patch bug-133347-20140528092009.patch text/plain 9468 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDVmYzg0N2Y0ZjA0OTg0 N2JlODU4MTlkMmQ3YTBkODNhZmJhYTc3Ny4uNWQzZjk2ZDk3NDhlZmFkMzBjZjQ1ZjJiZDc2NDky MDUyNTc3NmJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA1LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBH cmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZSgpIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzQ3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIDIgR3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2UgZnVuY3Rpb25zIHdpdGggdmVyeSBzaW1pbGFyIHBhcmFtZXRlciBsaXN0LiBU aGlzIGxvb2tzCisgICAgICAgIHRvIGJlIGEgc291cmNlIG9mIGNvbmZ1c2lvbiBhbmQgcmVzdWx0 cyBpbiBwYXNzaW5nIHVubmVlZGVkIHBhcmFtZXRlcnMuCisKKyAgICAgICAgTm8gY2hhbmdlIGlu IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdD b250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZHJhd0ltYWdlVG9Db250ZXh0KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVj dDo6cGFpbnROaW5lUGllY2VJbWFnZSk6CisKIDIwMTQtMDUtMjggIFJ5dWFuIENob2kgIDxyeXVh bi5jaG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJlbW92ZSBEb2N1bWVudFRocmVhZGFibGVM b2FkZXJDbGllbnQuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXggMGUwMjJkODZkYmFhOWYzZDgyOGY1YzM1 M2RmMzlhMzRhOGUwMzA3Ny4uNWJiY2U4MTU1NzhlNDk0MjU1OTc5YjQ3NTQyN2UyMjc5YjM1NGJk OSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5k ZXJpbmdDb250ZXh0MkQuY3BwCkBAIC0xNjU5LDcgKzE2NTksNyBAQCB2b2lkIENhbnZhc1JlbmRl cmluZ0NvbnRleHQyRDo6Y29tcG9zaXRlQnVmZmVyKEltYWdlQnVmZmVyKiBidWZmZXIsIGNvbnN0 IEludFJlYwogCiBzdGF0aWMgdm9pZCBkcmF3SW1hZ2VUb0NvbnRleHQoSW1hZ2UqIGltYWdlLCBH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25z dCBGbG9hdFJlY3QmIGRlc3QsIGNvbnN0IEZsb2F0UmVjdCYgc3JjLCBDb21wb3NpdGVPcGVyYXRv ciBvcCkKIHsKLSAgICBjb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwg ZGVzdCwgc3JjLCBvcCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAgIGNvbnRl eHQtPmRyYXdJbWFnZShpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCBkZXN0LCBzcmMsIG9wKTsKIH0K IAogc3RhdGljIHZvaWQgZHJhd0ltYWdlVG9Db250ZXh0KEltYWdlQnVmZmVyKiBpbWFnZUJ1ZmZl ciwgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwg Y29uc3QgRmxvYXRSZWN0JiBkZXN0LCBjb25zdCBGbG9hdFJlY3QmIHNyYywgQ29tcG9zaXRlT3Bl cmF0b3Igb3ApCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmNwcAppbmRleCAyMjVlMmZlNWVmOWYzNmRkY2JjZDBmMGM0YTA2NTY1YTBh OThlNTFhLi4zMzg2ZGYxZDVhMTZkNGVmYjJiYmYyM2FlZjc4YjFmMjMwOGQ3YzQwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5j cHAKQEAgLTU1MSwyNCArNTUxLDE5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2Uo SW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QKIHsKICAgICBp ZiAoIWltYWdlKQogICAgICAgICByZXR1cm47Ci0gICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNv bG9yU3BhY2UsIEZsb2F0UmVjdChwLCBpbWFnZS0+c2l6ZSgpKSwgRmxvYXRSZWN0KEZsb2F0UG9p bnQoKSwgaW1hZ2UtPnNpemUoKSksIG9wLCBkZXNjcmlwdGlvbik7CisgICAgZHJhd0ltYWdlKGlt YWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChwLCBpbWFnZS0+c2l6ZSgpKSwgRmxvYXRS ZWN0KEZsb2F0UG9pbnQoKSwgaW1hZ2UtPnNpemUoKSksIG9wLCBCbGVuZE1vZGVOb3JtYWwsIGRl c2NyaXB0aW9uKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJbWFnZSog aW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIHIsIENv bXBvc2l0ZU9wZXJhdG9yIG9wLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gZGVzY3JpcHRp b24sIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlKQogewogICAgIGlmICghaW1hZ2UpCiAgICAgICAg IHJldHVybjsKLSAgICBkcmF3SW1hZ2UoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgciwgRmxvYXRS ZWN0KEZsb2F0UG9pbnQoKSwgaW1hZ2UtPnNpemUoKSksIG9wLCBkZXNjcmlwdGlvbiwgdXNlTG93 UXVhbGl0eVNjYWxlKTsKKyAgICBkcmF3SW1hZ2UoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgciwg RmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgaW1hZ2UtPnNpemUoKSksIG9wLCBCbGVuZE1vZGVOb3Jt YWwsIGRlc2NyaXB0aW9uLCB1c2VMb3dRdWFsaXR5U2NhbGUpOwogfQogCiB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3Bh Y2UsIGNvbnN0IEZsb2F0UG9pbnQmIGRlc3QsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgQ29t cG9zaXRlT3BlcmF0b3Igb3AsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiBkZXNjcmlwdGlv bikKIHsKLSAgICBkcmF3SW1hZ2UoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgRmxvYXRSZWN0KGRl c3QsIHNyY1JlY3Quc2l6ZSgpKSwgc3JjUmVjdCwgb3AsIGRlc2NyaXB0aW9uKTsKLX0KLQotdm9p ZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJbWFnZSogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5 bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3QsIGNvbnN0IEZsb2F0UmVjdCYgc3Jj LCBDb21wb3NpdGVPcGVyYXRvciBvcCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uIGRlc2Ny aXB0aW9uLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSkKLXsKLSAgICBkcmF3SW1hZ2UoaW1hZ2Us IHN0eWxlQ29sb3JTcGFjZSwgZGVzdCwgc3JjLCBvcCwgQmxlbmRNb2RlTm9ybWFsLCBkZXNjcmlw dGlvbiwgdXNlTG93UXVhbGl0eVNjYWxlKTsKKyAgICBkcmF3SW1hZ2UoaW1hZ2UsIHN0eWxlQ29s b3JTcGFjZSwgRmxvYXRSZWN0KGRlc3QsIHNyY1JlY3Quc2l6ZSgpKSwgc3JjUmVjdCwgb3AsIEJs ZW5kTW9kZU5vcm1hbCwgZGVzY3JpcHRpb24pOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0 IEZsb2F0UmVjdCYgZGVzdCwgY29uc3QgRmxvYXRSZWN0JiBzcmMsIENvbXBvc2l0ZU9wZXJhdG9y IG9wLCBCbGVuZE1vZGUgYmxlbmRNb2RlLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gZGVz Y3JpcHRpb24sIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCAwN2IwMDk0OWQwMTZm ODg3Yzk4ODc3MTdhYjI0YWU4NTZmOWVjYjljLi45OWE2Yjc2YzVhYWFmYjU5NDg2MDMwZjVjNmVk Yzk3YWJkNjRmMTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaApAQCAtMzA1LDggKzMwNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JT cGFjZSwgY29uc3QgRmxvYXRQb2ludCYsIENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291 cmNlT3ZlciwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uID0gSW1hZ2VPcmllbnRhdGlvbkRl c2NyaXB0aW9uKCkpOwogICAgICAgICB2b2lkIGRyYXdJbWFnZShJbWFnZSosIENvbG9yU3BhY2Ug c3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmLCBDb21wb3NpdGVPcGVyYXRvciA9IENv bXBvc2l0ZVNvdXJjZU92ZXIsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiA9IEltYWdlT3Jp ZW50YXRpb25EZXNjcmlwdGlvbigpLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSA9IGZhbHNlKTsK ICAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFj ZSwgY29uc3QgRmxvYXRQb2ludCYgZGVzdFBvaW50LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3Qs IENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3ZlciwgSW1hZ2VPcmllbnRhdGlv bkRlc2NyaXB0aW9uID0gSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpOwotICAgICAgICB2 b2lkIGRyYXdJbWFnZShJbWFnZSosIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBG bG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9w ZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3ZlciwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9u ID0gSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCksIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxl ID0gZmFsc2UpOwotICAgICAgICB2b2lkIGRyYXdJbWFnZShJbWFnZSosIENvbG9yU3BhY2Ugc3R5 bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFJlY3Qm IHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yLCBCbGVuZE1vZGUsIEltYWdlT3JpZW50YXRpb25E ZXNjcmlwdGlvbiA9IEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpLCBib29sIHVzZUxvd1F1 YWxpdHlTY2FsZSA9IGZhbHNlKTsKKyAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xv clNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3Qg RmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNvdXJjZU92 ZXIsIEJsZW5kTW9kZSA9IEJsZW5kTW9kZU5vcm1hbCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0 aW9uID0gSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCksIGJvb2wgdXNlTG93UXVhbGl0eVNj YWxlID0gZmFsc2UpOwogICAgICAgICAKICAgICAgICAgdm9pZCBkcmF3VGlsZWRJbWFnZShJbWFn ZSosIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0 LCBjb25zdCBGbG9hdFBvaW50JiBzcmNQb2ludCwgY29uc3QgRmxvYXRTaXplJiB0aWxlU2l6ZSwK ICAgICAgICAgICAgIENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3ZlciwgYm9v bCB1c2VMb3dRdWFsaXR5U2NhbGUgPSBmYWxzZSwgQmxlbmRNb2RlID0gQmxlbmRNb2RlTm9ybWFs KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu Y3BwCmluZGV4IDlmOGE1ZmE1ODY3NTFlNTI5N2QyOTg2MjdiZTFhNjkzYzczYjVlYzcuLmZhNjk2 YmI1OGFmYzdkYzQ4NWM4ZGEyMGViNTcxODVjZWVjZTViMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMTMyOCwxMyArMTMy OCwxMyBAQCBib29sIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludE5pbmVQaWVjZUltYWdlKEdy YXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LAogICAgICAgICAvLyBUaGUgcmVjdCB0byB1 c2UgZnJvbSB3aXRoaW4gdGhlIGltYWdlIGlzIG9idGFpbmVkIGZyb20gb3VyIHNsaWNlLCBhbmQg aXMgKDAsIDAsIGxlZnRTbGljZSwgdG9wU2xpY2UpCiAgICAgICAgIGlmIChkcmF3VG9wKQogICAg ICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UuZ2V0KCksIGNvbG9yU3Bh Y2UsIHBpeGVsU25hcHBlZEZvclBhaW50aW5nKHgsIHksIGxlZnRXaWR0aCwgdG9wV2lkdGgsIGRl dmljZVNjYWxlRmFjdG9yKSwKLSAgICAgICAgICAgICAgICBwaXhlbFNuYXBwZWRGb3JQYWludGlu ZygwLCAwLCBsZWZ0U2xpY2UsIHRvcFNsaWNlLCBkZXZpY2VTY2FsZUZhY3RvciksIG9wLCBJbWFn ZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CisgICAgICAgICAgICAgICAgcGl4ZWxTbmFwcGVk Rm9yUGFpbnRpbmcoMCwgMCwgbGVmdFNsaWNlLCB0b3BTbGljZSwgZGV2aWNlU2NhbGVGYWN0b3Ip LCBvcCk7CiAKICAgICAgICAgLy8gVGhlIGJvdHRvbSBsZWZ0IGNvcm5lciByZWN0IGlzICh0eCwg dHkgKyBoIC0gYm90dG9tV2lkdGgsIGxlZnRXaWR0aCwgYm90dG9tV2lkdGgpCiAgICAgICAgIC8v IFRoZSByZWN0IHRvIHVzZSBmcm9tIHdpdGhpbiB0aGUgaW1hZ2UgaXMgKDAsIGltYWdlSGVpZ2h0 IC0gYm90dG9tU2xpY2UsIGxlZnRTbGljZSwgYm90b21TbGljZSkKICAgICAgICAgaWYgKGRyYXdC b3R0b20pCiAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFnZS5nZXQo KSwgY29sb3JTcGFjZSwgcGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoeCwgYm9yZGVySW1hZ2VSZWN0 Lm1heFkoKSAtIGJvdHRvbVdpZHRoLCBsZWZ0V2lkdGgsIGJvdHRvbVdpZHRoLCBkZXZpY2VTY2Fs ZUZhY3RvciksCi0gICAgICAgICAgICAgICAgcGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoMCwgaW1h Z2VIZWlnaHQgLSBib3R0b21TbGljZSwgbGVmdFNsaWNlLCBib3R0b21TbGljZSwgZGV2aWNlU2Nh bGVGYWN0b3IpLCBvcCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAgICAgICAg ICAgICAgIHBpeGVsU25hcHBlZEZvclBhaW50aW5nKDAsIGltYWdlSGVpZ2h0IC0gYm90dG9tU2xp Y2UsIGxlZnRTbGljZSwgYm90dG9tU2xpY2UsIGRldmljZVNjYWxlRmFjdG9yKSwgb3ApOwogCiAg ICAgICAgIC8vIFBhaW50IHRoZSBsZWZ0IGVkZ2UuCiAgICAgICAgIC8vIEhhdmUgdG8gc2NhbGUg YW5kIHRpbGUgaW50byB0aGUgYm9yZGVyIHJlY3QuCkBAIC0xMzQ5LDE0ICsxMzQ5LDE0IEBAIGJv b2wgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50TmluZVBpZWNlSW1hZ2UoR3JhcGhpY3NDb250 ZXh0KiBncmFwaGljc0NvbnRleHQsCiAgICAgICAgIC8vIFRoZSByZWN0IHRvIHVzZSBmcm9tIHdp dGhpbiB0aGUgaW1hZ2UgaXMgb2J0YWluZWQgZnJvbSBvdXIgc2xpY2UsIGFuZCBpcyAoaW1hZ2VX aWR0aCAtIHJpZ2h0U2xpY2UsIDAsIHJpZ2h0U2xpY2UsIHRvcFNsaWNlKQogICAgICAgICBpZiAo ZHJhd1RvcCkKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd0ltYWdlKGltYWdlLmdl dCgpLCBjb2xvclNwYWNlLCBwaXhlbFNuYXBwZWRGb3JQYWludGluZyhib3JkZXJJbWFnZVJlY3Qu bWF4WCgpIC0gcmlnaHRXaWR0aCwgeSwgcmlnaHRXaWR0aCwgdG9wV2lkdGgsIGRldmljZVNjYWxl RmFjdG9yKSwKLSAgICAgICAgICAgICAgICBwaXhlbFNuYXBwZWRGb3JQYWludGluZyhpbWFnZVdp ZHRoIC0gcmlnaHRTbGljZSwgMCwgcmlnaHRTbGljZSwgdG9wU2xpY2UsIGRldmljZVNjYWxlRmFj dG9yKSwgb3AsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKKyAgICAgICAgICAgICAg ICBwaXhlbFNuYXBwZWRGb3JQYWludGluZyhpbWFnZVdpZHRoIC0gcmlnaHRTbGljZSwgMCwgcmln aHRTbGljZSwgdG9wU2xpY2UsIGRldmljZVNjYWxlRmFjdG9yKSwgb3ApOwogCiAgICAgICAgIC8v IFRoZSBib3R0b20gcmlnaHQgY29ybmVyIHJlY3QgaXMgKHR4ICsgdyAtIHJpZ2h0V2lkdGgsIHR5 ICsgaCAtIGJvdHRvbVdpZHRoLCByaWdodFdpZHRoLCBib3R0b21XaWR0aCkKICAgICAgICAgLy8g VGhlIHJlY3QgdG8gdXNlIGZyb20gd2l0aGluIHRoZSBpbWFnZSBpcyAoaW1hZ2VXaWR0aCAtIHJp Z2h0U2xpY2UsIGltYWdlSGVpZ2h0IC0gYm90dG9tU2xpY2UsIHJpZ2h0U2xpY2UsIGJvdHRvbVNs aWNlKQogICAgICAgICBpZiAoZHJhd0JvdHRvbSkKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4 dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBwaXhlbFNuYXBwZWRGb3JQYWlu dGluZyhib3JkZXJJbWFnZVJlY3QubWF4WCgpIC0gcmlnaHRXaWR0aCwgYm9yZGVySW1hZ2VSZWN0 Lm1heFkoKSAtIGJvdHRvbVdpZHRoLAogICAgICAgICAgICAgICAgIHJpZ2h0V2lkdGgsIGJvdHRv bVdpZHRoLCBkZXZpY2VTY2FsZUZhY3RvciksIHBpeGVsU25hcHBlZEZvclBhaW50aW5nKGltYWdl V2lkdGggLSByaWdodFNsaWNlLCBpbWFnZUhlaWdodCAtIGJvdHRvbVNsaWNlLCByaWdodFNsaWNl LCBib3R0b21TbGljZSwgZGV2aWNlU2NhbGVGYWN0b3IpLAotICAgICAgICAgICAgICAgIG9wLCBJ bWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CisgICAgICAgICAgICAgICAgb3ApOwogCiAg ICAgICAgIC8vIFBhaW50IHRoZSByaWdodCBlZGdlLgogICAgICAgICBpZiAoc291cmNlSGVpZ2h0 ID4gMCkK 232203 2014-05-28 09:31:48 -0700 2014-05-29 18:58:56 -0700 Patch bug-133347-20140528093124.patch text/plain 11047 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDVmYzg0N2Y0ZjA0OTg0 N2JlODU4MTlkMmQ3YTBkODNhZmJhYTc3Ny4uNWQzZjk2ZDk3NDhlZmFkMzBjZjQ1ZjJiZDc2NDky MDUyNTc3NmJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA1LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBH cmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZSgpIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzQ3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIDIgR3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2UgZnVuY3Rpb25zIHdpdGggdmVyeSBzaW1pbGFyIHBhcmFtZXRlciBsaXN0LiBU aGlzIGxvb2tzCisgICAgICAgIHRvIGJlIGEgc291cmNlIG9mIGNvbmZ1c2lvbiBhbmQgcmVzdWx0 cyBpbiBwYXNzaW5nIHVubmVlZGVkIHBhcmFtZXRlcnMuCisKKyAgICAgICAgTm8gY2hhbmdlIGlu IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdD b250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZHJhd0ltYWdlVG9Db250ZXh0KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVj dDo6cGFpbnROaW5lUGllY2VJbWFnZSk6CisKIDIwMTQtMDUtMjggIFJ5dWFuIENob2kgIDxyeXVh bi5jaG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJlbW92ZSBEb2N1bWVudFRocmVhZGFibGVM b2FkZXJDbGllbnQuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXggMGUwMjJkODZkYmFhOWYzZDgyOGY1YzM1 M2RmMzlhMzRhOGUwMzA3Ny4uNWRkZTVjYmZmYzllY2E3MjAxM2I2OTE5NDI2NDAwYzkyOGFjYzU0 NiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5k ZXJpbmdDb250ZXh0MkQuY3BwCkBAIC0xMzc4LDE3ICsxMzc4LDE3IEBAIHZvaWQgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsIGNvbnN0 IEZsb2F0UmVjCiAgICAgY2hlY2tPcmlnaW4oaW1hZ2UpOwogCiAgICAgaWYgKHJlY3RDb250YWlu c0NhbnZhcyhub3JtYWxpemVkRHN0UmVjdCkpIHsKLSAgICAgICAgYy0+ZHJhd0ltYWdlKGNhY2hl ZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5yZW5kZXJlcigpKSwgQ29sb3JTcGFjZURl dmljZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5vcm1hbGl6ZWRTcmNSZWN0LCBvcCwgYmxlbmRN b2RlLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CisgICAgICAgIGMtPmRyYXdJbWFn ZShjYWNoZWRJbWFnZS0+aW1hZ2VGb3JSZW5kZXJlcihpbWFnZS0+cmVuZGVyZXIoKSksIENvbG9y U3BhY2VEZXZpY2VSR0IsIG5vcm1hbGl6ZWREc3RSZWN0LCBub3JtYWxpemVkU3JjUmVjdCwgb3As IGJsZW5kTW9kZSk7CiAgICAgICAgIGRpZERyYXdFbnRpcmVDYW52YXMoKTsKICAgICB9IGVsc2Ug aWYgKGlzRnVsbENhbnZhc0NvbXBvc2l0ZU1vZGUob3ApKSB7CiAgICAgICAgIGZ1bGxDYW52YXND b21wb3NpdGVkRHJhd0ltYWdlKGNhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5y ZW5kZXJlcigpKSwgQ29sb3JTcGFjZURldmljZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5vcm1h bGl6ZWRTcmNSZWN0LCBvcCk7CiAgICAgICAgIGRpZERyYXdFbnRpcmVDYW52YXMoKTsKICAgICB9 IGVsc2UgaWYgKG9wID09IENvbXBvc2l0ZUNvcHkpIHsKICAgICAgICAgY2xlYXJDYW52YXMoKTsK LSAgICAgICAgYy0+ZHJhd0ltYWdlKGNhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdl LT5yZW5kZXJlcigpKSwgQ29sb3JTcGFjZURldmljZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5v cm1hbGl6ZWRTcmNSZWN0LCBvcCwgYmxlbmRNb2RlLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRp b24oKSk7CisgICAgICAgIGMtPmRyYXdJbWFnZShjYWNoZWRJbWFnZS0+aW1hZ2VGb3JSZW5kZXJl cihpbWFnZS0+cmVuZGVyZXIoKSksIENvbG9yU3BhY2VEZXZpY2VSR0IsIG5vcm1hbGl6ZWREc3RS ZWN0LCBub3JtYWxpemVkU3JjUmVjdCwgb3AsIGJsZW5kTW9kZSk7CiAgICAgICAgIGRpZERyYXdF bnRpcmVDYW52YXMoKTsKICAgICB9IGVsc2UgewotICAgICAgICBjLT5kcmF3SW1hZ2UoY2FjaGVk SW1hZ2UtPmltYWdlRm9yUmVuZGVyZXIoaW1hZ2UtPnJlbmRlcmVyKCkpLCBDb2xvclNwYWNlRGV2 aWNlUkdCLCBub3JtYWxpemVkRHN0UmVjdCwgbm9ybWFsaXplZFNyY1JlY3QsIG9wLCBibGVuZE1v ZGUsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKKyAgICAgICAgYy0+ZHJhd0ltYWdl KGNhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5yZW5kZXJlcigpKSwgQ29sb3JT cGFjZURldmljZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5vcm1hbGl6ZWRTcmNSZWN0LCBvcCwg YmxlbmRNb2RlKTsKICAgICAgICAgZGlkRHJhdyhub3JtYWxpemVkRHN0UmVjdCk7CiAgICAgfQog fQpAQCAtMTY1OSw3ICsxNjU5LDcgQEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmNv bXBvc2l0ZUJ1ZmZlcihJbWFnZUJ1ZmZlciogYnVmZmVyLCBjb25zdCBJbnRSZWMKIAogc3RhdGlj IHZvaWQgZHJhd0ltYWdlVG9Db250ZXh0KEltYWdlKiBpbWFnZSwgR3JhcGhpY3NDb250ZXh0KiBj b250ZXh0LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0 LCBjb25zdCBGbG9hdFJlY3QmIHNyYywgQ29tcG9zaXRlT3BlcmF0b3Igb3ApCiB7Ci0gICAgY29u dGV4dC0+ZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3QsIHNyYywgb3AsIElt YWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKKyAgICBjb250ZXh0LT5kcmF3SW1hZ2UoaW1h Z2UsIHN0eWxlQ29sb3JTcGFjZSwgZGVzdCwgc3JjLCBvcCk7CiB9CiAKIHN0YXRpYyB2b2lkIGRy YXdJbWFnZVRvQ29udGV4dChJbWFnZUJ1ZmZlciogaW1hZ2VCdWZmZXIsIEdyYXBoaWNzQ29udGV4 dCogY29udGV4dCwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UmVjdCYg ZGVzdCwgY29uc3QgRmxvYXRSZWN0JiBzcmMsIENvbXBvc2l0ZU9wZXJhdG9yIG9wKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAK aW5kZXggMjI1ZTJmZTVlZjlmMzZkZGNiY2QwZjBjNGEwNjU2NWEwYTk4ZTUxYS4uMzM4NmRmMWQ1 YTE2ZDRlZmIyYmJmMjNhZWY3OGIxZjIzMDhkN2M0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCkBAIC01NTEsMjQgKzU1 MSwxOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29s b3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0CiB7CiAgICAgaWYgKCFpbWFnZSkKICAgICAg ICAgcmV0dXJuOwotICAgIGRyYXdJbWFnZShpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJl Y3QocCwgaW1hZ2UtPnNpemUoKSksIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIGltYWdlLT5zaXpl KCkpLCBvcCwgZGVzY3JpcHRpb24pOworICAgIGRyYXdJbWFnZShpbWFnZSwgc3R5bGVDb2xvclNw YWNlLCBGbG9hdFJlY3QocCwgaW1hZ2UtPnNpemUoKSksIEZsb2F0UmVjdChGbG9hdFBvaW50KCks IGltYWdlLT5zaXplKCkpLCBvcCwgQmxlbmRNb2RlTm9ybWFsLCBkZXNjcmlwdGlvbik7CiB9CiAK IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNl IHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiByLCBDb21wb3NpdGVPcGVyYXRvciBv cCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uIGRlc2NyaXB0aW9uLCBib29sIHVzZUxvd1F1 YWxpdHlTY2FsZSkKIHsKICAgICBpZiAoIWltYWdlKQogICAgICAgICByZXR1cm47Ci0gICAgZHJh d0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIHIsIEZsb2F0UmVjdChGbG9hdFBvaW50KCks IGltYWdlLT5zaXplKCkpLCBvcCwgZGVzY3JpcHRpb24sIHVzZUxvd1F1YWxpdHlTY2FsZSk7Cisg ICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIHIsIEZsb2F0UmVjdChGbG9hdFBv aW50KCksIGltYWdlLT5zaXplKCkpLCBvcCwgQmxlbmRNb2RlTm9ybWFsLCBkZXNjcmlwdGlvbiwg dXNlTG93UXVhbGl0eVNjYWxlKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFn ZShJbWFnZSogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFBv aW50JiBkZXN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yIG9w LCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gZGVzY3JpcHRpb24pCiB7Ci0gICAgZHJhd0lt YWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChkZXN0LCBzcmNSZWN0LnNpemUo KSksIHNyY1JlY3QsIG9wLCBkZXNjcmlwdGlvbik7Ci19Ci0KLXZvaWQgR3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29u c3QgRmxvYXRSZWN0JiBkZXN0LCBjb25zdCBGbG9hdFJlY3QmIHNyYywgQ29tcG9zaXRlT3BlcmF0 b3Igb3AsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiwgYm9vbCB1c2VM b3dRdWFsaXR5U2NhbGUpCi17Ci0gICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2Us IGRlc3QsIHNyYywgb3AsIEJsZW5kTW9kZU5vcm1hbCwgZGVzY3JpcHRpb24sIHVzZUxvd1F1YWxp dHlTY2FsZSk7CisgICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVj dChkZXN0LCBzcmNSZWN0LnNpemUoKSksIHNyY1JlY3QsIG9wLCBCbGVuZE1vZGVOb3JtYWwsIGRl c2NyaXB0aW9uKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJbWFnZSog aW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3Qs IGNvbnN0IEZsb2F0UmVjdCYgc3JjLCBDb21wb3NpdGVPcGVyYXRvciBvcCwgQmxlbmRNb2RlIGJs ZW5kTW9kZSwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uIGRlc2NyaXB0aW9uLCBib29sIHVz ZUxvd1F1YWxpdHlTY2FsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXggMDdiMDA5NDlkMDE2Zjg4N2M5ODg3NzE3YWIyNGFl ODU2ZjllY2I5Yy4uOTlhNmI3NmM1YWFhZmI1OTQ4NjAzMGY1YzZlZGM5N2FiZDY0ZjE5YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 LmgKQEAgLTMwNSw4ICszMDUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQg ZHJhd0ltYWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0 UG9pbnQmLCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNvdXJjZU92ZXIsIEltYWdlT3Jp ZW50YXRpb25EZXNjcmlwdGlvbiA9IEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKICAg ICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwg Y29uc3QgRmxvYXRSZWN0JiwgQ29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VPdmVy LCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gPSBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRp b24oKSwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUgPSBmYWxzZSk7CiAgICAgICAgIHZvaWQgZHJh d0ltYWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UG9p bnQmIGRlc3RQb2ludCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRv ciA9IENvbXBvc2l0ZVNvdXJjZU92ZXIsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiA9IElt YWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKLSAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1h Z2UqLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVj dCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0 ZVNvdXJjZU92ZXIsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiA9IEltYWdlT3JpZW50YXRp b25EZXNjcmlwdGlvbigpLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSA9IGZhbHNlKTsKLSAgICAg ICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29u c3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3Np dGVPcGVyYXRvciwgQmxlbmRNb2RlLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gPSBJbWFn ZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUgPSBmYWxz ZSk7CisgICAgICAgIHZvaWQgZHJhd0ltYWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9y U3BhY2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVj dCwgQ29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VPdmVyLCBCbGVuZE1vZGUgPSBC bGVuZE1vZGVOb3JtYWwsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiA9IEltYWdlT3JpZW50 YXRpb25EZXNjcmlwdGlvbigpLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSA9IGZhbHNlKTsKICAg ICAgICAgCiAgICAgICAgIHZvaWQgZHJhd1RpbGVkSW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0 eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRQb2lu dCYgc3JjUG9pbnQsIGNvbnN0IEZsb2F0U2l6ZSYgdGlsZVNpemUsCiAgICAgICAgICAgICBDb21w b3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNvdXJjZU92ZXIsIGJvb2wgdXNlTG93UXVhbGl0eVNj YWxlID0gZmFsc2UsIEJsZW5kTW9kZSA9IEJsZW5kTW9kZU5vcm1hbCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCA5ZjhhNWZh NTg2NzUxZTUyOTdkMjk4NjI3YmUxYTY5M2M3M2I1ZWM3Li5mYTY5NmJiNThhZmM3ZGM0ODVjOGRh MjBlYjU3MTg1Y2VlY2U1YjE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKQEAgLTEzMjgsMTMgKzEzMjgsMTMgQEAgYm9vbCBSZW5k ZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllY2VJbWFnZShHcmFwaGljc0NvbnRleHQqIGdy YXBoaWNzQ29udGV4dCwKICAgICAgICAgLy8gVGhlIHJlY3QgdG8gdXNlIGZyb20gd2l0aGluIHRo ZSBpbWFnZSBpcyBvYnRhaW5lZCBmcm9tIG91ciBzbGljZSwgYW5kIGlzICgwLCAwLCBsZWZ0U2xp Y2UsIHRvcFNsaWNlKQogICAgICAgICBpZiAoZHJhd1RvcCkKICAgICAgICAgICAgIGdyYXBoaWNz Q29udGV4dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBwaXhlbFNuYXBwZWRG b3JQYWludGluZyh4LCB5LCBsZWZ0V2lkdGgsIHRvcFdpZHRoLCBkZXZpY2VTY2FsZUZhY3Rvciks Ci0gICAgICAgICAgICAgICAgcGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoMCwgMCwgbGVmdFNsaWNl LCB0b3BTbGljZSwgZGV2aWNlU2NhbGVGYWN0b3IpLCBvcCwgSW1hZ2VPcmllbnRhdGlvbkRlc2Ny aXB0aW9uKCkpOworICAgICAgICAgICAgICAgIHBpeGVsU25hcHBlZEZvclBhaW50aW5nKDAsIDAs IGxlZnRTbGljZSwgdG9wU2xpY2UsIGRldmljZVNjYWxlRmFjdG9yKSwgb3ApOwogCiAgICAgICAg IC8vIFRoZSBib3R0b20gbGVmdCBjb3JuZXIgcmVjdCBpcyAodHgsIHR5ICsgaCAtIGJvdHRvbVdp ZHRoLCBsZWZ0V2lkdGgsIGJvdHRvbVdpZHRoKQogICAgICAgICAvLyBUaGUgcmVjdCB0byB1c2Ug ZnJvbSB3aXRoaW4gdGhlIGltYWdlIGlzICgwLCBpbWFnZUhlaWdodCAtIGJvdHRvbVNsaWNlLCBs ZWZ0U2xpY2UsIGJvdG9tU2xpY2UpCiAgICAgICAgIGlmIChkcmF3Qm90dG9tKQogICAgICAgICAg ICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UuZ2V0KCksIGNvbG9yU3BhY2UsIHBp eGVsU25hcHBlZEZvclBhaW50aW5nKHgsIGJvcmRlckltYWdlUmVjdC5tYXhZKCkgLSBib3R0b21X aWR0aCwgbGVmdFdpZHRoLCBib3R0b21XaWR0aCwgZGV2aWNlU2NhbGVGYWN0b3IpLAotICAgICAg ICAgICAgICAgIHBpeGVsU25hcHBlZEZvclBhaW50aW5nKDAsIGltYWdlSGVpZ2h0IC0gYm90dG9t U2xpY2UsIGxlZnRTbGljZSwgYm90dG9tU2xpY2UsIGRldmljZVNjYWxlRmFjdG9yKSwgb3AsIElt YWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKKyAgICAgICAgICAgICAgICBwaXhlbFNuYXBw ZWRGb3JQYWludGluZygwLCBpbWFnZUhlaWdodCAtIGJvdHRvbVNsaWNlLCBsZWZ0U2xpY2UsIGJv dHRvbVNsaWNlLCBkZXZpY2VTY2FsZUZhY3RvciksIG9wKTsKIAogICAgICAgICAvLyBQYWludCB0 aGUgbGVmdCBlZGdlLgogICAgICAgICAvLyBIYXZlIHRvIHNjYWxlIGFuZCB0aWxlIGludG8gdGhl IGJvcmRlciByZWN0LgpAQCAtMTM0OSwxNCArMTM0OSwxNCBAQCBib29sIFJlbmRlckJveE1vZGVs T2JqZWN0OjpwYWludE5pbmVQaWVjZUltYWdlKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250 ZXh0LAogICAgICAgICAvLyBUaGUgcmVjdCB0byB1c2UgZnJvbSB3aXRoaW4gdGhlIGltYWdlIGlz IG9idGFpbmVkIGZyb20gb3VyIHNsaWNlLCBhbmQgaXMgKGltYWdlV2lkdGggLSByaWdodFNsaWNl LCAwLCByaWdodFNsaWNlLCB0b3BTbGljZSkKICAgICAgICAgaWYgKGRyYXdUb3ApCiAgICAgICAg ICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFnZS5nZXQoKSwgY29sb3JTcGFjZSwg cGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoYm9yZGVySW1hZ2VSZWN0Lm1heFgoKSAtIHJpZ2h0V2lk dGgsIHksIHJpZ2h0V2lkdGgsIHRvcFdpZHRoLCBkZXZpY2VTY2FsZUZhY3RvciksCi0gICAgICAg ICAgICAgICAgcGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoaW1hZ2VXaWR0aCAtIHJpZ2h0U2xpY2Us IDAsIHJpZ2h0U2xpY2UsIHRvcFNsaWNlLCBkZXZpY2VTY2FsZUZhY3RvciksIG9wLCBJbWFnZU9y aWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CisgICAgICAgICAgICAgICAgcGl4ZWxTbmFwcGVkRm9y UGFpbnRpbmcoaW1hZ2VXaWR0aCAtIHJpZ2h0U2xpY2UsIDAsIHJpZ2h0U2xpY2UsIHRvcFNsaWNl LCBkZXZpY2VTY2FsZUZhY3RvciksIG9wKTsKIAogICAgICAgICAvLyBUaGUgYm90dG9tIHJpZ2h0 IGNvcm5lciByZWN0IGlzICh0eCArIHcgLSByaWdodFdpZHRoLCB0eSArIGggLSBib3R0b21XaWR0 aCwgcmlnaHRXaWR0aCwgYm90dG9tV2lkdGgpCiAgICAgICAgIC8vIFRoZSByZWN0IHRvIHVzZSBm cm9tIHdpdGhpbiB0aGUgaW1hZ2UgaXMgKGltYWdlV2lkdGggLSByaWdodFNsaWNlLCBpbWFnZUhl aWdodCAtIGJvdHRvbVNsaWNlLCByaWdodFNsaWNlLCBib3R0b21TbGljZSkKICAgICAgICAgaWYg KGRyYXdCb3R0b20pCiAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFn ZS5nZXQoKSwgY29sb3JTcGFjZSwgcGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoYm9yZGVySW1hZ2VS ZWN0Lm1heFgoKSAtIHJpZ2h0V2lkdGgsIGJvcmRlckltYWdlUmVjdC5tYXhZKCkgLSBib3R0b21X aWR0aCwKICAgICAgICAgICAgICAgICByaWdodFdpZHRoLCBib3R0b21XaWR0aCwgZGV2aWNlU2Nh bGVGYWN0b3IpLCBwaXhlbFNuYXBwZWRGb3JQYWludGluZyhpbWFnZVdpZHRoIC0gcmlnaHRTbGlj ZSwgaW1hZ2VIZWlnaHQgLSBib3R0b21TbGljZSwgcmlnaHRTbGljZSwgYm90dG9tU2xpY2UsIGRl dmljZVNjYWxlRmFjdG9yKSwKLSAgICAgICAgICAgICAgICBvcCwgSW1hZ2VPcmllbnRhdGlvbkRl c2NyaXB0aW9uKCkpOworICAgICAgICAgICAgICAgIG9wKTsKIAogICAgICAgICAvLyBQYWludCB0 aGUgcmlnaHQgZWRnZS4KICAgICAgICAgaWYgKHNvdXJjZUhlaWdodCA+IDApCg== 232277 2014-05-29 18:59:01 -0700 2014-05-30 07:17:24 -0700 Patch bug-133347-20140529185837.patch text/plain 13179 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTRhZTkwNTMxN2RjMTFh ZjUzMWY0ZjFkMzEwNDU4ZDNkYmNlYTc0My4uMzU3OWIxYWYyNTY4YTExOGQ2YWIyNTU2NTRiYTZj NzRjMjRlNzRmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA1LTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBH cmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZSgpIGZ1bmN0aW9uLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzQ3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIDIgR3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2UgZnVuY3Rpb25zIHdpdGggdmVyeSBzaW1pbGFyIHBhcmFtZXRlciBsaXN0LiBU aGlzIGxvb2tzCisgICAgICAgIHRvIGJlIGEgc291cmNlIG9mIGNvbmZ1c2lvbiBhbmQgcmVzdWx0 cyBpbiBwYXNzaW5nIHVubmVlZGVkIHBhcmFtZXRlcnMuCisKKyAgICAgICAgTm8gY2hhbmdlIGlu IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdD b250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJE OjpkcmF3SW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6ZHJhd0ltYWdlVG9Db250ZXh0KToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnBhaW50KToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckltYWdlQnVmZmVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcFRleHR1cmVJbWFnZUJ1ZmZlcjo6dXBkYXRlQ29u dGVudHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6cGFpbnROaW5lUGllY2VJbWFn ZSk6CisKIDIwMTQtMDUtMjkgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBQcmVwYXJlIGNzcyBqaXQgZm9yIGFybTY0IGFuZCBvdGhlciBhcmNo aXRlY3R1cmVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZh c1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXggMGUwMjJkODZkYmFhOWYzZDgyOGY1YzM1M2Rm MzlhMzRhOGUwMzA3Ny4uNWRkZTVjYmZmYzllY2E3MjAxM2I2OTE5NDI2NDAwYzkyOGFjYzU0NiAx MDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29u dGV4dDJELmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJp bmdDb250ZXh0MkQuY3BwCkBAIC0xMzc4LDE3ICsxMzc4LDE3IEBAIHZvaWQgQ2FudmFzUmVuZGVy aW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsIGNvbnN0IEZs b2F0UmVjCiAgICAgY2hlY2tPcmlnaW4oaW1hZ2UpOwogCiAgICAgaWYgKHJlY3RDb250YWluc0Nh bnZhcyhub3JtYWxpemVkRHN0UmVjdCkpIHsKLSAgICAgICAgYy0+ZHJhd0ltYWdlKGNhY2hlZElt YWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5yZW5kZXJlcigpKSwgQ29sb3JTcGFjZURldmlj ZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5vcm1hbGl6ZWRTcmNSZWN0LCBvcCwgYmxlbmRNb2Rl LCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CisgICAgICAgIGMtPmRyYXdJbWFnZShj YWNoZWRJbWFnZS0+aW1hZ2VGb3JSZW5kZXJlcihpbWFnZS0+cmVuZGVyZXIoKSksIENvbG9yU3Bh Y2VEZXZpY2VSR0IsIG5vcm1hbGl6ZWREc3RSZWN0LCBub3JtYWxpemVkU3JjUmVjdCwgb3AsIGJs ZW5kTW9kZSk7CiAgICAgICAgIGRpZERyYXdFbnRpcmVDYW52YXMoKTsKICAgICB9IGVsc2UgaWYg KGlzRnVsbENhbnZhc0NvbXBvc2l0ZU1vZGUob3ApKSB7CiAgICAgICAgIGZ1bGxDYW52YXNDb21w b3NpdGVkRHJhd0ltYWdlKGNhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5yZW5k ZXJlcigpKSwgQ29sb3JTcGFjZURldmljZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5vcm1hbGl6 ZWRTcmNSZWN0LCBvcCk7CiAgICAgICAgIGRpZERyYXdFbnRpcmVDYW52YXMoKTsKICAgICB9IGVs c2UgaWYgKG9wID09IENvbXBvc2l0ZUNvcHkpIHsKICAgICAgICAgY2xlYXJDYW52YXMoKTsKLSAg ICAgICAgYy0+ZHJhd0ltYWdlKGNhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5y ZW5kZXJlcigpKSwgQ29sb3JTcGFjZURldmljZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5vcm1h bGl6ZWRTcmNSZWN0LCBvcCwgYmxlbmRNb2RlLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24o KSk7CisgICAgICAgIGMtPmRyYXdJbWFnZShjYWNoZWRJbWFnZS0+aW1hZ2VGb3JSZW5kZXJlcihp bWFnZS0+cmVuZGVyZXIoKSksIENvbG9yU3BhY2VEZXZpY2VSR0IsIG5vcm1hbGl6ZWREc3RSZWN0 LCBub3JtYWxpemVkU3JjUmVjdCwgb3AsIGJsZW5kTW9kZSk7CiAgICAgICAgIGRpZERyYXdFbnRp cmVDYW52YXMoKTsKICAgICB9IGVsc2UgewotICAgICAgICBjLT5kcmF3SW1hZ2UoY2FjaGVkSW1h Z2UtPmltYWdlRm9yUmVuZGVyZXIoaW1hZ2UtPnJlbmRlcmVyKCkpLCBDb2xvclNwYWNlRGV2aWNl UkdCLCBub3JtYWxpemVkRHN0UmVjdCwgbm9ybWFsaXplZFNyY1JlY3QsIG9wLCBibGVuZE1vZGUs IEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKKyAgICAgICAgYy0+ZHJhd0ltYWdlKGNh Y2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5yZW5kZXJlcigpKSwgQ29sb3JTcGFj ZURldmljZVJHQiwgbm9ybWFsaXplZERzdFJlY3QsIG5vcm1hbGl6ZWRTcmNSZWN0LCBvcCwgYmxl bmRNb2RlKTsKICAgICAgICAgZGlkRHJhdyhub3JtYWxpemVkRHN0UmVjdCk7CiAgICAgfQogfQpA QCAtMTY1OSw3ICsxNjU5LDcgQEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmNvbXBv c2l0ZUJ1ZmZlcihJbWFnZUJ1ZmZlciogYnVmZmVyLCBjb25zdCBJbnRSZWMKIAogc3RhdGljIHZv aWQgZHJhd0ltYWdlVG9Db250ZXh0KEltYWdlKiBpbWFnZSwgR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0LCBj b25zdCBGbG9hdFJlY3QmIHNyYywgQ29tcG9zaXRlT3BlcmF0b3Igb3ApCiB7Ci0gICAgY29udGV4 dC0+ZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3QsIHNyYywgb3AsIEltYWdl T3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKKyAgICBjb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2Us IHN0eWxlQ29sb3JTcGFjZSwgZGVzdCwgc3JjLCBvcCk7CiB9CiAKIHN0YXRpYyB2b2lkIGRyYXdJ bWFnZVRvQ29udGV4dChJbWFnZUJ1ZmZlciogaW1hZ2VCdWZmZXIsIEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVz dCwgY29uc3QgRmxvYXRSZWN0JiBzcmMsIENvbXBvc2l0ZU9wZXJhdG9yIG9wKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKaW5k ZXggMjI1ZTJmZTVlZjlmMzZkZGNiY2QwZjBjNGEwNjU2NWEwYTk4ZTUxYS4uMzM4NmRmMWQ1YTE2 ZDRlZmIyYmJmMjNhZWY3OGIxZjIzMDhkN2M0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCkBAIC01NTEsMjQgKzU1MSwx OSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JT cGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0CiB7CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAg cmV0dXJuOwotICAgIGRyYXdJbWFnZShpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3Qo cCwgaW1hZ2UtPnNpemUoKSksIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIGltYWdlLT5zaXplKCkp LCBvcCwgZGVzY3JpcHRpb24pOworICAgIGRyYXdJbWFnZShpbWFnZSwgc3R5bGVDb2xvclNwYWNl LCBGbG9hdFJlY3QocCwgaW1hZ2UtPnNpemUoKSksIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIGlt YWdlLT5zaXplKCkpLCBvcCwgQmxlbmRNb2RlTm9ybWFsLCBkZXNjcmlwdGlvbik7CiB9CiAKIHZv aWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0 eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiByLCBDb21wb3NpdGVPcGVyYXRvciBvcCwg SW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uIGRlc2NyaXB0aW9uLCBib29sIHVzZUxvd1F1YWxp dHlTY2FsZSkKIHsKICAgICBpZiAoIWltYWdlKQogICAgICAgICByZXR1cm47Ci0gICAgZHJhd0lt YWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIHIsIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIGlt YWdlLT5zaXplKCkpLCBvcCwgZGVzY3JpcHRpb24sIHVzZUxvd1F1YWxpdHlTY2FsZSk7CisgICAg ZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIHIsIEZsb2F0UmVjdChGbG9hdFBvaW50 KCksIGltYWdlLT5zaXplKCkpLCBvcCwgQmxlbmRNb2RlTm9ybWFsLCBkZXNjcmlwdGlvbiwgdXNl TG93UXVhbGl0eVNjYWxlKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJ bWFnZSogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFBvaW50 JiBkZXN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBJ bWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gZGVzY3JpcHRpb24pCiB7Ci0gICAgZHJhd0ltYWdl KGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChkZXN0LCBzcmNSZWN0LnNpemUoKSks IHNyY1JlY3QsIG9wLCBkZXNjcmlwdGlvbik7Ci19Ci0KLXZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3Qg RmxvYXRSZWN0JiBkZXN0LCBjb25zdCBGbG9hdFJlY3QmIHNyYywgQ29tcG9zaXRlT3BlcmF0b3Ig b3AsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiwgYm9vbCB1c2VMb3dR dWFsaXR5U2NhbGUpCi17Ci0gICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIGRl c3QsIHNyYywgb3AsIEJsZW5kTW9kZU5vcm1hbCwgZGVzY3JpcHRpb24sIHVzZUxvd1F1YWxpdHlT Y2FsZSk7CisgICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChk ZXN0LCBzcmNSZWN0LnNpemUoKSksIHNyY1JlY3QsIG9wLCBCbGVuZE1vZGVOb3JtYWwsIGRlc2Ny aXB0aW9uKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJbWFnZSogaW1h Z2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3QsIGNv bnN0IEZsb2F0UmVjdCYgc3JjLCBDb21wb3NpdGVPcGVyYXRvciBvcCwgQmxlbmRNb2RlIGJsZW5k TW9kZSwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uIGRlc2NyaXB0aW9uLCBib29sIHVzZUxv d1F1YWxpdHlTY2FsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0LmgKaW5kZXggMDdiMDA5NDlkMDE2Zjg4N2M5ODg3NzE3YWIyNGFlODU2 ZjllY2I5Yy4uOTlhNmI3NmM1YWFhZmI1OTQ4NjAzMGY1YzZlZGM5N2FiZDY0ZjE5YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgK QEAgLTMwNSw4ICszMDUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgZHJh d0ltYWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UG9p bnQmLCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNvdXJjZU92ZXIsIEltYWdlT3JpZW50 YXRpb25EZXNjcmlwdGlvbiA9IEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKICAgICAg ICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29u c3QgRmxvYXRSZWN0JiwgQ29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VPdmVyLCBJ bWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gPSBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24o KSwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUgPSBmYWxzZSk7CiAgICAgICAgIHZvaWQgZHJhd0lt YWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UG9pbnQm IGRlc3RQb2ludCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciA9 IENvbXBvc2l0ZVNvdXJjZU92ZXIsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiA9IEltYWdl T3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKLSAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2Uq LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwg Y29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNv dXJjZU92ZXIsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiA9IEltYWdlT3JpZW50YXRpb25E ZXNjcmlwdGlvbigpLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSA9IGZhbHNlKTsKLSAgICAgICAg dm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3Qg RmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVP cGVyYXRvciwgQmxlbmRNb2RlLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24gPSBJbWFnZU9y aWVudGF0aW9uRGVzY3JpcHRpb24oKSwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUgPSBmYWxzZSk7 CisgICAgICAgIHZvaWQgZHJhd0ltYWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3Bh Y2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdFJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwg Q29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3VyY2VPdmVyLCBCbGVuZE1vZGUgPSBCbGVu ZE1vZGVOb3JtYWwsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiA9IEltYWdlT3JpZW50YXRp b25EZXNjcmlwdGlvbigpLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSA9IGZhbHNlKTsKICAgICAg ICAgCiAgICAgICAgIHZvaWQgZHJhd1RpbGVkSW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0eWxl Q29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwgY29uc3QgRmxvYXRQb2ludCYg c3JjUG9pbnQsIGNvbnN0IEZsb2F0U2l6ZSYgdGlsZVNpemUsCiAgICAgICAgICAgICBDb21wb3Np dGVPcGVyYXRvciA9IENvbXBvc2l0ZVNvdXJjZU92ZXIsIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxl ID0gZmFsc2UsIEJsZW5kTW9kZSA9IEJsZW5kTW9kZU5vcm1hbCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKaW5kZXggZWEwMGQwNjQ3 ODYyZDNjMTMyYTcwMDYyZDMyMWIzNTNmMzk1YmI2Mi4uYmI4YjVkNTQxNTk4NGM3Y2RhNjEwODk4 ZWRmYTZmOWMzNmVmZjVjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlLmNwcApAQCAtMzY0LDcgKzM2NCw3IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBj b25zdCBJbnRSCiAgICAgICAgIHJldHVybjsKIAogICAgIGNvbnRleHQtPmRyYXdJbWFnZShyZWlu dGVycHJldF9jYXN0PEltYWdlKj4oZ3N0SW1hZ2UtPmltYWdlKCkuZ2V0KCkpLCBDb2xvclNwYWNl U1JHQiwKLSAgICAgICAgcmVjdCwgZ3N0SW1hZ2UtPnJlY3QoKSwgQ29tcG9zaXRlQ29weSwgSW1h Z2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCksIGZhbHNlKTsKKyAgICAgICAgcmVjdCwgZ3N0SW1h Z2UtPnJlY3QoKSwgQ29tcG9zaXRlQ29weSk7CiB9CiAKICNpZiBVU0UoVEVYVFVSRV9NQVBQRVJf R0wpICYmICFVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckltYWdlQnVmZmVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy SW1hZ2VCdWZmZXIuY3BwCmluZGV4IDQxMDQxZjkxYTY3ZWY5ODk5NzUzZmEyYzg2MjdjMTQ4YmRh ZWMwY2IuLjhiOGVmMTY0MGUwZDJmZDI5OTBiZDEzNmM3MTY5YjczNWJmZDllODcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy SW1hZ2VCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVySW1hZ2VCdWZmZXIuY3BwCkBAIC02Nyw3ICs2Nyw3IEBAIHZvaWQg Qml0bWFwVGV4dHVyZUltYWdlQnVmZmVyOjpkaWRSZXNldCgpCiAKIHZvaWQgQml0bWFwVGV4dHVy ZUltYWdlQnVmZmVyOjp1cGRhdGVDb250ZW50cyhJbWFnZSogaW1hZ2UsIGNvbnN0IEludFJlY3Qm IHRhcmdldFJlY3QsIGNvbnN0IEludFBvaW50JiBvZmZzZXQsIFVwZGF0ZUNvbnRlbnRzRmxhZykK IHsKLSAgICBtX2ltYWdlLT5jb250ZXh0KCktPmRyYXdJbWFnZShpbWFnZSwgQ29sb3JTcGFjZURl dmljZVJHQiwgdGFyZ2V0UmVjdCwgSW50UmVjdChvZmZzZXQsIHRhcmdldFJlY3Quc2l6ZSgpKSwg Q29tcG9zaXRlQ29weSwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAgIG1faW1h Z2UtPmNvbnRleHQoKS0+ZHJhd0ltYWdlKGltYWdlLCBDb2xvclNwYWNlRGV2aWNlUkdCLCB0YXJn ZXRSZWN0LCBJbnRSZWN0KG9mZnNldCwgdGFyZ2V0UmVjdC5zaXplKCkpLCBDb21wb3NpdGVDb3B5 KTsKIH0KIAogSW50U2l6ZSBUZXh0dXJlTWFwcGVySW1hZ2VCdWZmZXI6Om1heFRleHR1cmVTaXpl KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hN b2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP YmplY3QuY3BwCmluZGV4IDlmOGE1ZmE1ODY3NTFlNTI5N2QyOTg2MjdiZTFhNjkzYzczYjVlYzcu LmZhNjk2YmI1OGFmYzdkYzQ4NWM4ZGEyMGViNTcxODVjZWVjZTViMTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMTMyOCwx MyArMTMyOCwxMyBAQCBib29sIFJlbmRlckJveE1vZGVsT2JqZWN0OjpwYWludE5pbmVQaWVjZUlt YWdlKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LAogICAgICAgICAvLyBUaGUgcmVj dCB0byB1c2UgZnJvbSB3aXRoaW4gdGhlIGltYWdlIGlzIG9idGFpbmVkIGZyb20gb3VyIHNsaWNl LCBhbmQgaXMgKDAsIDAsIGxlZnRTbGljZSwgdG9wU2xpY2UpCiAgICAgICAgIGlmIChkcmF3VG9w KQogICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UuZ2V0KCksIGNv bG9yU3BhY2UsIHBpeGVsU25hcHBlZEZvclBhaW50aW5nKHgsIHksIGxlZnRXaWR0aCwgdG9wV2lk dGgsIGRldmljZVNjYWxlRmFjdG9yKSwKLSAgICAgICAgICAgICAgICBwaXhlbFNuYXBwZWRGb3JQ YWludGluZygwLCAwLCBsZWZ0U2xpY2UsIHRvcFNsaWNlLCBkZXZpY2VTY2FsZUZhY3RvciksIG9w LCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CisgICAgICAgICAgICAgICAgcGl4ZWxT bmFwcGVkRm9yUGFpbnRpbmcoMCwgMCwgbGVmdFNsaWNlLCB0b3BTbGljZSwgZGV2aWNlU2NhbGVG YWN0b3IpLCBvcCk7CiAKICAgICAgICAgLy8gVGhlIGJvdHRvbSBsZWZ0IGNvcm5lciByZWN0IGlz ICh0eCwgdHkgKyBoIC0gYm90dG9tV2lkdGgsIGxlZnRXaWR0aCwgYm90dG9tV2lkdGgpCiAgICAg ICAgIC8vIFRoZSByZWN0IHRvIHVzZSBmcm9tIHdpdGhpbiB0aGUgaW1hZ2UgaXMgKDAsIGltYWdl SGVpZ2h0IC0gYm90dG9tU2xpY2UsIGxlZnRTbGljZSwgYm90b21TbGljZSkKICAgICAgICAgaWYg KGRyYXdCb3R0b20pCiAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdJbWFnZShpbWFn ZS5nZXQoKSwgY29sb3JTcGFjZSwgcGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmcoeCwgYm9yZGVySW1h Z2VSZWN0Lm1heFkoKSAtIGJvdHRvbVdpZHRoLCBsZWZ0V2lkdGgsIGJvdHRvbVdpZHRoLCBkZXZp Y2VTY2FsZUZhY3RvciksCi0gICAgICAgICAgICAgICAgcGl4ZWxTbmFwcGVkRm9yUGFpbnRpbmco MCwgaW1hZ2VIZWlnaHQgLSBib3R0b21TbGljZSwgbGVmdFNsaWNlLCBib3R0b21TbGljZSwgZGV2 aWNlU2NhbGVGYWN0b3IpLCBvcCwgSW1hZ2VPcmllbnRhdGlvbkRlc2NyaXB0aW9uKCkpOworICAg ICAgICAgICAgICAgIHBpeGVsU25hcHBlZEZvclBhaW50aW5nKDAsIGltYWdlSGVpZ2h0IC0gYm90 dG9tU2xpY2UsIGxlZnRTbGljZSwgYm90dG9tU2xpY2UsIGRldmljZVNjYWxlRmFjdG9yKSwgb3Ap OwogCiAgICAgICAgIC8vIFBhaW50IHRoZSBsZWZ0IGVkZ2UuCiAgICAgICAgIC8vIEhhdmUgdG8g c2NhbGUgYW5kIHRpbGUgaW50byB0aGUgYm9yZGVyIHJlY3QuCkBAIC0xMzQ5LDE0ICsxMzQ5LDE0 IEBAIGJvb2wgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50TmluZVBpZWNlSW1hZ2UoR3JhcGhp Y3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsCiAgICAgICAgIC8vIFRoZSByZWN0IHRvIHVzZSBm cm9tIHdpdGhpbiB0aGUgaW1hZ2UgaXMgb2J0YWluZWQgZnJvbSBvdXIgc2xpY2UsIGFuZCBpcyAo aW1hZ2VXaWR0aCAtIHJpZ2h0U2xpY2UsIDAsIHJpZ2h0U2xpY2UsIHRvcFNsaWNlKQogICAgICAg ICBpZiAoZHJhd1RvcCkKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJhd0ltYWdlKGlt YWdlLmdldCgpLCBjb2xvclNwYWNlLCBwaXhlbFNuYXBwZWRGb3JQYWludGluZyhib3JkZXJJbWFn ZVJlY3QubWF4WCgpIC0gcmlnaHRXaWR0aCwgeSwgcmlnaHRXaWR0aCwgdG9wV2lkdGgsIGRldmlj ZVNjYWxlRmFjdG9yKSwKLSAgICAgICAgICAgICAgICBwaXhlbFNuYXBwZWRGb3JQYWludGluZyhp bWFnZVdpZHRoIC0gcmlnaHRTbGljZSwgMCwgcmlnaHRTbGljZSwgdG9wU2xpY2UsIGRldmljZVNj YWxlRmFjdG9yKSwgb3AsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbigpKTsKKyAgICAgICAg ICAgICAgICBwaXhlbFNuYXBwZWRGb3JQYWludGluZyhpbWFnZVdpZHRoIC0gcmlnaHRTbGljZSwg MCwgcmlnaHRTbGljZSwgdG9wU2xpY2UsIGRldmljZVNjYWxlRmFjdG9yKSwgb3ApOwogCiAgICAg ICAgIC8vIFRoZSBib3R0b20gcmlnaHQgY29ybmVyIHJlY3QgaXMgKHR4ICsgdyAtIHJpZ2h0V2lk dGgsIHR5ICsgaCAtIGJvdHRvbVdpZHRoLCByaWdodFdpZHRoLCBib3R0b21XaWR0aCkKICAgICAg ICAgLy8gVGhlIHJlY3QgdG8gdXNlIGZyb20gd2l0aGluIHRoZSBpbWFnZSBpcyAoaW1hZ2VXaWR0 aCAtIHJpZ2h0U2xpY2UsIGltYWdlSGVpZ2h0IC0gYm90dG9tU2xpY2UsIHJpZ2h0U2xpY2UsIGJv dHRvbVNsaWNlKQogICAgICAgICBpZiAoZHJhd0JvdHRvbSkKICAgICAgICAgICAgIGdyYXBoaWNz Q29udGV4dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBjb2xvclNwYWNlLCBwaXhlbFNuYXBwZWRG b3JQYWludGluZyhib3JkZXJJbWFnZVJlY3QubWF4WCgpIC0gcmlnaHRXaWR0aCwgYm9yZGVySW1h Z2VSZWN0Lm1heFkoKSAtIGJvdHRvbVdpZHRoLAogICAgICAgICAgICAgICAgIHJpZ2h0V2lkdGgs IGJvdHRvbVdpZHRoLCBkZXZpY2VTY2FsZUZhY3RvciksIHBpeGVsU25hcHBlZEZvclBhaW50aW5n KGltYWdlV2lkdGggLSByaWdodFNsaWNlLCBpbWFnZUhlaWdodCAtIGJvdHRvbVNsaWNlLCByaWdo dFNsaWNlLCBib3R0b21TbGljZSwgZGV2aWNlU2NhbGVGYWN0b3IpLAotICAgICAgICAgICAgICAg IG9wLCBJbWFnZU9yaWVudGF0aW9uRGVzY3JpcHRpb24oKSk7CisgICAgICAgICAgICAgICAgb3Ap OwogCiAgICAgICAgIC8vIFBhaW50IHRoZSByaWdodCBlZGdlLgogICAgICAgICBpZiAoc291cmNl SGVpZ2h0ID4gMCkK