146748 2015-07-08 16:19:38 -0700 Make sure MediaSource engine isn't loaded for interpreting MediaStreams in getUserMedia() 2015-07-08 18:23:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED HTML5, InRadar P2 Normal --- 146746 1 mdaiter mdaiter bfulgham commit-queue eric.carlson jonlee mdaiter webkit-bug-importer webkit.review.bot oldest_to_newest 1107934 0 mdaiter 2015-07-08 16:19:38 -0700 MediaSource's AVFObjC engine was previously being loaded for interpreting MediaStreams. Making sure that it doesn't get loaded. 1107935 1 webkit-bug-importer 2015-07-08 16:21:34 -0700 <rdar://problem/21735416> 1107938 2 256418 mdaiter 2015-07-08 16:28:16 -0700 Created attachment 256418 Patch 1107944 3 256418 bfulgham 2015-07-08 16:32:57 -0700 Comment on attachment 256418 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256418&action=review Looks good. Please address my concerns and we can get this landed! > Source/WebCore/ChangeLog:8 > + Add a statement like: "Prevent the MediaSource engine from being used to process MediaStreams, since they are not compatible" > Source/WebCore/ChangeLog:10 > + Changed MediaStream to never be loaded Move this explanation down to line 11, where you were saying "Ditto". > Source/WebCore/ChangeLog:11 > + (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Ditto Remove Ditto from this line. > Source/WebCore/ChangeLog:14 > + * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm: Ditto Remove 'Ditto' from this line. > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:99 > + virtual void load(MediaStreamPrivate*) override { setNetworkState(MediaPlayer::FormatError); } No need for virtual here. "override" takes care of that. I think you should move this implementation inside of MediaPlayerPrivateMediaSourceAVFObjC.mm. 1107950 4 256423 mdaiter 2015-07-08 16:39:48 -0700 Created attachment 256423 Patch 1107953 5 256424 mdaiter 2015-07-08 16:41:31 -0700 Created attachment 256424 Patch 1107958 6 256424 bfulgham 2015-07-08 16:46:09 -0700 Comment on attachment 256424 Patch r=me. We can cq+ this if the tests all pass. 1108038 7 256424 commit-queue 2015-07-08 18:23:33 -0700 Comment on attachment 256424 Patch Clearing flags on attachment: 256424 Committed r186563: <http://trac.webkit.org/changeset/186563> 1108039 8 commit-queue 2015-07-08 18:23:37 -0700 All reviewed patches have been landed. Closing bug. 256418 2015-07-08 16:28:16 -0700 2015-07-08 16:39:46 -0700 Patch bug-146748-20150708162717.patch text/plain 3811 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVjMTRmYTdjOWRlMTdh OTRkMWIxNWY4NDkyM2FjMzI3ZmU3ODQwZi4uNmQ4NDQ1YTA5NzcyOTk4MzI0NDhkNDNiZjBhNjFj YjY5ODhlNjJkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA3LTA4ICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBNZWRp YVN0cmVhbSBlbmdpbmUgbG9hZGVkIGZvciBpbnRlcnByZXRpbmcgTWVkaWFTdHJlYW1zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY3NDgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzIxNzM1NDE2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbTogCisgICAgICAgIENoYW5n ZWQgTWVkaWFTdHJlYW0gdG8gbmV2ZXIgYmUgbG9hZGVkCisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpzdXBwb3J0c1R5cGUpOiBEaXR0bworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oOgorICAgICAgICBEaXR0bworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291 cmNlQVZGT2JqQy5tbTogRGl0dG8KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU291cmNlQVZGT2JqQzo6c3VwcG9ydHNUeXBlKTogRGl0dG8KKwogMjAxNS0wNy0wOCAg Q3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBuZXcg c291cmNlcyB0byBTdHlsZUFsbEluT25lLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXgg MDQwZGFkYWZlMDA2Yzc5YmY1NGNhMDk3OWY1M2E0Yzg5NDQ0NTYzNy4uN2JhYjVjNzhjNWZkOTNh MmYwYTU3NmFjNWY5YzA5NTdhMTU4YThkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC0x NjI3LDcgKzE2MjcsMTAgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpzdXBwb3J0c1R5cGUoY29uc3QKICAgICBpZiAocGFyYW1l dGVycy5pc01lZGlhU291cmNlKQogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3Vw cG9ydGVkOwogI2VuZGlmCi0KKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgIGlmIChwYXJh bWV0ZXJzLmlzTWVkaWFTdHJlYW0pCisgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNOb3RT dXBwb3J0ZWQ7CisjZW5kaWYKICAgICBpZiAoaXNVbnN1cHBvcnRlZE1JTUVUeXBlKHBhcmFtZXRl cnMudHlwZSkpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNOb3RTdXBwb3J0ZWQ7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlTWVkaWFTb3VyY2VBVkZPYmpDLmgKaW5kZXggYWZkMTU2OTk4NWMwYzZiMTE2MTZkNzIwYWU3 ZGY1MzNkZjdlZWYxNy4uNTYxNmQ3ZjljOTM3ZDE4YTIwM2E5NDEwZjg5MGM1MzJhNzU5ZjI4MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLmgKQEAgLTk2LDcgKzk2LDcgQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgbG9hZChjb25zdCBTdHJpbmcmIHVybCkgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCB2b2lkIGxvYWQoY29uc3QgU3RyaW5nJiB1cmwsIE1lZGlhU291cmNlUHJpdmF0ZUNsaWVu dCopIG92ZXJyaWRlOwogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCi0gICAgdm9pZCBsb2FkKE1l ZGlhU3RyZWFtUHJpdmF0ZSopIG92ZXJyaWRlIHsgfQorICAgIHZpcnR1YWwgdm9pZCBsb2FkKE1l ZGlhU3RyZWFtUHJpdmF0ZSopIG92ZXJyaWRlIHsgc2V0TmV0d29ya1N0YXRlKE1lZGlhUGxheWVy OjpGb3JtYXRFcnJvcik7IH0KICNlbmRpZgogICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxMb2FkKCkg b3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5t bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQppbmRleCAzMjM4ZTY4YTkyYTRi YzYxMWYxNDM3ZDgxYTk5ZGVlMGVkNGE3NjRjLi4zNzdhYWE4NTNkN2IzN2Y2ZGFlOTFiZGE5NWIz NTYzM2I3NTkwNzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tCkBAIC0yMzYsNyArMjM2 LDEwIEBAIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT b3VyY2VBVkZPYmpDOjpzdXBwb3J0c1R5cGUoY29uCiAgICAgLy8gVGhpcyBlbmdpbmUgZG9lcyBu b3Qgc3VwcG9ydCBub24tbWVkaWEtc291cmNlIHNvdXJjZXMuCiAgICAgaWYgKCFwYXJhbWV0ZXJz LmlzTWVkaWFTb3VyY2UpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNOb3RTdXBwb3J0 ZWQ7Ci0KKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgIGlmIChwYXJhbWV0ZXJzLmlzTWVk aWFTdHJlYW0pCisgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNOb3RTdXBwb3J0ZWQ7Cisj ZW5kaWYKICAgICBpZiAoIW1pbWVUeXBlQ2FjaGUoKS5jb250YWlucyhwYXJhbWV0ZXJzLnR5cGUp KQogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwogCg== 256423 2015-07-08 16:39:48 -0700 2015-07-08 16:41:29 -0700 Patch bug-146748-20150708163849.patch text/plain 4148 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVjMTRmYTdjOWRlMTdh OTRkMWIxNWY4NDkyM2FjMzI3ZmU3ODQwZi4uNTVjYTQ0YzVkNTY1YjE3ZTI5MGMxYmQ2ZjQ0N2Nj M2FiMzY0NzgzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTA4ICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBNZWRp YVN0cmVhbSBlbmdpbmUgbG9hZGVkIGZvciBpbnRlcnByZXRpbmcgTWVkaWFTdHJlYW1zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY3NDgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzIxNzM1NDE2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbTogCisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpzdXBwb3J0c1R5cGUpOgor ICAgICAgICBDaGFuZ2VkIE1lZGlhU3RyZWFtIHRvIG5ldmVyIGJlIGxvYWRlZAorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1l ZGlhU291cmNlQVZGT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6c3VwcG9y dHNUeXBlKTogCisgICAgICAgIENoYW5nZWQgTWVkaWFTdHJlYW0gdG8gbmV2ZXIgYmUgbG9hZGVk CisKKwogMjAxNS0wNy0wOCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgog CiAgICAgICAgIEFkZCBuZXcgc291cmNlcyB0byBTdHlsZUFsbEluT25lLmNwcApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakMubW0KaW5kZXggMDQwZGFkYWZlMDA2Yzc5YmY1NGNhMDk3OWY1M2E0Yzg5NDQ0NTYz Ny4uN2JhYjVjNzhjNWZkOTNhMmYwYTU3NmFjNWY5YzA5NTdhMTU4YThkYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDLm1tCkBAIC0xNjI3LDcgKzE2MjcsMTAgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRz VHlwZSBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpzdXBwb3J0c1R5cGUoY29u c3QKICAgICBpZiAocGFyYW1ldGVycy5pc01lZGlhU291cmNlKQogICAgICAgICByZXR1cm4gTWVk aWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwogI2VuZGlmCi0KKyNpZiBFTkFCTEUoTUVESUFfU1RS RUFNKQorICAgIGlmIChwYXJhbWV0ZXJzLmlzTWVkaWFTdHJlYW0pCisgICAgICAgIHJldHVybiBN ZWRpYVBsYXllcjo6SXNOb3RTdXBwb3J0ZWQ7CisjZW5kaWYKICAgICBpZiAoaXNVbnN1cHBvcnRl ZE1JTUVUeXBlKHBhcmFtZXRlcnMudHlwZSkpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6 SXNOb3RTdXBwb3J0ZWQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZG T2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLmgKaW5kZXggYWZkMTU2OTk4 NWMwYzZiMTE2MTZkNzIwYWU3ZGY1MzNkZjdlZWYxNy4uYWRhYWM1OGEzOTQ2OGNmMTQxNjI4YmMz NGY4OGJjOTZkZjI4ZmM5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZP YmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLmgKQEAgLTk2LDcgKzk2 LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgbG9hZChjb25zdCBTdHJpbmcmIHVybCkg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGxvYWQoY29uc3QgU3RyaW5nJiB1cmwsIE1lZGlh U291cmNlUHJpdmF0ZUNsaWVudCopIG92ZXJyaWRlOwogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0p Ci0gICAgdm9pZCBsb2FkKE1lZGlhU3RyZWFtUHJpdmF0ZSopIG92ZXJyaWRlIHsgfQorICAgIHZv aWQgbG9hZChNZWRpYVN0cmVhbVByaXZhdGUqKSBvdmVycmlkZTsKICNlbmRpZgogICAgIHZpcnR1 YWwgdm9pZCBjYW5jZWxMb2FkKCkgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU291cmNlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5t bQppbmRleCAzMjM4ZTY4YTkyYTRiYzYxMWYxNDM3ZDgxYTk5ZGVlMGVkNGE3NjRjLi44OWFiMzBl YjI3YzNjZjZjNTRhZDBhNDczMmY5ZDg4OWNmNzI1NDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZh dGVNZWRpYVNvdXJjZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZP YmpDLm1tCkBAIC0yMzYsNyArMjM2LDEwIEBAIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVk aWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjpzdXBwb3J0c1R5cGUoY29uCiAgICAg Ly8gVGhpcyBlbmdpbmUgZG9lcyBub3Qgc3VwcG9ydCBub24tbWVkaWEtc291cmNlIHNvdXJjZXMu CiAgICAgaWYgKCFwYXJhbWV0ZXJzLmlzTWVkaWFTb3VyY2UpCiAgICAgICAgIHJldHVybiBNZWRp YVBsYXllcjo6SXNOb3RTdXBwb3J0ZWQ7Ci0KKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAg IGlmIChwYXJhbWV0ZXJzLmlzTWVkaWFTdHJlYW0pCisgICAgICAgIHJldHVybiBNZWRpYVBsYXll cjo6SXNOb3RTdXBwb3J0ZWQ7CisjZW5kaWYKICAgICBpZiAoIW1pbWVUeXBlQ2FjaGUoKS5jb250 YWlucyhwYXJhbWV0ZXJzLnR5cGUpKQogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90 U3VwcG9ydGVkOwogCkBAIC0yNjYsNiArMjY5LDExIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTb3VyY2VBVkZPYmpDOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJsLCBNZWRpYVNvdXJjZVBy CiAgICAgbV9tZWRpYVNvdXJjZVByaXZhdGUgPSBNZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjpj cmVhdGUodGhpcywgY2xpZW50KTsKIH0KIAordm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakM6OmxvYWQoTWVkaWFTdHJlYW1Qcml2YXRlKikKK3sKKyAgICBzZXROZXR3b3Jr U3RhdGUoTWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yKTsKK30KKwogdm9pZCBNZWRpYVBsYXllclBy aXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmNhbmNlbExvYWQoKQogewogfQo= 256424 2015-07-08 16:41:31 -0700 2015-07-08 18:23:33 -0700 Patch bug-146748-20150708164032.patch text/plain 4270 mdaiter U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzVjMTRmYTdjOWRlMTdh OTRkMWIxNWY4NDkyM2FjMzI3ZmU3ODQwZi4uNGRiNzU2NTc4ODhkN2VkOTYyY2UxYWViYmQzODk5 NjkyNzU3M2JiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA3LTA4ICBNYXR0 aGV3IERhaXRlciAgPG1kYWl0ZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBNZWRp YVN0cmVhbSBlbmdpbmUgbG9hZGVkIGZvciBpbnRlcnByZXRpbmcgTWVkaWFTdHJlYW1zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY3NDgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzIxNzM1NDE2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFByZXZlbnQgdGhlIE1lZGlhU291cmNlIGVuZ2luZSBmcm9t IGJlaW5nIHVzZWQgdG8gcHJvY2VzcworICAgICAgICBNZWRpYVN0cmVhbXMsIHNpbmNlIHRoZXkg YXJlIG5vdCBjb21wYXRpYmxlCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOiAKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnN1cHBvcnRz VHlwZSk6CisgICAgICAgIENoYW5nZWQgTWVkaWFTdHJlYW0gdG8gbmV2ZXIgYmUgbG9hZGVkCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1t OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpD OjpzdXBwb3J0c1R5cGUpOiAKKyAgICAgICAgQ2hhbmdlZCBNZWRpYVN0cmVhbSB0byBuZXZlciBi ZSBsb2FkZWQKKworCiAyMDE1LTA3LTA4ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtp dC5vcmc+CiAKICAgICAgICAgQWRkIG5ldyBzb3VyY2VzIHRvIFN0eWxlQWxsSW5PbmUuY3BwCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCAwNDBkYWRhZmUwMDZjNzliZjU0Y2EwOTc5ZjUzYTRj ODk0NDQ1NjM3Li43YmFiNWM3OGM1ZmQ5M2EyZjBhNTc2YWM1ZjljMDk1N2ExNThhOGRiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTE2MjcsNyArMTYyNywxMCBAQCBNZWRpYVBsYXllcjo6 U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnN1cHBvcnRz VHlwZShjb25zdAogICAgIGlmIChwYXJhbWV0ZXJzLmlzTWVkaWFTb3VyY2UpCiAgICAgICAgIHJl dHVybiBNZWRpYVBsYXllcjo6SXNOb3RTdXBwb3J0ZWQ7CiAjZW5kaWYKLQorI2lmIEVOQUJMRShN RURJQV9TVFJFQU0pCisgICAgaWYgKHBhcmFtZXRlcnMuaXNNZWRpYVN0cmVhbSkKKyAgICAgICAg cmV0dXJuIE1lZGlhUGxheWVyOjpJc05vdFN1cHBvcnRlZDsKKyNlbmRpZgogICAgIGlmIChpc1Vu c3VwcG9ydGVkTUlNRVR5cGUocGFyYW1ldGVycy50eXBlKSkKICAgICAgICAgcmV0dXJuIE1lZGlh UGxheWVyOjpJc05vdFN1cHBvcnRlZDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT b3VyY2VBVkZPYmpDLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMuaAppbmRleCBh ZmQxNTY5OTg1YzBjNmIxMTYxNmQ3MjBhZTdkZjUzM2RmN2VlZjE3Li5hZGFhYzU4YTM5NDY4Y2Yx NDE2MjhiYzM0Zjg4YmM5NmRmMjhmYzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMuaApAQCAt OTYsNyArOTYsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBsb2FkKGNvbnN0IFN0cmlu ZyYgdXJsKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgbG9hZChjb25zdCBTdHJpbmcmIHVy bCwgTWVkaWFTb3VyY2VQcml2YXRlQ2xpZW50Kikgb3ZlcnJpZGU7CiAjaWYgRU5BQkxFKE1FRElB X1NUUkVBTSkKLSAgICB2b2lkIGxvYWQoTWVkaWFTdHJlYW1Qcml2YXRlKikgb3ZlcnJpZGUgeyB9 CisgICAgdm9pZCBsb2FkKE1lZGlhU3RyZWFtUHJpdmF0ZSopIG92ZXJyaWRlOwogI2VuZGlmCiAg ICAgdmlydHVhbCB2b2lkIGNhbmNlbExvYWQoKSBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VB VkZPYmpDLm1tCmluZGV4IDMyMzhlNjhhOTJhNGJjNjExZjE0MzdkODFhOTlkZWUwZWQ0YTc2NGMu Ljg5YWIzMGViMjdjM2NmNmM1NGFkMGE0NzMyZjlkODg5Y2Y3MjU0NGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNv dXJjZUFWRk9iakMubW0KQEAgLTIzNiw3ICsyMzYsMTAgQEAgTWVkaWFQbGF5ZXI6OlN1cHBvcnRz VHlwZSBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnN1cHBvcnRzVHlwZShj b24KICAgICAvLyBUaGlzIGVuZ2luZSBkb2VzIG5vdCBzdXBwb3J0IG5vbi1tZWRpYS1zb3VyY2Ug c291cmNlcy4KICAgICBpZiAoIXBhcmFtZXRlcnMuaXNNZWRpYVNvdXJjZSkKICAgICAgICAgcmV0 dXJuIE1lZGlhUGxheWVyOjpJc05vdFN1cHBvcnRlZDsKLQorI2lmIEVOQUJMRShNRURJQV9TVFJF QU0pCisgICAgaWYgKHBhcmFtZXRlcnMuaXNNZWRpYVN0cmVhbSkKKyAgICAgICAgcmV0dXJuIE1l ZGlhUGxheWVyOjpJc05vdFN1cHBvcnRlZDsKKyNlbmRpZgogICAgIGlmICghbWltZVR5cGVDYWNo ZSgpLmNvbnRhaW5zKHBhcmFtZXRlcnMudHlwZSkpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXll cjo6SXNOb3RTdXBwb3J0ZWQ7CiAKQEAgLTI2Niw2ICsyNjksMTEgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmxvYWQoY29uc3QgU3RyaW5nJiB1cmwsIE1lZGlh U291cmNlUHIKICAgICBtX21lZGlhU291cmNlUHJpdmF0ZSA9IE1lZGlhU291cmNlUHJpdmF0ZUFW Rk9iakM6OmNyZWF0ZSh0aGlzLCBjbGllbnQpOwogfQogCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU291cmNlQVZGT2JqQzo6bG9hZChNZWRpYVN0cmVhbVByaXZhdGUqKQoreworICAgIHNl dE5ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3IpOworfQorCiB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6Y2FuY2VsTG9hZCgpCiB7CiB9Cg==