89093 2012-06-14 06:26:33 -0700 Remove volume thumb for videos without audio track for Chrome Video controls 2012-06-15 11:00:10 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84672 89050 1 silviapf silviapf cmarcelo eric.carlson eric feature-media-reviews macpherson menard webkit.review.bot oldest_to_newest 649115 0 silviapf 2012-06-14 06:26:33 -0700 This patch is part of the introduction of the new Chromium video controls, master bug at https://bugs.webkit.org/show_bug.cgi?id=84672 . It removes the volume thumb for video and audio elements that have no audio track or have no media resource. 649119 1 147571 silviapf 2012-06-14 06:31:46 -0700 Created attachment 147571 complete patch for linux-ews layout tests 649121 2 147572 silviapf 2012-06-14 06:32:57 -0700 Created attachment 147572 Use this for review 649247 3 147572 eric.carlson 2012-06-14 09:49:32 -0700 Comment on attachment 147572 Use this for review View in context: https://bugs.webkit.org/attachment.cgi?id=147572&action=review Looks fine except for the ChangeLog. > Source/WebCore/ChangeLog:7 > 2012-06-14 Silvia Pfeiffer <silviapf@chromium.org> > > - Add fullscreen button to Chrome video controls for video. > - https://bugs.webkit.org/show_bug.cgi?id=88818 > + Remove volume thumb for videos without audio track. > + https://bugs.webkit.org/show_bug.cgi?id=89093 > > Reviewed by NOBODY (OOPS!). > Clearly something went wrong when this ChangeLog was generated :-) 649771 4 147711 silviapf 2012-06-14 19:26:32 -0700 Created attachment 147711 patch for cq - also includes image change for elements without audio 650338 5 147711 webkit.review.bot 2012-06-15 11:00:05 -0700 Comment on attachment 147711 patch for cq - also includes image change for elements without audio Clearing flags on attachment: 147711 Committed r120478: <http://trac.webkit.org/changeset/120478> 650339 6 webkit.review.bot 2012-06-15 11:00:10 -0700 All reviewed patches have been landed. Closing bug. 147571 2012-06-14 06:31:46 -0700 2012-06-14 19:26:15 -0700 complete patch for linux-ews layout tests bug-89093-20120614233143.patch text/plain 25951 silviapf U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE1OGU5YjQxZGJhODE5 MmZhMDAxNDJmN2I2MDBmZTk1ZWZjZDA2OS4uMzhiZDNjNGNlZGE3OTE2ZGIyYTk1YTllMTlmYWM4 Y2VmMGU2Yjg4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA2LTE0ICBTaWx2 aWEgUGZlaWZmZXIgIDxzaWx2aWFwZkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIHZv bHVtZSB0aHVtYiBmb3IgdmlkZW9zIHdpdGhvdXQgYXVkaW8gdHJhY2suCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTA5MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgc2luY2UgdGhp cyB3YXMgYWxyZWFkeSB0ZXN0ZWQgaW4gbWVkaWEvdmlkZW8tbm8tYXVkaW8uaHRtbC4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6cGFpbnRNZWRpYVZvbHVtZVNsaWRlcik6CisgICAgICAgIFNldCB2b2x1bWUg c2xpZGVyIHRvIDAgd2hlbiB0aGVyZSBpcyBubyBhdWRpbyBvciBubyBzb3VyY2UgZmlsZS4KKyAg ICAgICAgKFdlYkNvcmU6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJUaHVtYik6CisgICAgICAgIERv bid0IHBhaW50IHRoZSB2b2x1bWUgc2xpZGVyIHRodW1iIHdoZW4gdGhlcmUgaXMgbm8gYXVkaW8g b3Igbm8gc291cmNlIGZpbGUuCisKIDIwMTItMDYtMTMgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgogCiAgICAgICAgIFJlbW92ZSByZWR1bmRhbnQgY29kZSBmcm9tIFJlbmRl clZpZXcgYW5kIFJlbmRlckJsb2NrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvZnVs bHNjcmVlbi5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvZnVsbHNjcmVlbi5jc3MKaW5kZXggOGU3 Yzg3MzYwZWQwYjk2YWE4MDkwZmVmNjAwOGU2OThkYTcyMzQ5OS4uMTM1YWNiMTY5MjRjNmRlZDQy YjQ3MDg2Y2RkYjFhMGVlZTMzZmZhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL2Z1 bGxzY3JlZW4uY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9mdWxsc2NyZWVuLmNzcwpAQCAt MjAsNyArMjAsNyBAQAogICAgIC13ZWJraXQtdHJhbnNmb3JtLXN0eWxlOiBmbGF0ICFpbXBvcnRh bnQ7CiB9CiAKLXZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW4gewordmlkZW86LXdlYmtpdC1mdWxs LXNjcmVlbiwgYXVkaW86LXdlYmtpdC1mdWxsLXNjcmVlbiB7CiAgICAgYmFja2dyb3VuZC1jb2xv cjogdHJhbnNwYXJlbnQgIWltcG9ydGFudDsKICAgICBwb3NpdGlvbjogc3RhdGljICFpbXBvcnRh bnQ7CiAgICAgbWFyZ2luOiAwICFpbXBvcnRhbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvbWVkaWFDb250cm9sc0Nocm9taXVtLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tZWRp YUNvbnRyb2xzQ2hyb21pdW0uY3NzCmluZGV4IDQyMGQyNjg4ZTk3NGY3OGY4MmU0MWExODQ5MTdi NWUzMmZjZTdkZmQuLmIzOTMxMDE2ZTA0NWZiMjc0NzIyYzQyYjhiOTI2NTk2ODAxYTllZjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3NzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3NzCkBAIC0zOSw2 ICszOSwxMSBAQCBhdWRpbzotd2Via2l0LWZ1bGwtcGFnZS1tZWRpYSwgdmlkZW86LXdlYmtpdC1m dWxsLXBhZ2UtbWVkaWEgewogICAgIG1heC13aWR0aDogMTAwJTsKIH0KIAorYXVkaW86LXdlYmtp dC1mdWxsLXBhZ2UtbWVkaWE6Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwsCit2aWRlbzot d2Via2l0LWZ1bGwtcGFnZS1tZWRpYTo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCB7Cisg ICAgYm90dG9tOiAwcHg7Cit9CisKIDo6LXdlYmtpdC1tZWRpYS1jb250cm9scyB7CiAgICAgZGlz cGxheTogLXdlYmtpdC1ib3g7CiAgICAgLXdlYmtpdC1ib3gtb3JpZW50OiB2ZXJ0aWNhbDsKQEAg LTk3LDcgKzEwMiw4IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYXktYnV0dG9u LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wbGF5LWJ1CiAgICAgcGFkZGluZzogMDsK IH0KIAotYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtY3VycmVudC10aW1lLWRpc3BsYXks IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5IHsKK2F1 ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSwKK2F1ZGlvOjotd2Vi a2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWluaW5nLWRpc3BsYXksIHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWluaW5nLWRpc3BsYXkgewogICAgIC13ZWJraXQtYXBw ZWFyYW5jZTogbWVkaWEtY3VycmVudC10aW1lLWRpc3BsYXk7CiAgICAgLXdlYmtpdC11c2VyLXNl bGVjdDogbm9uZTsKICAgICBkaXNwbGF5OiBibG9jazsKQEAgLTExMSw2ICsxMTcsNyBAQCBhdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSwgdmlkZW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbAogICAgIGxpbmUtaGVpZ2h0OiAzMHB4OwogICAgIGZvbnQtZmFt aWx5OiBBcmlhbCwgSGVsdmV0aWNhLCBzYW5zLXNlcmlmOwogICAgIGZvbnQtc2l6ZTogMTNweDsK KyAgICBmb250LXdlaWdodDogYm9sZDsKICAgICBjb2xvcjogd2hpdGU7CiAKICAgICBsZXR0ZXIt c3BhY2luZzogbm9ybWFsOwpAQCAtMTY5LDMgKzE3NiwxNiBAQCBpbnB1dFt0eXBlPSJyYW5nZSJd Ojotd2Via2l0LW1lZGlhLXNsaWRlci10aHVtYiB7CiAgICAgbWFyZ2luLWxlZnQ6IC03cHg7CiAg ICAgbWFyZ2luLXJpZ2h0OiAtN3B4OwogfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy1mdWxsc2NyZWVuLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNj cmVlbi1idXR0b24geworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtZW50ZXItZnVsbHNj cmVlbi1idXR0b247CisgICAgZGlzcGxheTogaW5saW5lOworICAgIGJvcmRlcjogbm9uZTsKKyAg ICBib3gtc2l6aW5nOiBib3JkZXItYm94OworICAgIHdpZHRoOiAzMHB4OworICAgIGhlaWdodDog MzBweDsKKyAgICBsaW5lLWhlaWdodDogMzBweDsKKyAgICBtYXJnaW4tbGVmdDogLTVweDsKKyAg ICBtYXJnaW4tcmlnaHQ6IDlweDsKKyAgICBwYWRkaW5nOiAwOworfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCmluZGV4IGMwZGFm YzlhYzg2OGQ0NGEwYzk2MDM0ODVhMzBjY2M0NjY3YzQ3N2QuLjIzNjM4NGYxNjk4OTY4Y2U4MjFl ZDgyYTEyYmRkODZlM2NhMjk5NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKQEAgLTkwMSw2ICs5MDEsNyBAQCBjb25zdCBB dG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVudDo6c2hhZG93UHNldWRvSWQo KSBjb25zdAogCiBpbmxpbmUgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudDo6TWVkaWFD b250cm9sVm9sdW1lU2xpZGVyRWxlbWVudChEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgOiBNZWRp YUNvbnRyb2xJbnB1dEVsZW1lbnQoZG9jdW1lbnQsIE1lZGlhVm9sdW1lU2xpZGVyKQorICAgICwg bV9jbGVhck11dGVkT25Vc2VySW50ZXJhY3Rpb24oZmFsc2UpCiB7CiB9CiAKQEAgLTkzNCw2ICs5 MzUsOCBAQCB2b2lkIE1lZGlhQ29udHJvbFZvbHVtZVNsaWRlckVsZW1lbnQ6OmRlZmF1bHRFdmVu dEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogICAgICAgICBtZWRpYUNvbnRyb2xsZXIoKS0+c2V0Vm9s dW1lKHZvbHVtZSwgZWMpOwogICAgICAgICBBU1NFUlQoIWVjKTsKICAgICB9CisgICAgaWYgKG1f Y2xlYXJNdXRlZE9uVXNlckludGVyYWN0aW9uKQorICAgICAgICBtZWRpYUNvbnRyb2xsZXIoKS0+ c2V0TXV0ZWQoZmFsc2UpOwogfQogCiB2b2lkIE1lZGlhQ29udHJvbFZvbHVtZVNsaWRlckVsZW1l bnQ6OnNldFZvbHVtZShmbG9hdCB2b2x1bWUpCkBAIC05NDIsNiArOTQ1LDExIEBAIHZvaWQgTWVk aWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudDo6c2V0Vm9sdW1lKGZsb2F0IHZvbHVtZSkKICAg ICAgICAgc2V0VmFsdWUoU3RyaW5nOjpudW1iZXIodm9sdW1lKSk7CiB9CiAKK3ZvaWQgTWVkaWFD b250cm9sVm9sdW1lU2xpZGVyRWxlbWVudDo6c2V0Q2xlYXJNdXRlZE9uVXNlckludGVyYWN0aW9u KGJvb2wgY2xlYXJNdXRlKQoreworICAgIG1fY2xlYXJNdXRlZE9uVXNlckludGVyYWN0aW9uID0g Y2xlYXJNdXRlOworfQorCiBjb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFZvbHVtZVNs aWRlckVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKIHsKICAgICBERUZJTkVfU1RBVElD X0xPQ0FMKEF0b21pY1N0cmluZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUt c2xpZGVyIikpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFD b250cm9sRWxlbWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJv bEVsZW1lbnRzLmgKaW5kZXggNWJjYTVhOWE2NWMyMDFmODMxNDI1NjEzZWVkOGIxZjI2NTM4NGRi YS4uZWZkYjIxZjBkYWEwMGRkNzYwNTQwMGMyMzU0YWY1YjdiYzY3MmJkMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCkBAIC0zODks MTIgKzM4OSwxNCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50SGFu ZGxlcihFdmVudCopOwogICAgIHZvaWQgc2V0Vm9sdW1lKGZsb2F0KTsKKyAgICB2b2lkIHNldENs ZWFyTXV0ZWRPblVzZXJJbnRlcmFjdGlvbihib29sKTsKIAogcHJvdGVjdGVkOgogICAgIE1lZGlh Q29udHJvbFZvbHVtZVNsaWRlckVsZW1lbnQoRG9jdW1lbnQqKTsKIAogcHJpdmF0ZToKICAgICB2 aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdDsKKyAgICBi b29sIG1fY2xlYXJNdXRlZE9uVXNlckludGVyYWN0aW9uOwogfTsKIAogLy8gLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAppbmRleCA3ZTA3Y2Yy ZTQ3NDFlM2FmZWQ0ZGExODJkNjJkZWZlM2M0Y2UxZDE3Li4zODAxZTkyNjNhMTljMzI2MWEzMzAw MjI3M2QwMTg4MWM0ZDkyNzUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcApAQCAtNDYs NiArNDYsOCBAQCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK K3N0YXRpYyBjb25zdCBkb3VibGUgdGltZVdpdGhvdXRNb3VzZU1vdmVtZW50QmVmb3JlSGlkaW5n Q29udHJvbHMgPSAyOworCiBNZWRpYUNvbnRyb2xDaHJvbWl1bUVuY2xvc3VyZUVsZW1lbnQ6Ok1l ZGlhQ29udHJvbENocm9taXVtRW5jbG9zdXJlRWxlbWVudChEb2N1bWVudCogZG9jdW1lbnQpCiAg ICAgOiBIVE1MRGl2RWxlbWVudChIVE1MTmFtZXM6OmRpdlRhZywgZG9jdW1lbnQtPmRvY3VtZW50 KCkpCiAgICAgLCBtX21lZGlhQ29udHJvbGxlcigwKQpAQCAtNjgsNiArNzAsNyBAQCBNZWRpYUNv bnRyb2xSb290RWxlbWVudENocm9taXVtOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVt KERvY3VtZW50KiBkb2N1bQogICAgICwgbV9tZWRpYUNvbnRyb2xsZXIoMCkKICAgICAsIG1fcGxh eUJ1dHRvbigwKQogICAgICwgbV9jdXJyZW50VGltZURpc3BsYXkoMCkKKyAgICAsIG1fZHVyYXRp b25EaXNwbGF5KDApCiAgICAgLCBtX3RpbWVsaW5lKDApCiAgICAgLCBtX3BhbmVsTXV0ZUJ1dHRv bigwKQogICAgICwgbV92b2x1bWVTbGlkZXIoMCkKQEAgLTgwLDcgKzgzLDkgQEAgTWVkaWFDb250 cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bShE b2N1bWVudCogZG9jdW0KICAgICAsIG1fdGV4dERpc3BsYXlDb250YWluZXIoMCkKICNlbmRpZgog ICAgICwgbV9vcGFxdWUodHJ1ZSkKKyAgICAsIG1faGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVy KHRoaXMsICZNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpoaWRlRnVsbHNjcmVlbkNv bnRyb2xzVGltZXJGaXJlZCkKICAgICAsIG1faXNNb3VzZU92ZXJDb250cm9scyhmYWxzZSkKKyAg ICAsIG1faXNGdWxsc2NyZWVuKGZhbHNlKQogewogfQogCkBAIC0xMTcsMTAgKzEyMiwxNyBAQCBQ YXNzUmVmUHRyPE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0+IE1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW06OmNyZQogCiAgICAgUmVmUHRyPE1lZGlhQ29udHJvbEN1cnJlbnRU aW1lRGlzcGxheUVsZW1lbnQ+IGN1cnJlbnRUaW1lRGlzcGxheSA9IE1lZGlhQ29udHJvbEN1cnJl bnRUaW1lRGlzcGxheUVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCk7CiAgICAgY29udHJvbHMtPm1f Y3VycmVudFRpbWVEaXNwbGF5ID0gY3VycmVudFRpbWVEaXNwbGF5LmdldCgpOworICAgIGNvbnRy b2xzLT5tX2N1cnJlbnRUaW1lRGlzcGxheS0+aGlkZSgpOwogICAgIHBhbmVsLT5hcHBlbmRDaGls ZChjdXJyZW50VGltZURpc3BsYXkucmVsZWFzZSgpLCBlYywgdHJ1ZSk7CiAgICAgaWYgKGVjKQog ICAgICAgICByZXR1cm4gMDsKIAorICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xUaW1lUmVtYWluaW5n RGlzcGxheUVsZW1lbnQ+IGR1cmF0aW9uRGlzcGxheSA9IE1lZGlhQ29udHJvbFRpbWVSZW1haW5p bmdEaXNwbGF5RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKKyAgICBjb250cm9scy0+bV9kdXJh dGlvbkRpc3BsYXkgPSBkdXJhdGlvbkRpc3BsYXkuZ2V0KCk7CisgICAgcGFuZWwtPmFwcGVuZENo aWxkKGR1cmF0aW9uRGlzcGxheS5yZWxlYXNlKCksIGVjLCB0cnVlKTsKKyAgICBpZiAoZWMpCisg ICAgICAgIHJldHVybiAwOworCiAgICAgUmVmUHRyPE1lZGlhQ29udHJvbFBhbmVsTXV0ZUJ1dHRv bkVsZW1lbnQ+IHBhbmVsTXV0ZUJ1dHRvbiA9IE1lZGlhQ29udHJvbFBhbmVsTXV0ZUJ1dHRvbkVs ZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCwgY29udHJvbHMuZ2V0KCkpOwogICAgIGNvbnRyb2xzLT5t X3BhbmVsTXV0ZUJ1dHRvbiA9IHBhbmVsTXV0ZUJ1dHRvbi5nZXQoKTsKICAgICBwYW5lbC0+YXBw ZW5kQ2hpbGQocGFuZWxNdXRlQnV0dG9uLnJlbGVhc2UoKSwgZWMsIHRydWUpOwpAQCAtMTI5LDYg KzE0MSw3IEBAIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bT4gTWVk aWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6Y3JlCiAKICAgICBSZWZQdHI8TWVkaWFDb250 cm9sVm9sdW1lU2xpZGVyRWxlbWVudD4gc2xpZGVyID0gTWVkaWFDb250cm9sVm9sdW1lU2xpZGVy RWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50KTsKICAgICBjb250cm9scy0+bV92b2x1bWVTbGlkZXIg PSBzbGlkZXIuZ2V0KCk7CisgICAgY29udHJvbHMtPm1fdm9sdW1lU2xpZGVyLT5zZXRDbGVhck11 dGVkT25Vc2VySW50ZXJhY3Rpb24odHJ1ZSk7CiAgICAgcGFuZWwtPmFwcGVuZENoaWxkKHNsaWRl ci5yZWxlYXNlKCksIGVjLCB0cnVlKTsKICAgICBpZiAoZWMpCiAgICAgICAgIHJldHVybiAwOwpA QCAtMTY0LDYgKzE3Nyw4IEBAIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6 c2V0TWVkaWFDb250cm9sbGVyKE1lZGlhQ29udHJvbGxlckludGVyZmFjCiAgICAgICAgIG1fcGxh eUJ1dHRvbi0+c2V0TWVkaWFDb250cm9sbGVyKGNvbnRyb2xsZXIpOwogICAgIGlmIChtX2N1cnJl bnRUaW1lRGlzcGxheSkKICAgICAgICAgbV9jdXJyZW50VGltZURpc3BsYXktPnNldE1lZGlhQ29u dHJvbGxlcihjb250cm9sbGVyKTsKKyAgICBpZiAobV9kdXJhdGlvbkRpc3BsYXkpCisgICAgICAg IG1fZHVyYXRpb25EaXNwbGF5LT5zZXRNZWRpYUNvbnRyb2xsZXIoY29udHJvbGxlcik7CiAgICAg aWYgKG1fdGltZWxpbmUpCiAgICAgICAgIG1fdGltZWxpbmUtPnNldE1lZGlhQ29udHJvbGxlcihj b250cm9sbGVyKTsKICAgICBpZiAobV9wYW5lbE11dGVCdXR0b24pCkBAIC0yMTgsNiArMjMzLDEw IEBAIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6cmVzZXQoKQogICAgIGZs b2F0IGR1cmF0aW9uID0gbV9tZWRpYUNvbnRyb2xsZXItPmR1cmF0aW9uKCk7CiAgICAgbV90aW1l bGluZS0+c2V0RHVyYXRpb24oZHVyYXRpb24pOwogICAgIG1fdGltZWxpbmUtPnNob3coKTsKKwor ICAgIG1fZHVyYXRpb25EaXNwbGF5LT5zZXRJbm5lclRleHQocGFnZS0+dGhlbWUoKS0+Zm9ybWF0 TWVkaWFDb250cm9sc1RpbWUoZHVyYXRpb24pLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICBt X2R1cmF0aW9uRGlzcGxheS0+c2V0Q3VycmVudFZhbHVlKGR1cmF0aW9uKTsKKwogICAgIG1fdGlt ZWxpbmUtPnNldFBvc2l0aW9uKG1fbWVkaWFDb250cm9sbGVyLT5jdXJyZW50VGltZSgpKTsKICAg ICB1cGRhdGVUaW1lRGlzcGxheSgpOwogCkBAIC0yMzYsNyArMjU1LDEyIEBAIHZvaWQgTWVkaWFD b250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6cGxheWJhY2tTdGFydGVkKCkKIHsKICAgICBtX3Bs YXlCdXR0b24tPnVwZGF0ZURpc3BsYXlUeXBlKCk7CiAgICAgbV90aW1lbGluZS0+c2V0UG9zaXRp b24obV9tZWRpYUNvbnRyb2xsZXItPmN1cnJlbnRUaW1lKCkpOworICAgIG1fY3VycmVudFRpbWVE aXNwbGF5LT5zaG93KCk7CisgICAgbV9kdXJhdGlvbkRpc3BsYXktPmhpZGUoKTsKICAgICB1cGRh dGVUaW1lRGlzcGxheSgpOworCisgICAgaWYgKG1faXNGdWxsc2NyZWVuKQorICAgICAgICBzdGFy dEhpZGVGdWxsc2NyZWVuQ29udHJvbHNUaW1lcigpOwogfQogCiB2b2lkIE1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW06OnBsYXliYWNrUHJvZ3Jlc3NlZCgpCkBAIC0yNTQsNiArMjc4LDgg QEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpwbGF5YmFja1N0b3BwZWQo KQogICAgIG1fdGltZWxpbmUtPnNldFBvc2l0aW9uKG1fbWVkaWFDb250cm9sbGVyLT5jdXJyZW50 VGltZSgpKTsKICAgICB1cGRhdGVUaW1lRGlzcGxheSgpOwogICAgIG1ha2VPcGFxdWUoKTsKKwor ICAgIHN0b3BIaWRlRnVsbHNjcmVlbkNvbnRyb2xzVGltZXIoKTsKIH0KIAogdm9pZCBNZWRpYUNv bnRyb2xSb290RWxlbWVudENocm9taXVtOjp1cGRhdGVUaW1lRGlzcGxheSgpCkBAIC0yNjUsNiAr MjkxLDEyIEBAIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6dXBkYXRlVGlt ZURpc3BsYXkoKQogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgLy8gQWZ0 ZXIgc2VlaywgaGlkZSBkdXJhdGlvbiBkaXNwbGF5IGFuZCBzaG93IGN1cnJlbnQgdGltZS4KKyAg ICBpZiAobm93ID4gMCkgeworICAgICAgICBtX2N1cnJlbnRUaW1lRGlzcGxheS0+c2hvdygpOwor ICAgICAgICBtX2R1cmF0aW9uRGlzcGxheS0+aGlkZSgpOworICAgIH0KKwogICAgIC8vIEFsbG93 IHRoZSB0aGVtZSB0byBmb3JtYXQgdGhlIHRpbWUuCiAgICAgRXhjZXB0aW9uQ29kZSBlYzsKICAg ICBtX2N1cnJlbnRUaW1lRGlzcGxheS0+c2V0SW5uZXJUZXh0KHBhZ2UtPnRoZW1lKCktPmZvcm1h dE1lZGlhQ29udHJvbHNDdXJyZW50VGltZShub3csIGR1cmF0aW9uKSwgZWMpOwpAQCAtMzE2LDE1 ICszNDgsNTUgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpkZWZhdWx0 RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVu dE5hbWVzKCkubW91c2VvdmVyRXZlbnQpIHsKICAgICAgICAgaWYgKCFjb250YWluc1JlbGF0ZWRU YXJnZXQoZXZlbnQpKSB7CiAgICAgICAgICAgICBtX2lzTW91c2VPdmVyQ29udHJvbHMgPSB0cnVl OwotICAgICAgICAgICAgaWYgKCFtX21lZGlhQ29udHJvbGxlci0+Y2FuUGxheSgpKQorICAgICAg ICAgICAgaWYgKCFtX21lZGlhQ29udHJvbGxlci0+Y2FuUGxheSgpKSB7CiAgICAgICAgICAgICAg ICAgbWFrZU9wYXF1ZSgpOworICAgICAgICAgICAgICAgIGlmIChzaG91bGRIaWRlQ29udHJvbHMo KSkKKyAgICAgICAgICAgICAgICAgICAgc3RhcnRIaWRlRnVsbHNjcmVlbkNvbnRyb2xzVGltZXIo KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAoZXZlbnQtPnR5cGUo KSA9PSBldmVudE5hbWVzKCkubW91c2VvdXRFdmVudCkgewotICAgICAgICBpZiAoIWNvbnRhaW5z UmVsYXRlZFRhcmdldChldmVudCkpCisgICAgICAgIGlmICghY29udGFpbnNSZWxhdGVkVGFyZ2V0 KGV2ZW50KSkgewogICAgICAgICAgICAgbV9pc01vdXNlT3ZlckNvbnRyb2xzID0gZmFsc2U7Cisg ICAgICAgICAgICBzdG9wSGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVyKCk7CisgICAgICAgIH0K KyAgICB9IGVsc2UgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2 ZW50KSB7CisgICAgICAgIGlmIChtX2lzRnVsbHNjcmVlbikgeworICAgICAgICAgICAgLy8gV2hl biB3ZSBnZXQgYSBtb3VzZSBtb3ZlIGluIGZ1bGxzY3JlZW4gbW9kZSwgc2hvdyB0aGUgbWVkaWEg Y29udHJvbHMsIGFuZCBzdGFydCBhIHRpbWVyCisgICAgICAgICAgICAvLyB0aGF0IHdpbGwgaGlk ZSB0aGUgbWVkaWEgY29udHJvbHMgYWZ0ZXIgYSAzIHNlY29uZHMgd2l0aG91dCBhIG1vdXNlIG1v dmUuCisgICAgICAgICAgICBtYWtlT3BhcXVlKCk7CisgICAgICAgICAgICBpZiAoc2hvdWxkSGlk ZUNvbnRyb2xzKCkpCisgICAgICAgICAgICAgICAgc3RhcnRIaWRlRnVsbHNjcmVlbkNvbnRyb2xz VGltZXIoKTsKKyAgICAgICAgfQogICAgIH0KIH0KIAordm9pZCBNZWRpYUNvbnRyb2xSb290RWxl bWVudENocm9taXVtOjpzdGFydEhpZGVGdWxsc2NyZWVuQ29udHJvbHNUaW1lcigpCit7CisgICAg aWYgKCFtX2lzRnVsbHNjcmVlbikKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9oaWRlRnVsbHNj cmVlbkNvbnRyb2xzVGltZXIuc3RhcnRPbmVTaG90KHRpbWVXaXRob3V0TW91c2VNb3ZlbWVudEJl Zm9yZUhpZGluZ0NvbnRyb2xzKTsKK30KKwordm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENo cm9taXVtOjpoaWRlRnVsbHNjcmVlbkNvbnRyb2xzVGltZXJGaXJlZChUaW1lcjxNZWRpYUNvbnRy b2xSb290RWxlbWVudENocm9taXVtPiopCit7CisgICAgaWYgKG1fbWVkaWFDb250cm9sbGVyLT5w YXVzZWQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFtX2lzRnVsbHNjcmVlbikKKyAg ICAgICAgcmV0dXJuOworCisgICAgaWYgKCFzaG91bGRIaWRlQ29udHJvbHMoKSkKKyAgICAgICAg cmV0dXJuOworCisgICAgbWFrZVRyYW5zcGFyZW50KCk7Cit9CisKK3ZvaWQgTWVkaWFDb250cm9s Um9vdEVsZW1lbnRDaHJvbWl1bTo6c3RvcEhpZGVGdWxsc2NyZWVuQ29udHJvbHNUaW1lcigpCit7 CisgICAgbV9oaWRlRnVsbHNjcmVlbkNvbnRyb2xzVGltZXIuc3RvcCgpOworfQorCiB2b2lkIE1l ZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06OmNoYW5nZWRDbG9zZWRDYXB0aW9uc1Zpc2li aWxpdHkoKQogewogfQpAQCAtMzMyLDYgKzQwNCwxMSBAQCB2b2lkIE1lZGlhQ29udHJvbFJvb3RF bGVtZW50Q2hyb21pdW06OmNoYW5nZWRDbG9zZWRDYXB0aW9uc1Zpc2liaWxpdHkoKQogdm9pZCBN ZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpjaGFuZ2VkTXV0ZSgpCiB7CiAgICAgbV9w YW5lbE11dGVCdXR0b24tPmNoYW5nZWRNdXRlKCk7CisKKyAgICBpZiAobV9tZWRpYUNvbnRyb2xs ZXItPm11dGVkKCkpCisgICAgICAgIG1fdm9sdW1lU2xpZGVyLT5zZXRWb2x1bWUoMCk7CisgICAg ZWxzZQorICAgICAgICBtX3ZvbHVtZVNsaWRlci0+c2V0Vm9sdW1lKG1fbWVkaWFDb250cm9sbGVy LT52b2x1bWUoKSk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6 Y2hhbmdlZFZvbHVtZSgpCkBAIC0zNDEsMTAgKzQxOCwxNiBAQCB2b2lkIE1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW06OmNoYW5nZWRWb2x1bWUoKQogCiB2b2lkIE1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW06OmVudGVyZWRGdWxsc2NyZWVuKCkKIHsKKyAgICBtX2lzRnVsbHNj cmVlbiA9IHRydWU7CisgICAgbV9mdWxsc2NyZWVuQnV0dG9uLT5zZXRJc0Z1bGxzY3JlZW4odHJ1 ZSk7CisgICAgc3RhcnRIaWRlRnVsbHNjcmVlbkNvbnRyb2xzVGltZXIoKTsKIH0KIAogdm9pZCBN ZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpleGl0ZWRGdWxsc2NyZWVuKCkKIHsKKyAg ICBtX2lzRnVsbHNjcmVlbiA9IGZhbHNlOworICAgIG1fZnVsbHNjcmVlbkJ1dHRvbi0+c2V0SXNG dWxsc2NyZWVuKGZhbHNlKTsKKyAgICBzdG9wSGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVyKCk7 CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6c2hvd1ZvbHVtZVNs aWRlcigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xSb290RWxlbWVudENocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmgKaW5kZXggZjRjMzkyMWFjN2QwYzVhOWViYjM3 NTYwYzMzY2JhZjIzZWEzNTRlNC4uZjEwYjcyOGU4MGUyMWRhNTY5ZDQ1ODM0MDVmZjY4MTQyNjU3 YTQ5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9s Um9vdEVsZW1lbnRDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01l ZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uaApAQCAtNDAsNiArNDAsNyBAQCBjbGFzcyBF dmVudDsKIGNsYXNzIE1lZGlhQ29udHJvbFBhbmVsTXV0ZUJ1dHRvbkVsZW1lbnQ7CiBjbGFzcyBN ZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudDsKIGNsYXNzIE1lZGlhQ29udHJvbEN1cnJlbnRU aW1lRGlzcGxheUVsZW1lbnQ7CitjbGFzcyBNZWRpYUNvbnRyb2xUaW1lUmVtYWluaW5nRGlzcGxh eUVsZW1lbnQ7CiBjbGFzcyBNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQ7CiBjbGFzcyBNZWRp YUNvbnRyb2xWb2x1bWVTbGlkZXJFbGVtZW50OwogY2xhc3MgTWVkaWFDb250cm9sRnVsbHNjcmVl bkJ1dHRvbkVsZW1lbnQ7CkBAIC0xMjUsNiArMTI2LDkgQEAgcHJpdmF0ZToKICAgICBNZWRpYUNv bnRyb2xSb290RWxlbWVudENocm9taXVtKERvY3VtZW50Kik7CiAKICAgICB2aXJ0dWFsIHZvaWQg ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCopOworICAgIHZvaWQgaGlkZUZ1bGxzY3JlZW5Db250 cm9sc1RpbWVyRmlyZWQoVGltZXI8TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bT4qKTsK KyAgICB2b2lkIHN0YXJ0SGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVyKCk7CisgICAgdm9pZCBz dG9wSGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVyKCk7CiAKICAgICB2aXJ0dWFsIGNvbnN0IEF0 b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdDsKIApAQCAtMTM0LDYgKzEzOCw3IEBA IHByaXZhdGU6CiAKICAgICBNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudCogbV9wbGF5QnV0 dG9uOwogICAgIE1lZGlhQ29udHJvbEN1cnJlbnRUaW1lRGlzcGxheUVsZW1lbnQqIG1fY3VycmVu dFRpbWVEaXNwbGF5OworICAgIE1lZGlhQ29udHJvbFRpbWVSZW1haW5pbmdEaXNwbGF5RWxlbWVu dCogbV9kdXJhdGlvbkRpc3BsYXk7CiAgICAgTWVkaWFDb250cm9sVGltZWxpbmVFbGVtZW50KiBt X3RpbWVsaW5lOwogICAgIE1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyRWxlbWVudCogbV90 aW1lbGluZUNvbnRhaW5lcjsKICAgICBNZWRpYUNvbnRyb2xQYW5lbE11dGVCdXR0b25FbGVtZW50 KiBtX3BhbmVsTXV0ZUJ1dHRvbjsKQEAgLTE0OCw3ICsxNTMsOSBAQCBwcml2YXRlOgogI2VuZGlm CiAKICAgICBib29sIG1fb3BhcXVlOworICAgIFRpbWVyPE1lZGlhQ29udHJvbFJvb3RFbGVtZW50 Q2hyb21pdW0+IG1faGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVyOwogICAgIGJvb2wgbV9pc01v dXNlT3ZlckNvbnRyb2xzOworICAgIGJvb2wgbV9pc0Z1bGxzY3JlZW47CiB9OwogCiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9sc0Nocm9t aXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzQ2hy b21pdW0uY3BwCmluZGV4IGI2YjQ0Zjg2NzViMzEyMTA2NDlmNDQzOTA0NGI1MzUxYmM1ODdlYTAu LjQxYzc5NWI3N2E5NjhlM2JiODBhZmM2YjZiMTE1NDA0M2UwMzI1MWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW0u Y3BwCkBAIC0yNDgsMTIgKzI0OCwxNyBAQCBzdGF0aWMgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xp ZGVyKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWludEluZm8mIHBhaW50SQogICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICBpZiAodm9sdW1lID4gMSkKICAgICAgICAgdm9sdW1lID0gMTsK KyAgICBpZiAoIWhhc1NvdXJjZShtZWRpYUVsZW1lbnQpIHx8ICFtZWRpYUVsZW1lbnQtPmhhc0F1 ZGlvKCkgfHwgbWVkaWFFbGVtZW50LT5tdXRlZCgpKQorICAgICAgICB2b2x1bWUgPSAwOwogCiAg ICAgLy8gQ2FsY3VsYXRlIHRoZSBwb3NpdGlvbiByZWxhdGl2ZSB0byB0aGUgY2VudGVyIG9mIHRo ZSB0aHVtYi4KLSAgICBmbG9hdCB0aHVtYkNlbnRlciA9IG1lZGlhVm9sdW1lU2xpZGVyVGh1bWJX aWR0aCAvIDI7Ci0gICAgZmxvYXQgem9vbUxldmVsID0gc3R5bGUtPmVmZmVjdGl2ZVpvb20oKTsK LSAgICBmbG9hdCBwb3NpdGlvbldpZHRoID0gdm9sdW1lICogKHJlY3Qud2lkdGgoKSAtICh6b29t TGV2ZWwgKiB0aHVtYkNlbnRlcikpOwotICAgIGZsb2F0IGZpbGxXaWR0aCA9IHBvc2l0aW9uV2lk dGggKyAoem9vbUxldmVsICogdGh1bWJDZW50ZXIgLyAyKTsKKyAgICBmbG9hdCBmaWxsV2lkdGgg PSAwOworICAgIGlmICh2b2x1bWUgPiAwKSB7CisgICAgICAgIGZsb2F0IHRodW1iQ2VudGVyID0g bWVkaWFWb2x1bWVTbGlkZXJUaHVtYldpZHRoIC8gMjsKKyAgICAgICAgZmxvYXQgem9vbUxldmVs ID0gc3R5bGUtPmVmZmVjdGl2ZVpvb20oKTsKKyAgICAgICAgZmxvYXQgcG9zaXRpb25XaWR0aCA9 IHZvbHVtZSAqIChyZWN0LndpZHRoKCkgLSAoem9vbUxldmVsICogdGh1bWJDZW50ZXIpKTsKKyAg ICAgICAgZmlsbFdpZHRoID0gcG9zaXRpb25XaWR0aCArICh6b29tTGV2ZWwgKiB0aHVtYkNlbnRl ciAvIDIpOworICAgIH0KIAogICAgIHBhaW50U2xpZGVyUmFuZ2VIaWdobGlnaHQocmVjdCwgc3R5 bGUsIGNvbnRleHQsIDAuMCwgZmlsbFdpZHRoIC8gcmVjdC53aWR0aCgpKTsKIApAQCAtMjYyLDYg KzI2NywxNiBAQCBzdGF0aWMgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyKFJlbmRlck9iamVj dCogb2JqZWN0LCBjb25zdCBQYWludEluZm8mIHBhaW50SQogCiBzdGF0aWMgYm9vbCBwYWludE1l ZGlhVm9sdW1lU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW5m byYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0KQogeworICAgIEFTU0VSVChvYmplY3Qt Pm5vZGUoKSk7CisgICAgTm9kZSogaG9zdE5vZGUgPSBvYmplY3QtPm5vZGUoKS0+c2hhZG93QW5j ZXN0b3JOb2RlKCk7CisgICAgQVNTRVJUKGhvc3ROb2RlKTsKKyAgICBIVE1MTWVkaWFFbGVtZW50 KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudChob3N0Tm9kZSk7CisgICAgaWYg KCFtZWRpYUVsZW1lbnQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghaGFzU291 cmNlKG1lZGlhRWxlbWVudCkgfHwgIW1lZGlhRWxlbWVudC0+aGFzQXVkaW8oKSkKKyAgICAgICAg cmV0dXJuIHRydWU7CisKICAgICBzdGF0aWMgSW1hZ2UqIG1lZGlhVm9sdW1lU2xpZGVyVGh1bWIg PSBwbGF0Zm9ybVJlc291cmNlKCJtZWRpYXBsYXllclZvbHVtZVNsaWRlclRodW1iIik7CiAgICAg cmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsIG1lZGlhVm9s dW1lU2xpZGVyVGh1bWIpOwogfQpAQCAtMjcyLDggKzI4Nyw4IEBAIHN0YXRpYyBib29sIHBhaW50 TWVkaWFGdWxsc2NyZWVuQnV0dG9uKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWludElu Zm8mIHBhCiAgICAgaWYgKCFtZWRpYUVsZW1lbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAot ICAgIERFRklORV9TVEFUSUNfTE9DQUwoSW1hZ2UqLCBtZWRpYUZ1bGxzY3JlZW4sIChwbGF0Zm9y bVJlc291cmNlKCJtZWRpYUZ1bGxzY3JlZW4iKSkpOwotICAgIHJldHVybiBwYWludE1lZGlhQnV0 dG9uKHBhaW50SW5mby5jb250ZXh0LCByZWN0LCBtZWRpYUZ1bGxzY3JlZW4pOworICAgIHN0YXRp YyBJbWFnZSogbWVkaWFGdWxsc2NyZWVuQnV0dG9uID0gcGxhdGZvcm1SZXNvdXJjZSgibWVkaWFw bGF5ZXJGdWxsc2NyZWVuIik7CisgICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZv LmNvbnRleHQsIHJlY3QsIG1lZGlhRnVsbHNjcmVlbkJ1dHRvbik7CiB9CiAKIGJvb2wgUmVuZGVy TWVkaWFDb250cm9sc0Nocm9taXVtOjpwYWludE1lZGlhQ29udHJvbHNQYXJ0KE1lZGlhQ29udHJv bEVsZW1lbnRUeXBlIHBhcnQsIFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWludEluZm8m IHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTM0OCw2ICszNjMsNDUgQEAgdm9p ZCBSZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW06OmFkanVzdE1lZGlhU2xpZGVyVGh1bWJTaXpl KFJlbmRlclN0eWxlKiBzdHlsZSkKICAgICB9CiB9CiAKK3N0YXRpYyBTdHJpbmcgZm9ybWF0Q2hy b21pdW1NZWRpYUNvbnRyb2xzVGltZShmbG9hdCB0aW1lLCBmbG9hdCBkdXJhdGlvbikKK3sKKyAg ICBpZiAoIWlzZmluaXRlKHRpbWUpKQorICAgICAgICB0aW1lID0gMDsKKyAgICBpZiAoIWlzZmlu aXRlKGR1cmF0aW9uKSkKKyAgICAgICAgZHVyYXRpb24gPSAwOworICAgIGludCBzZWNvbmRzID0g c3RhdGljX2Nhc3Q8aW50PihmYWJzZih0aW1lKSk7CisgICAgaW50IGhvdXJzID0gc2Vjb25kcyAv ICg2MCAqIDYwKTsKKyAgICBpbnQgbWludXRlcyA9IChzZWNvbmRzIC8gNjApICUgNjA7CisgICAg c2Vjb25kcyAlPSA2MDsKKworICAgIC8vIGR1cmF0aW9uIGRlZmluZXMgdGhlIGZvcm1hdCBvZiBo b3cgdGhlIHRpbWUgaXMgcmVuZGVyZWQKKyAgICBpbnQgZHVyYXRpb25TZWNzID0gc3RhdGljX2Nh c3Q8aW50PihmYWJzZihkdXJhdGlvbikpOworICAgIGludCBkdXJhdGlvbkhvdXJzID0gZHVyYXRp b25TZWNzIC8gKDYwICogNjApOworICAgIGludCBkdXJhdGlvbk1pbnMgPSAoZHVyYXRpb25TZWNz IC8gNjApICUgNjA7CisKKyAgICBpZiAoZHVyYXRpb25Ib3VycyB8fCBob3VycykKKyAgICAgICAg cmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIlcyUwMWQ6JTAyZDolMDJkIiwgKHRpbWUgPCAwID8gIi0i IDogIiIpLCBob3VycywgbWludXRlcywgc2Vjb25kcyk7CisgICAgaWYgKGR1cmF0aW9uTWlucyA+ IDkpCisgICAgICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiJXMlMDJkOiUwMmQiLCAodGltZSA8 IDAgPyAiLSIgOiAiIiksIG1pbnV0ZXMsIHNlY29uZHMpOworCisgICAgcmV0dXJuIFN0cmluZzo6 Zm9ybWF0KCIlcyUwMWQ6JTAyZCIsICh0aW1lIDwgMCA/ICItIiA6ICIiKSwgbWludXRlcywgc2Vj b25kcyk7Cit9CisKK1N0cmluZyBSZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW06OmZvcm1hdE1l ZGlhQ29udHJvbHNUaW1lKGZsb2F0IHRpbWUpCit7CisgICAgcmV0dXJuIGZvcm1hdENocm9taXVt TWVkaWFDb250cm9sc1RpbWUodGltZSwgdGltZSk7Cit9CisKK1N0cmluZyBSZW5kZXJNZWRpYUNv bnRyb2xzQ2hyb21pdW06OmZvcm1hdE1lZGlhQ29udHJvbHNDdXJyZW50VGltZShmbG9hdCBjdXJy ZW50VGltZSwgZmxvYXQgZHVyYXRpb24pCit7CisgICAgcmV0dXJuIGZvcm1hdENocm9taXVtTWVk aWFDb250cm9sc1RpbWUoY3VycmVudFRpbWUsIGR1cmF0aW9uKTsKK30KKworU3RyaW5nIFJlbmRl ck1lZGlhQ29udHJvbHNDaHJvbWl1bTo6Zm9ybWF0TWVkaWFDb250cm9sc1JlbWFpbmluZ1RpbWUo ZmxvYXQgY3VycmVudFRpbWUsIGZsb2F0IGR1cmF0aW9uKQoreworICAgIHJldHVybiBmb3JtYXRD aHJvbWl1bU1lZGlhQ29udHJvbHNUaW1lKGN1cnJlbnRUaW1lIC0gZHVyYXRpb24sIGR1cmF0aW9u KTsKK30KKwogI2VuZGlmICAvLyAjaWYgRU5BQkxFKFZJREVPKQogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFD b250cm9sc0Nocm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFD b250cm9sc0Nocm9taXVtLmgKaW5kZXggOWFmOTM5NjBmZmVmY2NlOTlhZjEyNjQzODRlZDMzNDE2 YTJkOWY2MS4uYzNiODAxYmYwY2MxZTk4MTkxY2YzMzYzMGZhYjIyNzFiMzNjMzJiNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHNDaHJvbWl1 bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzQ2hy b21pdW0uaApAQCAtMzgsNiArMzgsOSBAQCBjbGFzcyBSZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21p dW0gewogcHVibGljOgogICAgIHN0YXRpYyBib29sIHBhaW50TWVkaWFDb250cm9sc1BhcnQoTWVk aWFDb250cm9sRWxlbWVudFR5cGUsIFJlbmRlck9iamVjdCosIGNvbnN0IFBhaW50SW5mbyYsIGNv bnN0IEludFJlY3QmKTsKICAgICBzdGF0aWMgdm9pZCBhZGp1c3RNZWRpYVNsaWRlclRodW1iU2l6 ZShSZW5kZXJTdHlsZSopOworICAgIHN0YXRpYyBTdHJpbmcgZm9ybWF0TWVkaWFDb250cm9sc1Rp bWUoZmxvYXQgdGltZSk7CisgICAgc3RhdGljIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzQ3Vy cmVudFRpbWUoZmxvYXQgY3VycmVudFRpbWUsIGZsb2F0IGR1cmF0aW9uKTsKKyAgICBzdGF0aWMg U3RyaW5nIGZvcm1hdE1lZGlhQ29udHJvbHNSZW1haW5pbmdUaW1lKGZsb2F0IGN1cnJlbnRUaW1l LCBmbG9hdCBkdXJhdGlvbik7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1NYWMuaAppbmRleCBh YTk0YTQyOWY3OTNkMWYyMmE0ODc3MDFmOTcwNGE5NTIxMWRhMzE0Li45NzMyOTlhMzE5MWYzN2Jl NTY0NTQxYmFhYzY3MmEwNjlmNDNkZTFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLmgKQEAgLTU1LDYgKzU1LDEwIEBAIHByb3RlY3Rl ZDoKICAgICB2aXJ0dWFsIGJvb2wgdXNlc01lZGlhQ29udHJvbFN0YXR1c0Rpc3BsYXkoKSB7IHJl dHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgYm9vbCBoYXNPd25EaXNhYmxlZFN0YXRlSGFuZGxp bmdGb3IoQ29udHJvbFBhcnQpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIGJv b2wgdXNlc1ZlcnRpY2FsVm9sdW1lU2xpZGVyKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAg ICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzVGltZShmbG9hdCB0aW1lKSBjb25z dDsKKyAgICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVudFRpbWUoZmxv YXQgY3VycmVudFRpbWUsIGZsb2F0IGR1cmF0aW9uKSBjb25zdDsKKyAgICB2aXJ0dWFsIFN0cmlu ZyBmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5nVGltZShmbG9hdCBjdXJyZW50VGltZSwgZmxv YXQgZHVyYXRpb24pIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhRnVsbHNjcmVl bkJ1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7 CiAjZW5kaWYKIAogICAgIHZpcnR1YWwgYm9vbCB1c2VzVGVzdE1vZGVGb2N1c1JpbmdDb2xvcigp IGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l Q2hyb21pdW1NYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJv bWl1bU1hYy5tbQppbmRleCA1YTVhZjRkYTY1YWI0YjQwMDBhOTUwOTNjZGM4NWU2Nzg1NmVlNDE4 Li4xNzkxYjA5YWI2NTI4YTE1ZmQ1M2Y5NGE4OTdlOTgyNTM3ZWQzNzAyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbQpAQCAtMjIz LDYgKzIyMywyNiBAQCBJbnRQb2ludCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjp2b2x1bWVTbGlk ZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihSZW5kZXJCb3gqIG11dAogewogICAgIHJldHVybiBSZW5k ZXJUaGVtZTo6dm9sdW1lU2xpZGVyT2Zmc2V0RnJvbU11dGVCdXR0b24obXV0ZUJ1dHRvbkJveCwg c2l6ZSk7CiB9CisKK1N0cmluZyBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpmb3JtYXRNZWRpYUNv bnRyb2xzVGltZShmbG9hdCB0aW1lKSBjb25zdAoreworICAgIHJldHVybiBSZW5kZXJNZWRpYUNv bnRyb2xzQ2hyb21pdW06OmZvcm1hdE1lZGlhQ29udHJvbHNUaW1lKHRpbWUpOworfQorCitTdHJp bmcgUmVuZGVyVGhlbWVDaHJvbWl1bU1hYzo6Zm9ybWF0TWVkaWFDb250cm9sc0N1cnJlbnRUaW1l KGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlvbikgY29uc3QKK3sKKyAgICByZXR1cm4g UmVuZGVyTWVkaWFDb250cm9sc0Nocm9taXVtOjpmb3JtYXRNZWRpYUNvbnRyb2xzQ3VycmVudFRp bWUoY3VycmVudFRpbWUsIGR1cmF0aW9uKTsKK30KKworU3RyaW5nIFJlbmRlclRoZW1lQ2hyb21p dW1NYWM6OmZvcm1hdE1lZGlhQ29udHJvbHNSZW1haW5pbmdUaW1lKGZsb2F0IGN1cnJlbnRUaW1l LCBmbG9hdCBkdXJhdGlvbikgY29uc3QKK3sKKyAgICByZXR1cm4gUmVuZGVyVGhlbWVDaHJvbWl1 bU1hYzo6Zm9ybWF0TWVkaWFDb250cm9sc1JlbWFpbmluZ1RpbWUoY3VycmVudFRpbWUsIGR1cmF0 aW9uKTsKK30KKworYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtTWFjOjpwYWludE1lZGlhRnVsbHNj cmVlbkJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludElu Zm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCit7CisgICAgcmV0dXJuIFJlbmRlck1lZGlhQ29udHJv bHNDaHJvbWl1bTo6cGFpbnRNZWRpYUNvbnRyb2xzUGFydChNZWRpYUVudGVyRnVsbHNjcmVlbkJ1 dHRvbiwgb2JqZWN0LCBwYWludEluZm8sIHJlY3QpOworfQogI2VuZGlmCiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZUNocm9taXVtU2tpYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVDaHJvbWl1bVNraWEuY3BwCmluZGV4IGMxNWY5NmRmNGJlNDZhNDg4MmVlYjIwMGIwNzgzZDRk NjNjYzMyNTAuLmM4ODA2NjYxNjc4MmE5ZDFmMzMzZDU2MGQ1NjRiYWRjNmI0ZWRmM2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1Ta2lh LmNwcApAQCAtNDU5LDYgKzQ1OSw1MCBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpw YWludE1lZGlhTXV0ZUJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUAogI2VuZGlm CiB9CiAKK1N0cmluZyBSZW5kZXJUaGVtZUNocm9taXVtU2tpYTo6Zm9ybWF0TWVkaWFDb250cm9s c1RpbWUoZmxvYXQgdGltZSkgY29uc3QKK3sKKyNpZiBFTkFCTEUoVklERU8pCisgICAgcmV0dXJu IFJlbmRlck1lZGlhQ29udHJvbHNDaHJvbWl1bTo6Zm9ybWF0TWVkaWFDb250cm9sc1RpbWUodGlt ZSk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTSh0aW1lKTsKKyAgICByZXR1cm4gMDsKKyNlbmRp ZgorfQorCitTdHJpbmcgUmVuZGVyVGhlbWVDaHJvbWl1bVNraWE6OmZvcm1hdE1lZGlhQ29udHJv bHNDdXJyZW50VGltZShmbG9hdCBjdXJyZW50VGltZSwgZmxvYXQgZHVyYXRpb24pIGNvbnN0Cit7 CisjaWYgRU5BQkxFKFZJREVPKQorICAgIHJldHVybiBSZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21p dW06OmZvcm1hdE1lZGlhQ29udHJvbHNDdXJyZW50VGltZShjdXJyZW50VGltZSwgZHVyYXRpb24p OworI2Vsc2UKKyAgICBVTlVTRURfUEFSQU0oY3VycmVudFRpbWUpOworICAgIFVOVVNFRF9QQVJB TShkdXJhdGlvbik7CisgICAgcmV0dXJuIDA7CisjZW5kaWYKK30KKworU3RyaW5nIFJlbmRlclRo ZW1lQ2hyb21pdW1Ta2lhOjpmb3JtYXRNZWRpYUNvbnRyb2xzUmVtYWluaW5nVGltZShmbG9hdCBj dXJyZW50VGltZSwgZmxvYXQgZHVyYXRpb24pIGNvbnN0Cit7CisjaWYgRU5BQkxFKFZJREVPKQor ICAgIHJldHVybiBSZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW06OmZvcm1hdE1lZGlhQ29udHJv bHNSZW1haW5pbmdUaW1lKGN1cnJlbnRUaW1lLCBkdXJhdGlvbik7CisjZWxzZQorICAgIFVOVVNF RF9QQVJBTShjdXJyZW50VGltZSk7CisgICAgVU5VU0VEX1BBUkFNKGR1cmF0aW9uKTsKKyAgICBy ZXR1cm4gMDsKKyNlbmRpZgorfQorCitib29sIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjpwYWlu dE1lZGlhRnVsbHNjcmVlbkJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJ bmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCit7CisjaWYgRU5BQkxFKFZJREVP KQorICAgIHJldHVybiBSZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW06OnBhaW50TWVkaWFDb250 cm9sc1BhcnQoTWVkaWFFbnRlckZ1bGxzY3JlZW5CdXR0b24sIG9iamVjdCwgcGFpbnRJbmZvLCBy ZWN0KTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKG9iamVjdCk7CisgICAgVU5VU0VEX1BBUkFN KHBhaW50SW5mbyk7CisgICAgVU5VU0VEX1BBUkFNKHJlY3QpOworICAgIHJldHVybiBmYWxzZTsK KyNlbmRpZgorfQorCiB2b2lkIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lhOjphZGp1c3RNZW51TGlz dFN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSogc3R5bGUsIFdlYkNvcmU6OkVsZW1l bnQqKSBjb25zdAogewogICAgIC8vIEhlaWdodCBpcyBsb2NrZWQgdG8gYXV0byBvbiBhbGwgYnJv d3NlcnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVD aHJvbWl1bVNraWEuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9t aXVtU2tpYS5oCmluZGV4IDUzZDZkMjMxNWJiZmYwNjU1ZmMxZmY2ZDY5OWFlZDMzMTI1NzcxY2Qu Ljc0NTg3MzA1MmZkZTYzMmFiOWUyMzhkYTdlYzRkZDg3YjQ2ZDIxZDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5oCkBAIC05OCw2 ICs5OCwxMCBAQCBjbGFzcyBSZW5kZXJUaGVtZUNocm9taXVtU2tpYSA6IHB1YmxpYyBSZW5kZXJU aGVtZSB7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIo UmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogICAgICAg ICB2aXJ0dWFsIGJvb2wgcGFpbnRNZWRpYVBsYXlCdXR0b24oUmVuZGVyT2JqZWN0KiwgY29uc3Qg UGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogICAgICAgICB2aXJ0dWFsIGJvb2wgcGFpbnRN ZWRpYU11dGVCdXR0b24oUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZvJiwgY29uc3QgSW50 UmVjdCYpOworICAgICAgICB2aXJ0dWFsIFN0cmluZyBmb3JtYXRNZWRpYUNvbnRyb2xzVGltZShm bG9hdCB0aW1lKSBjb25zdDsKKyAgICAgICAgdmlydHVhbCBTdHJpbmcgZm9ybWF0TWVkaWFDb250 cm9sc0N1cnJlbnRUaW1lKGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlvbikgY29uc3Q7 CisgICAgICAgIHZpcnR1YWwgU3RyaW5nIGZvcm1hdE1lZGlhQ29udHJvbHNSZW1haW5pbmdUaW1l KGZsb2F0IGN1cnJlbnRUaW1lLCBmbG9hdCBkdXJhdGlvbikgY29uc3Q7CisgICAgICAgIHZpcnR1 YWwgYm9vbCBwYWludE1lZGlhRnVsbHNjcmVlbkJ1dHRvbihSZW5kZXJPYmplY3QqLCBjb25zdCBQ YWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAKICAgICAgICAgLy8gTWVudUxpc3QgcmVmZXJz IHRvIGFuIHVuc3R5bGVkIG1lbnVsaXN0IChtZWFuaW5nIGEgbWVudWxpc3Qgd2l0aG91dAogICAg ICAgICAvLyBiYWNrZ3JvdW5kLWNvbG9yIG9yIGJvcmRlciBzZXQpIGFuZCBNZW51TGlzdEJ1dHRv biByZWZlcnMgdG8gYSBzdHlsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v ZmVhdHVyZXMuZ3lwaSBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lwaQppbmRl eCA5OTQ1ZjA0YmNhNDY1Nzc3ZGZiODZkNzI3ZGVlZjBjYjJlN2E3MmFhLi45NzZhYjliZGIxZjRl ZWI5YjBjODA3MDk2ZTBkOThmNjYyYzgzYTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL2ZlYXR1cmVzLmd5cGkKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9mZWF0dXJl cy5neXBpCkBAIC0xNjEsNyArMTYxLDcgQEAKICAgICAgICAgJ2ZlYXR1cmVfZGVmaW5lcyc6IFsK ICAgICAgICAgICAnRU5BQkxFX0NBTEVOREFSX1BJQ0tFUj0xJywKICAgICAgICAgICAnRU5BQkxF X0ZPTlRfQk9PU1RJTkc9MCcsCi0gICAgICAgICAgJ0VOQUJMRV9GVUxMU0NSRUVOX01FRElBX0NP TlRST0xTPTAnLAorICAgICAgICAgICdFTkFCTEVfRlVMTFNDUkVFTl9NRURJQV9DT05UUk9MUz0x JywKICAgICAgICAgICAnRU5BQkxFX0lOUFVUX1NQRUVDSD0xJywKICAgICAgICAgICAnRU5BQkxF X0lOUFVUX1RZUEVfREFURVRJTUU9MCcsCiAgICAgICAgICAgJ0VOQUJMRV9JTlBVVF9UWVBFX0RB VEVUSU1FTE9DQUw9MCcsCg== 147572 2012-06-14 06:32:57 -0700 2012-06-14 19:26:22 -0700 Use this for review patch8.diff text/plain 6731 silviapf ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1YmQ0YThhLi4zOGJkM2M0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDcyICsxLDE3 IEBACiAyMDEyLTA2LTE0ICBTaWx2aWEgUGZlaWZmZXIgIDxzaWx2aWFwZkBjaHJvbWl1bS5vcmc+ CiAKLSAgICAgICAgQWRkIGZ1bGxzY3JlZW4gYnV0dG9uIHRvIENocm9tZSB2aWRlbyBjb250cm9s cyBmb3IgdmlkZW8uCi0gICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04ODgxOAorICAgICAgICBSZW1vdmUgdm9sdW1lIHRodW1iIGZvciB2aWRlb3Mgd2l0aG91 dCBhdWRpbyB0cmFjay4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg5MDkzCiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAKLSAg ICAgICAgTm8gbmV3IHRlc3RzLCBmaW5hbCBwYXRjaCB3aWxsIGNvbnRhaW4gdGhlIHJlYmFzZWxp bmVkIHRlc3RzLgotCi0gICAgICAgIFRoZSBDaHJvbWUgdmlkZW8gY29udHJvbHMgYXJlIHJlY2Vp dmluZyBhIHZpc3VhbCB1cGRhdGUuCi0gICAgICAgIFRoaXMgcGF0Y2ggaW5jbHVkZXMgYSBmdWxs c2NyZWVuIGJ1dHRvbiBmb3IgdmlkZW8gZWxlbWVudHMgYW5kIHRoZSByZW5kZXJpbmcgb2YgdGhl IGNvbnRyb2xzCi0gICAgICAgIGluIGZ1bGxzY3JlZW4gaW5jbHVkaW5nIGhpZGluZyB0aGVtIGFm dGVyIDIgc2Vjb25kcyB3aGVuIHRoZSBtb3VzZSBpcyBvdXQgb2YgdGhlIGNvbnRyb2xzCi0gICAg ICAgIGFuZCBub3QgbW92ZWQuCisgICAgICAgIE5vIG5ldyB0ZXN0cywgc2luY2UgdGhpcyB3YXMg YWxyZWFkeSB0ZXN0ZWQgaW4gbWVkaWEvdmlkZW8tbm8tYXVkaW8uaHRtbC4KIAotICAgICAgICAq IGNzcy9mdWxsc2NyZWVuLmNzczoKLSAgICAgICAgKHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW4s IGF1ZGlvOi13ZWJraXQtZnVsbC1zY3JlZW4pOgotICAgICAgICBBZGQgYXVkaW8gdG8gdGhlIGRl ZmF1bHQgZnVsbHNjcmVlbiBzdHlsaW5nIHJ1bGVzLgotICAgICAgICAqIGNzcy9tZWRpYUNvbnRy b2xzQ2hyb21pdW0uY3NzOgotICAgICAgICAodmlkZW86LXdlYmtpdC1mdWxsLXBhZ2UtbWVkaWE6 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwpOgotICAgICAgICBBbGlnbiBjb250cm9scyB0 byB0aGUgYm90dG9tIG9mIHRoZSBmdWxsc2NyZWVuIHBhZ2UuCi0gICAgICAgIChhdWRpbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24pOgotICAgICAgICBJbmNsdWRlIHN0eWxpbmcg Zm9yIHRoZSBmdWxsc2NyZWVuIGJ1dHRvbi4KLSAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNv bnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcDoKLSAgICAgICAgKFdlYkNvcmUpOgotICAgICAg ICBBZGQgYSBjb25zdGFudCBmb3Igd2hlbiB0byBoaWRlIHRoZSBjb250cm9scyBpbiBmdWxsc2Ny ZWVuLgotICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6 TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bSk6Ci0gICAgICAgIEFkZCBtZW1iZXIgZmll bGRzIGZvciBmdWxsc2NyZWVuIGJ1dHRvbiwgaGlkaW5nIHRpbWVyIGFuZCB0cmFja2luZyBvZiB3 aGV0aGVyIHdlIGFyZSBpbiBmdWxsc2NyZWVuLgotICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250 cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6Y3JlYXRlKToKLSAgICAgICAgQWRkIGZ1bGxzY3JlZW4g YnV0dG9uIGVsZW1lbnQgdG8gdGhlIHZpc3VhbCBsYXlvdXQuCi0gICAgICAgIChXZWJDb3JlOjpN ZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpzZXRNZWRpYUNvbnRyb2xsZXIpOgotICAg ICAgICBBZGQgZnVsbHNjcmVlbiBidXR0b24gZWxlbWVudCB0byB0aGUgbWVkaWEgY29udHJvbGxl ci4KLSAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06OnJl c2V0KToKLSAgICAgICAgU2hvdyB0aGUgZnVsbHNjcmVlbiBidXR0b24gaWYgdGhlIGNvbnRyb2xs ZXIgc3VwcG9ydHMgZnVsbHNjcmVlbi4KLSAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW06OnBsYXliYWNrU3RhcnRlZCk6Ci0gICAgICAgIFN0YXJ0IHRoZSB0 aW1lciB0byBoaWRlIHRoZSBjb250cm9scyBpbiBmdWxsc2NyZWVuLgotICAgICAgICAoV2ViQ29y ZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6cGxheWJhY2tTdG9wcGVkKToKLSAg ICAgICAgRG9uJ3QgaGlkZSB0aGUgY29udHJvbHMgd2hlbiB0aGUgdmlkZW8gaXMgcGF1c2VkIGlu IGZ1bGxzY3JlZW4uCi0gICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENo cm9taXVtOjpyZXBvcnRlZEVycm9yKToKLSAgICAgICAgSGlkZSB0aGUgZnVsbHNjcmVlbiBidXR0 b24gd2hlbiB3ZSBoaXQgYW4gZXJyb3IuCi0gICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xS b290RWxlbWVudENocm9taXVtOjpkZWZhdWx0RXZlbnRIYW5kbGVyKToKLSAgICAgICAgQWRkIGxv Z2ljIGZvciBtb3VzZSBldmVudHMgaW4gZnVsbHNjcmVlbiB0byBzdGFydC9zdG9wIHRoZSBoaWRp bmcgdGltZXIuCi0gICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9t aXVtOjpzdGFydEhpZGVGdWxsc2NyZWVuQ29udHJvbHNUaW1lcik6Ci0gICAgICAgIFN0YXJ0IHRo ZSBmdWxsc2NyZWVuIGhpZGluZyB0aW1lci4KLSAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJv bFJvb3RFbGVtZW50Q2hyb21pdW06OmhpZGVGdWxsc2NyZWVuQ29udHJvbHNUaW1lckZpcmVkKToK LSAgICAgICAgVGltZXIgZmlyZWQ6IGhpZGUgdGhlIHZpZGVvIGNvbnRyb2xzIGluIGZ1bGxzY3Jl ZW4uCi0gICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpz dG9wSGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVyKToKLSAgICAgICAgUmVzZXQgdGhlIGZ1bGxz Y3JlZW4gaGlkaW5nIHRpbWVyLgotICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVs ZW1lbnRDaHJvbWl1bTo6ZW50ZXJlZEZ1bGxzY3JlZW4pOgotICAgICAgICBBZGQgbG9naWMgdG8g ZW50ZXIgZnVsbHNjcmVlbi4KLSAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVt ZW50Q2hyb21pdW06OmV4aXRlZEZ1bGxzY3JlZW4pOgotICAgICAgICBBZGQgbG9naWMgdG8gZXhp dCBmdWxsc2NyZWVuLgotICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVt ZW50Q2hyb21pdW0uaDoKLSAgICAgICAgKE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0p OgotICAgICAgICBBZGQgZGVjbGFyYXRpb24gb2YgbWVtYmVyIGZ1bmN0aW9ucyBhbmQgZmllbGRz IGZvciBmdWxsc2NyZWVuLgogICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xz Q2hyb21pdW0uY3BwOgotICAgICAgICAoV2ViQ29yZTo6cGFpbnRNZWRpYUZ1bGxzY3JlZW5CdXR0 b24pOgotICAgICAgICBVc2UgdGhlIG5ldyBpbWFnZSBmb3IgdGhlIGZ1bGxzY3JlZW4gYnV0dG9u LgotICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtTWFjLmg6Ci0gICAgICAg IChSZW5kZXJUaGVtZUNocm9taXVtTWFjKToKLSAgICAgICAgRGVjbGFyZSB0aGUgZnVsbHNjcmVl biBwYWludGluZyBmdW5jdGlvbiBmb3IgQ2hyb21lIE1hYy4KLSAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGhlbWVDaHJvbWl1bU1hYy5tbToKLSAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l Q2hyb21pdW1NYWM6OnBhaW50TWVkaWFGdWxsc2NyZWVuQnV0dG9uKToKLSAgICAgICAgSG9vayB1 cCB0aGUgZnVsbHNjcmVlbiBwYWluaW5nIGZ1bmN0aW9uIGZvciBDaHJvbWUgTWFjLgotICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHA6Ci0gICAgICAgIChXZWJD b3JlOjpSZW5kZXJUaGVtZUNocm9taXVtU2tpYTo6cGFpbnRNZWRpYUZ1bGxzY3JlZW5CdXR0b24p OgotICAgICAgICBIb29rIHVwIHRoZSBmdWxsc2NyZWVuIHBhaW5pbmcgZnVuY3Rpb24gZm9yIENo cm9tZSBTa2lhLgotICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5o OgotICAgICAgICAoUmVuZGVyVGhlbWVDaHJvbWl1bVNraWEpOgotICAgICAgICBEZWNsYXJlIHRo ZSBmdWxsc2NyZWVuIHBhaW50aW5nIGZ1bmN0aW9uIGZvciBDaHJvbWUgU2tpYS4KKyAgICAgICAg KFdlYkNvcmU6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXIpOgorICAgICAgICBTZXQgdm9sdW1lIHNs aWRlciB0byAwIHdoZW4gdGhlcmUgaXMgbm8gYXVkaW8gb3Igbm8gc291cmNlIGZpbGUuCisgICAg ICAgIChXZWJDb3JlOjpwYWludE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIpOgorICAgICAgICBEb24n dCBwYWludCB0aGUgdm9sdW1lIHNsaWRlciB0aHVtYiB3aGVuIHRoZXJlIGlzIG5vIGF1ZGlvIG9y IG5vIHNvdXJjZSBmaWxlLgogCiAyMDEyLTA2LTEzICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9u QG5va2lhLmNvbT4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck1lZGlhQ29udHJvbHNDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTWVkaWFDb250cm9sc0Nocm9taXVtLmNwcAppbmRleCA1NjBjZGFhLi40MWM3OTViIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9sc0Nocm9t aXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9s c0Nocm9taXVtLmNwcApAQCAtMjQ4LDE0ICsyNDgsMTcgQEAgc3RhdGljIGJvb2wgcGFpbnRNZWRp YVZvbHVtZVNsaWRlcihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWlu dEkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgaWYgKHZvbHVtZSA+IDEpCiAgICAgICAgIHZv bHVtZSA9IDE7Ci0gICAgaWYgKG1lZGlhRWxlbWVudC0+bXV0ZWQoKSkKKyAgICBpZiAoIWhhc1Nv dXJjZShtZWRpYUVsZW1lbnQpIHx8ICFtZWRpYUVsZW1lbnQtPmhhc0F1ZGlvKCkgfHwgbWVkaWFF bGVtZW50LT5tdXRlZCgpKQogICAgICAgICB2b2x1bWUgPSAwOwogCiAgICAgLy8gQ2FsY3VsYXRl IHRoZSBwb3NpdGlvbiByZWxhdGl2ZSB0byB0aGUgY2VudGVyIG9mIHRoZSB0aHVtYi4KLSAgICBm bG9hdCB0aHVtYkNlbnRlciA9IG1lZGlhVm9sdW1lU2xpZGVyVGh1bWJXaWR0aCAvIDI7Ci0gICAg ZmxvYXQgem9vbUxldmVsID0gc3R5bGUtPmVmZmVjdGl2ZVpvb20oKTsKLSAgICBmbG9hdCBwb3Np dGlvbldpZHRoID0gdm9sdW1lICogKHJlY3Qud2lkdGgoKSAtICh6b29tTGV2ZWwgKiB0aHVtYkNl bnRlcikpOwotICAgIGZsb2F0IGZpbGxXaWR0aCA9IHBvc2l0aW9uV2lkdGggKyAoem9vbUxldmVs ICogdGh1bWJDZW50ZXIgLyAyKTsKKyAgICBmbG9hdCBmaWxsV2lkdGggPSAwOworICAgIGlmICh2 b2x1bWUgPiAwKSB7CisgICAgICAgIGZsb2F0IHRodW1iQ2VudGVyID0gbWVkaWFWb2x1bWVTbGlk ZXJUaHVtYldpZHRoIC8gMjsKKyAgICAgICAgZmxvYXQgem9vbUxldmVsID0gc3R5bGUtPmVmZmVj dGl2ZVpvb20oKTsKKyAgICAgICAgZmxvYXQgcG9zaXRpb25XaWR0aCA9IHZvbHVtZSAqIChyZWN0 LndpZHRoKCkgLSAoem9vbUxldmVsICogdGh1bWJDZW50ZXIpKTsKKyAgICAgICAgZmlsbFdpZHRo ID0gcG9zaXRpb25XaWR0aCArICh6b29tTGV2ZWwgKiB0aHVtYkNlbnRlciAvIDIpOworICAgIH0K IAogICAgIHBhaW50U2xpZGVyUmFuZ2VIaWdobGlnaHQocmVjdCwgc3R5bGUsIGNvbnRleHQsIDAu MCwgZmlsbFdpZHRoIC8gcmVjdC53aWR0aCgpKTsKIApAQCAtMjY0LDYgKzI2NywxNiBAQCBzdGF0 aWMgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25z dCBQYWludEluZm8mIHBhaW50SQogCiBzdGF0aWMgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVy VGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBj b25zdCBJbnRSZWN0JiByZWN0KQogeworICAgIEFTU0VSVChvYmplY3QtPm5vZGUoKSk7CisgICAg Tm9kZSogaG9zdE5vZGUgPSBvYmplY3QtPm5vZGUoKS0+c2hhZG93QW5jZXN0b3JOb2RlKCk7Cisg ICAgQVNTRVJUKGhvc3ROb2RlKTsKKyAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQg PSB0b1BhcmVudE1lZGlhRWxlbWVudChob3N0Tm9kZSk7CisgICAgaWYgKCFtZWRpYUVsZW1lbnQp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghaGFzU291cmNlKG1lZGlhRWxlbWVu dCkgfHwgIW1lZGlhRWxlbWVudC0+aGFzQXVkaW8oKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisK ICAgICBzdGF0aWMgSW1hZ2UqIG1lZGlhVm9sdW1lU2xpZGVyVGh1bWIgPSBwbGF0Zm9ybVJlc291 cmNlKCJtZWRpYXBsYXllclZvbHVtZVNsaWRlclRodW1iIik7CiAgICAgcmV0dXJuIHBhaW50TWVk aWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsIG1lZGlhVm9sdW1lU2xpZGVyVGh1bWIp OwogfQo= 147711 2012-06-14 19:26:32 -0700 2012-06-15 11:00:05 -0700 patch for cq - also includes image change for elements without audio bug-89093-20120615122629.patch text/plain 4211 silviapf U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE0OTZiYTE3YmU4ZDg3 YzJmNjViNzBlMzBiODFmNmYzYzVkMjJjOS4uYzRiYWVhMTZjMDlhNWE4NWRlMzZlZjE5MjE2ODQz NTI3ZmM5MjdkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA2LTE0ICBTaWx2 aWEgUGZlaWZmZXIgIDxzaWx2aWFwZkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVtb3ZlIHZv bHVtZSB0aHVtYiBmb3IgdmlkZW9zIHdpdGhvdXQgYXVkaW8gdHJhY2suCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTA5MworCisgICAgICAgIFJldmll d2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHNpbmNlIHRoaXMg d2FzIGFscmVhZHkgdGVzdGVkIGluIG1lZGlhL3ZpZGVvLW5vLWF1ZGlvLmh0bWwuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9sc0Nocm9taXVtLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnBhaW50TWVkaWFNdXRlQnV0dG9uKToKKyAgICAgICAgQ2hhbmdlIG11dGUgYnV0 dG9uIHdoZW4gdGhlcmUgaXMgbm8gYXVkaW8gb3Igbm8gc291cmNlIGZpbGUuCisgICAgICAgIChX ZWJDb3JlOjpwYWludE1lZGlhVm9sdW1lU2xpZGVyKToKKyAgICAgICAgU2V0IHZvbHVtZSBzbGlk ZXIgdG8gMCB3aGVuIHRoZXJlIGlzIG5vIGF1ZGlvIG9yIG5vIHNvdXJjZSBmaWxlLgorICAgICAg ICAoV2ViQ29yZTo6cGFpbnRNZWRpYVZvbHVtZVNsaWRlclRodW1iKToKKyAgICAgICAgRG9uJ3Qg cGFpbnQgdGhlIHZvbHVtZSBzbGlkZXIgdGh1bWIgd2hlbiB0aGVyZSBpcyBubyBhdWRpbyBvciBu byBzb3VyY2UgZmlsZS4KKwogMjAxMi0wNi0xNCAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBw bGUuY29tPgogCiAgICAgICAgIFRoZSB3aG9sZSB3b3JsZCByZWJ1aWxkcyB3aGVuIHlvdSB0b3Vj aCBhbnkgSURMIGZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck1lZGlhQ29udHJvbHNDaHJvbWl1bS5jcHAKaW5kZXggYzQ4YjQxMjBjNzQ1ZDFmMmZhZDZk OWE3MjgyZWExMjQ0YWZjM2ZiMC4uMjQ2NmY4NjdlMmQxOWMxOGY5YTM0YWU0N2VhZjc1NjVlNDAy ZjE4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29u dHJvbHNDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1l ZGlhQ29udHJvbHNDaHJvbWl1bS5jcHAKQEAgLTc3LDExICs3NywxNSBAQCBzdGF0aWMgYm9vbCBw YWludE1lZGlhTXV0ZUJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZv JiBwYWludEluZgogICAgIHN0YXRpYyBJbWFnZSogc291bmRMZXZlbDMgPSBwbGF0Zm9ybVJlc291 cmNlKCJtZWRpYXBsYXllclNvdW5kTGV2ZWwzIik7CiAgICAgc3RhdGljIEltYWdlKiBzb3VuZExl dmVsMiA9IHBsYXRmb3JtUmVzb3VyY2UoIm1lZGlhcGxheWVyU291bmRMZXZlbDIiKTsKICAgICBz dGF0aWMgSW1hZ2UqIHNvdW5kTGV2ZWwxID0gcGxhdGZvcm1SZXNvdXJjZSgibWVkaWFwbGF5ZXJT b3VuZExldmVsMSIpOworICAgIHN0YXRpYyBJbWFnZSogc291bmRMZXZlbDAgPSBwbGF0Zm9ybVJl c291cmNlKCJtZWRpYXBsYXllclNvdW5kTGV2ZWwwIik7CiAgICAgc3RhdGljIEltYWdlKiBzb3Vu ZERpc2FibGVkID0gcGxhdGZvcm1SZXNvdXJjZSgibWVkaWFwbGF5ZXJTb3VuZERpc2FibGVkIik7 CiAKLSAgICBpZiAoIWhhc1NvdXJjZShtZWRpYUVsZW1lbnQpIHx8ICFtZWRpYUVsZW1lbnQtPmhh c0F1ZGlvKCkgfHwgbWVkaWFFbGVtZW50LT5tdXRlZCgpIHx8IG1lZGlhRWxlbWVudC0+dm9sdW1l KCkgPD0gMCkKKyAgICBpZiAoIWhhc1NvdXJjZShtZWRpYUVsZW1lbnQpIHx8ICFtZWRpYUVsZW1l bnQtPmhhc0F1ZGlvKCkpCiAgICAgICAgIHJldHVybiBwYWludE1lZGlhQnV0dG9uKHBhaW50SW5m by5jb250ZXh0LCByZWN0LCBzb3VuZERpc2FibGVkKTsKIAorICAgIGlmIChtZWRpYUVsZW1lbnQt Pm11dGVkKCkgfHwgbWVkaWFFbGVtZW50LT52b2x1bWUoKSA8PSAwKQorICAgICAgICByZXR1cm4g cGFpbnRNZWRpYUJ1dHRvbihwYWludEluZm8uY29udGV4dCwgcmVjdCwgc291bmRMZXZlbDApOwor CiAgICAgaWYgKG1lZGlhRWxlbWVudC0+dm9sdW1lKCkgPD0gMC4zMykKICAgICAgICAgcmV0dXJu IHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsIHNvdW5kTGV2ZWwxKTsK IApAQCAtMjQ4LDE0ICsyNTIsMTcgQEAgc3RhdGljIGJvb2wgcGFpbnRNZWRpYVZvbHVtZVNsaWRl cihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEkKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgaWYgKHZvbHVtZSA+IDEpCiAgICAgICAgIHZvbHVtZSA9IDE7Ci0g ICAgaWYgKG1lZGlhRWxlbWVudC0+bXV0ZWQoKSkKKyAgICBpZiAoIWhhc1NvdXJjZShtZWRpYUVs ZW1lbnQpIHx8ICFtZWRpYUVsZW1lbnQtPmhhc0F1ZGlvKCkgfHwgbWVkaWFFbGVtZW50LT5tdXRl ZCgpKQogICAgICAgICB2b2x1bWUgPSAwOwogCiAgICAgLy8gQ2FsY3VsYXRlIHRoZSBwb3NpdGlv biByZWxhdGl2ZSB0byB0aGUgY2VudGVyIG9mIHRoZSB0aHVtYi4KLSAgICBmbG9hdCB0aHVtYkNl bnRlciA9IG1lZGlhVm9sdW1lU2xpZGVyVGh1bWJXaWR0aCAvIDI7Ci0gICAgZmxvYXQgem9vbUxl dmVsID0gc3R5bGUtPmVmZmVjdGl2ZVpvb20oKTsKLSAgICBmbG9hdCBwb3NpdGlvbldpZHRoID0g dm9sdW1lICogKHJlY3Qud2lkdGgoKSAtICh6b29tTGV2ZWwgKiB0aHVtYkNlbnRlcikpOwotICAg IGZsb2F0IGZpbGxXaWR0aCA9IHBvc2l0aW9uV2lkdGggKyAoem9vbUxldmVsICogdGh1bWJDZW50 ZXIgLyAyKTsKKyAgICBmbG9hdCBmaWxsV2lkdGggPSAwOworICAgIGlmICh2b2x1bWUgPiAwKSB7 CisgICAgICAgIGZsb2F0IHRodW1iQ2VudGVyID0gbWVkaWFWb2x1bWVTbGlkZXJUaHVtYldpZHRo IC8gMjsKKyAgICAgICAgZmxvYXQgem9vbUxldmVsID0gc3R5bGUtPmVmZmVjdGl2ZVpvb20oKTsK KyAgICAgICAgZmxvYXQgcG9zaXRpb25XaWR0aCA9IHZvbHVtZSAqIChyZWN0LndpZHRoKCkgLSAo em9vbUxldmVsICogdGh1bWJDZW50ZXIpKTsKKyAgICAgICAgZmlsbFdpZHRoID0gcG9zaXRpb25X aWR0aCArICh6b29tTGV2ZWwgKiB0aHVtYkNlbnRlciAvIDIpOworICAgIH0KIAogICAgIHBhaW50 U2xpZGVyUmFuZ2VIaWdobGlnaHQocmVjdCwgc3R5bGUsIGNvbnRleHQsIDAuMCwgZmlsbFdpZHRo IC8gcmVjdC53aWR0aCgpKTsKIApAQCAtMjY0LDYgKzI3MSwxNiBAQCBzdGF0aWMgYm9vbCBwYWlu dE1lZGlhVm9sdW1lU2xpZGVyKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWludEluZm8m IHBhaW50SQogCiBzdGF0aWMgYm9vbCBwYWludE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIoUmVuZGVy T2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0 JiByZWN0KQogeworICAgIEFTU0VSVChvYmplY3QtPm5vZGUoKSk7CisgICAgTm9kZSogaG9zdE5v ZGUgPSBvYmplY3QtPm5vZGUoKS0+c2hhZG93QW5jZXN0b3JOb2RlKCk7CisgICAgQVNTRVJUKGhv c3ROb2RlKTsKKyAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1l ZGlhRWxlbWVudChob3N0Tm9kZSk7CisgICAgaWYgKCFtZWRpYUVsZW1lbnQpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIGlmICghaGFzU291cmNlKG1lZGlhRWxlbWVudCkgfHwgIW1lZGlh RWxlbWVudC0+aGFzQXVkaW8oKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBzdGF0aWMg SW1hZ2UqIG1lZGlhVm9sdW1lU2xpZGVyVGh1bWIgPSBwbGF0Zm9ybVJlc291cmNlKCJtZWRpYXBs YXllclZvbHVtZVNsaWRlclRodW1iIik7CiAgICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFp bnRJbmZvLmNvbnRleHQsIHJlY3QsIG1lZGlhVm9sdW1lU2xpZGVyVGh1bWIpOwogfQo=