109005 2013-02-05 20:48:28 -0800 [Mac] Minor updates to captions menu UI 2013-02-06 09:30:13 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino cmarcelo eric.carlson feature-media-reviews macpherson menard ojan.autocc webkit.review.bot oldest_to_newest 826056 0 dino 2013-02-05 20:48:28 -0800 Now that we only have a single section in the captions menu, remove the extra wrapper element. Also update the UI for Mac. 826350 1 186834 dino 2013-02-06 05:01:59 -0800 Created attachment 186834 Patch 826505 2 dino 2013-02-06 09:30:13 -0800 Committed r142003: <http://trac.webkit.org/changeset/142003> 186834 2013-02-06 05:01:59 -0800 2013-02-06 06:05:13 -0800 Patch bug-109005-20130206235834.patch text/plain 13122 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxOTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTRjNGRkN2MwMTZmNDdk NThlNzYzYTYyZThlZTcwNzdjZDI5OTQwMS4uZDgyMGIyNTlkYTdiNTdiYzQwOGI2ZjJmMTg5Yzc3 ZGIxNjFhMDkwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAyLTA2ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBNaW5vciB1cGRhdGVzIHRvIGNh cHRpb25zIG1lbnUgVUkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwOTAwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vdyB0aGF0IHdlIG9ubHkgaGF2ZSBhIHNpbmdsZSBzZWN0aW9uIGluIHRoZSBjYXB0 aW9ucyBtZW51LCByZW1vdmUgdGhlCisgICAgICAgIHVubmVjZXNzYXJ5IHdyYXBwZXIgZWxlbWVu dC4gQWxzbyB1cGRhdGUgdGhlIFVJIGZvciBNYWMgc28gdGhhdCB0aGUgbWVudQorICAgICAgICBn cm93cyBpbiBzaXplIGR5bmFtaWNhbGx5LCBhbmQgY2hhbmdlIHRoZSB0ZXh0IHdlIGRpc3BsYXkg Zm9yIGEgY2FwdGlvbgorICAgICAgICB0aGF0IGhhcyBuZWl0aGVyIGxhYmVsIG9yIGxhbmd1YWdl IGlkZW50aWZpZXJzLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAg ICAgICAgKiBFbmdsaXNoLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3M6CisgICAgICAgICogY3Nz L21lZGlhQ29udHJvbHNRdWlja1RpbWUuY3NzOgorICAgICAgICAodmlkZW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtY2xvc2VkLWNhcHRpb25zLWNvbnRhaW5lcik6CisgICAgICAgICh2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2stbGlzdCk6CisgICAg ICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2st bGlzdCBoMyk6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQt Y2FwdGlvbnMtdHJhY2stbGlzdCB1bCk6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2stbGlzdCBsaSk6CisgICAgICAgICh2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2stbGlzdCBsaTpob3Zl cik6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlv bnMtdHJhY2stbGlzdCBsaS5zZWxlY3RlZCk6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2stbGlzdCBsaS5zZWxlY3RlZDpob3Zlcik6 CisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50Ojpy ZWJ1aWxkVHJhY2tMaXN0TWVudSk6CisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5n cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0ZXh0VHJhY2tOb0xhYmVsVGV4dCk6CisKIDIwMTMt MDItMDUgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFNwbGl0 IGVhY2ggUnVsZVNldCBhbmQgZmVhdHVyZSBvdXQgZnJvbSBTdHlsZVJlc29sdmVyIGludG8gaXRz IG93biBjbGFzcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9j YWxpemFibGUuc3RyaW5ncyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovTG9jYWxpemFi bGUuc3RyaW5ncwppbmRleCAyOWFlODFmYjQ5Yzc0Mzc1NTBkN2ZjM2M5Y2JhZWNlMWQ5ZWU2YjA1 Li5lNzQ5YTJmZmE4MjM2ODVkZmMzMGY4NzhmNmEwNmRmNjRiNTZkYWI2IDEwMDY0NApHSVQgYmlu YXJ5IHBhdGNoCmRlbHRhIDgyCnpjbWV4eGloMD4tPF8paCFDaWgyWnV7JHkzR3ZxTCZPaXBrISs8 YUFKanRvZVUrbW9TJEFyVUI/JCZmcipxMWwpaApiaU8qMHhgR0J3TD02MXQyPyNiRTBKZSUqXlBG eE5FcipJcWUKCmRlbHRhIDEzNwp6Y21aMj5uKSQ7aTxfKWghSFliYT0keE0jNzd1KCF5KVckdG9w SEYxK09hfkZoI0wwNDNtMzIhUGlXbXxaa3tQbFkKejZjfGJ2R0p4ejdBUFlubjFMLWA1ZD8xKypt UHV0T25qfFchPT81MGQwVitzaE5NKj1qUHkjQmoxITUlekc/fmQ0Ck1eclNiNytEJSp6MENITypS UjkxMAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9mdWxsc2NyZWVuUXVpY2tUaW1l LmNzcyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9mdWxsc2NyZWVuUXVpY2tUaW1lLmNzcwppbmRleCBi YjdhM2I0NTQzNDg5MTcwOGI2NWViMjRlZDcxNjVkYTQ1ODkyNDg1Li5jOGEzOGUxZWMwZjcxYTUy MWNlM2I5YzRlY2IxZGY5NDE2ZmYyZmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv ZnVsbHNjcmVlblF1aWNrVGltZS5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL2Z1bGxzY3Jl ZW5RdWlja1RpbWUuY3NzCkBAIC0xNjksNiArMTY5LDkgQEAgdmlkZW86LXdlYmtpdC1mdWxsLXNj cmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGF0dXMtZGlzcGxheSB7CiAKIHZpZGVvOi13 ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtY2xvc2VkLWNhcHRpb25z LWNvbnRhaW5lciB7CiAgICAgYm90dG9tOiA2NHB4OwotICAgIG1hcmdpbi1sZWZ0OiAyMDVweDsK KyAgICByaWdodDogMzhweDsKIH0KIAordmlkZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2stbGlzdCB7CisgICAgbWF4LWhl aWdodDogNTAwcHg7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250 cm9sc1F1aWNrVGltZS5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWVkaWFDb250cm9sc1F1aWNr VGltZS5jc3MKaW5kZXggZGRhOGI5ZDcwMjM5ZjUwMTU2YmU2YmEwYjRjZWZiY2Y4N2QxOTdkNy4u NDM2MWJmN2NlMGFmOGVhODRlNjljYzNhNWFlMGUyMDM4NzVjZDNkNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL21lZGlhQ29udHJvbHNRdWlja1RpbWUuY3NzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzUXVpY2tUaW1lLmNzcwpAQCAtMjQ0LDQ5ICsyNDQsNDIg QEAgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtY2xvc2VkLWNhcHRpb25zLWNvbnRhaW5l ciB7CiAgICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBtZWRpYS1jbG9zZWQtY2FwdGlvbnMtY29udGFp bmVyOwogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBkaXNwbGF5OiBibG9jazsKKyAgICBy aWdodDogMzhweDsKICAgICBib3R0b206IDI5cHg7Ci0gICAgbWFyZ2luLWxlZnQ6IC0xNTVweDsK LSAgICB6LWluZGV4OiAyOwotICAgIHdpZHRoOiAyMDBweDsKLSAgICBoZWlnaHQ6IDI1MHB4Owog ICAgIGJhY2tncm91bmQtY29sb3I6IHJnYmEoMCwgMCwgMCwgMC44NSk7Ci0gICAgYm9yZGVyOiAx cHggc29saWQgcmdiKDY2LCA2NiwgNjYpOwotICAgIGJvcmRlci1yYWRpdXM6IDhweDsKKyAgICBi b3JkZXI6IDNweCBzb2xpZCByZ2JhKDEyOCwgMTI4LCAxMjgsIDAuNzUpOworICAgIGJvcmRlci1y YWRpdXM6IDEwcHg7CiAgICAgY3Vyc29yOiBkZWZhdWx0OworICAgIHotaW5kZXg6IDI7CiB9CiAK IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWNsb3NlZC1jYXB0aW9ucy10cmFjay1saXN0 IHsKLSAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG1lZGlhLWNsb3NlZC1jYXB0aW9ucy10cmFjay1s aXN0OwotICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBkaXNwbGF5OiBibG9jazsKLSAgICB0 b3A6IDVweDsKLSAgICBsZWZ0OiA1cHg7Ci0gICAgd2lkdGg6IDE5MHB4OwotICAgIGhlaWdodDog MjQwcHg7CisgICAgbWF4LXdpZHRoOiAyNTBweDsKKyAgICBtYXgtaGVpZ2h0OiAyNTBweDsKICAg ICBvdmVyZmxvdy14OiBoaWRkZW47CiAgICAgb3ZlcmZsb3cteTogc2Nyb2xsOwogICAgIHRleHQt YWxpZ246IGxlZnQ7Ci0gICAgZm9udC1mYW1pbHk6ICJIZWx2ZXRpY2EgQm9sZCIsICJIZWx2ZXRp Y2EiOwotICAgIGZvbnQtd2VpZ2h0OiBib2xkOwotICAgIGZvbnQtc2l6ZTogOXB0OworICAgIGZv bnQtZmFtaWx5OiAiSGVsdmV0aWNhIEJvbGQiLCBIZWx2ZXRpY2E7CisgICAgZm9udC1zaXplOiAx MHB0OwogICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7CiB9CiAKIHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLWNsb3NlZC1jYXB0aW9ucy10cmFjay1saXN0IGgzIHsKICAgICBtYXJn aW46IDA7Ci0gICAgY29sb3I6ICNiYmI7CisgICAgY29sb3I6ICM3NTc1NzU7CiAgICAgdGV4dC1z aGFkb3c6IDAgMXB4IDAgYmxhY2s7Ci0gICAgcGFkZGluZy1sZWZ0OiA0cHg7CisgICAgcGFkZGlu Zy1sZWZ0OiAyM3B4OwogICAgIHBhZGRpbmctdG9wOiA0cHg7Ci0gICAgcGFkZGluZy1ib3R0b206 IDRweDsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgIzU1NTsKLSAgICBmb250LXNpemU6 IDlwdDsKKyAgICBmb250LXdlaWdodDogYm9sZDsKKyAgICBmb250LXNpemU6IDEwcHQ7CiB9CiAK IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWNsb3NlZC1jYXB0aW9ucy10cmFjay1saXN0 IHVsIHsKICAgICBsaXN0LXN0eWxlLXR5cGU6IG5vbmU7Ci0gICAgbWFyZ2luOiAwIDAgOHB4IDA7 CisgICAgbWFyZ2luOiAwIDAgNHB4IDA7CiAgICAgcGFkZGluZzogMDsKKyAgICBmb250LXdlaWdo dDogYm9sZDsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtY2xvc2VkLWNhcHRp b25zLXRyYWNrLWxpc3QgbGkgewpAQCAtMjk0LDM1ICsyODcsMzQgQEAgdmlkZW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtY2xvc2VkLWNhcHRpb25zLXRyYWNrLWxpc3QgbGkgewogICAgIGJhY2tn cm91bmQtaW1hZ2U6IG5vbmU7CiAgICAgdGV4dC1zaGFkb3c6IDAgMXB4IDAgYmxhY2s7CiAgICAg bWFyZ2luOiAwOwotICAgIHBhZGRpbmctbGVmdDogMjRweDsKLSAgICBwYWRkaW5nLXJpZ2h0OiAx MHB4OwotICAgIHBhZGRpbmctdG9wOiAwLjM1ZW07Ci0gICAgcGFkZGluZy1ib3R0b206IDAuM2Vt OwotICAgIHdpZHRoOiAxOTBweDsKLSAgICBoZWlnaHQ6IDIuMGVtOwotICAgIGJvcmRlci1ib3R0 b206IDFweCBzb2xpZCAjNTU1OworICAgIHBhZGRpbmctbGVmdDogMzdweDsKKyAgICBwYWRkaW5n LXJpZ2h0OiAzNXB4OworICAgIHBhZGRpbmctdG9wOiAwLjE1ZW07CisgICAgcGFkZGluZy1ib3R0 b206IDAuMmVtOwogICAgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CiAgICAgb3ZlcmZsb3c6IGhp ZGRlbjsKICAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwogICAgIHRleHQtb3ZlcmZsb3c6IGVsbGlw c2lzOwotICAgIC13ZWJraXQtdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7CisgICAgYm9yZGVyLXRv cDogMXB4IHNvbGlkIHJnYmEoMCwgMCwgMCwgMCk7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNv bGlkIHJnYmEoMCwgMCwgMCwgMCk7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LWNsb3NlZC1jYXB0aW9ucy10cmFjay1saXN0IGxpOmhvdmVyIHsKLSAgICBiYWNrZ3JvdW5kLWlt YWdlOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBjb2xv ci1zdG9wKDAsIHJnYig3OSwgMTEyLCAyNDUpKSwgY29sb3Itc3RvcCgxLCByZ2IoMjgsIDY2LCAy NDUpKSk7Ci0gICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYigyOCwgNjYsIDI0NSk7Cisg ICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBs ZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwLCAjNGY3MGY2KSwgY29sb3Itc3RvcCgxLCAjMWE0NGYz KSk7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkICM0NjY3ZWE7CisgICAgYm9yZGVyLWJvdHRv bTogMXB4IHNvbGlkICMwMzM2ZTU7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LWNsb3NlZC1jYXB0aW9ucy10cmFjay1saXN0IGxpLnNlbGVjdGVkIHsKLSAgICBiYWNrZ3JvdW5k LWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbDt1dGY4LDxzdmcgeG1sbnM9Imh0dHA6Ly93 d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMzAwIDMwMCI+PHBhdGggZmlsbD0id2hp dGUiIGQ9Ik05LjA3OSwxMzAuNzA5bDI0LjI4Mi0yNC41NjdsNDguODQ5LDQ4Ljk5MkwyMjguNDcs OC44NzNsMjQuNDI0LDI0LjI4Mkw4Mi4yMDksMjAzLjg0TDkuMDc5LDEzMC43MDl6Ii8+PC9zdmc+ Jyk7CisgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWw7dXRmOCw8 c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDMwMCAz MDAiPjxwb2x5Z29uIGZpbGw9IiNhM2EzYTMiIHBvaW50cz0iMjUyLjMwMSw0LjQ3NyAxMjYuNjY3 LDE5NC4xMDQgNDMuMzU4LDEwOC4zIDYuODY4LDE2MS40MDggMTMyLjUxNSwyOTAuODE0IDI5Ny43 MzIsNDkuOTI2Ii8+PC9zdmc+Jyk7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsK LSAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiAwLjVlbSAwLjVlbTsKKyAgICBiYWNrZ3JvdW5kLXBv c2l0aW9uOiAxN3B4IDAuMjVlbTsKICAgICBiYWNrZ3JvdW5kLXNpemU6IDEuMWVtIDEuMWVtOwog fQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2st bGlzdCBsaS5zZWxlY3RlZDpob3ZlciB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRh OmltYWdlL3N2Zyt4bWw7dXRmOCw8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2 ZyIgdmlld0JveD0iMCAwIDMwMCAzMDAiPjxwYXRoIGZpbGw9IndoaXRlIiBkPSJNOS4wNzksMTMw LjcwOWwyNC4yODItMjQuNTY3bDQ4Ljg0OSw0OC45OTJMMjI4LjQ3LDguODczbDI0LjQyNCwyNC4y ODJMODIuMjA5LDIwMy44NEw5LjA3OSwxMzAuNzA5eiIvPjwvc3ZnPicpLCAtd2Via2l0LWdyYWRp ZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBjb2xvci1zdG9wKDAsIHJnYig3OSwg MTEyLCAyNDUpKSwgY29sb3Itc3RvcCgxLCByZ2IoMjgsIDY2LCAyNDUpKSk7CisgICAgYmFja2dy b3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWw7dXRmOCw8c3ZnIHhtbG5zPSJodHRw Oi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDMwMCAzMDAiPjxwb2x5Z29uIGZp bGw9IndoaXRlIiBwb2ludHM9IjI1Mi4zMDEsNC40NzcgMTI2LjY2NywxOTQuMTA0IDQzLjM1OCwx MDguMyA2Ljg2OCwxNjEuNDA4IDEzMi41MTUsMjkwLjgxNCAyOTcuNzMyLDQ5LjkyNiIvPjwvc3Zn PicpLCAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBjb2xv ci1zdG9wKDAsICM0ZjcwZjYpLCBjb2xvci1zdG9wKDEsICMxYTQ0ZjMpKTsKICAgICBiYWNrZ3Jv dW5kLXJlcGVhdDogbm8tcmVwZWF0LCByZXBlYXQ7Ci0gICAgYmFja2dyb3VuZC1wb3NpdGlvbjog MC41ZW0gMC41ZW0sIHRvcCBsZWZ0OworICAgIGJhY2tncm91bmQtcG9zaXRpb246IDE3cHggMC4y NWVtLCB0b3AgbGVmdDsKICAgICBiYWNrZ3JvdW5kLXNpemU6IDEuMWVtIDEuMWVtLCAxMDAlIDEw MCU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xF bGVtZW50cy5jcHAKaW5kZXggZmM2ZTBhNTVjNjc5OTFiYjVkY2NhMzYyZTdmYjA2Yzg3NzYzNWJj MC4uNDhmMTI3NjU1NjczZDkxZWM2Mzk3M2UwNDhjN2NmMDZhZDIzYTlkZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcApAQCAt ODc0LDEwICs4NzQsOSBAQCB2b2lkIE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zVHJhY2tMaXN0 RWxlbWVudDo6cmVidWlsZFRyYWNrTGlzdE1lbnUoKQogICAgIERvY3VtZW50KiBkb2MgPSBkb2N1 bWVudCgpOwogICAgIENhcHRpb25Vc2VyUHJlZmVyZW5jZXMqIGNhcHRpb25zVXNlclByZWZlcmVu Y2VzID0gZG9jLT5wYWdlKCktPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCk7CiAKLSAgICBS ZWZQdHI8RWxlbWVudD4gY2FwdGlvbnNTZWN0aW9uID0gZG9jLT5jcmVhdGVFbGVtZW50KHNlY3Rp b25UYWcsIEFTU0VSVF9OT19FWENFUFRJT04pOwogICAgIFJlZlB0cjxFbGVtZW50PiBjYXB0aW9u c0hlYWRlciA9IGRvYy0+Y3JlYXRlRWxlbWVudChoM1RhZywgQVNTRVJUX05PX0VYQ0VQVElPTik7 CiAgICAgY2FwdGlvbnNIZWFkZXItPmFwcGVuZENoaWxkKGRvYy0+Y3JlYXRlVGV4dE5vZGUodGV4 dFRyYWNrU3VidGl0bGVzVGV4dCgpKSk7Ci0gICAgY2FwdGlvbnNTZWN0aW9uLT5hcHBlbmRDaGls ZChjYXB0aW9uc0hlYWRlcik7CisgICAgYXBwZW5kQ2hpbGQoY2FwdGlvbnNIZWFkZXIpOwogICAg IFJlZlB0cjxFbGVtZW50PiBjYXB0aW9uc01lbnVMaXN0ID0gZG9jLT5jcmVhdGVFbGVtZW50KHVs VGFnLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKIAogICAgIFJlZlB0cjxFbGVtZW50PiB0cmFja0l0 ZW07CkBAIC05MDcsOCArOTA2LDcgQEAgdm9pZCBNZWRpYUNvbnRyb2xDbG9zZWRDYXB0aW9uc1Ry YWNrTGlzdEVsZW1lbnQ6OnJlYnVpbGRUcmFja0xpc3RNZW51KCkKICAgICAgICAgbV9tZW51SXRl bXMuYXBwZW5kKHRyYWNrSXRlbSk7CiAgICAgfQogCi0gICAgY2FwdGlvbnNTZWN0aW9uLT5hcHBl bmRDaGlsZChjYXB0aW9uc01lbnVMaXN0KTsKLSAgICBhcHBlbmRDaGlsZChjYXB0aW9uc1NlY3Rp b24pOworICAgIGFwcGVuZENoaWxkKGNhcHRpb25zTWVudUxpc3QpOwogCiAgICAgdXBkYXRlRGlz cGxheSgpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2Nh bGl6ZWRTdHJpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmlu Z3MuY3BwCmluZGV4IDFmYmFlODgyYTlmMWIwMmQ1ZDZjNjgwN2QzNzU3YzZjZDJhNDYwNTMuLjEy NmQ5ODliOWM5YWIwMjkwOTI4NGM4MmFlYWU2YjNiY2FkNGViNWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0xvY2FsaXplZFN0cmluZ3MuY3BwCkBAIC0xMDI3LDcgKzEwMjcsNyBAQCBT dHJpbmcgdGV4dFRyYWNrT2ZmVGV4dCgpCiAKIFN0cmluZyB0ZXh0VHJhY2tOb0xhYmVsVGV4dCgp CiB7Ci0gICAgcmV0dXJuIFdFQl9VSV9TVFJJTkcoIk5vIGxhYmVsIiwgIk1lbnUgaXRlbSBsYWJl bCBmb3IgYSBjbG9zZWQgY2FwdGlvbnMgdHJhY2sgdGhhdCBoYXMgbm8gb3RoZXIgbmFtZSIpOwor ICAgIHJldHVybiBXRUJfVUlfU1RSSU5HKCJVbmtub3duIiwgIk1lbnUgaXRlbSBsYWJlbCBmb3Ig YSBjbG9zZWQgY2FwdGlvbnMgdHJhY2sgdGhhdCBoYXMgbm8gb3RoZXIgbmFtZSIpOwogfQogI2Vu ZGlmCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCAwYTRhMjc0NzZhYjY1YTAzOGYzOTFiNDcwMGQ0YzllN2Q5NDMyMTUzLi42 NDZhM2UzMDhjZjdiOGZmZGNjYjMxNDU4ZjlkNTEzMzQ4OTBlMmE3IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTMtMDItMDYgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAg ICAgIE1pbm9yIHVwZGF0ZXMgdG8gY2FwdGlvbnMgbWVudSBVSQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5MDA1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQSBjYXB0aW9uIHRyYWNrIHdpdGhvdXQgYSBs YWJlbCBvciBsYW5ndWFnZSBpcyBub3cgZ2l2ZW4gdGhlIG1lbnUKKyAgICAgICAgdGl0bGUgJ1Vu a25vd24nLiBOb3RlIGFsc28gdGhhdCB0aGUgdGVzdCBpbmNsdWRlcyBzb21lIGludGVudGlvbmFs CisgICAgICAgIGZhaWx1cmUgdGV4dC4KKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWNvbnRyb2xz LWNhcHRpb25zLXRyYWNrbWVudS1sb2NhbGl6ZWQuaHRtbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvbWVkaWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LWxvY2FsaXplZC1leHBl Y3RlZC50eHQ6CisKIDIwMTMtMDItMDUgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdl YmtpdC5vcmc+CiAKICAgICAgICAgW0NTUyBHcmlkIExheW91dF0gR3JpZCBpdGVtJ3MgbG9naWNh bCBoZWlnaHQgaXMgbm90IHByb3Blcmx5IHJlY29tcHV0ZWQgYWZ0ZXIgLXdlYmtpdC1ncmlkLWNv bHVtbiAvIC13ZWJraXQtZ3JpZC1yb3cgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv bWVkaWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LWxvY2FsaXplZC5odG1sIGIv TGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LWxvY2Fs aXplZC5odG1sCmluZGV4IGM4NWRiYWVhNWJjYWJkMDc2ZDM0Y2JlZmZhZWM0NmFhMjIwZDYyNGIu LjVlNDk0YmMzMmQzNTJjMjNhYmNkNTFiNTY1NTdjNzViYjlkN2M5M2MgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLWNhcHRpb25zLXRyYWNrbWVudS1sb2NhbGl6 ZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10 cmFja21lbnUtbG9jYWxpemVkLmh0bWwKQEAgLTQ0LDEyICs0NCwxMiBAQAogICAgICAgICAgICAg dGVzdEV4cGVjdGVkKCJpdGVtLnRleHRDb250ZW50IiwgIkVuZ2xpc2ggQ0MiKTsKIAogICAgICAg ICAgICAgaXRlbSA9IGNhcHRpb25zRW50cmllc1syXTsKLSAgICAgICAgICAgIGNvbnNvbGVXcml0 ZSgiPGJyPlRoaXJkIGl0ZW0gaW4gY2FwdGlvbnMgbWVudSBzaG91bGQgYmUgbGFiZWxsZWQgJ05v IGxhYmVsJyIpOwotICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJpdGVtLnRleHRDb250ZW50Iiwg Ik5vIGxhYmVsIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIjxicj5UaGlyZCBpdGVtIGlu IGNhcHRpb25zIG1lbnUgc2hvdWxkIGJlIGxhYmVsbGVkICdVbmtub3duJyIpOworICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJpdGVtLnRleHRDb250ZW50IiwgIlVua25vd24iKTsKIAogICAgICAg ICAgICAgaXRlbSA9IGNhcHRpb25zRW50cmllc1szXTsKLSAgICAgICAgICAgIGNvbnNvbGVXcml0 ZSgiPGJyPkZvdXJ0aCBpdGVtIGluIGNhcHRpb25zIG1lbnUgc2hvdWxkIGJlIGxhYmVsbGVkICdO byBsYWJlbCciKTsKLSAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgiaXRlbS50ZXh0Q29udGVudCIs ICJObyBsYWJlbCIpOworICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+Rm91cnRoIGl0ZW0g aW4gY2FwdGlvbnMgbWVudSBzaG91bGQgYmUgbGFiZWxsZWQgJ1Vua25vd24nIik7CisgICAgICAg ICAgICB0ZXN0RXhwZWN0ZWQoIml0ZW0udGV4dENvbnRlbnQiLCAiVW5rbm93biIpOwogCiAgICAg ICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9tZWRpYS92aWRlby1jb250cm9scy1jYXB0aW9ucy10cmFja21lbnUtbG9jYWxp emVkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9tZWRpYS92aWRlby1j b250cm9scy1jYXB0aW9ucy10cmFja21lbnUtbG9jYWxpemVkLWV4cGVjdGVkLnR4dAppbmRleCAx ODhlMmQzNDI5MDM0YWFlNWExMGRmODRjY2UxZDIwOGM4NDBlNzM4Li5jYWY3YTcyOTBhNjAzOWJi ZjZkZjQ4NDJiZjEwYzYxZDZjMTQ4NWI5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvbWVkaWEvdmlkZW8tY29udHJvbHMtY2FwdGlvbnMtdHJhY2ttZW51LWxvY2FsaXplZC1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL21lZGlhL3ZpZGVvLWNv bnRyb2xzLWNhcHRpb25zLXRyYWNrbWVudS1sb2NhbGl6ZWQtZXhwZWN0ZWQudHh0CkBAIC0xMSwx MiArMTEsMTIgQEAgRmlyc3QgaXRlbSBpbiBjYXB0aW9ucyBtZW51IHNob3VsZCBiZSBsYWJlbGxl ZCAnT2ZmJwogRVhQRUNURUQgKGl0ZW0udGV4dENvbnRlbnQgPT0gJ09mZicpIE9LCiAKIFNlY29u ZCBpdGVtIGluIGNhcHRpb25zIG1lbnUgc2hvdWxkIGJlIGxhYmVsbGVkICdFbmdsaXNoIENDJwot RVhQRUNURUQgKGl0ZW0udGV4dENvbnRlbnQgPT0gJ0VuZ2xpc2ggQ0MnKSBPSworRVhQRUNURUQg KGl0ZW0udGV4dENvbnRlbnQgPT0gJ0VuZ2xpc2ggQ0MnKSwgT0JTRVJWRUQgJ1Vua25vd24nIEZB SUwKIAotVGhpcmQgaXRlbSBpbiBjYXB0aW9ucyBtZW51IHNob3VsZCBiZSBsYWJlbGxlZCAnTm8g bGFiZWwnCi1FWFBFQ1RFRCAoaXRlbS50ZXh0Q29udGVudCA9PSAnTm8gbGFiZWwnKSBPSworVGhp cmQgaXRlbSBpbiBjYXB0aW9ucyBtZW51IHNob3VsZCBiZSBsYWJlbGxlZCAnVW5rbm93bicKK0VY UEVDVEVEIChpdGVtLnRleHRDb250ZW50ID09ICdVbmtub3duJykgT0sKIAotRm91cnRoIGl0ZW0g aW4gY2FwdGlvbnMgbWVudSBzaG91bGQgYmUgbGFiZWxsZWQgJ05vIGxhYmVsJwotRVhQRUNURUQg KGl0ZW0udGV4dENvbnRlbnQgPT0gJ05vIGxhYmVsJykgT0sKK0ZvdXJ0aCBpdGVtIGluIGNhcHRp b25zIG1lbnUgc2hvdWxkIGJlIGxhYmVsbGVkICdVbmtub3duJworVHlwZUVycm9yOiAndW5kZWZp bmVkJyBpcyBub3QgYW4gb2JqZWN0IChldmFsdWF0aW5nICdpdGVtLnRleHRDb250ZW50JykKIEVO RCBPRiBURVNUCiAK