110541 2013-02-21 18:21:45 -0800 Better sizing model for Snapshotted plugins 2013-02-21 18:51:32 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino oldest_to_newest 839114 0 dino 2013-02-21 18:21:45 -0800 At the moment we have a slightly confusing model of deciding how to tell the shadow root of a snapshotted plugin how big it is. Clean this up a little. Unfortunately the sizes are still somewhat arbitrary, but we can address this later. 839117 1 189658 dino 2013-02-21 18:29:39 -0800 Created attachment 189658 Patch 839129 2 189658 jonlee 2013-02-21 18:47:18 -0800 Comment on attachment 189658 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189658&action=review > Source/WebCore/html/HTMLPlugInImageElement.cpp:426 > + if (!width || !height || (width <= sizingTinyDimensionThreshold || height <= sizingTinyDimensionThreshold)) { By changing the logic to only require one of the dimensions being less than the threshold, there's no need for the !width and !height checks. 839133 3 dino 2013-02-21 18:51:32 -0800 Committed r143680: <http://trac.webkit.org/changeset/143680> 189658 2013-02-21 18:29:39 -0800 2013-02-21 18:47:18 -0800 Patch bug-110541-20130221182600.patch text/plain 10161 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWJlYzVlMmIyNDI3M2Iy ODgwZDE3ZDQxYzUwNTcxOTkxYTU4NjdlYi4uY2I5NTRmMWUwMDZiZTc1ZDYwZTY0MjE1MjdkNzlm MzA0ZmNlMThhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAyLTIxICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBCZXR0ZXIgc2l6aW5nIG1vZGVs IGZvciBTbmFwc2hvdHRlZCBwbHVnaW5zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTA1NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDbGFyaWZ5IHRoZSB3YXkgd2UgYXBwbHkgc2l6aW5nIHJ1bGVzIHRv IHNuYXBzaG90dGVkIHBsdWctaW5zLiBJbgorICAgICAgICB0ZXN0aW5nIHdlJ3ZlIGZvdW5kIHRo YXQgcGx1Zy1pbnMgc21hbGxlciB0aGFuIDQwcHggaW4gZWl0aGVyCisgICAgICAgIGRpbWVuc2lv biBzaG91bGQgbmV2ZXIgYmUgZnJvemVuLiBBbHNvLCBsYXJnZXIgcGx1Z2lucyBzaG91bGQKKyAg ICAgICAgYmUgZXhwbGljaXRseSBtYXJrZWQsIGJlY2F1c2Ugb2Z0ZW4gdGhleSBhcmUgdGhlIHNp bmdsZSBkb21pbmFudAorICAgICAgICBlbGVtZW50IG9uIHRoZSBwYWdlLgorCisgICAgICAgIEFz IGEgZHJpdmUtYnksIEkgcmVtb3ZlZCB0aGUgZmxhZyB0aGF0IGluZGljYXRlZCB3aGV0aGVyIG9y IG5vdAorICAgICAgICB0aGUgbGFiZWwgc2hvdWxkIHNob3cgYXV0b21hdGljYWxseS4gSXQgd2Fz bid0IGJlaW5nIHVzZWQuIFRoaXMgaXMKKyAgICAgICAgYWxsIGRldGVybWluZWQgZnJvbSB0aGUg c2hhZG93IHJvb3QgYW5kIGl0cyBDU1Mgbm93LgorCisgICAgICAgICogaHRtbC9IVE1MUGx1Z0lu SW1hZ2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1l bnQ6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQpOiBOZXcgdmFsdWVzIGZvciBzaXplIHRocmVzaG9s ZHMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpjcmVhdGVSZW5k ZXJlcik6IFJlbW92ZSBjYWxsIHRvIHNldFNob3VsZFNob3dTbmFwc2hvdExhYmVsQXV0b21hdGlj YWxseS4KKyAgICAgICAgKFdlYkNvcmU6OmNsYXNzTmFtZUZvclNoYWRvd1Jvb3QpOiBSZW1vdmUg bG9nZ2luZyBhbmQgY2xlYXJseSBhc3NpZ24gc2l6aW5nIGNsYXNzZXMuCisgICAgICAgIChXZWJD b3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp1cGRhdGVTbmFwc2hvdEluZm8pOiBXZSBkb24n dCBuZWVkIHRoZSBwYWdlIHNpemUgYW55IG1vcmUuCisgICAgICAgIChXZWJDb3JlOjpIVE1MUGx1 Z0luSW1hZ2VFbGVtZW50OjpzdWJmcmFtZUxvYWRlcldpbGxDcmVhdGVQbHVnSW4pOiBVc2UgbmV3 IGNvbnN0YW50IG5hbWVzLgorICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5o OgorICAgICAgICAoSFRNTFBsdWdJbkltYWdlRWxlbWVudCk6IFJlbW92ZSBzZXRTaG91bGRTaG93 U25hcHNob3RMYWJlbEF1dG9tYXRpY2FsbHkuCisKIDIwMTMtMDItMjEgIFRvbnkgQ2hhbmcgIDx0 b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBdXRvZ2VuZXJhdGUgU2V0dGluZ3MgdGhhdCBj YWxsIHNldE5lZWRzUmVjYWxjU3R5bGVJbkFsbEZyYW1lcyB3aGVuIHNldApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAKaW5kZXggNzQ5OThmMzAxYmMw YTRjN2U0ZGNlM2ZjNDc0YTc2YWE4ZWUwMDExMS4uZjBjNDEwMTE4OTQ1ZDdiNmM1NzZjMjcyZDE4 YzJjZjIwYTJkMDNmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0lu SW1hZ2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFn ZUVsZW1lbnQuY3BwCkBAIC01MywxMyArNTMsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1 c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogCi1zdGF0aWMgY29uc3QgaW50IGF1dG9TdGFydFBs dWdJblNpemVEaW1lbnNpb25UaHJlc2hvbGQgPSAxOwotc3RhdGljIGNvbnN0IGludCBhdXRvU2hv d0xhYmVsU2l6ZVdpZHRoVGhyZXNob2xkID0gNDAwOwotc3RhdGljIGNvbnN0IGludCBhdXRvU2hv d0xhYmVsU2l6ZUhlaWdodFRocmVzaG9sZCA9IDMwMDsKLQogc3RhdGljIGNvbnN0IGludCBzaXpp bmdUaW55RGltZW5zaW9uVGhyZXNob2xkID0gNDA7CiBzdGF0aWMgY29uc3QgaW50IHNpemluZ1Nt YWxsV2lkdGhUaHJlc2hvbGQgPSAyNTA7Ci1zdGF0aWMgY29uc3QgaW50IHNpemluZ01lZGl1bVdp ZHRoVGhyZXNob2xkID0gNjAwOworc3RhdGljIGNvbnN0IGludCBzaXppbmdNZWRpdW1XaWR0aFRo cmVzaG9sZCA9IDQ1MDsKK3N0YXRpYyBjb25zdCBpbnQgc2l6aW5nTWVkaXVtSGVpZ2h0VGhyZXNo b2xkID0gMzAwOwogCiAvLyBUaGlzIGRlbGF5IHNob3VsZCBub3QgZXhjZWVkIHRoZSBzbmFwc2hv dCBkZWxheSBpbiBQbHVnaW5WaWV3LmNwcAogc3RhdGljIGNvbnN0IGRvdWJsZSBzaW11bGF0ZWRN b3VzZUNsaWNrVGltZXJEZWxheSA9IC43NTsKQEAgLTczLDcgKzcwLDYgQEAgSFRNTFBsdWdJbklt YWdlRWxlbWVudDo6SFRNTFBsdWdJbkltYWdlRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0 YWdOYW1lLCBEb2MKICAgICAsIG1fbmVlZHNXaWRnZXRVcGRhdGUoIWNyZWF0ZWRCeVBhcnNlcikK ICAgICAsIG1fc2hvdWxkUHJlZmVyUGx1Z0luc0ZvckltYWdlcyhwcmVmZXJQbHVnSW5zRm9ySW1h Z2VzT3B0aW9uID09IFNob3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXMpCiAgICAgLCBtX25lZWRz RG9jdW1lbnRBY3RpdmF0aW9uQ2FsbGJhY2tzKGZhbHNlKQotICAgICwgbV9zaG91bGRTaG93U25h cHNob3RMYWJlbEF1dG9tYXRpY2FsbHkoZmFsc2UpCiAgICAgLCBtX3NpbXVsYXRlZE1vdXNlQ2xp Y2tUaW1lcih0aGlzLCAmSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c2ltdWxhdGVkTW91c2VDbGlj a1RpbWVyRmlyZWQsIHNpbXVsYXRlZE1vdXNlQ2xpY2tUaW1lckRlbGF5KQogICAgICwgbV9zd2Fw UmVuZGVyZXJUaW1lcih0aGlzLCAmSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c3dhcFJlbmRlcmVy VGltZXJGaXJlZCkKIHsKQEAgLTE1Nyw4ICsxNTMsNiBAQCBSZW5kZXJPYmplY3QqIEhUTUxQbHVn SW5JbWFnZUVsZW1lbnQ6OmNyZWF0ZVJlbmRlcmVyKFJlbmRlckFyZW5hKiBhcmVuYSwgUmVuZGVy UwogICAgIGlmIChkaXNwbGF5U3RhdGUoKSA9PSBEaXNwbGF5aW5nU25hcHNob3QpIHsKICAgICAg ICAgUmVuZGVyU25hcHNob3R0ZWRQbHVnSW4qIHJlbmRlclNuYXBzaG90dGVkUGx1Z0luID0gbmV3 IChhcmVuYSkgUmVuZGVyU25hcHNob3R0ZWRQbHVnSW4odGhpcyk7CiAgICAgICAgIHJlbmRlclNu YXBzaG90dGVkUGx1Z0luLT51cGRhdGVTbmFwc2hvdChtX3NuYXBzaG90SW1hZ2UpOwotICAgICAg ICBpZiAobV9zaG91bGRTaG93U25hcHNob3RMYWJlbEF1dG9tYXRpY2FsbHkpCi0gICAgICAgICAg ICByZW5kZXJTbmFwc2hvdHRlZFBsdWdJbi0+c2V0U2hvdWxkU2hvd0xhYmVsQXV0b21hdGljYWxs eSgpOwogICAgICAgICByZXR1cm4gcmVuZGVyU25hcHNob3R0ZWRQbHVnSW47CiAgICAgfQogCkBA IC0yOTYsMzQgKzI5MCwyNSBAQCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnVwZGF0ZVNu YXBzaG90KFBhc3NSZWZQdHI8SW1hZ2U+IGltYWdlKQogICAgIH0KIH0KIAotc3RhdGljIEF0b21p Y1N0cmluZyBjbGFzc05hbWVGb3JTaGFkb3dSb290U2l6ZShjb25zdCBJbnRTaXplJiB2aWV3Q29u dGVudHNTaXplLCBjb25zdCBOb2RlKiBub2RlKQorc3RhdGljIEF0b21pY1N0cmluZyBjbGFzc05h bWVGb3JTaGFkb3dSb290KGNvbnN0IE5vZGUqIG5vZGUpCiB7CiAgICAgREVGSU5FX1NUQVRJQ19M T0NBTChjb25zdCBBdG9taWNTdHJpbmcsIHBsdWdJblRpbnlTaXplQ2xhc3NOYW1lLCAoInRpbnki LCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiAgICAgREVGSU5FX1NUQVRJ Q19MT0NBTChjb25zdCBBdG9taWNTdHJpbmcsIHBsdWdJblNtYWxsU2l6ZUNsYXNzTmFtZSwgKCJz bWFsbCIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKICAgICBERUZJTkVf U1RBVElDX0xPQ0FMKGNvbnN0IEF0b21pY1N0cmluZywgcGx1Z0luTWVkaXVtU2l6ZUNsYXNzTmFt ZSwgKCJtZWRpdW0iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiAgICAg REVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJpbmcsIHBsdWdJbkxhcmdlU2l6ZUNs YXNzTmFtZSwgKCJsYXJnZSIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsK IAotICAgIExheW91dFJlY3QgcGx1Z0luQ2xpcFJlY3QgPSBub2RlLT5yZW5kZXJlcigpLT5hYnNv bHV0ZUNsaXBwZWRPdmVyZmxvd1JlY3QoKTsKLSAgICBMYXlvdXRSZWN0IHZpZXdDb250ZW50c1Jl Y3QoTGF5b3V0UG9pbnQ6Onplcm8oKSwgTGF5b3V0U2l6ZSh2aWV3Q29udGVudHNTaXplKSk7Ci0g ICAgaWYgKCF2aWV3Q29udGVudHNSZWN0LmNvbnRhaW5zKHBsdWdJbkNsaXBSZWN0KSkgewotICAg ICAgICBMT0coUGx1Z2lucywgIiVwIFBsdWctaW4gcmVjdDogKCVkICVkLCAlZCAlZCkgbm90IGNv bnRhaW5lZCBpbiBkb2N1bWVudCBvZiBzaXplICVkICVkIiwgbm9kZSwgcGx1Z0luQ2xpcFJlY3Qu cGl4ZWxTbmFwcGVkWCgpLCBwbHVnSW5DbGlwUmVjdC5waXhlbFNuYXBwZWRZKCksIHBsdWdJbkNs aXBSZWN0LnBpeGVsU25hcHBlZFdpZHRoKCksIHBsdWdJbkNsaXBSZWN0LnBpeGVsU25hcHBlZEhl aWdodCgpLCB2aWV3Q29udGVudHNTaXplLndpZHRoKCksIHZpZXdDb250ZW50c1NpemUuaGVpZ2h0 KCkpOwotICAgICAgICByZXR1cm4gbnVsbEF0b207Ci0gICAgfQorICAgIFJlbmRlckJveCogcmVu ZGVyQm94ID0gc3RhdGljX2Nhc3Q8UmVuZGVyQm94Kj4obm9kZS0+cmVuZGVyZXIoKSk7CisgICAg TGF5b3V0VW5pdCB3aWR0aCA9IHJlbmRlckJveC0+Y29udGVudFdpZHRoKCk7CisgICAgTGF5b3V0 VW5pdCBoZWlnaHQgPSByZW5kZXJCb3gtPmNvbnRlbnRIZWlnaHQoKTsKIAotICAgIGlmIChwbHVn SW5DbGlwUmVjdC5waXhlbFNuYXBwZWRXaWR0aCgpIDwgc2l6aW5nVGlueURpbWVuc2lvblRocmVz aG9sZCB8fCBwbHVnSW5DbGlwUmVjdC5waXhlbFNuYXBwZWRIZWlnaHQoKSA8IHNpemluZ1RpbnlE aW1lbnNpb25UaHJlc2hvbGQpIHsKLSAgICAgICAgTE9HKFBsdWdpbnMsICIlcCBUaW55IFNpemU6 ICVkICVkIiwgbm9kZSwgcGx1Z0luQ2xpcFJlY3QucGl4ZWxTbmFwcGVkV2lkdGgoKSwgcGx1Z0lu Q2xpcFJlY3QucGl4ZWxTbmFwcGVkSGVpZ2h0KCkpOworICAgIGlmICh3aWR0aCA8IHNpemluZ1Rp bnlEaW1lbnNpb25UaHJlc2hvbGQgfHwgaGVpZ2h0IDwgc2l6aW5nVGlueURpbWVuc2lvblRocmVz aG9sZCkKICAgICAgICAgcmV0dXJuIHBsdWdJblRpbnlTaXplQ2xhc3NOYW1lOwotICAgIH0KIAot ICAgIGlmIChwbHVnSW5DbGlwUmVjdC5waXhlbFNuYXBwZWRXaWR0aCgpIDwgc2l6aW5nU21hbGxX aWR0aFRocmVzaG9sZCkgewotICAgICAgICBMT0coUGx1Z2lucywgIiVwIFNtYWxsIFNpemU6ICVk ICVkIiwgbm9kZSwgcGx1Z0luQ2xpcFJlY3QucGl4ZWxTbmFwcGVkV2lkdGgoKSwgcGx1Z0luQ2xp cFJlY3QucGl4ZWxTbmFwcGVkSGVpZ2h0KCkpOworICAgIGlmICh3aWR0aCA8IHNpemluZ1NtYWxs V2lkdGhUaHJlc2hvbGQpCiAgICAgICAgIHJldHVybiBwbHVnSW5TbWFsbFNpemVDbGFzc05hbWU7 Ci0gICAgfQogCi0gICAgaWYgKHBsdWdJbkNsaXBSZWN0LnBpeGVsU25hcHBlZFdpZHRoKCkgPCBz aXppbmdNZWRpdW1XaWR0aFRocmVzaG9sZCkgewotICAgICAgICBMT0coUGx1Z2lucywgIiVwIE1l ZGl1bSBTaXplOiAlZCAlZCIsIG5vZGUsIHBsdWdJbkNsaXBSZWN0LnBpeGVsU25hcHBlZFdpZHRo KCksIHBsdWdJbkNsaXBSZWN0LnBpeGVsU25hcHBlZEhlaWdodCgpKTsKKyAgICBpZiAod2lkdGgg PCBzaXppbmdNZWRpdW1XaWR0aFRocmVzaG9sZCB8fCBoZWlnaHQgPCBzaXppbmdNZWRpdW1IZWln aHRUaHJlc2hvbGQpCiAgICAgICAgIHJldHVybiBwbHVnSW5NZWRpdW1TaXplQ2xhc3NOYW1lOwot ICAgIH0KIAogICAgIHJldHVybiBwbHVnSW5MYXJnZVNpemVDbGFzc05hbWU7CiB9CkBAIC0zMzUs NyArMzIwLDcgQEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp1cGRhdGVTbmFwc2hvdElu Zm8oKQogICAgICAgICByZXR1cm47CiAKICAgICBFbGVtZW50KiBzaGFkb3dDb250YWluZXIgPSBz dGF0aWNfY2FzdDxFbGVtZW50Kj4ocm9vdC0+Zmlyc3RDaGlsZCgpKTsKLSAgICBzaGFkb3dDb250 YWluZXItPnNldEF0dHJpYnV0ZShjbGFzc0F0dHIsIGNsYXNzTmFtZUZvclNoYWRvd1Jvb3RTaXpl KGRvY3VtZW50KCktPnBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+Y29udGVudHNTaXplKCks IHRoaXMpKTsgICAKKyAgICBzaGFkb3dDb250YWluZXItPnNldEF0dHJpYnV0ZShjbGFzc0F0dHIs IGNsYXNzTmFtZUZvclNoYWRvd1Jvb3QodGhpcykpOwogfQogCiB2b2lkIEhUTUxQbHVnSW5JbWFn ZUVsZW1lbnQ6OmRpZEFkZFVzZXJBZ2VudFNoYWRvd1Jvb3QoU2hhZG93Um9vdCogcm9vdCkKQEAg LTQxOSwyNSArNDA0LDYgQEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpzaW11bGF0ZWRN b3VzZUNsaWNrVGltZXJGaXJlZChEZWZlcnJhYmxlT25lU2hvdFRpbWUKICAgICBtX3BlbmRpbmdD bGlja0V2ZW50RnJvbVNuYXBzaG90ID0gbnVsbHB0cjsKIH0KIAotc3RhdGljIGJvb2wgc2hvdWxk UGx1Z0luU2hvd0xhYmVsQXV0b21hdGljYWxseShjb25zdCBJbnRTaXplJiB2aWV3Q29udGVudHNT aXplLCBjb25zdCBOb2RlKiBub2RlKQotewotICAgIExheW91dFJlY3QgcGx1Z0luQ2xpcFJlY3Qg PSBub2RlLT5yZW5kZXJlcigpLT5hYnNvbHV0ZUNsaXBwZWRPdmVyZmxvd1JlY3QoKTsKLSAgICBM YXlvdXRSZWN0IHZpZXdDb250ZW50c1JlY3QoTGF5b3V0UG9pbnQ6Onplcm8oKSwgTGF5b3V0U2l6 ZSh2aWV3Q29udGVudHNTaXplKSk7Ci0gICAgaWYgKCF2aWV3Q29udGVudHNSZWN0LmNvbnRhaW5z KHBsdWdJbkNsaXBSZWN0KSkgewotICAgICAgICBMT0coUGx1Z2lucywgIiVwIFBsdWctaW4gcmVj dDogKCVkICVkLCAlZCAlZCkgbm90IGNvbnRhaW5lZCBpbiBkb2N1bWVudCBvZiBzaXplICVkICVk Iiwgbm9kZSwgcGx1Z0luQ2xpcFJlY3QucGl4ZWxTbmFwcGVkWCgpLCBwbHVnSW5DbGlwUmVjdC5w aXhlbFNuYXBwZWRZKCksIHBsdWdJbkNsaXBSZWN0LnBpeGVsU25hcHBlZFdpZHRoKCksIHBsdWdJ bkNsaXBSZWN0LnBpeGVsU25hcHBlZEhlaWdodCgpLCB2aWV3Q29udGVudHNTaXplLndpZHRoKCks IHZpZXdDb250ZW50c1NpemUuaGVpZ2h0KCkpOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg fQotCi0gICAgaWYgKHBsdWdJbkNsaXBSZWN0LnBpeGVsU25hcHBlZFdpZHRoKCkgPCBhdXRvU2hv d0xhYmVsU2l6ZVdpZHRoVGhyZXNob2xkCi0gICAgICAgIHx8IHBsdWdJbkNsaXBSZWN0LnBpeGVs U25hcHBlZEhlaWdodCgpIDwgYXV0b1Nob3dMYWJlbFNpemVIZWlnaHRUaHJlc2hvbGQpIHsKLSAg ICAgICAgTE9HKFBsdWdpbnMsICIlcCBTaXplOiAlZCAlZCIsIG5vZGUsIHBsdWdJbkNsaXBSZWN0 LnBpeGVsU25hcHBlZFdpZHRoKCksIHBsdWdJbkNsaXBSZWN0LnBpeGVsU25hcHBlZEhlaWdodCgp KTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLQotICAgIExPRyhQbHVnaW5zLCAiJXAg QXV0by1zaG93IGxhYmVsIiwgbm9kZSk7Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIHZvaWQgSFRN TFBsdWdJbkltYWdlRWxlbWVudDo6c3ViZnJhbWVMb2FkZXJXaWxsQ3JlYXRlUGx1Z0luKGNvbnN0 IEtVUkwmIHVybCkKIHsKICAgICBpZiAoIWRvY3VtZW50KCktPnBhZ2UoKQpAQCAtNDU3LDcgKzQy Myw3IEBAIHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c3ViZnJhbWVMb2FkZXJXaWxsQ3Jl YXRlUGx1Z0luKGNvbnN0IEtVUkwmIHVybCkKICAgICBMYXlvdXRSZWN0IHJlY3QgPSB0b1JlbmRl ckVtYmVkZGVkT2JqZWN0KHJlbmRlcmVyKCkpLT5jb250ZW50Qm94UmVjdCgpOwogICAgIGludCB3 aWR0aCA9IHJlY3Qud2lkdGgoKTsKICAgICBpbnQgaGVpZ2h0ID0gcmVjdC5oZWlnaHQoKTsKLSAg ICBpZiAoIXdpZHRoIHx8ICFoZWlnaHQgfHwgKHdpZHRoIDw9IGF1dG9TdGFydFBsdWdJblNpemVE aW1lbnNpb25UaHJlc2hvbGQgJiYgaGVpZ2h0IDw9IGF1dG9TdGFydFBsdWdJblNpemVEaW1lbnNp b25UaHJlc2hvbGQpKSB7CisgICAgaWYgKCF3aWR0aCB8fCAhaGVpZ2h0IHx8ICh3aWR0aCA8PSBz aXppbmdUaW55RGltZW5zaW9uVGhyZXNob2xkIHx8IGhlaWdodCA8PSBzaXppbmdUaW55RGltZW5z aW9uVGhyZXNob2xkKSkgewogICAgICAgICBMT0coUGx1Z2lucywgIiVwIFBsdWctaW4gaXMgJWR4 JWQsIHNldCB0byBwbGF5IiwgdGhpcywgd2lkdGgsIGhlaWdodCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CkBAIC00NzYsOSArNDQyLDYgQEAgdm9pZCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojpz dWJmcmFtZUxvYWRlcldpbGxDcmVhdGVQbHVnSW4oY29uc3QgS1VSTCYgdXJsKQogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgaWYgKHNob3VsZFBsdWdJblNob3dMYWJlbEF1dG9tYXRpY2Fs bHkoZG9jdW1lbnQoKS0+cGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpLT5jb250ZW50c1NpemUo KSwgdGhpcykpCi0gICAgICAgIHNldFNob3VsZFNob3dTbmFwc2hvdExhYmVsQXV0b21hdGljYWxs eSgpOwotCiAgICAgTE9HKFBsdWdpbnMsICIlcCBQbHVnLWluIGhhc2ggJXggaXMgJWR4JWQsIG9y aWdpbiBpcyBub3QgYXV0by1zdGFydCwgc2V0IHRvIHdhaXQgZm9yIHNuYXBzaG90IiwgdGhpcywg bV9wbHVnSW5PcmlnaW5IYXNoLCB3aWR0aCwgaGVpZ2h0KTsKICAgICAvLyBXZSBtYXkgaGF2ZSBn b3QgdG8gdGhpcyBwb2ludCBieSByZXN0YXJ0aW5nIGEgc25hcHNob3R0ZWQgcGx1Zy1pbiwgaW4g d2hpY2ggY2FzZSB3ZSBkb24ndCB3YW50IHRvCiAgICAgLy8gcmVzZXQgdGhlIGRpc3BsYXkgc3Rh dGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5JbWFnZUVsZW1l bnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oCmluZGV4 IDY3MzVkY2JhM2I3Mjk1NThlZTZiMWJiYzQ5Yjg4N2NmZTU5MGE0YzQuLmU2YTNmZTlmYjY1Nzcz YTY2MWM2YjdkZTZhNTNhNzIwMGM0NGUxZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TFBsdWdJbkltYWdlRWxlbWVudC5oCkBAIC0xMTEsMTIgKzExMSw5IEBAIHByaXZhdGU6CiAKICAg ICB2b2lkIHN3YXBSZW5kZXJlclRpbWVyRmlyZWQoVGltZXI8SFRNTFBsdWdJbkltYWdlRWxlbWVu dD4qKTsKIAotICAgIHZvaWQgc2V0U2hvdWxkU2hvd1NuYXBzaG90TGFiZWxBdXRvbWF0aWNhbGx5 KCkgeyBtX3Nob3VsZFNob3dTbmFwc2hvdExhYmVsQXV0b21hdGljYWxseSA9IHRydWU7IH0KLQog ICAgIGJvb2wgbV9uZWVkc1dpZGdldFVwZGF0ZTsKICAgICBib29sIG1fc2hvdWxkUHJlZmVyUGx1 Z0luc0ZvckltYWdlczsKICAgICBib29sIG1fbmVlZHNEb2N1bWVudEFjdGl2YXRpb25DYWxsYmFj a3M7Ci0gICAgYm9vbCBtX3Nob3VsZFNob3dTbmFwc2hvdExhYmVsQXV0b21hdGljYWxseTsKICAg ICBSZWZQdHI8UmVuZGVyU3R5bGU+IG1fY3VzdG9tU3R5bGVGb3JQYWdlQ2FjaGU7CiAgICAgUmVm UHRyPE1vdXNlRXZlbnQ+IG1fcGVuZGluZ0NsaWNrRXZlbnRGcm9tU25hcHNob3Q7CiAgICAgRGVm ZXJyYWJsZU9uZVNob3RUaW1lcjxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50PiBtX3NpbXVsYXRlZE1v dXNlQ2xpY2tUaW1lcjsK