104367 2012-12-07 06:07:37 -0800 GraphicsContext::drawImageBuffer is inefficient 2013-03-01 02:52:13 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 104176 100026 1 schenney schenney a.renevier buildbot cabanier fmalita krit pdr rniwa oldest_to_newest 785843 0 schenney 2012-12-07 06:07:37 -0800 There are several versions of the GraphicsContext::drawImageBuffer method, each taking a different form for the src and dest rectangle specs. As written, the "least specific" version calls the version that is slightly more specific which calls the version that is slightly more specific which ..., until the most specific version is invoked to do the work. All of these calls could be short circuited with each non-final version invoking the final version directly. We would have fewer stack frame and less parameter shuffling. 818245 1 185096 schenney 2013-01-28 16:26:37 -0800 Created attachment 185096 Patch We should now be calling at most 2 versions of drawImageBuffer or drawImage 818806 2 185096 buildbot 2013-01-29 03:37:02 -0800 Comment on attachment 185096 Patch Attachment 185096 did not pass mac-wk2-ews (mac-wk2): Output: http://queues.webkit.org/results/16198105 New failing tests: fast/workers/worker-document-leak.html 818962 3 185096 krit 2013-01-29 08:12:46 -0800 Comment on attachment 185096 Patch I wish we had a Ctor for FloatRect that takes IntPoint and Intsize. But I guess it is not common enough to implement it. Do we have a performance test for that? Would be great if you can create one if not. r=me anyway. 819366 4 pdr 2013-01-29 14:57:11 -0800 There are essentially no other uses of FloatRect(IntRect(...)) outside GraphicsContext.cpp so I wonder if there's a better way. We could at least modify a couple of the FloatRect(IntRect(IntPoint(), ...)) ones to be FloatRect(FloatPoint(), FloatSize( )). 825720 5 186677 schenney 2013-02-05 12:46:07 -0800 Created attachment 186677 Patch Modified to reflect Philip's suggestion, and to remove an unused method 825721 6 schenney 2013-02-05 12:46:46 -0800 We should see how this does on ews. 827520 7 schenney 2013-02-07 07:57:23 -0800 Committed r142123: <http://trac.webkit.org/changeset/142123> 844990 8 186677 eric 2013-03-01 02:52:13 -0800 Comment on attachment 186677 Patch Cleared review? from attachment 186677 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 185096 2013-01-28 16:26:37 -0800 2013-02-05 12:46:04 -0800 Patch bug-104367-20130128192324.patch text/plain 6025 schenney SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTAyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAxLTI4ICBTdGVwaGVu IENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgR3JhcGhpY3NDb250 ZXh0OjpkcmF3SW1hZ2VCdWZmZXIgaXMgaW5lZmZpY2llbnQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDM2NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY29udmVydHMgYWxsIG9mIHRo ZSBkcmF3SW1hZ2UgYW5kIGRyYXdJbWFnZUJ1ZmZlcgorICAgICAgICBjb252ZW5pZW5jZSBtZXRo b2RzICh0aG9zZSB0aGF0IHRha2UgcGFyYW1ldGVycyBvZiB2YXJpb3VzIHR5cGVzKSB0bworICAg ICAgICBpbnZva2UgdGhlIGltcGxlbWVudGluZyBtZXRob2QgKHRoYXQgdGFrZXMgRmxvYXRSZWN0 IHNyYyBhbmQgZGVzdCkKKyAgICAgICAgZGlyZWN0bHksIHJhdGhlciB0aGFuIHRocm91Z2ggdGhl IG5leHQtbW9zdC1jb252ZW5pZW50IG1ldGhvZCBhcyB3YXMKKyAgICAgICAgZG9uZSBwcmV2aW91 c2x5LiBUaGlzIHdpbGwga25vY2sgc29tZSBsYXllcnMgb2ZmIHRoZSBzdGFjayBjb21wYXJlZAor ICAgICAgICB0byB0aGUgZXhpc3RpbmcgY29kZSwgYW5kIG1heSByZW1vdmUgb25lIG9yIHR3byBj b25zdHJ1Y3RvciBpbnZvY2F0aW9ucy4KKyAgICAgICAgVGhpcyBtYXkgYmUgc2xpZ2h0bHkgbW9y ZSBlZmZpY2llbnQsIGFuZCBhbHNvIG1ha2VzIGRlYnVnZ2luZyBzaW1wbGVyLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHksIGp1c3QgcmVmYWN0b3Jp bmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UpOiBNb2RpZnkgYWxs IHRoZSBjb252ZW5pZW5jZSB2ZXJzaW9ucyB0byBjYWxsCisgICAgICAgIHRoZSBpbXBsZW1lbnRp bmcgdmVyc2lvbiBkaXJlY3RseS4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6 ZHJhd0ltYWdlQnVmZmVyKTogTW9kaWZ5IGFsbCB0aGUgY29udmVuaWVuY2UgdmVyc2lvbnMKKyAg ICAgICAgdG8gY2FsbCB0aGUgaW1wbGVtZW50aW5nIHZlcnNpb24gZGlyZWN0bHkuCisKIDIwMTMt MDEtMjggIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCiAgICAgICAgIFBM QVRGT1JNKElPUykgc2hvdWxkIGNvbWUgYmVmb3JlIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVR VUlSRUQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0LmNwcAkocmV2aXNpb24gMTQxMDE4KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDUwLDI5ICs0NTAsMjkgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJbWFnZSog aQogewogICAgIGlmICghaW1hZ2UpCiAgICAgICAgIHJldHVybjsKLSAgICBkcmF3SW1hZ2UoaW1h Z2UsIHN0eWxlQ29sb3JTcGFjZSwgcCwgSW50UmVjdChJbnRQb2ludCgpLCBpbWFnZS0+c2l6ZSgp KSwgb3AsIHNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uKTsKKyAgICBkcmF3SW1hZ2UoaW1h Z2UsIHN0eWxlQ29sb3JTcGFjZSwgRmxvYXRSZWN0KEludFJlY3QocCwgaW1hZ2UtPnNpemUoKSkp LCBGbG9hdFJlY3QoSW50UmVjdChJbnRQb2ludCgpLCBpbWFnZS0+c2l6ZSgpKSksIG9wLCBzaG91 bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbik7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3Qg SW50UmVjdCYgciwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9u RW51bSBzaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiwgYm9vbCB1c2VMb3dRdWFsaXR5U2Nh bGUpCiB7CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgcmV0dXJuOwotICAgIGRyYXdJbWFnZShp bWFnZSwgc3R5bGVDb2xvclNwYWNlLCByLCBJbnRSZWN0KEludFBvaW50KCksIGltYWdlLT5zaXpl KCkpLCBvcCwgc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHVzZUxvd1F1YWxpdHlTY2Fs ZSk7CisgICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChyKSwg RmxvYXRSZWN0KEludFJlY3QoSW50UG9pbnQoKSwgaW1hZ2UtPnNpemUoKSkpLCBvcCwgc2hvdWxk UmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHVzZUxvd1F1YWxpdHlTY2FsZSk7CiB9CiAKIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxl Q29sb3JTcGFjZSwgY29uc3QgSW50UG9pbnQmIGRlc3QsIGNvbnN0IEludFJlY3QmIHNyY1JlY3Qs IENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbkVudW0gc2hvdWxk UmVzcGVjdEltYWdlT3JpZW50YXRpb24pCiB7Ci0gICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNv bG9yU3BhY2UsIEludFJlY3QoZGVzdCwgc3JjUmVjdC5zaXplKCkpLCBzcmNSZWN0LCBvcCwgc2hv dWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24pOworICAgIGRyYXdJbWFnZShpbWFnZSwgc3R5bGVD b2xvclNwYWNlLCBGbG9hdFJlY3QoSW50UmVjdChkZXN0LCBzcmNSZWN0LnNpemUoKSkpLCBGbG9h dFJlY3Qoc3JjUmVjdCksIG9wLCBzaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbik7CiB9CiAK IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNl IHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgSW50UmVjdCYgZGVzdCwgY29uc3QgSW50UmVjdCYgc3Jj UmVjdCwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uRW51bSBz aG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUpCiB7 Ci0gICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChkZXN0KSwg c3JjUmVjdCwgb3AsIHNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uLCB1c2VMb3dRdWFsaXR5 U2NhbGUpOworICAgIGRyYXdJbWFnZShpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3Qo ZGVzdCksIEZsb2F0UmVjdChzcmNSZWN0KSwgb3AsIHNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0 aW9uLCB1c2VMb3dRdWFsaXR5U2NhbGUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJh d0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZs b2F0UmVjdCYgZGVzdCwgY29uc3QgRmxvYXRSZWN0JiBzcmMsIENvbXBvc2l0ZU9wZXJhdG9yIG9w LCBSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbkVudW0gc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRp b24sIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlKQogewotICAgIGRyYXdJbWFnZShpbWFnZSwgc3R5 bGVDb2xvclNwYWNlLCBGbG9hdFJlY3QoZGVzdCksIHNyYywgb3AsIEJsZW5kTW9kZU5vcm1hbCwg c2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHVzZUxvd1F1YWxpdHlTY2FsZSk7CisgICAg ZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3QsIHNyYywgb3AsIEJsZW5kTW9k ZU5vcm1hbCwgc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHVzZUxvd1F1YWxpdHlTY2Fs ZSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBD b2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0KQpAQCAtNTQz LDI0ICs1NDMsMjQgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZUJ1ZmZlcihJbQog ewogICAgIGlmICghaW1hZ2UpCiAgICAgICAgIHJldHVybjsKLSAgICBkcmF3SW1hZ2VCdWZmZXIo aW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgcCwgSW50UmVjdChJbnRQb2ludCgpLCBpbWFnZS0+bG9n aWNhbFNpemUoKSksIG9wLCBibGVuZE1vZGUpOworICAgIGRyYXdJbWFnZUJ1ZmZlcihpbWFnZSwg c3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3QoSW50UmVjdChwLCBpbWFnZS0+bG9naWNhbFNpemUo KSkpLCBGbG9hdFJlY3QoSW50UmVjdChJbnRQb2ludCgpLCBpbWFnZS0+bG9naWNhbFNpemUoKSkp LCBvcCwgYmxlbmRNb2RlKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZUJ1 ZmZlcihJbWFnZUJ1ZmZlciogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25z dCBJbnRSZWN0JiByLCBDb21wb3NpdGVPcGVyYXRvciBvcCwgQmxlbmRNb2RlIGJsZW5kTW9kZSwg Ym9vbCB1c2VMb3dRdWFsaXR5U2NhbGUpCiB7CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgcmV0 dXJuOwotICAgIGRyYXdJbWFnZUJ1ZmZlcihpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCByLCBJbnRS ZWN0KEludFBvaW50KCksIGltYWdlLT5sb2dpY2FsU2l6ZSgpKSwgb3AsIGJsZW5kTW9kZSwgdXNl TG93UXVhbGl0eVNjYWxlKTsKKyAgICBkcmF3SW1hZ2VCdWZmZXIoaW1hZ2UsIHN0eWxlQ29sb3JT cGFjZSwgRmxvYXRSZWN0KHIpLCBGbG9hdFJlY3QoSW50UmVjdChJbnRQb2ludCgpLCBpbWFnZS0+ bG9naWNhbFNpemUoKSkpLCBvcCwgYmxlbmRNb2RlLCB1c2VMb3dRdWFsaXR5U2NhbGUpOwogfQog CiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdlQnVmZmVyKiBpbWFn ZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEludFBvaW50JiBkZXN0LCBjb25z dCBJbnRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciBvcCwgQmxlbmRNb2RlIGJsZW5k TW9kZSkKIHsKLSAgICBkcmF3SW1hZ2VCdWZmZXIoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgSW50 UmVjdChkZXN0LCBzcmNSZWN0LnNpemUoKSksIHNyY1JlY3QsIG9wLCBibGVuZE1vZGUpOworICAg IGRyYXdJbWFnZUJ1ZmZlcihpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3QoSW50UmVj dChkZXN0LCBzcmNSZWN0LnNpemUoKSkpLCBGbG9hdFJlY3Qoc3JjUmVjdCksIG9wLCBibGVuZE1v ZGUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdlQnVm ZmVyKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEludFJlY3QmIGRl c3QsIGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBCbGVuZE1v ZGUgYmxlbmRNb2RlLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSkKIHsKLSAgICBkcmF3SW1hZ2VC dWZmZXIoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgRmxvYXRSZWN0KGRlc3QpLCBzcmNSZWN0LCBv cCwgYmxlbmRNb2RlLCB1c2VMb3dRdWFsaXR5U2NhbGUpOworICAgIGRyYXdJbWFnZUJ1ZmZlcihp bWFnZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3QoZGVzdCksIEZsb2F0UmVjdChzcmNSZWN0 KSwgb3AsIGJsZW5kTW9kZSwgdXNlTG93UXVhbGl0eVNjYWxlKTsKIH0KIAogdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmRyYXdJbWFnZUJ1ZmZlcihJbWFnZUJ1ZmZlciogaW1hZ2UsIENvbG9yU3BhY2Ug c3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3QpCg== 186677 2013-02-05 12:46:07 -0800 2013-03-01 02:52:12 -0800 Patch bug-104367-20130205154244.patch text/plain 7922 schenney SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MTkxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAyLTA1ICBTdGVwaGVu IENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgR3JhcGhpY3NDb250 ZXh0OjpkcmF3SW1hZ2VCdWZmZXIgaXMgaW5lZmZpY2llbnQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDM2NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY29udmVydHMgYWxsIG9mIHRo ZSBkcmF3SW1hZ2UgYW5kIGRyYXdJbWFnZUJ1ZmZlcgorICAgICAgICBjb252ZW5pZW5jZSBtZXRo b2RzICh0aG9zZSB0aGF0IHRha2UgcGFyYW1ldGVycyBvZiB2YXJpb3VzIHR5cGVzKSB0bworICAg ICAgICBpbnZva2UgdGhlIGltcGxlbWVudGluZyBtZXRob2QgKHRoYXQgdGFrZXMgRmxvYXRSZWN0 IHNyYyBhbmQgZGVzdCkKKyAgICAgICAgZGlyZWN0bHksIHJhdGhlciB0aGFuIHRocm91Z2ggdGhl IG5leHQtbW9zdC1jb252ZW5pZW50IG1ldGhvZCBhcyB3YXMKKyAgICAgICAgZG9uZSBwcmV2aW91 c2x5LiBUaGlzIHdpbGwga25vY2sgc29tZSBsYXllcnMgb2ZmIHRoZSBzdGFjayBjb21wYXJlZAor ICAgICAgICB0byB0aGUgZXhpc3RpbmcgY29kZSwgYW5kIG1heSByZW1vdmUgb25lIG9yIHR3byBj b25zdHJ1Y3RvciBpbnZvY2F0aW9ucy4KKyAgICAgICAgVGhpcyBtYXkgYmUgc2xpZ2h0bHkgbW9y ZSBlZmZpY2llbnQsIGFuZCBhbHNvIG1ha2VzIGRlYnVnZ2luZyBzaW1wbGVyLgorCisgICAgICAg IEFsc28gcmVtb3ZlcyB0aGUgdW51c2VkIGRyYXdJbWFnZSBtZXRob2QgdGhhdCB0YWtlcyBhbmQg SW50UmVjdCBzb3VyY2UKKyAgICAgICAgYXJlYSBhbmQgSW50UmVjdCBkZXN0aW5hdGlvbi4gSXQg aXMgbm90IGludm9rZWQgYW55d2hlcmUgaW4gYSBzdGFuZGFyZAorICAgICAgICBXZWJLaXQgY2hl Y2tvdXQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0 eSwganVzdCByZWZhY3RvcmluZy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdJ bWFnZSk6IE1vZGlmeSBhbGwgdGhlIGNvbnZlbmllbmNlIHZlcnNpb25zIHRvIGNhbGwKKyAgICAg ICAgdGhlIGltcGxlbWVudGluZyB2ZXJzaW9uIGRpcmVjdGx5LgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIpOiBNb2RpZnkgYWxsIHRoZSBjb252ZW5p ZW5jZSB2ZXJzaW9ucworICAgICAgICB0byBjYWxsIHRoZSBpbXBsZW1lbnRpbmcgdmVyc2lvbiBk aXJlY3RseS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoK KyAgICAgICAgKEdyYXBoaWNzQ29udGV4dCk6IFJlbW92ZSBJbnRSZWN0LCBJbnRSZWN0IHZlcnNp b24gb2YgZHJhd0ltYWdlLgorCiAyMDEzLTAyLTA1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZp ZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTQx OTA1LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQuY3BwCShyZXZpc2lvbiAxNDE5MTApCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 NTAsMjkgKzQ1MCwyNCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKEltYWdlKiBp CiB7CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgcmV0dXJuOwotICAgIGRyYXdJbWFnZShpbWFn ZSwgc3R5bGVDb2xvclNwYWNlLCBwLCBJbnRSZWN0KEludFBvaW50KCksIGltYWdlLT5zaXplKCkp LCBvcCwgc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24pOworICAgIGRyYXdJbWFnZShpbWFn ZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3QoSW50UmVjdChwLCBpbWFnZS0+c2l6ZSgpKSks IEZsb2F0UmVjdChGbG9hdFBvaW50KCksIEZsb2F0U2l6ZShpbWFnZS0+c2l6ZSgpKSksIG9wLCBz aG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbik7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29u c3QgSW50UmVjdCYgciwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIFJlc3BlY3RJbWFnZU9yaWVudGF0 aW9uRW51bSBzaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiwgYm9vbCB1c2VMb3dRdWFsaXR5 U2NhbGUpCiB7CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgcmV0dXJuOwotICAgIGRyYXdJbWFn ZShpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCByLCBJbnRSZWN0KEludFBvaW50KCksIGltYWdlLT5z aXplKCkpLCBvcCwgc2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHVzZUxvd1F1YWxpdHlT Y2FsZSk7CisgICAgZHJhd0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChy KSwgRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgRmxvYXRTaXplKGltYWdlLT5zaXplKCkpKSwgb3As IHNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uLCB1c2VMb3dRdWFsaXR5U2NhbGUpOwogfQog CiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JTcGFj ZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEludFBvaW50JiBkZXN0LCBjb25zdCBJbnRSZWN0JiBz cmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciBvcCwgUmVzcGVjdEltYWdlT3JpZW50YXRpb25FbnVt IHNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uKQogewotICAgIGRyYXdJbWFnZShpbWFnZSwg c3R5bGVDb2xvclNwYWNlLCBJbnRSZWN0KGRlc3QsIHNyY1JlY3Quc2l6ZSgpKSwgc3JjUmVjdCwg b3AsIHNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uKTsKLX0KLQotdm9pZCBHcmFwaGljc0Nv bnRleHQ6OmRyYXdJbWFnZShJbWFnZSogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNl LCBjb25zdCBJbnRSZWN0JiBkZXN0LCBjb25zdCBJbnRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVP cGVyYXRvciBvcCwgUmVzcGVjdEltYWdlT3JpZW50YXRpb25FbnVtIHNob3VsZFJlc3BlY3RJbWFn ZU9yaWVudGF0aW9uLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSkKLXsKLSAgICBkcmF3SW1hZ2Uo aW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgRmxvYXRSZWN0KGRlc3QpLCBzcmNSZWN0LCBvcCwgc2hv dWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHVzZUxvd1F1YWxpdHlTY2FsZSk7CisgICAgZHJh d0ltYWdlKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIEZsb2F0UmVjdChJbnRSZWN0KGRlc3QsIHNy Y1JlY3Quc2l6ZSgpKSksIEZsb2F0UmVjdChzcmNSZWN0KSwgb3AsIHNob3VsZFJlc3BlY3RJbWFn ZU9yaWVudGF0aW9uKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdJbWFnZShJbWFn ZSogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRl c3QsIGNvbnN0IEZsb2F0UmVjdCYgc3JjLCBDb21wb3NpdGVPcGVyYXRvciBvcCwgUmVzcGVjdElt YWdlT3JpZW50YXRpb25FbnVtIHNob3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uLCBib29sIHVz ZUxvd1F1YWxpdHlTY2FsZSkKIHsKLSAgICBkcmF3SW1hZ2UoaW1hZ2UsIHN0eWxlQ29sb3JTcGFj ZSwgRmxvYXRSZWN0KGRlc3QpLCBzcmMsIG9wLCBCbGVuZE1vZGVOb3JtYWwsIHNob3VsZFJlc3Bl Y3RJbWFnZU9yaWVudGF0aW9uLCB1c2VMb3dRdWFsaXR5U2NhbGUpOworICAgIGRyYXdJbWFnZShp bWFnZSwgc3R5bGVDb2xvclNwYWNlLCBkZXN0LCBzcmMsIG9wLCBCbGVuZE1vZGVOb3JtYWwsIHNo b3VsZFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uLCB1c2VMb3dRdWFsaXR5U2NhbGUpOwogfQogCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JTcGFjZSBz dHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdCkKQEAgLTU0MywyNCArNTM4LDI0 IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIoSW0KIHsKICAgICBpZiAo IWltYWdlKQogICAgICAgICByZXR1cm47Ci0gICAgZHJhd0ltYWdlQnVmZmVyKGltYWdlLCBzdHls ZUNvbG9yU3BhY2UsIHAsIEludFJlY3QoSW50UG9pbnQoKSwgaW1hZ2UtPmxvZ2ljYWxTaXplKCkp LCBvcCwgYmxlbmRNb2RlKTsKKyAgICBkcmF3SW1hZ2VCdWZmZXIoaW1hZ2UsIHN0eWxlQ29sb3JT cGFjZSwgRmxvYXRSZWN0KEludFJlY3QocCwgaW1hZ2UtPmxvZ2ljYWxTaXplKCkpKSwgRmxvYXRS ZWN0KEZsb2F0UG9pbnQoKSwgRmxvYXRTaXplKGltYWdlLT5sb2dpY2FsU2l6ZSgpKSksIG9wLCBi bGVuZE1vZGUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKElt YWdlQnVmZmVyKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEludFJl Y3QmIHIsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBCbGVuZE1vZGUgYmxlbmRNb2RlLCBib29sIHVz ZUxvd1F1YWxpdHlTY2FsZSkKIHsKICAgICBpZiAoIWltYWdlKQogICAgICAgICByZXR1cm47Ci0g ICAgZHJhd0ltYWdlQnVmZmVyKGltYWdlLCBzdHlsZUNvbG9yU3BhY2UsIHIsIEludFJlY3QoSW50 UG9pbnQoKSwgaW1hZ2UtPmxvZ2ljYWxTaXplKCkpLCBvcCwgYmxlbmRNb2RlLCB1c2VMb3dRdWFs aXR5U2NhbGUpOworICAgIGRyYXdJbWFnZUJ1ZmZlcihpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCBG bG9hdFJlY3QociksIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIEZsb2F0U2l6ZShpbWFnZS0+bG9n aWNhbFNpemUoKSkpLCBvcCwgYmxlbmRNb2RlLCB1c2VMb3dRdWFsaXR5U2NhbGUpOwogfQogCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdlQnVmZmVyKiBpbWFnZSwg Q29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEludFBvaW50JiBkZXN0LCBjb25zdCBJ bnRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciBvcCwgQmxlbmRNb2RlIGJsZW5kTW9k ZSkKIHsKLSAgICBkcmF3SW1hZ2VCdWZmZXIoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgSW50UmVj dChkZXN0LCBzcmNSZWN0LnNpemUoKSksIHNyY1JlY3QsIG9wLCBibGVuZE1vZGUpOworICAgIGRy YXdJbWFnZUJ1ZmZlcihpbWFnZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3QoSW50UmVjdChk ZXN0LCBzcmNSZWN0LnNpemUoKSkpLCBGbG9hdFJlY3Qoc3JjUmVjdCksIG9wLCBibGVuZE1vZGUp OwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdlQnVmZmVy KiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEludFJlY3QmIGRlc3Qs IGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBCbGVuZE1vZGUg YmxlbmRNb2RlLCBib29sIHVzZUxvd1F1YWxpdHlTY2FsZSkKIHsKLSAgICBkcmF3SW1hZ2VCdWZm ZXIoaW1hZ2UsIHN0eWxlQ29sb3JTcGFjZSwgRmxvYXRSZWN0KGRlc3QpLCBzcmNSZWN0LCBvcCwg YmxlbmRNb2RlLCB1c2VMb3dRdWFsaXR5U2NhbGUpOworICAgIGRyYXdJbWFnZUJ1ZmZlcihpbWFn ZSwgc3R5bGVDb2xvclNwYWNlLCBGbG9hdFJlY3QoZGVzdCksIEZsb2F0UmVjdChzcmNSZWN0KSwg b3AsIGJsZW5kTW9kZSwgdXNlTG93UXVhbGl0eVNjYWxlKTsKIH0KIAogdm9pZCBHcmFwaGljc0Nv bnRleHQ6OmRyYXdJbWFnZUJ1ZmZlcihJbWFnZUJ1ZmZlciogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5 bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3QpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAkocmV2aXNpb24g MTQxOTEwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTMyMSw3ICszMjEsNiBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHZvaWQgZHJhd0ltYWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9y U3BhY2UsIGNvbnN0IEludFBvaW50JiwgQ29tcG9zaXRlT3BlcmF0b3IgPSBDb21wb3NpdGVTb3Vy Y2VPdmVyLCBSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbkVudW0gPSBEb05vdFJlc3BlY3RJbWFnZU9y aWVudGF0aW9uKTsKICAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2UqLCBDb2xvclNwYWNlIHN0 eWxlQ29sb3JTcGFjZSwgY29uc3QgSW50UmVjdCYsIENvbXBvc2l0ZU9wZXJhdG9yID0gQ29tcG9z aXRlU291cmNlT3ZlciwgUmVzcGVjdEltYWdlT3JpZW50YXRpb25FbnVtID0gRG9Ob3RSZXNwZWN0 SW1hZ2VPcmllbnRhdGlvbiwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUgPSBmYWxzZSk7CiAgICAg ICAgIHZvaWQgZHJhd0ltYWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNv bnN0IEludFBvaW50JiBkZXN0UG9pbnQsIGNvbnN0IEludFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0 ZU9wZXJhdG9yID0gQ29tcG9zaXRlU291cmNlT3ZlciwgUmVzcGVjdEltYWdlT3JpZW50YXRpb25F bnVtID0gRG9Ob3RSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbik7Ci0gICAgICAgIHZvaWQgZHJhd0lt YWdlKEltYWdlKiwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEludFJlY3QmIGRl c3RSZWN0LCBjb25zdCBJbnRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBv c2l0ZVNvdXJjZU92ZXIsIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uRW51bSA9IERvTm90UmVzcGVj dEltYWdlT3JpZW50YXRpb24sIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlID0gZmFsc2UpOwogICAg ICAgICB2b2lkIGRyYXdJbWFnZShJbWFnZSosIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBj b25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0KTsKICAgICAgICAgdm9pZCBkcmF3SW1hZ2UoSW1hZ2Uq LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCwg Y29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBDb21wb3NpdGVPcGVyYXRvciA9IENvbXBvc2l0ZVNv dXJjZU92ZXIsIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uRW51bSA9IERvTm90UmVzcGVjdEltYWdl T3JpZW50YXRpb24sIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlID0gZmFsc2UpOwogICAgICAgICB2 b2lkIGRyYXdJbWFnZShJbWFnZSosIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBG bG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9w ZXJhdG9yLCBCbGVuZE1vZGUsIFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uRW51bSA9IERvTm90UmVz cGVjdEltYWdlT3JpZW50YXRpb24sIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlID0gZmFsc2UpOwo=