119469 2013-08-03 12:30:02 -0700 Loading a video with a custom URL scheme will result in stalling playback 2013-08-05 08:29:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn oldest_to_newest 914388 0 jer.noble 2013-08-03 12:30:02 -0700 Loading a video with a custom URL scheme will result in stalling playback 914389 1 jer.noble 2013-08-03 12:30:18 -0700 <rdar://problem/14637544> 914391 2 208070 jer.noble 2013-08-03 12:34:51 -0700 Created attachment 208070 Patch 914493 3 208070 eric.carlson 2013-08-04 17:53:48 -0700 Comment on attachment 208070 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208070&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:961 > +void MediaPlayerPrivateAVFoundationObjC::didStopLoadingRequest(AVAssetResourceLoadingRequest* avRequest) Nit: AVAssetResourceLoadingRequest is an ObjC type so the "*" should be next to the variable. > Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.h:49 > + static PassRefPtr<WebCoreAVFResourceLoader> create(MediaPlayerPrivateAVFoundationObjC* parent, AVAssetResourceLoadingRequest*); Super nit-pick: there should be a space between "AVAssetResourceLoadingRequest" and "*" . > Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:46 > +PassRefPtr<WebCoreAVFResourceLoader> WebCoreAVFResourceLoader::create(MediaPlayerPrivateAVFoundationObjC* parent, AVAssetResourceLoadingRequest* avRequest) Ditto. > Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:53 > WebCoreAVFResourceLoader::WebCoreAVFResourceLoader(MediaPlayerPrivateAVFoundationObjC* parent, AVAssetResourceLoadingRequest* avRequest) Ditto. 914587 4 jer.noble 2013-08-05 08:29:04 -0700 Committed r153706: <http://trac.webkit.org/changeset/153706> 208070 2013-08-03 12:34:51 -0700 2013-08-04 17:53:48 -0700 Patch bug-119469-20130803123450.patch text/plain 7839 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyOTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDIwYzJkNjllMzE3M2Jh MjhjNTA4YWE2MmIwOTczYThjZTk4ZWVlNC4uNGRkZjlkNWRiODYzNzY0Y2NhYzQyODE1NmZjMTBl N2QwZjY5YzU0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA4LTAzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIExvYWRpbmcgYSB2aWRlbyB3 aXRoIGEgY3VzdG9tIFVSTCBzY2hlbWUgd2lsbCByZXN1bHQgaW4gc3RhbGxpbmcgcGxheWJhY2sK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTQ2OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJyZWFrIHRo ZSBhc3N1bXB0aW9uIHRoYXQgb25seSBvbmUgQVZBc3NldFJlc291cmNlUmVxdWVzdCB3aWxsIGJl IG91dHN0YW5kaW5nIHNpbXVsdGFuZW91c2x5CisgICAgICAgIGJ5IHN0b3JpbmcgYSBIYXNoTWFw IG9mIEFWQXNzZXRSZXNvdXJjZVJlcXVlc3RzIGFuZCB0aGVpciByZXN1bHRpbmcgV2ViQ29yZUFW RlJlc291cmNlTG9hZGVyLgorICAgICAgICBXaGVuIGxvYWRpbmcgaXMgc3RvcHBlZCAoZHVlIHRv IGNvbXBsZXRpb24gb3IgZXJyb3IpLCBub3RpZnkgdGhlIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbgorICAgICAgICBwYXJlbnQgc28gdGhhdCB0aGUgbWFwIGNhbiBiZSBlbXB0aWVkLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpz aG91bGRXYWl0Rm9yTG9hZGluZ09mUmVzb3VyY2UpOiBTdG9yZSB0aGUgcmVxdWVzdAorICAgICAg ICAgICAgaW4gbV9yZXNvdXJjZUxvYWRlck1hcC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmRpZENhbmNlbExvYWRpbmdSZXF1ZXN0KTogUHVs bCB0aGUgcmVxdWVzdCBmcm9tCisgICAgICAgICAgICBtX3Jlc291cmNlTG9hZGVyTWFwLgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6ZGlkU3Rv cExvYWRpbmdSZXF1ZXN0KTogUmVtb3ZlIHRoZSByZXF1c2V0IGZyb20KKyAgICAgICAgICAgIG1f cmVzb3VyY2VMb2FkZXJNYXAuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tOgor ICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpjcmVhdGUpOiBSZXR1 cm4gYSBQYXNzUmVmUHRyLCByYXRoZXIgdGhhbiBhIFBhc3NPd25QdHIuCisgICAgICAgIChXZWJD b3JlOjpXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI6OnN0b3BMb2FkaW5nKTogQ2FsbCBkaWRTdG9w TG9hZGluZ1JlcXVlc3QuCisKIDIwMTMtMDctMTkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBs ZS5jb20+CiAKICAgICAgICAgUGFnaW5hdGlvbjogRG8gbm90IHBhaW50IHRoZSBiYXNlQmFja2dy b3VuZENvbG9yIGlmIGFza2VkIHRvIHNraXBSb290QmFja2dyb3VuZC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akMuaAppbmRleCBjYmEwOTZhZjRlNWEzMGNjOTQ0YmYwMGQ0ZDlhMGNkNDc4ZjMxMDZjLi45Mjhm MzkzNGJmNWYyZGEwNGE5MWYzYjJmMjk1MDgxZjk1YjExNzhlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qy5oCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KIAogT0JKQ19D TEFTUyBBVkFzc2V0SW1hZ2VHZW5lcmF0b3I7CitPQkpDX0NMQVNTIEFWQXNzZXRSZXNvdXJjZUxv YWRpbmdSZXF1ZXN0OwogT0JKQ19DTEFTUyBBVk1lZGlhU2VsZWN0aW9uR3JvdXA7CiBPQkpDX0NM QVNTIEFWUGxheWVyOwogT0JKQ19DTEFTUyBBVlBsYXllckl0ZW07CkBAIC03Nyw2ICs3OCw3IEBA IHB1YmxpYzoKICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKICAg ICBib29sIHNob3VsZFdhaXRGb3JMb2FkaW5nT2ZSZXNvdXJjZShBVkFzc2V0UmVzb3VyY2VMb2Fk aW5nUmVxdWVzdCopOwogICAgIHZvaWQgZGlkQ2FuY2VsTG9hZGluZ1JlcXVlc3QoQVZBc3NldFJl c291cmNlTG9hZGluZ1JlcXVlc3QqKTsKKyAgICB2b2lkIGRpZFN0b3BMb2FkaW5nUmVxdWVzdChB VkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVxdWVzdCopOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoRU5D UllQVEVEX01FRElBKSB8fCBFTkFCTEUoRU5DUllQVEVEX01FRElBX1YyKQpAQCAtMjAxLDcgKzIw Myw3IEBAIHByaXZhdGU6CiAgICAgUmV0YWluUHRyPFZUUGl4ZWxUcmFuc2ZlclNlc3Npb25SZWY+ IG1fcGl4ZWxUcmFuc2ZlclNlc3Npb247CiAKICAgICBmcmllbmQgY2xhc3MgV2ViQ29yZUFWRlJl c291cmNlTG9hZGVyOwotICAgIE93blB0cjxXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI+IG1fcmVz b3VyY2VMb2FkZXI7CisgICAgSGFzaE1hcDxSZXRhaW5QdHI8QVZBc3NldFJlc291cmNlTG9hZGlu Z1JlcXVlc3Q+LCBSZWZQdHI8V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyPiA+IG1fcmVzb3VyY2VM b2FkZXJNYXA7CiAgICAgUmV0YWluUHRyPFdlYkNvcmVBVkZMb2FkZXJEZWxlZ2F0ZT4gbV9sb2Fk ZXJEZWxlZ2F0ZTsKICAgICBIYXNoTWFwPFN0cmluZywgUmV0YWluUHRyPEFWQXNzZXRSZXNvdXJj ZUxvYWRpbmdSZXF1ZXN0PiA+IG1fa2V5VVJJVG9SZXF1ZXN0TWFwOwogICAgIEhhc2hNYXA8U3Ry aW5nLCBSZXRhaW5QdHI8QVZBc3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3Q+ID4gbV9zZXNzaW9u SURUb1JlcXVlc3RNYXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCA1M2QxMmFjMzlhZWI3 MjFlMWE3OGYyNjc3MzU4Y2E5NWZhYmFmYzk1Li5hNjk1ZDUwNGFiYmQ4ZGNmZGZiYzc5YjE5NmQ3 MjFmZTNiMWQzYWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTk0Miw4ICs5NDIsOSBA QCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnNob3VsZFdhaXRGb3JM b2FkaW5nT2ZSZXNvdXJjZShBVkFzc2V0UgogICAgIH0KICNlbmRpZgogCi0gICAgbV9yZXNvdXJj ZUxvYWRlciA9IFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6Y3JlYXRlKHRoaXMsIGF2UmVxdWVz dCk7Ci0gICAgbV9yZXNvdXJjZUxvYWRlci0+c3RhcnRMb2FkaW5nKCk7CisgICAgUmVmUHRyPFdl YkNvcmVBVkZSZXNvdXJjZUxvYWRlcj4gcmVzb3VyY2VMb2FkZXIgPSBXZWJDb3JlQVZGUmVzb3Vy Y2VMb2FkZXI6OmNyZWF0ZSh0aGlzLCBhdlJlcXVlc3QpOworICAgIG1fcmVzb3VyY2VMb2FkZXJN YXAuYWRkKGF2UmVxdWVzdCwgcmVzb3VyY2VMb2FkZXIpOworICAgIHJlc291cmNlTG9hZGVyLT5z dGFydExvYWRpbmcoKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtOTUxLDggKzk1MiwxNSBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmRpZENhbmNlbExvYWRp bmdSZXF1ZXN0KEFWQXNzZXRSZXNvdXJjZQogewogICAgIFN0cmluZyBzY2hlbWUgPSBbW1thdlJl cXVlc3QgcmVxdWVzdF0gVVJMXSBzY2hlbWVdOwogCi0gICAgaWYgKG1fcmVzb3VyY2VMb2FkZXIp Ci0gICAgICAgIG1fcmVzb3VyY2VMb2FkZXItPnN0b3BMb2FkaW5nKCk7CisgICAgV2ViQ29yZUFW RlJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciA9IG1fcmVzb3VyY2VMb2FkZXJNYXAuZ2V0 KGF2UmVxdWVzdCk7CisKKyAgICBpZiAocmVzb3VyY2VMb2FkZXIpCisgICAgICAgIHJlc291cmNl TG9hZGVyLT5zdG9wTG9hZGluZygpOworfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakM6OmRpZFN0b3BMb2FkaW5nUmVxdWVzdChBVkFzc2V0UmVzb3VyY2VMb2FkaW5n UmVxdWVzdCogYXZSZXF1ZXN0KQoreworICAgIG1fcmVzb3VyY2VMb2FkZXJNYXAucmVtb3ZlKGF2 UmVxdWVzdCk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJD b3JlQVZGUmVzb3VyY2VMb2FkZXIuaAppbmRleCA4Y2U4OTgwODAxNzg0MTVhOTY4N2ZmNDIzMzBh MDJlYzYwZTk3YTEyLi40YmJiZGFlYzlkOGExNzc2MzM2OGYyMDU0NTc3MjY2ZTcyOTBiZDQ5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIu aApAQCAtMzEsNyArMzEsOCBAQAogI2luY2x1ZGUgIkNhY2hlZFJhd1Jlc291cmNlQ2xpZW50Lmgi CiAjaW5jbHVkZSAiQ2FjaGVkUmVzb3VyY2VIYW5kbGUuaCIKICNpbmNsdWRlIDx3dGYvTm9uY29w eWFibGUuaD4KLSNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgorI2luY2x1ZGUgPHd0Zi9QYXNz UmVmUHRyLmg+CisjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmV0 YWluUHRyLmg+CiAKIE9CSkNfQ0xBU1MgQVZBc3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3Q7CkBA IC00MiwxMCArNDMsMTAgQEAgY2xhc3MgQ2FjaGVkUmF3UmVzb3VyY2U7CiBjbGFzcyBDYWNoZWRS ZXNvdXJjZUxvYWRlcjsKIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM7 CiAKLWNsYXNzIFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlciA6IHB1YmxpYyBDYWNoZWRSYXdSZXNv dXJjZUNsaWVudCB7CitjbGFzcyBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIgOiBwdWJsaWMgUmVm Q291bnRlZDxXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI+LCBDYWNoZWRSYXdSZXNvdXJjZUNsaWVu dCB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyKTsg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8 V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyPiBjcmVhdGUoTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQyogcGFyZW50LCBBVkFzc2V0UmVzb3VyY2VMb2FkaW5nUmVxdWVzdCopOworICAg IHN0YXRpYyBQYXNzUmVmUHRyPFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcj4gY3JlYXRlKE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMqIHBhcmVudCwgQVZBc3NldFJlc291cmNlTG9h ZGluZ1JlcXVlc3QqKTsKICAgICB2aXJ0dWFsIH5XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIoKTsK IAogICAgIHZvaWQgc3RhcnRMb2FkaW5nKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2Fk ZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KaW5kZXggODU2MDY4NTVkMmUzMjVkYTMwZDQw MmQwN2IyOTY3ZDAzZmQwMjAzNS4uMGJlY2MxZGNlNzcwMmNmZGU0Yjc5Y2I5YzdhZmY1ODc5ZGY0 N2ZlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJj ZUxvYWRlci5tbQpAQCAtNDMsMTEgKzQzLDExIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot UGFzc093blB0cjxXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI+IFdlYkNvcmVBVkZSZXNvdXJjZUxv YWRlcjo6Y3JlYXRlKE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMqIHBhcmVudCwg QVZBc3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3QqIGF2UmVxdWVzdCkKK1Bhc3NSZWZQdHI8V2Vi Q29yZUFWRlJlc291cmNlTG9hZGVyPiBXZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDKiBwYXJlbnQsIEFWQXNzZXRSZXNvdXJj ZUxvYWRpbmdSZXF1ZXN0KiBhdlJlcXVlc3QpCiB7CiAgICAgQVNTRVJUKGF2UmVxdWVzdCk7CiAg ICAgQVNTRVJUKHBhcmVudCk7Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBXZWJDb3JlQVZGUmVz b3VyY2VMb2FkZXIocGFyZW50LCBhdlJlcXVlc3QpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3 IFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcihwYXJlbnQsIGF2UmVxdWVzdCkpOwogfQogCiBXZWJD b3JlQVZGUmVzb3VyY2VMb2FkZXI6OldlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcihNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDKiBwYXJlbnQsIEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdS ZXF1ZXN0KiBhdlJlcXVlc3QpCkBAIC04OCw2ICs4OCw4IEBAIHZvaWQgV2ViQ29yZUFWRlJlc291 cmNlTG9hZGVyOjpzdG9wTG9hZGluZygpCiAKICAgICBtX3Jlc291cmNlLT5yZW1vdmVDbGllbnQo dGhpcyk7CiAgICAgbV9yZXNvdXJjZSA9IDA7CisKKyAgICBtX3BhcmVudC0+ZGlkU3RvcExvYWRp bmdSZXF1ZXN0KG1fYXZSZXF1ZXN0LmdldCgpKTsKIH0KIAogdm9pZCBXZWJDb3JlQVZGUmVzb3Vy Y2VMb2FkZXI6OnJlc3BvbnNlUmVjZWl2ZWQoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlLCBjb25z dCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkK