123353 2013-10-25 11:50:22 -0700 [MSE] Add MediaSource compatible loading functions to MediaPlayer 2013-10-30 19:37:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 123374 1 jer.noble jer.noble bw80.lee darin gyuyoung.kim ossy rniwa oldest_to_newest 943685 0 jer.noble 2013-10-25 11:50:22 -0700 [MSE] Add MediaSource compatable loading functions to MediaPlayer 943688 1 215197 jer.noble 2013-10-25 11:52:30 -0700 Created attachment 215197 Patch 944432 2 215197 eric.carlson 2013-10-29 08:17:43 -0700 Comment on attachment 215197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215197&action=review > Source/WebCore/Modules/mediasource/MediaSource.cpp:207 > - return MIMETypeRegistry::isSupportedMediaSourceMIMEType(contentType.type(), codecs); > + return MediaPlayer::supportsType(contentType, emptyString(), URL(), 0, true) != MediaPlayer::IsNotSupported; Can you remove MIMETypeRegistry::isSupportedMediaSourceMIMEType now? > Source/WebCore/platform/graphics/MediaPlayer.cpp:744 > +MediaPlayer::SupportsType MediaPlayer::supportsType(const ContentType& contentType, const String& keySystem, const URL& url, const MediaPlayerSupportsTypeClient* client, bool isMediaSource) We will have to modify this again for MediaStream so this one bool won't last long. Why not just pass the MediaEngineSupportParameters struct? 944670 3 jer.noble 2013-10-29 16:24:17 -0700 (In reply to comment #2) > (From update of attachment 215197 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=215197&action=review > > > Source/WebCore/Modules/mediasource/MediaSource.cpp:207 > > - return MIMETypeRegistry::isSupportedMediaSourceMIMEType(contentType.type(), codecs); > > + return MediaPlayer::supportsType(contentType, emptyString(), URL(), 0, true) != MediaPlayer::IsNotSupported; > > Can you remove MIMETypeRegistry::isSupportedMediaSourceMIMEType now? Sure can. > > Source/WebCore/platform/graphics/MediaPlayer.cpp:744 > > +MediaPlayer::SupportsType MediaPlayer::supportsType(const ContentType& contentType, const String& keySystem, const URL& url, const MediaPlayerSupportsTypeClient* client, bool isMediaSource) > > We will have to modify this again for MediaStream so this one bool won't last long. Why not just pass the MediaEngineSupportParameters struct? Good plan. I'll do that! 944688 4 215447 jer.noble 2013-10-29 17:00:48 -0700 Created attachment 215447 Patch for landing 945050 5 jer.noble 2013-10-30 11:16:47 -0700 Committed r158291: <http://trac.webkit.org/changeset/158291> 945087 6 rniwa 2013-10-30 11:51:01 -0700 Fixed builds in http://trac.webkit.org/changeset/158295. 945132 7 215447 ossy 2013-10-30 12:57:13 -0700 Comment on attachment 215447 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=215447&action=review > Source/WebCore/dom/DOMImplementation.cpp:359 > + MediaEngineSupportParameters parameters = { }; It broke the EFL build: /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp: In static member function ‘static WTF::PassRefPtr<WebCore::Document> WebCore::DOMImplementation::createDocument(const WTF::String&, WebCore::Frame*, const WebCore::URL&, bool)’: /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp:359:49: error: missing initializer for member ‘WebCore::MediaEngineSupportParameters::type’ [-Werror=missing-field-initializers] /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp:359:49: error: missing initializer for member ‘WebCore::MediaEngineSupportParameters::codecs’ [-Werror=missing-field-initializers] /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp:359:49: error: missing initializer for member ‘WebCore::MediaEngineSupportParameters::url’ [-Werror=missing-field-initializers] cc1plus: all warnings being treated as errors Could you fix it please? 945145 8 jer.noble 2013-10-30 13:16:19 -0700 (In reply to comment #7) > (From update of attachment 215447 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=215447&action=review > > > Source/WebCore/dom/DOMImplementation.cpp:359 > > + MediaEngineSupportParameters parameters = { }; > > It broke the EFL build: > /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp: In static member function ‘static WTF::PassRefPtr<WebCore::Document> WebCore::DOMImplementation::createDocument(const WTF::String&, WebCore::Frame*, const WebCore::URL&, bool)’: > /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp:359:49: error: missing initializer for member ‘WebCore::MediaEngineSupportParameters::type’ [-Werror=missing-field-initializers] > /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp:359:49: error: missing initializer for member ‘WebCore::MediaEngineSupportParameters::codecs’ [-Werror=missing-field-initializers] > /mnt/buildbot/efl-linux-slave-2/efl-linux-64-release-wk2/build/Source/WebCore/dom/DOMImplementation.cpp:359:49: error: missing initializer for member ‘WebCore::MediaEngineSupportParameters::url’ [-Werror=missing-field-initializers] > cc1plus: all warnings being treated as errors > > > Could you fix it please? Does the EFL builder not support empty initializer lists for structs? 945149 9 ossy 2013-10-30 13:23:30 -0700 I don't know ... cc-ing the EFL bot maintainers, they can answer it. (Otherwise EWS bots are to signal this kind of build failures.) 945152 10 ossy 2013-10-30 13:30:36 -0700 I checked, it isn't a gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55805 945158 11 jer.noble 2013-10-30 13:33:26 -0700 Okay, I'll convert this from a POD struct to one with a default constructor. 945167 12 jer.noble 2013-10-30 13:50:47 -0700 Committed r158311: <http://trac.webkit.org/changeset/158311> 945315 13 rniwa 2013-10-30 19:37:53 -0700 This patch caused media/media-fragments/TC0054.html and media/media-fragments/TC0061.html to start crashing: http://webkit-test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=media%2Fmedia-fragments%2FTC0054.html%2Cmedia%2Fmedia-fragments%2FTC0061.html 215197 2013-10-25 11:52:30 -0700 2013-10-30 11:27:07 -0700 Patch bug-123353-20131025115229.patch text/plain 6770 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3OTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzAwOTA5OTEwN2ZhMGRk MjQ3ZDJlY2QyYzkwMzNlMGIzODFmOWRlZC4uZWVhYzdkYWI5NjE1YzZhZDkzMmEzZGUwMzk3OGE4 YjYyYjQzNWY4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTEwLTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtNU0VdIEFkZCBNZWRpYVNv dXJjZSBjb21wYXRhYmxlIGxvYWRpbmcgZnVuY3Rpb25zIHRvIE1lZGlhUGxheWVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzNTMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbWV0aG9kcyB0byBN ZWRpYVBsYXllciB0byBhbGxvdyBpdCB0byBzZWxlY3QgdGhlIGNvcnJlY3QgTWVkaWFQbGF5ZXJG YWN0b3J5CisgICAgICAgIHdoZW4gYXR0ZW1wdGluZyB0byBsb2FkIGEgTWVkaWFTb3VyY2UgVVJM LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVNvdXJjZTo6YWRkU291cmNlQnVmZmVyKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhU291cmNlOjppc1R5cGVTdXBwb3J0ZWQpOgorICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojps b2FkUmVzb3VyY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyOjpzdXBwb3J0c1R5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL01lZGlhUGxheWVyLmg6CisKKzIwMTMtMTAtMjUgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CisKICAgICAgICAgW01TRV0gRml4IHJ1bnRpbWUgZXJyb3JzIGNhdXNlZCBieSBt ZWRpYXNvdXJjZSBJREwgYXR0cmlidXRlcy4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyMzM1MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuY3BwCmluZGV4IGRjN2E3OTNjMWJlZmZjZWZhN2Nj Y2U0NmJjZDY4YTVmODhkNWI0ODEuLjQxMDkwYTU3N2E3NzcyY2UzN2Y2OGM2YzBkNGUyMjE5NGMy NzI4YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVk aWFTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVk aWFTb3VyY2UuY3BwCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSAiR2VuZXJpY0V2ZW50UXVl dWUuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5o IgorI2luY2x1ZGUgIk1lZGlhUGxheWVyLmgiCiAjaW5jbHVkZSAiTWVkaWFTb3VyY2VSZWdpc3Ry eS5oIgogI2luY2x1ZGUgIlNvdXJjZUJ1ZmZlclByaXZhdGUuaCIKICNpbmNsdWRlICJUaW1lUmFu Z2VzLmgiCkBAIC05NSw3ICs5Niw2IEBAIFNvdXJjZUJ1ZmZlciogTWVkaWFTb3VyY2U6OmFkZFNv dXJjZUJ1ZmZlcihjb25zdCBTdHJpbmcmIHR5cGUsIEV4Y2VwdGlvbkNvZGUmIGVjCiAKICAgICAv LyA1LiBDcmVhdGUgYSBuZXcgU291cmNlQnVmZmVyIG9iamVjdCBhbmQgYXNzb2NpYXRlZCByZXNv dXJjZXMuCiAgICAgQ29udGVudFR5cGUgY29udGVudFR5cGUodHlwZSk7Ci0gICAgVmVjdG9yPFN0 cmluZz4gY29kZWNzID0gY29udGVudFR5cGUuY29kZWNzKCk7CiAgICAgUmVmUHRyPFNvdXJjZUJ1 ZmZlclByaXZhdGU+IHNvdXJjZUJ1ZmZlclByaXZhdGUgPSBjcmVhdGVTb3VyY2VCdWZmZXJQcml2 YXRlKGNvbnRlbnRUeXBlLCBlYyk7CiAKICAgICBpZiAoIXNvdXJjZUJ1ZmZlclByaXZhdGUpIHsK QEAgLTIwNCw3ICsyMDQsNyBAQCBib29sIE1lZGlhU291cmNlOjppc1R5cGVTdXBwb3J0ZWQoY29u c3QgU3RyaW5nJiB0eXBlKQogICAgIC8vIDQuIElmIHR5cGUgY29udGFpbnMgYXQgYSBjb2RlYyB0 aGF0IHRoZSBNZWRpYVNvdXJjZSBkb2VzIG5vdCBzdXBwb3J0LCB0aGVuIHJldHVybiBmYWxzZS4K ICAgICAvLyA1LiBJZiB0aGUgTWVkaWFTb3VyY2UgZG9lcyBub3Qgc3VwcG9ydCB0aGUgc3BlY2lm aWVkIGNvbWJpbmF0aW9uIG9mIG1lZGlhIHR5cGUsIG1lZGlhIHN1YnR5cGUsIGFuZCBjb2RlY3Mg dGhlbiByZXR1cm4gZmFsc2UuCiAgICAgLy8gNi4gUmV0dXJuIHRydWUuCi0gICAgcmV0dXJuIE1J TUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTWVkaWFTb3VyY2VNSU1FVHlwZShjb250ZW50VHlw ZS50eXBlKCksIGNvZGVjcyk7CisgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpzdXBwb3J0c1R5cGUo Y29udGVudFR5cGUsIGVtcHR5U3RyaW5nKCksIFVSTCgpLCAwLCB0cnVlKSAhPSBNZWRpYVBsYXll cjo6SXNOb3RTdXBwb3J0ZWQ7CiB9CiAKIEV2ZW50VGFyZ2V0SW50ZXJmYWNlIE1lZGlhU291cmNl OjpldmVudFRhcmdldEludGVyZmFjZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAppbmRleCAyOTViZDU2Y2M3ZGRkMTQzNTRkYmU0OWRmYTBkOGM4YzE2NDEz NmVmLi4wZTVjZWI1YzU4ZjFlNDM3NDBmZjA4OWMzYTYwNjg0NDZmZDEzM2VmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTExMTQsNyArMTExNCw3IEBAIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6bG9hZFJlc291cmNlKGNvbnN0IFVSTCYgaW5pdGlhbFVSTCwg Q29udGVudFR5cGUmIGNvbnRlbnRUCiAKICAgICBpZiAobV9tZWRpYVNvdXJjZSkgewogICAgICAg ICBpZiAobV9tZWRpYVNvdXJjZS0+YXR0YWNoVG9FbGVtZW50KCkpCi0gICAgICAgICAgICBtX3Bs YXllci0+bG9hZCh1cmwsIG1fbWVkaWFTb3VyY2UpOworICAgICAgICAgICAgbV9wbGF5ZXItPmxv YWQodXJsLCBjb250ZW50VHlwZSwgbV9tZWRpYVNvdXJjZSk7CiAgICAgICAgIGVsc2UgewogICAg ICAgICAgICAgLy8gRm9yZ2V0IG91ciByZWZlcmVuY2UgdG8gdGhlIE1lZGlhU291cmNlLCBzbyB3 ZSBsZWF2ZSBpdCBhbG9uZQogICAgICAgICAgICAgLy8gd2hpbGUgcHJvY2Vzc2luZyByZW1haW5k ZXIgb2YgbG9hZCBmYWlsdXJlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvTWVkaWFQbGF5ZXIuY3BwCmluZGV4IDVmY2U3ZmNjOTM2ZTU5YTUwYTc4MzAxNjE0NjFmMWRi YmNiMzFiZjcuLjYzYmFhNGIyMWE2NmMyYzllN2ZlZmExOWU4YmJjZTNhOTIzYThhOWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKQEAg LTM3OSwxMSArMzc5LDExIEBAIGJvb2wgTWVkaWFQbGF5ZXI6OmxvYWQoY29uc3QgVVJMJiB1cmws IGNvbnN0IENvbnRlbnRUeXBlJiBjb250ZW50VHlwZSwgY29uc3QgU3RyCiB9CiAKICNpZiBFTkFC TEUoTUVESUFfU09VUkNFKQotYm9vbCBNZWRpYVBsYXllcjo6bG9hZChjb25zdCBVUkwmIHVybCwg UGFzc1JlZlB0cjxIVE1MTWVkaWFTb3VyY2U+IG1lZGlhU291cmNlKQorYm9vbCBNZWRpYVBsYXll cjo6bG9hZChjb25zdCBVUkwmIHVybCwgY29uc3QgQ29udGVudFR5cGUmIGNvbnRlbnRUeXBlLCBQ YXNzUmVmUHRyPEhUTUxNZWRpYVNvdXJjZT4gbWVkaWFTb3VyY2UpCiB7CiAgICAgbV9tZWRpYVNv dXJjZSA9IG1lZGlhU291cmNlOwotICAgIG1fY29udGVudE1JTUVUeXBlID0gIiI7Ci0gICAgbV9j b250ZW50VHlwZUNvZGVjcyA9ICIiOworICAgIG1fY29udGVudE1JTUVUeXBlID0gY29udGVudFR5 cGUudHlwZSgpLmxvd2VyKCk7CisgICAgbV9jb250ZW50VHlwZUNvZGVjcyA9IGNvbnRlbnRUeXBl LnBhcmFtZXRlcihjb2RlY3MoKSk7CiAgICAgbV91cmwgPSB1cmw7CiAgICAgbV9rZXlTeXN0ZW0g PSAiIjsKICAgICBtX2NvbnRlbnRNSU1FVHlwZVdhc0luZmVycmVkRnJvbUV4dGVuc2lvbiA9IGZh bHNlOwpAQCAtNzQxLDcgKzc0MSw3IEBAIGJvb2wgTWVkaWFQbGF5ZXI6OmNvcHlWaWRlb1RleHR1 cmVUb1BsYXRmb3JtVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwKICAgICByZXR1 cm4gbV9wcml2YXRlLT5jb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUoY29udGV4dCwg dGV4dHVyZSwgbGV2ZWwsIHR5cGUsIGludGVybmFsRm9ybWF0LCBwcmVtdWx0aXBseUFscGhhLCBm bGlwWSk7CiB9CiAKLU1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXI6OnN1cHBv cnRzVHlwZShjb25zdCBDb250ZW50VHlwZSYgY29udGVudFR5cGUsIGNvbnN0IFN0cmluZyYga2V5 U3lzdGVtLCBjb25zdCBVUkwmIHVybCwgY29uc3QgTWVkaWFQbGF5ZXJTdXBwb3J0c1R5cGVDbGll bnQqIGNsaWVudCkKK01lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXI6OnN1cHBv cnRzVHlwZShjb25zdCBDb250ZW50VHlwZSYgY29udGVudFR5cGUsIGNvbnN0IFN0cmluZyYga2V5 U3lzdGVtLCBjb25zdCBVUkwmIHVybCwgY29uc3QgTWVkaWFQbGF5ZXJTdXBwb3J0c1R5cGVDbGll bnQqIGNsaWVudCwgYm9vbCBpc01lZGlhU291cmNlKQogewogICAgIE1lZGlhRW5naW5lU3VwcG9y dFBhcmFtZXRlcnMgcGFyYW1ldGVyczsKICAgICBwYXJhbWV0ZXJzLnR5cGUgPSBjb250ZW50VHlw ZS50eXBlKCkubG93ZXIoKTsKQEAgLTc1NSw3ICs3NTUsOSBAQCBNZWRpYVBsYXllcjo6U3VwcG9y dHNUeXBlIE1lZGlhUGxheWVyOjpzdXBwb3J0c1R5cGUoY29uc3QgQ29udGVudFR5cGUmIGNvbnRl bnRUeQogICAgIFVOVVNFRF9QQVJBTShrZXlTeXN0ZW0pOwogI2VuZGlmCiAjaWYgRU5BQkxFKE1F RElBX1NPVVJDRSkKLSAgICBwYXJhbWV0ZXJzLmlzTWVkaWFTb3VyY2UgPSBmYWxzZTsKKyAgICBw YXJhbWV0ZXJzLmlzTWVkaWFTb3VyY2UgPSBpc01lZGlhU291cmNlOworI2Vsc2UKKyAgICBVTlVT RURfUEFSQU0oaXNNZWRpYVNvdXJjZSk7CiAjZW5kaWYKIAogICAgIC8vIDQuOC4xMC4zIE1JTUUg dHlwZXMgLSBUaGUgY2FuUGxheVR5cGUodHlwZSkgbWV0aG9kIG11c3QgcmV0dXJuIHRoZSBlbXB0 eSBzdHJpbmcgaWYgdHlwZSBpcyBhIHR5cGUgdGhhdCB0aGUgCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAppbmRleCA1ZmFmOWRjNWE1MjBlODVmNjk1 YmFmNGM5MDMwMGViMzY2YjBkZTBkLi42ZmY3MmRmODRkZTI4YTg3N2RjNTEzMjI2YmUwYTZjNzYw YjJiMWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRp YVBsYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxh eWVyLmgKQEAgLTI1Myw3ICsyNTMsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBNZWRpYSBlbmdpbmUg c3VwcG9ydC4KICAgICBlbnVtIFN1cHBvcnRzVHlwZSB7IElzTm90U3VwcG9ydGVkLCBJc1N1cHBv cnRlZCwgTWF5QmVTdXBwb3J0ZWQgfTsKLSAgICBzdGF0aWMgTWVkaWFQbGF5ZXI6OlN1cHBvcnRz VHlwZSBzdXBwb3J0c1R5cGUoY29uc3QgQ29udGVudFR5cGUmLCBjb25zdCBTdHJpbmcmIGtleVN5 c3RlbSwgY29uc3QgVVJMJiwgY29uc3QgTWVkaWFQbGF5ZXJTdXBwb3J0c1R5cGVDbGllbnQqKTsK KyAgICBzdGF0aWMgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBzdXBwb3J0c1R5cGUoY29uc3Qg Q29udGVudFR5cGUmLCBjb25zdCBTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgVVJMJiwgY29uc3Qg TWVkaWFQbGF5ZXJTdXBwb3J0c1R5cGVDbGllbnQqLCBib29sIGlzTWVkaWFTb3VyY2UgPSBmYWxz ZSk7CiAgICAgc3RhdGljIHZvaWQgZ2V0U3VwcG9ydGVkVHlwZXMoSGFzaFNldDxTdHJpbmc+Jik7 CiAgICAgc3RhdGljIGJvb2wgaXNBdmFpbGFibGUoKTsKICAgICBzdGF0aWMgdm9pZCBnZXRTaXRl c0luTWVkaWFDYWNoZShWZWN0b3I8U3RyaW5nPiYpOwpAQCAtMjgyLDcgKzI4Miw3IEBAIHB1Ymxp YzoKIAogICAgIGJvb2wgbG9hZChjb25zdCBVUkwmLCBjb25zdCBDb250ZW50VHlwZSYsIGNvbnN0 IFN0cmluZyYga2V5U3lzdGVtKTsKICNpZiBFTkFCTEUoTUVESUFfU09VUkNFKQotICAgIGJvb2wg bG9hZChjb25zdCBVUkwmLCBQYXNzUmVmUHRyPEhUTUxNZWRpYVNvdXJjZT4pOworICAgIGJvb2wg bG9hZChjb25zdCBVUkwmLCBjb25zdCBDb250ZW50VHlwZSYsIFBhc3NSZWZQdHI8SFRNTE1lZGlh U291cmNlPik7CiAjZW5kaWYKICAgICB2b2lkIGNhbmNlbExvYWQoKTsKIAo= 215447 2013-10-29 17:00:48 -0700 2013-10-30 12:57:13 -0700 Patch for landing bug-123353-20131029170047.patch text/plain 13681 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2I2OGEzNTc3NzZmMWUz Yzc5OTY2MTkxMzk5MzFiYjJmOWQ1MzU0Mi4uNjQ1NmY4YjZjODIwYTUxMDFlZTUxMmVlM2NkNTc2 ODczMWQyOWU3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEzLTEwLTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtNU0VdIEFkZCBNZWRpYVNv dXJjZSBjb21wYXRhYmxlIGxvYWRpbmcgZnVuY3Rpb25zIHRvIE1lZGlhUGxheWVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzNTMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbWV0aG9kcyB0byBN ZWRpYVBsYXllciB0byBhbGxvdyBpdCB0byBzZWxlY3QgdGhlIGNvcnJlY3QgTWVkaWFQbGF5ZXJG YWN0b3J5CisgICAgICAgIHdoZW4gYXR0ZW1wdGluZyB0byBsb2FkIGEgTWVkaWFTb3VyY2UgVVJM LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVNvdXJjZTo6YWRkU291cmNlQnVmZmVyKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhU291cmNlOjppc1R5cGVTdXBwb3J0ZWQpOgorICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojps b2FkUmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Y2FuUGxh eVR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2VsZWN0TmV4dFNv dXJjZUNoaWxkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6bG9hZCk6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllcjo6c3VwcG9ydHNUeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9NZWRpYVBsYXllci5oOgorICAgICAgICAqIGRvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpET01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlRG9jdW1lbnQpOgorCisg ICAgICAgIFJlbW92ZSB0aGUgaXNTdXBwb3J0ZWRNZWRpYVNvdXJjZU1JTUVUeXBlKCkgbWV0aG9k OgorICAgICAgICAqIHBsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9lZmwvTUlNRVR5cGVSZWdpc3RyeUVmbC5jcHA6CisgICAgICAgICogcGxhdGZvcm0vbWFj L01JTUVUeXBlUmVnaXN0cnlNYWMubW06CisKKworMjAxMy0xMC0yNSAgSmVyIE5vYmxlICA8amVy Lm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBbTVNFXSBNYWtlIE1lZGlhU291cmNlUHJpdmF0 ZSwgU291cmNlQnVmZmVyUHJpdmF0ZSBjbGFzc2VzIFJlZkNvdW50ZWQuCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjMzNTAKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlLmNwcAppbmRleCAxNjI0 MDZjMDMzNTZhNDE4YjE1NDg0NzFhOTNlNTkxOTI4MTk3NjYxLi5mMjFiMjYzZWQ5MGMwYTNjNDhm OWNiODE3MzUxOTI1MzE1OTIzNjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc291cmNlL01lZGlhU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc291cmNlL01lZGlhU291cmNlLmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUg IkdlbmVyaWNFdmVudFF1ZXVlLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1J TUVUeXBlUmVnaXN0cnkuaCIKKyNpbmNsdWRlICJNZWRpYVBsYXllci5oIgogI2luY2x1ZGUgIk1l ZGlhU291cmNlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJTb3VyY2VCdWZmZXJQcml2YXRlLmgiCiAj aW5jbHVkZSAiVGltZVJhbmdlcy5oIgpAQCAtOTUsNyArOTYsNiBAQCBTb3VyY2VCdWZmZXIqIE1l ZGlhU291cmNlOjphZGRTb3VyY2VCdWZmZXIoY29uc3QgU3RyaW5nJiB0eXBlLCBFeGNlcHRpb25D b2RlJiBlYwogCiAgICAgLy8gNS4gQ3JlYXRlIGEgbmV3IFNvdXJjZUJ1ZmZlciBvYmplY3QgYW5k IGFzc29jaWF0ZWQgcmVzb3VyY2VzLgogICAgIENvbnRlbnRUeXBlIGNvbnRlbnRUeXBlKHR5cGUp OwotICAgIFZlY3RvcjxTdHJpbmc+IGNvZGVjcyA9IGNvbnRlbnRUeXBlLmNvZGVjcygpOwogICAg IFJlZlB0cjxTb3VyY2VCdWZmZXJQcml2YXRlPiBzb3VyY2VCdWZmZXJQcml2YXRlID0gY3JlYXRl U291cmNlQnVmZmVyUHJpdmF0ZShjb250ZW50VHlwZSwgZWMpOwogCiAgICAgaWYgKCFzb3VyY2VC dWZmZXJQcml2YXRlKSB7CkBAIC0yMDQsNyArMjA0LDExIEBAIGJvb2wgTWVkaWFTb3VyY2U6Omlz VHlwZVN1cHBvcnRlZChjb25zdCBTdHJpbmcmIHR5cGUpCiAgICAgLy8gNC4gSWYgdHlwZSBjb250 YWlucyBhdCBhIGNvZGVjIHRoYXQgdGhlIE1lZGlhU291cmNlIGRvZXMgbm90IHN1cHBvcnQsIHRo ZW4gcmV0dXJuIGZhbHNlLgogICAgIC8vIDUuIElmIHRoZSBNZWRpYVNvdXJjZSBkb2VzIG5vdCBz dXBwb3J0IHRoZSBzcGVjaWZpZWQgY29tYmluYXRpb24gb2YgbWVkaWEgdHlwZSwgbWVkaWEgc3Vi dHlwZSwgYW5kIGNvZGVjcyB0aGVuIHJldHVybiBmYWxzZS4KICAgICAvLyA2LiBSZXR1cm4gdHJ1 ZS4KLSAgICByZXR1cm4gTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRNZWRpYVNvdXJjZU1J TUVUeXBlKGNvbnRlbnRUeXBlLnR5cGUoKSwgY29kZWNzKTsKKyAgICBNZWRpYUVuZ2luZVN1cHBv cnRQYXJhbWV0ZXJzIHBhcmFtZXRlcnMgPSB7IH07CisgICAgcGFyYW1ldGVycy50eXBlID0gY29u dGVudFR5cGUudHlwZSgpOworICAgIHBhcmFtZXRlcnMuY29kZWNzID0gY29kZWNzOworICAgIHBh cmFtZXRlcnMuaXNNZWRpYVNvdXJjZSA9IHRydWU7CisgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpz dXBwb3J0c1R5cGUocGFyYW1ldGVycywgMCkgIT0gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVk OwogfQogCiBFdmVudFRhcmdldEludGVyZmFjZSBNZWRpYVNvdXJjZTo6ZXZlbnRUYXJnZXRJbnRl cmZhY2UoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVu dGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHAKaW5k ZXggMzAxYjUwMjMzMmMyNTE2ODJlOGFlY2FkMmRhYjYxMTdhY2MxYzdhMi4uYmIyZmVjMGNlOThm MjM0MmZkYjhkYmE1ZmMwNDZjNzU4ZjNkODQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRE9NSW1w bGVtZW50YXRpb24uY3BwCkBAIC0zNTYsNyArMzU2LDEwIEBAIFBhc3NSZWZQdHI8RG9jdW1lbnQ+ IERPTUltcGxlbWVudGF0aW9uOjpjcmVhdGVEb2N1bWVudChjb25zdCBTdHJpbmcmIHR5cGUsIEZy YW1lCiAgICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGUgdHlwZSBjYW4gYmUgcGxheWVkIGJ5IG91 ciBNZWRpYVBsYXllciwgaWYgc28gY3JlYXRlIGEgTWVkaWFEb2N1bWVudAogICAgIC8vIEtleSBz eXN0ZW0gaXMgbm90IGFwcGxpY2FibGUgaGVyZS4KICAgICBET01JbXBsZW1lbnRhdGlvblN1cHBv cnRzVHlwZUNsaWVudCBjbGllbnQoZnJhbWUgJiYgZnJhbWUtPnNldHRpbmdzKCkubmVlZHNTaXRl U3BlY2lmaWNRdWlya3MoKSwgdXJsLmhvc3QoKSk7Ci0gICAgaWYgKE1lZGlhUGxheWVyOjpzdXBw b3J0c1R5cGUoQ29udGVudFR5cGUodHlwZSksIFN0cmluZygpLCB1cmwsICZjbGllbnQpKQorICAg IE1lZGlhRW5naW5lU3VwcG9ydFBhcmFtZXRlcnMgcGFyYW1ldGVycyA9IHsgfTsKKyAgICBwYXJh bWV0ZXJzLnR5cGUgPSB0eXBlOworICAgIHBhcmFtZXRlcnMudXJsID0gdXJsOworICAgIGlmIChN ZWRpYVBsYXllcjo6c3VwcG9ydHNUeXBlKHBhcmFtZXRlcnMsICZjbGllbnQpKQogICAgICAgICAg cmV0dXJuIE1lZGlhRG9jdW1lbnQ6OmNyZWF0ZShmcmFtZSwgdXJsKTsKICNlbmRpZgogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBkNzU0ZGU3MmU1ZTdkYjA0 YTcwNjJiMDkwZGQ4MjgwM2JkN2RiYjFiLi42YzVjNTNjYzgxZjBlMjUzOGJiNmNhMDdkMWZlYzAw NWY2N2Y0NDFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAg LTc2Miw3ICs3NjIsMTUgQEAgSFRNTE1lZGlhRWxlbWVudDo6TmV0d29ya1N0YXRlIEhUTUxNZWRp YUVsZW1lbnQ6Om5ldHdvcmtTdGF0ZSgpIGNvbnN0CiAKIFN0cmluZyBIVE1MTWVkaWFFbGVtZW50 OjpjYW5QbGF5VHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGtleVN5 c3RlbSwgY29uc3QgVVJMJiB1cmwpIGNvbnN0CiB7Ci0gICAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRz VHlwZSBzdXBwb3J0ID0gTWVkaWFQbGF5ZXI6OnN1cHBvcnRzVHlwZShDb250ZW50VHlwZShtaW1l VHlwZSksIGtleVN5c3RlbSwgdXJsLCB0aGlzKTsKKyAgICBNZWRpYUVuZ2luZVN1cHBvcnRQYXJh bWV0ZXJzIHBhcmFtZXRlcnMgPSB7IH07CisgICAgQ29udGVudFR5cGUgY29udGVudFR5cGUobWlt ZVR5cGUpOworICAgIHBhcmFtZXRlcnMudHlwZSA9IGNvbnRlbnRUeXBlLnR5cGUoKTsKKyAgICBw YXJhbWV0ZXJzLmNvZGVjcyA9IGNvbnRlbnRUeXBlLnBhcmFtZXRlcihBU0NJSUxpdGVyYWwoImNv ZGVjcyIpKTsKKyAgICBwYXJhbWV0ZXJzLnVybCA9IHVybDsKKyNpZiBFTkFCTEUoRU5DUllQVEVE X01FRElBKQorICAgIHBhcmFtZXRlcnMua2V5U3lzdGVtID0ga2V5U3lzdGVtOworI2VuZGlmCisg ICAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBzdXBwb3J0ID0gTWVkaWFQbGF5ZXI6OnN1cHBv cnRzVHlwZShwYXJhbWV0ZXJzLCB0aGlzKTsKICAgICBTdHJpbmcgY2FuUGxheTsKIAogICAgIC8v IDQuOC4xMC4zCkBAIC0xMTE0LDcgKzExMjIsNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Omxv YWRSZXNvdXJjZShjb25zdCBVUkwmIGluaXRpYWxVUkwsIENvbnRlbnRUeXBlJiBjb250ZW50VAog CiAgICAgaWYgKG1fbWVkaWFTb3VyY2UpIHsKICAgICAgICAgaWYgKG1fbWVkaWFTb3VyY2UtPmF0 dGFjaFRvRWxlbWVudCgpKQotICAgICAgICAgICAgbV9wbGF5ZXItPmxvYWQodXJsLCBtX21lZGlh U291cmNlKTsKKyAgICAgICAgICAgIG1fcGxheWVyLT5sb2FkKHVybCwgY29udGVudFR5cGUsIG1f bWVkaWFTb3VyY2UpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIC8vIEZvcmdldCBvdXIg cmVmZXJlbmNlIHRvIHRoZSBNZWRpYVNvdXJjZSwgc28gd2UgbGVhdmUgaXQgYWxvbmUKICAgICAg ICAgICAgIC8vIHdoaWxlIHByb2Nlc3NpbmcgcmVtYWluZGVyIG9mIGxvYWQgZmFpbHVyZS4KQEAg LTM1MjEsNyArMzUyOSwxNSBAQCBVUkwgSFRNTE1lZGlhRWxlbWVudDo6c2VsZWN0TmV4dFNvdXJj ZUNoaWxkKENvbnRlbnRUeXBlKiBjb250ZW50VHlwZSwgU3RyaW5nKiBrZQogICAgICAgICAgICAg aWYgKHNob3VsZExvZykKICAgICAgICAgICAgICAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVt ZW50OjpzZWxlY3ROZXh0U291cmNlQ2hpbGQgLSAndHlwZScgaXMgJyVzJyAtIGtleSBzeXN0ZW0g aXMgJyVzJyIsIHR5cGUudXRmOCgpLmRhdGEoKSwgc3lzdGVtLnV0ZjgoKS5kYXRhKCkpOwogI2Vu ZGlmCi0gICAgICAgICAgICBpZiAoIU1lZGlhUGxheWVyOjpzdXBwb3J0c1R5cGUoQ29udGVudFR5 cGUodHlwZSksIHN5c3RlbSwgbWVkaWFVUkwsIHRoaXMpKQorICAgICAgICAgICAgTWVkaWFFbmdp bmVTdXBwb3J0UGFyYW1ldGVycyBwYXJhbWV0ZXJzID0geyB9OworICAgICAgICAgICAgQ29udGVu dFR5cGUgY29udGVudFR5cGUodHlwZSk7CisgICAgICAgICAgICBwYXJhbWV0ZXJzLnR5cGUgPSBj b250ZW50VHlwZS50eXBlKCk7CisgICAgICAgICAgICBwYXJhbWV0ZXJzLmNvZGVjcyA9IGNvbnRl bnRUeXBlLnBhcmFtZXRlcihBU0NJSUxpdGVyYWwoImNvZGVjcyIpKTsKKyAgICAgICAgICAgIHBh cmFtZXRlcnMudXJsID0gbWVkaWFVUkw7CisjaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKKyAg ICAgICAgICAgIHBhcmFtZXRlcnMua2V5U3lzdGVtID0gc3lzdGVtOworI2VuZGlmCisgICAgICAg ICAgICBpZiAoIU1lZGlhUGxheWVyOjpzdXBwb3J0c1R5cGUocGFyYW1ldGVycywgdGhpcykpCiAg ICAgICAgICAgICAgICAgZ290byBjaGVja19hZ2FpbjsKICAgICAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9NSU1FVHlwZVJlZ2lzdHJ5LmgKaW5kZXggZWNjNzY2Y2M0NzFkNWJhMTg0 YjU0YzA0NGJjODk2OTczZWQyNDAxNC4uZjcyMGY1ODZmYzlhOTQ0YjQ2ZmViZDVmNDhmMzFlNmVi MzQ5ZjBkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTUlNRVR5cGVSZWdp c3RyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01JTUVUeXBlUmVnaXN0cnkuaApA QCAtNjcsMTEgKzY3LDYgQEAgcHVibGljOgogICAgIC8vIENoZWNrIHRvIHNlZSBpZiBhIG1pbWUg dHlwZSBpcyBzdWl0YWJsZSBmb3IgYmVpbmcgbG9hZGVkIHVzaW5nIDx2aWRlbz4gYW5kIDxhdWRp bz4KICAgICBzdGF0aWMgYm9vbCBpc1N1cHBvcnRlZE1lZGlhTUlNRVR5cGUoY29uc3QgU3RyaW5n JiBtaW1lVHlwZSk7IAogCi0jaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKLSAgICAvLyBDaGVjayB0 byBzZWUgaWYgdGhlIG1pbWUgdHlwZSBhbmQgY29kZWNzIGFyZSBzdXBwb3J0ZWQgYnkgdGhlIE1l ZGlhU291cmNlIGltcGxlbWVudGF0aW9uLgotICAgIHN0YXRpYyBib29sIGlzU3VwcG9ydGVkTWVk aWFTb3VyY2VNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGNv ZGVjcyk7Ci0jZW5kaWYKLQogICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGUgbWltZSB0eXBlIGlz IG5vdCBzdWl0YWJsZSBmb3IgYmVpbmcgbG9hZGVkIGFzIGEgdGV4dAogICAgIC8vIGRvY3VtZW50 IGluIGEgZnJhbWUuIE9ubHkgdmFsaWQgZm9yIG1pbWUgdHlwZXMgYmVnaW5pbmcgd2l0aCAidGV4 dC8iLgogICAgIHN0YXRpYyBib29sIGlzVW5zdXBwb3J0ZWRUZXh0TUlNRVR5cGUoY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwv TUlNRVR5cGVSZWdpc3RyeUVmbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvTUlN RVR5cGVSZWdpc3RyeUVmbC5jcHAKaW5kZXggZDdlMGIwYzQ0ZjhhZWEzYWIxZmEyYzNmZDQ5NzE0 MGU1ZTJjOGYyOS4uNGFlODE4MTVmMzQ2MzFjYmUwZjRlYTUyMDZkNDZlYmExNjJjMDk0ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL01JTUVUeXBlUmVnaXN0cnlFZmwu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2VmbC9NSU1FVHlwZVJlZ2lzdHJ5RWZs LmNwcApAQCAtOTYsMTIgKzk2LDQgQEAgYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc0FwcGxpY2F0 aW9uUGx1Z2luTUlNRVR5cGUoY29uc3QgU3RyaW5nJikKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK LSNpZiBFTkFCTEUoTUVESUFfU09VUkNFKQotYm9vbCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBv cnRlZE1lZGlhU291cmNlTUlNRVR5cGUoY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJikKLXsK LSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBmYWxzZTsKLX0KLSNlbmRpZgotCiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXll ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAK aW5kZXggNWZjZTdmY2M5MzZlNTlhNTBhNzgzMDE2MTQ2MWYxZGJiY2IzMWJmNy4uZmQzMmZmMzhi MGFiOGE5ZjEzYzdjMjgxZGUwMjUyZTJhMmQyMDY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtMzc5LDExICszNzksMTEgQEAg Ym9vbCBNZWRpYVBsYXllcjo6bG9hZChjb25zdCBVUkwmIHVybCwgY29uc3QgQ29udGVudFR5cGUm IGNvbnRlbnRUeXBlLCBjb25zdCBTdHIKIH0KIAogI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCi1i b29sIE1lZGlhUGxheWVyOjpsb2FkKGNvbnN0IFVSTCYgdXJsLCBQYXNzUmVmUHRyPEhUTUxNZWRp YVNvdXJjZT4gbWVkaWFTb3VyY2UpCitib29sIE1lZGlhUGxheWVyOjpsb2FkKGNvbnN0IFVSTCYg dXJsLCBjb25zdCBDb250ZW50VHlwZSYgY29udGVudFR5cGUsIFBhc3NSZWZQdHI8SFRNTE1lZGlh U291cmNlPiBtZWRpYVNvdXJjZSkKIHsKICAgICBtX21lZGlhU291cmNlID0gbWVkaWFTb3VyY2U7 Ci0gICAgbV9jb250ZW50TUlNRVR5cGUgPSAiIjsKLSAgICBtX2NvbnRlbnRUeXBlQ29kZWNzID0g IiI7CisgICAgbV9jb250ZW50TUlNRVR5cGUgPSBjb250ZW50VHlwZS50eXBlKCkubG93ZXIoKTsK KyAgICBtX2NvbnRlbnRUeXBlQ29kZWNzID0gY29udGVudFR5cGUucGFyYW1ldGVyKGNvZGVjcygp KTsKICAgICBtX3VybCA9IHVybDsKICAgICBtX2tleVN5c3RlbSA9ICIiOwogICAgIG1fY29udGVu dE1JTUVUeXBlV2FzSW5mZXJyZWRGcm9tRXh0ZW5zaW9uID0gZmFsc2U7CkBAIC03NDEsMjMgKzc0 MSw4IEBAIGJvb2wgTWVkaWFQbGF5ZXI6OmNvcHlWaWRlb1RleHR1cmVUb1BsYXRmb3JtVGV4dHVy ZShHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCwKICAgICByZXR1cm4gbV9wcml2YXRlLT5jb3B5 VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUoY29udGV4dCwgdGV4dHVyZSwgbGV2ZWwsIHR5 cGUsIGludGVybmFsRm9ybWF0LCBwcmVtdWx0aXBseUFscGhhLCBmbGlwWSk7CiB9CiAKLU1lZGlh UGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXI6OnN1cHBvcnRzVHlwZShjb25zdCBDb250 ZW50VHlwZSYgY29udGVudFR5cGUsIGNvbnN0IFN0cmluZyYga2V5U3lzdGVtLCBjb25zdCBVUkwm IHVybCwgY29uc3QgTWVkaWFQbGF5ZXJTdXBwb3J0c1R5cGVDbGllbnQqIGNsaWVudCkKK01lZGlh UGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXI6OnN1cHBvcnRzVHlwZShjb25zdCBNZWRp YUVuZ2luZVN1cHBvcnRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBjb25zdCBNZWRpYVBsYXllclN1 cHBvcnRzVHlwZUNsaWVudCogY2xpZW50KQogewotICAgIE1lZGlhRW5naW5lU3VwcG9ydFBhcmFt ZXRlcnMgcGFyYW1ldGVyczsKLSAgICBwYXJhbWV0ZXJzLnR5cGUgPSBjb250ZW50VHlwZS50eXBl KCkubG93ZXIoKTsKLSAgICAvLyBUaGUgY29kZWNzIHN0cmluZyBpcyBub3QgbG93ZXItY2FzZWQg YmVjYXVzZSBNUDQgdmFsdWVzIGFyZSBjYXNlIHNlbnNpdGl2ZQotICAgIC8vIHBlciBodHRwOi8v dG9vbHMuaWV0Zi5vcmcvaHRtbC9yZmM0MjgxI3BhZ2UtNy4KLSAgICBwYXJhbWV0ZXJzLmNvZGVj cyA9IGNvbnRlbnRUeXBlLnBhcmFtZXRlcihjb2RlY3MoKSk7Ci0gICAgcGFyYW1ldGVycy51cmwg PSB1cmw7Ci0jaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJQSkKLSAgICBwYXJhbWV0ZXJzLmtleVN5 c3RlbSA9IGtleVN5c3RlbS5sb3dlcigpOwotI2Vsc2UKLSAgICBVTlVTRURfUEFSQU0oa2V5U3lz dGVtKTsKLSNlbmRpZgotI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCi0gICAgcGFyYW1ldGVycy5p c01lZGlhU291cmNlID0gZmFsc2U7Ci0jZW5kaWYKLQogICAgIC8vIDQuOC4xMC4zIE1JTUUgdHlw ZXMgLSBUaGUgY2FuUGxheVR5cGUodHlwZSkgbWV0aG9kIG11c3QgcmV0dXJuIHRoZSBlbXB0eSBz dHJpbmcgaWYgdHlwZSBpcyBhIHR5cGUgdGhhdCB0aGUgCiAgICAgLy8gdXNlciBhZ2VudCBrbm93 cyBpdCBjYW5ub3QgcmVuZGVyIG9yIGlzIHRoZSB0eXBlICJhcHBsaWNhdGlvbi9vY3RldC1zdHJl YW0iCiAgICAgaWYgKHBhcmFtZXRlcnMudHlwZSA9PSBhcHBsaWNhdGlvbk9jdGV0U3RyZWFtKCkp CkBAIC03NzcsNyArNzYyLDcgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBsYXll cjo6c3VwcG9ydHNUeXBlKGNvbnN0IENvbnRlbnRUeXBlJiBjb250ZW50VHkKICAgICBpZiAoY2xp ZW50ICYmIGNsaWVudC0+bWVkaWFQbGF5ZXJOZWVkc1NpdGVTcGVjaWZpY0hhY2tzKCkpIHsKICAg ICAgICAgU3RyaW5nIGhvc3QgPSBjbGllbnQtPm1lZGlhUGxheWVyRG9jdW1lbnRIb3N0KCk7CiAg ICAgICAgIGlmICgoaG9zdC5lbmRzV2l0aCgiLnlvdXR1YmUuY29tIiwgZmFsc2UpIHx8IGVxdWFs SWdub3JpbmdDYXNlKCJ5b3V0dWJlLmNvbSIsIGhvc3QpKQotICAgICAgICAgICAgJiYgKGNvbnRl bnRUeXBlLnR5cGUoKS5zdGFydHNXaXRoKCJ2aWRlby93ZWJtIiwgZmFsc2UpIHx8IGNvbnRlbnRU eXBlLnR5cGUoKS5zdGFydHNXaXRoKCJ2aWRlby94LWZsdiIsIGZhbHNlKSkpCisgICAgICAgICAg ICAmJiAocGFyYW1ldGVycy50eXBlLnN0YXJ0c1dpdGgoInZpZGVvL3dlYm0iLCBmYWxzZSkgfHwg cGFyYW1ldGVycy50eXBlLnN0YXJ0c1dpdGgoInZpZGVvL3gtZmx2IiwgZmFsc2UpKSkKICAgICAg ICAgICAgIHJldHVybiBJc05vdFN1cHBvcnRlZDsKICAgICB9CiAjZWxzZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgKaW5kZXggNWZhZjlkYzVhNTIw ZTg1ZjY5NWJhZjRjOTAzMDBlYjM2NmIwZGUwZC4uZTQyNTdkNTM3YzlkYzU3MDc1YTIwMDdjMmJk M2M5Y2Q5NjFkZDNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvTWVkaWFQbGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9N ZWRpYVBsYXllci5oCkBAIC0xMDIsNiArMTAyLDE4IEBAIHN0cnVjdCBQbGF0Zm9ybU1lZGlhIHsK ICAgICB9IG1lZGlhOwogfTsKIAorc3RydWN0IE1lZGlhRW5naW5lU3VwcG9ydFBhcmFtZXRlcnMg eworICAgIFN0cmluZyB0eXBlOworICAgIFN0cmluZyBjb2RlY3M7CisgICAgVVJMIHVybDsKKyNp ZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQorICAgIFN0cmluZyBrZXlTeXN0ZW07CisjZW5kaWYK KyNpZiBFTkFCTEUoTUVESUFfU09VUkNFKQorICAgIGJvb2wgaXNNZWRpYVNvdXJjZTsKKyNlbmRp ZgorfTsKKwogZXh0ZXJuIGNvbnN0IFBsYXRmb3JtTWVkaWEgTm9QbGF0Zm9ybU1lZGlhOwogCiBj bGFzcyBDYWNoZWRSZXNvdXJjZUxvYWRlcjsKQEAgLTI1Myw3ICsyNjUsNyBAQCBwdWJsaWM6CiAK ICAgICAvLyBNZWRpYSBlbmdpbmUgc3VwcG9ydC4KICAgICBlbnVtIFN1cHBvcnRzVHlwZSB7IElz Tm90U3VwcG9ydGVkLCBJc1N1cHBvcnRlZCwgTWF5QmVTdXBwb3J0ZWQgfTsKLSAgICBzdGF0aWMg TWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBzdXBwb3J0c1R5cGUoY29uc3QgQ29udGVudFR5cGUm LCBjb25zdCBTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgVVJMJiwgY29uc3QgTWVkaWFQbGF5ZXJT dXBwb3J0c1R5cGVDbGllbnQqKTsKKyAgICBzdGF0aWMgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlw ZSBzdXBwb3J0c1R5cGUoY29uc3QgTWVkaWFFbmdpbmVTdXBwb3J0UGFyYW1ldGVycyYsIGNvbnN0 IE1lZGlhUGxheWVyU3VwcG9ydHNUeXBlQ2xpZW50Kik7CiAgICAgc3RhdGljIHZvaWQgZ2V0U3Vw cG9ydGVkVHlwZXMoSGFzaFNldDxTdHJpbmc+Jik7CiAgICAgc3RhdGljIGJvb2wgaXNBdmFpbGFi bGUoKTsKICAgICBzdGF0aWMgdm9pZCBnZXRTaXRlc0luTWVkaWFDYWNoZShWZWN0b3I8U3RyaW5n PiYpOwpAQCAtMjgyLDcgKzI5NCw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgbG9hZChjb25zdCBV UkwmLCBjb25zdCBDb250ZW50VHlwZSYsIGNvbnN0IFN0cmluZyYga2V5U3lzdGVtKTsKICNpZiBF TkFCTEUoTUVESUFfU09VUkNFKQotICAgIGJvb2wgbG9hZChjb25zdCBVUkwmLCBQYXNzUmVmUHRy PEhUTUxNZWRpYVNvdXJjZT4pOworICAgIGJvb2wgbG9hZChjb25zdCBVUkwmLCBjb25zdCBDb250 ZW50VHlwZSYsIFBhc3NSZWZQdHI8SFRNTE1lZGlhU291cmNlPik7CiAjZW5kaWYKICAgICB2b2lk IGNhbmNlbExvYWQoKTsKIApAQCAtNTI0LDE4ICs1MzYsNiBAQCBwcml2YXRlOgogI2VuZGlmCiB9 OwogCi1zdHJ1Y3QgTWVkaWFFbmdpbmVTdXBwb3J0UGFyYW1ldGVycyB7Ci0gICAgU3RyaW5nIHR5 cGU7Ci0gICAgU3RyaW5nIGNvZGVjczsKLSAgICBVUkwgdXJsOwotI2lmIEVOQUJMRShFTkNSWVBU RURfTUVESUEpCi0gICAgU3RyaW5nIGtleVN5c3RlbTsKLSNlbmRpZgotI2lmIEVOQUJMRShNRURJ QV9TT1VSQ0UpCi0gICAgYm9vbCBpc01lZGlhU291cmNlOwotI2VuZGlmCi19OwotCiB0eXBlZGVm IFBhc3NPd25QdHI8TWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlPiAoKkNyZWF0ZU1lZGlhRW5n aW5lUGxheWVyKShNZWRpYVBsYXllciopOwogdHlwZWRlZiB2b2lkICgqTWVkaWFFbmdpbmVTdXBw b3J0ZWRUeXBlcykoSGFzaFNldDxTdHJpbmc+JiB0eXBlcyk7CiB0eXBlZGVmIE1lZGlhUGxheWVy OjpTdXBwb3J0c1R5cGUgKCpNZWRpYUVuZ2luZVN1cHBvcnRzVHlwZSkoY29uc3QgTWVkaWFFbmdp bmVTdXBwb3J0UGFyYW1ldGVycyYgcGFyYW1ldGVycyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvTUlNRVR5cGVSZWdpc3RyeU1hYy5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9NSU1FVHlwZVJlZ2lzdHJ5TWFjLm1tCmluZGV4IDg4MzY2NDA1MDNjOGZk NGMxMWVhZDE2YjlkOTQ1NTA2MjE4MTBkODMuLmQyMmUyYjY2MTk4MWMwMDg4MzdkZmJjMmM5YTUz MjYwMDZiMmI0YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9NSU1F VHlwZVJlZ2lzdHJ5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9NSU1F VHlwZVJlZ2lzdHJ5TWFjLm1tCkBAIC03MywxMSArNzMsNCBAQCBib29sIE1JTUVUeXBlUmVnaXN0 cnk6OmlzQXBwbGljYXRpb25QbHVnaW5NSU1FVHlwZShjb25zdCBTdHJpbmcmIE1JTUVUeXBlKQog ICAgIHJldHVybiBmYWxzZTsKIH0KIAotI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCi1ib29sIE1J TUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTWVkaWFTb3VyY2VNSU1FVHlwZShjb25zdCBTdHJp bmcmLCBjb25zdCBTdHJpbmcmKQotewotICAgIHJldHVybiBmYWxzZTsKLX0KLSNlbmRpZgotCiB9 Cg==