139444 2014-12-09 05:23:19 -0800 [MSE] Prevent SourceBuffer monitoring algorithm from triggering a HAVE_NOTHING to HAVE_METADATA transition. 2014-12-15 09:28:40 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 b.gajda webkit-unassigned calvaris commit-queue eric.carlson glenn jer.noble ltilve philipj sergio oldest_to_newest 1053751 0 b.gajda 2014-12-09 05:23:19 -0800 Currently transition to HaveMetadata is both in sourceBufferPrivateDidReceiveInitializationSegment() and monitorSourceBuffers(); As monitorSourcebuffers is called after each every append, in 2 SourceBuffers scenario (audio+video) it means, that we send `loadedmetadata` event before second SB will get his first init segment. But `loadedmetadata` states (http://www.w3.org/TR/html5/embedded-content-0.html#event-media-loadedmetadata) "The user agent has just determined the duration and dimensions of the media resource and the text tracks are ready. " So in scenario with first append going to audio SB, second to video SB, we will be unable to ask for video dimension in `loadedmetadata` event handler, as there was no init segment yet. I believe we shouldn't fire this event untill every SourceBuffer have first init segment. Made a bug against spec: https://www.w3.org/Bugs/Public/show_bug.cgi?id=27542 with few more words in it. 1053753 1 242911 b.gajda 2014-12-09 05:28:43 -0800 Created attachment 242911 exit monitorSourceBuffers if any SB didn't receive init segment yet LayoutTest simulates written scenario with ActiveSourceBuffers, as there is no width/height in MockMSE yet, and occurrence is the same for both cases. 1055602 2 243290 b.gajda 2014-12-15 05:17:46 -0800 Created attachment 243290 patch v2 return when have_nothing Shamelessly stolen name from what it looks like in Editor's Draft changelog. As bug in spec was resolved in a way that fixes this issue, I have prepared second version which complies new spec. 1055640 3 243290 commit-queue 2014-12-15 09:28:36 -0800 Comment on attachment 243290 patch v2 return when have_nothing Clearing flags on attachment: 243290 Committed r177281: <http://trac.webkit.org/changeset/177281> 1055641 4 commit-queue 2014-12-15 09:28:40 -0800 All reviewed patches have been landed. Closing bug. 242911 2014-12-09 05:28:43 -0800 2014-12-15 05:17:46 -0800 exit monitorSourceBuffers if any SB didn't receive init segment yet patch_loadedmetadata text/plain 7342 b.gajda ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNmNlNTVjLi5kMDc0NmE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMTIt MDkgIEJhcnRsb21pZWogR2FqZGEgIDxiLmdhamRhQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtN U0VdIFNob3VsZCBub3QgZmlyZSBsb2FkZWRtZXRhZGF0YSB1bnRpbGwgYWxsIFNvdXJjZUJ1ZmZl cnMgaGF2ZSByZWNlaXZlZCBmaXJzdCBpbml0aWFsaXphdGlvbiBzZWdtZW50LgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDQ0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdGVzdCB0byBjaGVj ayBob3cgbWFueSBhY3RpdmUgU291cmNlQnVmZmVycyBleGlzdCB3aGVuIGxvYWRlZG1ldGFkYXRh IGZpcmVzLgorICAgICAgICBBY2NvcmRpbmcgdG8gc3BlYyAzLjUuNywgdGhpcyBzaG91bGQgYmUg dHdvLgorCisgICAgICAgICogbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1sb2FkZWRt ZXRhZGEtd2l0aC10d28tc291cmNlYnVmZmVycy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtbG9hZGVkbWV0YWRhLXdpdGgtdHdv LXNvdXJjZWJ1ZmZlcnMuaHRtbDogQWRkZWQuCisKIDIwMTQtMTItMDkgIEpvYW5tYXJpZSBEaWdn cyAgPGpkaWdnc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEJ1bXAgbWluaW11bSB2ZXJz aW9uIG9mIEFUSyB1c2VkIGJ5IGpoYnVpbGQgdG8gYXQgbGVhc3QgMi4xNS4yCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLWxvYWRlZG1ldGFk YS13aXRoLXR3by1zb3VyY2VidWZmZXJzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlh L21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtbG9hZGVkbWV0YWRhLXdpdGgtdHdvLXNvdXJjZWJ1 ZmZlcnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA1 ZDA1MmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uv bWVkaWEtc291cmNlLWxvYWRlZG1ldGFkYS13aXRoLXR3by1zb3VyY2VidWZmZXJzLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDEzIEBACisKK1JVTih2aWRlby5zcmMgPSBVUkwuY3JlYXRlT2JqZWN0 VVJMKHNvdXJjZSkpCitFVkVOVChzb3VyY2VvcGVuKQorUlVOKHNvdXJjZUJ1ZmZlcjEgPSBzb3Vy Y2UuYWRkU291cmNlQnVmZmVyKCJhdWRpby9tb2NrOyBjb2RlY3M9bW9jayIpKQorUlVOKHNvdXJj ZUJ1ZmZlcjIgPSBzb3VyY2UuYWRkU291cmNlQnVmZmVyKCJ2aWRlby9tb2NrOyBjb2RlY3M9bW9j ayIpKQorUlVOKHNvdXJjZUJ1ZmZlcjEuYXBwZW5kQnVmZmVyKGluaXRTZWdtZW50KSkKK0VWRU5U KHVwZGF0ZWVuZCkKK1JVTihzb3VyY2VCdWZmZXIyLmFwcGVuZEJ1ZmZlcihpbml0U2VnbWVudCkp CitFVkVOVChsb2FkZWRtZXRhZGF0YSkKK0VWRU5UKHVwZGF0ZWVuZCkKK0VYUEVDVEVEIChzb3Vy Y2UuYWN0aXZlU291cmNlQnVmZmVycy5sZW5ndGggPT0gJzInKSBPSworRU5EIE9GIFRFU1QKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1s b2FkZWRtZXRhZGEtd2l0aC10d28tc291cmNlYnVmZmVycy5odG1sIGIvTGF5b3V0VGVzdHMvbWVk aWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1sb2FkZWRtZXRhZGEtd2l0aC10d28tc291cmNl YnVmZmVycy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmEwZDlhMDQK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEt c291cmNlLWxvYWRlZG1ldGFkYS13aXRoLXR3by1zb3VyY2VidWZmZXJzLmh0bWwKQEAgLTAsMCAr MSw2MyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5tb2Nr LW1lZGlhLXNvdXJjZTwvdGl0bGU+CisgICAgPHNjcmlwdCBzcmM9Im1vY2stbWVkaWEtc291cmNl LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vdmlkZW8tdGVzdC5qcyI+PC9zY3Jp cHQ+CisgICAgPHNjcmlwdD4KKyAgICB2YXIgc291cmNlOworICAgIHZhciBzb3VyY2VCdWZmZXIx OworICAgIHZhciBzb3VyY2VCdWZmZXIyOworICAgIHZhciBjb3VudGVyID0gMDsKKworICAgIGlm ICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICBpbnRlcm5hbHMuaW5pdGlhbGl6ZU1vY2tNZWRp YVNvdXJjZSgpOworCisgICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgZmluZE1lZGlh RWxlbWVudCgpOworICAgICAgICBzb3VyY2UgPSBuZXcgTWVkaWFTb3VyY2UoKTsKKyAgICAgICAg d2FpdEZvckV2ZW50KCdzb3VyY2VvcGVuJywgc291cmNlT3BlbiwgZmFsc2UsIGZhbHNlLCBzb3Vy Y2UpOworICAgICAgICBydW4oJ3ZpZGVvLnNyYyA9IFVSTC5jcmVhdGVPYmplY3RVUkwoc291cmNl KScpOworICAgIH0KKworICAgIGZ1bmN0aW9uIHNvdXJjZU9wZW4oKSB7CisgICAgICAgIHJ1bign c291cmNlQnVmZmVyMSA9IHNvdXJjZS5hZGRTb3VyY2VCdWZmZXIoImF1ZGlvL21vY2s7IGNvZGVj cz1tb2NrIiknKTsKKyAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIyID0gc291cmNlLmFkZFNvdXJj ZUJ1ZmZlcigidmlkZW8vbW9jazsgY29kZWNzPW1vY2siKScpOworCisgICAgICAgIHdhaXRGb3JF dmVudE9uKHNvdXJjZUJ1ZmZlcjEsICd1cGRhdGVlbmQnLCB1cGRhdGUxLCBmYWxzZSwgdHJ1ZSk7 CisgICAgICAgIHdhaXRGb3JFdmVudE9uKHNvdXJjZUJ1ZmZlcjIsICd1cGRhdGVlbmQnLCB1cGRh dGUyLCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgIHdhaXRGb3JFdmVudE9uY2UoJ2xvYWRlZG1ldGFk YXRhJywgbG9hZGVkTWV0YWRhdGEpOworCisgICAgICAgIGluaXRTZWdtZW50ID0gbWFrZUFJbml0 KDAsIFttYWtlQVRyYWNrKDEsICdtb2NrJywgVFJBQ0tfS0lORC5BVURJTyldKTsKKyAgICAgICAg cnVuKCdzb3VyY2VCdWZmZXIxLmFwcGVuZEJ1ZmZlcihpbml0U2VnbWVudCknKTsKKyAgICB9CisK KyAgICBmdW5jdGlvbiB1cGRhdGUxKCkgeworICAgICAgICBjb3VudGVyKys7CisgICAgICAgIGlu aXRTZWdtZW50ID0gbWFrZUFJbml0KDAsIFttYWtlQVRyYWNrKDEsICdtb2NrJywgVFJBQ0tfS0lO RC5WSURFTyldKTsKKyAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbiAoKSB7CisgICAgICAgICAg ICBydW4oJ3NvdXJjZUJ1ZmZlcjIuYXBwZW5kQnVmZmVyKGluaXRTZWdtZW50KScpOworICAgICAg ICB9LCAyMDApOworICAgIH0KKworICAgIGZ1bmN0aW9uIHVwZGF0ZTIoKSB7CisgICAgICAgIGNv dW50ZXIrKzsKKyAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICBp ZiAoY291bnRlcj09MykgZW5kVGVzdCgpOworICAgICAgICB9LCAyMDApOworICAgIH0KKworICAg IGZ1bmN0aW9uIGxvYWRlZE1ldGFkYXRhKCkgeworICAgICAgICBjb3VudGVyKys7CisgICAgICAg IHNldFRpbWVvdXQoZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdzb3Vy Y2UuYWN0aXZlU291cmNlQnVmZmVycy5sZW5ndGgnLCAyKTsKKyAgICAgICAgICAgIGlmIChjb3Vu dGVyPT0zKSBlbmRUZXN0KCk7CisgICAgICAgIH0sIDIwMCk7CisgICAgfQorCisgICAgPC9zY3Jp cHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgPHZpZGVvPjwvdmlk ZW8+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjA0YmM5OC4uYzhiYTk3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTEyLTA5ICBCYXJ0bG9taWVqIEdhamRhICA8 Yi5nYWpkYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbTVNFXSBTaG91bGQgbm90IGZpcmUgbG9h ZGVkbWV0YWRhdGEgdW50aWxsIGFsbCBTb3VyY2VCdWZmZXJzIGhhdmUgcmVjZWl2ZWQgZmlyc3Qg aW5pdGlhbGl6YXRpb24gc2VnbWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzOTQ0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEluIGNhc2Ugb2YgMiBTb3VyY2VCdWZmZXJzLCB0aGVyZSBjYW4gYmUg dHJhbnNpdGlvbiB0byBIYXZlTWV0YWRhdGEgZnJvbSBtb25pdG9yU291cmNlQnVmZmVycywKKyAg ICAgICAgZXZlbiB0aG91Z2ggc2Vjb25kIFNvdXJjZUJ1ZmZlciBkaWQgbm90IHJlY2VpdmUgaW5p dCBzZWdtZW50IC0gd2UgY2FuJ3QgcXVlcnkgZm9yIGl0J3MgbWV0YWRhdGEKKyAgICAgICAgc3Vj aCBhcyB3aWR0aC9oZWlnaHQgKGlmIHNlY29uZCBvbmUgd2FzIHZpZGVvKSwgc28gd2Ugc2hvdWxk bid0IGZpcmUgdGhlIGV2ZW50LgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLXNvdXJjZS9t ZWRpYS1zb3VyY2UtbG9hZGVkbWV0YWRhLXdpdGgtdHdvLXNvdXJjZWJ1ZmZlcnMuaHRtbAorCisg ICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVNvdXJjZTo6bW9uaXRvclNvdXJjZUJ1ZmZlcnMpOgorICAgICAgICAqIE1v ZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbW9j ay9tZWRpYXNvdXJjZS9Nb2NrTWVkaWFQbGF5ZXJNZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjptaW1lVHlwZUNhY2hlKToKKwogMjAxNC0xMi0wOSAgQWxiZXJ0byBHYXJjaWEgIDxi ZXJ0b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtNZWRpYV1bR1RLXVtFRkxdIFJlZHVjZSBzdHls ZSB1cGRhdGVzIChwYWludGluZykgaW4gY29udHJvbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAKaW5kZXggZjE2ZWIzZi4uNTFmMmQ4 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNv dXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNv dXJjZS5jcHAKQEAgLTI0NSw2ICsyNDUsMTYgQEAgdm9pZCBNZWRpYVNvdXJjZTo6bW9uaXRvclNv dXJjZUJ1ZmZlcnMoKQogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgLy8gTm90ZTogd2hp bGUgaXQncyB1bmNvbmZpcm1lZCwgdGhlIGZpcnN0IHBsYWNlIG1ha2luZyB0cmFuc2l0aW9uIHRv IEhhdmVNZXRhZGF0YSBzaG91bGQgYmUKKyAgICAvLyBhZnRlciBjb21wbGV0aW5nIGFsbCBpbml0 IHNlZ21lbnRzIGluIGFsbCBzb3VyY2VCdWZmZXJzLCBub3QgZWFybGllciwgYXMgaW4gc3BlYyA6 IDMuNS43IDYuMQorICAgIC8vIEZJWE1FOiBpZiB0aGVyZSB3aWxsIGJlIHNvbWUgY2xhcmlmaWNh dGlvbiBoZXJlOiBodHRwczovL3d3dy53My5vcmcvQnVncy9QdWJsaWMvc2hvd19idWcuY2dpP2lk PTI3NTQyCisgICAgLy8gY2hhbmdlIHRoaXMgYWNjb3JkaW5nbHkuCisgICAgaWYgKHN0ZDo6YW55 X29mKHNvdXJjZUJ1ZmZlcnMoKS0+YmVnaW4oKSwgc291cmNlQnVmZmVycygpLT5lbmQoKSwgW10o UmVmUHRyPFNvdXJjZUJ1ZmZlcj4mIHNvdXJjZUJ1ZmZlcikgeworICAgICAgICByZXR1cm4gIXNv dXJjZUJ1ZmZlci0+cmVjZWl2ZWRGaXJzdEluaXRpYWxpemF0aW9uU2VnbWVudCgpOworICAgIH0p KSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICAvLyDihrMgSWYgYnVmZmVyZWQgZm9y IGFsbCBvYmplY3RzIGluIGFjdGl2ZVNvdXJjZUJ1ZmZlcnMgZG8gbm90IGNvbnRhaW4gVGltZVJh bmdlcyBmb3IgdGhlIGN1cnJlbnQKICAgICAvLyBwbGF5YmFjayBwb3NpdGlvbjoKICAgICBhdXRv IGJlZ2luID0gbV9hY3RpdmVTb3VyY2VCdWZmZXJzLT5iZWdpbigpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmgKaW5kZXggNTFhMDIwYy4u OWNkNjIwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9T b3VyY2VCdWZmZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1Nv dXJjZUJ1ZmZlci5oCkBAIC05Nyw2ICs5Nyw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgYWN0aXZl KCkgY29uc3QgeyByZXR1cm4gbV9hY3RpdmU7IH0KIAorICAgIGJvb2wgcmVjZWl2ZWRGaXJzdElu aXRpYWxpemF0aW9uU2VnbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjZWl2ZWRGaXJzdEluaXRp YWxpemF0aW9uU2VnbWVudDsgfQorCiAgICAgLy8gQWN0aXZlRE9NT2JqZWN0IGludGVyZmFjZQog ICAgIHZpcnR1YWwgYm9vbCBoYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdCBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIHZvaWQgc3RvcCgpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbW9jay9tZWRpYXNvdXJjZS9Nb2NrTWVkaWFQbGF5ZXJNZWRpYVNvdXJjZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL21lZGlhc291cmNlL01vY2tNZWRpYVBs YXllck1lZGlhU291cmNlLmNwcAppbmRleCBjNjYxNzhiLi44Mjg2MzU1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL21lZGlhc291cmNlL01vY2tNZWRpYVBsYXllck1l ZGlhU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL21lZGlhc291 cmNlL01vY2tNZWRpYVBsYXllck1lZGlhU291cmNlLmNwcApAQCAtNTcsNiArNTcsNyBAQCBzdGF0 aWMgSGFzaFNldDxTdHJpbmc+IG1pbWVUeXBlQ2FjaGUoKQogICAgIGlmICghaXNJbml0aWFsaXpl ZCkgewogICAgICAgICBpc0luaXRpYWxpemVkID0gdHJ1ZTsKICAgICAgICAgY2FjaGUuYWRkKEFT Q0lJTGl0ZXJhbCgidmlkZW8vbW9jayIpKTsKKyAgICAgICAgY2FjaGUuYWRkKEFTQ0lJTGl0ZXJh bCgiYXVkaW8vbW9jayIpKTsKICAgICB9CiAKICAgICByZXR1cm4gY2FjaGU7Cg== 243290 2014-12-15 05:17:46 -0800 2014-12-15 09:28:36 -0800 patch v2 return when have_nothing patch_prevent_havemetadata_v2.txt text/plain 6598 b.gajda ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4YjlhNTA2Li5hZDY4ZTUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMTIt MDkgIEJhcnRsb21pZWogR2FqZGEgIDxiLmdhamRhQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtN U0VdIFByZXZlbnQgU291cmNlQnVmZmVyIG1vbml0b3JpbmcgYWxnb3JpdGhtIGZyb20gdHJpZ2dl cmluZyBhIEhBVkVfTk9USElORyB0byBIQVZFX01FVEFEQVRBIHRyYW5zaXRpb24uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk0NDQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXN0IHRvIGNo ZWNrIGhvdyBtYW55IGFjdGl2ZSBTb3VyY2VCdWZmZXJzIGV4aXN0IHdoZW4gbG9hZGVkbWV0YWRh dGEgZmlyZXMsCisgICAgICAgIGFjY29yZGluZyB0byBzcGVjIDMuNS43LCB0aGlzIHNob3VsZCBi ZSBlcXVhbCB0byBudW1iZXIgb2Ygc291cmNlYnVmZmVycy4KKworICAgICAgICAqIG1lZGlhL21l ZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtbG9hZGVkbWV0YWRhLXdpdGgtdHdvLXNvdXJjZWJ1ZmZl cnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3VyY2UvbWVk aWEtc291cmNlLWxvYWRlZG1ldGFkYS13aXRoLXR3by1zb3VyY2VidWZmZXJzLmh0bWw6IEFkZGVk LgorCiAyMDE0LTEyLTEyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg ICAgICAgIFtXZWJHTF0gVGV4dHVyZSBzaXplIHRlc3RzIGZhaWx1cmVzCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLWxvYWRlZG1ldGFkYS13 aXRoLXR3by1zb3VyY2VidWZmZXJzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21l ZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtbG9hZGVkbWV0YWRhLXdpdGgtdHdvLXNvdXJjZWJ1ZmZl cnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjA1ZDA1 MmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVk aWEtc291cmNlLWxvYWRlZG1ldGFkYS13aXRoLXR3by1zb3VyY2VidWZmZXJzLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDEzIEBACisKK1JVTih2aWRlby5zcmMgPSBVUkwuY3JlYXRlT2JqZWN0VVJM KHNvdXJjZSkpCitFVkVOVChzb3VyY2VvcGVuKQorUlVOKHNvdXJjZUJ1ZmZlcjEgPSBzb3VyY2Uu YWRkU291cmNlQnVmZmVyKCJhdWRpby9tb2NrOyBjb2RlY3M9bW9jayIpKQorUlVOKHNvdXJjZUJ1 ZmZlcjIgPSBzb3VyY2UuYWRkU291cmNlQnVmZmVyKCJ2aWRlby9tb2NrOyBjb2RlY3M9bW9jayIp KQorUlVOKHNvdXJjZUJ1ZmZlcjEuYXBwZW5kQnVmZmVyKGluaXRTZWdtZW50KSkKK0VWRU5UKHVw ZGF0ZWVuZCkKK1JVTihzb3VyY2VCdWZmZXIyLmFwcGVuZEJ1ZmZlcihpbml0U2VnbWVudCkpCitF VkVOVChsb2FkZWRtZXRhZGF0YSkKK0VWRU5UKHVwZGF0ZWVuZCkKK0VYUEVDVEVEIChzb3VyY2Uu YWN0aXZlU291cmNlQnVmZmVycy5sZW5ndGggPT0gJzInKSBPSworRU5EIE9GIFRFU1QKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1sb2Fk ZWRtZXRhZGEtd2l0aC10d28tc291cmNlYnVmZmVycy5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEv bWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1sb2FkZWRtZXRhZGEtd2l0aC10d28tc291cmNlYnVm ZmVycy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmEwZDlhMDQKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291 cmNlLWxvYWRlZG1ldGFkYS13aXRoLXR3by1zb3VyY2VidWZmZXJzLmh0bWwKQEAgLTAsMCArMSw2 MyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5tb2NrLW1l ZGlhLXNvdXJjZTwvdGl0bGU+CisgICAgPHNjcmlwdCBzcmM9Im1vY2stbWVkaWEtc291cmNlLmpz Ij48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vdmlkZW8tdGVzdC5qcyI+PC9zY3JpcHQ+ CisgICAgPHNjcmlwdD4KKyAgICB2YXIgc291cmNlOworICAgIHZhciBzb3VyY2VCdWZmZXIxOwor ICAgIHZhciBzb3VyY2VCdWZmZXIyOworICAgIHZhciBjb3VudGVyID0gMDsKKworICAgIGlmICh3 aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICBpbnRlcm5hbHMuaW5pdGlhbGl6ZU1vY2tNZWRpYVNv dXJjZSgpOworCisgICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgZmluZE1lZGlhRWxl bWVudCgpOworICAgICAgICBzb3VyY2UgPSBuZXcgTWVkaWFTb3VyY2UoKTsKKyAgICAgICAgd2Fp dEZvckV2ZW50KCdzb3VyY2VvcGVuJywgc291cmNlT3BlbiwgZmFsc2UsIGZhbHNlLCBzb3VyY2Up OworICAgICAgICBydW4oJ3ZpZGVvLnNyYyA9IFVSTC5jcmVhdGVPYmplY3RVUkwoc291cmNlKScp OworICAgIH0KKworICAgIGZ1bmN0aW9uIHNvdXJjZU9wZW4oKSB7CisgICAgICAgIHJ1bignc291 cmNlQnVmZmVyMSA9IHNvdXJjZS5hZGRTb3VyY2VCdWZmZXIoImF1ZGlvL21vY2s7IGNvZGVjcz1t b2NrIiknKTsKKyAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIyID0gc291cmNlLmFkZFNvdXJjZUJ1 ZmZlcigidmlkZW8vbW9jazsgY29kZWNzPW1vY2siKScpOworCisgICAgICAgIHdhaXRGb3JFdmVu dE9uKHNvdXJjZUJ1ZmZlcjEsICd1cGRhdGVlbmQnLCB1cGRhdGUxLCBmYWxzZSwgdHJ1ZSk7Cisg ICAgICAgIHdhaXRGb3JFdmVudE9uKHNvdXJjZUJ1ZmZlcjIsICd1cGRhdGVlbmQnLCB1cGRhdGUy LCBmYWxzZSwgdHJ1ZSk7CisgICAgICAgIHdhaXRGb3JFdmVudE9uY2UoJ2xvYWRlZG1ldGFkYXRh JywgbG9hZGVkTWV0YWRhdGEpOworCisgICAgICAgIGluaXRTZWdtZW50ID0gbWFrZUFJbml0KDAs IFttYWtlQVRyYWNrKDEsICdtb2NrJywgVFJBQ0tfS0lORC5BVURJTyldKTsKKyAgICAgICAgcnVu KCdzb3VyY2VCdWZmZXIxLmFwcGVuZEJ1ZmZlcihpbml0U2VnbWVudCknKTsKKyAgICB9CisKKyAg ICBmdW5jdGlvbiB1cGRhdGUxKCkgeworICAgICAgICBjb3VudGVyKys7CisgICAgICAgIGluaXRT ZWdtZW50ID0gbWFrZUFJbml0KDAsIFttYWtlQVRyYWNrKDEsICdtb2NrJywgVFJBQ0tfS0lORC5W SURFTyldKTsKKyAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICBy dW4oJ3NvdXJjZUJ1ZmZlcjIuYXBwZW5kQnVmZmVyKGluaXRTZWdtZW50KScpOworICAgICAgICB9 LCAyMDApOworICAgIH0KKworICAgIGZ1bmN0aW9uIHVwZGF0ZTIoKSB7CisgICAgICAgIGNvdW50 ZXIrKzsKKyAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICBpZiAo Y291bnRlcj09MykgZW5kVGVzdCgpOworICAgICAgICB9LCAyMDApOworICAgIH0KKworICAgIGZ1 bmN0aW9uIGxvYWRlZE1ldGFkYXRhKCkgeworICAgICAgICBjb3VudGVyKys7CisgICAgICAgIHNl dFRpbWVvdXQoZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdzb3VyY2Uu YWN0aXZlU291cmNlQnVmZmVycy5sZW5ndGgnLCAyKTsKKyAgICAgICAgICAgIGlmIChjb3VudGVy PT0zKSBlbmRUZXN0KCk7CisgICAgICAgIH0sIDIwMCk7CisgICAgfQorCisgICAgPC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgPHZpZGVvPjwvdmlkZW8+ Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTJkOTA2NS4uMjhjYTViMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTEyLTA5ICBCYXJ0bG9taWVqIEdhamRhICA8Yi5n YWpkYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbTVNFXSBQcmV2ZW50IFNvdXJjZUJ1ZmZlciBt b25pdG9yaW5nIGFsZ29yaXRobSBmcm9tIHRyaWdnZXJpbmcgYSBIQVZFX05PVEhJTkcgdG8gSEFW RV9NRVRBREFUQSB0cmFuc2l0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM5NDQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW4gY2FzZSBvZiAyIFNvdXJjZUJ1ZmZlcnMsIHRoZXJlIGNhbiBiZSB0 cmFuc2l0aW9uIHRvIEhhdmVNZXRhZGF0YSBmcm9tIG1vbml0b3JTb3VyY2VCdWZmZXJzLAorICAg ICAgICBldmVuIHRob3VnaCBzZWNvbmQgU291cmNlQnVmZmVyIGRpZCBub3QgcmVjZWl2ZSBpbml0 IHNlZ21lbnQgLSB3ZSBjYW4ndCBxdWVyeSBmb3IgaXQncyBtZXRhZGF0YQorICAgICAgICBzdWNo IGFzIHdpZHRoL2hlaWdodCAoaWYgc2Vjb25kIG9uZSB3YXMgdmlkZW8pLCBzbyB3ZSBzaG91bGRu J3QgZmlyZSB0aGUgZXZlbnQuCisgICAgICAgIFczIEJ1ZyByZWZlcmVuY2UgOiBodHRwczovL3d3 dy53My5vcmcvQnVncy9QdWJsaWMvc2hvd19idWcuY2dpP2lkPTI3NTQyCisKKyAgICAgICAgVGVz dDogbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1sb2FkZWRtZXRhZGEtd2l0aC10d28t c291cmNlYnVmZmVycy5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc291cmNlL01lZGlh U291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU291cmNlOjptb25pdG9yU291cmNl QnVmZmVycyk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS9tb2NrL21lZGlhc291cmNlL01vY2tNZWRpYVBsYXllck1lZGlh U291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1pbWVUeXBlQ2FjaGUpOgorCiAyMDE0LTEy LTEyICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gV29yayBh cm91bmQgYSBidWcgaW4gZHN5bXV0aWwgb24gb2xkZXIgT1MgdmVyc2lvbnMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAKaW5kZXggNWUz NTRhNS4uY2FiMmY5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNv dXJjZS9NZWRpYVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNv dXJjZS9NZWRpYVNvdXJjZS5jcHAKQEAgLTI0Niw2ICsyNDYsMTMgQEAgdm9pZCBNZWRpYVNvdXJj ZTo6bW9uaXRvclNvdXJjZUJ1ZmZlcnMoKQogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAg Ly8gaHR0cDovL3czYy5naXRodWIuaW8vbWVkaWEtc291cmNlLyNidWZmZXItbW9uaXRvcmluZywg Y2hhbmdlIGZyb20gMTEgRGVjZW1iZXIgMjAxNAorICAgIC8vIOKGsyBJZiB0aGUgdGhlIEhUTUxN ZWRpYUVsZW1lbnQucmVhZHlTdGF0ZSBhdHRyaWJ1dGUgZXF1YWxzIEhBVkVfTk9USElORzoKKyAg ICBpZiAobWVkaWFFbGVtZW50KCktPnJlYWR5U3RhdGUoKSA9PSBIVE1MTWVkaWFFbGVtZW50OjpI QVZFX05PVEhJTkcpIHsKKyAgICAgICAgLy8gMS4gQWJvcnQgdGhlc2Ugc3RlcHMuCisgICAgICAg IHJldHVybjsKKyAgICB9CisKICAgICAvLyDihrMgSWYgYnVmZmVyZWQgZm9yIGFsbCBvYmplY3Rz IGluIGFjdGl2ZVNvdXJjZUJ1ZmZlcnMgZG8gbm90IGNvbnRhaW4gVGltZVJhbmdlcyBmb3IgdGhl IGN1cnJlbnQKICAgICAvLyBwbGF5YmFjayBwb3NpdGlvbjoKICAgICBhdXRvIGJlZ2luID0gbV9h Y3RpdmVTb3VyY2VCdWZmZXJzLT5iZWdpbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbW9jay9tZWRpYXNvdXJjZS9Nb2NrTWVkaWFQbGF5ZXJNZWRpYVNvdXJjZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL21lZGlhc291cmNlL01vY2tNZWRpYVBsYXll ck1lZGlhU291cmNlLmNwcAppbmRleCBjNjYxNzhiLi44Mjg2MzU1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL21lZGlhc291cmNlL01vY2tNZWRpYVBsYXllck1lZGlh U291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL21lZGlhc291cmNl L01vY2tNZWRpYVBsYXllck1lZGlhU291cmNlLmNwcApAQCAtNTcsNiArNTcsNyBAQCBzdGF0aWMg SGFzaFNldDxTdHJpbmc+IG1pbWVUeXBlQ2FjaGUoKQogICAgIGlmICghaXNJbml0aWFsaXplZCkg ewogICAgICAgICBpc0luaXRpYWxpemVkID0gdHJ1ZTsKICAgICAgICAgY2FjaGUuYWRkKEFTQ0lJ TGl0ZXJhbCgidmlkZW8vbW9jayIpKTsKKyAgICAgICAgY2FjaGUuYWRkKEFTQ0lJTGl0ZXJhbCgi YXVkaW8vbW9jayIpKTsKICAgICB9CiAKICAgICByZXR1cm4gY2FjaGU7Cg==