96277 2012-09-10 09:08:02 -0700 Web Inspector: NMI: instrument NativeImageSkia 2012-10-03 07:51:07 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo loislo alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik senorblanco timothy webkit.review.bot yurys oldest_to_newest 716136 0 loislo 2012-09-10 09:08:02 -0700 EOM 716138 1 163144 loislo 2012-09-10 09:10:23 -0700 Created attachment 163144 Patch 716817 2 163144 yurys 2012-09-10 21:30:21 -0700 Comment on attachment 163144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163144&action=review > Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp:40 > +#include "WebCoreMemoryInstrumentation.h" As discussed, we shouldn't add dependency on WebCore. 733658 3 166887 loislo 2012-10-03 07:03:22 -0700 Created attachment 166887 Patch 733671 4 166887 yurys 2012-10-03 07:25:15 -0700 Comment on attachment 166887 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166887&action=review > Source/WebCore/platform/graphics/BitmapImage.cpp:586 > +void reportMemoryUsage(const NativeImageSkia* const&, MemoryObjectInfo*); Let's move this declaration into NativeImagePtr.h next to NativeImagePtr typdef for Skia. > Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp:167 > +void reportSkBitmapMemoryUsage(MemoryClassInfo& info, const SkBitmap& image) missing static? > Source/WebCore/platform/graphics/skia/NativeImageSkia.cpp:178 > + reportSkBitmapMemoryUsage(info, m_image); Why not declare WTF::reportMemoryUsage(...SkBitmap... and call addMember here? 733689 5 166891 loislo 2012-10-03 07:46:36 -0700 Created attachment 166891 Patch 733699 6 loislo 2012-10-03 07:51:07 -0700 Committed r130289: <http://trac.webkit.org/changeset/130289> 163144 2012-09-10 09:10:23 -0700 2012-10-03 07:03:15 -0700 Patch bug-96277-20120910200959.patch text/plain 6206 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmEyNDkxM2M4ODUzNWNk OTE3YjAwMmM5YTdlNDgzNjAxNzNhODg1NS4uYWNhNzM5ZGM0MjE1OGFjY2MxOWQxMGNmZDQ4Y2Q1 ZjE2YTJiOWEwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTEwICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBOTUk6IGluc3RydW1lbnQgTmF0aXZlSW1hZ2VTa2lhLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYyNzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcElt YWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJpdG1hcEltYWdlOjpyZXBvcnRNZW1vcnlVc2Fn ZSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lRGF0YTo6cmVw b3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZl SW1hZ2VTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6TmF0 aXZlSW1hZ2VTa2lhKToKKyAgICAgICAgKFdlYkNvcmU6OlNrQml0bWFwKToKKyAgICAgICAgKFdl YkNvcmU6Ok5hdGl2ZUltYWdlU2tpYTo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmg6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKE5hdGl2ZUltYWdlU2tpYSk6CisKIDIwMTItMDktMTAgIEtldmluIEZ1bmsg IDxrZXZpbi5mdW5rQGtkYWIuY29tPgogCiAgICAgICAgIFJlcGxhY2UgY2FsbHMgdG8gUVN0cmlu Zzo6ZnJvbUFzY2lpIHdoaWNoIGlzIGRlcHJlY2F0ZWQgaW4gUXQ1CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKaW5kZXggNDQ4YTI4Mjk1NmJl OTU1ZTQyMDQ4MGE2MzJhMjQ2MDcxNDBlNGExNi4uYzE1Njg1OGZkYjFmYmFlNTI2MjljZDczNjg0 ZTdmMWNmYzE1Y2UxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvQml0bWFwSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0JpdG1hcEltYWdlLmNwcApAQCAtNTc4LDE0ICs1NzgsMjIgQEAgdm9pZCBCaXRtYXBJbWFnZTo6 cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29u c3QKICAgICBJbWFnZTo6cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CiAgICAg aW5mby5hZGRNZW1iZXIobV9zb3VyY2UpOwogICAgIGluZm8uYWRkTWVtYmVyKG1fZnJhbWVUaW1l cik7Ci0gICAgaW5mby5hZGRWZWN0b3IobV9mcmFtZXMpOwotICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBtX2ZyYW1lQ291bnQ7ICsraSkgeworICAgIGluZm8uYWRkSW5zdHJ1bWVudGVkVmVj dG9yKG1fZnJhbWVzKTsKK30KKworI2lmIFVTRShTS0lBKQordGVtcGxhdGU8PiB2b2lkIE1lbW9y eUluc3RydW1lbnRhdGlvblRyYWl0czo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0PE5hdGl2ZUltYWdl U2tpYT4oTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiwgY29uc3QgTmF0aXZlSW1hZ2VTa2lhKiBjb25z dCYsIE1lbW9yeU9iamVjdFR5cGUsIE1lbW9yeU93bmluZ1R5cGUpOwordGVtcGxhdGU8PiB2b2lk IE1lbW9yeUluc3RydW1lbnRhdGlvblRyYWl0czo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0PGNvbnN0 IE5hdGl2ZUltYWdlU2tpYT4oTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiwgY29uc3QgTmF0aXZlSW1h Z2VTa2lhKiBjb25zdCYsIE1lbW9yeU9iamVjdFR5cGUsIE1lbW9yeU93bmluZ1R5cGUpOworI2Vu ZGlmCisKK3ZvaWQgRnJhbWVEYXRhOjpyZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZv KiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAoreworICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1l bW9yeU9iamVjdEluZm8sIHRoaXMsIFdlYkNvcmVNZW1vcnlUeXBlczo6Q2FjaGVkUmVzb3VyY2VJ bWFnZSk7CiAjaWYgT1MoV0lOQ0UpCi0gICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKG1fZnJhbWVz W2ldLm1fZnJhbWUuZ2V0KCksIG1fZnJhbWVzW2ldLm1fZnJhbWVCeXRlcyk7Ci0jZWxzZQotICAg ICAgICBpbmZvLmFkZFJhd0J1ZmZlcihtX2ZyYW1lc1tpXS5tX2ZyYW1lLCBtX2ZyYW1lc1tpXS5t X2ZyYW1lQnl0ZXMpOworICAgIGluZm8uYWRkUmF3QnVmZmVyKG1fZnJhbWUuZ2V0KCksIG1fZnJh bWVCeXRlcyk7CisjZWxpZiBVU0UoU0tJQSkKKyAgICBpbmZvLmFkZEluc3RydW1lbnRlZE1lbWJl cihtX2ZyYW1lKTsKICNlbmRpZgotICAgIH0KIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuY3BwCmluZGV4 IDJjNGJhZWQ3NTRkMzdkZjA4MjgxZmMyMmE2YjNkYjM0OGY1MDU0ZDkuLmE5OTZlN2RmMjFjMzk4 MWQ2NzQ1ODVlMjY4NTQ3MjU2NjUzMjQ0MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5jcHAKQEAgLTM1LDcg KzM1LDkgQEAKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEuaCIKICNpbmNsdWRlICJHcmFwaGlj c0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtSW5zdHJ1bWVudGF0aW9uLmgiCisjaW5j bHVkZSAiU2tQaXhlbFJlZi5oIgogI2luY2x1ZGUgIlNraWFVdGlscy5oIgorI2luY2x1ZGUgIldl YkNvcmVNZW1vcnlJbnN0cnVtZW50YXRpb24uaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBA IC0xNjIsNCArMTY0LDM5IEBAIHZvaWQgTmF0aXZlSW1hZ2VTa2lhOjpDYWNoZWRJbWFnZUluZm86 OnNldChjb25zdCBTa0lSZWN0JiBvdGhlclNyY1N1YnNldCwgaW50IHdpCiAgICAgcmVxdWVzdFNp emUuc2V0SGVpZ2h0KGhlaWdodCk7CiB9CiAKKwordGVtcGxhdGU8PiB2b2lkIE1lbW9yeUluc3Ry dW1lbnRhdGlvblRyYWl0czo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0PE5hdGl2ZUltYWdlU2tpYT4o TWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBpbnN0cnVtZW50YXRpb24sIGNvbnN0IE5hdGl2ZUltYWdl U2tpYSogY29uc3QmIGltYWdlLCBNZW1vcnlPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgTWVt b3J5T3duaW5nVHlwZSBvd25pbmdUeXBlKQoreworICAgIGluc3RydW1lbnRhdGlvbi0+YWRkSW5z dHJ1bWVudGVkT2JqZWN0SW1wbChpbWFnZSwgb3duZXJPYmplY3RUeXBlLCBvd25pbmdUeXBlKTsK K30KKwordGVtcGxhdGU8PiB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvblRyYWl0czo6YWRkSW5z dHJ1bWVudGVkT2JqZWN0PGNvbnN0IE5hdGl2ZUltYWdlU2tpYT4oTWVtb3J5SW5zdHJ1bWVudGF0 aW9uKiBpbnN0cnVtZW50YXRpb24sIGNvbnN0IE5hdGl2ZUltYWdlU2tpYSogY29uc3QmIGltYWdl LCBNZW1vcnlPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgTWVtb3J5T3duaW5nVHlwZSBvd25p bmdUeXBlKQoreworICAgIGluc3RydW1lbnRhdGlvbi0+YWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1w bChpbWFnZSwgb3duZXJPYmplY3RUeXBlLCBvd25pbmdUeXBlKTsKK30KKwordGVtcGxhdGU8PiB2 b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvblRyYWl0czo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0PGNv bnN0IFNrQml0bWFwPihNZW1vcnlJbnN0cnVtZW50YXRpb24qIGluc3RydW1lbnRhdGlvbiwgY29u c3QgU2tCaXRtYXAqIGNvbnN0JiBpbWFnZSwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5 cGUsIE1lbW9yeU93bmluZ1R5cGUgb3duaW5nVHlwZSkKK3sKKyAgICBpZiAoIWltYWdlKQorICAg ICAgICByZXR1cm47CisgICAgaW5zdHJ1bWVudGF0aW9uLT5hZGRSYXdCdWZmZXIoaW1hZ2UsIG93 bmVyT2JqZWN0VHlwZSwgc2l6ZW9mKFNrQml0bWFwKSk7CisgICAgU2tQaXhlbFJlZiogcGl4ZWxS ZWYgPSBpbWFnZS0+cGl4ZWxSZWYoKTsKKyAgICBpZiAocGl4ZWxSZWYpIHsKKyAgICAgICAgaW5z dHJ1bWVudGF0aW9uLT5hZGRSYXdCdWZmZXIocGl4ZWxSZWYsIG93bmVyT2JqZWN0VHlwZSwgc2l6 ZW9mKFNrUGl4ZWxSZWYpKTsKKyAgICAgICAgaW5zdHJ1bWVudGF0aW9uLT5hZGRSYXdCdWZmZXIo cGl4ZWxSZWYtPnBpeGVscygpLCBvd25lck9iamVjdFR5cGUsIGltYWdlLT5nZXRTaXplNjQoKS5n ZXQzMigpKTsKKyAgICB9Cit9CisKK3RlbXBsYXRlPD4gdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRp b25UcmFpdHM6OmFkZEluc3RydW1lbnRlZE9iamVjdDxTa0JpdG1hcD4oTWVtb3J5SW5zdHJ1bWVu dGF0aW9uKiBpbnN0cnVtZW50YXRpb24sIGNvbnN0IFNrQml0bWFwKiBjb25zdCYgaW1hZ2UsIE1l bW9yeU9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlLCBNZW1vcnlPd25pbmdUeXBlIG93bmluZ1R5 cGUpCit7CisgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uVHJhaXRzOjphZGRJbnN0cnVtZW50ZWRP YmplY3Q8Y29uc3QgU2tCaXRtYXA+KGluc3RydW1lbnRhdGlvbiwgaW1hZ2UsIG93bmVyT2JqZWN0 VHlwZSwgb3duaW5nVHlwZSk7Cit9CisKK3ZvaWQgTmF0aXZlSW1hZ2VTa2lhOjpyZXBvcnRNZW1v cnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAoreworICAg IE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMsIFdlYkNvcmVNZW1v cnlUeXBlczo6Q2FjaGVkUmVzb3VyY2VJbWFnZSk7CisgICAgaW5mby5hZGRJbnN0cnVtZW50ZWRN ZW1iZXIobV9pbWFnZSk7CisgICAgaW5mby5hZGRJbnN0cnVtZW50ZWRNZW1iZXIobV9yZXNpemVk SW1hZ2UpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuaAppbmRleCAy YTUyZTY4ZWU0ZWYxNzU1MTlkMTgzZmRkZmQ1NTdhNTJkZmQ0NmE1Li5iOTI1OTFmY2U4OTYyZmU2 YThlMWNmODRjZDcwOGU0NDdjNzNkNzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmgKQEAgLTM3LDYgKzM3LDgg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBNZW1vcnlPYmplY3RJbmZvOworCiAv LyBUaGlzIG9iamVjdCBpcyB1c2VkIGFzIHRoZSAibmF0aXZlIGltYWdlIiBpbiBvdXIgcG9ydC4g V2hlbiBXZWJLaXQgdXNlcwogLy8gIk5hdGl2ZUltYWdlUHRyIiwgaXQgaXMgYSBwb2ludGVyIHRv IHRoaXMgdHlwZS4gSXQgaGFzIGFuIFNrQml0bWFwLCBhbmQgYWxzbwogLy8gc3RvcmVzIGEgY2Fj aGVkIHJlc2l6ZWQgaW1hZ2UuCkBAIC05Miw2ICs5NCw4IEBAIHB1YmxpYzoKICAgICAvLyAtIHJl dHVybiBkZXN0SW1hZ2UgY3JvcHBlZCBieSBkZXN0VmlzaWJsZVN1YnNldC4KICAgICBTa0JpdG1h cCByZXNpemVkQml0bWFwKGNvbnN0IFNrSVJlY3QmIHNyY1N1YnNldCwgaW50IGRlc3RXaWR0aCwg aW50IGRlc3RIZWlnaHQsIGNvbnN0IFNrSVJlY3QmIGRlc3RWaXNpYmxlU3Vic2V0KSBjb25zdDsK IAorICAgIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0Owor CiBwcml2YXRlOgogICAgIC8vIENhY2hlZEltYWdlSW5mbyBpcyB1c2VkIHRvIHVuaXF1ZWx5IGlk ZW50aWZ5IGNhY2hlZCBvciByZXF1ZXN0ZWQgaW1hZ2UKICAgICAvLyByZXNpemVzLgo= 166887 2012-10-03 07:03:22 -0700 2012-10-03 07:46:29 -0700 Patch bug-96277-20121003180233.patch text/plain 4767 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWNhYzU0ODNkMjRhZjQ3 M2ZlZDJmOWZiODA2MDFjZmY4NDE3MjUwMC4uOThjOTEzYTc3MTM2ZGMwM2MxNWVkYjViMjhiYzdk MTYzZTk3ZDE2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTEwLTAzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBOTUk6IGluc3RydW1lbnQgTmF0aXZlSW1hZ2VTa2lhLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYyNzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0 aXZlSW1hZ2VTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5hdGl2ZUltYWdlU2tpYTo6cmVw b3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6cmVwb3J0TWVtb3J5VXNhZ2UpOgor CiAyMDEyLTEwLTAzICBEb25nd29vIEpvc2h1YSBJbSAgPGR3LmltQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIFtFRkxdIFNrZWxldG9uIGNvZGUgb2YgRmlsZSBzeXN0ZW0gQVBJLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCmluZGV4IGQwYTJh YWJkMWQ0MGMwNzBjZWI1YTcyZDAzZmNlODdmOWY5MzQ1ZGEuLmMyMzA3YTI3ZWMyYThhZjczZTRi NmNiMzFhNzI3MWM2ZDgzZWUwNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKQEAgLTU4MCwxMyArNTgwLDIyIEBAIHZvaWQgQml0bWFw SW1hZ2U6OnJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdElu Zm8pIGNvbnN0CiAgICAgaW5mby5hZGRNZW1iZXIobV9zb3VyY2UpOwogICAgIGluZm8uYWRkTWVt YmVyKG1fZnJhbWVUaW1lcik7CiAgICAgaW5mby5hZGRNZW1iZXIobV9mcmFtZXMpOwotICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2ZyYW1lQ291bnQ7ICsraSkgeworfQorCisjaWYgVVNF KFNLSUEpCit2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IE5hdGl2ZUltYWdlU2tpYSogY29u c3QmLCBNZW1vcnlPYmplY3RJbmZvKik7CisjZW5kaWYKKwordm9pZCBGcmFtZURhdGE6OnJlcG9y dE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0Cit7 CisgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgUGxhdGZv cm1NZW1vcnlUeXBlczo6SW1hZ2UpOwogI2lmIE9TKFdJTkNFKSAmJiAhUExBVEZPUk0oUVQpCi0g ICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKG1fZnJhbWVzW2ldLm1fZnJhbWUuZ2V0KCksIG1fZnJh bWVzW2ldLm1fZnJhbWVCeXRlcyk7CisgICAgaW5mby5hZGRSYXdCdWZmZXIobV9mcmFtZS5nZXQo KSwgbV9mcmFtZUJ5dGVzKTsKKyNlbGlmIFVTRShTS0lBKQorICAgIGluZm8uYWRkTWVtYmVyKG1f ZnJhbWUpOwogI2Vsc2UKLSAgICAgICAgaW5mby5hZGRSYXdCdWZmZXIobV9mcmFtZXNbaV0ubV9m cmFtZSwgbV9mcmFtZXNbaV0ubV9mcmFtZUJ5dGVzKTsKKyAgICBpbmZvLmFkZFJhd0J1ZmZlciht X2ZyYW1lLCBtX2ZyYW1lQnl0ZXMpOwogI2VuZGlmCi0gICAgfQogfQogCiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaAppbmRleCAzZjIzZGNlZGZl YTRhNTMzZDA4MmIyMzZhMjhmZTg1OGRkZDYwYmJlLi44ZmVkYzNlNTA3MzNlYjk2NTllNzg1NWJl YmM3OWNiNzFkYjBjYTU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9CaXRtYXBJbWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0JpdG1hcEltYWdlLmgKQEAgLTg4LDYgKzg4LDggQEAgcHVibGljOgogICAgIC8vIFJldHVybnMg d2hldGhlciB0aGVyZSB3YXMgY2FjaGVkIGltYWdlIGRhdGEgdG8gY2xlYXIuCiAgICAgYm9vbCBj bGVhcihib29sIGNsZWFyTWV0YWRhdGEpOwogCisgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShN ZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CisKICAgICBOYXRpdmVJbWFnZVB0ciBtX2ZyYW1lOwog ICAgIEltYWdlT3JpZW50YXRpb24gbV9vcmllbnRhdGlvbjsKICAgICBmbG9hdCBtX2R1cmF0aW9u OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRp dmVJbWFnZVNraWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9O YXRpdmVJbWFnZVNraWEuY3BwCmluZGV4IDJjNGJhZWQ3NTRkMzdkZjA4MjgxZmMyMmE2YjNkYjM0 OGY1MDU0ZDkuLjM2NDk1NjRiYmQwYjlkN2RlMzUwMGJmNGM4NWQzOGYzOGFjYmNkZWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VT a2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2 ZUltYWdlU2tpYS5jcHAKQEAgLTM1LDYgKzM1LDggQEAKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNr aWEuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIlBsYXRmb3Jt SW5zdHJ1bWVudGF0aW9uLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1NZW1vcnlJbnN0cnVtZW50YXRp b24uaCIKKyNpbmNsdWRlICJTa1BpeGVsUmVmLmgiCiAjaW5jbHVkZSAiU2tpYVV0aWxzLmgiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTE2Miw0ICsxNjQsMjUgQEAgdm9pZCBOYXRpdmVJbWFn ZVNraWE6OkNhY2hlZEltYWdlSW5mbzo6c2V0KGNvbnN0IFNrSVJlY3QmIG90aGVyU3JjU3Vic2V0 LCBpbnQgd2kKICAgICByZXF1ZXN0U2l6ZS5zZXRIZWlnaHQoaGVpZ2h0KTsKIH0KIAordm9pZCBy ZXBvcnRTa0JpdG1hcE1lbW9yeVVzYWdlKE1lbW9yeUNsYXNzSW5mbyYgaW5mbywgY29uc3QgU2tC aXRtYXAmIGltYWdlKQoreworICAgIFNrUGl4ZWxSZWYqIHBpeGVsUmVmID0gaW1hZ2UucGl4ZWxS ZWYoKTsKKyAgICBpbmZvLmFkZE1lbWJlcihwaXhlbFJlZik7CisgICAgaWYgKHBpeGVsUmVmKQor ICAgICAgICBpbmZvLmFkZFJhd0J1ZmZlcihwaXhlbFJlZi0+cGl4ZWxzKCksIGltYWdlLmdldFNp emUoKSk7Cit9CisKK3ZvaWQgTmF0aXZlSW1hZ2VTa2lhOjpyZXBvcnRNZW1vcnlVc2FnZShNZW1v cnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAoreworICAgIE1lbW9yeUNsYXNz SW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMpOworICAgIHJlcG9ydFNrQml0bWFwTWVt b3J5VXNhZ2UoaW5mbywgbV9pbWFnZSk7CisgICAgcmVwb3J0U2tCaXRtYXBNZW1vcnlVc2FnZShp bmZvLCBtX3Jlc2l6ZWRJbWFnZSk7Cit9CisKK3ZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3Qg TmF0aXZlSW1hZ2VTa2lhKiBjb25zdCYgaW1hZ2UsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9i amVjdEluZm8pCit7CisgICAgaW1hZ2UtPnJlcG9ydE1lbW9yeVVzYWdlKG1lbW9yeU9iamVjdElu Zm8pOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5oCmluZGV4IDJh NTJlNjhlZTRlZjE3NTUxOWQxODNmZGRmZDU1N2E1MmRmZDQ2YTUuLjljMjJiNWZjOGNlYTRjMGEz MzEzZDE5OGFiZGVkMjkxZDZhOTBkYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuaApAQCAtMzQsNiArMzQsNyBA QAogI2luY2x1ZGUgIlNrQml0bWFwLmgiCiAjaW5jbHVkZSAiU2tSZWN0LmgiCiAjaW5jbHVkZSAi SW50U2l6ZS5oIgorI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIApAQCAtOTIsNiArOTMsOCBAQCBwdWJsaWM6CiAgICAgLy8gLSByZXR1cm4gZGVzdEltYWdl IGNyb3BwZWQgYnkgZGVzdFZpc2libGVTdWJzZXQuCiAgICAgU2tCaXRtYXAgcmVzaXplZEJpdG1h cChjb25zdCBTa0lSZWN0JiBzcmNTdWJzZXQsIGludCBkZXN0V2lkdGgsIGludCBkZXN0SGVpZ2h0 LCBjb25zdCBTa0lSZWN0JiBkZXN0VmlzaWJsZVN1YnNldCkgY29uc3Q7CiAKKyAgICB2b2lkIHJl cG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKKwogcHJpdmF0ZToKICAg ICAvLyBDYWNoZWRJbWFnZUluZm8gaXMgdXNlZCB0byB1bmlxdWVseSBpZGVudGlmeSBjYWNoZWQg b3IgcmVxdWVzdGVkIGltYWdlCiAgICAgLy8gcmVzaXplcy4K 166891 2012-10-03 07:46:36 -0700 2012-10-03 07:49:26 -0700 Patch bug-96277-20121003184547.patch text/plain 5576 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWNhYzU0ODNkMjRhZjQ3 M2ZlZDJmOWZiODA2MDFjZmY4NDE3MjUwMC4uOThjOTEzYTc3MTM2ZGMwM2MxNWVkYjViMjhiYzdk MTYzZTk3ZDE2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTEwLTAzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBOTUk6IGluc3RydW1lbnQgTmF0aXZlSW1hZ2VTa2lhLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYyNzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0 aXZlSW1hZ2VTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5hdGl2ZUltYWdlU2tpYTo6cmVw b3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6cmVwb3J0TWVtb3J5VXNhZ2UpOgor CiAyMDEyLTEwLTAzICBEb25nd29vIEpvc2h1YSBJbSAgPGR3LmltQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIFtFRkxdIFNrZWxldG9uIGNvZGUgb2YgRmlsZSBzeXN0ZW0gQVBJLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuY3BwCmluZGV4IGQwYTJh YWJkMWQ0MGMwNzBjZWI1YTcyZDAzZmNlODdmOWY5MzQ1ZGEuLmRlZjA3MmVlMGQ3YmYyZWZhNjZi Njg4YmNmNmFiMWFlOTgzMGRlYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0JpdG1hcEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9CaXRtYXBJbWFnZS5jcHAKQEAgLTU4MCwxMyArNTgwLDE4IEBAIHZvaWQgQml0bWFw SW1hZ2U6OnJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdElu Zm8pIGNvbnN0CiAgICAgaW5mby5hZGRNZW1iZXIobV9zb3VyY2UpOwogICAgIGluZm8uYWRkTWVt YmVyKG1fZnJhbWVUaW1lcik7CiAgICAgaW5mby5hZGRNZW1iZXIobV9mcmFtZXMpOwotICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2ZyYW1lQ291bnQ7ICsraSkgeworfQorCit2b2lkIEZy YW1lRGF0YTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0 SW5mbykgY29uc3QKK3sKKyAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZv LCB0aGlzLCBQbGF0Zm9ybU1lbW9yeVR5cGVzOjpJbWFnZSk7CiAjaWYgT1MoV0lOQ0UpICYmICFQ TEFURk9STShRVCkKLSAgICAgICAgaW5mby5hZGRSYXdCdWZmZXIobV9mcmFtZXNbaV0ubV9mcmFt ZS5nZXQoKSwgbV9mcmFtZXNbaV0ubV9mcmFtZUJ5dGVzKTsKKyAgICBpbmZvLmFkZFJhd0J1ZmZl cihtX2ZyYW1lLmdldCgpLCBtX2ZyYW1lQnl0ZXMpOworI2VsaWYgVVNFKFNLSUEpCisgICAgaW5m by5hZGRNZW1iZXIobV9mcmFtZSk7CiAjZWxzZQotICAgICAgICBpbmZvLmFkZFJhd0J1ZmZlciht X2ZyYW1lc1tpXS5tX2ZyYW1lLCBtX2ZyYW1lc1tpXS5tX2ZyYW1lQnl0ZXMpOworICAgIGluZm8u YWRkUmF3QnVmZmVyKG1fZnJhbWUsIG1fZnJhbWVCeXRlcyk7CiAjZW5kaWYKLSAgICB9CiB9CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcElt YWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5oCmlu ZGV4IDNmMjNkY2VkZmVhNGE1MzNkMDgyYjIzNmEyOGZlODU4ZGRkNjBiYmUuLjhmZWRjM2U1MDcz M2ViOTY1OWU3ODU1YmViYzc5Y2I3MWRiMGNhNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaApAQCAtODgsNiArODgsOCBAQCBwdWJsaWM6CiAg ICAgLy8gUmV0dXJucyB3aGV0aGVyIHRoZXJlIHdhcyBjYWNoZWQgaW1hZ2UgZGF0YSB0byBjbGVh ci4KICAgICBib29sIGNsZWFyKGJvb2wgY2xlYXJNZXRhZGF0YSk7CiAKKyAgICB2b2lkIHJlcG9y dE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKKwogICAgIE5hdGl2ZUltYWdl UHRyIG1fZnJhbWU7CiAgICAgSW1hZ2VPcmllbnRhdGlvbiBtX29yaWVudGF0aW9uOwogICAgIGZs b2F0IG1fZHVyYXRpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9OYXRpdmVJbWFnZVB0ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TmF0aXZlSW1hZ2VQdHIuaAppbmRleCAxZmMzZmE2Yzk5NWY1NzkwZjQyYjZhZWY5M2Y5YjFjZGYw N2M2ZWJlLi41MGNkZTVkODFhYjdiM2ZmYjgyMDJjN2UzYjc4OWI2YjU0YTNkNDYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9OYXRpdmVJbWFnZVB0ci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL05hdGl2ZUltYWdlUHRyLmgKQEAg LTQ4LDYgKzQ4LDEwIEBAIGNsYXNzIE5hdGl2ZUltYWdlU2tpYTsKICNpbmNsdWRlICJTaGFyZWRC aXRtYXAuaCIKICNlbmRpZgogCituYW1lc3BhY2UgV1RGIHsKK2NsYXNzIE1lbW9yeU9iamVjdElu Zm87Cit9CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogI2lmIFVTRShDRykKQEAgLTY3LDYgKzcx LDcgQEAgdHlwZWRlZiB3eEJpdG1hcCogTmF0aXZlSW1hZ2VQdHI7CiB0eXBlZGVmIFdlYkNvcmU6 Ok5hdGl2ZUltYWdlQ2Fpcm8qIE5hdGl2ZUltYWdlUHRyOwogI2VsaWYgVVNFKFNLSUEpCiB0eXBl ZGVmIFdlYkNvcmU6Ok5hdGl2ZUltYWdlU2tpYSogTmF0aXZlSW1hZ2VQdHI7Cit2b2lkIHJlcG9y dE1lbW9yeVVzYWdlKGNvbnN0IE5hdGl2ZUltYWdlU2tpYSogY29uc3QmLCBXVEY6Ok1lbW9yeU9i amVjdEluZm8qKTsKICNlbGlmIE9TKFdJTkNFKQogdHlwZWRlZiBSZWZQdHI8U2hhcmVkQml0bWFw PiBOYXRpdmVJbWFnZVB0cjsKICNlbGlmIFBMQVRGT1JNKEJMQUNLQkVSUlkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tp YS5jcHAKaW5kZXggMmM0YmFlZDc1NGQzN2RmMDgyODFmYzIyYTZiM2RiMzQ4ZjUwNTRkOS4uZGVh MTNhNTAwY2ZiZjExYzYzMTkxZDRiOTdlOTgxMmZmN2M2OGRkOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmNw cApAQCAtMzUsOCArMzUsMTkgQEAKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEuaCIKICNpbmNs dWRlICJHcmFwaGljc0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtSW5zdHJ1bWVudGF0 aW9uLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1NZW1vcnlJbnN0cnVtZW50YXRpb24uaCIKKyNpbmNs dWRlICJTa1BpeGVsUmVmLmgiCiAjaW5jbHVkZSAiU2tpYVV0aWxzLmgiCiAKK3ZvaWQgcmVwb3J0 TWVtb3J5VXNhZ2UoY29uc3QgU2tCaXRtYXAqIGNvbnN0JiBpbWFnZSwgV1RGOjpNZW1vcnlPYmpl Y3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQoreworICAgIFdURjo6TWVtb3J5Q2xhc3NJbmZvIGlu Zm8obWVtb3J5T2JqZWN0SW5mbywgaW1hZ2UpOworICAgIFNrUGl4ZWxSZWYqIHBpeGVsUmVmID0g aW1hZ2UtPnBpeGVsUmVmKCk7CisgICAgaW5mby5hZGRNZW1iZXIocGl4ZWxSZWYpOworICAgIGlm IChwaXhlbFJlZikKKyAgICAgICAgaW5mby5hZGRSYXdCdWZmZXIocGl4ZWxSZWYtPnBpeGVscygp LCBpbWFnZS0+Z2V0U2l6ZSgpKTsKK30KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBOYXRpdmVJ bWFnZVNraWE6Ok5hdGl2ZUltYWdlU2tpYSgpCkBAIC0xNjIsNCArMTczLDE3IEBAIHZvaWQgTmF0 aXZlSW1hZ2VTa2lhOjpDYWNoZWRJbWFnZUluZm86OnNldChjb25zdCBTa0lSZWN0JiBvdGhlclNy Y1N1YnNldCwgaW50IHdpCiAgICAgcmVxdWVzdFNpemUuc2V0SGVpZ2h0KGhlaWdodCk7CiB9CiAK K3ZvaWQgTmF0aXZlSW1hZ2VTa2lhOjpyZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZv KiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAoreworICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1l bW9yeU9iamVjdEluZm8sIHRoaXMpOworICAgIGluZm8uYWRkTWVtYmVyKG1faW1hZ2UpOworICAg IGluZm8uYWRkTWVtYmVyKG1fcmVzaXplZEltYWdlKTsKK30KKwordm9pZCByZXBvcnRNZW1vcnlV c2FnZShjb25zdCBOYXRpdmVJbWFnZVNraWEqIGNvbnN0JiBpbWFnZSwgTWVtb3J5T2JqZWN0SW5m byogbWVtb3J5T2JqZWN0SW5mbykKK3sKKyAgICBpbWFnZS0+cmVwb3J0TWVtb3J5VXNhZ2UobWVt b3J5T2JqZWN0SW5mbyk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lh LmgKaW5kZXggMmE1MmU2OGVlNGVmMTc1NTE5ZDE4M2ZkZGZkNTU3YTUyZGZkNDZhNS4uOWMyMmI1 ZmM4Y2VhNGMwYTMzMTNkMTk4YWJkZWQyOTFkNmE5MGRjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5oCkBAIC0z NCw2ICszNCw3IEBACiAjaW5jbHVkZSAiU2tCaXRtYXAuaCIKICNpbmNsdWRlICJTa1JlY3QuaCIK ICNpbmNsdWRlICJJbnRTaXplLmgiCisjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCkBAIC05Miw2ICs5Myw4IEBAIHB1YmxpYzoKICAgICAvLyAtIHJldHVy biBkZXN0SW1hZ2UgY3JvcHBlZCBieSBkZXN0VmlzaWJsZVN1YnNldC4KICAgICBTa0JpdG1hcCBy ZXNpemVkQml0bWFwKGNvbnN0IFNrSVJlY3QmIHNyY1N1YnNldCwgaW50IGRlc3RXaWR0aCwgaW50 IGRlc3RIZWlnaHQsIGNvbnN0IFNrSVJlY3QmIGRlc3RWaXNpYmxlU3Vic2V0KSBjb25zdDsKIAor ICAgIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0OworCiBw cml2YXRlOgogICAgIC8vIENhY2hlZEltYWdlSW5mbyBpcyB1c2VkIHRvIHVuaXF1ZWx5IGlkZW50 aWZ5IGNhY2hlZCBvciByZXF1ZXN0ZWQgaW1hZ2UKICAgICAvLyByZXNpemVzLgo=