141125 2015-01-31 15:05:29 -0800 Ambiguous naming: Do not call replacedContentRect()'s return value paint rect. 2015-02-02 12:40:00 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan sabouhallawa simon.fraser oldest_to_newest 1065874 0 zalan 2015-01-31 15:05:29 -0800 It's the content rect. 1065875 1 245802 zalan 2015-01-31 15:11:53 -0800 Created attachment 245802 Patch 1065878 2 245802 simon.fraser 2015-01-31 15:44:17 -0800 Comment on attachment 245802 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245802&action=review > Source/WebCore/rendering/RenderHTMLCanvas.cpp:73 > + LayoutRect contentBoxRect = this->contentBoxRect(); > + contentBoxRect.moveBy(paintOffset); > + LayoutRect contentRect = replacedContentRect(intrinsicSize()); I'm not sure "contentBoxRect" vs "contentRect" is much clearer. Maybe "contentRect" could be "imageDestinationRect"? 1065881 3 zalan 2015-01-31 15:59:57 -0800 (In reply to comment #2) > Comment on attachment 245802 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=245802&action=review > > > Source/WebCore/rendering/RenderHTMLCanvas.cpp:73 > > + LayoutRect contentBoxRect = this->contentBoxRect(); > > + contentBoxRect.moveBy(paintOffset); > > + LayoutRect contentRect = replacedContentRect(intrinsicSize()); > > I'm not sure "contentBoxRect" vs "contentRect" is much clearer. > > Maybe "contentRect" could be "imageDestinationRect"? Ok, but imageDestinationRect sounds too specific. This is a replaced element term where the content box rect is extended/shrunk/fit based on the object-fit property value. How about we just call it "replacedContentRect"? 1066167 4 245889 zalan 2015-02-02 11:47:44 -0800 Created attachment 245889 Patch 1066192 5 245889 commit-queue 2015-02-02 12:39:56 -0800 Comment on attachment 245889 Patch Clearing flags on attachment: 245889 Committed r179488: <http://trac.webkit.org/changeset/179488> 1066193 6 commit-queue 2015-02-02 12:40:00 -0800 All reviewed patches have been landed. Closing bug. 245802 2015-01-31 15:11:53 -0800 2015-02-02 11:47:41 -0800 Patch bug-141125-20150131151201.patch text/plain 6236 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRlMmE2NzQ5NjgwOGEy NTJhNDQ4ZTE2ZjE3ODkyMDZlODlmZmY3My4uMzBhMTM0YjJiYjY3ZDQyZTY4OGU0MmQzYTU3OTNl OGZjMTI4NTA0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAxLTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQW1iaWd1b3VzIG5hbWluZzog RG8gbm90IGNhbGwgcmVwbGFjZWRDb250ZW50UmVjdCgpJ3MgcmV0dXJuIHZhbHVlIHBhaW50IHJl Y3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEx MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCdz IHRoZSBjb250ZW50IGJveCByZWN0IHdpdGggdGhlIG9iamVjdC1maXQgYWRqdXN0bWVudC4KKwor ICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJIVE1MQ2FudmFzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckhUTUxDYW52 YXM6OnBhaW50UmVwbGFjZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6dXBkYXRlSW5uZXJDb250ZW50UmVjdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNlZCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clJlcGxhY2VkOjpyZXBsYWNlZENvbnRlbnRSZWN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojpz cGxpdEZyYWdtZW50VG9GaXRMaW5lKToKKwogMjAxNS0wMS0zMSAgQ29tbWl0IFF1ZXVlICA8Y29t bWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjE3OTQyNi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJIVE1M Q2FudmFzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJIVE1MQ2FudmFzLmNw cAppbmRleCBlMjE4NTQ0NjEwOThjMjBiYzVmYzU1ZDFlODhkOWU0NDVhMTA4M2NkLi4xNWE1MDU1 MWIxNTdkN2M4MGFmMjBhYWE0NTNmYWNkN2RhMjU1NWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySFRNTENhbnZhcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckhUTUxDYW52YXMuY3BwCkBAIC02OCwyNCArNjgsMjQgQEAgdm9pZCBS ZW5kZXJIVE1MQ2FudmFzOjpwYWludFJlcGxhY2VkKFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25z dCBMYXlvdXRQb2ludCYgcGEKIHsKICAgICBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQgPSBwYWlu dEluZm8uY29udGV4dDsKIAotICAgIExheW91dFJlY3QgY29udGVudFJlY3QgPSBjb250ZW50Qm94 UmVjdCgpOworICAgIExheW91dFJlY3QgY29udGVudEJveFJlY3QgPSB0aGlzLT5jb250ZW50Qm94 UmVjdCgpOworICAgIGNvbnRlbnRCb3hSZWN0Lm1vdmVCeShwYWludE9mZnNldCk7CisgICAgTGF5 b3V0UmVjdCBjb250ZW50UmVjdCA9IHJlcGxhY2VkQ29udGVudFJlY3QoaW50cmluc2ljU2l6ZSgp KTsKICAgICBjb250ZW50UmVjdC5tb3ZlQnkocGFpbnRPZmZzZXQpOwotICAgIExheW91dFJlY3Qg cGFpbnRSZWN0ID0gcmVwbGFjZWRDb250ZW50UmVjdChpbnRyaW5zaWNTaXplKCkpOwotICAgIHBh aW50UmVjdC5tb3ZlQnkocGFpbnRPZmZzZXQpOwogCiAgICAgLy8gTm90IGFsbG93ZWQgdG8gb3Zl cmZsb3cgdGhlIGNvbnRlbnQgYm94LgotICAgIGJvb2wgY2xpcCA9ICFjb250ZW50UmVjdC5jb250 YWlucyhwYWludFJlY3QpOworICAgIGJvb2wgY2xpcCA9ICFjb250ZW50Qm94UmVjdC5jb250YWlu cyhjb250ZW50UmVjdCk7CiAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVy KCpwYWludEluZm8uY29udGV4dCwgY2xpcCk7CiAgICAgaWYgKGNsaXApCi0gICAgICAgIHBhaW50 SW5mby5jb250ZXh0LT5jbGlwKHNuYXBwZWRJbnRSZWN0KGNvbnRlbnRSZWN0KSk7CisgICAgICAg IHBhaW50SW5mby5jb250ZXh0LT5jbGlwKHNuYXBwZWRJbnRSZWN0KGNvbnRlbnRCb3hSZWN0KSk7 CiAKICAgICBpZiAoUGFnZSogcGFnZSA9IGZyYW1lKCkucGFnZSgpKSB7CiAgICAgICAgIGlmIChw YWludEluZm8ucGhhc2UgPT0gUGFpbnRQaGFzZUZvcmVncm91bmQpCi0gICAgICAgICAgICBwYWdl LT5hZGRSZWxldmFudFJlcGFpbnRlZE9iamVjdCh0aGlzLCBpbnRlcnNlY3Rpb24ocGFpbnRSZWN0 LCBjb250ZW50UmVjdCkpOworICAgICAgICAgICAgcGFnZS0+YWRkUmVsZXZhbnRSZXBhaW50ZWRP YmplY3QodGhpcywgaW50ZXJzZWN0aW9uKGNvbnRlbnRSZWN0LCBjb250ZW50Qm94UmVjdCkpOwog ICAgIH0KIAogICAgIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlID0gc3R5bGUoKS5pbWFnZVJlbmRl cmluZygpID09IEltYWdlUmVuZGVyaW5nQ3Jpc3BFZGdlcyB8fCBzdHlsZSgpLmltYWdlUmVuZGVy aW5nKCkgPT0gSW1hZ2VSZW5kZXJpbmdPcHRpbWl6ZVNwZWVkOwotICAgIGNhbnZhc0VsZW1lbnQo KS5wYWludChjb250ZXh0LCBwYWludFJlY3QsIHVzZUxvd1F1YWxpdHlTY2FsZSk7CisgICAgY2Fu dmFzRWxlbWVudCgpLnBhaW50KGNvbnRleHQsIGNvbnRlbnRSZWN0LCB1c2VMb3dRdWFsaXR5U2Nh bGUpOwogfQogCiB2b2lkIFJlbmRlckhUTUxDYW52YXM6OmNhbnZhc1NpemVDaGFuZ2VkKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCmluZGV4IGM5NTRmNzZiNGQ0OTI5 MGViYzkwNzQwMjViNmI3ZmYwMzczOGIzZmQuLmZkNTYyODNlOTYzM2U2MmI5OTI3ZjNhNTExZWUw MDJlZWQwOWQyNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcApA QCAtMjc3LDggKzI3Nyw3IEBAIGJvb2wgUmVuZGVySW1hZ2U6OnVwZGF0ZUludHJpbnNpY1NpemVJ Zk5lZWRlZChjb25zdCBMYXlvdXRTaXplJiBuZXdTaXplLCBib29sIGltCiB2b2lkIFJlbmRlcklt YWdlOjp1cGRhdGVJbm5lckNvbnRlbnRSZWN0KCkKIHsKICAgICAvLyBQcm9wYWdhdGUgY29udGFp bmVyIHNpemUgdG8gaW1hZ2UgcmVzb3VyY2UuCi0gICAgTGF5b3V0UmVjdCBwYWludFJlY3QgPSBy ZXBsYWNlZENvbnRlbnRSZWN0KGludHJpbnNpY1NpemUoKSk7Ci0gICAgSW50U2l6ZSBjb250YWlu ZXJTaXplKHBhaW50UmVjdC53aWR0aCgpLCBwYWludFJlY3QuaGVpZ2h0KCkpOworICAgIEludFNp emUgY29udGFpbmVyU2l6ZShyZXBsYWNlZENvbnRlbnRSZWN0KGludHJpbnNpY1NpemUoKSkuc2l6 ZSgpKTsKICAgICBpZiAoIWNvbnRhaW5lclNpemUuaXNFbXB0eSgpKQogICAgICAgICBpbWFnZVJl c291cmNlKCkuc2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKGNvbnRhaW5lclNpemUpOwogfQpA QCAtNDU1LDIxICs0NTQsMjEgQEAgdm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNlZChQYWlu dEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2YKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIExheW91dFJlY3QgY29udGVudFJlY3QgPSBj b250ZW50Qm94UmVjdCgpOworICAgICAgICBMYXlvdXRSZWN0IGNvbnRlbnRCb3hSZWN0ID0gdGhp cy0+Y29udGVudEJveFJlY3QoKTsKKyAgICAgICAgY29udGVudEJveFJlY3QubW92ZUJ5KHBhaW50 T2Zmc2V0KTsKKyAgICAgICAgTGF5b3V0UmVjdCBjb250ZW50UmVjdCA9IHJlcGxhY2VkQ29udGVu dFJlY3QoaW50cmluc2ljU2l6ZSgpKTsKICAgICAgICAgY29udGVudFJlY3QubW92ZUJ5KHBhaW50 T2Zmc2V0KTsKLSAgICAgICAgTGF5b3V0UmVjdCBwYWludFJlY3QgPSByZXBsYWNlZENvbnRlbnRS ZWN0KGludHJpbnNpY1NpemUoKSk7Ci0gICAgICAgIHBhaW50UmVjdC5tb3ZlQnkocGFpbnRPZmZz ZXQpOwotICAgICAgICBib29sIGNsaXAgPSAhY29udGVudFJlY3QuY29udGFpbnMocGFpbnRSZWN0 KTsKKyAgICAgICAgYm9vbCBjbGlwID0gIWNvbnRlbnRCb3hSZWN0LmNvbnRhaW5zKGNvbnRlbnRS ZWN0KTsKICAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpjb250 ZXh0LCBjbGlwKTsKICAgICAgICAgaWYgKGNsaXApCi0gICAgICAgICAgICBjb250ZXh0LT5jbGlw KGNvbnRlbnRSZWN0KTsKKyAgICAgICAgICAgIGNvbnRleHQtPmNsaXAoY29udGVudEJveFJlY3Qp OwogCi0gICAgICAgIHBhaW50SW50b1JlY3QoY29udGV4dCwgc25hcFJlY3RUb0RldmljZVBpeGVs cyhwYWludFJlY3QsIGRldmljZVNjYWxlRmFjdG9yKSk7CisgICAgICAgIHBhaW50SW50b1JlY3Qo Y29udGV4dCwgc25hcFJlY3RUb0RldmljZVBpeGVscyhjb250ZW50UmVjdCwgZGV2aWNlU2NhbGVG YWN0b3IpKTsKICAgICAgICAgCiAgICAgICAgIGlmIChjYWNoZWRJbWFnZSgpICYmIHBhZ2UgJiYg cGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VGb3JlZ3JvdW5kKSB7CiAgICAgICAgICAgICAv LyBGb3Igbm93LCBjb3VudCBpbWFnZXMgYXMgdW5wYWludGVkIGlmIHRoZXkgYXJlIHN0aWxsIHBy b2dyZXNzaXZlbHkgbG9hZGluZy4gV2UgbWF5IHdhbnQgCiAgICAgICAgICAgICAvLyB0byByZWZp bmUgdGhpcyBpbiB0aGUgZnV0dXJlIHRvIGFjY291bnQgZm9yIHRoZSBwb3J0aW9uIG9mIHRoZSBp bWFnZSB0aGF0IGhhcyBwYWludGVkLgotICAgICAgICAgICAgTGF5b3V0UmVjdCB2aXNpYmxlUmVj dCA9IGludGVyc2VjdGlvbihwYWludFJlY3QsIGNvbnRlbnRSZWN0KTsKKyAgICAgICAgICAgIExh eW91dFJlY3QgdmlzaWJsZVJlY3QgPSBpbnRlcnNlY3Rpb24oY29udGVudFJlY3QsIGNvbnRlbnRC b3hSZWN0KTsKICAgICAgICAgICAgIGlmIChjYWNoZWRJbWFnZSgpLT5pc0xvYWRpbmcoKSkKICAg ICAgICAgICAgICAgICBwYWdlLT5hZGRSZWxldmFudFVucGFpbnRlZE9iamVjdCh0aGlzLCB2aXNp YmxlUmVjdCk7CiAgICAgICAgICAgICBlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclJlcGxhY2VkLmNwcAppbmRleCAwODUzMzNiMzQ0ZmUwZTA0OGQwNjUwMzAyZGFjNjJhMjA4 OWI2NTY2Li4xODg5NWQ4YjNkYWZlY2JmNzcwNjM2MTY1YTI5NjY5YzRkNzllOTJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKQEAgLTMyNCwxMSArMzI0 LDExIEBAIHZvaWQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVBc3BlY3RSYXRpb0luZm9ybWF0aW9u Rm9yUmVuZGVyQm94KFJlbmRlckJveCogY29udGVuCiBMYXlvdXRSZWN0IFJlbmRlclJlcGxhY2Vk OjpyZXBsYWNlZENvbnRlbnRSZWN0KGNvbnN0IExheW91dFNpemUmIGludHJpbnNpY1NpemUpIGNv bnN0CiB7CiAgICAgTGF5b3V0UmVjdCBjb250ZW50UmVjdCA9IGNvbnRlbnRCb3hSZWN0KCk7Ci0g ICAgT2JqZWN0Rml0IG9iamVjdEZpdCA9IHN0eWxlKCkub2JqZWN0Rml0KCk7Ci0gICAgaWYgKG9i amVjdEZpdCA9PSBPYmplY3RGaXRGaWxsKQorICAgIGlmIChpbnRyaW5zaWNTaXplLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIGNvbnRlbnRSZWN0OwogCi0gICAgaWYgKCFpbnRyaW5zaWNTaXpl LndpZHRoKCkgfHwgIWludHJpbnNpY1NpemUuaGVpZ2h0KCkpCisgICAgT2JqZWN0Rml0IG9iamVj dEZpdCA9IHN0eWxlKCkub2JqZWN0Rml0KCk7CisgICAgaWYgKG9iamVjdEZpdCA9PSBPYmplY3RG aXRGaWxsKQogICAgICAgICByZXR1cm4gY29udGVudFJlY3Q7CiAKICAgICBMYXlvdXRSZWN0IGZp bmFsUmVjdCA9IGNvbnRlbnRSZWN0Owo= 245889 2015-02-02 11:47:44 -0800 2015-02-02 12:39:56 -0800 Patch bug-141125-20150202114754.patch text/plain 6430 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NmZWVhNDM1Mjc5Njc2 NWE4ZWFmNThiMDA2NTk5MGIxYjQ0ZWNlYy4uZTE3OTAxYWJlMmIyNmQ2YjM4MDczYWU0MTM4M2I4 MTE5MjhkNzVmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAyLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQW1iaWd1b3VzIG5hbWluZzog RG8gbm90IGNhbGwgcmVwbGFjZWRDb250ZW50UmVjdCgpJ3MgcmV0dXJuIHZhbHVlIHBhaW50IHJl Y3QuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEx MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCdz IHRoZSBjb250ZW50IGJveCByZWN0IHdpdGggdGhlIG9iamVjdC1maXQgYWRqdXN0bWVudC4KKwor ICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJIVE1MQ2FudmFzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckhUTUxDYW52 YXM6OnBhaW50UmVwbGFjZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6dXBkYXRlSW5uZXJDb250ZW50UmVjdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbWFnZTo6cGFpbnRSZXBsYWNlZCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clJlcGxhY2VkOjpyZXBsYWNlZENvbnRlbnRSZWN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojpz cGxpdEZyYWdtZW50VG9GaXRMaW5lKToKKwogMjAxNS0wMi0wMiAgSmVyZW15IEpvbmVzICA8amVy ZW15akBhcHBsZS5jb20+CiAKICAgICAgICAgUHJldmVudCBjcmFzaCB3aGVuIGFjY2Vzc2luZyBX ZWJBVlBsYXllckNvbnRyb2xsZXIuZGVsZWdhdGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVySFRNTENhbnZhcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVySFRNTENhbnZhcy5jcHAKaW5kZXggZTIxODU0NDYxMDk4YzIwYmM1ZmM1NWQxZTg4 ZDllNDQ1YTEwODNjZC4uNWE2NTBhYWM5ZGRiNDk3NzdiNjNmM2JkODgwM2YwNmU1ZWM2YmMxNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckhUTUxDYW52YXMuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJIVE1MQ2FudmFzLmNwcApAQCAt NjgsMjQgKzY4LDI0IEBAIHZvaWQgUmVuZGVySFRNTENhbnZhczo6cGFpbnRSZXBsYWNlZChQYWlu dEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhCiB7CiAgICAgR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0ID0gcGFpbnRJbmZvLmNvbnRleHQ7CiAKLSAgICBMYXlvdXRSZWN0IGNv bnRlbnRSZWN0ID0gY29udGVudEJveFJlY3QoKTsKLSAgICBjb250ZW50UmVjdC5tb3ZlQnkocGFp bnRPZmZzZXQpOwotICAgIExheW91dFJlY3QgcGFpbnRSZWN0ID0gcmVwbGFjZWRDb250ZW50UmVj dChpbnRyaW5zaWNTaXplKCkpOwotICAgIHBhaW50UmVjdC5tb3ZlQnkocGFpbnRPZmZzZXQpOwor ICAgIExheW91dFJlY3QgY29udGVudEJveFJlY3QgPSB0aGlzLT5jb250ZW50Qm94UmVjdCgpOwor ICAgIGNvbnRlbnRCb3hSZWN0Lm1vdmVCeShwYWludE9mZnNldCk7CisgICAgTGF5b3V0UmVjdCBy ZXBsYWNlZENvbnRlbnRSZWN0ID0gdGhpcy0+cmVwbGFjZWRDb250ZW50UmVjdChpbnRyaW5zaWNT aXplKCkpOworICAgIHJlcGxhY2VkQ29udGVudFJlY3QubW92ZUJ5KHBhaW50T2Zmc2V0KTsKIAog ICAgIC8vIE5vdCBhbGxvd2VkIHRvIG92ZXJmbG93IHRoZSBjb250ZW50IGJveC4KLSAgICBib29s IGNsaXAgPSAhY29udGVudFJlY3QuY29udGFpbnMocGFpbnRSZWN0KTsKKyAgICBib29sIGNsaXAg PSAhY29udGVudEJveFJlY3QuY29udGFpbnMocmVwbGFjZWRDb250ZW50UmVjdCk7CiAgICAgR3Jh cGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpwYWludEluZm8uY29udGV4dCwgY2xp cCk7CiAgICAgaWYgKGNsaXApCi0gICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5jbGlwKHNuYXBw ZWRJbnRSZWN0KGNvbnRlbnRSZWN0KSk7CisgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5jbGlw KHNuYXBwZWRJbnRSZWN0KGNvbnRlbnRCb3hSZWN0KSk7CiAKICAgICBpZiAoUGFnZSogcGFnZSA9 IGZyYW1lKCkucGFnZSgpKSB7CiAgICAgICAgIGlmIChwYWludEluZm8ucGhhc2UgPT0gUGFpbnRQ aGFzZUZvcmVncm91bmQpCi0gICAgICAgICAgICBwYWdlLT5hZGRSZWxldmFudFJlcGFpbnRlZE9i amVjdCh0aGlzLCBpbnRlcnNlY3Rpb24ocGFpbnRSZWN0LCBjb250ZW50UmVjdCkpOworICAgICAg ICAgICAgcGFnZS0+YWRkUmVsZXZhbnRSZXBhaW50ZWRPYmplY3QodGhpcywgaW50ZXJzZWN0aW9u KHJlcGxhY2VkQ29udGVudFJlY3QsIGNvbnRlbnRCb3hSZWN0KSk7CiAgICAgfQogCiAgICAgYm9v bCB1c2VMb3dRdWFsaXR5U2NhbGUgPSBzdHlsZSgpLmltYWdlUmVuZGVyaW5nKCkgPT0gSW1hZ2VS ZW5kZXJpbmdDcmlzcEVkZ2VzIHx8IHN0eWxlKCkuaW1hZ2VSZW5kZXJpbmcoKSA9PSBJbWFnZVJl bmRlcmluZ09wdGltaXplU3BlZWQ7Ci0gICAgY2FudmFzRWxlbWVudCgpLnBhaW50KGNvbnRleHQs IHBhaW50UmVjdCwgdXNlTG93UXVhbGl0eVNjYWxlKTsKKyAgICBjYW52YXNFbGVtZW50KCkucGFp bnQoY29udGV4dCwgcmVwbGFjZWRDb250ZW50UmVjdCwgdXNlTG93UXVhbGl0eVNjYWxlKTsKIH0K IAogdm9pZCBSZW5kZXJIVE1MQ2FudmFzOjpjYW52YXNTaXplQ2hhbmdlZCgpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcAppbmRleCBjOTU0Zjc2YjRkNDkyOTBlYmM5MDc0 MDI1YjZiN2ZmMDM3MzhiM2ZkLi40ZWZkOWYxMTBjMThiODc4MjdjMGI5NWI3NTM4YmRiYTY0NzQz ZTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKQEAgLTI3Nyw4 ICsyNzcsNyBAQCBib29sIFJlbmRlckltYWdlOjp1cGRhdGVJbnRyaW5zaWNTaXplSWZOZWVkZWQo Y29uc3QgTGF5b3V0U2l6ZSYgbmV3U2l6ZSwgYm9vbCBpbQogdm9pZCBSZW5kZXJJbWFnZTo6dXBk YXRlSW5uZXJDb250ZW50UmVjdCgpCiB7CiAgICAgLy8gUHJvcGFnYXRlIGNvbnRhaW5lciBzaXpl IHRvIGltYWdlIHJlc291cmNlLgotICAgIExheW91dFJlY3QgcGFpbnRSZWN0ID0gcmVwbGFjZWRD b250ZW50UmVjdChpbnRyaW5zaWNTaXplKCkpOwotICAgIEludFNpemUgY29udGFpbmVyU2l6ZShw YWludFJlY3Qud2lkdGgoKSwgcGFpbnRSZWN0LmhlaWdodCgpKTsKKyAgICBJbnRTaXplIGNvbnRh aW5lclNpemUocmVwbGFjZWRDb250ZW50UmVjdChpbnRyaW5zaWNTaXplKCkpLnNpemUoKSk7CiAg ICAgaWYgKCFjb250YWluZXJTaXplLmlzRW1wdHkoKSkKICAgICAgICAgaW1hZ2VSZXNvdXJjZSgp LnNldENvbnRhaW5lclNpemVGb3JSZW5kZXJlcihjb250YWluZXJTaXplKTsKIH0KQEAgLTQ1NSwy MSArNDU0LDIxIEBAIHZvaWQgUmVuZGVySW1hZ2U6OnBhaW50UmVwbGFjZWQoUGFpbnRJbmZvJiBw YWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KIAotICAgICAgICBMYXlvdXRSZWN0IGNvbnRlbnRSZWN0ID0gY29udGVudEJv eFJlY3QoKTsKLSAgICAgICAgY29udGVudFJlY3QubW92ZUJ5KHBhaW50T2Zmc2V0KTsKLSAgICAg ICAgTGF5b3V0UmVjdCBwYWludFJlY3QgPSByZXBsYWNlZENvbnRlbnRSZWN0KGludHJpbnNpY1Np emUoKSk7Ci0gICAgICAgIHBhaW50UmVjdC5tb3ZlQnkocGFpbnRPZmZzZXQpOwotICAgICAgICBi b29sIGNsaXAgPSAhY29udGVudFJlY3QuY29udGFpbnMocGFpbnRSZWN0KTsKKyAgICAgICAgTGF5 b3V0UmVjdCBjb250ZW50Qm94UmVjdCA9IHRoaXMtPmNvbnRlbnRCb3hSZWN0KCk7CisgICAgICAg IGNvbnRlbnRCb3hSZWN0Lm1vdmVCeShwYWludE9mZnNldCk7CisgICAgICAgIExheW91dFJlY3Qg cmVwbGFjZWRDb250ZW50UmVjdCA9IHRoaXMtPnJlcGxhY2VkQ29udGVudFJlY3QoaW50cmluc2lj U2l6ZSgpKTsKKyAgICAgICAgcmVwbGFjZWRDb250ZW50UmVjdC5tb3ZlQnkocGFpbnRPZmZzZXQp OworICAgICAgICBib29sIGNsaXAgPSAhY29udGVudEJveFJlY3QuY29udGFpbnMocmVwbGFjZWRD b250ZW50UmVjdCk7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZl cigqY29udGV4dCwgY2xpcCk7CiAgICAgICAgIGlmIChjbGlwKQotICAgICAgICAgICAgY29udGV4 dC0+Y2xpcChjb250ZW50UmVjdCk7CisgICAgICAgICAgICBjb250ZXh0LT5jbGlwKGNvbnRlbnRC b3hSZWN0KTsKIAotICAgICAgICBwYWludEludG9SZWN0KGNvbnRleHQsIHNuYXBSZWN0VG9EZXZp Y2VQaXhlbHMocGFpbnRSZWN0LCBkZXZpY2VTY2FsZUZhY3RvcikpOworICAgICAgICBwYWludElu dG9SZWN0KGNvbnRleHQsIHNuYXBSZWN0VG9EZXZpY2VQaXhlbHMocmVwbGFjZWRDb250ZW50UmVj dCwgZGV2aWNlU2NhbGVGYWN0b3IpKTsKICAgICAgICAgCiAgICAgICAgIGlmIChjYWNoZWRJbWFn ZSgpICYmIHBhZ2UgJiYgcGFpbnRJbmZvLnBoYXNlID09IFBhaW50UGhhc2VGb3JlZ3JvdW5kKSB7 CiAgICAgICAgICAgICAvLyBGb3Igbm93LCBjb3VudCBpbWFnZXMgYXMgdW5wYWludGVkIGlmIHRo ZXkgYXJlIHN0aWxsIHByb2dyZXNzaXZlbHkgbG9hZGluZy4gV2UgbWF5IHdhbnQgCiAgICAgICAg ICAgICAvLyB0byByZWZpbmUgdGhpcyBpbiB0aGUgZnV0dXJlIHRvIGFjY291bnQgZm9yIHRoZSBw b3J0aW9uIG9mIHRoZSBpbWFnZSB0aGF0IGhhcyBwYWludGVkLgotICAgICAgICAgICAgTGF5b3V0 UmVjdCB2aXNpYmxlUmVjdCA9IGludGVyc2VjdGlvbihwYWludFJlY3QsIGNvbnRlbnRSZWN0KTsK KyAgICAgICAgICAgIExheW91dFJlY3QgdmlzaWJsZVJlY3QgPSBpbnRlcnNlY3Rpb24ocmVwbGFj ZWRDb250ZW50UmVjdCwgY29udGVudEJveFJlY3QpOwogICAgICAgICAgICAgaWYgKGNhY2hlZElt YWdlKCktPmlzTG9hZGluZygpKQogICAgICAgICAgICAgICAgIHBhZ2UtPmFkZFJlbGV2YW50VW5w YWludGVkT2JqZWN0KHRoaXMsIHZpc2libGVSZWN0KTsKICAgICAgICAgICAgIGVsc2UKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4IDA4NTMzM2IzNDRm ZTBlMDQ4ZDA2NTAzMDJkYWM2MmEyMDg5YjY1NjYuLjE4ODk1ZDhiM2RhZmVjYmY3NzA2MzYxNjVh Mjk2NjljNGQ3OWU5MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxh Y2VkLmNwcApAQCAtMzI0LDExICszMjQsMTEgQEAgdm9pZCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0 ZUFzcGVjdFJhdGlvSW5mb3JtYXRpb25Gb3JSZW5kZXJCb3goUmVuZGVyQm94KiBjb250ZW4KIExh eW91dFJlY3QgUmVuZGVyUmVwbGFjZWQ6OnJlcGxhY2VkQ29udGVudFJlY3QoY29uc3QgTGF5b3V0 U2l6ZSYgaW50cmluc2ljU2l6ZSkgY29uc3QKIHsKICAgICBMYXlvdXRSZWN0IGNvbnRlbnRSZWN0 ID0gY29udGVudEJveFJlY3QoKTsKLSAgICBPYmplY3RGaXQgb2JqZWN0Rml0ID0gc3R5bGUoKS5v YmplY3RGaXQoKTsKLSAgICBpZiAob2JqZWN0Rml0ID09IE9iamVjdEZpdEZpbGwpCisgICAgaWYg KGludHJpbnNpY1NpemUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gY29udGVudFJlY3Q7CiAK LSAgICBpZiAoIWludHJpbnNpY1NpemUud2lkdGgoKSB8fCAhaW50cmluc2ljU2l6ZS5oZWlnaHQo KSkKKyAgICBPYmplY3RGaXQgb2JqZWN0Rml0ID0gc3R5bGUoKS5vYmplY3RGaXQoKTsKKyAgICBp ZiAob2JqZWN0Rml0ID09IE9iamVjdEZpdEZpbGwpCiAgICAgICAgIHJldHVybiBjb250ZW50UmVj dDsKIAogICAgIExheW91dFJlY3QgZmluYWxSZWN0ID0gY29udGVudFJlY3Q7Cg==