28161 2009-08-10 12:30:57 -0700 Qt DumpRenderTree does not process named events. 2009-08-17 06:52:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 mifenton webkit-unassigned eric manyoso oldest_to_newest 138770 0 mifenton 2009-08-10 12:30:57 -0700 The DumpRenderTree does not correctly process named events as used by the tests. Named events currently processed by Mac/Win and not handled by Qt include: leftArrow rightArrow upArrow downArrow pageUp pageDown home end delete Processing of these events needs to be added to the Qt DRT. This bug was discovered by the failure of fast/forms/textarea-arrow-navigation.html which was moved from editing/input and was relying on editing.js, which is no longer references by the test, but uses eventSender("downArrow") instead. 138782 1 34500 mifenton 2009-08-10 13:05:15 -0700 Created attachment 34500 Code change for DumpRenderTree keyDown processing. This patch fixes the existing test and enables all missing string based key events. Existing tests in skipped also need to be tested for other tests now fixed by this change. 138788 2 34504 mifenton 2009-08-10 13:16:52 -0700 Created attachment 34504 Style patch for jsobjects.cpp based upon results of cpp_style.py and WebKit style guide. 138956 3 34555 mifenton 2009-08-11 07:36:30 -0700 Created attachment 34555 Fix missing brace in previous patch. 138958 4 34500 manyoso 2009-08-11 07:51:58 -0700 Comment on attachment 34500 Code change for DumpRenderTree keyDown processing. This is awesome! I imagine this will fix quite a few tests :) A few comments: > + } else { > + qDebug() << ">>>>>>>>> keyDown" << string; Is this necessary? > + // map special keycode strings used by the tests to something that works for Qt/X11 > + if (string == "leftArrow") { string == QLatin1String("leftArrow") I think. r- to change. And then I'll land :) 138975 5 34562 mifenton 2009-08-11 08:49:49 -0700 Created attachment 34562 Revised code change wrapping strings with QLatin1String() 139030 6 34577 mifenton 2009-08-11 10:29:10 -0700 Created attachment 34577 Remove working tests from qt/Skipped associated with DRT update. 139192 7 34562 manyoso 2009-08-11 18:06:04 -0700 Comment on attachment 34562 Revised code change wrapping strings with QLatin1String() Landed with r47077, clearing review flag. 139238 8 34555 eric 2009-08-11 22:27:02 -0700 Comment on attachment 34555 Fix missing brace in previous patch. LGTM. 139303 9 34577 manyoso 2009-08-12 05:44:54 -0700 Comment on attachment 34577 Remove working tests from qt/Skipped associated with DRT update. Clear flags as this has landed. 139361 10 34555 eric 2009-08-12 09:40:02 -0700 Comment on attachment 34555 Fix missing brace in previous patch. Rejecting patch 34555 from commit-queue. This patch will require manual commit. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 cwd: None 139362 11 eric 2009-08-12 09:41:09 -0700 ChangeLog diff is malformed. bugzilla-tool/svn-apply don't know how to fix it, hence the commit-queue rejected it. 139372 12 34667 mifenton 2009-08-12 09:47:06 -0700 Created attachment 34667 Replacement patch with proper ChangeLog Entry Here's a fixed patch with the changeLog entry complete. 139596 13 34555 eric 2009-08-12 15:25:56 -0700 Comment on attachment 34555 Fix missing brace in previous patch. clearing review flag on this obsolete patch. 140703 14 manyoso 2009-08-17 06:52:08 -0700 Landed with r47358. Closing bug... 34500 2009-08-10 13:05:15 -0700 2009-08-11 08:49:49 -0700 Code change for DumpRenderTree keyDown processing. 0001-Code-change-for-DumpRenderTree-keyDown-update.patch text/plain 2851 mifenton RnJvbSAwYzk0NDQwMWVmM2U3YTIwZjI1NDM5ZWE2OWEyMzlhNGJmYzVkNDQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlrZS5mZW50b25AdG9yY2htb2JpbGUu Y29tPgpEYXRlOiBNb24sIDEwIEF1ZyAyMDA5IDE1OjM3OjUwIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gQ29kZSBjaGFuZ2UgZm9yIER1bXBSZW5kZXJUcmVlIGtleURvd24gdXBkYXRlLgoKLS0tCiBX ZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysrKysr KysrKysrKwogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcCB8ICAg MzEgKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDQ3IGluc2Vy dGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDI3NzQ2YjkuLmQzODViOTMgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOSBAQAorMjAwOS0wOC0xMCAgTWlrZSBGZW50b24gIDxtaWtlLmZlbnRvbkB0 b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIHByb2Nlc3NpbmcgZm9yIHN0cmluZyBjb25zdGFudHMgdXNlZCBieSB0aGUg dGVzdHMgdG8gdHJpZ2dlcgorICAgICAgICBjb21tb24gYWN0aW9ucyBsaWtlIHVwLCBkb3duLCBs ZWZ0LCByaWdodCwgZXRjLiBmb3IgdGhlIFF0CisgICAgICAgIGltcGxlbWVudGF0aW9uIG9mIER1 bXBSZW5kZXJUcmVlLgorCisgICAgICAgIE5vdGUgdGhpcyBhbGxvd3MgZmFzdC9mb3Jtcy90ZXh0 YXJlYS1hcnJvdy1uYXZpZ2F0aW9uLmh0bWwgdG8gcGFzcworICAgICAgICBjb3JyZWN0bHkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MTYxCisK KyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwOgorICAgICAgICAoRXZl bnRTZW5kZXI6OmtleURvd24pOgorCiAyMDA5LTA4LTA4ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwIGIvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcAppbmRleCA3ZTVlMTY4Li40OThjMjg4 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3Bw CisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L2pzb2JqZWN0cy5jcHAKQEAgLTQ0 Myw2ICs0NDMsMzcgQEAgdm9pZCBFdmVudFNlbmRlcjo6a2V5RG93bihjb25zdCBRU3RyaW5nICZz dHJpbmcsIGNvbnN0IFFTdHJpbmdMaXN0ICZtb2RpZmllcnMpCiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICBjb2RlID0gc3RyaW5nLnVuaWNvZGUoKS0+dG9VcHBlcigpLnVuaWNvZGUoKTsK ICAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIHFEZWJ1ZygpIDw8ICI+Pj4+Pj4+Pj4g a2V5RG93biIgPDwgc3RyaW5nOworICAgICAgICAvLyBtYXAgc3BlY2lhbCBrZXljb2RlIHN0cmlu Z3MgdXNlZCBieSB0aGUgdGVzdHMgdG8gc29tZXRoaW5nIHRoYXQgd29ya3MgZm9yIFF0L1gxMQor ICAgICAgICBpZiAoc3RyaW5nID09ICJsZWZ0QXJyb3ciKSB7CisgICAgICAgICAgICBzID0gUVN0 cmluZygpOworICAgICAgICAgICAgY29kZSA9IFF0OjpLZXlfTGVmdDsKKyAgICAgICAgfSBlbHNl IGlmIChzdHJpbmcgPT0gInJpZ2h0QXJyb3ciKSB7CisgICAgICAgICAgICBzID0gUVN0cmluZygp OworICAgICAgICAgICAgY29kZSA9IFF0OjpLZXlfUmlnaHQ7CisgICAgICAgIH0gZWxzZSBpZiAo c3RyaW5nID09ICJ1cEFycm93IikgeworICAgICAgICAgICAgcyA9IFFTdHJpbmcoKTsKKyAgICAg ICAgICAgIGNvZGUgPSBRdDo6S2V5X1VwOworICAgICAgICB9IGVsc2UgaWYgKHN0cmluZyA9PSAi ZG93bkFycm93IikgeworICAgICAgICAgICAgcyA9IFFTdHJpbmcoKTsKKyAgICAgICAgICAgIGNv ZGUgPSBRdDo6S2V5X0Rvd247CisgICAgICAgIH0gZWxzZSBpZiAoc3RyaW5nID09ICJwYWdlVXAi KSB7CisgICAgICAgICAgICBzID0gUVN0cmluZygpOworICAgICAgICAgICAgY29kZSA9IFF0OjpL ZXlfUGFnZVVwOworICAgICAgICB9IGVsc2UgaWYgKHN0cmluZyA9PSAicGFnZURvd24iKSB7Cisg ICAgICAgICAgICBzID0gUVN0cmluZygpOworICAgICAgICAgICAgY29kZSA9IFF0OjpLZXlfUGFn ZURvd247CisgICAgICAgIH0gZWxzZSBpZiAoc3RyaW5nID09ICJob21lIikgeworICAgICAgICAg ICAgcyA9IFFTdHJpbmcoKTsKKyAgICAgICAgICAgIGNvZGUgPSBRdDo6S2V5X0hvbWU7CisgICAg ICAgIH0gZWxzZSBpZiAoc3RyaW5nID09ICJlbmQiKSB7CisgICAgICAgICAgICBzID0gUVN0cmlu ZygpOworICAgICAgICAgICAgY29kZSA9IFF0OjpLZXlfRW5kOworICAgICAgICB9IGVsc2UgaWYg KHN0cmluZyA9PSAiZGVsZXRlIikgeworICAgICAgICAgICAgcyA9IFFTdHJpbmcoKTsKKyAgICAg ICAgICAgIGNvZGUgPSBRdDo6S2V5X0RlbGV0ZTsKKyAgICAgICAgfQogICAgIH0KICAgICBRS2V5 RXZlbnQgZXZlbnQoUUV2ZW50OjpLZXlQcmVzcywgY29kZSwgbW9kaWZzLCBzKTsKICAgICBRQXBw bGljYXRpb246OnNlbmRFdmVudChtX3BhZ2UsICZldmVudCk7Ci0tIAoxLjYuNC4xOC5nMDdhNGEK Cg== 34504 2009-08-10 13:16:52 -0700 2009-08-11 07:36:30 -0700 Style patch for jsobjects.cpp based upon results of cpp_style.py and WebKit style guide. 0001-Style-changes-for-jsobjects.cpp.patch text/plain 11265 mifenton RnJvbSAyZDU5YWUyZGMyOGRhMjgzZmQyZjJkYjE2NzMyOGMwYzliMzU3ZDk2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlrZS5mZW50b25AdG9yY2htb2JpbGUu Y29tPgpEYXRlOiBNb24sIDEwIEF1ZyAyMDA5IDE1OjQ5OjAwIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gU3R5bGUgY2hhbmdlcyBmb3IganNvYmplY3RzLmNwcC4KCi0tLQogV2ViS2l0VG9vbHMvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjEgKysrKysrCiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwIHwgIDEwMyArKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNzIgaW5zZXJ0aW9ucygrKSwgNTIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IGQzODViOTMuLjViMDdhYTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNyBAQAogCiAg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIFN0eWxlIGZpeGVz IGZvciBEdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwIGJhc2VkIG9uIGNwcF9zdHlsZS5w eSBhbmQKKyAgICAgICAgV2ViS2l0IHN0eWxlIGd1aWRlLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODE2MQorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvcXQvanNvYmplY3RzLmNwcDoKKyAgICAgICAgKGZpbmRGcmFtZU5hbWVkKToKKyAgICAg ICAgKExvYWRJdGVtOjppbnZva2UpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBy b3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6dGltZXJFdmVu dCk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGF1c2VBbmltYXRpb25BdFRpbWVP bkVsZW1lbnRXaXRoSWQpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdXNlVHJh bnNpdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJZCk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJv bGxlcjo6bnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpr ZXlEb3duKToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpmcmFtZVVuZGVyTW91c2UpOgorICAgICAg ICAoVGV4dElucHV0Q29udHJvbGxlcjo6ZG9Db21tYW5kKToKKworMjAwOS0wOC0xMCAgTWlrZSBG ZW50b24gIDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgQWRkIHByb2Nlc3NpbmcgZm9yIHN0cmluZyBj b25zdGFudHMgdXNlZCBieSB0aGUgdGVzdHMgdG8gdHJpZ2dlcgogICAgICAgICBjb21tb24gYWN0 aW9ucyBsaWtlIHVwLCBkb3duLCBsZWZ0LCByaWdodCwgZXRjLiBmb3IgdGhlIFF0CiAgICAgICAg IGltcGxlbWVudGF0aW9uIG9mIER1bXBSZW5kZXJUcmVlLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL3F0L2pzb2JqZWN0cy5jcHAKaW5kZXggNDk4YzI4OC4uODU5ODU0NyAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcAorKysgYi9XZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwCkBAIC0yNywxOSArMjcsMjAg QEAKICAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KICNpbmNsdWRlIDxqc29iamVjdHMuaD4KLSNpbmNsdWRlIDxx d2VicGFnZS5oPgotI2luY2x1ZGUgPHF3ZWJoaXN0b3J5Lmg+Ci0jaW5jbHVkZSA8cXdlYmZyYW1l Lmg+Ci0jaW5jbHVkZSA8cXdlYnNlY3VyaXR5b3JpZ2luLmg+Ci0jaW5jbHVkZSA8cXdlYmRhdGFi YXNlLmg+Ci0jaW5jbHVkZSA8cWV2ZW50Lmg+CisKKyNpbmNsdWRlICJEdW1wUmVuZGVyVHJlZS5o IgorI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgorI2luY2x1ZGUgIldvcmtRdWV1ZUl0ZW0uaCIKKwog I2luY2x1ZGUgPHFhcHBsaWNhdGlvbi5oPgogI2luY2x1ZGUgPHFldmVudC5oPgogI2luY2x1ZGUg PHF0aW1lci5oPgorI2luY2x1ZGUgPHF3ZWJkYXRhYmFzZS5oPgorI2luY2x1ZGUgPHF3ZWJmcmFt ZS5oPgorI2luY2x1ZGUgPHF3ZWJoaXN0b3J5Lmg+CisjaW5jbHVkZSA8cXdlYnBhZ2UuaD4KKyNp bmNsdWRlIDxxd2Vic2VjdXJpdHlvcmlnaW4uaD4KIAotI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVl LmgiCi0jaW5jbHVkZSAiV29ya1F1ZXVlSXRlbS5oIgotI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgog ZXh0ZXJuIHZvaWQgcXRfZHVtcF9lZGl0aW5nX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZv aWQgcXRfZHVtcF9yZXNvdXJjZV9sb2FkX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZvaWQg cXRfZHJ0X3NldEphdmFTY3JpcHRQcm9maWxpbmdFbmFibGVkKFFXZWJGcmFtZSosIGJvb2wgZW5h YmxlZCk7CkBAIC00Nyw3ICs0OCw3IEBAIGV4dGVybiBib29sIHF0X2RydF9wYXVzZUFuaW1hdGlv bihRV2ViRnJhbWUqLCBjb25zdCBRU3RyaW5nICZuYW1lLCBkb3VibGUgdGltZSwKIGV4dGVybiBi b29sIHF0X2RydF9wYXVzZVRyYW5zaXRpb25PZlByb3BlcnR5KFFXZWJGcmFtZSosIGNvbnN0IFFT dHJpbmcgJm5hbWUsIGRvdWJsZSB0aW1lLCBjb25zdCBRU3RyaW5nICZlbGVtZW50SWQpOwogZXh0 ZXJuIGludCBxdF9kcnRfbnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKFFXZWJGcmFtZSopOwogCi1R V2ViRnJhbWUgKmZpbmRGcmFtZU5hbWVkKGNvbnN0IFFTdHJpbmcgJmZyYW1lTmFtZSwgUVdlYkZy YW1lICpmcmFtZSkKK1FXZWJGcmFtZSogZmluZEZyYW1lTmFtZWQoY29uc3QgUVN0cmluZyAmZnJh bWVOYW1lLCBRV2ViRnJhbWUqIGZyYW1lKQogewogICAgIGlmIChmcmFtZS0+ZnJhbWVOYW1lKCkg PT0gZnJhbWVOYW1lKQogICAgICAgICByZXR1cm4gZnJhbWU7CkBAIC02NCw3ICs2NSw3IEBAIGJv b2wgTG9hZEl0ZW06Omludm9rZSgpIGNvbnN0CiAgICAgLy9xRGVidWcoKSA8PCAiPj4+TG9hZEl0 ZW06Omludm9rZSI7CiAgICAgUV9BU1NFUlQobV93ZWJQYWdlKTsKIAotICAgIFFXZWJGcmFtZSAq ZnJhbWUgPSAwOworICAgIFFXZWJGcmFtZSogZnJhbWUgPSAwOwogICAgIGNvbnN0IFFTdHJpbmcg dCA9IHRhcmdldCgpOwogICAgIGlmICh0LmlzRW1wdHkoKSkKICAgICAgICAgZnJhbWUgPSBtX3dl YlBhZ2UtPm1haW5GcmFtZSgpOwpAQCAtMjM3LDcgKzIzOCw3IEBAIHZvaWQgTGF5b3V0VGVzdENv bnRyb2xsZXI6OnF1ZXVlU2NyaXB0KGNvbnN0IFFTdHJpbmcgJnVybCkKIAogdm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6cHJvdmlzaW9uYWxMb2FkKCkKIHsKLSAgICBRV2ViRnJhbWUgKmZyYW1l ID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KHNlbmRlcigpKTsKKyAgICBRV2ViRnJhbWUqIGZy YW1lID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KHNlbmRlcigpKTsKICAgICBpZiAoIW1fdG9w TG9hZGluZ0ZyYW1lICYmIG1faXNMb2FkaW5nKQogICAgICAgICBtX3RvcExvYWRpbmdGcmFtZSA9 IGZyYW1lOwogfQpAQCAtMjQ3LDkgKzI0OCw4IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6 OnRpbWVyRXZlbnQoUVRpbWVyRXZlbnQgKmV2KQogICAgIGlmIChldi0+dGltZXJJZCgpID09IG1f dGltZW91dFRpbWVyLnRpbWVySWQoKSkgewogICAgICAgICBxRGVidWcoKSA8PCAiPj4+Pj4+Pj4+ Pj4+PiB0aW1lb3V0IjsKICAgICAgICAgbm90aWZ5RG9uZSgpOwotICAgIH0gZWxzZSB7CisgICAg fSBlbHNlCiAgICAgICAgIFFPYmplY3Q6OnRpbWVyRXZlbnQoZXYpOwotICAgIH0KIH0KIAogUVN0 cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6ZW5jb2RlSG9zdE5hbWUoY29uc3QgUVN0cmluZyAm aG9zdCkKQEAgLTI4Niw3ICsyODYsNyBAQCBib29sIExheW91dFRlc3RDb250cm9sbGVyOjpwYXVz ZUFuaW1hdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJZChjb25zdCBRU3RyaW5nICZhbgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZG91YmxlIHRpbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZlbGVtZW50SWQpCiB7Ci0gICAgUVdl YkZyYW1lICpmcmFtZSA9IG1fZHJ0LT53ZWJQYWdlKCktPm1haW5GcmFtZSgpOworICAgIFFXZWJG cmFtZSogZnJhbWUgPSBtX2RydC0+d2ViUGFnZSgpLT5tYWluRnJhbWUoKTsKICAgICBRX0FTU0VS VChmcmFtZSk7CiAgICAgcmV0dXJuIHF0X2RydF9wYXVzZUFuaW1hdGlvbihmcmFtZSwgYW5pbWF0 aW9uTmFtZSwgdGltZSwgZWxlbWVudElkKTsKIH0KQEAgLTI5NSwxNCArMjk1LDE0IEBAIGJvb2wg TGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdXNlVHJhbnNpdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJ ZChjb25zdCBRU3RyaW5nICZwCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHRpbWUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUVN0 cmluZyAmZWxlbWVudElkKQogewotICAgIFFXZWJGcmFtZSAqZnJhbWUgPSBtX2RydC0+d2ViUGFn ZSgpLT5tYWluRnJhbWUoKTsKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gbV9kcnQtPndlYlBhZ2Uo KS0+bWFpbkZyYW1lKCk7CiAgICAgUV9BU1NFUlQoZnJhbWUpOwogICAgIHJldHVybiBxdF9kcnRf cGF1c2VUcmFuc2l0aW9uT2ZQcm9wZXJ0eShmcmFtZSwgcHJvcGVydHlOYW1lLCB0aW1lLCBlbGVt ZW50SWQpOwogfQogCiB1bnNpZ25lZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bnVtYmVyT2ZBY3Rp dmVBbmltYXRpb25zKCkgY29uc3QKIHsKLSAgICBRV2ViRnJhbWUgKmZyYW1lID0gbV9kcnQtPndl YlBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1fZHJ0LT53ZWJQ YWdlKCktPm1haW5GcmFtZSgpOwogICAgIFFfQVNTRVJUKGZyYW1lKTsKICAgICByZXR1cm4gcXRf ZHJ0X251bWJlck9mQWN0aXZlQW5pbWF0aW9ucyhmcmFtZSk7CiB9CkBAIC00NDAsOSArNDQwLDgg QEAgdm9pZCBFdmVudFNlbmRlcjo6a2V5RG93bihjb25zdCBRU3RyaW5nICZzdHJpbmcsIGNvbnN0 IFFTdHJpbmdMaXN0ICZtb2RpZmllcnMpCiAgICAgICAgICAgICBzID0gUVN0cmluZygpOwogICAg ICAgICAgICAgY29kZSA9IFF0OjpLZXlfSG9tZTsKICAgICAgICAgICAgIG1vZGlmcyA9IDA7Ci0g ICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgY29kZSA9IHN0cmlu Zy51bmljb2RlKCktPnRvVXBwZXIoKS51bmljb2RlKCk7Ci0gICAgICAgIH0KICAgICB9IGVsc2Ug ewogICAgICAgICBxRGVidWcoKSA8PCAiPj4+Pj4+Pj4+IGtleURvd24iIDw8IHN0cmluZzsKICAg ICAgICAgLy8gbWFwIHNwZWNpYWwga2V5Y29kZSBzdHJpbmdzIHVzZWQgYnkgdGhlIHRlc3RzIHRv IHNvbWV0aGluZyB0aGF0IHdvcmtzIGZvciBRdC9YMTEKQEAgLTQ3OSw5ICs0NzgsOSBAQCB2b2lk IEV2ZW50U2VuZGVyOjprZXlEb3duKGNvbnN0IFFTdHJpbmcgJnN0cmluZywgY29uc3QgUVN0cmlu Z0xpc3QgJm1vZGlmaWVycykKICAgICBRQXBwbGljYXRpb246OnNlbmRFdmVudChtX3BhZ2UsICZl dmVudCk7CiB9CiAKLVFXZWJGcmFtZSAqRXZlbnRTZW5kZXI6OmZyYW1lVW5kZXJNb3VzZSgpIGNv bnN0CitRV2ViRnJhbWUqIEV2ZW50U2VuZGVyOjpmcmFtZVVuZGVyTW91c2UoKSBjb25zdAogewot ICAgIFFXZWJGcmFtZSAqZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIFFXZWJGcmFt ZSogZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOwogCiByZWRvOgogICAgIFFMaXN0PFFXZWJG cmFtZSo+IGNoaWxkcmVuID0gZnJhbWUtPmNoaWxkRnJhbWVzKCk7CkBAIC01MDksODEgKzUwOCw4 MSBAQCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6OmRvQ29tbWFuZChjb25zdCBRU3RyaW5nICZj b21tYW5kKQogICAgIGlmIChjb21tYW5kID09ICJtb3ZlQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rp b246IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAg IGtleWNvZGUgPSBRdDo6S2V5X0xlZnQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZURv d246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlRG93bjoiKSB7CiAgICAgICAg IGtleWNvZGUgPSBRdDo6S2V5X0Rvd247Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZURv d25BbmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3Zl RG93bkFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hp ZnRNb2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfRG93bjsKLSAgICB9IGVsc2Ug aWYoY29tbWFuZCA9PSJtb3ZlRm9yd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09 Im1vdmVGb3J3YXJkOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAg fSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUZvcndhcmRBbmRNb2RpZnlTZWxlY3Rpb246Iikgewor ICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlRm9yd2FyZEFuZE1vZGlmeVNlbGVjdGlvbjoi KSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRNb2RpZmllcjsKICAgICAgICAga2V5 Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUxlZnQ6 IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlTGVmdDoiKSB7CiAgICAgICAgIGtl eWNvZGUgPSBRdDo6S2V5X0xlZnQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUxlZnRB bmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlTGVm dEFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRN b2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYo Y29tbWFuZCA9PSJtb3ZlUmlnaHQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3Zl UmlnaHQ6IikgewogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9SaWdodDsKLSAgICB9IGVsc2Ug aWYoY29tbWFuZCA9PSJtb3ZlUmlnaHRBbmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxz ZSBpZiAoY29tbWFuZCA9PSJtb3ZlUmlnaHRBbmRNb2RpZnlTZWxlY3Rpb246IikgewogICAgICAg ICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAgIGtleWNvZGUgPSBRdDo6 S2V5X1JpZ2h0OwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVUb0JlZ2lubmluZ09mRG9j dW1lbnQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlVG9CZWdpbm5pbmdPZkRv Y3VtZW50OiIpIHsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpDb250cm9sTW9kaWZpZXI7CiAg ICAgICAgIGtleWNvZGUgPSBRdDo6S2V5X0hvbWU7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0i bW92ZVRvQmVnaW5uaW5nT2ZMaW5lOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92 ZVRvQmVnaW5uaW5nT2ZMaW5lOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfSG9tZTsK LS8vICAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlVG9CZWdpbm5pbmdPZlBhcmFncmFwaDoi KSB7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZEb2N1bWVudDoiKSB7Cisv LyAgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVUb0JlZ2lubmluZ09mUGFyYWdyYXBoOiIp IHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZEb2N1bWVudDoiKSB7CiAg ICAgICAgIG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2Rl ID0gUXQ6OktleV9FbmQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZMaW5l OiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZMaW5lOiIpIHsKICAg ICAgICAga2V5Y29kZSA9IFF0OjpLZXlfRW5kOwotLy8gICAgIH0gZWxzZSBpZihjb21tYW5kID09 Im1vdmVUb0VuZE9mUGFyYWdyYXBoOiIpIHsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3Zl VXA6IikgeworLy8gICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlVG9FbmRPZlBhcmFncmFw aDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVVcDoiKSB7CiAgICAgICAgIGtl eWNvZGUgPSBRdDo6S2V5X1VwOwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVVcEFuZE1v ZGlmeVNlbGVjdGlvbjoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVVcEFuZE1v ZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRNb2RpZmll cjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfVXA7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQg PT0ibW92ZVdvcmRCYWNrd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVX b3JkQmFja3dhcmQ6IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmll cjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfVXA7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQg PT0ibW92ZVdvcmRCYWNrd2FyZEFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CisgICAgfSBlbHNlIGlm IChjb21tYW5kID09Im1vdmVXb3JkQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rpb246IikgewogICAg ICAgICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAgIG1vZGlmaWVycyB8 PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9MZWZ0Owot ICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVXb3JkRm9yd2FyZDoiKSB7CisgICAgfSBlbHNl IGlmIChjb21tYW5kID09Im1vdmVXb3JkRm9yd2FyZDoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8 PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9SaWdodDsK LSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZEZvcndhcmRBbmRNb2RpZnlTZWxlY3Rp b246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZEZvcndhcmRBbmRNb2Rp ZnlTZWxlY3Rpb246IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmll cjsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpTaGlmdE1vZGlmaWVyOwogICAgICAgICBrZXlj b2RlID0gUXQ6OktleV9SaWdodDsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZExl ZnQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZExlZnQ6IikgewogICAg ICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9 IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZFJpZ2h0OiIp IHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVdvcmRSaWdodDoiKSB7CiAgICAgICAg IG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6 OktleV9MZWZ0OwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVXb3JkUmlnaHRBbmRNb2Rp ZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZFJpZ2h0 QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpTaGlmdE1v ZGlmaWVyOwogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmllcjsKICAgICAg ICAga2V5Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92 ZVdvcmRMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQg PT0ibW92ZVdvcmRMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKICAgICAgICAgbW9kaWZpZXJz IHw9IFF0OjpTaGlmdE1vZGlmaWVyOwogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xN b2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYo Y29tbWFuZCA9PSJwYWdlRG93bjoiKSB7Ci0gICAgICAgIGtleWNvZGUgPSBRdDo6S2V5X1BhZ2VE b3duOyAgICAgICAgCi0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0icGFnZVVwOiIpIHsKLSAgICAg ICAga2V5Y29kZSA9IFF0OjpLZXlfUGFnZVVwOyAgICAgICAgCi0gICAgfSBlbHNlIGlmKGNvbW1h bmQgPT0gImRlbGV0ZVdvcmRCYWNrd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09 InBhZ2VEb3duOiIpIHsKKyAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfUGFnZURvd247CisgICAg fSBlbHNlIGlmIChjb21tYW5kID09InBhZ2VVcDoiKSB7CisgICAgICAgIGtleWNvZGUgPSBRdDo6 S2V5X1BhZ2VVcDsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0gImRlbGV0ZVdvcmRCYWNrd2Fy ZDoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAg ICBrZXljb2RlID0gUXQ6OktleV9CYWNrc3BhY2U7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0g ImRlbGV0ZUJhY2t3YXJkOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0gImRlbGV0ZUJh Y2t3YXJkOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfQmFja3NwYWNlOwotICAgIH0g ZWxzZSBpZihjb21tYW5kID09ICJkZWxldGVGb3J3YXJkOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNv bW1hbmQgPT0gImRlbGV0ZUZvcndhcmQ6IikKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfRGVs ZXRlOwogICAgIH0KICAgICBRS2V5RXZlbnQgZXZlbnQoUUV2ZW50OjpLZXlQcmVzcywga2V5Y29k ZSwgbW9kaWZpZXJzKTsKLS0gCjEuNi40LjE4LmcwN2E0YQoK 34555 2009-08-11 07:36:30 -0700 2009-08-12 15:25:56 -0700 Fix missing brace in previous patch. 0001-Style-changes-for-jsobjects.cpp.patch text/plain 11267 mifenton RnJvbSAyZDU5YWUyZGMyOGRhMjgzZmQyZjJkYjE2NzMyOGMwYzliMzU3ZDk2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlrZS5mZW50b25AdG9yY2htb2JpbGUu Y29tPgpEYXRlOiBNb24sIDEwIEF1ZyAyMDA5IDE1OjQ5OjAwIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gU3R5bGUgY2hhbmdlcyBmb3IganNvYmplY3RzLmNwcC4KCi0tLQogV2ViS2l0VG9vbHMvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjEgKysrKysrCiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwIHwgIDEwMyArKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNzIgaW5zZXJ0aW9ucygrKSwgNTIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IGQzODViOTMuLjViMDdhYTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNyBAQAogCiAg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIFN0eWxlIGZpeGVz IGZvciBEdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwIGJhc2VkIG9uIGNwcF9zdHlsZS5w eSBhbmQKKyAgICAgICAgV2ViS2l0IHN0eWxlIGd1aWRlLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODE2MQorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvcXQvanNvYmplY3RzLmNwcDoKKyAgICAgICAgKGZpbmRGcmFtZU5hbWVkKToKKyAgICAg ICAgKExvYWRJdGVtOjppbnZva2UpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBy b3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6dGltZXJFdmVu dCk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGF1c2VBbmltYXRpb25BdFRpbWVP bkVsZW1lbnRXaXRoSWQpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdXNlVHJh bnNpdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJZCk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJv bGxlcjo6bnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpr ZXlEb3duKToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpmcmFtZVVuZGVyTW91c2UpOgorICAgICAg ICAoVGV4dElucHV0Q29udHJvbGxlcjo6ZG9Db21tYW5kKToKKworMjAwOS0wOC0xMCAgTWlrZSBG ZW50b24gIDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgQWRkIHByb2Nlc3NpbmcgZm9yIHN0cmluZyBj b25zdGFudHMgdXNlZCBieSB0aGUgdGVzdHMgdG8gdHJpZ2dlcgogICAgICAgICBjb21tb24gYWN0 aW9ucyBsaWtlIHVwLCBkb3duLCBsZWZ0LCByaWdodCwgZXRjLiBmb3IgdGhlIFF0CiAgICAgICAg IGltcGxlbWVudGF0aW9uIG9mIER1bXBSZW5kZXJUcmVlLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL3F0L2pzb2JqZWN0cy5jcHAKaW5kZXggNDk4YzI4OC4uODU5ODU0NyAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcAorKysgYi9XZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwCkBAIC0yNywxOSArMjcsMjAg QEAKICAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KICNpbmNsdWRlIDxqc29iamVjdHMuaD4KLSNpbmNsdWRlIDxx d2VicGFnZS5oPgotI2luY2x1ZGUgPHF3ZWJoaXN0b3J5Lmg+Ci0jaW5jbHVkZSA8cXdlYmZyYW1l Lmg+Ci0jaW5jbHVkZSA8cXdlYnNlY3VyaXR5b3JpZ2luLmg+Ci0jaW5jbHVkZSA8cXdlYmRhdGFi YXNlLmg+Ci0jaW5jbHVkZSA8cWV2ZW50Lmg+CisKKyNpbmNsdWRlICJEdW1wUmVuZGVyVHJlZS5o IgorI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgorI2luY2x1ZGUgIldvcmtRdWV1ZUl0ZW0uaCIKKwog I2luY2x1ZGUgPHFhcHBsaWNhdGlvbi5oPgogI2luY2x1ZGUgPHFldmVudC5oPgogI2luY2x1ZGUg PHF0aW1lci5oPgorI2luY2x1ZGUgPHF3ZWJkYXRhYmFzZS5oPgorI2luY2x1ZGUgPHF3ZWJmcmFt ZS5oPgorI2luY2x1ZGUgPHF3ZWJoaXN0b3J5Lmg+CisjaW5jbHVkZSA8cXdlYnBhZ2UuaD4KKyNp bmNsdWRlIDxxd2Vic2VjdXJpdHlvcmlnaW4uaD4KIAotI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVl LmgiCi0jaW5jbHVkZSAiV29ya1F1ZXVlSXRlbS5oIgotI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgog ZXh0ZXJuIHZvaWQgcXRfZHVtcF9lZGl0aW5nX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZv aWQgcXRfZHVtcF9yZXNvdXJjZV9sb2FkX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZvaWQg cXRfZHJ0X3NldEphdmFTY3JpcHRQcm9maWxpbmdFbmFibGVkKFFXZWJGcmFtZSosIGJvb2wgZW5h YmxlZCk7CkBAIC00Nyw3ICs0OCw3IEBAIGV4dGVybiBib29sIHF0X2RydF9wYXVzZUFuaW1hdGlv bihRV2ViRnJhbWUqLCBjb25zdCBRU3RyaW5nICZuYW1lLCBkb3VibGUgdGltZSwKIGV4dGVybiBi b29sIHF0X2RydF9wYXVzZVRyYW5zaXRpb25PZlByb3BlcnR5KFFXZWJGcmFtZSosIGNvbnN0IFFT dHJpbmcgJm5hbWUsIGRvdWJsZSB0aW1lLCBjb25zdCBRU3RyaW5nICZlbGVtZW50SWQpOwogZXh0 ZXJuIGludCBxdF9kcnRfbnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKFFXZWJGcmFtZSopOwogCi1R V2ViRnJhbWUgKmZpbmRGcmFtZU5hbWVkKGNvbnN0IFFTdHJpbmcgJmZyYW1lTmFtZSwgUVdlYkZy YW1lICpmcmFtZSkKK1FXZWJGcmFtZSogZmluZEZyYW1lTmFtZWQoY29uc3QgUVN0cmluZyAmZnJh bWVOYW1lLCBRV2ViRnJhbWUqIGZyYW1lKQogewogICAgIGlmIChmcmFtZS0+ZnJhbWVOYW1lKCkg PT0gZnJhbWVOYW1lKQogICAgICAgICByZXR1cm4gZnJhbWU7CkBAIC02NCw3ICs2NSw3IEBAIGJv b2wgTG9hZEl0ZW06Omludm9rZSgpIGNvbnN0CiAgICAgLy9xRGVidWcoKSA8PCAiPj4+TG9hZEl0 ZW06Omludm9rZSI7CiAgICAgUV9BU1NFUlQobV93ZWJQYWdlKTsKIAotICAgIFFXZWJGcmFtZSAq ZnJhbWUgPSAwOworICAgIFFXZWJGcmFtZSogZnJhbWUgPSAwOwogICAgIGNvbnN0IFFTdHJpbmcg dCA9IHRhcmdldCgpOwogICAgIGlmICh0LmlzRW1wdHkoKSkKICAgICAgICAgZnJhbWUgPSBtX3dl YlBhZ2UtPm1haW5GcmFtZSgpOwpAQCAtMjM3LDcgKzIzOCw3IEBAIHZvaWQgTGF5b3V0VGVzdENv bnRyb2xsZXI6OnF1ZXVlU2NyaXB0KGNvbnN0IFFTdHJpbmcgJnVybCkKIAogdm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6cHJvdmlzaW9uYWxMb2FkKCkKIHsKLSAgICBRV2ViRnJhbWUgKmZyYW1l ID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KHNlbmRlcigpKTsKKyAgICBRV2ViRnJhbWUqIGZy YW1lID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KHNlbmRlcigpKTsKICAgICBpZiAoIW1fdG9w TG9hZGluZ0ZyYW1lICYmIG1faXNMb2FkaW5nKQogICAgICAgICBtX3RvcExvYWRpbmdGcmFtZSA9 IGZyYW1lOwogfQpAQCAtMjQ3LDkgKzI0OCw4IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6 OnRpbWVyRXZlbnQoUVRpbWVyRXZlbnQgKmV2KQogICAgIGlmIChldi0+dGltZXJJZCgpID09IG1f dGltZW91dFRpbWVyLnRpbWVySWQoKSkgewogICAgICAgICBxRGVidWcoKSA8PCAiPj4+Pj4+Pj4+ Pj4+PiB0aW1lb3V0IjsKICAgICAgICAgbm90aWZ5RG9uZSgpOwotICAgIH0gZWxzZSB7CisgICAg fSBlbHNlCiAgICAgICAgIFFPYmplY3Q6OnRpbWVyRXZlbnQoZXYpOwotICAgIH0KIH0KIAogUVN0 cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6ZW5jb2RlSG9zdE5hbWUoY29uc3QgUVN0cmluZyAm aG9zdCkKQEAgLTI4Niw3ICsyODYsNyBAQCBib29sIExheW91dFRlc3RDb250cm9sbGVyOjpwYXVz ZUFuaW1hdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJZChjb25zdCBRU3RyaW5nICZhbgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZG91YmxlIHRpbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZlbGVtZW50SWQpCiB7Ci0gICAgUVdl YkZyYW1lICpmcmFtZSA9IG1fZHJ0LT53ZWJQYWdlKCktPm1haW5GcmFtZSgpOworICAgIFFXZWJG cmFtZSogZnJhbWUgPSBtX2RydC0+d2ViUGFnZSgpLT5tYWluRnJhbWUoKTsKICAgICBRX0FTU0VS VChmcmFtZSk7CiAgICAgcmV0dXJuIHF0X2RydF9wYXVzZUFuaW1hdGlvbihmcmFtZSwgYW5pbWF0 aW9uTmFtZSwgdGltZSwgZWxlbWVudElkKTsKIH0KQEAgLTI5NSwxNCArMjk1LDE0IEBAIGJvb2wg TGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdXNlVHJhbnNpdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJ ZChjb25zdCBRU3RyaW5nICZwCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHRpbWUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUVN0 cmluZyAmZWxlbWVudElkKQogewotICAgIFFXZWJGcmFtZSAqZnJhbWUgPSBtX2RydC0+d2ViUGFn ZSgpLT5tYWluRnJhbWUoKTsKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gbV9kcnQtPndlYlBhZ2Uo KS0+bWFpbkZyYW1lKCk7CiAgICAgUV9BU1NFUlQoZnJhbWUpOwogICAgIHJldHVybiBxdF9kcnRf cGF1c2VUcmFuc2l0aW9uT2ZQcm9wZXJ0eShmcmFtZSwgcHJvcGVydHlOYW1lLCB0aW1lLCBlbGVt ZW50SWQpOwogfQogCiB1bnNpZ25lZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bnVtYmVyT2ZBY3Rp dmVBbmltYXRpb25zKCkgY29uc3QKIHsKLSAgICBRV2ViRnJhbWUgKmZyYW1lID0gbV9kcnQtPndl YlBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1fZHJ0LT53ZWJQ YWdlKCktPm1haW5GcmFtZSgpOwogICAgIFFfQVNTRVJUKGZyYW1lKTsKICAgICByZXR1cm4gcXRf ZHJ0X251bWJlck9mQWN0aXZlQW5pbWF0aW9ucyhmcmFtZSk7CiB9CkBAIC00NDAsOSArNDQwLDgg QEAgdm9pZCBFdmVudFNlbmRlcjo6a2V5RG93bihjb25zdCBRU3RyaW5nICZzdHJpbmcsIGNvbnN0 IFFTdHJpbmdMaXN0ICZtb2RpZmllcnMpCiAgICAgICAgICAgICBzID0gUVN0cmluZygpOwogICAg ICAgICAgICAgY29kZSA9IFF0OjpLZXlfSG9tZTsKICAgICAgICAgICAgIG1vZGlmcyA9IDA7Ci0g ICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgY29kZSA9IHN0cmlu Zy51bmljb2RlKCktPnRvVXBwZXIoKS51bmljb2RlKCk7Ci0gICAgICAgIH0KICAgICB9IGVsc2Ug ewogICAgICAgICBxRGVidWcoKSA8PCAiPj4+Pj4+Pj4+IGtleURvd24iIDw8IHN0cmluZzsKICAg ICAgICAgLy8gbWFwIHNwZWNpYWwga2V5Y29kZSBzdHJpbmdzIHVzZWQgYnkgdGhlIHRlc3RzIHRv IHNvbWV0aGluZyB0aGF0IHdvcmtzIGZvciBRdC9YMTEKQEAgLTQ3OSw5ICs0NzgsOSBAQCB2b2lk IEV2ZW50U2VuZGVyOjprZXlEb3duKGNvbnN0IFFTdHJpbmcgJnN0cmluZywgY29uc3QgUVN0cmlu Z0xpc3QgJm1vZGlmaWVycykKICAgICBRQXBwbGljYXRpb246OnNlbmRFdmVudChtX3BhZ2UsICZl dmVudCk7CiB9CiAKLVFXZWJGcmFtZSAqRXZlbnRTZW5kZXI6OmZyYW1lVW5kZXJNb3VzZSgpIGNv bnN0CitRV2ViRnJhbWUqIEV2ZW50U2VuZGVyOjpmcmFtZVVuZGVyTW91c2UoKSBjb25zdAogewot ICAgIFFXZWJGcmFtZSAqZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIFFXZWJGcmFt ZSogZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOwogCiByZWRvOgogICAgIFFMaXN0PFFXZWJG cmFtZSo+IGNoaWxkcmVuID0gZnJhbWUtPmNoaWxkRnJhbWVzKCk7CkBAIC01MDksODEgKzUwOCw4 MSBAQCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6OmRvQ29tbWFuZChjb25zdCBRU3RyaW5nICZj b21tYW5kKQogICAgIGlmIChjb21tYW5kID09ICJtb3ZlQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rp b246IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAg IGtleWNvZGUgPSBRdDo6S2V5X0xlZnQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZURv d246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlRG93bjoiKSB7CiAgICAgICAg IGtleWNvZGUgPSBRdDo6S2V5X0Rvd247Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZURv d25BbmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3Zl RG93bkFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hp ZnRNb2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfRG93bjsKLSAgICB9IGVsc2Ug aWYoY29tbWFuZCA9PSJtb3ZlRm9yd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09 Im1vdmVGb3J3YXJkOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAg fSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUZvcndhcmRBbmRNb2RpZnlTZWxlY3Rpb246Iikgewor ICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlRm9yd2FyZEFuZE1vZGlmeVNlbGVjdGlvbjoi KSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRNb2RpZmllcjsKICAgICAgICAga2V5 Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUxlZnQ6 IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlTGVmdDoiKSB7CiAgICAgICAgIGtl eWNvZGUgPSBRdDo6S2V5X0xlZnQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUxlZnRB bmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlTGVm dEFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRN b2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYo Y29tbWFuZCA9PSJtb3ZlUmlnaHQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3Zl UmlnaHQ6IikgewogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9SaWdodDsKLSAgICB9IGVsc2Ug aWYoY29tbWFuZCA9PSJtb3ZlUmlnaHRBbmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxz ZSBpZiAoY29tbWFuZCA9PSJtb3ZlUmlnaHRBbmRNb2RpZnlTZWxlY3Rpb246IikgewogICAgICAg ICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAgIGtleWNvZGUgPSBRdDo6 S2V5X1JpZ2h0OwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVUb0JlZ2lubmluZ09mRG9j dW1lbnQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlVG9CZWdpbm5pbmdPZkRv Y3VtZW50OiIpIHsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpDb250cm9sTW9kaWZpZXI7CiAg ICAgICAgIGtleWNvZGUgPSBRdDo6S2V5X0hvbWU7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0i bW92ZVRvQmVnaW5uaW5nT2ZMaW5lOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92 ZVRvQmVnaW5uaW5nT2ZMaW5lOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfSG9tZTsK LS8vICAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlVG9CZWdpbm5pbmdPZlBhcmFncmFwaDoi KSB7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZEb2N1bWVudDoiKSB7Cisv LyAgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVUb0JlZ2lubmluZ09mUGFyYWdyYXBoOiIp IHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZEb2N1bWVudDoiKSB7CiAg ICAgICAgIG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2Rl ID0gUXQ6OktleV9FbmQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZMaW5l OiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZMaW5lOiIpIHsKICAg ICAgICAga2V5Y29kZSA9IFF0OjpLZXlfRW5kOwotLy8gICAgIH0gZWxzZSBpZihjb21tYW5kID09 Im1vdmVUb0VuZE9mUGFyYWdyYXBoOiIpIHsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3Zl VXA6IikgeworLy8gICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlVG9FbmRPZlBhcmFncmFw aDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVVcDoiKSB7CiAgICAgICAgIGtl eWNvZGUgPSBRdDo6S2V5X1VwOwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVVcEFuZE1v ZGlmeVNlbGVjdGlvbjoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVVcEFuZE1v ZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRNb2RpZmll cjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfVXA7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQg PT0ibW92ZVdvcmRCYWNrd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVX b3JkQmFja3dhcmQ6IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmll cjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfVXA7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQg PT0ibW92ZVdvcmRCYWNrd2FyZEFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CisgICAgfSBlbHNlIGlm IChjb21tYW5kID09Im1vdmVXb3JkQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rpb246IikgewogICAg ICAgICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAgIG1vZGlmaWVycyB8 PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9MZWZ0Owot ICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVXb3JkRm9yd2FyZDoiKSB7CisgICAgfSBlbHNl IGlmIChjb21tYW5kID09Im1vdmVXb3JkRm9yd2FyZDoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8 PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9SaWdodDsK LSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZEZvcndhcmRBbmRNb2RpZnlTZWxlY3Rp b246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZEZvcndhcmRBbmRNb2Rp ZnlTZWxlY3Rpb246IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmll cjsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpTaGlmdE1vZGlmaWVyOwogICAgICAgICBrZXlj b2RlID0gUXQ6OktleV9SaWdodDsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZExl ZnQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZExlZnQ6IikgewogICAg ICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9 IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZFJpZ2h0OiIp IHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVdvcmRSaWdodDoiKSB7CiAgICAgICAg IG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6 OktleV9MZWZ0OwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVXb3JkUmlnaHRBbmRNb2Rp ZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZFJpZ2h0 QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpTaGlmdE1v ZGlmaWVyOwogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmllcjsKICAgICAg ICAga2V5Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92 ZVdvcmRMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQg PT0ibW92ZVdvcmRMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKICAgICAgICAgbW9kaWZpZXJz IHw9IFF0OjpTaGlmdE1vZGlmaWVyOwogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xN b2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYo Y29tbWFuZCA9PSJwYWdlRG93bjoiKSB7Ci0gICAgICAgIGtleWNvZGUgPSBRdDo6S2V5X1BhZ2VE b3duOyAgICAgICAgCi0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0icGFnZVVwOiIpIHsKLSAgICAg ICAga2V5Y29kZSA9IFF0OjpLZXlfUGFnZVVwOyAgICAgICAgCi0gICAgfSBlbHNlIGlmKGNvbW1h bmQgPT0gImRlbGV0ZVdvcmRCYWNrd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09 InBhZ2VEb3duOiIpIHsKKyAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfUGFnZURvd247CisgICAg fSBlbHNlIGlmIChjb21tYW5kID09InBhZ2VVcDoiKSB7CisgICAgICAgIGtleWNvZGUgPSBRdDo6 S2V5X1BhZ2VVcDsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0gImRlbGV0ZVdvcmRCYWNrd2Fy ZDoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAg ICBrZXljb2RlID0gUXQ6OktleV9CYWNrc3BhY2U7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0g ImRlbGV0ZUJhY2t3YXJkOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0gImRlbGV0ZUJh Y2t3YXJkOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfQmFja3NwYWNlOwotICAgIH0g ZWxzZSBpZihjb21tYW5kID09ICJkZWxldGVGb3J3YXJkOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNv bW1hbmQgPT0gImRlbGV0ZUZvcndhcmQ6IikgewogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9E ZWxldGU7CiAgICAgfQogICAgIFFLZXlFdmVudCBldmVudChRRXZlbnQ6OktleVByZXNzLCBrZXlj b2RlLCBtb2RpZmllcnMpOwotLSAKMS42LjQuMTguZzA3YTRhCgo= 34562 2009-08-11 08:49:49 -0700 2009-08-11 18:06:04 -0700 Revised code change wrapping strings with QLatin1String() 0001-Code-change-for-DumpRenderTree-keyDown-update.patch text/plain 2986 mifenton RnJvbSBkMzRlMDQ3NmMzZDY4ZGUxZDFkNGUwZjAwMGM5ODM3MWVlZmQ2OTVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlrZS5mZW50b25AdG9yY2htb2JpbGUu Y29tPgpEYXRlOiBUdWUsIDExIEF1ZyAyMDA5IDExOjQyOjEzIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gQ29kZSBjaGFuZ2UgZm9yIER1bXBSZW5kZXJUcmVlIGtleURvd24gdXBkYXRlLgoKLS0tCiBX ZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysrKysr KysrKysrKwogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcCB8ICAg MzEgKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDQ3IGluc2Vy dGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDI3NzQ2YjkuLmQzODViOTMgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOSBAQAorMjAwOS0wOC0xMCAgTWlrZSBGZW50b24gIDxtaWtlLmZlbnRvbkB0 b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIHByb2Nlc3NpbmcgZm9yIHN0cmluZyBjb25zdGFudHMgdXNlZCBieSB0aGUg dGVzdHMgdG8gdHJpZ2dlcgorICAgICAgICBjb21tb24gYWN0aW9ucyBsaWtlIHVwLCBkb3duLCBs ZWZ0LCByaWdodCwgZXRjLiBmb3IgdGhlIFF0CisgICAgICAgIGltcGxlbWVudGF0aW9uIG9mIER1 bXBSZW5kZXJUcmVlLgorCisgICAgICAgIE5vdGUgdGhpcyBhbGxvd3MgZmFzdC9mb3Jtcy90ZXh0 YXJlYS1hcnJvdy1uYXZpZ2F0aW9uLmh0bWwgdG8gcGFzcworICAgICAgICBjb3JyZWN0bHkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MTYxCisK KyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwOgorICAgICAgICAoRXZl bnRTZW5kZXI6OmtleURvd24pOgorCiAyMDA5LTA4LTA4ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwIGIvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcAppbmRleCA3ZTVlMTY4Li4zZDA3M2Qy IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3Bw CisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L2pzb2JqZWN0cy5jcHAKQEAgLTQ0 Myw2ICs0NDMsMzcgQEAgdm9pZCBFdmVudFNlbmRlcjo6a2V5RG93bihjb25zdCBRU3RyaW5nICZz dHJpbmcsIGNvbnN0IFFTdHJpbmdMaXN0ICZtb2RpZmllcnMpCiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICBjb2RlID0gc3RyaW5nLnVuaWNvZGUoKS0+dG9VcHBlcigpLnVuaWNvZGUoKTsK ICAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIHFEZWJ1ZygpIDw8ICI+Pj4+Pj4+Pj4g a2V5RG93biIgPDwgc3RyaW5nOworICAgICAgICAvLyBtYXAgc3BlY2lhbCBrZXljb2RlIHN0cmlu Z3MgdXNlZCBieSB0aGUgdGVzdHMgdG8gc29tZXRoaW5nIHRoYXQgd29ya3MgZm9yIFF0L1gxMQor ICAgICAgICBpZiAoc3RyaW5nID09IFFMYXRpbjFTdHJpbmcoImxlZnRBcnJvdyIpKSB7CisgICAg ICAgICAgICBzID0gUVN0cmluZygpOworICAgICAgICAgICAgY29kZSA9IFF0OjpLZXlfTGVmdDsK KyAgICAgICAgfSBlbHNlIGlmIChzdHJpbmcgPT0gUUxhdGluMVN0cmluZygicmlnaHRBcnJvdyIp KSB7CisgICAgICAgICAgICBzID0gUVN0cmluZygpOworICAgICAgICAgICAgY29kZSA9IFF0OjpL ZXlfUmlnaHQ7CisgICAgICAgIH0gZWxzZSBpZiAoc3RyaW5nID09IFFMYXRpbjFTdHJpbmcoInVw QXJyb3ciKSkgeworICAgICAgICAgICAgcyA9IFFTdHJpbmcoKTsKKyAgICAgICAgICAgIGNvZGUg PSBRdDo6S2V5X1VwOworICAgICAgICB9IGVsc2UgaWYgKHN0cmluZyA9PSBRTGF0aW4xU3RyaW5n KCJkb3duQXJyb3ciKSkgeworICAgICAgICAgICAgcyA9IFFTdHJpbmcoKTsKKyAgICAgICAgICAg IGNvZGUgPSBRdDo6S2V5X0Rvd247CisgICAgICAgIH0gZWxzZSBpZiAoc3RyaW5nID09IFFMYXRp bjFTdHJpbmcoInBhZ2VVcCIpKSB7CisgICAgICAgICAgICBzID0gUVN0cmluZygpOworICAgICAg ICAgICAgY29kZSA9IFF0OjpLZXlfUGFnZVVwOworICAgICAgICB9IGVsc2UgaWYgKHN0cmluZyA9 PSBRTGF0aW4xU3RyaW5nKCJwYWdlRG93biIpKSB7CisgICAgICAgICAgICBzID0gUVN0cmluZygp OworICAgICAgICAgICAgY29kZSA9IFF0OjpLZXlfUGFnZURvd247CisgICAgICAgIH0gZWxzZSBp ZiAoc3RyaW5nID09IFFMYXRpbjFTdHJpbmcoImhvbWUiKSkgeworICAgICAgICAgICAgcyA9IFFT dHJpbmcoKTsKKyAgICAgICAgICAgIGNvZGUgPSBRdDo6S2V5X0hvbWU7CisgICAgICAgIH0gZWxz ZSBpZiAoc3RyaW5nID09IFFMYXRpbjFTdHJpbmcoImVuZCIpKSB7CisgICAgICAgICAgICBzID0g UVN0cmluZygpOworICAgICAgICAgICAgY29kZSA9IFF0OjpLZXlfRW5kOworICAgICAgICB9IGVs c2UgaWYgKHN0cmluZyA9PSBRTGF0aW4xU3RyaW5nKCJkZWxldGUiKSkgeworICAgICAgICAgICAg cyA9IFFTdHJpbmcoKTsKKyAgICAgICAgICAgIGNvZGUgPSBRdDo6S2V5X0RlbGV0ZTsKKyAgICAg ICAgfQogICAgIH0KICAgICBRS2V5RXZlbnQgZXZlbnQoUUV2ZW50OjpLZXlQcmVzcywgY29kZSwg bW9kaWZzLCBzKTsKICAgICBRQXBwbGljYXRpb246OnNlbmRFdmVudChtX3BhZ2UsICZldmVudCk7 Ci0tIAoxLjYuNC4xOC5nMDdhNGEKCg== 34577 2009-08-11 10:29:10 -0700 2009-08-12 05:44:54 -0700 Remove working tests from qt/Skipped associated with DRT update. 0001-Remove-working-tests-from-qt-Skipped-as-a-result-of-.patch text/plain 3486 mifenton RnJvbSAyNDZhZDliNDg4MTMxOWFiZDM0N2RiNDY1YmU4N2ExYjU4MDllY2QzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlrZS5mZW50b25AdG9yY2htb2JpbGUu Y29tPgpEYXRlOiBUdWUsIDExIEF1ZyAyMDA5IDExOjUxOjQ0IC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gUmVtb3ZlIHdvcmtpbmcgdGVzdHMgZnJvbSBxdC9Ta2lwcGVkIGFzIGEgcmVzdWx0IG9mIERS VCBVcGRhdGUuCgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgfCAgIDExICsr KysrKysrKysrCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIHwgICAgNyAtLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDYwMmJlN2EuLjJhYjI2MjQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wOC0xMSAg TWlrZSBGZW50b24gIDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRlc3RzIGZyb20gU2tp cHBlZCB0aGF0IG5vdyBwYXNzIGNvcnJlY3RseSBhZnRlciB0aGUgYWRkaXRpb24KKyAgICAgICAg b2Yga2V5RG93biBuYW1lZCBldmVudCBoYW5kbGluZyB0byBRdCdzIER1bXBSZW5kZXJUcmVlLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODE2MQor CisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoKKwogMjAwOS0wOC0xMCAgUmVuYXRhIEhv ZG92YW4gIDxob2RvdmFuLnJlbmF0YUBzdHVkLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v cXQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKaW5kZXggNzExZDcw Ni4uNjI5ZGQ4ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCkBAIC03MSw3ICs3MSw2IEBAIGVk aXRpbmcvc2VsZWN0aW9uL2Zha2UtZG91YmxlY2xpY2suaHRtbAogZWRpdGluZy9zZWxlY3Rpb24v ZmFrZS1kcmFnLmh0bWwKIGVkaXRpbmcvc2VsZWN0aW9uL2lubGluZS1jbG9zZXN0LWxlYWYtY2hp bGQuaHRtbAogZWRpdGluZy9zZWxlY3Rpb24vbWl4ZWQtZWRpdGFiaWxpdHktMS5odG1sCi1lZGl0 aW5nL3NlbGVjdGlvbi9tb3ZlLWJlZ2luLWVuZC5odG1sCiBlZGl0aW5nL3NlbGVjdGlvbi9wYXJh Z3JhcGgtZ3JhbnVsYXJpdHkuaHRtbAogZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0LWZyb20tdGV4 dGZpZWxkLW91dHdhcmRzLmh0bWwKIGVkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1hY3Rpb25z Lmh0bWwKQEAgLTE2NSw3ICsxNjQsNiBAQCBmYXN0L2VuY29kaW5nL0dCSy9pc28taXItNTguaHRt bAogZmFzdC9lbmNvZGluZy9HQksveC1ldWMtY24uaHRtbAogZmFzdC9lbmNvZGluZy9HQksveC1n YmsuaHRtbAogZmFzdC9ldmVudHMvNTA1NjYxOS5odG1sCi1mYXN0L2V2ZW50cy9hcnJvdy1uYXZp Z2F0aW9uLmh0bWwKIGZhc3QvZXZlbnRzL2F1dG9zY3JvbGwuaHRtbAogZmFzdC9ldmVudHMvY2xp Y2stY291bnQuaHRtbAogZmFzdC9ldmVudHMvY29udGVudC1jaGFuZ2VkLWR1cmluZy1kcm9wLmh0 bWwKQEAgLTIwMiw3ICsyMDAsNiBAQCBmYXN0L2Zvcm1zL29uY2hhbmdlLWVudGVyLXN1Ym1pdC5o dG1sCiBmYXN0L2Zvcm1zL29uc2VsZWN0LXRleHRhcmVhLmh0bWwKIGZhc3QvZm9ybXMvb25zZWxl Y3QtdGV4dGZpZWxkLmh0bWwKIGZhc3QvZm9ybXMvcGFzc3dvcmQtZG91YmxlY2xpY2stc2VsZWN0 aW9uLmh0bWwKLWZhc3QvZm9ybXMvc2VhcmNoLWV2ZW50LWRlbGF5Lmh0bWwKIGZhc3QvZm9ybXMv c2VhcmNoLXJ0bC5odG1sCiBmYXN0L2Zvcm1zL3NlbGVjdC1hY2Nlc3NrZXkuaHRtbAogZmFzdC9m b3Jtcy9zZWxlY3Qtd3JpdGluZy1kaXJlY3Rpb24tbmF0dXJhbC5odG1sCkBAIC04OTUsNyArODky LDYgQEAgY3NzMi4xL3QwNDAzMDYtc3ludGF4LTAxLWYuaHRtbAogZWRpdGluZy9kZWxldGluZy81 MTQ0MTM5LTIuaHRtbAogZWRpdGluZy9kZWxldGluZy81MzAwMzc5Lmh0bWwKIGVkaXRpbmcvZGVs ZXRpbmcvNTQwODI1NS5odG1sCi1lZGl0aW5nL2RlbGV0aW5nLzU3Mjk2ODAuaHRtbAogZWRpdGlu Zy9kZWxldGluZy9kZWxldGUtYmxvY2stbWVyZ2UtY29udGVudHMtMDAxLmh0bWwKIGVkaXRpbmcv ZGVsZXRpbmcvZGVsZXRlLWJsb2NrLW1lcmdlLWNvbnRlbnRzLTAxOS5odG1sCiBlZGl0aW5nL2Rl bGV0aW5nL2RlbGV0ZS1ibG9jay1tZXJnZS1jb250ZW50cy0wMjAuaHRtbApAQCAtOTEwLDcgKzkw Niw2IEBAIGVkaXRpbmcvZGVsZXRpbmcvc21hcnQtZGVsZXRlLTAwMy5odG1sCiBlZGl0aW5nL2Rl bGV0aW5nL3NtYXJ0LWRlbGV0ZS0wMDQuaHRtbAogZWRpdGluZy9leGVjQ29tbWFuZC80OTIwNDg4 Lmh0bWwKIGVkaXRpbmcvZXhlY0NvbW1hbmQvNDkyMDc0Mi0xLmh0bWwKLWVkaXRpbmcvZXhlY0Nv bW1hbmQvYm9sZFNlbGVjdGlvbi5odG1sCiBlZGl0aW5nL2V4ZWNDb21tYW5kL2NyZWF0ZS1saXN0 LXdpdGgtaHIuaHRtbAogZWRpdGluZy9leGVjQ29tbWFuZC9tb2RpZnlGb3JlQ29sb3JCeUNoYXJh Y3Rlci5odG1sCiBlZGl0aW5nL2V4ZWNDb21tYW5kL3ByaW50Lmh0bWwKQEAgLTIxMzgsNyArMjEz Myw2IEBAIGVkaXRpbmcvc2VsZWN0aW9uLzUxMzE3MTYtMS5odG1sCiBlZGl0aW5nL3NlbGVjdGlv bi81MTMxNzE2LTIuaHRtbAogZWRpdGluZy9zZWxlY3Rpb24vNTEzMTcxNi0zLmh0bWwKIGVkaXRp bmcvc2VsZWN0aW9uLzUxMzE3MTYtNC5odG1sCi1lZGl0aW5nL3NlbGVjdGlvbi81MjEzOTYzLmh0 bWwKIGVkaXRpbmcvc2VsZWN0aW9uLzUyMzQzODMtMS5odG1sCiBlZGl0aW5nL3NlbGVjdGlvbi81 MjM0MzgzLTIuaHRtbAogZWRpdGluZy9zZWxlY3Rpb24vNTI0MDI2NS5odG1sCkBAIC01MDM5LDcg KzUwMzMsNiBAQCBmYXN0L2V2ZW50cy9zdG9wUHJvcGFnYXRpb24tc3VibWl0Lmh0bWwKIGZhc3Qv ZXZlbnRzL3RhYmluZGV4LWZvY3VzLWJsdXItYWxsLmh0bWwKIGZhc3QvZm9ybXMvb3B0aW9uLW1v dXNlZXZlbnRzLmh0bWwKIGZhc3QvZm9ybXMvc2VhcmNoLWFicy1wb3MtY2FuY2VsLWJ1dHRvbi5o dG1sCi1mYXN0L2Zvcm1zL3NlbGVjdC1jYWNoZS1kZXN5bmNocm9uaXphdGlvbi5odG1sCiBmYXN0 L2Zvcm1zL3NsaWRlci10cmFuc2Zvcm1lZC5odG1sCiBmYXN0L2Zvcm1zL3NsaWRlci16b29tZWQu aHRtbAogZmFzdC9mb3Jtcy9zdWJtaXQtdG8tdXJsLWZyYWdtZW50Lmh0bWwKLS0gCjEuNi40LjE4 LmcwN2E0YQoK 34667 2009-08-12 09:47:06 -0700 2009-08-17 06:47:59 -0700 Replacement patch with proper ChangeLog Entry 0001-Style-changes-for-jsobjects.cpp.patch text/plain 11267 mifenton RnJvbSAyZDU5YWUyZGMyOGRhMjgzZmQyZjJkYjE2NzMyOGMwYzliMzU3ZDk2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlrZS5mZW50b25AdG9yY2htb2JpbGUu Y29tPgpEYXRlOiBNb24sIDEwIEF1ZyAyMDA5IDE1OjQ5OjAwIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gU3R5bGUgY2hhbmdlcyBmb3IganNvYmplY3RzLmNwcC4KCi0tLQogV2ViS2l0VG9vbHMvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjEgKysrKysrCiBXZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwIHwgIDEwMyArKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNzIgaW5zZXJ0aW9ucygrKSwgNTIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IGQzODViOTMuLjViMDdhYTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyNyBAQAogCiAg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisyMDA5LTA4LTEwICBNaWtlIEZl bnRvbiAgPG1pa2UuZmVudG9uQHRvcmNobW9iaWxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdHlsZSBmaXhlcyBmb3IgRHVtcFJlbmRlclRy ZWUvcXQvanNvYmplY3RzLmNwcCBiYXNlZCBvbiBjcHBfc3R5bGUucHkgYW5kCisgICAgICAgIFdl YktpdCBzdHlsZSBndWlkZS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjgxNjEKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L2pzb2JqZWN0 cy5jcHA6CisgICAgICAgIChmaW5kRnJhbWVOYW1lZCk6CisgICAgICAgIChMb2FkSXRlbTo6aW52 b2tlKToKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpwcm92aXNpb25hbExvYWQpOgor ICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnRpbWVyRXZlbnQpOgorICAgICAgICAoTGF5 b3V0VGVzdENvbnRyb2xsZXI6OnBhdXNlQW5pbWF0aW9uQXRUaW1lT25FbGVtZW50V2l0aElkKToK KyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpwYXVzZVRyYW5zaXRpb25BdFRpbWVPbkVs ZW1lbnRXaXRoSWQpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6Om51bWJlck9mQWN0 aXZlQW5pbWF0aW9ucyk6CisgICAgICAgIChFdmVudFNlbmRlcjo6a2V5RG93bik6CisgICAgICAg IChFdmVudFNlbmRlcjo6ZnJhbWVVbmRlck1vdXNlKToKKyAgICAgICAgKFRleHRJbnB1dENvbnRy b2xsZXI6OmRvQ29tbWFuZCk6CisKICAgICAgICAgQWRkIHByb2Nlc3NpbmcgZm9yIHN0cmluZyBj b25zdGFudHMgdXNlZCBieSB0aGUgdGVzdHMgdG8gdHJpZ2dlcgogICAgICAgICBjb21tb24gYWN0 aW9ucyBsaWtlIHVwLCBkb3duLCBsZWZ0LCByaWdodCwgZXRjLiBmb3IgdGhlIFF0CiAgICAgICAg IGltcGxlbWVudGF0aW9uIG9mIER1bXBSZW5kZXJUcmVlLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL3F0L2pzb2JqZWN0cy5jcHAKaW5kZXggNDk4YzI4OC4uODU5ODU0NyAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvanNvYmplY3RzLmNwcAorKysgYi9XZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9qc29iamVjdHMuY3BwCkBAIC0yNywxOSArMjcsMjAg QEAKICAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KICNpbmNsdWRlIDxqc29iamVjdHMuaD4KLSNpbmNsdWRlIDxx d2VicGFnZS5oPgotI2luY2x1ZGUgPHF3ZWJoaXN0b3J5Lmg+Ci0jaW5jbHVkZSA8cXdlYmZyYW1l Lmg+Ci0jaW5jbHVkZSA8cXdlYnNlY3VyaXR5b3JpZ2luLmg+Ci0jaW5jbHVkZSA8cXdlYmRhdGFi YXNlLmg+Ci0jaW5jbHVkZSA8cWV2ZW50Lmg+CisKKyNpbmNsdWRlICJEdW1wUmVuZGVyVHJlZS5o IgorI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgorI2luY2x1ZGUgIldvcmtRdWV1ZUl0ZW0uaCIKKwog I2luY2x1ZGUgPHFhcHBsaWNhdGlvbi5oPgogI2luY2x1ZGUgPHFldmVudC5oPgogI2luY2x1ZGUg PHF0aW1lci5oPgorI2luY2x1ZGUgPHF3ZWJkYXRhYmFzZS5oPgorI2luY2x1ZGUgPHF3ZWJmcmFt ZS5oPgorI2luY2x1ZGUgPHF3ZWJoaXN0b3J5Lmg+CisjaW5jbHVkZSA8cXdlYnBhZ2UuaD4KKyNp bmNsdWRlIDxxd2Vic2VjdXJpdHlvcmlnaW4uaD4KIAotI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVl LmgiCi0jaW5jbHVkZSAiV29ya1F1ZXVlSXRlbS5oIgotI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgog ZXh0ZXJuIHZvaWQgcXRfZHVtcF9lZGl0aW5nX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZv aWQgcXRfZHVtcF9yZXNvdXJjZV9sb2FkX2NhbGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZvaWQg cXRfZHJ0X3NldEphdmFTY3JpcHRQcm9maWxpbmdFbmFibGVkKFFXZWJGcmFtZSosIGJvb2wgZW5h YmxlZCk7CkBAIC00Nyw3ICs0OCw3IEBAIGV4dGVybiBib29sIHF0X2RydF9wYXVzZUFuaW1hdGlv bihRV2ViRnJhbWUqLCBjb25zdCBRU3RyaW5nICZuYW1lLCBkb3VibGUgdGltZSwKIGV4dGVybiBi b29sIHF0X2RydF9wYXVzZVRyYW5zaXRpb25PZlByb3BlcnR5KFFXZWJGcmFtZSosIGNvbnN0IFFT dHJpbmcgJm5hbWUsIGRvdWJsZSB0aW1lLCBjb25zdCBRU3RyaW5nICZlbGVtZW50SWQpOwogZXh0 ZXJuIGludCBxdF9kcnRfbnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKFFXZWJGcmFtZSopOwogCi1R V2ViRnJhbWUgKmZpbmRGcmFtZU5hbWVkKGNvbnN0IFFTdHJpbmcgJmZyYW1lTmFtZSwgUVdlYkZy YW1lICpmcmFtZSkKK1FXZWJGcmFtZSogZmluZEZyYW1lTmFtZWQoY29uc3QgUVN0cmluZyAmZnJh bWVOYW1lLCBRV2ViRnJhbWUqIGZyYW1lKQogewogICAgIGlmIChmcmFtZS0+ZnJhbWVOYW1lKCkg PT0gZnJhbWVOYW1lKQogICAgICAgICByZXR1cm4gZnJhbWU7CkBAIC02NCw3ICs2NSw3IEBAIGJv b2wgTG9hZEl0ZW06Omludm9rZSgpIGNvbnN0CiAgICAgLy9xRGVidWcoKSA8PCAiPj4+TG9hZEl0 ZW06Omludm9rZSI7CiAgICAgUV9BU1NFUlQobV93ZWJQYWdlKTsKIAotICAgIFFXZWJGcmFtZSAq ZnJhbWUgPSAwOworICAgIFFXZWJGcmFtZSogZnJhbWUgPSAwOwogICAgIGNvbnN0IFFTdHJpbmcg dCA9IHRhcmdldCgpOwogICAgIGlmICh0LmlzRW1wdHkoKSkKICAgICAgICAgZnJhbWUgPSBtX3dl YlBhZ2UtPm1haW5GcmFtZSgpOwpAQCAtMjM3LDcgKzIzOCw3IEBAIHZvaWQgTGF5b3V0VGVzdENv bnRyb2xsZXI6OnF1ZXVlU2NyaXB0KGNvbnN0IFFTdHJpbmcgJnVybCkKIAogdm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6cHJvdmlzaW9uYWxMb2FkKCkKIHsKLSAgICBRV2ViRnJhbWUgKmZyYW1l ID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KHNlbmRlcigpKTsKKyAgICBRV2ViRnJhbWUqIGZy YW1lID0gcW9iamVjdF9jYXN0PFFXZWJGcmFtZSo+KHNlbmRlcigpKTsKICAgICBpZiAoIW1fdG9w TG9hZGluZ0ZyYW1lICYmIG1faXNMb2FkaW5nKQogICAgICAgICBtX3RvcExvYWRpbmdGcmFtZSA9 IGZyYW1lOwogfQpAQCAtMjQ3LDkgKzI0OCw4IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6 OnRpbWVyRXZlbnQoUVRpbWVyRXZlbnQgKmV2KQogICAgIGlmIChldi0+dGltZXJJZCgpID09IG1f dGltZW91dFRpbWVyLnRpbWVySWQoKSkgewogICAgICAgICBxRGVidWcoKSA8PCAiPj4+Pj4+Pj4+ Pj4+PiB0aW1lb3V0IjsKICAgICAgICAgbm90aWZ5RG9uZSgpOwotICAgIH0gZWxzZSB7CisgICAg fSBlbHNlCiAgICAgICAgIFFPYmplY3Q6OnRpbWVyRXZlbnQoZXYpOwotICAgIH0KIH0KIAogUVN0 cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6ZW5jb2RlSG9zdE5hbWUoY29uc3QgUVN0cmluZyAm aG9zdCkKQEAgLTI4Niw3ICsyODYsNyBAQCBib29sIExheW91dFRlc3RDb250cm9sbGVyOjpwYXVz ZUFuaW1hdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJZChjb25zdCBRU3RyaW5nICZhbgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZG91YmxlIHRpbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZlbGVtZW50SWQpCiB7Ci0gICAgUVdl YkZyYW1lICpmcmFtZSA9IG1fZHJ0LT53ZWJQYWdlKCktPm1haW5GcmFtZSgpOworICAgIFFXZWJG cmFtZSogZnJhbWUgPSBtX2RydC0+d2ViUGFnZSgpLT5tYWluRnJhbWUoKTsKICAgICBRX0FTU0VS VChmcmFtZSk7CiAgICAgcmV0dXJuIHF0X2RydF9wYXVzZUFuaW1hdGlvbihmcmFtZSwgYW5pbWF0 aW9uTmFtZSwgdGltZSwgZWxlbWVudElkKTsKIH0KQEAgLTI5NSwxNCArMjk1LDE0IEBAIGJvb2wg TGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdXNlVHJhbnNpdGlvbkF0VGltZU9uRWxlbWVudFdpdGhJ ZChjb25zdCBRU3RyaW5nICZwCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIHRpbWUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUVN0 cmluZyAmZWxlbWVudElkKQogewotICAgIFFXZWJGcmFtZSAqZnJhbWUgPSBtX2RydC0+d2ViUGFn ZSgpLT5tYWluRnJhbWUoKTsKKyAgICBRV2ViRnJhbWUqIGZyYW1lID0gbV9kcnQtPndlYlBhZ2Uo KS0+bWFpbkZyYW1lKCk7CiAgICAgUV9BU1NFUlQoZnJhbWUpOwogICAgIHJldHVybiBxdF9kcnRf cGF1c2VUcmFuc2l0aW9uT2ZQcm9wZXJ0eShmcmFtZSwgcHJvcGVydHlOYW1lLCB0aW1lLCBlbGVt ZW50SWQpOwogfQogCiB1bnNpZ25lZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bnVtYmVyT2ZBY3Rp dmVBbmltYXRpb25zKCkgY29uc3QKIHsKLSAgICBRV2ViRnJhbWUgKmZyYW1lID0gbV9kcnQtPndl YlBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgUVdlYkZyYW1lKiBmcmFtZSA9IG1fZHJ0LT53ZWJQ YWdlKCktPm1haW5GcmFtZSgpOwogICAgIFFfQVNTRVJUKGZyYW1lKTsKICAgICByZXR1cm4gcXRf ZHJ0X251bWJlck9mQWN0aXZlQW5pbWF0aW9ucyhmcmFtZSk7CiB9CkBAIC00NDAsOSArNDQwLDgg QEAgdm9pZCBFdmVudFNlbmRlcjo6a2V5RG93bihjb25zdCBRU3RyaW5nICZzdHJpbmcsIGNvbnN0 IFFTdHJpbmdMaXN0ICZtb2RpZmllcnMpCiAgICAgICAgICAgICBzID0gUVN0cmluZygpOwogICAg ICAgICAgICAgY29kZSA9IFF0OjpLZXlfSG9tZTsKICAgICAgICAgICAgIG1vZGlmcyA9IDA7Ci0g ICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgY29kZSA9IHN0cmlu Zy51bmljb2RlKCktPnRvVXBwZXIoKS51bmljb2RlKCk7Ci0gICAgICAgIH0KICAgICB9IGVsc2Ug ewogICAgICAgICBxRGVidWcoKSA8PCAiPj4+Pj4+Pj4+IGtleURvd24iIDw8IHN0cmluZzsKICAg ICAgICAgLy8gbWFwIHNwZWNpYWwga2V5Y29kZSBzdHJpbmdzIHVzZWQgYnkgdGhlIHRlc3RzIHRv IHNvbWV0aGluZyB0aGF0IHdvcmtzIGZvciBRdC9YMTEKQEAgLTQ3OSw5ICs0NzgsOSBAQCB2b2lk IEV2ZW50U2VuZGVyOjprZXlEb3duKGNvbnN0IFFTdHJpbmcgJnN0cmluZywgY29uc3QgUVN0cmlu Z0xpc3QgJm1vZGlmaWVycykKICAgICBRQXBwbGljYXRpb246OnNlbmRFdmVudChtX3BhZ2UsICZl dmVudCk7CiB9CiAKLVFXZWJGcmFtZSAqRXZlbnRTZW5kZXI6OmZyYW1lVW5kZXJNb3VzZSgpIGNv bnN0CitRV2ViRnJhbWUqIEV2ZW50U2VuZGVyOjpmcmFtZVVuZGVyTW91c2UoKSBjb25zdAogewot ICAgIFFXZWJGcmFtZSAqZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIFFXZWJGcmFt ZSogZnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOwogCiByZWRvOgogICAgIFFMaXN0PFFXZWJG cmFtZSo+IGNoaWxkcmVuID0gZnJhbWUtPmNoaWxkRnJhbWVzKCk7CkBAIC01MDksODEgKzUwOCw4 MSBAQCB2b2lkIFRleHRJbnB1dENvbnRyb2xsZXI6OmRvQ29tbWFuZChjb25zdCBRU3RyaW5nICZj b21tYW5kKQogICAgIGlmIChjb21tYW5kID09ICJtb3ZlQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rp b246IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAg IGtleWNvZGUgPSBRdDo6S2V5X0xlZnQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZURv d246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlRG93bjoiKSB7CiAgICAgICAg IGtleWNvZGUgPSBRdDo6S2V5X0Rvd247Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZURv d25BbmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3Zl RG93bkFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hp ZnRNb2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfRG93bjsKLSAgICB9IGVsc2Ug aWYoY29tbWFuZCA9PSJtb3ZlRm9yd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09 Im1vdmVGb3J3YXJkOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAg fSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUZvcndhcmRBbmRNb2RpZnlTZWxlY3Rpb246Iikgewor ICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlRm9yd2FyZEFuZE1vZGlmeVNlbGVjdGlvbjoi KSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRNb2RpZmllcjsKICAgICAgICAga2V5 Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUxlZnQ6 IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlTGVmdDoiKSB7CiAgICAgICAgIGtl eWNvZGUgPSBRdDo6S2V5X0xlZnQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZUxlZnRB bmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlTGVm dEFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRN b2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYo Y29tbWFuZCA9PSJtb3ZlUmlnaHQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3Zl UmlnaHQ6IikgewogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9SaWdodDsKLSAgICB9IGVsc2Ug aWYoY29tbWFuZCA9PSJtb3ZlUmlnaHRBbmRNb2RpZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxz ZSBpZiAoY29tbWFuZCA9PSJtb3ZlUmlnaHRBbmRNb2RpZnlTZWxlY3Rpb246IikgewogICAgICAg ICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAgIGtleWNvZGUgPSBRdDo6 S2V5X1JpZ2h0OwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVUb0JlZ2lubmluZ09mRG9j dW1lbnQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlVG9CZWdpbm5pbmdPZkRv Y3VtZW50OiIpIHsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpDb250cm9sTW9kaWZpZXI7CiAg ICAgICAgIGtleWNvZGUgPSBRdDo6S2V5X0hvbWU7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0i bW92ZVRvQmVnaW5uaW5nT2ZMaW5lOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92 ZVRvQmVnaW5uaW5nT2ZMaW5lOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfSG9tZTsK LS8vICAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlVG9CZWdpbm5pbmdPZlBhcmFncmFwaDoi KSB7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZEb2N1bWVudDoiKSB7Cisv LyAgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVUb0JlZ2lubmluZ09mUGFyYWdyYXBoOiIp IHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZEb2N1bWVudDoiKSB7CiAg ICAgICAgIG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2Rl ID0gUXQ6OktleV9FbmQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZMaW5l OiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVRvRW5kT2ZMaW5lOiIpIHsKICAg ICAgICAga2V5Y29kZSA9IFF0OjpLZXlfRW5kOwotLy8gICAgIH0gZWxzZSBpZihjb21tYW5kID09 Im1vdmVUb0VuZE9mUGFyYWdyYXBoOiIpIHsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3Zl VXA6IikgeworLy8gICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlVG9FbmRPZlBhcmFncmFw aDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVVcDoiKSB7CiAgICAgICAgIGtl eWNvZGUgPSBRdDo6S2V5X1VwOwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVVcEFuZE1v ZGlmeVNlbGVjdGlvbjoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVVcEFuZE1v ZGlmeVNlbGVjdGlvbjoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6U2hpZnRNb2RpZmll cjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfVXA7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQg PT0ibW92ZVdvcmRCYWNrd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09Im1vdmVX b3JkQmFja3dhcmQ6IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmll cjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfVXA7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQg PT0ibW92ZVdvcmRCYWNrd2FyZEFuZE1vZGlmeVNlbGVjdGlvbjoiKSB7CisgICAgfSBlbHNlIGlm IChjb21tYW5kID09Im1vdmVXb3JkQmFja3dhcmRBbmRNb2RpZnlTZWxlY3Rpb246IikgewogICAg ICAgICBtb2RpZmllcnMgfD0gUXQ6OlNoaWZ0TW9kaWZpZXI7CiAgICAgICAgIG1vZGlmaWVycyB8 PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9MZWZ0Owot ICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVXb3JkRm9yd2FyZDoiKSB7CisgICAgfSBlbHNl IGlmIChjb21tYW5kID09Im1vdmVXb3JkRm9yd2FyZDoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8 PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9SaWdodDsK LSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZEZvcndhcmRBbmRNb2RpZnlTZWxlY3Rp b246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZEZvcndhcmRBbmRNb2Rp ZnlTZWxlY3Rpb246IikgewogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmll cjsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpTaGlmdE1vZGlmaWVyOwogICAgICAgICBrZXlj b2RlID0gUXQ6OktleV9SaWdodDsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZExl ZnQ6IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZExlZnQ6IikgewogICAg ICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9 IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYoY29tbWFuZCA9PSJtb3ZlV29yZFJpZ2h0OiIp IHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0ibW92ZVdvcmRSaWdodDoiKSB7CiAgICAgICAg IG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAgICBrZXljb2RlID0gUXQ6 OktleV9MZWZ0OwotICAgIH0gZWxzZSBpZihjb21tYW5kID09Im1vdmVXb3JkUmlnaHRBbmRNb2Rp ZnlTZWxlY3Rpb246IikgeworICAgIH0gZWxzZSBpZiAoY29tbWFuZCA9PSJtb3ZlV29yZFJpZ2h0 QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKICAgICAgICAgbW9kaWZpZXJzIHw9IFF0OjpTaGlmdE1v ZGlmaWVyOwogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xNb2RpZmllcjsKICAgICAg ICAga2V5Y29kZSA9IFF0OjpLZXlfUmlnaHQ7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0ibW92 ZVdvcmRMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQg PT0ibW92ZVdvcmRMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uOiIpIHsKICAgICAgICAgbW9kaWZpZXJz IHw9IFF0OjpTaGlmdE1vZGlmaWVyOwogICAgICAgICBtb2RpZmllcnMgfD0gUXQ6OkNvbnRyb2xN b2RpZmllcjsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfTGVmdDsKLSAgICB9IGVsc2UgaWYo Y29tbWFuZCA9PSJwYWdlRG93bjoiKSB7Ci0gICAgICAgIGtleWNvZGUgPSBRdDo6S2V5X1BhZ2VE b3duOyAgICAgICAgCi0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0icGFnZVVwOiIpIHsKLSAgICAg ICAga2V5Y29kZSA9IFF0OjpLZXlfUGFnZVVwOyAgICAgICAgCi0gICAgfSBlbHNlIGlmKGNvbW1h bmQgPT0gImRlbGV0ZVdvcmRCYWNrd2FyZDoiKSB7CisgICAgfSBlbHNlIGlmIChjb21tYW5kID09 InBhZ2VEb3duOiIpIHsKKyAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfUGFnZURvd247CisgICAg fSBlbHNlIGlmIChjb21tYW5kID09InBhZ2VVcDoiKSB7CisgICAgICAgIGtleWNvZGUgPSBRdDo6 S2V5X1BhZ2VVcDsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0gImRlbGV0ZVdvcmRCYWNrd2Fy ZDoiKSB7CiAgICAgICAgIG1vZGlmaWVycyB8PSBRdDo6Q29udHJvbE1vZGlmaWVyOwogICAgICAg ICBrZXljb2RlID0gUXQ6OktleV9CYWNrc3BhY2U7Ci0gICAgfSBlbHNlIGlmKGNvbW1hbmQgPT0g ImRlbGV0ZUJhY2t3YXJkOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNvbW1hbmQgPT0gImRlbGV0ZUJh Y2t3YXJkOiIpIHsKICAgICAgICAga2V5Y29kZSA9IFF0OjpLZXlfQmFja3NwYWNlOwotICAgIH0g ZWxzZSBpZihjb21tYW5kID09ICJkZWxldGVGb3J3YXJkOiIpIHsKKyAgICB9IGVsc2UgaWYgKGNv bW1hbmQgPT0gImRlbGV0ZUZvcndhcmQ6IikgewogICAgICAgICBrZXljb2RlID0gUXQ6OktleV9E ZWxldGU7CiAgICAgfQogICAgIFFLZXlFdmVudCBldmVudChRRXZlbnQ6OktleVByZXNzLCBrZXlj b2RlLCBtb2RpZmllcnMpOwotLSAKMS42LjQuMTguZzA3YTRhCgo=