84046 2012-04-16 09:48:39 -0700 Fix WebKit style violations in Source/Webkit/chromium/public/WebMediaPlayer.h 2012-04-16 17:48:45 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 acolwell acolwell abarth dglazkov eric.carlson feature-media-reviews fishd jamesr tkent+wkapi webkit.review.bot oldest_to_newest 603225 0 acolwell 2012-04-16 09:48:39 -0700 WebMediaPlayer.h has several style violations that need fixing: - enum values should be prefixed with the enum name. (Preload::None -> Preload::PreloadNone) - WebTimeRange & WebTimeRanges should be in WebTimeRange.h . 603233 1 fishd 2012-04-16 09:59:49 -0700 http://trac.webkit.org/wiki/ChromiumWebKitAPI#Enums http://trac.webkit.org/wiki/ChromiumWebKitAPI#Types 603488 2 137412 acolwell 2012-04-16 15:13:40 -0700 Created attachment 137412 Patch 603492 3 webkit.review.bot 2012-04-16 15:17:57 -0700 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. 603494 4 jamesr 2012-04-16 15:19:36 -0700 This changes the exposed API, so is there a corresponding chromium patch to update to the new names/etc? 603510 5 acolwell 2012-04-16 15:32:23 -0700 (In reply to comment #4) > This changes the exposed API, so is there a corresponding chromium patch to update to the new names/etc? There will be. I haven't created it yet. I was planning on landing this, WebKit DEPS roll, landing chromium changes to use new enum name, WebKit chromium deps roll. Remove old names. 603523 6 jamesr 2012-04-16 15:53:48 -0700 When this rolls into the chromium tree, will the chromium code using this still compile? 603569 7 acolwell 2012-04-16 16:49:40 -0700 (In reply to comment #6) > When this rolls into the chromium tree, will the chromium code using this still compile? Yes. I'm building this patch w/ ToT chrome right now. That is why I still have the old enum values in there. The plan is to land this, update chrome to the new enum value names, and then remove to old names in webkit. 603573 8 jamesr 2012-04-16 16:53:53 -0700 Ah gotcha, I missed that you were leaving the old values in as aliases. Proceed! 603576 9 acolwell 2012-04-16 16:56:58 -0700 (In reply to comment #8) > Ah gotcha, I missed that you were leaving the old values in as aliases. Proceed! No problem. Could you please cq+ my patch. 603634 10 137412 webkit.review.bot 2012-04-16 17:48:38 -0700 Comment on attachment 137412 Patch Clearing flags on attachment: 137412 Committed r114329: <http://trac.webkit.org/changeset/114329> 603635 11 webkit.review.bot 2012-04-16 17:48:45 -0700 All reviewed patches have been landed. Closing bug. 137412 2012-04-16 15:13:40 -0700 2012-04-16 17:48:38 -0700 Patch bug-84046-20120416151339.patch text/plain 14810 acolwell U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0MzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGU0NjFjZGU1YmFhMWFhODMyN2MyNjc1ODZlN2YyYjA5NmIxZmNkZjMuLjI4Mjk1NmJlZWQ1MjBh YzFmOWIzZjVlNDkyN2U5ZGI3OWI0YzlkN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDQtMTYgIEFhcm9uIENvbHdlbGwgIDxhY29sd2VsbEBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgRml4IFdlYktpdCBzdHlsZSB2aW9sYXRpb25zIGluIENocm9t aXVtIFdlYk1lZGlhUGxheWVyLmggJiBXZWJNZWRpYVBsYXllckNsaWVudC5oCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDA0NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0Lmd5cDoKKyAgICAg ICAgKiBwdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAg ICogcHVibGljL1dlYk1lZGlhUGxheWVyQ2xpZW50Lmg6CisgICAgICAgICogcHVibGljL1dlYlRp bWVSYW5nZS5oOiBDb3BpZWQgZnJvbSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJN ZWRpYVBsYXllckNsaWVudC5oLgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6 V2ViVGltZVJhbmdlOjpXZWJUaW1lUmFuZ2UpOgorICAgICAgICAoV2ViVGltZVJhbmdlKToKKyAg ICAgICAgKiBzcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHA6CisKIDIwMTItMDQtMTYgIFRlcnJ5 IEFuZGVyc29uICA8dGRhbmRlcnNvbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVt XSBBbGxvdyBXZWJHZXN0dXJlRXZlbnQgdG8gc3RvcmUgZm91ciBmbG9hdGluZyBwb2ludCB2YWx1 ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCBmZTRjM2RkMDkzOTJjY2VjZDNiZDZl ZWQzMzM0M2RlZjc0MmZmZGI4Li44NGViMDYzMmE4MWEzMjdmZjI1MmQ4Mzc4ZjRmYjJjYzI0ZTE5 NzhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0yNzIsNiArMjcyLDcgQEAKICAg ICAgICAgICAgICAgICAncHVibGljL1dlYlRleHRGaWVsZERlY29yYXRvckNsaWVudC5oJywKICAg ICAgICAgICAgICAgICAncHVibGljL1dlYlRleHRJbnB1dFR5cGUuaCcsCiAgICAgICAgICAgICAg ICAgJ3B1YmxpYy9XZWJUZXh0UnVuLmgnLAorICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViVGlt ZVJhbmdlLmgnLAogICAgICAgICAgICAgICAgICdwdWJsaWMvV2ViVVJMTG9hZGVyT3B0aW9ucy5o JywKICAgICAgICAgICAgICAgICAncHVibGljL1dlYlVzZXJNZWRpYUNsaWVudC5oJywKICAgICAg ICAgICAgICAgICAncHVibGljL1dlYlVzZXJNZWRpYVJlcXVlc3QuaCcsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaAppbmRleCAyMDQ5YjU5YjAyYWJl M2ExMDI0MmUyN2VjZTJiYmU3ZjkyN2Y3ZDM3Li5jMjkzY2VlOTU4MjM3ZGM2YzY0ZTZjMWRkMzll YWFmN2ViMjUxMzZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJNZWRpYVBsYXllci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1l ZGlhUGxheWVyLmgKQEAgLTMxLDkgKzMxLDkgQEAKICNpZm5kZWYgV2ViTWVkaWFQbGF5ZXJfaAog I2RlZmluZSBXZWJNZWRpYVBsYXllcl9oCiAKKyNpbmNsdWRlICJXZWJUaW1lUmFuZ2UuaCIKICNp bmNsdWRlICJXZWJWaWRlb0ZyYW1lLmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViQ2FudmFzLmgi Ci0jaW5jbHVkZSAicGxhdGZvcm0vV2ViVmVjdG9yLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewog CkBAIC00Niw2MSArNDYsNzYgQEAgY2xhc3MgV2ViVVJMOwogc3RydWN0IFdlYlJlY3Q7CiBzdHJ1 Y3QgV2ViU2l6ZTsKIAotc3RydWN0IFdlYlRpbWVSYW5nZSB7Ci0gICAgV2ViVGltZVJhbmdlKCkg OiBzdGFydCgwKSwgZW5kKDApIHt9Ci0gICAgV2ViVGltZVJhbmdlKGZsb2F0IHMsIGZsb2F0IGUp IDogc3RhcnQocyksIGVuZChlKSB7fQotCi0gICAgZmxvYXQgc3RhcnQ7Ci0gICAgZmxvYXQgZW5k OwotfTsKLQotdHlwZWRlZiBXZWJWZWN0b3I8V2ViVGltZVJhbmdlPiBXZWJUaW1lUmFuZ2VzOwot CiBjbGFzcyBXZWJNZWRpYVBsYXllciB7CiBwdWJsaWM6CiAgICAgZW51bSBOZXR3b3JrU3RhdGUg ewotICAgICAgICBFbXB0eSwKLSAgICAgICAgSWRsZSwKLSAgICAgICAgTG9hZGluZywKLSAgICAg ICAgTG9hZGVkLAotICAgICAgICBGb3JtYXRFcnJvciwKLSAgICAgICAgTmV0d29ya0Vycm9yLAot ICAgICAgICBEZWNvZGVFcnJvciwKKyAgICAgICAgTmV0d29ya1N0YXRlRW1wdHksCisgICAgICAg IE5ldHdvcmtTdGF0ZUlkbGUsCisgICAgICAgIE5ldHdvcmtTdGF0ZUxvYWRpbmcsCisgICAgICAg IE5ldHdvcmtTdGF0ZUxvYWRlZCwKKyAgICAgICAgTmV0d29ya1N0YXRlRm9ybWF0RXJyb3IsCisg ICAgICAgIE5ldHdvcmtTdGF0ZU5ldHdvcmtFcnJvciwKKyAgICAgICAgTmV0d29ya1N0YXRlRGVj b2RlRXJyb3IsCisgICAgICAgIEVtcHR5ID0gTmV0d29ya1N0YXRlRW1wdHksCisgICAgICAgIElk bGUgPSBOZXR3b3JrU3RhdGVJZGxlLAorICAgICAgICBMb2FkaW5nID0gTmV0d29ya1N0YXRlTG9h ZGluZywKKyAgICAgICAgTG9hZGVkID0gTmV0d29ya1N0YXRlTG9hZGVkLAorICAgICAgICBGb3Jt YXRFcnJvciA9IE5ldHdvcmtTdGF0ZUZvcm1hdEVycm9yLAorICAgICAgICBOZXR3b3JrRXJyb3Ig PSBOZXR3b3JrU3RhdGVOZXR3b3JrRXJyb3IsCisgICAgICAgIERlY29kZUVycm9yID0gTmV0d29y a1N0YXRlRGVjb2RlRXJyb3IsCiAgICAgfTsKIAogICAgIGVudW0gUmVhZHlTdGF0ZSB7Ci0gICAg ICAgIEhhdmVOb3RoaW5nLAotICAgICAgICBIYXZlTWV0YWRhdGEsCi0gICAgICAgIEhhdmVDdXJy ZW50RGF0YSwKLSAgICAgICAgSGF2ZUZ1dHVyZURhdGEsCi0gICAgICAgIEhhdmVFbm91Z2hEYXRh LAorICAgICAgICBSZWFkeVN0YXRlSGF2ZU5vdGhpbmcsCisgICAgICAgIFJlYWR5U3RhdGVIYXZl TWV0YWRhdGEsCisgICAgICAgIFJlYWR5U3RhdGVIYXZlQ3VycmVudERhdGEsCisgICAgICAgIFJl YWR5U3RhdGVIYXZlRnV0dXJlRGF0YSwKKyAgICAgICAgUmVhZHlTdGF0ZUhhdmVFbm91Z2hEYXRh LAorICAgICAgICBIYXZlTm90aGluZyA9IFJlYWR5U3RhdGVIYXZlTm90aGluZywKKyAgICAgICAg SGF2ZU1ldGFkYXRhID0gUmVhZHlTdGF0ZUhhdmVNZXRhZGF0YSwKKyAgICAgICAgSGF2ZUN1cnJl bnREYXRhID0gUmVhZHlTdGF0ZUhhdmVDdXJyZW50RGF0YSwKKyAgICAgICAgSGF2ZUZ1dHVyZURh dGEgPSBSZWFkeVN0YXRlSGF2ZUZ1dHVyZURhdGEsCisgICAgICAgIEhhdmVFbm91Z2hEYXRhID0g UmVhZHlTdGF0ZUhhdmVFbm91Z2hEYXRhLAogICAgIH07CiAKICAgICBlbnVtIE1vdmllTG9hZFR5 cGUgewotICAgICAgICBVbmtub3duLAotICAgICAgICBEb3dubG9hZCwKLSAgICAgICAgU3RvcmVk U3RyZWFtLAotICAgICAgICBMaXZlU3RyZWFtLAorICAgICAgICBNb3ZpZUxvYWRUeXBlVW5rbm93 biwKKyAgICAgICAgTW92aWVMb2FkVHlwZURvd25sb2FkLAorICAgICAgICBNb3ZpZUxvYWRUeXBl U3RvcmVkU3RyZWFtLAorICAgICAgICBNb3ZpZUxvYWRUeXBlTGl2ZVN0cmVhbSwKKyAgICAgICAg VW5rbm93biA9IE1vdmllTG9hZFR5cGVVbmtub3duLAorICAgICAgICBEb3dubG9hZCA9IE1vdmll TG9hZFR5cGVEb3dubG9hZCwKKyAgICAgICAgU3RvcmVkU3RyZWFtID0gTW92aWVMb2FkVHlwZVN0 b3JlZFN0cmVhbSwKKyAgICAgICAgTGl2ZVN0cmVhbSA9IE1vdmllTG9hZFR5cGVMaXZlU3RyZWFt LAogICAgIH07CiAKICAgICBlbnVtIFByZWxvYWQgewotICAgICAgICBOb25lLAotICAgICAgICBN ZXRhRGF0YSwKLSAgICAgICAgQXV0bywKKyAgICAgICAgUHJlbG9hZE5vbmUsCisgICAgICAgIFBy ZWxvYWRNZXRhRGF0YSwKKyAgICAgICAgUHJlbG9hZEF1dG8sCisgICAgICAgIE5vbmUgPSBQcmVs b2FkTm9uZSwKKyAgICAgICAgTWV0YURhdGEgPSBQcmVsb2FkTWV0YURhdGEsCisgICAgICAgIEF1 dG8gPSBQcmVsb2FkQXV0bywKICAgICB9OwogCiAgICAgZW51bSBFbmRPZlN0cmVhbVN0YXR1cyB7 Ci0gICAgICAgIEVvc05vRXJyb3IsCi0gICAgICAgIEVvc05ldHdvcmtFcnJvciwKLSAgICAgICAg RW9zRGVjb2RlRXJyb3IsCisgICAgICAgIEVuZE9mU3RyZWFtU3RhdHVzTm9FcnJvciwKKyAgICAg ICAgRW5kT2ZTdHJlYW1TdGF0dXNOZXR3b3JrRXJyb3IsCisgICAgICAgIEVuZE9mU3RyZWFtU3Rh dHVzRGVjb2RlRXJyb3IsCisgICAgICAgIEVvc05vRXJyb3IgPSBFbmRPZlN0cmVhbVN0YXR1c05v RXJyb3IsCisgICAgICAgIEVvc05ldHdvcmtFcnJvciA9IEVuZE9mU3RyZWFtU3RhdHVzTmV0d29y a0Vycm9yLAorICAgICAgICBFb3NEZWNvZGVFcnJvciA9IEVuZE9mU3RyZWFtU3RhdHVzRGVjb2Rl RXJyb3IsCiAgICAgfTsKIAogICAgIC8vIFJlcHJlc2VudHMgc3luY2hyb25vdXMgZXhjZXB0aW9u cyB0aGF0IGNhbiBiZSB0aHJvd24gZnJvbSB0aGUgRW5jcnlwdGVkCiAgICAgLy8gTWVkaWEgbWV0 aG9kcy4gVGhpcyBpcyBkaWZmZXJlbnQgZnJvbSB0aGUgYXN5bmNocm9ub3VzIE1lZGlhS2V5RXJy b3IuCiAgICAgZW51bSBNZWRpYUtleUV4Y2VwdGlvbiB7Ci0gICAgICAgIE5vRXJyb3IsCi0gICAg ICAgIEludmFsaWRQbGF5ZXJTdGF0ZSwKLSAgICAgICAgS2V5U3lzdGVtTm90U3VwcG9ydGVkCisg ICAgICAgIE1lZGlhS2V5RXhjZXB0aW9uTm9FcnJvciwKKyAgICAgICAgTWVkaWFLZXlFeGNlcHRp b25JbnZhbGlkUGxheWVyU3RhdGUsCisgICAgICAgIE1lZGlhS2V5RXhjZXB0aW9uS2V5U3lzdGVt Tm90U3VwcG9ydGVkLAorICAgICAgICBOb0Vycm9yID0gTWVkaWFLZXlFeGNlcHRpb25Ob0Vycm9y LAorICAgICAgICBJbnZhbGlkUGxheWVyU3RhdGUgPSBNZWRpYUtleUV4Y2VwdGlvbkludmFsaWRQ bGF5ZXJTdGF0ZSwKKyAgICAgICAgS2V5U3lzdGVtTm90U3VwcG9ydGVkID0gTWVkaWFLZXlFeGNl cHRpb25LZXlTeXN0ZW1Ob3RTdXBwb3J0ZWQsCiAgICAgfTsKIAogICAgIHZpcnR1YWwgfldlYk1l ZGlhUGxheWVyKCkge30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYk1lZGlhUGxheWVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJNZWRpYVBsYXllckNsaWVudC5oCmluZGV4IGM5ZDMxZTRkMTJhNGQ4OTc2MmI1MjE4YzBkZDRh MWUwODcxNDM2YTEuLjc4NmJmNWFhNzQ5M2FiNjNkZjVkNWZlM2FlNzU5MTkyZWJmMTI4NGUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyQ2xp ZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXJD bGllbnQuaApAQCAtNDEsMTIgKzQxLDE4IEBAIGNsYXNzIFdlYlVSTDsKIGNsYXNzIFdlYk1lZGlh UGxheWVyQ2xpZW50IHsKIHB1YmxpYzoKICAgICBlbnVtIE1lZGlhS2V5RXJyb3JDb2RlIHsKLSAg ICAgICAgVW5rbm93bkVycm9yID0gMSwKLSAgICAgICAgQ2xpZW50RXJyb3IsCi0gICAgICAgIFNl cnZpY2VFcnJvciwKLSAgICAgICAgT3V0cHV0RXJyb3IsCi0gICAgICAgIEhhcmR3YXJlQ2hhbmdl RXJyb3IsCi0gICAgICAgIERvbWFpbkVycm9yCisgICAgICAgIE1lZGlhS2V5RXJyb3JDb2RlVW5r bm93biA9IDEsCisgICAgICAgIE1lZGlhS2V5RXJyb3JDb2RlQ2xpZW50LAorICAgICAgICBNZWRp YUtleUVycm9yQ29kZVNlcnZpY2UsCisgICAgICAgIE1lZGlhS2V5RXJyb3JDb2RlT3V0cHV0LAor ICAgICAgICBNZWRpYUtleUVycm9yQ29kZUhhcmR3YXJlQ2hhbmdlLAorICAgICAgICBNZWRpYUtl eUVycm9yQ29kZURvbWFpbiwKKyAgICAgICAgVW5rbm93bkVycm9yID0gTWVkaWFLZXlFcnJvckNv ZGVVbmtub3duLAorICAgICAgICBDbGllbnRFcnJvciA9IE1lZGlhS2V5RXJyb3JDb2RlQ2xpZW50 LAorICAgICAgICBTZXJ2aWNlRXJyb3IgPSBNZWRpYUtleUVycm9yQ29kZVNlcnZpY2UsCisgICAg ICAgIE91dHB1dEVycm9yID0gTWVkaWFLZXlFcnJvckNvZGVPdXRwdXQsCisgICAgICAgIEhhcmR3 YXJlQ2hhbmdlRXJyb3IgPSBNZWRpYUtleUVycm9yQ29kZUhhcmR3YXJlQ2hhbmdlLAorICAgICAg ICBEb21haW5FcnJvciA9IE1lZGlhS2V5RXJyb3JDb2RlRG9tYWluLAogICAgIH07CiAKICAgICB2 aXJ0dWFsIHZvaWQgbmV0d29ya1N0YXRlQ2hhbmdlZCgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlRpbWVSYW5nZS5oIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViVGltZVJhbmdlLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDFhM2EyMDk4ZDBjYzBi YjYxZDBhNDRlYTMyNjEyNzg3MTU2NjhmMAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYlRpbWVSYW5nZS5oCkBAIC0wLDAgKzEsNTAgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq CisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlz dHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3Ig dGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ug b3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91 dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwor ICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9S IENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVm IFdlYlRpbWVSYW5nZV9oCisjZGVmaW5lIFdlYlRpbWVSYW5nZV9oCisKKyNpbmNsdWRlICJwbGF0 Zm9ybS9XZWJWZWN0b3IuaCIKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK3N0cnVjdCBXZWJUaW1l UmFuZ2UgeworICAgIFdlYlRpbWVSYW5nZSgpIDogc3RhcnQoMCksIGVuZCgwKSB7IH0KKyAgICBX ZWJUaW1lUmFuZ2UoZmxvYXQgcywgZmxvYXQgZSkgOiBzdGFydChzKSwgZW5kKGUpIHsgfQorCisg ICAgZmxvYXQgc3RhcnQ7CisgICAgZmxvYXQgZW5kOworfTsKKwordHlwZWRlZiBXZWJWZWN0b3I8 V2ViVGltZVJhbmdlPiBXZWJUaW1lUmFuZ2VzOworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKwor I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRNYXRj aGluZ0VudW1zLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Fzc2VydE1hdGNoaW5n RW51bXMuY3BwCmluZGV4IDQ4NTFlYzk3OWExNWI1Nzg0NTIxYTZmNmMyZDJhNjU1ZDU0Y2ZmZDUu LjVjZjY1N2YyYjM4NjgwYmFhOWQzZGE1MWVjNDAzZWZiM2MwOTI0OGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Fzc2VydE1hdGNoaW5nRW51bXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Fzc2VydE1hdGNoaW5nRW51bXMuY3BwCkBAIC0zNjgs MzYgKzM2OCw0NiBAQCBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk5vZGU6Ok5vdGF0 aW9uTm9kZSwgTm9kZTo6Tk9UQVRJT05fTk9ERSk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKFdlYk5vZGU6OlhQYXRoTmFtZXNwYWNlTm9kZSwgTm9kZTo6WFBBVEhfTkFNRVNQQUNFX05P REUpOwogCiAjaWYgRU5BQkxFKFZJREVPKQotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShX ZWJNZWRpYVBsYXllcjo6RW1wdHksIE1lZGlhUGxheWVyOjpFbXB0eSk7Ci1DT01QSUxFX0FTU0VS VF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpJZGxlLCBNZWRpYVBsYXllcjo6SWRsZSk7 Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpMb2FkaW5nLCBN ZWRpYVBsYXllcjo6TG9hZGluZyk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1l ZGlhUGxheWVyOjpMb2FkZWQsIE1lZGlhUGxheWVyOjpMb2FkZWQpOwotQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6Rm9ybWF0RXJyb3IsIE1lZGlhUGxheWVyOjpG b3JtYXRFcnJvcik7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVy OjpOZXR3b3JrRXJyb3IsIE1lZGlhUGxheWVyOjpOZXR3b3JrRXJyb3IpOwotQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6RGVjb2RlRXJyb3IsIE1lZGlhUGxheWVy OjpEZWNvZGVFcnJvcik7Ci0KLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQ bGF5ZXI6OkhhdmVOb3RoaW5nLCBNZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmcpOwotQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6SGF2ZU1ldGFkYXRhLCBNZWRpYVBs YXllcjo6SGF2ZU1ldGFkYXRhKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVk aWFQbGF5ZXI6OkhhdmVDdXJyZW50RGF0YSwgTWVkaWFQbGF5ZXI6OkhhdmVDdXJyZW50RGF0YSk7 Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpIYXZlRnV0dXJl RGF0YSwgTWVkaWFQbGF5ZXI6OkhhdmVGdXR1cmVEYXRhKTsKLUNPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6OkhhdmVFbm91Z2hEYXRhLCBNZWRpYVBsYXllcjo6SGF2 ZUVub3VnaERhdGEpOwotCi1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxh eWVyOjpVbmtub3duLCBNZWRpYVBsYXllcjo6VW5rbm93bik7Ci1DT01QSUxFX0FTU0VSVF9NQVRD SElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpEb3dubG9hZCwgTWVkaWFQbGF5ZXI6OkRvd25sb2Fk KTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6OlN0b3JlZFN0 cmVhbSwgTWVkaWFQbGF5ZXI6OlN0b3JlZFN0cmVhbSk7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKFdlYk1lZGlhUGxheWVyOjpMaXZlU3RyZWFtLCBNZWRpYVBsYXllcjo6TGl2ZVN0cmVh bSk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpOZXR3b3Jr U3RhdGVFbXB0eSwgTWVkaWFQbGF5ZXI6OkVtcHR5KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZUlkbGUsIE1lZGlhUGxheWVyOjpJZGxl KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6Ok5ldHdvcmtT dGF0ZUxvYWRpbmcsIE1lZGlhUGxheWVyOjpMb2FkaW5nKTsKK0NPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZUxvYWRlZCwgTWVkaWFQbGF5ZXI6 OkxvYWRlZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpO ZXR3b3JrU3RhdGVGb3JtYXRFcnJvciwgTWVkaWFQbGF5ZXI6OkZvcm1hdEVycm9yKTsKK0NPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZU5ldHdv cmtFcnJvciwgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtFcnJvcik7CitDT01QSUxFX0FTU0VSVF9NQVRD SElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGVEZWNvZGVFcnJvciwgTWVkaWFQ bGF5ZXI6OkRlY29kZUVycm9yKTsKKworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJN ZWRpYVBsYXllcjo6UmVhZHlTdGF0ZUhhdmVOb3RoaW5nLCBNZWRpYVBsYXllcjo6SGF2ZU5vdGhp bmcpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6UmVhZHlT dGF0ZUhhdmVNZXRhZGF0YSwgTWVkaWFQbGF5ZXI6OkhhdmVNZXRhZGF0YSk7CitDT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpSZWFkeVN0YXRlSGF2ZUN1cnJlbnRE YXRhLCBNZWRpYVBsYXllcjo6SGF2ZUN1cnJlbnREYXRhKTsKK0NPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGVIYXZlRnV0dXJlRGF0YSwgTWVkaWFQ bGF5ZXI6OkhhdmVGdXR1cmVEYXRhKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2Vi TWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGVIYXZlRW5vdWdoRGF0YSwgTWVkaWFQbGF5ZXI6OkhhdmVF bm91Z2hEYXRhKTsKKworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXll cjo6TW92aWVMb2FkVHlwZVVua25vd24sIE1lZGlhUGxheWVyOjpVbmtub3duKTsKK0NPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGVEb3dubG9h ZCwgTWVkaWFQbGF5ZXI6OkRvd25sb2FkKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0o V2ViTWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGVTdG9yZWRTdHJlYW0sIE1lZGlhUGxheWVyOjpT dG9yZWRTdHJlYW0pOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXll cjo6TW92aWVMb2FkVHlwZUxpdmVTdHJlYW0sIE1lZGlhUGxheWVyOjpMaXZlU3RyZWFtKTsKKwor Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6UHJlbG9hZE5vbmUs IE1lZGlhUGxheWVyOjpOb25lKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVk aWFQbGF5ZXI6OlByZWxvYWRNZXRhRGF0YSwgTWVkaWFQbGF5ZXI6Ok1ldGFEYXRhKTsKK0NPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6OlByZWxvYWRBdXRvLCBNZWRp YVBsYXllcjo6QXV0byk7CiAKICNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQotQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6Tm9FcnJvciwgTWVkaWFQbGF5ZXI6 Ok5vRXJyb3IpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6 SW52YWxpZFBsYXllclN0YXRlLCBNZWRpYVBsYXllcjo6SW52YWxpZFBsYXllclN0YXRlKTsKLUNP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXI6OktleVN5c3RlbU5vdFN1 cHBvcnRlZCwgTWVkaWFQbGF5ZXI6OktleVN5c3RlbU5vdFN1cHBvcnRlZCk7Ci0KLUNPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXJDbGllbnQ6OlVua25vd25FcnJvciwg TWVkaWFQbGF5ZXJDbGllbnQ6OlVua25vd25FcnJvcik7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKFdlYk1lZGlhUGxheWVyQ2xpZW50OjpDbGllbnRFcnJvciwgTWVkaWFQbGF5ZXJDbGll bnQ6OkNsaWVudEVycm9yKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQ bGF5ZXJDbGllbnQ6OlNlcnZpY2VFcnJvciwgTWVkaWFQbGF5ZXJDbGllbnQ6OlNlcnZpY2VFcnJv cik7Ci1DT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyQ2xpZW50OjpP dXRwdXRFcnJvciwgTWVkaWFQbGF5ZXJDbGllbnQ6Ok91dHB1dEVycm9yKTsKLUNPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXJDbGllbnQ6OkhhcmR3YXJlQ2hhbmdlRXJy b3IsIE1lZGlhUGxheWVyQ2xpZW50OjpIYXJkd2FyZUNoYW5nZUVycm9yKTsKLUNPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViTWVkaWFQbGF5ZXJDbGllbnQ6OkRvbWFpbkVycm9yLCBNZWRp YVBsYXllckNsaWVudDo6RG9tYWluRXJyb3IpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShXZWJNZWRpYVBsYXllcjo6RW5kT2ZTdHJlYW1TdGF0dXNOb0Vycm9yLCBNZWRpYVBsYXllcjo6 RW9zTm9FcnJvcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVy OjpFbmRPZlN0cmVhbVN0YXR1c05ldHdvcmtFcnJvciwgTWVkaWFQbGF5ZXI6OkVvc05ldHdvcmtF cnJvcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlhUGxheWVyOjpFbmRP ZlN0cmVhbVN0YXR1c0RlY29kZUVycm9yLCBNZWRpYVBsYXllcjo6RW9zRGVjb2RlRXJyb3IpOwor I2VuZGlmCisKKyNpZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQorQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShXZWJNZWRpYVBsYXllcjo6TWVkaWFLZXlFeGNlcHRpb25Ob0Vycm9yLCBNZWRp YVBsYXllcjo6Tm9FcnJvcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1lZGlh UGxheWVyOjpNZWRpYUtleUV4Y2VwdGlvbkludmFsaWRQbGF5ZXJTdGF0ZSwgTWVkaWFQbGF5ZXI6 OkludmFsaWRQbGF5ZXJTdGF0ZSk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYk1l ZGlhUGxheWVyOjpNZWRpYUtleUV4Y2VwdGlvbktleVN5c3RlbU5vdFN1cHBvcnRlZCwgTWVkaWFQ bGF5ZXI6OktleVN5c3RlbU5vdFN1cHBvcnRlZCk7CisKK0NPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViTWVkaWFQbGF5ZXJDbGllbnQ6Ok1lZGlhS2V5RXJyb3JDb2RlVW5rbm93biwgTWVk aWFQbGF5ZXJDbGllbnQ6OlVua25vd25FcnJvcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKFdlYk1lZGlhUGxheWVyQ2xpZW50OjpNZWRpYUtleUVycm9yQ29kZUNsaWVudCwgTWVkaWFQ bGF5ZXJDbGllbnQ6OkNsaWVudEVycm9yKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0o V2ViTWVkaWFQbGF5ZXJDbGllbnQ6Ok1lZGlhS2V5RXJyb3JDb2RlU2VydmljZSwgTWVkaWFQbGF5 ZXJDbGllbnQ6OlNlcnZpY2VFcnJvcik7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdl Yk1lZGlhUGxheWVyQ2xpZW50OjpNZWRpYUtleUVycm9yQ29kZU91dHB1dCwgTWVkaWFQbGF5ZXJD bGllbnQ6Ok91dHB1dEVycm9yKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViTWVk aWFQbGF5ZXJDbGllbnQ6Ok1lZGlhS2V5RXJyb3JDb2RlSGFyZHdhcmVDaGFuZ2UsIE1lZGlhUGxh eWVyQ2xpZW50OjpIYXJkd2FyZUNoYW5nZUVycm9yKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViTWVkaWFQbGF5ZXJDbGllbnQ6Ok1lZGlhS2V5RXJyb3JDb2RlRG9tYWluLCBNZWRp YVBsYXllckNsaWVudDo6RG9tYWluRXJyb3IpOwogI2VuZGlmCiAKICNlbmRpZgo=