145703 2015-06-05 11:37:48 -0700 MediaSessions should keep track of their participating media elements 2015-06-05 15:33:55 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 145411 1 mrajca webkit-unassigned commit-queue conrad_shultz eric.carlson jer.noble mrajca webkit-bug-importer oldest_to_newest 1099879 0 mrajca 2015-06-05 11:37:48 -0700 Per the Media Session spec, media sessions should keep track of their participating media elements. We will also need a convenience accessor to the active participating media elements when activating media sessions, handling MediaPlayPause events, and more. 1099883 1 webkit-bug-importer 2015-06-05 11:39:10 -0700 <rdar://problem/21263059> 1099911 2 254373 mrajca 2015-06-05 12:55:00 -0700 Created attachment 254373 Patch 1099924 3 254373 eric.carlson 2015-06-05 13:38:39 -0700 Comment on attachment 254373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254373&action=review > Source/WebCore/Modules/mediasession/MediaSession.h:63 > State m_currentState { State::Idle }; > > + friend class HTMLMediaElement; > + > + Vector<HTMLMediaElement*> m_participatingElements; Nit: instance variables are typically declared after methods. 1099925 4 254377 mrajca 2015-06-05 13:41:14 -0700 Created attachment 254377 Patch 1099963 5 254377 commit-queue 2015-06-05 14:38:17 -0700 Comment on attachment 254377 Patch Rejecting attachment 254377 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 254377, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 185261 = 0677956ac2bcc8a1d65a4547f0dfb591c996cefc r185262 = f91c4b4882085ddc04885a962e70876f59d818ea r185263 = 065724ea223aa04fb93118eff1d87f7a290df893 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.appspot.com/results/5199210643193856 1099970 6 254388 mrajca 2015-06-05 14:44:26 -0700 Created attachment 254388 Patch (re-based) 1099990 7 254388 commit-queue 2015-06-05 15:33:51 -0700 Comment on attachment 254388 Patch (re-based) Clearing flags on attachment: 254388 Committed r185270: <http://trac.webkit.org/changeset/185270> 1099991 8 commit-queue 2015-06-05 15:33:55 -0700 All reviewed patches have been landed. Closing bug. 254373 2015-06-05 12:55:00 -0700 2015-06-05 13:41:09 -0700 Patch bug-145703-20150605125438.patch text/plain 4565 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTA5MTNmYjIxNzcxMTFh NjU5NjhiZjg4NWMzZTYxMWNhN2UzMTc1Yy4uYmJmZGQ4M2EzNTBjNWI5YTFhOTcxZmQ1N2NmYzQ1 YTUzNGUyNzZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA2LTA1ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNlc3Npb25zIHNob3Vs ZCBrZWVwIHRyYWNrIG9mIHRoZWlyIHBhcnRpY2lwYXRpbmcgbWVkaWEgZWxlbWVudHMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU3MDMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVk aWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Np b246OmFkZE1lZGlhRWxlbWVudCk6IEFkZCB0aGUgZ2l2ZW4gbWVkaWEgZWxlbWVudCB0byB0aGUg bWVkaWEgc2Vzc2lvbi4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbjo6cmVtb3ZlTWVk aWFFbGVtZW50KTogUmVtb3ZlIHRoZSBnaXZlbiBtZWRpYSBlbGVtZW50IGZyb20gdGhlIG1lZGlh IHNlc3Npb24uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb246OmFjdGl2ZVBhcnRpY2lw YXRpbmdFbGVtZW50cyk6IER5bmFtaWNhbGx5IGJ1aWxkIGEgdmVjdG9yIG9mIGFjdGl2ZWx5LXBs YXlpbmcgbWVkaWEKKyAgICAgICAgICBlbGVtZW50cy4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c2Vzc2lvbi9NZWRpYVNlc3Npb24uaDoKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1l bnQpOiBFbnN1cmUgdGhlIGVsZW1lbnQgaXMgcmVtb3ZlZCBmcm9tIGl0cyBtZWRpYSBzZXNzaW9u LgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0U2Vzc2lvbik6IFVwZGF0 ZSBzZXNzaW9ucycgcmVmZXJlbmNlcyB0byB0aGVpciBtZWRpYSBlbGVtZW50cy4KKwogMjAxNS0w Ni0wNCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIE1l ZGlhU2Vzc2lvbk1hbmFnZXIgdG8gUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyIGZvciBjb25z aXN0ZW5jeSB3aXRoIFBsYXRmb3JtTWVkaWFTZXNzaW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHAKaW5kZXggOWZiYTYxMmU3 NDRlN2IzZWNhMDk2MTNjNjk4YThkMWJiMWNjNGJmNS4uYWQ4MWRmNzg0NGIzYzE0Mjk0NWQ0MmMz OTdkNjEyODhkNDdjMzEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uY3BwCkBAIC0yOCw2ICsyOCw4IEBACiAKICNpZiBFTkFC TEUoTUVESUFfU0VTU0lPTikKIAorI2luY2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnQuaCIKKwogbmFt ZXNwYWNlIFdlYkNvcmUgewogCiBNZWRpYVNlc3Npb246Ok1lZGlhU2Vzc2lvbihTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIGtpbmQpCkBAIC00OCw2ICs1MCwz MCBAQCBNZWRpYVJlbW90ZUNvbnRyb2xzKiBNZWRpYVNlc3Npb246OmNvbnRyb2xzKGJvb2wmIGlz TnVsbCkKICAgICByZXR1cm4gY29udHJvbHM7CiB9CiAKK3ZvaWQgTWVkaWFTZXNzaW9uOjphZGRN ZWRpYUVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCYgZWxlbWVudCkKK3sKKyAgICBBU1NFUlQoIW1f cGFydGljaXBhdGluZ0VsZW1lbnRzLmNvbnRhaW5zKCZlbGVtZW50KSk7CisgICAgbV9wYXJ0aWNp cGF0aW5nRWxlbWVudHMuYXBwZW5kKCZlbGVtZW50KTsKK30KKwordm9pZCBNZWRpYVNlc3Npb246 OnJlbW92ZU1lZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50JiBlbGVtZW50KQoreworICAgIEFT U0VSVChtX3BhcnRpY2lwYXRpbmdFbGVtZW50cy5jb250YWlucygmZWxlbWVudCkpOworICAgIG1f cGFydGljaXBhdGluZ0VsZW1lbnRzLnJlbW92ZShtX3BhcnRpY2lwYXRpbmdFbGVtZW50cy5maW5k KCZlbGVtZW50KSk7Cit9CisKK1ZlY3RvcjxIVE1MTWVkaWFFbGVtZW50Kj4gTWVkaWFTZXNzaW9u OjphY3RpdmVQYXJ0aWNpcGF0aW5nRWxlbWVudHMoKSBjb25zdAoreworICAgIFZlY3RvcjxIVE1M TWVkaWFFbGVtZW50Kj4gZWxlbWVudHM7CisKKyAgICBmb3IgKGF1dG8qIGVsZW1lbnQgOiBtX3Bh cnRpY2lwYXRpbmdFbGVtZW50cykgeworICAgICAgICBpZiAoZWxlbWVudC0+aXNQbGF5aW5nKCkp CisgICAgICAgICAgICBlbGVtZW50cy5hcHBlbmQoZWxlbWVudCk7CisgICAgfQorCisgICAgcmV0 dXJuIGVsZW1lbnRzOworfQorCiB2b2lkIE1lZGlhU2Vzc2lvbjo6cmVsZWFzZVNlc3Npb24oKQog ewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVk aWFTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNl c3Npb24uaAppbmRleCBiZmQxNDBkYTE0YWIwNDQwYTczZDllMzk1OGRmZWZhNTZhNzc2M2MzLi44 NjRjMjUyN2FkYTM0OGZjZjFhZWFmZmExYTI4ODRiODU3MmI1NTAyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uaApAQCAtMzIsNiAr MzIsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEhUTUxNZWRpYUVsZW1lbnQ7 CisKIGNsYXNzIE1lZGlhU2Vzc2lvbiBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhU2Vz c2lvbj4gewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8TWVkaWFTZXNzaW9uPiBjcmVhdGUoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgU3RyaW5nJiBraW5kKQpAQCAtNTYs NiArNTgsMTUgQEAgcHJpdmF0ZToKIAogICAgIFN0YXRlIG1fY3VycmVudFN0YXRlIHsgU3RhdGU6 OklkbGUgfTsKIAorICAgIGZyaWVuZCBjbGFzcyBIVE1MTWVkaWFFbGVtZW50OworCisgICAgVmVj dG9yPEhUTUxNZWRpYUVsZW1lbnQqPiBtX3BhcnRpY2lwYXRpbmdFbGVtZW50czsKKworICAgIHZv aWQgYWRkTWVkaWFFbGVtZW50KEhUTUxNZWRpYUVsZW1lbnQmKTsKKyAgICB2b2lkIHJlbW92ZU1l ZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50Jik7CisKKyAgICBWZWN0b3I8SFRNTE1lZGlhRWxl bWVudCo+IGFjdGl2ZVBhcnRpY2lwYXRpbmdFbGVtZW50cygpIGNvbnN0OworCiAgICAgY29uc3Qg U3RyaW5nIG1fa2luZDsKICAgICBSZWZQdHI8TWVkaWFSZW1vdGVDb250cm9scz4gbV9jb250cm9s czsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBiYTQx MDllNGRiMDlmOTdmMDA4MGEyZWE4N2RmM2MxOWY1NTc2NTg4Li5lYjcwMDRjZDEwZjgwOGMzY2Yz MjdiMTk2MTZlYTkwYjU5OTUzNDAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5jcHAKQEAgLTQ1Nyw2ICs0NTcsMTMgQEAgSFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRp YUVsZW1lbnQoKQogICAgICAgICBtX2lzb2xhdGVkV29ybGQtPmNsZWFyV3JhcHBlcnMoKTsKICNl bmRpZgogCisjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCisgICAgaWYgKG1fc2Vzc2lvbikgewor ICAgICAgICBtX3Nlc3Npb24tPnJlbW92ZU1lZGlhRWxlbWVudCgqdGhpcyk7CisgICAgICAgIG1f c2Vzc2lvbiA9IG51bGxwdHI7CisgICAgfQorI2VuZGlmCisKICAgICBtX3NlZWtUYXNrUXVldWUu Y2xvc2UoKTsKIAogICAgIG1fY29tcGxldGVseUxvYWRlZCA9IHRydWU7CkBAIC02MzY3LDcgKzYz NzQsMTMgQEAgTWVkaWFTZXNzaW9uKiBIVE1MTWVkaWFFbGVtZW50OjpzZXNzaW9uKCkgY29uc3QK IAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRTZXNzaW9uKE1lZGlhU2Vzc2lvbiogc2Vzc2lv bikKIHsKKyAgICBpZiAobV9zZXNzaW9uKQorICAgICAgICBtX3Nlc3Npb24tPnJlbW92ZU1lZGlh RWxlbWVudCgqdGhpcyk7CisKICAgICBtX3Nlc3Npb24gPSBzZXNzaW9uOworCisgICAgaWYgKHNl c3Npb24pCisgICAgICAgIHNlc3Npb24tPmFkZE1lZGlhRWxlbWVudCgqdGhpcyk7CiB9CiAKICNl bmRpZgo= 254377 2015-06-05 13:41:14 -0700 2015-06-05 14:44:21 -0700 Patch bug-145703-20150605134051.patch text/plain 4588 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTA5MTNmYjIxNzcxMTFh NjU5NjhiZjg4NWMzZTYxMWNhN2UzMTc1Yy4uYmJmZGQ4M2EzNTBjNWI5YTFhOTcxZmQ1N2NmYzQ1 YTUzNGUyNzZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA2LTA1ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNlc3Npb25zIHNob3Vs ZCBrZWVwIHRyYWNrIG9mIHRoZWlyIHBhcnRpY2lwYXRpbmcgbWVkaWEgZWxlbWVudHMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU3MDMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVk aWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Np b246OmFkZE1lZGlhRWxlbWVudCk6IEFkZCB0aGUgZ2l2ZW4gbWVkaWEgZWxlbWVudCB0byB0aGUg bWVkaWEgc2Vzc2lvbi4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbjo6cmVtb3ZlTWVk aWFFbGVtZW50KTogUmVtb3ZlIHRoZSBnaXZlbiBtZWRpYSBlbGVtZW50IGZyb20gdGhlIG1lZGlh IHNlc3Npb24uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb246OmFjdGl2ZVBhcnRpY2lw YXRpbmdFbGVtZW50cyk6IER5bmFtaWNhbGx5IGJ1aWxkIGEgdmVjdG9yIG9mIGFjdGl2ZWx5LXBs YXlpbmcgbWVkaWEKKyAgICAgICAgICBlbGVtZW50cy4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c2Vzc2lvbi9NZWRpYVNlc3Npb24uaDoKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1l bnQpOiBFbnN1cmUgdGhlIGVsZW1lbnQgaXMgcmVtb3ZlZCBmcm9tIGl0cyBtZWRpYSBzZXNzaW9u LgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0U2Vzc2lvbik6IFVwZGF0 ZSBzZXNzaW9ucycgcmVmZXJlbmNlcyB0byB0aGVpciBtZWRpYSBlbGVtZW50cy4KKwogMjAxNS0w Ni0wNCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIE1l ZGlhU2Vzc2lvbk1hbmFnZXIgdG8gUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyIGZvciBjb25z aXN0ZW5jeSB3aXRoIFBsYXRmb3JtTWVkaWFTZXNzaW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHAKaW5kZXggOWZiYTYxMmU3 NDRlN2IzZWNhMDk2MTNjNjk4YThkMWJiMWNjNGJmNS4uYWQ4MWRmNzg0NGIzYzE0Mjk0NWQ0MmMz OTdkNjEyODhkNDdjMzEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uY3BwCkBAIC0yOCw2ICsyOCw4IEBACiAKICNpZiBFTkFC TEUoTUVESUFfU0VTU0lPTikKIAorI2luY2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnQuaCIKKwogbmFt ZXNwYWNlIFdlYkNvcmUgewogCiBNZWRpYVNlc3Npb246Ok1lZGlhU2Vzc2lvbihTY3JpcHRFeGVj dXRpb25Db250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIGtpbmQpCkBAIC00OCw2ICs1MCwz MCBAQCBNZWRpYVJlbW90ZUNvbnRyb2xzKiBNZWRpYVNlc3Npb246OmNvbnRyb2xzKGJvb2wmIGlz TnVsbCkKICAgICByZXR1cm4gY29udHJvbHM7CiB9CiAKK3ZvaWQgTWVkaWFTZXNzaW9uOjphZGRN ZWRpYUVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCYgZWxlbWVudCkKK3sKKyAgICBBU1NFUlQoIW1f cGFydGljaXBhdGluZ0VsZW1lbnRzLmNvbnRhaW5zKCZlbGVtZW50KSk7CisgICAgbV9wYXJ0aWNp cGF0aW5nRWxlbWVudHMuYXBwZW5kKCZlbGVtZW50KTsKK30KKwordm9pZCBNZWRpYVNlc3Npb246 OnJlbW92ZU1lZGlhRWxlbWVudChIVE1MTWVkaWFFbGVtZW50JiBlbGVtZW50KQoreworICAgIEFT U0VSVChtX3BhcnRpY2lwYXRpbmdFbGVtZW50cy5jb250YWlucygmZWxlbWVudCkpOworICAgIG1f cGFydGljaXBhdGluZ0VsZW1lbnRzLnJlbW92ZShtX3BhcnRpY2lwYXRpbmdFbGVtZW50cy5maW5k KCZlbGVtZW50KSk7Cit9CisKK1ZlY3RvcjxIVE1MTWVkaWFFbGVtZW50Kj4gTWVkaWFTZXNzaW9u OjphY3RpdmVQYXJ0aWNpcGF0aW5nRWxlbWVudHMoKSBjb25zdAoreworICAgIFZlY3RvcjxIVE1M TWVkaWFFbGVtZW50Kj4gZWxlbWVudHM7CisKKyAgICBmb3IgKGF1dG8qIGVsZW1lbnQgOiBtX3Bh cnRpY2lwYXRpbmdFbGVtZW50cykgeworICAgICAgICBpZiAoZWxlbWVudC0+aXNQbGF5aW5nKCkp CisgICAgICAgICAgICBlbGVtZW50cy5hcHBlbmQoZWxlbWVudCk7CisgICAgfQorCisgICAgcmV0 dXJuIGVsZW1lbnRzOworfQorCiB2b2lkIE1lZGlhU2Vzc2lvbjo6cmVsZWFzZVNlc3Npb24oKQog ewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVk aWFTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNl c3Npb24uaAppbmRleCBiZmQxNDBkYTE0YWIwNDQwYTczZDllMzk1OGRmZWZhNTZhNzc2M2MzLi5i YzNmZmZlZDllZjQxNDYwN2Q2Njk5ODVmODZjNjU5YzIyYjYyZDZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNlc3Npb24uaApAQCAtMzIsNiAr MzIsOCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEhUTUxNZWRpYUVsZW1lbnQ7 CisKIGNsYXNzIE1lZGlhU2Vzc2lvbiBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhU2Vz c2lvbj4gewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8TWVkaWFTZXNzaW9uPiBjcmVhdGUoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgU3RyaW5nJiBraW5kKQpAQCAtNTQs NyArNTYsMTUgQEAgcHJpdmF0ZToKICAgICAgICAgSW50ZXJydXB0ZWQKICAgICB9OwogCisgICAg ZnJpZW5kIGNsYXNzIEhUTUxNZWRpYUVsZW1lbnQ7CisKKyAgICB2b2lkIGFkZE1lZGlhRWxlbWVu dChIVE1MTWVkaWFFbGVtZW50Jik7CisgICAgdm9pZCByZW1vdmVNZWRpYUVsZW1lbnQoSFRNTE1l ZGlhRWxlbWVudCYpOworCisgICAgVmVjdG9yPEhUTUxNZWRpYUVsZW1lbnQqPiBhY3RpdmVQYXJ0 aWNpcGF0aW5nRWxlbWVudHMoKSBjb25zdDsKKwogICAgIFN0YXRlIG1fY3VycmVudFN0YXRlIHsg U3RhdGU6OklkbGUgfTsKKyAgICBWZWN0b3I8SFRNTE1lZGlhRWxlbWVudCo+IG1fcGFydGljaXBh dGluZ0VsZW1lbnRzOwogCiAgICAgY29uc3QgU3RyaW5nIG1fa2luZDsKICAgICBSZWZQdHI8TWVk aWFSZW1vdGVDb250cm9scz4gbV9jb250cm9sczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCmluZGV4IGJhNDEwOWU0ZGIwOWY5N2YwMDgwYTJlYTg3ZGYzYzE5ZjU1NzY1 ODguLmViNzAwNGNkMTBmODA4YzNjZjMyN2IxOTYxNmVhOTBiNTk5NTM0MDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNDU3LDYgKzQ1NywxMyBAQCBIVE1M TWVkaWFFbGVtZW50Ojp+SFRNTE1lZGlhRWxlbWVudCgpCiAgICAgICAgIG1faXNvbGF0ZWRXb3Js ZC0+Y2xlYXJXcmFwcGVycygpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTikK KyAgICBpZiAobV9zZXNzaW9uKSB7CisgICAgICAgIG1fc2Vzc2lvbi0+cmVtb3ZlTWVkaWFFbGVt ZW50KCp0aGlzKTsKKyAgICAgICAgbV9zZXNzaW9uID0gbnVsbHB0cjsKKyAgICB9CisjZW5kaWYK KwogICAgIG1fc2Vla1Rhc2tRdWV1ZS5jbG9zZSgpOwogCiAgICAgbV9jb21wbGV0ZWx5TG9hZGVk ID0gdHJ1ZTsKQEAgLTYzNjcsNyArNjM3NCwxMyBAQCBNZWRpYVNlc3Npb24qIEhUTUxNZWRpYUVs ZW1lbnQ6OnNlc3Npb24oKSBjb25zdAogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFNlc3Np b24oTWVkaWFTZXNzaW9uKiBzZXNzaW9uKQogeworICAgIGlmIChtX3Nlc3Npb24pCisgICAgICAg IG1fc2Vzc2lvbi0+cmVtb3ZlTWVkaWFFbGVtZW50KCp0aGlzKTsKKwogICAgIG1fc2Vzc2lvbiA9 IHNlc3Npb247CisKKyAgICBpZiAoc2Vzc2lvbikKKyAgICAgICAgc2Vzc2lvbi0+YWRkTWVkaWFF bGVtZW50KCp0aGlzKTsKIH0KIAogI2VuZGlmCg== 254388 2015-06-05 14:44:26 -0700 2015-06-05 15:33:51 -0700 Patch (re-based) bug-145703-20150605144403.patch text/plain 4613 mrajca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTdmNmRhNzNjNTU3N2Nk ZGQxYzQyNGEzMWNkNGMwYjZlYjMxNDdkMC4uZDMzMGU4N2Q3MjI2ZmQzNjU0OGUwZDIwZTdmMzUy ZTU0YzE1ZmZmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA2LTA1ICBNYXR0 IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYVNlc3Npb25zIHNob3Vs ZCBrZWVwIHRyYWNrIG9mIHRoZWlyIHBhcnRpY2lwYXRpbmcgbWVkaWEgZWxlbWVudHMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU3MDMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVk aWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Np b246OmFkZE1lZGlhRWxlbWVudCk6IEFkZCB0aGUgZ2l2ZW4gbWVkaWEgZWxlbWVudCB0byB0aGUg bWVkaWEgc2Vzc2lvbi4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbjo6cmVtb3ZlTWVk aWFFbGVtZW50KTogUmVtb3ZlIHRoZSBnaXZlbiBtZWRpYSBlbGVtZW50IGZyb20gdGhlIG1lZGlh IHNlc3Npb24uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb246OmFjdGl2ZVBhcnRpY2lw YXRpbmdFbGVtZW50cyk6IER5bmFtaWNhbGx5IGJ1aWxkIGEgdmVjdG9yIG9mIGFjdGl2ZWx5LXBs YXlpbmcgbWVkaWEKKyAgICAgICAgICBlbGVtZW50cy4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c2Vzc2lvbi9NZWRpYVNlc3Npb24uaDoKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1l bnQpOiBFbnN1cmUgdGhlIGVsZW1lbnQgaXMgcmVtb3ZlZCBmcm9tIGl0cyBtZWRpYSBzZXNzaW9u LgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0U2Vzc2lvbik6IFVwZGF0 ZSBzZXNzaW9ucycgcmVmZXJlbmNlcyB0byB0aGVpciBtZWRpYSBlbGVtZW50cy4KKwogMjAxNS0w Ni0wNSAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPiBhbmQg WW91ZW5uIEZhYmxldCA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgW1N0 cmVhbXMgQVBJXSBSZWFkYWJsZVN0cmVhbSBzaG91bGQgc3RvcmUgY2FsbGJhY2tzIGFzIGEgRGVx dWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlh U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9NZWRpYVNl c3Npb24uY3BwCmluZGV4IDlmYmE2MTJlNzQ0ZTdiM2VjYTA5NjEzYzY5OGE4ZDFiYjFjYzRiZjUu LmFkODFkZjc4NDRiM2MxNDI5NDVkNDJjMzk3ZDYxMjg4ZDQ3YzMxMmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmNwcApAQCAt MjgsNiArMjgsOCBAQAogCiAjaWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCiAKKyNpbmNsdWRlICJI VE1MTWVkaWFFbGVtZW50LmgiCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogTWVkaWFTZXNzaW9u OjpNZWRpYVNlc3Npb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgU3Ry aW5nJiBraW5kKQpAQCAtNDgsNiArNTAsMzAgQEAgTWVkaWFSZW1vdGVDb250cm9scyogTWVkaWFT ZXNzaW9uOjpjb250cm9scyhib29sJiBpc051bGwpCiAgICAgcmV0dXJuIGNvbnRyb2xzOwogfQog Cit2b2lkIE1lZGlhU2Vzc2lvbjo6YWRkTWVkaWFFbGVtZW50KEhUTUxNZWRpYUVsZW1lbnQmIGVs ZW1lbnQpCit7CisgICAgQVNTRVJUKCFtX3BhcnRpY2lwYXRpbmdFbGVtZW50cy5jb250YWlucygm ZWxlbWVudCkpOworICAgIG1fcGFydGljaXBhdGluZ0VsZW1lbnRzLmFwcGVuZCgmZWxlbWVudCk7 Cit9CisKK3ZvaWQgTWVkaWFTZXNzaW9uOjpyZW1vdmVNZWRpYUVsZW1lbnQoSFRNTE1lZGlhRWxl bWVudCYgZWxlbWVudCkKK3sKKyAgICBBU1NFUlQobV9wYXJ0aWNpcGF0aW5nRWxlbWVudHMuY29u dGFpbnMoJmVsZW1lbnQpKTsKKyAgICBtX3BhcnRpY2lwYXRpbmdFbGVtZW50cy5yZW1vdmUobV9w YXJ0aWNpcGF0aW5nRWxlbWVudHMuZmluZCgmZWxlbWVudCkpOworfQorCitWZWN0b3I8SFRNTE1l ZGlhRWxlbWVudCo+IE1lZGlhU2Vzc2lvbjo6YWN0aXZlUGFydGljaXBhdGluZ0VsZW1lbnRzKCkg Y29uc3QKK3sKKyAgICBWZWN0b3I8SFRNTE1lZGlhRWxlbWVudCo+IGVsZW1lbnRzOworCisgICAg Zm9yIChhdXRvKiBlbGVtZW50IDogbV9wYXJ0aWNpcGF0aW5nRWxlbWVudHMpIHsKKyAgICAgICAg aWYgKGVsZW1lbnQtPmlzUGxheWluZygpKQorICAgICAgICAgICAgZWxlbWVudHMuYXBwZW5kKGVs ZW1lbnQpOworICAgIH0KKworICAgIHJldHVybiBlbGVtZW50czsKK30KKwogdm9pZCBNZWRpYVNl c3Npb246OnJlbGVhc2VTZXNzaW9uKCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzZXNzaW9uL01lZGlhU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNlc3Npb24vTWVkaWFTZXNzaW9uLmgKaW5kZXggYmZkMTQwZGExNGFiMDQ0MGE3 M2Q5ZTM5NThkZmVmYTU2YTc3NjNjMy4uYmMzZmZmZWQ5ZWY0MTQ2MDdkNjY5OTg1Zjg2YzY1OWMy MmI2MmQ2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24v TWVkaWFTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24v TWVkaWFTZXNzaW9uLmgKQEAgLTMyLDYgKzMyLDggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CitjbGFzcyBIVE1MTWVkaWFFbGVtZW50OworCiBjbGFzcyBNZWRpYVNlc3Npb24gZmluYWwgOiBw dWJsaWMgUmVmQ291bnRlZDxNZWRpYVNlc3Npb24+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVm PE1lZGlhU2Vzc2lvbj4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIGNv bnN0IFN0cmluZyYga2luZCkKQEAgLTU0LDcgKzU2LDE1IEBAIHByaXZhdGU6CiAgICAgICAgIElu dGVycnVwdGVkCiAgICAgfTsKIAorICAgIGZyaWVuZCBjbGFzcyBIVE1MTWVkaWFFbGVtZW50Owor CisgICAgdm9pZCBhZGRNZWRpYUVsZW1lbnQoSFRNTE1lZGlhRWxlbWVudCYpOworICAgIHZvaWQg cmVtb3ZlTWVkaWFFbGVtZW50KEhUTUxNZWRpYUVsZW1lbnQmKTsKKworICAgIFZlY3RvcjxIVE1M TWVkaWFFbGVtZW50Kj4gYWN0aXZlUGFydGljaXBhdGluZ0VsZW1lbnRzKCkgY29uc3Q7CisKICAg ICBTdGF0ZSBtX2N1cnJlbnRTdGF0ZSB7IFN0YXRlOjpJZGxlIH07CisgICAgVmVjdG9yPEhUTUxN ZWRpYUVsZW1lbnQqPiBtX3BhcnRpY2lwYXRpbmdFbGVtZW50czsKIAogICAgIGNvbnN0IFN0cmlu ZyBtX2tpbmQ7CiAgICAgUmVmUHRyPE1lZGlhUmVtb3RlQ29udHJvbHM+IG1fY29udHJvbHM7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCBiYTQxMDllNGRiMDlm OTdmMDA4MGEyZWE4N2RmM2MxOWY1NTc2NTg4Li5lYjcwMDRjZDEwZjgwOGMzY2YzMjdiMTk2MTZl YTkwYjU5OTUzNDAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAK QEAgLTQ1Nyw2ICs0NTcsMTMgQEAgSFRNTE1lZGlhRWxlbWVudDo6fkhUTUxNZWRpYUVsZW1lbnQo KQogICAgICAgICBtX2lzb2xhdGVkV29ybGQtPmNsZWFyV3JhcHBlcnMoKTsKICNlbmRpZgogCisj aWYgRU5BQkxFKE1FRElBX1NFU1NJT04pCisgICAgaWYgKG1fc2Vzc2lvbikgeworICAgICAgICBt X3Nlc3Npb24tPnJlbW92ZU1lZGlhRWxlbWVudCgqdGhpcyk7CisgICAgICAgIG1fc2Vzc2lvbiA9 IG51bGxwdHI7CisgICAgfQorI2VuZGlmCisKICAgICBtX3NlZWtUYXNrUXVldWUuY2xvc2UoKTsK IAogICAgIG1fY29tcGxldGVseUxvYWRlZCA9IHRydWU7CkBAIC02MzY3LDcgKzYzNzQsMTMgQEAg TWVkaWFTZXNzaW9uKiBIVE1MTWVkaWFFbGVtZW50OjpzZXNzaW9uKCkgY29uc3QKIAogdm9pZCBI VE1MTWVkaWFFbGVtZW50OjpzZXRTZXNzaW9uKE1lZGlhU2Vzc2lvbiogc2Vzc2lvbikKIHsKKyAg ICBpZiAobV9zZXNzaW9uKQorICAgICAgICBtX3Nlc3Npb24tPnJlbW92ZU1lZGlhRWxlbWVudCgq dGhpcyk7CisKICAgICBtX3Nlc3Npb24gPSBzZXNzaW9uOworCisgICAgaWYgKHNlc3Npb24pCisg ICAgICAgIHNlc3Npb24tPmFkZE1lZGlhRWxlbWVudCgqdGhpcyk7CiB9CiAKICNlbmRpZgo=