30343 2009-10-13 15:06:26 -0700 [v8] typeof(HTMLMediaElement) should return undefined if media engine is not available 2009-10-19 17:00:03 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hclam hclam abarth atwilson dglazkov eric.carlson eric levin oldest_to_newest 154455 0 hclam 2009-10-13 15:06:26 -0700 In Chromium: 1. Remove all ffmpeg library files 2. Run Chromium 3. Open a page and does typeof(HTMLMediaElement), it should return undefined, but it returns "function" instead. In the v8 binding we should check if the media engine and intercept such calls and returns undefined. 154486 1 41138 hclam 2009-10-13 16:27:17 -0700 Created attachment 41138 Patch This patch passes try servers on chromium side. 154858 2 41138 eric 2009-10-15 12:02:23 -0700 Comment on attachment 41138 Patch Every change requires a test: "No new test because this is V8 specific." makes no sense. 154873 3 41240 hclam 2009-10-15 12:59:01 -0700 Created attachment 41240 patch Providing a manual test. 154888 4 eric 2009-10-15 13:44:30 -0700 OK. I misunderstood how one would reproduce this. I guess I didn't read the bug close enough. Yes, I think it's better to have the manual test, but I now understand why you didn't have a test initially. It would also of course be possible to override MediaPlayer::isAvailable() via some layoutTestController method, but a manual test is OK in this case. I think a v8-enabled reviewer should review this though. 154889 5 dglazkov 2009-10-15 13:47:43 -0700 Didn't atwilson just do this? 154891 6 atwilson 2009-10-15 13:59:40 -0700 I changed window.Audio, and did nothing for HTMLMediaElement or any other constructors, as I was not aware that this was the desired behavior. Just returning undefined for the constructor is incorrect - you should instead follow the example for window.Audio, which actually removes the associated attribute from the window object. Case in point: with the patch attached to this bug, "typeof HTMLMediaElement === 'undefined'", but "'HTMLMediaElement' in window" would still return true. If you follow the approach I used for window.Audio, then you'd get the correct behavior in both cases. Take a look here: https://bugs.webkit.org/show_bug.cgi?id=30240 154892 7 hclam 2009-10-15 14:02:01 -0700 Great, I'll also change the tests accordingly. 154955 8 41254 hclam 2009-10-15 17:25:01 -0700 Created attachment 41254 Patch + manual test case 155227 9 hclam 2009-10-16 14:15:45 -0700 I've uploaded a new patch does similar things according to atwilson. Please take a look. Thanks. 155283 10 atwilson 2009-10-16 15:37:13 -0700 This looks fine to me (although someone with reviewer bit needs to r+ it) - only comment is that ideally the test would include testing that ('HTMLMediaElement' in window) == false. 155819 11 41254 dglazkov 2009-10-19 12:16:12 -0700 Comment on attachment 41254 Patch + manual test case > + attribute [Conditional=VIDEO,EnabledAtRuntime] HTMLAudioElementConstructor HTMLAudioElement; > + attribute [Conditional=VIDEO,EnabledAtRuntime] HTMLMediaElementConstructor HTMLMediaElement; > + attribute [Conditional=VIDEO,EnabledAtRuntime] HTMLVideoElementConstructor HTMLVideoElement; > + attribute [Conditional=VIDEO,EnabledAtRuntime] MediaErrorConstructor MediaError; Space between IDL attributes would be nice for readability. You can fix upon landing. 155983 12 hclam 2009-10-19 17:00:03 -0700 Landed as http://trac.webkit.org/changeset/49803. 41138 2009-10-13 16:27:17 -0700 2009-10-15 12:59:01 -0700 Patch webkit-media-v8.patch text/plain 1839 hclam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTFjMzNhYi4uYTM5YTVhYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAwOS0xMC0xMyAgQWxwaGEgTGFtICA8 aGNsYW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFt2OF0gdHlwZW9mKEhUTUxNZWRpYUVsZW1lbnQpIHNob3VsZCByZXR1cm4g dW5kZWZpbmVkIGlmIG1lZGlhCisgICAgICAgIGVuZ2luZSBpcyBub3QgYXZhaWxhYmxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDM0MworCisgICAg ICAgIENoZWNrIGZvciBjb25kaXRpb25zIG9mIEhUTUxNZWRpYUVsZW1lbnQsIEhUTUxWaWRlb0Vs ZW1lbnQsCisgICAgICAgIEhUTUxBdWRpb0VsZW1lbnQgYW5kIHRoZSBhdmFpbGFiaWxpdHkgb2Yg dGhlIG1lZGlhIGVuZ2luZS4KKworICAgICAgICBUcnkgcnVucyBhbmQgcmV2aWV3IGluIENocm9t aXVtOgorICAgICAgICBodHRwOi8vY29kZXJldmlldy5jaHJvbWl1bS5vcmcvMjc2MDExCisKKyAg ICAgICAgTm8gbmV3IHRlc3QgYmVjYXVzZSB0aGlzIGlzIFY4IHNwZWNpZmljLgorCisgICAgICAg ICogYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4RE9N V3JhcHBlcjo6Z2V0Q29uc3RydWN0b3IpOgorICAgICAgICBDaGVjayB0aGUgYXZhaWxhYmlsaXR5 IG9mIG1lZGlhIGVuZ2luZS4KKwogMjAwOS0xMC0xMiAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXpr b3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vIHJldmlldywgcm9sbGluZyBvdXQgcjQ5NDI5 LCBiZWNhdXNlIGl0IGJyb2tlIGxheW91dCB0ZXN0cy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmlu ZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFw cGVyLmNwcAppbmRleCA3Y2JhMjM0Li44ZTVlOTM3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4RE9NV3JhcHBlci5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdy YXBwZXIuY3BwCkBAIC01ODksNiArNTg5LDE3IEBAIHY4OjpMb2NhbDx2ODo6RnVuY3Rpb24+IFY4 RE9NV3JhcHBlcjo6Z2V0Q29uc3RydWN0b3IoVjhDbGFzc0luZGV4OjpWOFdyYXBwZXJUeXBlCiAg ICAgfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoVklERU8pCisgICAgLy8gTWFrZSB0eXBlb2YoSFRN TE1lZGlhRWxlbWVudCksIHR5cGVvZihIVE1MVmlkZW9FbGVtZW50KSwgdHlwZW9mKEhUTUxBdWRp b0VsZW1lbnQpCisgICAgLy8gcmV0dXJuIHVuZGVmaW5lZCB3aGVuIE1lZGlhUGxheWVyOjppc0F2 YWlsYWJsZSgpIGlzIGZhbHNlLgorICAgIGlmICh0eXBlID09IFY4Q2xhc3NJbmRleDo6SFRNTE1F RElBRUxFTUVOVAorICAgICAgICB8fCB0eXBlID09IFY4Q2xhc3NJbmRleDo6SFRNTFZJREVPRUxF TUVOVAorICAgICAgICB8fCB0eXBlID09IFY4Q2xhc3NJbmRleDo6SFRNTEFVRElPRUxFTUVOVCkg eworICAgICAgICBpZiAoIU1lZGlhUGxheWVyOjppc0F2YWlsYWJsZSgpKQorICAgICAgICAgICAg cmV0dXJuIHY4OjpMb2NhbDx2ODo6RnVuY3Rpb24+KCk7CisgICAgfQorI2VuZGlmCisKICAgICB2 ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0ID0gVjhQcm94eTo6Y29udGV4dChmcmFtZSk7 CiAgICAgaWYgKGNvbnRleHQuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gdjg6OkxvY2FsPHY4 OjpGdW5jdGlvbj4oKTsK 41240 2009-10-15 12:59:01 -0700 2009-10-15 17:25:01 -0700 patch webkit-media-v8.patch text/plain 3270 hclam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTFjMzNhYi4uMWZiNmQwOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAwOS0xMC0xMyAgQWxwaGEgTGFtICA8 aGNsYW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFt2OF0gdHlwZW9mKEhUTUxNZWRpYUVsZW1lbnQpIHNob3VsZCByZXR1cm4g dW5kZWZpbmVkIGlmIG1lZGlhCisgICAgICAgIGVuZ2luZSBpcyBub3QgYXZhaWxhYmxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDM0MworCisgICAg ICAgIENoZWNrIGZvciBjb25kaXRpb25zIG9mIEhUTUxNZWRpYUVsZW1lbnQsIEhUTUxWaWRlb0Vs ZW1lbnQsCisgICAgICAgIEhUTUxBdWRpb0VsZW1lbnQgYW5kIHRoZSBhdmFpbGFiaWxpdHkgb2Yg dGhlIG1lZGlhIGVuZ2luZS4KKworICAgICAgICBUcnkgcnVucyBhbmQgcmV2aWV3IGluIENocm9t aXVtOgorICAgICAgICBodHRwOi8vY29kZXJldmlldy5jaHJvbWl1bS5vcmcvMjc2MDExCisKKyAg ICAgICAgVGVzdDogbWFudWFsPXRlc3RzL2Nocm9taXVtL3ZpZGVvLXR5cGVvZi5odG1sCisKKyAg ICAgICAgVGhlIGFib3ZlIHRlc3QgY2FuIHdvcmsgaW4gQ2hyb21pdW0uIFRlc3RpbmcgcHJvY2Vk dXJlczoKKyAgICAgICAgMS4gUmVtb3ZlIGFsbCBtZWRpYSBzdXBwb3J0IGxpYnJhcmllcyBpbiBD aHJvbWl1bSAoZS5nLiBmZm1wZWcgbGlicmFyaWVzKQorICAgICAgICAyLiBPcGVuIENocm9taXVt IHdpdGggYWJvdmUgdGVzdCBwYWdlCisgICAgICAgIDMuIFZlcmlmeSB0aGUgdGVzdCByZXN1bHRz IGFjY29yZGluZyB0byB0aGUgdGVzdCBwYWdlCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOERP TVdyYXBwZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhET01XcmFwcGVyOjpnZXRDb25zdHJ1 Y3Rvcik6CisgICAgICAgIENoZWNrIHRoZSBhdmFpbGFiaWxpdHkgb2YgbWVkaWEgZW5naW5lLgor ICAgICAgICAqIG1hbnVhbC10ZXN0cy9jaHJvbWl1bS92aWRlby10eXBlb2YuaHRtbDogQWRkZWQu CisKIDIwMDktMTAtMTIgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K IAogICAgICAgICBObyByZXZpZXcsIHJvbGxpbmcgb3V0IHI0OTQyOSwgYmVjYXVzZSBpdCBicm9r ZSBsYXlvdXQgdGVzdHMuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3Jh cHBlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV3JhcHBlci5jcHAKaW5kZXggN2Ni YTIzNC4uOGU1ZTkzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdyYXBw ZXIuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01XcmFwcGVyLmNwcApAQCAtNTg5 LDYgKzU4OSwxNyBAQCB2ODo6TG9jYWw8djg6OkZ1bmN0aW9uPiBWOERPTVdyYXBwZXI6OmdldENv bnN0cnVjdG9yKFY4Q2xhc3NJbmRleDo6VjhXcmFwcGVyVHlwZQogICAgIH0KICNlbmRpZgogCisj aWYgRU5BQkxFKFZJREVPKQorICAgIC8vIE1ha2UgdHlwZW9mKEhUTUxNZWRpYUVsZW1lbnQpLCB0 eXBlb2YoSFRNTFZpZGVvRWxlbWVudCksIHR5cGVvZihIVE1MQXVkaW9FbGVtZW50KQorICAgIC8v IHJldHVybiB1bmRlZmluZWQgd2hlbiBNZWRpYVBsYXllcjo6aXNBdmFpbGFibGUoKSBpcyBmYWxz ZS4KKyAgICBpZiAodHlwZSA9PSBWOENsYXNzSW5kZXg6OkhUTUxNRURJQUVMRU1FTlQKKyAgICAg ICAgfHwgdHlwZSA9PSBWOENsYXNzSW5kZXg6OkhUTUxWSURFT0VMRU1FTlQKKyAgICAgICAgfHwg dHlwZSA9PSBWOENsYXNzSW5kZXg6OkhUTUxBVURJT0VMRU1FTlQpIHsKKyAgICAgICAgaWYgKCFN ZWRpYVBsYXllcjo6aXNBdmFpbGFibGUoKSkKKyAgICAgICAgICAgIHJldHVybiB2ODo6TG9jYWw8 djg6OkZ1bmN0aW9uPigpOworICAgIH0KKyNlbmRpZgorCiAgICAgdjg6OkhhbmRsZTx2ODo6Q29u dGV4dD4gY29udGV4dCA9IFY4UHJveHk6OmNvbnRleHQoZnJhbWUpOwogICAgIGlmIChjb250ZXh0 LklzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHY4OjpMb2NhbDx2ODo6RnVuY3Rpb24+KCk7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL21hbnVhbC10ZXN0cy9jaHJvbWl1bS92aWRlby10eXBlb2YuaHRt bCBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL2Nocm9taXVtL3ZpZGVvLXR5cGVvZi5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAwMDAuLjNlNWQyMDkKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJDb3JlL21hbnVhbC10ZXN0cy9jaHJvbWl1bS92aWRlby10eXBlb2YuaHRtbApAQCAtMCww ICsxLDIwIEBACis8aHRtbD4KKyAgPGhlYWQ+CisgICAgPHRpdGxlPlRlc3RpbmcgdHlwZW9mKEhU TUxWaWRlb0VsZW1lbnQpPC90aXRsZT4KKyAgPC9oZWFkPgorICA8Ym9keT4KKyAgICAgIDxwPlRl c3RpbmcgcHJvY2VkdXJlczo8L3A+CisgICAgICA8cD4xLiBSZW1vdmUgYWxsIG1lZGlhIHN1cHBv cnRpbmcgbGlicmFyaWVzIGZpbGVzIGluIENocm9taXVtJ3MgZGlyZWN0b3J5PC9wPgorICAgICAg PHA+Mi4gVXNlIENocm9taXVtIHRvIG9wZW4gdGhpcyBwYWdlPC9wPgorICAgICAgPHA+My4gVGhl IGZvbGxvd2luZyB0aHJlZSB2YWx1ZXMgc2hvdWxkIGJlICJ1bmRlZmluZWQiPC9wPgorICAgICAg PHA+dHlwZW9mKEhUTUxNZWRpYUVsZW1lbnQpID0gPHNwYW4gaWQ9Im0iPjwvc3Bhbj4gKGV4cGVj dGVkIHVuZGVmaW5lZCk8cD4KKyAgICAgIDxwPnR5cGVvZihIVE1MVmlkZW9FbGVtZW50KSA9IDxz cGFuIGlkPSJ2Ij48L3NwYW4+IChleHBlY3RlZCB1bmRlZmluZWQpPHA+CisgICAgICA8cD50eXBl b2YoSFRNTEF1ZGlvRWxlbWVudCkgPSA8c3BhbiBpZD0iYSI+PC9zcGFuPiAoZXhwZWN0ZWQgdW5k ZWZpbmVkKTxwPgorICAgICAgPHNjcmlwdD4KKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoIm0iKS5pbm5lckhUTUwgPSB0eXBlb2YoSFRNTE1lZGlhRWxlbWVudCk7CisgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJ2IikuaW5uZXJIVE1MID0gdHlwZW9mKEhUTUxWaWRlb0Vs ZW1lbnQpOworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYSIpLmlubmVySFRNTCA9 IHR5cGVvZihIVE1MQXVkaW9FbGVtZW50KTsKKyAgICAgIDwvc2NyaXB0PgorICAgIDwvdmlkZW8+ CisgIDwvYm9keT4KKzwvaHRtbD4K 41254 2009-10-15 17:25:01 -0700 2009-10-19 12:16:12 -0700 Patch + manual test case webkit-media-v8.patch text/plain 6205 hclam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGQ3MDdiYS4uYjU0OTgzMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAwOS0xMC0xMyAgQWxwaGEgTGFtICA8 aGNsYW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFt2OF0gdHlwZW9mKEhUTUxNZWRpYUVsZW1lbnQpIHNob3VsZCByZXR1cm4g dW5kZWZpbmVkIGlmIG1lZGlhCisgICAgICAgIGVuZ2luZSBpcyBub3QgYXZhaWxhYmxlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDM0MworCisgICAg ICAgIENoZWNrIGZvciBhdmFpbGFiaWxpdHkgb2YgdGhlIG1lZGlhIGVuZ2luZSB0byBkaXNhYmxl CisgICAgICAgIEhUTUxNZWRpYUVsZW1lbnQsIEhUTUxBdWRpb0VsZW1lbnQsIEhUTUxWaWRlb0Vs ZW1lbnQsIE1lZGlhRXJyb3IKKyAgICAgICAgaW4gcnVudGltZS4KKworICAgICAgICBUcnkgcnVu cyBhbmQgcmV2aWV3IGluIENocm9taXVtOgorICAgICAgICBodHRwOi8vY29kZXJldmlldy5jaHJv bWl1bS5vcmcvMjc2MDExCisKKyAgICAgICAgVGVzdDogbWFudWFsLXRlc3RzL2Nocm9taXVtL21l ZGlhLXBsYXllci1ub3QtYXZhaWxhYmxlLmh0bWwKKworICAgICAgICBUaGUgYWJvdmUgdGVzdCBj YW4gd29yayB3b3JrIGluIENocm9taXVtLiBUZXN0aW5nIHByb2NlZHVyZXM6CisgICAgICAgIDEu IFJlbW92ZSBhbGwgbWVkaWEgc3VwcG9ydCBsaWJyYXJpZXMgaW4gQ2hyb21pdW0gKGUuZy4gZmZt cGVnIGxpYnJhcmllcykKKyAgICAgICAgMi4gT3BlbiBDaHJvbWl1bSB3aXRoIGFib3ZlIHRlc3Qg cGFnZQorICAgICAgICAzLiBWZXJpZnkgdGhlIHRlc3QgcmVzdWx0cyBhY2NvcmRpbmcgdG8gdGhl IHRlc3QgcGFnZQorCisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tQmluZGlu Zy5oOgorICAgICAgICBEZWNsYXJlIGVuYWJsZXIgbWV0aG9kcy4KKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwOgorICAgICAgICBSZXBvcnQgZW5hYmxl ZCBvbmx5IGlmIG1lZGlhIHBsYXllciBpcyBhdmFpbGFibGUuCisgICAgICAgICogbWFudWFsLXRl c3RzL2Nocm9taXVtL21lZGlhLXBsYXllci1ub3QtYXZhaWxhYmxlLmh0bWw6IEFkZGVkLgorICAg ICAgICBNYW51YWwgdGVzdCwgZm9sbG93aW5nIGluc3RydWN0aW9uIGluIHRoaXMgdGVzdCBmb3Ig cHJvY2VkdXJlcy4KKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5pZGw6CisgICAgICAgIE1hcmsg SFRNTE1lZGlhRWxlbWVudCwgSFRNTEF1ZGlvRWxlbWVudCwgSFRNTFZpZGVFbGVtZW50LCBNZWRp YUVycm9yCisgICAgICAgIGFzIGVuYWJsZWQgYXQgcnVudGltZS4KKwogMjAwOS0xMC0xNSAgWm9s dGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBP bGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3Vz dG9tQmluZGluZy5oIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21CaW5kaW5n LmgKaW5kZXggNzFkZDg4ZS4uZDVlMDJhYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhDdXN0b21CaW5kaW5nLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhDdXN0b21CaW5kaW5nLmgKQEAgLTI1NCw2ICsyNTQsMTAgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogI2lmIEVOQUJMRShWSURFTykKICAgICAgICAgREVDTEFSRV9QUk9QRVJUWV9BQ0NFU1NP Ul9HRVRURVIoRE9NV2luZG93QXVkaW8pOwogICAgICAgICBERUNMQVJFX0FDQ0VTU09SX1JVTlRJ TUVfRU5BQkxFUihET01XaW5kb3dBdWRpbyk7CisgICAgICAgIERFQ0xBUkVfQUNDRVNTT1JfUlVO VElNRV9FTkFCTEVSKERPTVdpbmRvd0hUTUxNZWRpYUVsZW1lbnQpOworICAgICAgICBERUNMQVJF X0FDQ0VTU09SX1JVTlRJTUVfRU5BQkxFUihET01XaW5kb3dIVE1MQXVkaW9FbGVtZW50KTsKKyAg ICAgICAgREVDTEFSRV9BQ0NFU1NPUl9SVU5USU1FX0VOQUJMRVIoRE9NV2luZG93SFRNTFZpZGVv RWxlbWVudCk7CisgICAgICAgIERFQ0xBUkVfQUNDRVNTT1JfUlVOVElNRV9FTkFCTEVSKERPTVdp bmRvd01lZGlhRXJyb3IpOwogI2VuZGlmCiAKICAgICAgICAgREVDTEFSRV9QUk9QRVJUWV9BQ0NF U1NPUl9HRVRURVIoRE9NV2luZG93SW1hZ2UpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCmluZGV4IGMzZDc4MWUuLjAzZDQ4MGUgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAor KysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKQEAg LTI0Miw2ICsyNDIsMjYgQEAgQUNDRVNTT1JfUlVOVElNRV9FTkFCTEVSKERPTVdpbmRvd0F1ZGlv KQogICAgIHJldHVybiBNZWRpYVBsYXllcjo6aXNBdmFpbGFibGUoKTsKIH0KIAorQUNDRVNTT1Jf UlVOVElNRV9FTkFCTEVSKERPTVdpbmRvd0hUTUxNZWRpYUVsZW1lbnQpCit7CisgICAgcmV0dXJu IE1lZGlhUGxheWVyOjppc0F2YWlsYWJsZSgpOworfQorCitBQ0NFU1NPUl9SVU5USU1FX0VOQUJM RVIoRE9NV2luZG93SFRNTEF1ZGlvRWxlbWVudCkKK3sKKyAgICByZXR1cm4gTWVkaWFQbGF5ZXI6 OmlzQXZhaWxhYmxlKCk7Cit9CisKK0FDQ0VTU09SX1JVTlRJTUVfRU5BQkxFUihET01XaW5kb3dI VE1MVmlkZW9FbGVtZW50KQoreworICAgIHJldHVybiBNZWRpYVBsYXllcjo6aXNBdmFpbGFibGUo KTsKK30KKworQUNDRVNTT1JfUlVOVElNRV9FTkFCTEVSKERPTVdpbmRvd01lZGlhRXJyb3IpCit7 CisgICAgcmV0dXJuIE1lZGlhUGxheWVyOjppc0F2YWlsYWJsZSgpOworfQorCiAjZW5kaWYKIAog I2lmIEVOQUJMRShTSEFSRURfV09SS0VSUykKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbWFudWFsLXRl c3RzL2Nocm9taXVtL21lZGlhLXBsYXllci1ub3QtYXZhaWxhYmxlLmh0bWwgYi9XZWJDb3JlL21h bnVhbC10ZXN0cy9jaHJvbWl1bS9tZWRpYS1wbGF5ZXItbm90LWF2YWlsYWJsZS5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRkOTdmZTMKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJDb3JlL21hbnVhbC10ZXN0cy9jaHJvbWl1bS9tZWRpYS1wbGF5ZXItbm90LWF2YWlsYWJs ZS5odG1sCkBAIC0wLDAgKzEsMzAgQEAKKzxodG1sPgorICA8aGVhZD4KKyAgICA8dGl0bGU+VGVz dGluZyBtZWRpYSBwbGF5ZXIgbm90IGF2YWlsYWJsZS48L3RpdGxlPgorICA8L2hlYWQ+CisgIDxi b2R5PgorICAgICAgPHA+VGVzdGluZyBwcm9jZWR1cmVzOjwvcD4KKyAgICAgIDxwPjEuIFJlbW92 ZSBhbGwgbWVkaWEgc3VwcG9ydGluZyBsaWJyYXJpZXMgZmlsZXMgaW4gQ2hyb21pdW0ncyBkaXJl Y3Rvcnk8L3A+CisgICAgICA8cD4yLiBVc2UgQ2hyb21pdW0gdG8gb3BlbiB0aGlzIHBhZ2U8L3A+ CisgICAgICA8cD4zLiBUaGUgZm9sbG93aW5nIDggdmFsdWVzIHNob3VsZCBiZSAidW5kZWZpbmVk IjwvcD4KKyAgICAgIDxwPnR5cGVvZihIVE1MTWVkaWFFbGVtZW50KSA9IDxzcGFuIGlkPSJ0bSI+ PC9zcGFuPiAoZXhwZWN0ZWQgdW5kZWZpbmVkKTxwPgorICAgICAgPHA+dHlwZW9mKEhUTUxWaWRl b0VsZW1lbnQpID0gPHNwYW4gaWQ9InR2Ij48L3NwYW4+IChleHBlY3RlZCB1bmRlZmluZWQpPHA+ CisgICAgICA8cD50eXBlb2YoSFRNTEF1ZGlvRWxlbWVudCkgPSA8c3BhbiBpZD0idGEiPjwvc3Bh bj4gKGV4cGVjdGVkIHVuZGVmaW5lZCk8cD4KKyAgICAgIDxwPnR5cGVvZihNZWRpYUVycm9yKSA9 IDxzcGFuIGlkPSJ0ZSI+PC9zcGFuPiAoZXhwZWN0ZWQgdW5kZWZpbmVkKTxwPgorICAgICAgPHA+ d2luZG93LkhUTUxNZWRpYUVsZW1lbnQgPSA8c3BhbiBpZD0iaG0iPjwvc3Bhbj4gKGV4cGVjdGVk IHVuZGVmaW5lZCk8cD4KKyAgICAgIDxwPndpbmRvdy5IVE1MVmlkZW9FbGVtZW50ID0gPHNwYW4g aWQ9Imh2Ij48L3NwYW4+IChleHBlY3RlZCB1bmRlZmluZWQpPHA+CisgICAgICA8cD53aW5kb3cu SFRNTEF1ZGlvRWxlbWVudCA9IDxzcGFuIGlkPSJoYSI+PC9zcGFuPiAoZXhwZWN0ZWQgdW5kZWZp bmVkKTxwPgorICAgICAgPHA+d2luZG93Lk1lZGlhRXJyb3IgPSA8c3BhbiBpZD0iaGUiPjwvc3Bh bj4gKGV4cGVjdGVkIHVuZGVmaW5lZCk8cD4KKyAgICAgIDxzY3JpcHQ+CisgICAgICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJ0bSIpLmlubmVySFRNTCA9IHR5cGVvZihIVE1MTWVkaWFFbGVt ZW50KTsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInR2IikuaW5uZXJIVE1MID0g dHlwZW9mKEhUTUxWaWRlb0VsZW1lbnQpOworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgidGEiKS5pbm5lckhUTUwgPSB0eXBlb2YoSFRNTEF1ZGlvRWxlbWVudCk7CisgICAgICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZSIpLmlubmVySFRNTCA9IHR5cGVvZihNZWRpYUVycm9y KTsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImhtIikuaW5uZXJIVE1MID0gd2lu ZG93LkhUTUxNZWRpYUVsZW1lbnQ7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJo diIpLmlubmVySFRNTCA9IHdpbmRvdy5IVE1MVmlkZW9FbGVtZW50OworICAgICAgICBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgiaGEiKS5pbm5lckhUTUwgPSB3aW5kb3cuSFRNTEF1ZGlvRWxlbWVu dDsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImhlIikuaW5uZXJIVE1MID0gd2lu ZG93Lk1lZGlhRXJyb3I7CisgICAgICA8L3NjcmlwdD4KKyAgICA8L3ZpZGVvPgorICA8L2JvZHk+ Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmlkbCBiL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuaWRsCmluZGV4IDkwM2VkMTguLjdlZWI1ZjUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaWRsCisrKyBiL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cu aWRsCkBAIC01MjQsMTAgKzUyNCwxMCBAQCBtb2R1bGUgd2luZG93IHsKICNlbmRpZgogCiAgICAg ICAgIGF0dHJpYnV0ZSBbQ3VzdG9tR2V0dGVyLENvbmRpdGlvbmFsPVZJREVPLEVuYWJsZWRBdFJ1 bnRpbWVdIEhUTUxBdWRpb0VsZW1lbnRDb25zdHJ1Y3RvciBBdWRpbzsgLy8gVXNhYmxlIHdpdGgg dGhlIG5ldyBvcGVyYXRvcgotICAgICAgICBhdHRyaWJ1dGUgW0NvbmRpdGlvbmFsPVZJREVPXSBI VE1MQXVkaW9FbGVtZW50Q29uc3RydWN0b3IgSFRNTEF1ZGlvRWxlbWVudDsKLSAgICAgICAgYXR0 cmlidXRlIFtDb25kaXRpb25hbD1WSURFT10gSFRNTE1lZGlhRWxlbWVudENvbnN0cnVjdG9yIEhU TUxNZWRpYUVsZW1lbnQ7Ci0gICAgICAgIGF0dHJpYnV0ZSBbQ29uZGl0aW9uYWw9VklERU9dIEhU TUxWaWRlb0VsZW1lbnRDb25zdHJ1Y3RvciBIVE1MVmlkZW9FbGVtZW50OwotICAgICAgICBhdHRy aWJ1dGUgW0NvbmRpdGlvbmFsPVZJREVPXSBNZWRpYUVycm9yQ29uc3RydWN0b3IgTWVkaWFFcnJv cjsKKyAgICAgICAgYXR0cmlidXRlIFtDb25kaXRpb25hbD1WSURFTyxFbmFibGVkQXRSdW50aW1l XSBIVE1MQXVkaW9FbGVtZW50Q29uc3RydWN0b3IgSFRNTEF1ZGlvRWxlbWVudDsKKyAgICAgICAg YXR0cmlidXRlIFtDb25kaXRpb25hbD1WSURFTyxFbmFibGVkQXRSdW50aW1lXSBIVE1MTWVkaWFF bGVtZW50Q29uc3RydWN0b3IgSFRNTE1lZGlhRWxlbWVudDsKKyAgICAgICAgYXR0cmlidXRlIFtD b25kaXRpb25hbD1WSURFTyxFbmFibGVkQXRSdW50aW1lXSBIVE1MVmlkZW9FbGVtZW50Q29uc3Ry dWN0b3IgSFRNTFZpZGVvRWxlbWVudDsKKyAgICAgICAgYXR0cmlidXRlIFtDb25kaXRpb25hbD1W SURFTyxFbmFibGVkQXRSdW50aW1lXSBNZWRpYUVycm9yQ29uc3RydWN0b3IgTWVkaWFFcnJvcjsK IAogI2lmIGRlZmluZWQoRU5BQkxFX1hQQVRIKSAmJiBFTkFCTEVfWFBBVEgKICAgICAgICAgYXR0 cmlidXRlIFhQYXRoRXZhbHVhdG9yQ29uc3RydWN0b3IgWFBhdGhFdmFsdWF0b3I7Cg==