165376 2016-12-05 08:59:53 -0800 [CSS Parser] Add parseValue support to new parser. Use new parser for UA sheet too if useNewParser is set. 2016-12-05 09:14:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 1256310 0 hyatt 2016-12-05 08:59:53 -0800 [CSS Parser] Add parseValue support to new parser. Use new parser for UA sheet too if useNewParser is set. 1256312 1 296142 hyatt 2016-12-05 09:05:14 -0800 Created attachment 296142 Patch 1256315 2 296142 zalan 2016-12-05 09:07:33 -0800 Comment on attachment 296142 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=296142&action=review > Source/WebCore/css/parser/CSSParserFastPaths.cpp:-87 > - // case CSSPropertyMotionOffset: ? > Source/WebCore/css/parser/CSSParserImpl.h:65 > + Spaces. 1256318 3 hyatt 2016-12-05 09:14:15 -0800 Fixed in r209318. 296142 2016-12-05 09:05:14 -0800 2016-12-05 09:07:33 -0800 Patch bug-165376-20161205110437.patch text/plain 13460 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTMxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDE2LTEyLTA1ICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBBZGQgcGFyc2VW YWx1ZSBzdXBwb3J0IHRvIG5ldyBwYXJzZXIuIFVzZSBuZXcgcGFyc2VyIGZvciBVQSBzaGVldCB0 b28gaWYgdXNlTmV3UGFyc2VyIGlzIHNldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2NTM3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogY3NzL1N0eWxlQ29sb3IuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVDb2xvcjo6aXNDb2xvcktleXdvcmQpOgorICAgICAgICBJbmNsdWRlIHN5c3RlbSBj b2xvcnMgd2hlbiB1c2luZyB0aGUgZmFzdCBwYXJzZVZhbHVlIHBhdGguCisKKyAgICAgICAgKiBj c3MvcGFyc2VyL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnNl dHVwUGFyc2VyKToKKyAgICAgICAgQWRkIGFuIGFzc2VydCB0byBjYXRjaCBhbnkgY29kZSBwYXRo IHVzaW5nIHRoZSBvbGQgcGFyc2VyIHdoZW4gdGhlIG5ldyBwYXJzZXIgZmxhZyBpcyBzZXQuCisK KyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VTaGVldCk6CisgICAgICAgIChXZWJD b3JlOjpDU1NQYXJzZXI6OnBhcnNlUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6 OnBhcnNlS2V5ZnJhbWVSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VT dXBwb3J0c0NvbmRpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFs dWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVNlbGVjdG9yKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VEZWNsYXJhdGlvbik6CisgICAgICAgIFBhdGNo ZWQgdG8gdXNlIHRoZSBuZXcgcGFyc2VyIGluIFVBU2hlZXRNb2RlIGFzIHdlbGwgYXMgb3RoZXIg bW9kZXMgd2hlbiB0aGUgbmV3IHBhcnNlciBmbGFnCisgICAgICAgIGlzIHNldC4gcGFyc2VWYWx1 ZSBpcyBwYXRjaGVkIHRvIHVzZSB0aGUgbmV3IHBhcnNlcidzIGZhc3QgcGF0aHMgYW5kIHRvIGNh bGwgaW50byBDU1NQYXJzZXJJbXBsJ3MKKyAgICAgICAgcGFyc2VWYWx1ZS4KKworICAgICAgICAq IGNzcy9wYXJzZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omlz U2ltcGxlTGVuZ3RoUHJvcGVydHlJRCk6CisgICAgICAgIFN1cHBvcnQgQ1NTUHJvcGVydHlTaGFw ZU1hcmdpbiBpbiB0aGUgZmFzdCBwYXRoIHNpbmNlIHRoZSBvbGQgcGFyc2VyIGRpZCBpbiBpdHMg ZmFzdCBwYXRoLgorCisgICAgICAgIChXZWJDb3JlOjpwYXJzZVNpbXBsZUxlbmd0aFZhbHVlKToK KyAgICAgICAgRG9uJ3QgZXZlciByZXR1cm4gdW5pdGxlc3MgbnVtYmVycy4gSWYgd2UgYWNjZXB0 IGEgdW5pdGxlc3MgbnVtYmVyLCBjb252ZXJ0IHRoZSB1bml0IHRvIFBYIHN0aWxsLgorCisgICAg ICAgIChXZWJDb3JlOjpDU1NQYXJzZXJGYXN0UGF0aHM6OnBhcnNlQ29sb3IpOgorICAgICAgICBV c2UgdGhlIENTU1ZhbHVlUG9vbCB3aGVuIGNyZWF0aW5nIGNvbG9ycyBvbiB0aGUgZmFzdCBwYXRo LgorCisgICAgICAgICogY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNTU1BhcnNlckltcGw6OnBhcnNlVmFsdWUpOgorICAgICAgICAqIGNzcy9wYXJzZXIv Q1NTUGFyc2VySW1wbC5oOgorICAgICAgICBDaGFuZ2UgdGhlIHJldHVybiB0eXBlIHRvIGJlIGNv bXBhdGlibGUgd2l0aCB0aGUgb2xkIHBhcnNlcidzIFBhcnNlUmVzdWx0IGZsYWcuCisKIDIwMTYt MTItMDQgIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NTUyBQYXJz ZXJdIEVsaW1pbmF0ZSBpbi1wbGFjZSBsb3dlcmNhc2luZyBpbiB0aGUgcGFyc2VyLgpJbmRleDog U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQ29sb3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUNvbG9yLmNwcAkocmV2aXNpb24gMjA4OTk5KQorKysgU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlQ29sb3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCw3ICs1MCw3IEBA IGJvb2wgU3R5bGVDb2xvcjo6aXNDb2xvcktleXdvcmQoQ1NTVmFsdWUKIHsKICAgICByZXR1cm4g KGlkID49IENTU1ZhbHVlQWxwaGEgJiYgaWQgPD0gQ1NTVmFsdWVXZWJraXRUZXh0KQogICAgICAg ICB8fCAoaWQgPj0gQ1NTVmFsdWVBbGljZWJsdWUgJiYgaWQgPD0gQ1NTVmFsdWVZZWxsb3dncmVl bikKLSAgICAgICAgfHwgaWQgPT0gQ1NTVmFsdWVNZW51OworICAgICAgICB8fCBpZCA9PSBDU1NW YWx1ZU1lbnUgfHwgaXNTeXN0ZW1Db2xvcihpZCk7CiB9CiAKIGJvb2wgU3R5bGVDb2xvcjo6aXNT eXN0ZW1Db2xvcihDU1NWYWx1ZUlEIGlkKQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL3BhcnNl ci9DU1NQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIv Q1NTUGFyc2VyLmNwcAkocmV2aXNpb24gMjA5MzA0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTIsNiArMzEyLDggQEAgdm9p ZCBDU1NQYXJzZXJTdHJpbmc6OmNvbnZlcnRUb0FTQ0lJTG93ZQogCiB2b2lkIENTU1BhcnNlcjo6 c2V0dXBQYXJzZXIoY29uc3QgY2hhciogcHJlZml4LCB1bnNpZ25lZCBwcmVmaXhMZW5ndGgsIFN0 cmluZ1ZpZXcgc3RyaW5nLCBjb25zdCBjaGFyKiBzdWZmaXgsIHVuc2lnbmVkIHN1ZmZpeExlbmd0 aCkKIHsKKyAgICBBU1NFUlQoIW1fY29udGV4dC51c2VOZXdQYXJzZXIpOworCiAgICAgbV9wYXJz ZWRUZXh0UHJlZml4TGVuZ3RoID0gcHJlZml4TGVuZ3RoOwogICAgIHVuc2lnbmVkIHN0cmluZ0xl bmd0aCA9IHN0cmluZy5sZW5ndGgoKTsKICAgICB1bnNpZ25lZCBsZW5ndGggPSBzdHJpbmdMZW5n dGggKyBtX3BhcnNlZFRleHRQcmVmaXhMZW5ndGggKyBzdWZmaXhMZW5ndGggKyAxOwpAQCAtMzY4 LDcgKzM3MCw3IEBAIHZvaWQgQ1NTUGFyc2VyOjpwYXJzZVNoZWV0KFN0eWxlU2hlZXRDb24KICAg ICAvLyBGSVhNRS1ORVdQQVJTRVI6IEl0J3MgZWFzaWVyIGZvciB0ZXN0aW5nIHRvIGxldCB0aGUg ZW50aXJlIFVBIHNoZWV0IHBhcnNlIHdpdGggdGhlIG9sZAogICAgIC8vIHBhcnNlci4gVGhhdCB3 YXkgd2UgY2FuIHN0aWxsIGhhdmUgdGhlIGRlZmF1bHQgc3R5bGVzIGxvb2sgY29ycmVjdCB3aGls ZSB3ZSBhZGQgaW4gc3VwcG9ydCBmb3IKICAgICAvLyBwcm9wZXJ0aWVzLgotICAgIGlmIChtX2Nv bnRleHQudXNlTmV3UGFyc2VyICYmIG1fY29udGV4dC5tb2RlICE9IFVBU2hlZXRNb2RlKQorICAg IGlmIChtX2NvbnRleHQudXNlTmV3UGFyc2VyKQogICAgICAgICByZXR1cm4gQ1NTUGFyc2VySW1w bDo6cGFyc2VTdHlsZVNoZWV0KHN0cmluZywgbV9jb250ZXh0LCBzaGVldCk7CiAgICAgCiAgICAg c2V0U3R5bGVTaGVldChzaGVldCk7CkBAIC00MDAsNyArNDAyLDcgQEAgdm9pZCBDU1NQYXJzZXI6 OnBhcnNlU2hlZXRGb3JJbnNwZWN0b3IoYwogCiBSZWZQdHI8U3R5bGVSdWxlQmFzZT4gQ1NTUGFy c2VyOjpwYXJzZVJ1bGUoU3R5bGVTaGVldENvbnRlbnRzKiBzaGVldCwgY29uc3QgU3RyaW5nJiBz dHJpbmcpCiB7Ci0gICAgaWYgKG1fY29udGV4dC51c2VOZXdQYXJzZXIgJiYgbV9jb250ZXh0Lm1v ZGUgIT0gVUFTaGVldE1vZGUpCisgICAgaWYgKG1fY29udGV4dC51c2VOZXdQYXJzZXIpCiAgICAg ICAgIHJldHVybiBDU1NQYXJzZXJJbXBsOjpwYXJzZVJ1bGUoc3RyaW5nLCBtX2NvbnRleHQsIHNo ZWV0LCBDU1NQYXJzZXJJbXBsOjpBbGxvd0ltcG9ydFJ1bGVzKTsKICAgICBzZXRTdHlsZVNoZWV0 KHNoZWV0KTsKICAgICBtX2FsbG93TmFtZXNwYWNlRGVjbGFyYXRpb25zID0gZmFsc2U7CkBAIC00 MTEsNyArNDEzLDcgQEAgUmVmUHRyPFN0eWxlUnVsZUJhc2U+IENTU1BhcnNlcjo6cGFyc2VSdQog CiBSZWZQdHI8U3R5bGVLZXlmcmFtZT4gQ1NTUGFyc2VyOjpwYXJzZUtleWZyYW1lUnVsZShTdHls ZVNoZWV0Q29udGVudHMqIHNoZWV0LCBjb25zdCBTdHJpbmcmIHN0cmluZykKIHsKLSAgICBpZiAo bV9jb250ZXh0LnVzZU5ld1BhcnNlciAmJiBtX2NvbnRleHQubW9kZSAhPSBVQVNoZWV0TW9kZSkg eworICAgIGlmIChtX2NvbnRleHQudXNlTmV3UGFyc2VyKSB7CiAgICAgICAgIFJlZlB0cjxTdHls ZVJ1bGVCYXNlPiBrZXlmcmFtZSA9IENTU1BhcnNlckltcGw6OnBhcnNlUnVsZShzdHJpbmcsIG1f Y29udGV4dCwgbnVsbHB0ciwgQ1NTUGFyc2VySW1wbDo6S2V5ZnJhbWVSdWxlcyk7CiAgICAgICAg IHJldHVybiBkb3duY2FzdDxTdHlsZUtleWZyYW1lPihrZXlmcmFtZS5nZXQoKSk7CiAgICAgfQpA QCAtNDI0LDEwICs0MjYsMTAgQEAgUmVmUHRyPFN0eWxlS2V5ZnJhbWU+IENTU1BhcnNlcjo6cGFy c2VLZQogCiBib29sIENTU1BhcnNlcjo6cGFyc2VTdXBwb3J0c0NvbmRpdGlvbihjb25zdCBTdHJp bmcmIGNvbmRpdGlvbikKIHsKLSAgICBpZiAobV9jb250ZXh0LnVzZU5ld1BhcnNlciAmJiBtX2Nv bnRleHQubW9kZSAhPSBVQVNoZWV0TW9kZSkgeworICAgIGlmIChtX2NvbnRleHQudXNlTmV3UGFy c2VyKSB7CiAgICAgICAgIENTU1Rva2VuaXplcjo6U2NvcGUgc2NvcGUoY29uZGl0aW9uKTsKICAg ICAgICAgQ1NTUGFyc2VyVG9rZW5SYW5nZSByYW5nZSA9IHNjb3BlLnRva2VuUmFuZ2UoKTsKLSAg ICAgICAgQ1NTUGFyc2VySW1wbCBwYXJzZXIoc3RyaWN0Q1NTUGFyc2VyQ29udGV4dCgpKTsKKyAg ICAgICAgQ1NTUGFyc2VySW1wbCBwYXJzZXIobV9jb250ZXh0KTsKICAgICAgICAgcmV0dXJuIENT U1N1cHBvcnRzUGFyc2VyOjpzdXBwb3J0c0NvbmRpdGlvbihyYW5nZSwgcGFyc2VyKSA9PSBDU1NT dXBwb3J0c1BhcnNlcjo6U3VwcG9ydGVkOwogICAgIH0KIApAQCAtMTMzNCwyMSArMTMzNiwyOCBA QCBSZWZQdHI8Q1NTVmFsdWVMaXN0PiBDU1NQYXJzZXI6OnBhcnNlRm9uCiBDU1NQYXJzZXI6OlBh cnNlUmVzdWx0IENTU1BhcnNlcjo6cGFyc2VWYWx1ZShNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzJiBk ZWNsYXJhdGlvbiwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHN0cmlu ZywgYm9vbCBpbXBvcnRhbnQsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRleHQsIFN0eWxl U2hlZXRDb250ZW50cyogY29udGV4dFN0eWxlU2hlZXQpCiB7CiAgICAgQVNTRVJUKCFzdHJpbmcu aXNFbXB0eSgpKTsKLSAgICBDU1NQYXJzZXI6OlBhcnNlUmVzdWx0IHJlc3VsdCA9IHBhcnNlU2lt cGxlTGVuZ3RoVmFsdWUoZGVjbGFyYXRpb24sIHByb3BlcnR5SUQsIHN0cmluZywgaW1wb3J0YW50 LCBjb250ZXh0Lm1vZGUpOwotICAgIGlmIChyZXN1bHQgIT0gUGFyc2VSZXN1bHQ6OkVycm9yKQot ICAgICAgICByZXR1cm4gcmVzdWx0OwotCi0gICAgcmVzdWx0ID0gcGFyc2VDb2xvclZhbHVlKGRl Y2xhcmF0aW9uLCBwcm9wZXJ0eUlELCBzdHJpbmcsIGltcG9ydGFudCwgIGNvbnRleHQubW9kZSk7 Ci0gICAgaWYgKHJlc3VsdCAhPSBQYXJzZVJlc3VsdDo6RXJyb3IpCi0gICAgICAgIHJldHVybiBy ZXN1bHQ7Ci0KLSAgICByZXN1bHQgPSBwYXJzZUtleXdvcmRWYWx1ZShkZWNsYXJhdGlvbiwgcHJv cGVydHlJRCwgc3RyaW5nLCBpbXBvcnRhbnQsIGNvbnRleHQsIGNvbnRleHRTdHlsZVNoZWV0KTsK LSAgICBpZiAocmVzdWx0ICE9IFBhcnNlUmVzdWx0OjpFcnJvcikKLSAgICAgICAgcmV0dXJuIHJl c3VsdDsKLQotICAgIHJlc3VsdCA9IHBhcnNlVHJhbnNsYXRlVHJhbnNmb3JtVmFsdWUoZGVjbGFy YXRpb24sIHByb3BlcnR5SUQsIHN0cmluZywgaW1wb3J0YW50KTsKLSAgICBpZiAocmVzdWx0ICE9 IFBhcnNlUmVzdWx0OjpFcnJvcikKLSAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICBpZiAoY29u dGV4dC51c2VOZXdQYXJzZXIpIHsKKyAgICAgICAgUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZSA9IENT U1BhcnNlckZhc3RQYXRoczo6bWF5YmVQYXJzZVZhbHVlKHByb3BlcnR5SUQsIHN0cmluZywgY29u dGV4dC5tb2RlLCBjb250ZXh0U3R5bGVTaGVldCk7CisgICAgICAgIGlmICh2YWx1ZSkKKyAgICAg ICAgICAgIHJldHVybiBkZWNsYXJhdGlvbi5hZGRQYXJzZWRQcm9wZXJ0eShDU1NQcm9wZXJ0eShw cm9wZXJ0eUlELCBXVEZNb3ZlKHZhbHVlKSwgaW1wb3J0YW50KSkgPyBDU1NQYXJzZXI6OlBhcnNl UmVzdWx0OjpDaGFuZ2VkIDogQ1NTUGFyc2VyOjpQYXJzZVJlc3VsdDo6VW5jaGFuZ2VkOworICAg IH0gZWxzZSB7CisgICAgICAgIC8vIEZJWE1FLU5FV1BBUlNFUjogUmVtb3ZlIGFsbCB0aGlzIGNv ZGUgd2hlbiB0aGUgb2xkIHBhcnNlciBnb2VzIGF3YXkuCisgICAgICAgIENTU1BhcnNlcjo6UGFy c2VSZXN1bHQgcmVzdWx0ID0gcGFyc2VTaW1wbGVMZW5ndGhWYWx1ZShkZWNsYXJhdGlvbiwgcHJv cGVydHlJRCwgc3RyaW5nLCBpbXBvcnRhbnQsIGNvbnRleHQubW9kZSk7CisgICAgICAgIGlmIChy ZXN1bHQgIT0gUGFyc2VSZXN1bHQ6OkVycm9yKQorICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsK KworICAgICAgICByZXN1bHQgPSBwYXJzZUNvbG9yVmFsdWUoZGVjbGFyYXRpb24sIHByb3BlcnR5 SUQsIHN0cmluZywgaW1wb3J0YW50LCAgY29udGV4dC5tb2RlKTsKKyAgICAgICAgaWYgKHJlc3Vs dCAhPSBQYXJzZVJlc3VsdDo6RXJyb3IpCisgICAgICAgICAgICByZXR1cm4gcmVzdWx0OworCisg ICAgICAgIHJlc3VsdCA9IHBhcnNlS2V5d29yZFZhbHVlKGRlY2xhcmF0aW9uLCBwcm9wZXJ0eUlE LCBzdHJpbmcsIGltcG9ydGFudCwgY29udGV4dCwgY29udGV4dFN0eWxlU2hlZXQpOworICAgICAg ICBpZiAocmVzdWx0ICE9IFBhcnNlUmVzdWx0OjpFcnJvcikKKyAgICAgICAgICAgIHJldHVybiBy ZXN1bHQ7CisKKyAgICAgICAgcmVzdWx0ID0gcGFyc2VUcmFuc2xhdGVUcmFuc2Zvcm1WYWx1ZShk ZWNsYXJhdGlvbiwgcHJvcGVydHlJRCwgc3RyaW5nLCBpbXBvcnRhbnQpOworICAgICAgICBpZiAo cmVzdWx0ICE9IFBhcnNlUmVzdWx0OjpFcnJvcikKKyAgICAgICAgICAgIHJldHVybiByZXN1bHQ7 CisgICAgfQogCiAgICAgQ1NTUGFyc2VyIHBhcnNlcihjb250ZXh0KTsKICAgICByZXR1cm4gcGFy c2VyLnBhcnNlVmFsdWUoZGVjbGFyYXRpb24sIHByb3BlcnR5SUQsIHN0cmluZywgaW1wb3J0YW50 LCBjb250ZXh0U3R5bGVTaGVldCk7CkBAIC0xMzYzLDYgKzEzNzIsOSBAQCBDU1NQYXJzZXI6OlBh cnNlUmVzdWx0IENTU1BhcnNlcjo6cGFyc2VDCiAKIENTU1BhcnNlcjo6UGFyc2VSZXN1bHQgQ1NT UGFyc2VyOjpwYXJzZVZhbHVlKE11dGFibGVTdHlsZVByb3BlcnRpZXMmIGRlY2xhcmF0aW9uLCBD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGltcG9y dGFudCwgU3R5bGVTaGVldENvbnRlbnRzKiBjb250ZXh0U3R5bGVTaGVldCkKIHsKKyAgICBpZiAo bV9jb250ZXh0LnVzZU5ld1BhcnNlcikKKyAgICAgICAgcmV0dXJuIENTU1BhcnNlckltcGw6OnBh cnNlVmFsdWUoJmRlY2xhcmF0aW9uLCBwcm9wZXJ0eUlELCBzdHJpbmcsIGltcG9ydGFudCwgbV9j b250ZXh0KTsKKwogICAgIHNldFN0eWxlU2hlZXQoY29udGV4dFN0eWxlU2hlZXQpOwogCiAgICAg c2V0dXBQYXJzZXIoIkAtd2Via2l0LXZhbHVleyIsIHN0cmluZywgIn0gIik7CkBAIC0xNDM2LDcg KzE0NDgsNyBAQCBDb2xvciBDU1NQYXJzZXI6OnBhcnNlU3lzdGVtQ29sb3IoY29uc3QgCiAKIHZv aWQgQ1NTUGFyc2VyOjpwYXJzZVNlbGVjdG9yKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBDU1NTZWxl Y3Rvckxpc3QmIHNlbGVjdG9yTGlzdCkKIHsKLSAgICBpZiAobV9jb250ZXh0LnVzZU5ld1BhcnNl ciAmJiBtX2NvbnRleHQubW9kZSAhPSBVQVNoZWV0TW9kZSkgeworICAgIGlmIChtX2NvbnRleHQu dXNlTmV3UGFyc2VyKSB7CiAgICAgICAgIENTU1Rva2VuaXplcjo6U2NvcGUgc2NvcGUoc3RyaW5n KTsKICAgICAgICAgc2VsZWN0b3JMaXN0ID0gQ1NTU2VsZWN0b3JQYXJzZXI6OnBhcnNlU2VsZWN0 b3Ioc2NvcGUudG9rZW5SYW5nZSgpLCBtX2NvbnRleHQsIG51bGxwdHIpOwogICAgICAgICByZXR1 cm47CkBAIC0xNDgwLDcgKzE0OTIsNyBAQCBSZWY8SW1tdXRhYmxlU3R5bGVQcm9wZXJ0aWVzPiBD U1NQYXJzZXI6CiAKIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZURlY2xhcmF0aW9uKE11dGFibGVTdHls ZVByb3BlcnRpZXMmIGRlY2xhcmF0aW9uLCBjb25zdCBTdHJpbmcmIHN0cmluZywgUmVmUHRyPENT U1J1bGVTb3VyY2VEYXRhPiYmIHJ1bGVTb3VyY2VEYXRhLCBTdHlsZVNoZWV0Q29udGVudHMqIGNv bnRleHRTdHlsZVNoZWV0KQogewotICAgIGlmIChtX2NvbnRleHQudXNlTmV3UGFyc2VyICYmIG1f Y29udGV4dC5tb2RlICE9IFVBU2hlZXRNb2RlKQorICAgIGlmIChtX2NvbnRleHQudXNlTmV3UGFy c2VyKQogICAgICAgICByZXR1cm4gQ1NTUGFyc2VySW1wbDo6cGFyc2VEZWNsYXJhdGlvbkxpc3Qo JmRlY2xhcmF0aW9uLCBzdHJpbmcsIG1fY29udGV4dCk7CiAKICAgICAvLyBMZW5ndGggb2YgdGhl ICJALXdlYmtpdC1kZWNsc3siIHByZWZpeC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJz ZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAJKHJldmlzaW9uIDIwOTI2NSkKKysrIFNv dXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNzAsNyArNzAsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNTaW1wbGVMZW5ndGhQ cm9wZXJ0CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFBhZGRpbmdCZWZvcmU6CiAgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdFBhZGRpbmdFbmQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dFBhZGRpbmdTdGFydDoKLSAgLy8gIGNhc2UgQ1NTUHJvcGVydHlTaGFwZU1hcmdpbjoKKyAgICBj YXNlIENTU1Byb3BlcnR5U2hhcGVNYXJnaW46CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVI6CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eVJ4OgogICAgIGNhc2UgQ1NTUHJvcGVydHlSeToKQEAgLTg0LDcgKzg0 LDYgQEAgc3RhdGljIGlubGluZSBib29sIGlzU2ltcGxlTGVuZ3RoUHJvcGVydAogICAgIGNhc2Ug Q1NTUHJvcGVydHlNYXJnaW5MZWZ0OgogICAgIGNhc2UgQ1NTUHJvcGVydHlNYXJnaW5SaWdodDoK ICAgICBjYXNlIENTU1Byb3BlcnR5TWFyZ2luVG9wOgotIC8vICAgY2FzZSBDU1NQcm9wZXJ0eU1v dGlvbk9mZnNldDoKICAgICBjYXNlIENTU1Byb3BlcnR5UmlnaHQ6CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVRvcDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFyZ2luQWZ0ZXI6CkBAIC0xNDQs MTAgKzE0Myw5IEBAIHN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IHBhcnNlU2ltcGxlTGVuZ3QKICAg ICB9CiAKICAgICBpZiAodW5pdCA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6VW5pdFR5cGVzOjpDU1Nf TlVNQkVSKSB7Ci0gICAgICAgIGlmICghbnVtYmVyKQotICAgICAgICAgICAgdW5pdCA9IENTU1By aW1pdGl2ZVZhbHVlOjpVbml0VHlwZXM6OkNTU19QWDsKLSAgICAgICAgZWxzZSBpZiAoY3NzUGFy c2VyTW9kZSAhPSBTVkdBdHRyaWJ1dGVNb2RlKQorICAgICAgICBpZiAobnVtYmVyICYmIGNzc1Bh cnNlck1vZGUgIT0gU1ZHQXR0cmlidXRlTW9kZSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRy OworICAgICAgICB1bml0ID0gQ1NTUHJpbWl0aXZlVmFsdWU6OlVuaXRUeXBlczo6Q1NTX1BYOwog ICAgIH0KIAogICAgIGlmIChudW1iZXIgPCAwICYmICFhY2NlcHRzTmVnYXRpdmVOdW1iZXJzKQpA QCAtNDgxLDcgKzQ3OSw3IEBAIFJlZlB0cjxDU1NWYWx1ZT4gQ1NTUGFyc2VyRmFzdFBhdGhzOjpw YXIKICAgICBpZiAoU3R5bGVDb2xvcjo6aXNDb2xvcktleXdvcmQodmFsdWVJRCkpIHsKICAgICAg ICAgaWYgKCFpc1ZhbHVlQWxsb3dlZEluTW9kZSh2YWx1ZUlELCBwYXJzZXJNb2RlKSkKICAgICAg ICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZlVmFsdWU6 OmNyZWF0ZUlkZW50aWZpZXIodmFsdWVJRCk7CisgICAgICAgIHJldHVybiBDU1NWYWx1ZVBvb2w6 OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZSh2YWx1ZUlEKTsKICAgICB9CiAKICAg ICBib29sIHF1aXJrc01vZGUgPSBpc1F1aXJrc01vZGVCZWhhdmlvcihwYXJzZXJNb2RlKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcAkocmV2aXNp b24gMjA5MzA0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBAQCBDU1NQYXJzZXJJbXBsOjpDU1NQYXJz ZXJJbXBsKGNvbnN0IENTU1BhCiB7CiB9CiAKLWJvb2wgQ1NTUGFyc2VySW1wbDo6cGFyc2VWYWx1 ZShNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzKiBkZWNsYXJhdGlvbiwgQ1NTUHJvcGVydHlJRCBwcm9w ZXJ0eUlELCBjb25zdCBTdHJpbmcmIHN0cmluZywgYm9vbCBpbXBvcnRhbnQsIGNvbnN0IENTU1Bh cnNlckNvbnRleHQmIGNvbnRleHQpCitDU1NQYXJzZXI6OlBhcnNlUmVzdWx0IENTU1BhcnNlcklt cGw6OnBhcnNlVmFsdWUoTXV0YWJsZVN0eWxlUHJvcGVydGllcyogZGVjbGFyYXRpb24sIENTU1By b3BlcnR5SUQgcHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiBzdHJpbmcsIGJvb2wgaW1wb3J0YW50 LCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBjb250ZXh0KQogewogICAgIENTU1BhcnNlckltcGwg cGFyc2VyKGNvbnRleHQpOwogICAgIFN0eWxlUnVsZTo6VHlwZSBydWxlVHlwZSA9IFN0eWxlUnVs ZTo6U3R5bGU7CkBAIC03Myw4ICs3Myw4IEBAIGJvb2wgQ1NTUGFyc2VySW1wbDo6cGFyc2VWYWx1 ZShNdXRhYmxlU3QKICAgICBDU1NUb2tlbml6ZXI6OlNjb3BlIHNjb3BlKHN0cmluZyk7CiAgICAg cGFyc2VyLmNvbnN1bWVEZWNsYXJhdGlvblZhbHVlKHNjb3BlLnRva2VuUmFuZ2UoKSwgcHJvcGVy dHlJRCwgaW1wb3J0YW50LCBydWxlVHlwZSk7CiAgICAgaWYgKHBhcnNlci5tX3BhcnNlZFByb3Bl cnRpZXMuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuIGRlY2xh cmF0aW9uLT5hZGRQYXJzZWRQcm9wZXJ0aWVzKHBhcnNlci5tX3BhcnNlZFByb3BlcnRpZXMpOwor ICAgICAgICByZXR1cm4gQ1NTUGFyc2VyOjpQYXJzZVJlc3VsdDo6RXJyb3I7CisgICAgcmV0dXJu IGRlY2xhcmF0aW9uLT5hZGRQYXJzZWRQcm9wZXJ0aWVzKHBhcnNlci5tX3BhcnNlZFByb3BlcnRp ZXMpID8gQ1NTUGFyc2VyOjpQYXJzZVJlc3VsdDo6Q2hhbmdlZCA6IENTU1BhcnNlcjo6UGFyc2VS ZXN1bHQ6OlVuY2hhbmdlZDsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkIGZpbHRlclByb3BlcnRp ZXMoYm9vbCBpbXBvcnRhbnQsIGNvbnN0IFBhcnNlZFByb3BlcnR5VmVjdG9yJiBpbnB1dCwgUGFy c2VkUHJvcGVydHlWZWN0b3ImIG91dHB1dCwgc2l6ZV90JiB1bnVzZWRFbnRyaWVzLCBzdGQ6OmJp dHNldDxudW1DU1NQcm9wZXJ0aWVzPiYgc2VlblByb3BlcnRpZXMsIEhhc2hTZXQ8QXRvbWljU3Ry aW5nPiYgc2VlbkN1c3RvbVByb3BlcnRpZXMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvcGFy c2VyL0NTU1BhcnNlckltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFy c2VyL0NTU1BhcnNlckltcGwuaAkocmV2aXNpb24gMjA4OTk5KQorKysgU291cmNlL1dlYkNvcmUv Y3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDcg QEAKIAogI3ByYWdtYSBvbmNlCiAKKyNpbmNsdWRlICJDU1NQYXJzZXIuaCIKICNpbmNsdWRlICJD U1NQYXJzZXJNb2RlLmgiCiAjaW5jbHVkZSAiQ1NTUGFyc2VyVG9rZW5SYW5nZS5oIgogI2luY2x1 ZGUgIkNTU1Byb3BlcnR5LmgiCkBAIC02MSw3ICs2Miw3IEBAIGNsYXNzIFN0eWxlU2hlZXRDb250 ZW50czsKIGNsYXNzIEltbXV0YWJsZVN0eWxlUHJvcGVydGllczsKIGNsYXNzIEVsZW1lbnQ7CiBj bGFzcyBNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzOwotCisgICAgCiBjbGFzcyBDU1NQYXJzZXJJbXBs IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDU1NQYXJzZXJJbXBsKTsKIHB1YmxpYzoKQEAg LTgyLDcgKzgzLDcgQEAgcHVibGljOgogICAgICAgICBOb1J1bGVzLCAvLyBGb3IgcGFyc2luZyBh dC1ydWxlcyBpbnNpZGUgZGVjbGFyYXRpb24gbGlzdHMKICAgICB9OwogCi0gICAgc3RhdGljIGJv b2wgcGFyc2VWYWx1ZShNdXRhYmxlU3R5bGVQcm9wZXJ0aWVzKiwgQ1NTUHJvcGVydHlJRCwgY29u c3QgU3RyaW5nJiwgYm9vbCBpbXBvcnRhbnQsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmKTsKKyAg ICBzdGF0aWMgQ1NTUGFyc2VyOjpQYXJzZVJlc3VsdCBwYXJzZVZhbHVlKE11dGFibGVTdHlsZVBy b3BlcnRpZXMqLCBDU1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmLCBib29sIGltcG9ydGFudCwg Y29uc3QgQ1NTUGFyc2VyQ29udGV4dCYpOwogICAgIHN0YXRpYyBSZWY8SW1tdXRhYmxlU3R5bGVQ cm9wZXJ0aWVzPiBwYXJzZUlubGluZVN0eWxlRGVjbGFyYXRpb24oY29uc3QgU3RyaW5nJiwgRWxl bWVudCopOwogICAgIHN0YXRpYyBib29sIHBhcnNlRGVjbGFyYXRpb25MaXN0KE11dGFibGVTdHls ZVByb3BlcnRpZXMqLCBjb25zdCBTdHJpbmcmLCBjb25zdCBDU1NQYXJzZXJDb250ZXh0Jik7CiAg ICAgc3RhdGljIFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiBwYXJzZVJ1bGUoY29uc3QgU3RyaW5nJiwg Y29uc3QgQ1NTUGFyc2VyQ29udGV4dCYsIFN0eWxlU2hlZXRDb250ZW50cyosIEFsbG93ZWRSdWxl c1R5cGUpOwo=