110371 2013-02-20 13:16:00 -0800 Cleanup dead MediaSource code after Chromium refactor completes 2013-03-13 08:40:15 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109857 110798 1 acolwell acolwell abarth dglazkov eric.carlson feature-media-reviews fishd jamesr jer.noble peter+ews tkent+wkapi webkit.review.bot oldest_to_newest 837681 0 acolwell 2013-02-20 13:16:00 -0800 This is a follow up bug for cleaning up dead WebKit code, once the MediaSource refactor (https://bugs.webkit.org/show_bug.cgi?id=109857) lands and the Chromium WebMediaPlayerImpl implements its own version of WebMediaPlayer::load(WebURL, WebMediaSource, CORSMode). Once this happens the following code can be removed. - WebMediaSourceClientImpl in WebMediaPlayerClientImpl.cpp - WebMediaPlayerClientImpl::sourceOpened() - WebMediaPlayerClientImpl::sourceURL() - The default implementation of WebMediaPlayer::load(WebURL, WebMediaSource, CORSMode) 851267 1 192242 acolwell 2013-03-08 09:51:59 -0800 Created attachment 192242 Patch 851268 2 webkit.review.bot 2013-03-08 09:54:47 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 851269 3 192242 webkit.review.bot 2013-03-08 09:55:41 -0800 Comment on attachment 192242 Patch Attachment 192242 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17016243 851271 4 192242 webkit.review.bot 2013-03-08 09:56:30 -0800 Comment on attachment 192242 Patch Attachment 192242 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17027281 851275 5 192242 peter+ews 2013-03-08 10:01:33 -0800 Comment on attachment 192242 Patch Attachment 192242 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/17068503 853999 6 192856 acolwell 2013-03-12 19:12:56 -0700 Created attachment 192856 Rebase 854324 7 192856 webkit.review.bot 2013-03-13 08:40:11 -0700 Comment on attachment 192856 Rebase Clearing flags on attachment: 192856 Committed r145721: <http://trac.webkit.org/changeset/145721> 854325 8 webkit.review.bot 2013-03-13 08:40:15 -0700 All reviewed patches have been landed. Closing bug. 192242 2013-03-08 09:51:59 -0800 2013-03-12 19:12:53 -0700 Patch bug-110371-20130308094802.patch text/plain 11448 acolwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGJmYmEwZjdkYjUwM2Y0NDIzZDA4Y2ViZmFmYzU1ODRiZmJjNjRkMDcuLmVkOWFiNGIyNTJkYjk0 NWQwYTM1YTFmMDRlNWZlYTNjM2U2OGMxOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTMtMDMtMDggIEFhcm9uIENvbHdlbGwgIDxhY29sd2VsbEBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgQ2xlYW51cCBkZWFkIE1lZGlhU291cmNlIGNvZGUgbm93IHRo YXQgdGhlIENocm9taXVtLXNpZGUgcmVmYWN0b3IgaXMgY29tcGxldGUuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAzNzEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJNZWRpYVBsYXll ci5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYk1lZGlhUGxheWVyKTogUmVtb3Zl IG9sZCBNZWRpYVNvdXJjZSBtZXRob2RzIGFuZCBkZWZhdWx0IE1lZGlhU291cmNlIGxvYWQoKSBp bXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKiBwdWJsaWMvV2ViTWVkaWFQbGF5ZXJDbGllbnQuaDog UmVtb3ZlIG9sZCBNZWRpYVNvdXJjZSBtZXRob2RzLgorICAgICAgICAqIHNyYy9XZWJNZWRpYVBs YXllckNsaWVudEltcGwuY3BwOiBSZW1vdmUgV2ViTWVkaWFTb3VyY2VDbGllbnRJbXBsICYgV2Vi U291cmNlQnVmZmVySW1wbCBjbGFzc2VzIHRoYXQKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYXJlIG5vIGxvbmdlciBuZWVkZWQuCisgICAgICAgICogc3JjL1dl Yk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oOiBSZW1vdmUgb2xkIE1lZGlhU291cmNlIG1ldGhvZHMu CisgICAgICAgIChXZWJNZWRpYVBsYXllckNsaWVudEltcGwpOgorCiAyMDEzLTAzLTA3ICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVwZGF0ZSBjYWxlbmRh ciBwaWNrZXIgVUkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl Yk1lZGlhUGxheWVyLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBs YXllci5oCmluZGV4IGY4OGI3MTQ5M2Q5ODU3YzkwYzYwOWE0YTRkYjhhYmMzYWMzYzk5MDIuLmEx NmZjY2E5MTUxZTUyY2I1MWNhMTI0MGJmODA5NzQ4MGY3Nzk0NTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmgKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaApAQCAtMzQsNyArMzQsNiBAQAog I2luY2x1ZGUgIi4uLy4uLy4uL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJDYW52YXMuaCIK ICNpbmNsdWRlICIuLi8uLi8uLi9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViU3RyaW5nLmgi CiAjaW5jbHVkZSAiLi4vLi4vLi4vUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYlZpZGVvRnJh bWUuaCIKLSNpbmNsdWRlICJXZWJNZWRpYVNvdXJjZS5oIgogI2luY2x1ZGUgIldlYlRpbWVSYW5n ZS5oIgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQyLDYgKzQxLDcgQEAgbmFtZXNwYWNlIFdl YktpdCB7CiBjbGFzcyBXZWJBdWRpb1NvdXJjZVByb3ZpZGVyOwogY2xhc3MgV2ViQXVkaW9Tb3Vy Y2VQcm92aWRlckNsaWVudDsKIGNsYXNzIFdlYk1lZGlhUGxheWVyQ2xpZW50OworY2xhc3MgV2Vi TWVkaWFTb3VyY2U7CiBjbGFzcyBXZWJTdHJlYW1UZXh0dXJlQ2xpZW50OwogY2xhc3MgV2ViU3Ry aW5nOwogY2xhc3MgV2ViVVJMOwpAQCAtODEsMTggKzgxLDYgQEAgcHVibGljOgogICAgICAgICBQ cmVsb2FkQXV0bywKICAgICB9OwogCi0gICAgZW51bSBBZGRJZFN0YXR1cyB7Ci0gICAgICAgIEFk ZElkU3RhdHVzT2ssCi0gICAgICAgIEFkZElkU3RhdHVzTm90U3VwcG9ydGVkLAotICAgICAgICBB ZGRJZFN0YXR1c1JlYWNoZWRJZExpbWl0Ci0gICAgfTsKLQotICAgIGVudW0gRW5kT2ZTdHJlYW1T dGF0dXMgewotICAgICAgICBFbmRPZlN0cmVhbVN0YXR1c05vRXJyb3IsCi0gICAgICAgIEVuZE9m U3RyZWFtU3RhdHVzTmV0d29ya0Vycm9yLAotICAgICAgICBFbmRPZlN0cmVhbVN0YXR1c0RlY29k ZUVycm9yLAotICAgIH07Ci0KICAgICAvLyBSZXByZXNlbnRzIHN5bmNocm9ub3VzIGV4Y2VwdGlv bnMgdGhhdCBjYW4gYmUgdGhyb3duIGZyb20gdGhlIEVuY3J5cHRlZAogICAgIC8vIE1lZGlhIG1l dGhvZHMuIFRoaXMgaXMgZGlmZmVyZW50IGZyb20gdGhlIGFzeW5jaHJvbm91cyBNZWRpYUtleUVy cm9yLgogICAgIGVudW0gTWVkaWFLZXlFeGNlcHRpb24gewpAQCAtMTEwLDkgKzk4LDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgfldlYk1lZGlhUGxheWVyKCkge30KIAogICAgIHZpcnR1YWwgdm9p ZCBsb2FkKGNvbnN0IFdlYlVSTCYsIENPUlNNb2RlKSA9IDA7Ci0gICAgLy8gRklYTUU6IFJlbW92 ZSB0aGUgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBvbmNlIHRoZSBDaHJvbWl1bSBjb2RlIGltcGxl bWVudHMgdGhpcyBtZXRob2QuCi0gICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDM3MQotICAgIHZpcnR1YWwgdm9pZCBsb2FkKGNvbnN0IFdlYlVSTCYgdXJs LCBXZWJNZWRpYVNvdXJjZSogbWVkaWFTb3VyY2UsIENPUlNNb2RlIGNvcnNNb2RlKSB7IGRlbGV0 ZSBtZWRpYVNvdXJjZTsgbG9hZCh1cmwsIGNvcnNNb2RlKTsgfTsKKyAgICB2aXJ0dWFsIHZvaWQg bG9hZChjb25zdCBXZWJVUkwmLCBXZWJNZWRpYVNvdXJjZSosIENPUlNNb2RlKSA9IDA7CiAgICAg dmlydHVhbCB2b2lkIGNhbmNlbExvYWQoKSA9IDA7CiAKICAgICAvLyBQbGF5YmFjayBjb250cm9s cy4KQEAgLTE4NCwxNiArMTcwLDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBXZWJBdWRpb1Nv dXJjZVByb3ZpZGVyKiBhdWRpb1NvdXJjZVByb3ZpZGVyKCkgeyByZXR1cm4gMDsgfQogCi0gICAg dmlydHVhbCBBZGRJZFN0YXR1cyBzb3VyY2VBZGRJZChjb25zdCBXZWJTdHJpbmcmIGlkLCBjb25z dCBXZWJTdHJpbmcmIHR5cGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgY29kZWNzKSB7IHJldHVybiBBZGRJZFN0YXR1c05v dFN1cHBvcnRlZDsgfQotICAgIHZpcnR1YWwgYm9vbCBzb3VyY2VSZW1vdmVJZChjb25zdCBXZWJT dHJpbmcmIGlkKSB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgV2ViVGltZVJhbmdlcyBz b3VyY2VCdWZmZXJlZChjb25zdCBXZWJTdHJpbmcmIGlkKSB7IHJldHVybiBXZWJUaW1lUmFuZ2Vz KCk7IH07Ci0gICAgdmlydHVhbCBib29sIHNvdXJjZUFwcGVuZChjb25zdCBXZWJTdHJpbmcmIGlk LCBjb25zdCB1bnNpZ25lZCBjaGFyKiBkYXRhLCB1bnNpZ25lZCBsZW5ndGgpIHsgcmV0dXJuIGZh bHNlOyB9Ci0gICAgdmlydHVhbCBib29sIHNvdXJjZUFib3J0KGNvbnN0IFdlYlN0cmluZyYgaWQp IHsgcmV0dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCB2b2lkIHNvdXJjZVNldER1cmF0aW9uKGRv dWJsZSkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIHNvdXJjZUVuZE9mU3RyZWFtKEVuZE9mU3RyZWFt U3RhdHVzKSAgeyB9Ci0gICAgdmlydHVhbCBib29sIHNvdXJjZVNldFRpbWVzdGFtcE9mZnNldChj b25zdCBXZWJTdHJpbmcmIGlkLCBkb3VibGUgb2Zmc2V0KSB7IHJldHVybiBmYWxzZTsgfQotCiAg ICAgLy8gUmV0dXJucyB3aGV0aGVyIGtleVN5c3RlbSBpcyBzdXBwb3J0ZWQuIElmIHRydWUsIHRo ZSByZXN1bHQgd2lsbCBiZQogICAgIC8vIHJlcG9ydGVkIGJ5IGFuIGV2ZW50LgogICAgIHZpcnR1 YWwgTWVkaWFLZXlFeGNlcHRpb24gZ2VuZXJhdGVLZXlSZXF1ZXN0KGNvbnN0IFdlYlN0cmluZyYg a2V5U3lzdGVtLCBjb25zdCB1bnNpZ25lZCBjaGFyKiBpbml0RGF0YSwgdW5zaWduZWQgaW5pdERh dGFMZW5ndGgpIHsgcmV0dXJuIE1lZGlhS2V5RXhjZXB0aW9uS2V5U3lzdGVtTm90U3VwcG9ydGVk OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBs YXllckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5 ZXJDbGllbnQuaAppbmRleCBjODJmZDNhY2M2NTY5YmEyNzBjMWI3NmQ3YTYxY2I5ZDMzNWE5YWQ2 Li4wODk5MzdjMjRhZWI2YzU1YjkzNmMwMjhmZmQzN2QyYTU4NmM4ZTgzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllckNsaWVudC5oCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyQ2xpZW50LmgKQEAg LTcyLDggKzcyLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgZmxvYXQgdm9sdW1lKCkgY29uc3Qg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBwbGF5YmFja1N0YXRlQ2hhbmdlZCgpID0gMDsKICAgICB2 aXJ0dWFsIFdlYk1lZGlhUGxheWVyOjpQcmVsb2FkIHByZWxvYWQoKSBjb25zdCA9IDA7Ci0gICAg dmlydHVhbCB2b2lkIHNvdXJjZU9wZW5lZCgpID0gMDsKLSAgICB2aXJ0dWFsIFdlYktpdDo6V2Vi VVJMIHNvdXJjZVVSTCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQga2V5QWRkZWQoY29u c3QgV2ViU3RyaW5nJiBrZXlTeXN0ZW0sIGNvbnN0IFdlYlN0cmluZyYgc2Vzc2lvbklkKSA9IDA7 CiAgICAgdmlydHVhbCB2b2lkIGtleUVycm9yKGNvbnN0IFdlYlN0cmluZyYga2V5U3lzdGVtLCBj b25zdCBXZWJTdHJpbmcmIHNlc3Npb25JZCwgTWVkaWFLZXlFcnJvckNvZGUsIHVuc2lnbmVkIHNo b3J0IHN5c3RlbUNvZGUpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQga2V5TWVzc2FnZShjb25zdCBX ZWJTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgV2ViU3RyaW5nJiBzZXNzaW9uSWQsIGNvbnN0IHVu c2lnbmVkIGNoYXIqIG1lc3NhZ2UsIHVuc2lnbmVkIG1lc3NhZ2VMZW5ndGgsIGNvbnN0IFdlYlVS TCYgZGVmYXVsdFVSTCkgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKaW5kZXggYzNkYmJjMzM0M2I1YjM0YTY2 ZjhlN2E5Yzc3Yjg2Y2JhYmM5Mzc4ZC4uOTEyYmZkMDk2ZmI3MTQ4ODQ2NGU4ZTBiNzk0ZjFiYzE1 Mzc4Njg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQ bGF5ZXJDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJN ZWRpYVBsYXllckNsaWVudEltcGwuY3BwCkBAIC0yMSwxNSArMjEsMTIgQEAKICNpbmNsdWRlICJQ bGF0Zm9ybUNvbnRleHRTa2lhLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUg IlRpbWVSYW5nZXMuaCIKLSNpbmNsdWRlICJVVUlELmgiCiAjaW5jbHVkZSAiV2ViQXVkaW9Tb3Vy Y2VQcm92aWRlci5oIgogI2luY2x1ZGUgIldlYkZyYW1lQ2xpZW50LmgiCiAjaW5jbHVkZSAiV2Vi RnJhbWVJbXBsLmgiCiAjaW5jbHVkZSAiV2ViSGVscGVyUGx1Z2luSW1wbC5oIgogI2luY2x1ZGUg IldlYk1lZGlhUGxheWVyLmgiCi0jaW5jbHVkZSAiV2ViTWVkaWFTb3VyY2VDbGllbnQuaCIKICNp bmNsdWRlICJXZWJNZWRpYVNvdXJjZUltcGwuaCIKLSNpbmNsdWRlICJXZWJTb3VyY2VCdWZmZXIu aCIKICNpbmNsdWRlICJXZWJWaWV3SW1wbC5oIgogI2luY2x1ZGUgPHB1YmxpYy9QbGF0Zm9ybS5o PgogI2luY2x1ZGUgPHB1YmxpYy9XZWJDU3RyaW5nLmg+CkBAIC01MywxMTMgKzUwLDYgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi0vLyBGSVhNRTog UmVtb3ZlIHRoaXMgY2xhc3Mgb25jZSB0aGUgQ2hyb21pdW0gY29kZSBpbXBsZW1lbnRzIGl0cyBv d24KLS8vIHZlcnNpb24gb2YgV2ViTWVkaWFQbGF5ZXI6OmxvYWQoV2ViVVJMLCBXZWJNZWRpYVNv dXJjZSwgQ09SU01vZGUpLgotLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMDM3MQotY2xhc3MgV2ViTWVkaWFTb3VyY2VDbGllbnRJbXBsIDogcHVibGljIFdlYk1l ZGlhU291cmNlQ2xpZW50IHsKLXB1YmxpYzoKLSAgICBleHBsaWNpdCBXZWJNZWRpYVNvdXJjZUNs aWVudEltcGwoV2ViTWVkaWFQbGF5ZXIqKTsKLSAgICB2aXJ0dWFsIH5XZWJNZWRpYVNvdXJjZUNs aWVudEltcGwoKTsKLQotICAgIC8vIFdlYk1lZGlhU291cmNlQ2xpZW50IG1ldGhvZHMuCi0gICAg dmlydHVhbCBBZGRTdGF0dXMgYWRkU291cmNlQnVmZmVyKGNvbnN0IFdlYlN0cmluZyYgdHlwZSwg Y29uc3QgV2ViVmVjdG9yPFdlYlN0cmluZz4mIGNvZGVjcywgV2ViU291cmNlQnVmZmVyKiopOwot ICAgIHZpcnR1YWwgZG91YmxlIGR1cmF0aW9uKCk7Ci0gICAgdmlydHVhbCB2b2lkIHNldER1cmF0 aW9uKGRvdWJsZSk7Ci0gICAgdmlydHVhbCB2b2lkIGVuZE9mU3RyZWFtKEVuZE9mU3RyZWFtU3Rh dHVzKTsKLQotcHJpdmF0ZToKLSAgICBXZWJNZWRpYVBsYXllciogbV93ZWJNZWRpYVBsYXllcjsK LX07Ci0KLS8vIEZJWE1FOiBSZW1vdmUgdGhpcyBjbGFzcyBvbmNlIHRoZSBDaHJvbWl1bSBjb2Rl IGltcGxlbWVudHMgaXRzIG93bgotLy8gdmVyc2lvbiBvZiBXZWJNZWRpYVBsYXllcjo6bG9hZChX ZWJVUkwsIFdlYk1lZGlhU291cmNlLCBDT1JTTW9kZSkuCi0vLyBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMzcxCi1jbGFzcyBXZWJTb3VyY2VCdWZmZXJJbXBsIDog cHVibGljIFdlYlNvdXJjZUJ1ZmZlciB7Ci1wdWJsaWM6Ci0gICAgV2ViU291cmNlQnVmZmVySW1w bChXZWJNZWRpYVBsYXllciosIGNvbnN0IFdlYlN0cmluZyYgaWQpOwotCi0gICAgLy8gV2ViU291 cmNlQnVmZmVyIG1ldGhvZHMuCi0gICAgdmlydHVhbCBXZWJUaW1lUmFuZ2VzIGJ1ZmZlcmVkKCk7 Ci0gICAgdmlydHVhbCB2b2lkIGFwcGVuZChjb25zdCB1bnNpZ25lZCBjaGFyKiBkYXRhLCB1bnNp Z25lZCBsZW5ndGgpOwotICAgIHZpcnR1YWwgdm9pZCBhYm9ydCgpOwotICAgIHZpcnR1YWwgYm9v bCBzZXRUaW1lc3RhbXBPZmZzZXQoZG91YmxlKTsKLSAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlZEZy b21NZWRpYVNvdXJjZSgpOwotCi1wcml2YXRlOgotICAgIFdlYk1lZGlhUGxheWVyKiBtX3dlYk1l ZGlhUGxheWVyOwotICAgIFdlYlN0cmluZyBtX2lkOwotfTsKLQotV2ViTWVkaWFTb3VyY2VDbGll bnRJbXBsOjpXZWJNZWRpYVNvdXJjZUNsaWVudEltcGwoV2ViTWVkaWFQbGF5ZXIqIHdlYk1lZGlh UGxheWVyKQotICAgIDogbV93ZWJNZWRpYVBsYXllcih3ZWJNZWRpYVBsYXllcikKLXsKLX0KLQot V2ViTWVkaWFTb3VyY2VDbGllbnRJbXBsOjp+V2ViTWVkaWFTb3VyY2VDbGllbnRJbXBsKCkKLXsK LX0KLQotV2ViTWVkaWFTb3VyY2VDbGllbnQ6OkFkZFN0YXR1cyBXZWJNZWRpYVNvdXJjZUNsaWVu dEltcGw6OmFkZFNvdXJjZUJ1ZmZlcihjb25zdCBXZWJTdHJpbmcmIHR5cGUsIGNvbnN0IFdlYlZl Y3RvcjxXZWJTdHJpbmc+JiBjb2RlY3MsCi0gICAgV2ViU291cmNlQnVmZmVyKiogc291cmNlQnVm ZmVyKQotewotICAgIFdlYlN0cmluZyBpZCA9IFdlYkNvcmU6OmNyZWF0ZUNhbm9uaWNhbFVVSURT dHJpbmcoKTsKLSAgICBXZWJNZWRpYVNvdXJjZUNsaWVudDo6QWRkU3RhdHVzIHJlc3VsdCA9IHN0 YXRpY19jYXN0PFdlYk1lZGlhU291cmNlQ2xpZW50OjpBZGRTdGF0dXM+KG1fd2ViTWVkaWFQbGF5 ZXItPnNvdXJjZUFkZElkKGlkLCB0eXBlLCBjb2RlY3MpKTsKLSAgICBpZiAocmVzdWx0ID09IFdl Yk1lZGlhU291cmNlQ2xpZW50OjpBZGRTdGF0dXNPaykKLSAgICAgICAgKnNvdXJjZUJ1ZmZlciA9 IG5ldyBXZWJTb3VyY2VCdWZmZXJJbXBsKG1fd2ViTWVkaWFQbGF5ZXIsIGlkKTsKLQotICAgIHJl dHVybiByZXN1bHQ7Ci19Ci0KLWRvdWJsZSBXZWJNZWRpYVNvdXJjZUNsaWVudEltcGw6OmR1cmF0 aW9uKCkKLXsKLSAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+ZHVyYXRpb24oKTsKLX0KLQot dm9pZCBXZWJNZWRpYVNvdXJjZUNsaWVudEltcGw6OnNldER1cmF0aW9uKGRvdWJsZSBkdXJhdGlv bikKLXsKLSAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+c291cmNlU2V0RHVyYXRpb24oZHVy YXRpb24pOwotfQotCi12b2lkIFdlYk1lZGlhU291cmNlQ2xpZW50SW1wbDo6ZW5kT2ZTdHJlYW0o RW5kT2ZTdHJlYW1TdGF0dXMgc3RhdHVzKQotewotICAgIG1fd2ViTWVkaWFQbGF5ZXItPnNvdXJj ZUVuZE9mU3RyZWFtKHN0YXRpY19jYXN0PFdlYk1lZGlhUGxheWVyOjpFbmRPZlN0cmVhbVN0YXR1 cz4oc3RhdHVzKSk7Ci19Ci0KLVdlYlNvdXJjZUJ1ZmZlckltcGw6OldlYlNvdXJjZUJ1ZmZlcklt cGwoV2ViTWVkaWFQbGF5ZXIqIHdlYk1lZGlhUGxheWVyLCBjb25zdCBXZWJTdHJpbmcmIGlkKQot ICAgIDogbV93ZWJNZWRpYVBsYXllcih3ZWJNZWRpYVBsYXllcikKLSAgICAsIG1faWQoaWQpCi17 Ci19Ci0KLVdlYlRpbWVSYW5nZXMgV2ViU291cmNlQnVmZmVySW1wbDo6YnVmZmVyZWQoKQotewot ICAgIHJldHVybiBtX3dlYk1lZGlhUGxheWVyLT5zb3VyY2VCdWZmZXJlZChtX2lkKTsKLX0KLQot dm9pZCBXZWJTb3VyY2VCdWZmZXJJbXBsOjphcHBlbmQoY29uc3QgdW5zaWduZWQgY2hhciogZGF0 YSwgdW5zaWduZWQgbGVuZ3RoKQotewotICAgIG1fd2ViTWVkaWFQbGF5ZXItPnNvdXJjZUFwcGVu ZChtX2lkLCBkYXRhLCBsZW5ndGgpOwotfQotCi12b2lkIFdlYlNvdXJjZUJ1ZmZlckltcGw6OmFi b3J0KCkKLXsKLSAgICBtX3dlYk1lZGlhUGxheWVyLT5zb3VyY2VBYm9ydChtX2lkKTsKLX0KLQot Ym9vbCBXZWJTb3VyY2VCdWZmZXJJbXBsOjpzZXRUaW1lc3RhbXBPZmZzZXQoZG91YmxlIG9mZnNl dCkKLXsKLSAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+c291cmNlU2V0VGltZXN0YW1wT2Zm c2V0KG1faWQsIG9mZnNldCk7Ci19Ci0KLXZvaWQgV2ViU291cmNlQnVmZmVySW1wbDo6cmVtb3Zl ZEZyb21NZWRpYVNvdXJjZSgpCi17Ci0gICAgaWYgKCFtX3dlYk1lZGlhUGxheWVyKQotICAgICAg ICByZXR1cm47Ci0KLSAgICBtX3dlYk1lZGlhUGxheWVyLT5zb3VyY2VSZW1vdmVJZChtX2lkKTsK LSAgICBtX3dlYk1lZGlhUGxheWVyID0gMDsKLX0KLQogc3RhdGljIFBhc3NPd25QdHI8V2ViTWVk aWFQbGF5ZXI+IGNyZWF0ZVdlYk1lZGlhUGxheWVyKFdlYk1lZGlhUGxheWVyQ2xpZW50KiBjbGll bnQsIGNvbnN0IFdlYlVSTCYgdXJsLCBGcmFtZSogZnJhbWUpCiB7CiAgICAgV2ViRnJhbWVJbXBs KiB3ZWJGcmFtZSA9IFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKGZyYW1lKTsKQEAgLTMyOSwyOSAr MjE5LDYgQEAgV2ViTWVkaWFQbGF5ZXI6OlByZWxvYWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBs OjpwcmVsb2FkKCkgY29uc3QKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViTWVkaWFQbGF5ZXI6 OlByZWxvYWQ+KG1fcHJlbG9hZCk7CiB9CiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhpcyBhbmQgc291 cmNlVVJMKCkgb25jZSB0aGUgQ2hyb21pdW0gY29kZSBpbXBsZW1lbnRzCi0vLyBpdHMgb3duIHZl cnNpb24gb2YgV2ViTWVkaWFQbGF5ZXI6OmxvYWQoV2ViVVJMLCBXZWJNZWRpYVNvdXJjZSwgQ09S U01vZGUpLgotLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDM3 MQotdm9pZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnNvdXJjZU9wZW5lZCgpCi17Ci0jaWYg RU5BQkxFKE1FRElBX1NPVVJDRSkKLSAgICBBU1NFUlQobV93ZWJNZWRpYVBsYXllcik7Ci0gICAg aWYgKG1fbWVkaWFTb3VyY2UpIHsKLSAgICAgICAgT3duUHRyPFdlYk1lZGlhU291cmNlPiBtZWRp YVNvdXJjZSA9IGFkb3B0UHRyKG5ldyBXZWJNZWRpYVNvdXJjZUltcGwobV9tZWRpYVNvdXJjZSkp OwotICAgICAgICBtZWRpYVNvdXJjZS0+b3BlbihuZXcgV2ViTWVkaWFTb3VyY2VDbGllbnRJbXBs KG1fd2ViTWVkaWFQbGF5ZXIuZ2V0KCkpKTsKLSAgICB9Ci0jZW5kaWYKLX0KLQotV2ViS2l0OjpX ZWJVUkwgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzb3VyY2VVUkwoKSBjb25zdAotewotI2lm IEVOQUJMRShNRURJQV9TT1VSQ0UpCi0gICAgaWYgKG1fbWVkaWFTb3VyY2UpCi0gICAgICAgIHJl dHVybiBtX3VybDsKLSNlbmRpZgotICAgIHJldHVybiBLVVJMKCk7Ci19Ci0KIHZvaWQgV2ViTWVk aWFQbGF5ZXJDbGllbnRJbXBsOjprZXlBZGRlZChjb25zdCBXZWJTdHJpbmcmIGtleVN5c3RlbSwg Y29uc3QgV2ViU3RyaW5nJiBzZXNzaW9uSWQpCiB7CiAjaWYgRU5BQkxFKEVOQ1JZUFRFRF9NRURJ QSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVy Q2xpZW50SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJD bGllbnRJbXBsLmgKaW5kZXggOTlkMmU4YmRiZTg0NTQ4MGI3NWQxM2FmZWU5YzUzZWRkOTRlMGY3 Ni4uNmYyYTM1OWZkNjNhYTgxMzY5MWQ5ZGRjZGQ1ODU1MzY5YjNhMzNjMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmgK QEAgLTg0LDggKzg0LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgZmxvYXQgdm9sdW1lKCkgY29u c3Q7CiAgICAgdmlydHVhbCB2b2lkIHBsYXliYWNrU3RhdGVDaGFuZ2VkKCk7CiAgICAgdmlydHVh bCBXZWJNZWRpYVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkKCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2 b2lkIHNvdXJjZU9wZW5lZCgpOwotICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJVUkwgc291cmNlVVJM KCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGtleUFkZGVkKGNvbnN0IFdlYlN0cmluZyYga2V5 U3lzdGVtLCBjb25zdCBXZWJTdHJpbmcmIHNlc3Npb25JZCk7CiAgICAgdmlydHVhbCB2b2lkIGtl eUVycm9yKGNvbnN0IFdlYlN0cmluZyYga2V5U3lzdGVtLCBjb25zdCBXZWJTdHJpbmcmIHNlc3Np b25JZCwgTWVkaWFLZXlFcnJvckNvZGUsIHVuc2lnbmVkIHNob3J0IHN5c3RlbUNvZGUpOwogICAg IHZpcnR1YWwgdm9pZCBrZXlNZXNzYWdlKGNvbnN0IFdlYlN0cmluZyYga2V5U3lzdGVtLCBjb25z dCBXZWJTdHJpbmcmIHNlc3Npb25JZCwgY29uc3QgdW5zaWduZWQgY2hhciogbWVzc2FnZSwgdW5z aWduZWQgbWVzc2FnZUxlbmd0aCwgY29uc3QgV2ViVVJMJiBkZWZhdWx0VVJMKTsK 192856 2013-03-12 19:12:56 -0700 2013-03-13 08:40:11 -0700 Rebase bug-110371-20130312190854.patch text/plain 11515 acolwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1NjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDA2Y2YxMDEyNTc0NDY2OTNmZWYzMDEyMzM1YTQyYWM1NWIwNzBhNzguLjA2OWE1M2FmODQwY2Mx ZmNhNjY2MTliNzgzOTJkMGVjZjk0ODg2ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTMtMDMtMTIgIEFhcm9uIENvbHdlbGwgIDxhY29sd2VsbEBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgQ2xlYW51cCBkZWFkIE1lZGlhU291cmNlIGNvZGUgbm93IHRo YXQgdGhlIENocm9taXVtLXNpZGUgcmVmYWN0b3IgaXMgY29tcGxldGUuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAzNzEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJNZWRpYVBsYXll ci5oOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYk1lZGlhUGxheWVyKTogUmVtb3Zl IG9sZCBNZWRpYVNvdXJjZSBtZXRob2RzIGFuZCBkZWZhdWx0IE1lZGlhU291cmNlIGxvYWQoKSBp bXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKiBwdWJsaWMvV2ViTWVkaWFQbGF5ZXJDbGllbnQuaDog UmVtb3ZlIG9sZCBNZWRpYVNvdXJjZSBtZXRob2RzLgorICAgICAgICAqIHNyYy9XZWJNZWRpYVBs YXllckNsaWVudEltcGwuY3BwOiBSZW1vdmUgV2ViTWVkaWFTb3VyY2VDbGllbnRJbXBsICYgV2Vi U291cmNlQnVmZmVySW1wbCBjbGFzc2VzIHRoYXQKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYXJlIG5vIGxvbmdlciBuZWVkZWQuCisgICAgICAgICogc3JjL1dl Yk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oOiBSZW1vdmUgb2xkIE1lZGlhU291cmNlIG1ldGhvZHMu CisgICAgICAgIChXZWJNZWRpYVBsYXllckNsaWVudEltcGwpOgorCiAyMDEzLTAzLTEyICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLiAgUm9sbGVkIENocm9taXVtIERFUFMgdG8gcjE4NzY2MC4gIFJlcXVlc3RlZCBieQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmgKaW5kZXggZjg4 YjcxNDkzZDk4NTdjOTBjNjA5YTRhNGRiOGFiYzNhYzNjOTkwMi4uYTE2ZmNjYTkxNTFlNTJjYjUx Y2ExMjQwYmY4MDk3NDgwZjc3OTQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJNZWRpYVBsYXllci5oCkBAIC0zNCw3ICszNCw2IEBACiAjaW5jbHVkZSAiLi4vLi4v Li4vUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkNhbnZhcy5oIgogI2luY2x1ZGUgIi4uLy4u Ly4uL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJTdHJpbmcuaCIKICNpbmNsdWRlICIuLi8u Li8uLi9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViVmlkZW9GcmFtZS5oIgotI2luY2x1ZGUg IldlYk1lZGlhU291cmNlLmgiCiAjaW5jbHVkZSAiV2ViVGltZVJhbmdlLmgiCiAKIG5hbWVzcGFj ZSBXZWJLaXQgewpAQCAtNDIsNiArNDEsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdl YkF1ZGlvU291cmNlUHJvdmlkZXI7CiBjbGFzcyBXZWJBdWRpb1NvdXJjZVByb3ZpZGVyQ2xpZW50 OwogY2xhc3MgV2ViTWVkaWFQbGF5ZXJDbGllbnQ7CitjbGFzcyBXZWJNZWRpYVNvdXJjZTsKIGNs YXNzIFdlYlN0cmVhbVRleHR1cmVDbGllbnQ7CiBjbGFzcyBXZWJTdHJpbmc7CiBjbGFzcyBXZWJV Ukw7CkBAIC04MSwxOCArODEsNiBAQCBwdWJsaWM6CiAgICAgICAgIFByZWxvYWRBdXRvLAogICAg IH07CiAKLSAgICBlbnVtIEFkZElkU3RhdHVzIHsKLSAgICAgICAgQWRkSWRTdGF0dXNPaywKLSAg ICAgICAgQWRkSWRTdGF0dXNOb3RTdXBwb3J0ZWQsCi0gICAgICAgIEFkZElkU3RhdHVzUmVhY2hl ZElkTGltaXQKLSAgICB9OwotCi0gICAgZW51bSBFbmRPZlN0cmVhbVN0YXR1cyB7Ci0gICAgICAg IEVuZE9mU3RyZWFtU3RhdHVzTm9FcnJvciwKLSAgICAgICAgRW5kT2ZTdHJlYW1TdGF0dXNOZXR3 b3JrRXJyb3IsCi0gICAgICAgIEVuZE9mU3RyZWFtU3RhdHVzRGVjb2RlRXJyb3IsCi0gICAgfTsK LQogICAgIC8vIFJlcHJlc2VudHMgc3luY2hyb25vdXMgZXhjZXB0aW9ucyB0aGF0IGNhbiBiZSB0 aHJvd24gZnJvbSB0aGUgRW5jcnlwdGVkCiAgICAgLy8gTWVkaWEgbWV0aG9kcy4gVGhpcyBpcyBk aWZmZXJlbnQgZnJvbSB0aGUgYXN5bmNocm9ub3VzIE1lZGlhS2V5RXJyb3IuCiAgICAgZW51bSBN ZWRpYUtleUV4Y2VwdGlvbiB7CkBAIC0xMTAsOSArOTgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB+V2ViTWVkaWFQbGF5ZXIoKSB7fQogCiAgICAgdmlydHVhbCB2b2lkIGxvYWQoY29uc3QgV2Vi VVJMJiwgQ09SU01vZGUpID0gMDsKLSAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBkZWZhdWx0IGlt cGxlbWVudGF0aW9uIG9uY2UgdGhlIENocm9taXVtIGNvZGUgaW1wbGVtZW50cyB0aGlzIG1ldGhv ZC4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMzcx Ci0gICAgdmlydHVhbCB2b2lkIGxvYWQoY29uc3QgV2ViVVJMJiB1cmwsIFdlYk1lZGlhU291cmNl KiBtZWRpYVNvdXJjZSwgQ09SU01vZGUgY29yc01vZGUpIHsgZGVsZXRlIG1lZGlhU291cmNlOyBs b2FkKHVybCwgY29yc01vZGUpOyB9OworICAgIHZpcnR1YWwgdm9pZCBsb2FkKGNvbnN0IFdlYlVS TCYsIFdlYk1lZGlhU291cmNlKiwgQ09SU01vZGUpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgY2Fu Y2VsTG9hZCgpID0gMDsKIAogICAgIC8vIFBsYXliYWNrIGNvbnRyb2xzLgpAQCAtMTg0LDE2ICsx NzAsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFdlYkF1ZGlvU291cmNlUHJvdmlkZXIqIGF1 ZGlvU291cmNlUHJvdmlkZXIoKSB7IHJldHVybiAwOyB9CiAKLSAgICB2aXJ0dWFsIEFkZElkU3Rh dHVzIHNvdXJjZUFkZElkKGNvbnN0IFdlYlN0cmluZyYgaWQsIGNvbnN0IFdlYlN0cmluZyYgdHlw ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlZlY3RvcjxX ZWJTdHJpbmc+JiBjb2RlY3MpIHsgcmV0dXJuIEFkZElkU3RhdHVzTm90U3VwcG9ydGVkOyB9Ci0g ICAgdmlydHVhbCBib29sIHNvdXJjZVJlbW92ZUlkKGNvbnN0IFdlYlN0cmluZyYgaWQpIHsgcmV0 dXJuIGZhbHNlOyB9Ci0gICAgdmlydHVhbCBXZWJUaW1lUmFuZ2VzIHNvdXJjZUJ1ZmZlcmVkKGNv bnN0IFdlYlN0cmluZyYgaWQpIHsgcmV0dXJuIFdlYlRpbWVSYW5nZXMoKTsgfTsKLSAgICB2aXJ0 dWFsIGJvb2wgc291cmNlQXBwZW5kKGNvbnN0IFdlYlN0cmluZyYgaWQsIGNvbnN0IHVuc2lnbmVk IGNoYXIqIGRhdGEsIHVuc2lnbmVkIGxlbmd0aCkgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0 dWFsIGJvb2wgc291cmNlQWJvcnQoY29uc3QgV2ViU3RyaW5nJiBpZCkgeyByZXR1cm4gZmFsc2U7 IH0KLSAgICB2aXJ0dWFsIHZvaWQgc291cmNlU2V0RHVyYXRpb24oZG91YmxlKSB7IH0KLSAgICB2 aXJ0dWFsIHZvaWQgc291cmNlRW5kT2ZTdHJlYW0oRW5kT2ZTdHJlYW1TdGF0dXMpICB7IH0KLSAg ICB2aXJ0dWFsIGJvb2wgc291cmNlU2V0VGltZXN0YW1wT2Zmc2V0KGNvbnN0IFdlYlN0cmluZyYg aWQsIGRvdWJsZSBvZmZzZXQpIHsgcmV0dXJuIGZhbHNlOyB9Ci0KICAgICAvLyBSZXR1cm5zIHdo ZXRoZXIga2V5U3lzdGVtIGlzIHN1cHBvcnRlZC4gSWYgdHJ1ZSwgdGhlIHJlc3VsdCB3aWxsIGJl CiAgICAgLy8gcmVwb3J0ZWQgYnkgYW4gZXZlbnQuCiAgICAgdmlydHVhbCBNZWRpYUtleUV4Y2Vw dGlvbiBnZW5lcmF0ZUtleVJlcXVlc3QoY29uc3QgV2ViU3RyaW5nJiBrZXlTeXN0ZW0sIGNvbnN0 IHVuc2lnbmVkIGNoYXIqIGluaXREYXRhLCB1bnNpZ25lZCBpbml0RGF0YUxlbmd0aCkgeyByZXR1 cm4gTWVkaWFLZXlFeGNlcHRpb25LZXlTeXN0ZW1Ob3RTdXBwb3J0ZWQ7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyQ2xpZW50LmggYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllckNsaWVudC5oCmluZGV4 IGM4MmZkM2FjYzY1NjliYTI3MGMxYjc2ZDdhNjFjYjlkMzM1YTlhZDYuLjA4OTkzN2MyNGFlYjZj NTViOTM2YzAyOGZmZDM3ZDJhNTg2YzhlODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXJDbGllbnQuaApAQCAtNzIsOCArNzIsNiBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCBmbG9hdCB2b2x1bWUoKSBjb25zdCA9IDA7CiAgICAgdmlydHVh bCB2b2lkIHBsYXliYWNrU3RhdGVDaGFuZ2VkKCkgPSAwOwogICAgIHZpcnR1YWwgV2ViTWVkaWFQ bGF5ZXI6OlByZWxvYWQgcHJlbG9hZCgpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgc291 cmNlT3BlbmVkKCkgPSAwOwotICAgIHZpcnR1YWwgV2ViS2l0OjpXZWJVUkwgc291cmNlVVJMKCkg Y29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBrZXlBZGRlZChjb25zdCBXZWJTdHJpbmcmIGtl eVN5c3RlbSwgY29uc3QgV2ViU3RyaW5nJiBzZXNzaW9uSWQpID0gMDsKICAgICB2aXJ0dWFsIHZv aWQga2V5RXJyb3IoY29uc3QgV2ViU3RyaW5nJiBrZXlTeXN0ZW0sIGNvbnN0IFdlYlN0cmluZyYg c2Vzc2lvbklkLCBNZWRpYUtleUVycm9yQ29kZSwgdW5zaWduZWQgc2hvcnQgc3lzdGVtQ29kZSkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBrZXlNZXNzYWdlKGNvbnN0IFdlYlN0cmluZyYga2V5U3lz dGVtLCBjb25zdCBXZWJTdHJpbmcmIHNlc3Npb25JZCwgY29uc3QgdW5zaWduZWQgY2hhciogbWVz c2FnZSwgdW5zaWduZWQgbWVzc2FnZUxlbmd0aCwgY29uc3QgV2ViVVJMJiBkZWZhdWx0VVJMKSA9 IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXll ckNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsLmNwcAppbmRleCBlMjBmZGEzMDg2ZjYyZmEzZmZiODliMGJkM2UzODkwMWZi ZWUwZjMyLi4zM2FjYzQ2OWQyYmI1NGE5MTY1NjkzMWQ1MjM0OTNiYWM0NTlkMzVlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbC5jcHAKQEAgLTIxLDE2ICsyMSwxMyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtQ29udGV4dFNr aWEuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCiAjaW5jbHVkZSAiVGltZVJhbmdlcy5oIgot I2luY2x1ZGUgIlVVSUQuaCIKICNpbmNsdWRlICJXZWJBdWRpb1NvdXJjZVByb3ZpZGVyLmgiCiAj aW5jbHVkZSAiV2ViRG9jdW1lbnQuaCIKICNpbmNsdWRlICJXZWJGcmFtZUNsaWVudC5oIgogI2lu Y2x1ZGUgIldlYkZyYW1lSW1wbC5oIgogI2luY2x1ZGUgIldlYkhlbHBlclBsdWdpbkltcGwuaCIK ICNpbmNsdWRlICJXZWJNZWRpYVBsYXllci5oIgotI2luY2x1ZGUgIldlYk1lZGlhU291cmNlQ2xp ZW50LmgiCiAjaW5jbHVkZSAiV2ViTWVkaWFTb3VyY2VJbXBsLmgiCi0jaW5jbHVkZSAiV2ViU291 cmNlQnVmZmVyLmgiCiAjaW5jbHVkZSAiV2ViVmlld0ltcGwuaCIKICNpbmNsdWRlIDxwdWJsaWMv UGxhdGZvcm0uaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViQ1N0cmluZy5oPgpAQCAtNTQsMTEzICs1 MSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot Ly8gRklYTUU6IFJlbW92ZSB0aGlzIGNsYXNzIG9uY2UgdGhlIENocm9taXVtIGNvZGUgaW1wbGVt ZW50cyBpdHMgb3duCi0vLyB2ZXJzaW9uIG9mIFdlYk1lZGlhUGxheWVyOjpsb2FkKFdlYlVSTCwg V2ViTWVkaWFTb3VyY2UsIENPUlNNb2RlKS4KLS8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTAzNzEKLWNsYXNzIFdlYk1lZGlhU291cmNlQ2xpZW50SW1wbCA6IHB1 YmxpYyBXZWJNZWRpYVNvdXJjZUNsaWVudCB7Ci1wdWJsaWM6Ci0gICAgZXhwbGljaXQgV2ViTWVk aWFTb3VyY2VDbGllbnRJbXBsKFdlYk1lZGlhUGxheWVyKik7Ci0gICAgdmlydHVhbCB+V2ViTWVk aWFTb3VyY2VDbGllbnRJbXBsKCk7Ci0KLSAgICAvLyBXZWJNZWRpYVNvdXJjZUNsaWVudCBtZXRo b2RzLgotICAgIHZpcnR1YWwgQWRkU3RhdHVzIGFkZFNvdXJjZUJ1ZmZlcihjb25zdCBXZWJTdHJp bmcmIHR5cGUsIGNvbnN0IFdlYlZlY3RvcjxXZWJTdHJpbmc+JiBjb2RlY3MsIFdlYlNvdXJjZUJ1 ZmZlcioqKTsKLSAgICB2aXJ0dWFsIGRvdWJsZSBkdXJhdGlvbigpOwotICAgIHZpcnR1YWwgdm9p ZCBzZXREdXJhdGlvbihkb3VibGUpOwotICAgIHZpcnR1YWwgdm9pZCBlbmRPZlN0cmVhbShFbmRP ZlN0cmVhbVN0YXR1cyk7Ci0KLXByaXZhdGU6Ci0gICAgV2ViTWVkaWFQbGF5ZXIqIG1fd2ViTWVk aWFQbGF5ZXI7Ci19OwotCi0vLyBGSVhNRTogUmVtb3ZlIHRoaXMgY2xhc3Mgb25jZSB0aGUgQ2hy b21pdW0gY29kZSBpbXBsZW1lbnRzIGl0cyBvd24KLS8vIHZlcnNpb24gb2YgV2ViTWVkaWFQbGF5 ZXI6OmxvYWQoV2ViVVJMLCBXZWJNZWRpYVNvdXJjZSwgQ09SU01vZGUpLgotLy8gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDM3MQotY2xhc3MgV2ViU291cmNlQnVm ZmVySW1wbCA6IHB1YmxpYyBXZWJTb3VyY2VCdWZmZXIgewotcHVibGljOgotICAgIFdlYlNvdXJj ZUJ1ZmZlckltcGwoV2ViTWVkaWFQbGF5ZXIqLCBjb25zdCBXZWJTdHJpbmcmIGlkKTsKLQotICAg IC8vIFdlYlNvdXJjZUJ1ZmZlciBtZXRob2RzLgotICAgIHZpcnR1YWwgV2ViVGltZVJhbmdlcyBi dWZmZXJlZCgpOwotICAgIHZpcnR1YWwgdm9pZCBhcHBlbmQoY29uc3QgdW5zaWduZWQgY2hhciog ZGF0YSwgdW5zaWduZWQgbGVuZ3RoKTsKLSAgICB2aXJ0dWFsIHZvaWQgYWJvcnQoKTsKLSAgICB2 aXJ0dWFsIGJvb2wgc2V0VGltZXN0YW1wT2Zmc2V0KGRvdWJsZSk7Ci0gICAgdmlydHVhbCB2b2lk IHJlbW92ZWRGcm9tTWVkaWFTb3VyY2UoKTsKLQotcHJpdmF0ZToKLSAgICBXZWJNZWRpYVBsYXll ciogbV93ZWJNZWRpYVBsYXllcjsKLSAgICBXZWJTdHJpbmcgbV9pZDsKLX07Ci0KLVdlYk1lZGlh U291cmNlQ2xpZW50SW1wbDo6V2ViTWVkaWFTb3VyY2VDbGllbnRJbXBsKFdlYk1lZGlhUGxheWVy KiB3ZWJNZWRpYVBsYXllcikKLSAgICA6IG1fd2ViTWVkaWFQbGF5ZXIod2ViTWVkaWFQbGF5ZXIp Ci17Ci19Ci0KLVdlYk1lZGlhU291cmNlQ2xpZW50SW1wbDo6fldlYk1lZGlhU291cmNlQ2xpZW50 SW1wbCgpCi17Ci19Ci0KLVdlYk1lZGlhU291cmNlQ2xpZW50OjpBZGRTdGF0dXMgV2ViTWVkaWFT b3VyY2VDbGllbnRJbXBsOjphZGRTb3VyY2VCdWZmZXIoY29uc3QgV2ViU3RyaW5nJiB0eXBlLCBj b25zdCBXZWJWZWN0b3I8V2ViU3RyaW5nPiYgY29kZWNzLAotICAgIFdlYlNvdXJjZUJ1ZmZlcioq IHNvdXJjZUJ1ZmZlcikKLXsKLSAgICBXZWJTdHJpbmcgaWQgPSBXZWJDb3JlOjpjcmVhdGVDYW5v bmljYWxVVUlEU3RyaW5nKCk7Ci0gICAgV2ViTWVkaWFTb3VyY2VDbGllbnQ6OkFkZFN0YXR1cyBy ZXN1bHQgPSBzdGF0aWNfY2FzdDxXZWJNZWRpYVNvdXJjZUNsaWVudDo6QWRkU3RhdHVzPihtX3dl Yk1lZGlhUGxheWVyLT5zb3VyY2VBZGRJZChpZCwgdHlwZSwgY29kZWNzKSk7Ci0gICAgaWYgKHJl c3VsdCA9PSBXZWJNZWRpYVNvdXJjZUNsaWVudDo6QWRkU3RhdHVzT2spCi0gICAgICAgICpzb3Vy Y2VCdWZmZXIgPSBuZXcgV2ViU291cmNlQnVmZmVySW1wbChtX3dlYk1lZGlhUGxheWVyLCBpZCk7 Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1kb3VibGUgV2ViTWVkaWFTb3VyY2VDbGllbnRJ bXBsOjpkdXJhdGlvbigpCi17Ci0gICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPmR1cmF0aW9u KCk7Ci19Ci0KLXZvaWQgV2ViTWVkaWFTb3VyY2VDbGllbnRJbXBsOjpzZXREdXJhdGlvbihkb3Vi bGUgZHVyYXRpb24pCi17Ci0gICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPnNvdXJjZVNldER1 cmF0aW9uKGR1cmF0aW9uKTsKLX0KLQotdm9pZCBXZWJNZWRpYVNvdXJjZUNsaWVudEltcGw6OmVu ZE9mU3RyZWFtKEVuZE9mU3RyZWFtU3RhdHVzIHN0YXR1cykKLXsKLSAgICBtX3dlYk1lZGlhUGxh eWVyLT5zb3VyY2VFbmRPZlN0cmVhbShzdGF0aWNfY2FzdDxXZWJNZWRpYVBsYXllcjo6RW5kT2ZT dHJlYW1TdGF0dXM+KHN0YXR1cykpOwotfQotCi1XZWJTb3VyY2VCdWZmZXJJbXBsOjpXZWJTb3Vy Y2VCdWZmZXJJbXBsKFdlYk1lZGlhUGxheWVyKiB3ZWJNZWRpYVBsYXllciwgY29uc3QgV2ViU3Ry aW5nJiBpZCkKLSAgICA6IG1fd2ViTWVkaWFQbGF5ZXIod2ViTWVkaWFQbGF5ZXIpCi0gICAgLCBt X2lkKGlkKQotewotfQotCi1XZWJUaW1lUmFuZ2VzIFdlYlNvdXJjZUJ1ZmZlckltcGw6OmJ1ZmZl cmVkKCkKLXsKLSAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+c291cmNlQnVmZmVyZWQobV9p ZCk7Ci19Ci0KLXZvaWQgV2ViU291cmNlQnVmZmVySW1wbDo6YXBwZW5kKGNvbnN0IHVuc2lnbmVk IGNoYXIqIGRhdGEsIHVuc2lnbmVkIGxlbmd0aCkKLXsKLSAgICBtX3dlYk1lZGlhUGxheWVyLT5z b3VyY2VBcHBlbmQobV9pZCwgZGF0YSwgbGVuZ3RoKTsKLX0KLQotdm9pZCBXZWJTb3VyY2VCdWZm ZXJJbXBsOjphYm9ydCgpCi17Ci0gICAgbV93ZWJNZWRpYVBsYXllci0+c291cmNlQWJvcnQobV9p ZCk7Ci19Ci0KLWJvb2wgV2ViU291cmNlQnVmZmVySW1wbDo6c2V0VGltZXN0YW1wT2Zmc2V0KGRv dWJsZSBvZmZzZXQpCi17Ci0gICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPnNvdXJjZVNldFRp bWVzdGFtcE9mZnNldChtX2lkLCBvZmZzZXQpOwotfQotCi12b2lkIFdlYlNvdXJjZUJ1ZmZlcklt cGw6OnJlbW92ZWRGcm9tTWVkaWFTb3VyY2UoKQotewotICAgIGlmICghbV93ZWJNZWRpYVBsYXll cikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV93ZWJNZWRpYVBsYXllci0+c291cmNlUmVtb3Zl SWQobV9pZCk7Ci0gICAgbV93ZWJNZWRpYVBsYXllciA9IDA7Ci19Ci0KIHN0YXRpYyBQYXNzT3du UHRyPFdlYk1lZGlhUGxheWVyPiBjcmVhdGVXZWJNZWRpYVBsYXllcihXZWJNZWRpYVBsYXllckNs aWVudCogY2xpZW50LCBjb25zdCBXZWJVUkwmIHVybCwgRnJhbWUqIGZyYW1lKQogewogICAgIFdl YkZyYW1lSW1wbCogd2ViRnJhbWUgPSBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShmcmFtZSk7CkBA IC0zMzAsMjkgKzIyMCw2IEBAIFdlYk1lZGlhUGxheWVyOjpQcmVsb2FkIFdlYk1lZGlhUGxheWVy Q2xpZW50SW1wbDo6cHJlbG9hZCgpIGNvbnN0CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYk1l ZGlhUGxheWVyOjpQcmVsb2FkPihtX3ByZWxvYWQpOwogfQogCi0vLyBGSVhNRTogUmVtb3ZlIHRo aXMgYW5kIHNvdXJjZVVSTCgpIG9uY2UgdGhlIENocm9taXVtIGNvZGUgaW1wbGVtZW50cwotLy8g aXRzIG93biB2ZXJzaW9uIG9mIFdlYk1lZGlhUGxheWVyOjpsb2FkKFdlYlVSTCwgV2ViTWVkaWFT b3VyY2UsIENPUlNNb2RlKS4KLS8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTAzNzEKLXZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzb3VyY2VPcGVuZWQo KQotewotI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCi0gICAgQVNTRVJUKG1fd2ViTWVkaWFQbGF5 ZXIpOwotICAgIGlmIChtX21lZGlhU291cmNlKSB7Ci0gICAgICAgIE93blB0cjxXZWJNZWRpYVNv dXJjZT4gbWVkaWFTb3VyY2UgPSBhZG9wdFB0cihuZXcgV2ViTWVkaWFTb3VyY2VJbXBsKG1fbWVk aWFTb3VyY2UpKTsKLSAgICAgICAgbWVkaWFTb3VyY2UtPm9wZW4obmV3IFdlYk1lZGlhU291cmNl Q2xpZW50SW1wbChtX3dlYk1lZGlhUGxheWVyLmdldCgpKSk7Ci0gICAgfQotI2VuZGlmCi19Ci0K LVdlYktpdDo6V2ViVVJMIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6c291cmNlVVJMKCkgY29u c3QKLXsKLSNpZiBFTkFCTEUoTUVESUFfU09VUkNFKQotICAgIGlmIChtX21lZGlhU291cmNlKQot ICAgICAgICByZXR1cm4gbV91cmw7Ci0jZW5kaWYKLSAgICByZXR1cm4gS1VSTCgpOwotfQotCiB2 b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6a2V5QWRkZWQoY29uc3QgV2ViU3RyaW5nJiBr ZXlTeXN0ZW0sIGNvbnN0IFdlYlN0cmluZyYgc2Vzc2lvbklkKQogewogI2lmIEVOQUJMRShFTkNS WVBURURfTUVESUEpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJN ZWRpYVBsYXllckNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1l ZGlhUGxheWVyQ2xpZW50SW1wbC5oCmluZGV4IDk5ZDJlOGJkYmU4NDU0ODBiNzVkMTNhZmVlOWM1 M2VkZDk0ZTBmNzYuLjZmMmEzNTlmZDYzYWE4MTM2OTFkOWRkY2RkNTg1NTM2OWIzYTMzYzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xp ZW50SW1wbC5oCkBAIC04NCw4ICs4NCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGZsb2F0IHZv bHVtZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBwbGF5YmFja1N0YXRlQ2hhbmdlZCgpOwog ICAgIHZpcnR1YWwgV2ViTWVkaWFQbGF5ZXI6OlByZWxvYWQgcHJlbG9hZCgpIGNvbnN0OwotICAg IHZpcnR1YWwgdm9pZCBzb3VyY2VPcGVuZWQoKTsKLSAgICB2aXJ0dWFsIFdlYktpdDo6V2ViVVJM IHNvdXJjZVVSTCgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBrZXlBZGRlZChjb25zdCBXZWJT dHJpbmcmIGtleVN5c3RlbSwgY29uc3QgV2ViU3RyaW5nJiBzZXNzaW9uSWQpOwogICAgIHZpcnR1 YWwgdm9pZCBrZXlFcnJvcihjb25zdCBXZWJTdHJpbmcmIGtleVN5c3RlbSwgY29uc3QgV2ViU3Ry aW5nJiBzZXNzaW9uSWQsIE1lZGlhS2V5RXJyb3JDb2RlLCB1bnNpZ25lZCBzaG9ydCBzeXN0ZW1D b2RlKTsKICAgICB2aXJ0dWFsIHZvaWQga2V5TWVzc2FnZShjb25zdCBXZWJTdHJpbmcmIGtleVN5 c3RlbSwgY29uc3QgV2ViU3RyaW5nJiBzZXNzaW9uSWQsIGNvbnN0IHVuc2lnbmVkIGNoYXIqIG1l c3NhZ2UsIHVuc2lnbmVkIG1lc3NhZ2VMZW5ndGgsIGNvbnN0IFdlYlVSTCYgZGVmYXVsdFVSTCk7 Cg==