208812 2020-03-09 08:09:49 -0700 Creating paths that are single-segment bezier or quad curves should not require a CGPath allocation 2020-03-09 13:57:52 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue darin sabouhallawa simon.fraser thorton webkit-bug-importer oldest_to_newest 1627759 0 wenson_hsieh 2020-03-09 08:09:49 -0700 Fold simple bezier and quad curves into inline path data as well. 1627777 1 393037 wenson_hsieh 2020-03-09 08:41:16 -0700 Created attachment 393037 Patch 1627889 2 393037 commit-queue 2020-03-09 12:55:59 -0700 Comment on attachment 393037 Patch Clearing flags on attachment: 393037 Committed r258151: <https://trac.webkit.org/changeset/258151> 1627890 3 commit-queue 2020-03-09 12:56:00 -0700 All reviewed patches have been landed. Closing bug. 1627894 4 webkit-bug-importer 2020-03-09 12:56:21 -0700 <rdar://problem/60238005> 1627949 5 393037 darin 2020-03-09 13:57:52 -0700 Comment on attachment 393037 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393037&action=review > Source/WebCore/platform/graphics/Path.cpp:273 > + if (hasInlineData<LineData>() || hasInlineData<BezierCurveData>() || hasInlineData<QuadCurveData>()) Eventually we will get to the point where a single switchOn is more efficient than these multiple calls. 393037 2020-03-09 08:41:16 -0700 2020-03-09 12:55:59 -0700 Patch bug-208812-20200309084115.patch text/plain 14787 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWIzMzhmNGI1YzE4MWY1 NWRhYjUwMDBmZTY2Y2QyMGFjNTQwNGM4Mi4uOTBhMjAwYWUzMDQ2MGVmZmIxYjQ3ZTI0MWFhZmZl MTNkNTc0NjhhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDcwIEBACisyMDIwLTAzLTA5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIENyZWF0aW5nIHBh dGhzIHRoYXQgYXJlIHNpbmdsZS1zZWdtZW50IGJlemllciBvciBxdWFkIGN1cnZlcyBzaG91bGQg bm90IHJlcXVpcmUgYSBDR1BhdGggYWxsb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4ODEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRXh0ZW5kIHRoZSBpbmxpbmUgcGF0aCBkYXRhIG1lY2hh bmlzbSBpbnRyb2R1Y2VkIGluIHIyNTgxMTggdG8gZW5jb21wYXNzIHR3byBtb3JlIGNhc2VzIG9m IHNpbXBsZSBwYXRoIG9iamVjdHM6CisgICAgICAgIHNpbmdsZS1zZWdtZW50IHF1YWQgYW5kIGJl emllciBjdXJ2ZXMuIEluIHRoZXNlIHNjZW5hcmlvcywgd2UgY2FuIHNpbXBseSBzdG9yZSB0aGUg c3RhcnQgcG9pbnQsIGVuZCBwb2ludCwgYW5kCisgICAgICAgIG9uZSBvciB0d28gY29udHJvbCBw b2ludHMgKHJlc3BlY3RpdmVseSkuIFNlZSBiZWxvdyBmb3IgbW9yZSBkZXRhaWxzOyB0aGVyZSBz aG91bGQgYmUgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvSW5saW5lUGF0aERhdGEuaDoKKworICAgICAgICBBZGQgdGhlIG5ldyBpbmxpbmUgcGF0 aCBkYXRhIHR5cGVzIHRvIHRoZSB2YXJpYW50LiBOb3RlIHRoYXQgZG9lcyBub3QgaW5jcmVhc2Ug dGhlIHNpemUgb2YgdGhlIElubGluZVBhdGhEYXRhCisgICAgICAgIHZhcmlhbnQsIG5vciBkb2Vz IGl0IGluY3JlYXNlIHRoZSBzaXplIG9mIFBhdGgsIHNpbmNlIHRoZSB2YXJpYW50IGlzIGFscmVh ZHkgMzIgYnl0ZXMgbGFyZ2UgZHVlIHRvIEFyY0RhdGEuCisKKyAgICAgICAgKFdlYkNvcmU6OlF1 YWRDdXJ2ZURhdGE6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpRdWFkQ3VydmVE YXRhOjpkZWNvZGUpOgorICAgICAgICAoV2ViQ29yZTo6QmV6aWVyQ3VydmVEYXRhOjplbmNvZGUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6QmV6aWVyQ3VydmVEYXRhOjpkZWNvZGUpOgorCisg ICAgICAgIEFkZCBlbmNvZGVycyBhbmQgZGVjb2RlcnMgZm9yIFF1YWRDdXJ2ZURhdGEgYW5kIEJl emllckN1cnZlRGF0YS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1BhdGguY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGF0aDo6YXBwbHkgY29uc3QpOgorCisgICAgICAgIEluIHRoZSBj YXNlcyB3aGVyZSB3ZSBoYXZlIHF1YWQgYW5kIGJlemllciBjdXJ2ZXMsIHdlIGNhbiBhcHBseSB0 aGUgcGF0aCB3aXRob3V0IGhhdmluZyB0byBmYWxsIGJhY2sgdG8KKyAgICAgICAgYWxsb2NhdGlu ZyBhIHBsYXRmb3JtIHBhdGggb2JqZWN0LgorCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjpjdXJy ZW50UG9pbnQgY29uc3QpOgorCisgICAgICAgIFJldHVybiBlbmRQb2ludCBpbiBib3RoIG9mIHRo ZSBuZXcgaW5saW5lIGN1cnZlIGNhc2VzLgorCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjplbGVt ZW50Q291bnQgY29uc3QpOgorCisgICAgICAgIFJldHVybiAyIGluIGJvdGggb2YgdGhlIG5ldyBj YXNlcy4KKworICAgICAgICAoV2ViQ29yZTo6UGF0aDo6YWRkUXVhZEN1cnZlVG8pOgorICAgICAg ICAoV2ViQ29yZTo6UGF0aDo6YWRkQmV6aWVyQ3VydmVUbyk6CisKKyAgICAgICAgSWYgdGhlIHBh dGggaXMgbnVsbCAod2UgaGF2ZW4ndCBtb2RpZmllZCBhbnl0aGluZyB5ZXQpIG9yIHRoZSBwYXRo IHdhcyBvbmx5IG1vdmVkIHRvIHNvbWUgbG9jYXRpb24sIHN0dWZmCisgICAgICAgIGluZm9ybWF0 aW9uIGFib3V0IHRoZSBxdWFkIG9yIGJlemllciBjdXJ2ZSBpbnRvIGlubGluZSBkYXRhIG9uIFBh dGggYW5kIGF2b2lkIGNyZWF0aW5nIGEgQ0dQYXRoIG9uIENvcmVHcmFwaGljcworICAgICAgICBw bGF0Zm9ybXMgKGFuZCBvdGhlciB0eXBlcyBvZiBwbGF0Zm9ybSBwYXRocyBlbHNld2hlcmUpLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYXRoOjph ZGRRdWFkQ3VydmVUb1Nsb3dDYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmFkZEJlemll ckN1cnZlVG9TbG93Q2FzZSk6CisgICAgICAgIChXZWJDb3JlOjpQYXRoOjphZGRRdWFkQ3VydmVU byk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpQYXRoOjphZGRCZXppZXJDdXJ2ZVRvKTog RGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9QYXRoQ0cuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UGF0aDo6Y3JlYXRlQ0dQYXRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OlBhdGg6OmFkZFF1YWRDdXJ2ZVRvU2xvd0Nhc2UpOgorICAgICAgICAoV2ViQ29yZTo6UGF0 aDo6YWRkQmV6aWVyQ3VydmVUb1Nsb3dDYXNlKToKKworICAgICAgICBBZGQgLVNsb3dDYXNlIHN1 ZmZpeGVzIHRvIHRoZXNlIG1ldGhvZHMsIGFuZCBtb3ZlIHRoZSBtYWluIGltcGxlbWVudGF0aW9u IG9mIGFkZFF1YWRDdXJ2ZSBhbmQgYWRkQmV6aWVyQ3VydmUKKyAgICAgICAgaW50byBwbGF0Zm9y bS1hZ25vc3RpYyBjb2RlIGluIFBhdGguY3BwIHdoZXJlIHdlIHVwZGF0ZSB0aGUgaW5saW5lIHBh dGggZGF0YSBhbmQgYmFpbCBlYXJseSBpZiBhcHByb3ByaWF0ZSwgYW5kCisgICAgICAgIG90aGVy d2lzZSBmYWxsIGJhY2sgdG8gYWRkUXVhZEN1cnZlVG9TbG93Q2FzZSBvciBhZGRCZXppZXJDdXJ2 ZVRvU2xvd0Nhc2UuCisKKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmFkZFF1YWRDdXJ2ZVRvKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhdGg6OmFkZEJlemllckN1cnZlVG8pOiBEZWxl dGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9QYXRoRGlyZWN0MkQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UGF0aDo6YWRkUXVhZEN1cnZlVG9TbG93Q2FzZSk6CisgICAgICAg IChXZWJDb3JlOjpQYXRoOjphZGRCZXppZXJDdXJ2ZVRvU2xvd0Nhc2UpOgorICAgICAgICAoV2Vi Q29yZTo6UGF0aDo6YWRkUXVhZEN1cnZlVG8pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 UGF0aDo6YWRkQmV6aWVyQ3VydmVUbyk6IERlbGV0ZWQuCisKIDIwMjAtMDMtMDggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgTGF6aWx5IGdlbmVyYXRl IENHUGF0aHMgZm9yIHNvbWUgc2ltcGxlIHR5cGVzIG9mIHBhdGhzLCBzdWNoIGFzIGFyY3MgYW5k IGxpbmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Jbmxp bmVQYXRoRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW5saW5lUGF0 aERhdGEuaAppbmRleCA2NjQxZTcxYTJkZjkxZWE0MTcyNDc1OGFjZDkyN2E4ZTk0ODg0YWI3Li44 YmZhZDA5M2IwZDdlNmVjMjM1MGJkMDUxODExNTIzYjM4ZGZmYzJlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbmxpbmVQYXRoRGF0YS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lubGluZVBhdGhEYXRhLmgKQEAgLTYxLDYgKzYx LDI1IEBAIHN0cnVjdCBNb3ZlRGF0YSB7CiAgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3Rh dGljIE9wdGlvbmFsPE1vdmVEYXRhPiBkZWNvZGUoRGVjb2RlciYpOwogfTsKIAorc3RydWN0IFF1 YWRDdXJ2ZURhdGEgeworICAgIEZsb2F0UG9pbnQgc3RhcnRQb2ludDsKKyAgICBGbG9hdFBvaW50 IGNvbnRyb2xQb2ludDsKKyAgICBGbG9hdFBvaW50IGVuZFBvaW50OworCisgICAgdGVtcGxhdGU8 Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGUoRW5jb2RlciYpIGNvbnN0OworICAgIHRlbXBsYXRl PGNsYXNzIERlY29kZXI+IHN0YXRpYyBPcHRpb25hbDxRdWFkQ3VydmVEYXRhPiBkZWNvZGUoRGVj b2RlciYpOworfTsKKworc3RydWN0IEJlemllckN1cnZlRGF0YSB7CisgICAgRmxvYXRQb2ludCBz dGFydFBvaW50OworICAgIEZsb2F0UG9pbnQgY29udHJvbFBvaW50MTsKKyAgICBGbG9hdFBvaW50 IGNvbnRyb2xQb2ludDI7CisgICAgRmxvYXRQb2ludCBlbmRQb2ludDsKKworICAgIHRlbXBsYXRl PGNsYXNzIEVuY29kZXI+IHZvaWQgZW5jb2RlKEVuY29kZXImKSBjb25zdDsKKyAgICB0ZW1wbGF0 ZTxjbGFzcyBEZWNvZGVyPiBzdGF0aWMgT3B0aW9uYWw8QmV6aWVyQ3VydmVEYXRhPiBkZWNvZGUo RGVjb2RlciYpOworfTsKKwogdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBNb3ZlRGF0YTo6 ZW5jb2RlKEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CiAgICAgZW5jb2RlciA8PCBsb2NhdGlv bjsKQEAgLTEzMCw3ICsxNDksNTUgQEAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gT3B0aW9uYWw8 QXJjRGF0YT4gQXJjRGF0YTo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiAgICAgcmV0dXJuIGRh dGE7CiB9CiAKLXVzaW5nIElubGluZVBhdGhEYXRhID0gVmFyaWFudDxNb25vc3RhdGUsIE1vdmVE YXRhLCBMaW5lRGF0YSwgQXJjRGF0YT47Cit0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIFF1 YWRDdXJ2ZURhdGE6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAoreworICAgIGVuY29k ZXIgPDwgc3RhcnRQb2ludDsKKyAgICBlbmNvZGVyIDw8IGNvbnRyb2xQb2ludDsKKyAgICBlbmNv ZGVyIDw8IGVuZFBvaW50OworfQorCit0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBPcHRpb25hbDxR dWFkQ3VydmVEYXRhPiBRdWFkQ3VydmVEYXRhOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKK3sK KyAgICBRdWFkQ3VydmVEYXRhIGRhdGE7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShkYXRhLnN0 YXJ0UG9pbnQpKQorICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCisgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShkYXRhLmNvbnRyb2xQb2ludCkpCisgICAgICAgIHJldHVybiBXVEY6Om51bGxv cHQ7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRhdGEuZW5kUG9pbnQpKQorICAgICAgICBy ZXR1cm4gV1RGOjpudWxsb3B0OworCisgICAgcmV0dXJuIGRhdGE7Cit9CisKK3RlbXBsYXRlPGNs YXNzIEVuY29kZXI+IHZvaWQgQmV6aWVyQ3VydmVEYXRhOjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl cikgY29uc3QKK3sKKyAgICBlbmNvZGVyIDw8IHN0YXJ0UG9pbnQ7CisgICAgZW5jb2RlciA8PCBj b250cm9sUG9pbnQxOworICAgIGVuY29kZXIgPDwgY29udHJvbFBvaW50MjsKKyAgICBlbmNvZGVy IDw8IGVuZFBvaW50OworfQorCit0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVyPiBPcHRpb25hbDxCZXpp ZXJDdXJ2ZURhdGE+IEJlemllckN1cnZlRGF0YTo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCit7 CisgICAgQmV6aWVyQ3VydmVEYXRhIGRhdGE7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShkYXRh LnN0YXJ0UG9pbnQpKQorICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShkYXRhLmNvbnRyb2xQb2ludDEpKQorICAgICAgICByZXR1cm4gV1RGOjpu dWxsb3B0OworCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShkYXRhLmNvbnRyb2xQb2ludDIpKQor ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShk YXRhLmVuZFBvaW50KSkKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKworICAgIHJldHVy biBkYXRhOworfQorCit1c2luZyBJbmxpbmVQYXRoRGF0YSA9IFZhcmlhbnQ8TW9ub3N0YXRlLCBN b3ZlRGF0YSwgTGluZURhdGEsIEFyY0RhdGEsIFF1YWRDdXJ2ZURhdGEsIEJlemllckN1cnZlRGF0 YT47CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9QYXRoLmNwcAppbmRleCBjNmIyYmRmMzRmMzRiNDY2ODU5MDQ5Zjc2NWYwZjYyYzM2 NzUxMDk3Li5hYWE0NmM0YTQ4MzJiOTQwMzFmOTM2MzVhNDNlYzE5MTliNTAyY2U4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmNwcApAQCAtMTkyLDYgKzE5MiwzMyBA QCB2b2lkIFBhdGg6OmFwcGx5KGNvbnN0IFBhdGhBcHBsaWVyRnVuY3Rpb24mIGZ1bmN0aW9uKSBj b25zdAogICAgICAgICBmdW5jdGlvbihlbGVtZW50KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K KworICAgIGlmIChoYXNJbmxpbmVEYXRhPEJlemllckN1cnZlRGF0YT4oKSkgeworICAgICAgICBh dXRvJiBjdXJ2ZSA9IFdURjo6Z2V0PEJlemllckN1cnZlRGF0YT4obV9pbmxpbmVEYXRhKTsKKyAg ICAgICAgUGF0aEVsZW1lbnQgZWxlbWVudDsKKyAgICAgICAgZWxlbWVudC50eXBlID0gUGF0aEVs ZW1lbnQ6OlR5cGU6Ok1vdmVUb1BvaW50OworICAgICAgICBlbGVtZW50LnBvaW50c1swXSA9IGN1 cnZlLnN0YXJ0UG9pbnQ7CisgICAgICAgIGZ1bmN0aW9uKGVsZW1lbnQpOworICAgICAgICBlbGVt ZW50LnR5cGUgPSBQYXRoRWxlbWVudDo6VHlwZTo6QWRkQ3VydmVUb1BvaW50OworICAgICAgICBl bGVtZW50LnBvaW50c1swXSA9IGN1cnZlLmNvbnRyb2xQb2ludDE7CisgICAgICAgIGVsZW1lbnQu cG9pbnRzWzFdID0gY3VydmUuY29udHJvbFBvaW50MjsKKyAgICAgICAgZWxlbWVudC5wb2ludHNb Ml0gPSBjdXJ2ZS5lbmRQb2ludDsKKyAgICAgICAgZnVuY3Rpb24oZWxlbWVudCk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoaGFzSW5saW5lRGF0YTxRdWFkQ3VydmVEYXRhPigp KSB7CisgICAgICAgIGF1dG8mIGN1cnZlID0gV1RGOjpnZXQ8UXVhZEN1cnZlRGF0YT4obV9pbmxp bmVEYXRhKTsKKyAgICAgICAgUGF0aEVsZW1lbnQgZWxlbWVudDsKKyAgICAgICAgZWxlbWVudC50 eXBlID0gUGF0aEVsZW1lbnQ6OlR5cGU6Ok1vdmVUb1BvaW50OworICAgICAgICBlbGVtZW50LnBv aW50c1swXSA9IGN1cnZlLnN0YXJ0UG9pbnQ7CisgICAgICAgIGZ1bmN0aW9uKGVsZW1lbnQpOwor ICAgICAgICBlbGVtZW50LnR5cGUgPSBQYXRoRWxlbWVudDo6VHlwZTo6QWRkUXVhZEN1cnZlVG9Q b2ludDsKKyAgICAgICAgZWxlbWVudC5wb2ludHNbMF0gPSBjdXJ2ZS5jb250cm9sUG9pbnQ7Cisg ICAgICAgIGVsZW1lbnQucG9pbnRzWzFdID0gY3VydmUuZW5kUG9pbnQ7CisgICAgICAgIGZ1bmN0 aW9uKGVsZW1lbnQpOworICAgICAgICByZXR1cm47CisgICAgfQogI2VuZGlmCiAKICAgICBhcHBs eVNsb3dDYXNlKGZ1bmN0aW9uKTsKQEAgLTIyNiw2ICsyNTMsMTIgQEAgRmxvYXRQb2ludCBQYXRo OjpjdXJyZW50UG9pbnQoKSBjb25zdAogCiAgICAgaWYgKGhhc0lubGluZURhdGE8TGluZURhdGE+ KCkpCiAgICAgICAgIHJldHVybiBXVEY6OmdldDxMaW5lRGF0YT4obV9pbmxpbmVEYXRhKS5lbmQ7 CisKKyAgICBpZiAoaGFzSW5saW5lRGF0YTxCZXppZXJDdXJ2ZURhdGE+KCkpCisgICAgICAgIHJl dHVybiBXVEY6OmdldDxCZXppZXJDdXJ2ZURhdGE+KG1faW5saW5lRGF0YSkuZW5kUG9pbnQ7CisK KyAgICBpZiAoaGFzSW5saW5lRGF0YTxRdWFkQ3VydmVEYXRhPigpKQorICAgICAgICByZXR1cm4g V1RGOjpnZXQ8UXVhZEN1cnZlRGF0YT4obV9pbmxpbmVEYXRhKS5lbmRQb2ludDsKICNlbmRpZgog CiAgICAgcmV0dXJuIGN1cnJlbnRQb2ludFNsb3dDYXNlKCk7CkBAIC0yMzcsNyArMjcwLDcgQEAg c2l6ZV90IFBhdGg6OmVsZW1lbnRDb3VudCgpIGNvbnN0CiAgICAgaWYgKGhhc0lubGluZURhdGE8 TW92ZURhdGE+KCkpCiAgICAgICAgIHJldHVybiAxOwogCi0gICAgaWYgKGhhc0lubGluZURhdGE8 TGluZURhdGE+KCkpCisgICAgaWYgKGhhc0lubGluZURhdGE8TGluZURhdGE+KCkgfHwgaGFzSW5s aW5lRGF0YTxCZXppZXJDdXJ2ZURhdGE+KCkgfHwgaGFzSW5saW5lRGF0YTxRdWFkQ3VydmVEYXRh PigpKQogICAgICAgICByZXR1cm4gMjsKICNlbmRpZgogCkBAIC0yODksNiArMzIyLDM5IEBAIHZv aWQgUGF0aDo6YWRkTGluZVRvKGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KQogICAgIGFkZExpbmVU b1Nsb3dDYXNlKHBvaW50KTsKIH0KIAordm9pZCBQYXRoOjphZGRRdWFkQ3VydmVUbyhjb25zdCBG bG9hdFBvaW50JiBjb250cm9sUG9pbnQsIGNvbnN0IEZsb2F0UG9pbnQmIGVuZFBvaW50KQorewor I2lmIEVOQUJMRShJTkxJTkVfUEFUSF9EQVRBKQorICAgIGlmIChpc051bGwoKSB8fCBoYXNJbmxp bmVEYXRhPE1vdmVEYXRhPigpKSB7CisgICAgICAgIFF1YWRDdXJ2ZURhdGEgY3VydmU7CisgICAg ICAgIGN1cnZlLnN0YXJ0UG9pbnQgPSBoYXNBbnlJbmxpbmVEYXRhKCkgPyBXVEY6OmdldDxNb3Zl RGF0YT4obV9pbmxpbmVEYXRhKS5sb2NhdGlvbiA6IEZsb2F0UG9pbnQoKTsKKyAgICAgICAgY3Vy dmUuY29udHJvbFBvaW50ID0gY29udHJvbFBvaW50OworICAgICAgICBjdXJ2ZS5lbmRQb2ludCA9 IGVuZFBvaW50OworICAgICAgICBtX2lubGluZURhdGEgPSB7IFdURk1vdmUoY3VydmUpIH07Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisjZW5kaWYKKworICAgIGFkZFF1YWRDdXJ2ZVRvU2xvd0Nh c2UoY29udHJvbFBvaW50LCBlbmRQb2ludCk7Cit9CisKK3ZvaWQgUGF0aDo6YWRkQmV6aWVyQ3Vy dmVUbyhjb25zdCBGbG9hdFBvaW50JiBjb250cm9sUG9pbnQxLCBjb25zdCBGbG9hdFBvaW50JiBj b250cm9sUG9pbnQyLCBjb25zdCBGbG9hdFBvaW50JiBlbmRQb2ludCkKK3sKKyNpZiBFTkFCTEUo SU5MSU5FX1BBVEhfREFUQSkKKyAgICBpZiAoaXNOdWxsKCkgfHwgaGFzSW5saW5lRGF0YTxNb3Zl RGF0YT4oKSkgeworICAgICAgICBCZXppZXJDdXJ2ZURhdGEgY3VydmU7CisgICAgICAgIGN1cnZl LnN0YXJ0UG9pbnQgPSBoYXNBbnlJbmxpbmVEYXRhKCkgPyBXVEY6OmdldDxNb3ZlRGF0YT4obV9p bmxpbmVEYXRhKS5sb2NhdGlvbiA6IEZsb2F0UG9pbnQoKTsKKyAgICAgICAgY3VydmUuY29udHJv bFBvaW50MSA9IGNvbnRyb2xQb2ludDE7CisgICAgICAgIGN1cnZlLmNvbnRyb2xQb2ludDIgPSBj b250cm9sUG9pbnQyOworICAgICAgICBjdXJ2ZS5lbmRQb2ludCA9IGVuZFBvaW50OworICAgICAg ICBtX2lubGluZURhdGEgPSB7IFdURk1vdmUoY3VydmUpIH07CisgICAgICAgIHJldHVybjsKKyAg ICB9CisjZW5kaWYKKworICAgIGFkZEJlemllckN1cnZlVG9TbG93Q2FzZShjb250cm9sUG9pbnQx LCBjb250cm9sUG9pbnQyLCBlbmRQb2ludCk7Cit9CisKIHZvaWQgUGF0aDo6bW92ZVRvKGNvbnN0 IEZsb2F0UG9pbnQmIHBvaW50KQogewogI2lmIEVOQUJMRShJTkxJTkVfUEFUSF9EQVRBKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oCmluZGV4IGRlYmUyZjBkYzcyNmJjMGVi YmZmOWVmODg2NWI4MzdjNmQ3OTc0YTkuLmI1NmFlYTA2ZmU3YjZkYTZhODI2OTNhYzdhYTJkZDYz Nzg4MDYyZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Bh dGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgKQEAgLTIz Niw2ICsyMzYsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgbW92ZVRvU2xvd0Nhc2UoY29uc3QgRmxv YXRQb2ludCYpOwogICAgIHZvaWQgYWRkTGluZVRvU2xvd0Nhc2UoY29uc3QgRmxvYXRQb2ludCYp OwogICAgIHZvaWQgYWRkQXJjU2xvd0Nhc2UoY29uc3QgRmxvYXRQb2ludCYsIGZsb2F0IHJhZGl1 cywgZmxvYXQgc3RhcnRBbmdsZSwgZmxvYXQgZW5kQW5nbGUsIGJvb2wgYW50aWNsb2Nrd2lzZSk7 CisgICAgdm9pZCBhZGRRdWFkQ3VydmVUb1Nsb3dDYXNlKGNvbnN0IEZsb2F0UG9pbnQmIGNvbnRy b2xQb2ludCwgY29uc3QgRmxvYXRQb2ludCYgZW5kUG9pbnQpOworICAgIHZvaWQgYWRkQmV6aWVy Q3VydmVUb1Nsb3dDYXNlKGNvbnN0IEZsb2F0UG9pbnQmIGNvbnRyb2xQb2ludDEsIGNvbnN0IEZs b2F0UG9pbnQmIGNvbnRyb2xQb2ludDIsIGNvbnN0IEZsb2F0UG9pbnQmIGVuZFBvaW50KTsKIAog ICAgIEZsb2F0UmVjdCBib3VuZGluZ1JlY3RTbG93Q2FzZSgpIGNvbnN0OwogICAgIEZsb2F0UmVj dCBmYXN0Qm91bmRpbmdSZWN0U2xvd0Nhc2UoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9QYXRoQ2Fpcm8uY3BwCmluZGV4IDU1MjU2OWZk MTk3OWIwNGIwYWI0NDdhNDIxZDJiYjM4OTJmOGNmMGYuLjc5YzdmM2Y1Nzc3MmI5N2M5ZDQxYTZh MWJmNmZiNmMyN2VjZjIwNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vUGF0aENhaXJvLmNwcApAQCAtMTU4LDcgKzE1OCw3IEBAIHZvaWQgUGF0 aDo6YWRkUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiAvKgogICogaW5zcGlyZWQgYnkgbGli c3ZnLWNhaXJvCiAgKi8KLXZvaWQgUGF0aDo6YWRkUXVhZEN1cnZlVG8oY29uc3QgRmxvYXRQb2lu dCYgY29udHJvbFBvaW50LCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCkKK3ZvaWQgUGF0aDo6YWRk UXVhZEN1cnZlVG9TbG93Q2FzZShjb25zdCBGbG9hdFBvaW50JiBjb250cm9sUG9pbnQsIGNvbnN0 IEZsb2F0UG9pbnQmIHBvaW50KQogewogICAgIGNhaXJvX3QqIGNyID0gZW5zdXJlUGxhdGZvcm1Q YXRoKCktPmNvbnRleHQoKTsKICAgICBkb3VibGUgeCwgeTsKQEAgLTE3Myw3ICsxNzMsNyBAQCB2 b2lkIFBhdGg6OmFkZFF1YWRDdXJ2ZVRvKGNvbnN0IEZsb2F0UG9pbnQmIGNvbnRyb2xQb2ludCwg Y29uc3QgRmxvYXRQb2ludCYgcG9pbgogICAgICAgICAgICAgICAgICAgIHgyLCB5Mik7CiB9CiAK LXZvaWQgUGF0aDo6YWRkQmV6aWVyQ3VydmVUbyhjb25zdCBGbG9hdFBvaW50JiBjb250cm9sUG9p bnQxLCBjb25zdCBGbG9hdFBvaW50JiBjb250cm9sUG9pbnQyLCBjb25zdCBGbG9hdFBvaW50JiBj b250cm9sUG9pbnQzKQordm9pZCBQYXRoOjphZGRCZXppZXJDdXJ2ZVRvU2xvd0Nhc2UoY29uc3Qg RmxvYXRQb2ludCYgY29udHJvbFBvaW50MSwgY29uc3QgRmxvYXRQb2ludCYgY29udHJvbFBvaW50 MiwgY29uc3QgRmxvYXRQb2ludCYgY29udHJvbFBvaW50MykKIHsKICAgICBjYWlyb190KiBjciA9 IGVuc3VyZVBsYXRmb3JtUGF0aCgpLT5jb250ZXh0KCk7CiAgICAgY2Fpcm9fY3VydmVfdG8oY3Is IGNvbnRyb2xQb2ludDEueCgpLCBjb250cm9sUG9pbnQxLnkoKSwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL1BhdGhDRy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9QYXRoQ0cuY3BwCmluZGV4IDA2YzQ0N2NlNWNhZmY1ZjFl MGRkZjdjMGRmNTc1ODZhZmRhYmU3ZWEuLmRkYjJiOTgyOGI1ODQwZWYyNDEyMDIyZGQ3NGE3YzI0 YjZlZmE3MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nn L1BhdGhDRy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvUGF0 aENHLmNwcApAQCAtMTAxLDYgKzEwMSwxNCBAQCB2b2lkIFBhdGg6OmNyZWF0ZUNHUGF0aCgpIGNv bnN0CiAgICAgICAgICAgICBpZiAoYXJjLmhhc09mZnNldCkKICAgICAgICAgICAgICAgICBDR1Bh dGhNb3ZlVG9Qb2ludChtX3BhdGguZ2V0KCksIG51bGxwdHIsIGFyYy5vZmZzZXQueCgpLCBhcmMu b2Zmc2V0LnkoKSk7CiAgICAgICAgICAgICBDR1BhdGhBZGRBcmMobV9wYXRoLmdldCgpLCBudWxs cHRyLCBhcmMuY2VudGVyLngoKSwgYXJjLmNlbnRlci55KCksIGFyYy5yYWRpdXMsIGFyYy5zdGFy dEFuZ2xlLCBhcmMuZW5kQW5nbGUsIGFyYy5jbG9ja3dpc2UpOworICAgICAgICB9LAorICAgICAg ICBbJl0oY29uc3QgUXVhZEN1cnZlRGF0YSYgY3VydmUpIHsKKyAgICAgICAgICAgIENHUGF0aE1v dmVUb1BvaW50KG1fcGF0aC5nZXQoKSwgbnVsbHB0ciwgY3VydmUuc3RhcnRQb2ludC54KCksIGN1 cnZlLnN0YXJ0UG9pbnQueSgpKTsKKyAgICAgICAgICAgIENHUGF0aEFkZFF1YWRDdXJ2ZVRvUG9p bnQobV9wYXRoLmdldCgpLCBudWxscHRyLCBjdXJ2ZS5jb250cm9sUG9pbnQueCgpLCBjdXJ2ZS5j b250cm9sUG9pbnQueSgpLCBjdXJ2ZS5lbmRQb2ludC54KCksIGN1cnZlLmVuZFBvaW50LnkoKSk7 CisgICAgICAgIH0sCisgICAgICAgIFsmXShjb25zdCBCZXppZXJDdXJ2ZURhdGEmIGN1cnZlKSB7 CisgICAgICAgICAgICBDR1BhdGhNb3ZlVG9Qb2ludChtX3BhdGguZ2V0KCksIG51bGxwdHIsIGN1 cnZlLnN0YXJ0UG9pbnQueCgpLCBjdXJ2ZS5zdGFydFBvaW50LnkoKSk7CisgICAgICAgICAgICBD R1BhdGhBZGRDdXJ2ZVRvUG9pbnQobV9wYXRoLmdldCgpLCBudWxscHRyLCBjdXJ2ZS5jb250cm9s UG9pbnQxLngoKSwgY3VydmUuY29udHJvbFBvaW50MS55KCksIGN1cnZlLmNvbnRyb2xQb2ludDIu eCgpLCBjdXJ2ZS5jb250cm9sUG9pbnQyLnkoKSwgY3VydmUuZW5kUG9pbnQueCgpLCBjdXJ2ZS5l bmRQb2ludC55KCkpOwogICAgICAgICB9CiAgICAgKTsKIH0KQEAgLTMxNiwxMiArMzI0LDEyIEBA IHZvaWQgUGF0aDo6YWRkTGluZVRvU2xvd0Nhc2UoY29uc3QgRmxvYXRQb2ludCYgcCkKICAgICBD R1BhdGhBZGRMaW5lVG9Qb2ludChlbnN1cmVQbGF0Zm9ybVBhdGgoKSwgbnVsbHB0ciwgcC54KCks IHAueSgpKTsKIH0KIAotdm9pZCBQYXRoOjphZGRRdWFkQ3VydmVUbyhjb25zdCBGbG9hdFBvaW50 JiBjcCwgY29uc3QgRmxvYXRQb2ludCYgcCkKK3ZvaWQgUGF0aDo6YWRkUXVhZEN1cnZlVG9TbG93 Q2FzZShjb25zdCBGbG9hdFBvaW50JiBjcCwgY29uc3QgRmxvYXRQb2ludCYgcCkKIHsKICAgICBD R1BhdGhBZGRRdWFkQ3VydmVUb1BvaW50KGVuc3VyZVBsYXRmb3JtUGF0aCgpLCBudWxscHRyLCBj cC54KCksIGNwLnkoKSwgcC54KCksIHAueSgpKTsKIH0KIAotdm9pZCBQYXRoOjphZGRCZXppZXJD dXJ2ZVRvKGNvbnN0IEZsb2F0UG9pbnQmIGNwMSwgY29uc3QgRmxvYXRQb2ludCYgY3AyLCBjb25z dCBGbG9hdFBvaW50JiBwKQordm9pZCBQYXRoOjphZGRCZXppZXJDdXJ2ZVRvU2xvd0Nhc2UoY29u c3QgRmxvYXRQb2ludCYgY3AxLCBjb25zdCBGbG9hdFBvaW50JiBjcDIsIGNvbnN0IEZsb2F0UG9p bnQmIHApCiB7CiAgICAgQ0dQYXRoQWRkQ3VydmVUb1BvaW50KGVuc3VyZVBsYXRmb3JtUGF0aCgp LCBudWxscHRyLCBjcDEueCgpLCBjcDEueSgpLCBjcDIueCgpLCBjcDIueSgpLCBwLngoKSwgcC55 KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L1BhdGhEaXJlY3QyRC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4v UGF0aERpcmVjdDJELmNwcAppbmRleCBmMjQ3Y2JhYThiMWI2OGExN2ZmMjNiN2QwNTZiOGQyZTNl MDJmOTEyLi42ZjNhZWQyODZjMWQ3ZmI0NmJhMzk5OWJkYWEzMWRjZTMwOWZmZjU3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUGF0aERpcmVjdDJELmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUGF0aERpcmVjdDJE LmNwcApAQCAtMzk0LDEzICszOTQsMTMgQEAgdm9pZCBQYXRoOjphZGRMaW5lVG9TbG93Q2FzZShj b25zdCBGbG9hdFBvaW50JiBwb2ludCkKICAgICBtX2FjdGl2ZVBhdGgtPkFkZExpbmUocG9pbnQp OwogfQogCi12b2lkIFBhdGg6OmFkZFF1YWRDdXJ2ZVRvKGNvbnN0IEZsb2F0UG9pbnQmIGNwLCBj b25zdCBGbG9hdFBvaW50JiBwKQordm9pZCBQYXRoOjphZGRRdWFkQ3VydmVUb1Nsb3dDYXNlKGNv bnN0IEZsb2F0UG9pbnQmIGNwLCBjb25zdCBGbG9hdFBvaW50JiBwKQogewogICAgIG9wZW5GaWd1 cmVBdEN1cnJlbnRQb2ludElmTmVjZXNzYXJ5KCk7CiAgICAgbV9hY3RpdmVQYXRoLT5BZGRRdWFk cmF0aWNCZXppZXIoRDJEMTo6UXVhZHJhdGljQmV6aWVyU2VnbWVudChjcCwgcCkpOwogfQogCi12 b2lkIFBhdGg6OmFkZEJlemllckN1cnZlVG8oY29uc3QgRmxvYXRQb2ludCYgY3AxLCBjb25zdCBG bG9hdFBvaW50JiBjcDIsIGNvbnN0IEZsb2F0UG9pbnQmIHApCit2b2lkIFBhdGg6OmFkZEJlemll ckN1cnZlVG9TbG93Q2FzZShjb25zdCBGbG9hdFBvaW50JiBjcDEsIGNvbnN0IEZsb2F0UG9pbnQm IGNwMiwgY29uc3QgRmxvYXRQb2ludCYgcCkKIHsKICAgICBvcGVuRmlndXJlQXRDdXJyZW50UG9p bnRJZk5lY2Vzc2FyeSgpOwogICAgIG1fYWN0aXZlUGF0aC0+QWRkQmV6aWVyKEQyRDE6OkJlemll clNlZ21lbnQoY3AxLCBjcDIsIHApKTsK