41574 2010-07-03 18:31:46 -0700 Bring bufferData and clear to GLES2 compliant 2010-07-12 16:13:35 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 29230 1 zmo zmo cmarrin commit-queue dglazkov kbr oliver oldest_to_newest 246374 0 zmo 2010-07-03 18:31:46 -0700 check usage for bufferData(), and check mask for clear() 246377 1 60464 zmo 2010-07-03 18:37:08 -0700 Created attachment 60464 patch 246462 2 60483 zmo 2010-07-04 15:17:21 -0700 Created attachment 60483 revised patch: resolving svn merge conflicts 247921 3 60483 kbr 2010-07-07 18:23:08 -0700 Comment on attachment 60483 revised patch: resolving svn merge conflicts Looks good. (Minor typo in description -- should be "compliance" instead of "compliant" -- not a big deal.) 249524 4 zmo 2010-07-10 09:48:07 -0700 Will fix the typo in the committed patch 250056 5 60483 fishd 2010-07-12 14:26:50 -0700 Comment on attachment 60483 revised patch: resolving svn merge conflicts r=me 250119 6 60483 commit-queue 2010-07-12 16:13:31 -0700 Comment on attachment 60483 revised patch: resolving svn merge conflicts Clearing flags on attachment: 60483 Committed r63134: <http://trac.webkit.org/changeset/63134> 250120 7 commit-queue 2010-07-12 16:13:35 -0700 All reviewed patches have been landed. Closing bug. 60464 2010-07-03 18:37:08 -0700 2010-07-04 15:17:21 -0700 patch param.patch text/plain 11763 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MjQ1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDctMDMgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCcmluZyBi dWZmZXJEYXRhIGFuZCBjbGVhciB0byBHTEVTMiBjb21wbGlhbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNTc0CisKKyAgICAgICAgKiBodG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpidWZmZXJEYXRhKTogQ2FsbCB2YWxpZGF0ZUJ1ZmZlckRhdGFVc2Fn ZSgpLgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVhcik6IENo ZWNrIG1hc2suCisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlk YXRlQnVmZmVyRGF0YVVzYWdlKTogQ2hlY2sgdXNhZ2UuCisgICAgICAgICogaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0Lmg6IERlY2xhcmUgdmFsaWRhdGVCdWZmZXJEYXRhVXNhZ2Uu CisKIDIwMTAtMDctMDMgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgVWdoLiAgSGF2ZSB0byBwdXQgdGhlIGRlc3RydWN0b3IgaW4gdGhlIC5oIGZpbGUgc2lu Y2UgdGhlIC5jY3AgaXNuJ3QgY29tcGlsZWQgeWV0LgpJbmRleDogV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24gNjI0NTIpCisrKyBXZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM0OSw2ICszNDksMTAgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmJsZW5kRnVu Y1NlcAogdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmJ1ZmZlckRhdGEodW5zaWduZWQgbG9u ZyB0YXJnZXQsIGludCBzaXplLCB1bnNpZ25lZCBsb25nIHVzYWdlLCBFeGNlcHRpb25Db2RlJiBl YykKIHsKICAgICBVTlVTRURfUEFSQU0oZWMpOworICAgIGlmICghaXNHTEVTMkNvbXBsaWFudCgp KSB7CisgICAgICAgIGlmICghdmFsaWRhdGVCdWZmZXJEYXRhVXNhZ2UodXNhZ2UpKQorICAgICAg ICAgICAgcmV0dXJuOworICAgIH0KICAgICBpZiAodGFyZ2V0ID09IEdyYXBoaWNzQ29udGV4dDNE OjpFTEVNRU5UX0FSUkFZX0JVRkZFUiAmJiBtX2JvdW5kRWxlbWVudEFycmF5QnVmZmVyKSB7CiAg ICAgICAgIGlmICghbV9ib3VuZEVsZW1lbnRBcnJheUJ1ZmZlci0+YXNzb2NpYXRlQnVmZmVyRGF0 YShzaXplKSkgewogICAgICAgICAgICAgbV9jb250ZXh0LT5zeW50aGVzaXplR0xFcnJvcihHcmFw aGljc0NvbnRleHQzRDo6SU5WQUxJRF9WQUxVRSk7CkBAIC0zNzEsNiArMzc1LDEwIEBAIHZvaWQg V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpidWZmZXJEYXRhKHUKIHZvaWQgV2ViR0xSZW5kZXJpbmdD b250ZXh0OjpidWZmZXJEYXRhKHVuc2lnbmVkIGxvbmcgdGFyZ2V0LCBBcnJheUJ1ZmZlclZpZXcq IGRhdGEsIHVuc2lnbmVkIGxvbmcgdXNhZ2UsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIFVO VVNFRF9QQVJBTShlYyk7CisgICAgaWYgKCFpc0dMRVMyQ29tcGxpYW50KCkpIHsKKyAgICAgICAg aWYgKCF2YWxpZGF0ZUJ1ZmZlckRhdGFVc2FnZSh1c2FnZSkpCisgICAgICAgICAgICByZXR1cm47 CisgICAgfQogICAgIGlmICh0YXJnZXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkVMRU1FTlRfQVJS QVlfQlVGRkVSICYmIG1fYm91bmRFbGVtZW50QXJyYXlCdWZmZXIpIHsKICAgICAgICAgaWYgKCFt X2JvdW5kRWxlbWVudEFycmF5QnVmZmVyLT5hc3NvY2lhdGVCdWZmZXJEYXRhKGRhdGEpKSB7CiAg ICAgICAgICAgICBtX2NvbnRleHQtPnN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNE OjpJTlZBTElEX1ZBTFVFKTsKQEAgLTQyOCw2ICs0MzYsMTIgQEAgdW5zaWduZWQgbG9uZyBXZWJH TFJlbmRlcmluZ0NvbnRleHQ6OmNoZQogCiB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y2xl YXIodW5zaWduZWQgbG9uZyBtYXNrKQogeworICAgIGlmICghaXNHTEVTMkNvbXBsaWFudCgpKSB7 CisgICAgICAgIGlmIChtYXNrICYgfihHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQlVGRkVSX0JJ VCB8IEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9CVUZGRVJfQklUIHwgR3JhcGhpY3NDb250ZXh0 M0Q6OlNURU5DSUxfQlVGRkVSX0JJVCkpIHsKKyAgICAgICAgICAgIG1fY29udGV4dC0+c3ludGhl c2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfVkFMVUUpOworICAgICAgICAg ICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQogICAgIG1fY29udGV4dC0+Y2xlYXIobWFzayk7 CiAgICAgY2xlYW51cEFmdGVyR3JhcGhpY3NDYWxsKHRydWUpOwogfQpAQCAtMzYwNiw2ICszNjIw LDE4IEBAIGJvb2wgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp2YWxpZGF0ZVVuaWYKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAorYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlkYXRlQnVmZmVy RGF0YVVzYWdlKHVuc2lnbmVkIGxvbmcgdXNhZ2UpCit7CisgICAgc3dpdGNoICh1c2FnZSkgewor ICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlNUUkVBTV9EUkFXOgorICAgIGNhc2UgR3JhcGhp Y3NDb250ZXh0M0Q6OlNUQVRJQ19EUkFXOgorICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OkRZ TkFNSUNfRFJBVzoKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIG1fY29udGV4dC0+ c3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfRU5VTSk7CisgICAg cmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dmVydGV4QXR0 cmliSW1wbCh1bnNpZ25lZCBsb25nIGluZGV4LCBGbG9hdDMyQXJyYXkqIHYsIGludCBleHBlY3Rl ZFNpemUpCiB7CiAgICAgaWYgKCF2KSB7CkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R0xSZW5kZXJpbmdDb250ZXh0LmgJKHJldmlzaW9uIDYyNDUyKQorKysgV2ViQ29yZS9odG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtNTAxLDYgKzUw MSw5IEBAIGNsYXNzIFdlYktpdENTU01hdHJpeDsKICAgICAgICAgYm9vbCB2YWxpZGF0ZVVuaWZv cm1NYXRyaXhQYXJhbWV0ZXJzKGNvbnN0IFdlYkdMVW5pZm9ybUxvY2F0aW9uKiBsb2NhdGlvbiwg Ym9vbCB0cmFuc3Bvc2UsIEZsb2F0MzJBcnJheSogdiwgaW50IG1vZCk7CiAgICAgICAgIGJvb2wg dmFsaWRhdGVVbmlmb3JtTWF0cml4UGFyYW1ldGVycyhjb25zdCBXZWJHTFVuaWZvcm1Mb2NhdGlv biogbG9jYXRpb24sIGJvb2wgdHJhbnNwb3NlLCB2b2lkKiB2LCBpbnQgc2l6ZSwgaW50IG1vZCk7 CiAKKyAgICAgICAgLy8gSGVscGVyIGZ1bmN0aW9uIHRvIHZhbGlkYXRlIHVzYWdlIGZvciBidWZm ZXJEYXRhLgorICAgICAgICBib29sIHZhbGlkYXRlQnVmZmVyRGF0YVVzYWdlKHVuc2lnbmVkIGxv bmcpOworCiAgICAgICAgIC8vIEhlbHBlciBmdW5jdGlvbnMgZm9yIHZlcnRleEF0dHJpYk5mdi4K ICAgICAgICAgdm9pZCB2ZXJ0ZXhBdHRyaWJJbXBsKHVuc2lnbmVkIGxvbmcgaW5kZXgsIEZsb2F0 MzJBcnJheSogdiwgaW50IGV4cGVjdGVkU2l6ZSk7CiAgICAgICAgIHZvaWQgdmVydGV4QXR0cmli SW1wbCh1bnNpZ25lZCBsb25nIGluZGV4LCBmbG9hdCogdiwgaW50IHNpemUsIGludCBleHBlY3Rl ZFNpemUpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNjI0NTcpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNy0wMyAgWmhlbnlhbyBN byAgPHptb0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEJyaW5nIGJ1ZmZlckRhdGEgYW5kIGNsZWFyIHRvIEdMRVMyIGNvbXBsaWFu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE1NzQK KworICAgICAgICAqIGZhc3QvY2FudmFzL3dlYmdsL2ludmFsaWRQYXNzZWRQYXJhbXMtZXhwZWN0 ZWQudHh0OiBBZGQgd3JvbmcgcGFyYW0gdGVzdCBjYXNlcyBmb3IgYnVmZmVyRGF0YSBhbmQgY2xl YXIuCisgICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxpZFBhc3NlZFBhcmFtcy5odG1s OiBEaXR0by4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC9yZXNvdXJjZXMvZGVza3RvcC1n bC1jb25zdGFudHMuanM6IEFkZCBBQ0NVTV9CVUZGRVJfQklUIGVudW0uCisKIDIwMTAtMDctMDMg IERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZGVkIHRlc3QgY2Fz ZXMgZm9yIGVkZ2UgY2FzZXMgaW4gYXBwbHkgZnVuY3Rpb24gb24gYXJyYXlzLgpJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxpZFBhc3NlZFBhcmFtcy1leHBlY3RlZC50 eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxpZFBh c3NlZFBhcmFtcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDYyNDUyKQorKysgTGF5b3V0VGVzdHMv ZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxpZFBhc3NlZFBhcmFtcy1leHBlY3RlZC50eHQJKHdvcmtp bmcgY29weSkKQEAgLTIsMTEgKzIsMjcgQEAgVGVzdCBmb3IgaW52YWxpZCBwYXNzZWQgcGFyYW1l dGVycwogCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKLVRlc3Qgc2hhZGVycwotUEFTUyBz aGFkZXIgPSBjb250ZXh0LmNyZWF0ZVNoYWRlcihjb250ZXh0LkZSQUdNRU5UX1NIQURFUikgaXMg c2hhZGVyCi1QQVNTIHNoYWRlciA9IGNvbnRleHQuY3JlYXRlU2hhZGVyKGNvbnRleHQuVkVSVEVY X1NIQURFUikgaXMgc2hhZGVyCi1QQVNTIGNvbnRleHQuY3JlYXRlU2hhZGVyKDApIHRocmV3IGV4 Y2VwdGlvbiBHTCBlcnJvciAxMjgwIGluIGNyZWF0ZVNoYWRlci4KLVBBU1MgY29udGV4dC5jcmVh dGVTaGFkZXIoY29udGV4dC5UUklBTkdMRVMpIHRocmV3IGV4Y2VwdGlvbiBHTCBlcnJvciAxMjgw IGluIGNyZWF0ZVNoYWRlci4KK1Rlc3QgY3JlYXRlU2hhZGVyKCkKK1BBU1MgY29udGV4dC5jcmVh dGVTaGFkZXIoY29udGV4dC5GUkFHTUVOVF9TSEFERVIpIGdlbmVyYXRlZCBleHBlY3RlZCBHTCBl cnJvcjogTk9fRVJST1IuCitQQVNTIGNvbnRleHQuY3JlYXRlU2hhZGVyKGNvbnRleHQuVkVSVEVY X1NIQURFUikgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBOT19FUlJPUi4KK1BBU1MgY29u dGV4dC5jcmVhdGVTaGFkZXIoMCkgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElE X0VOVU0uCitQQVNTIGNvbnRleHQuY3JlYXRlU2hhZGVyKGNvbnRleHQuVFJJQU5HTEVTKSBnZW5l cmF0ZWQgZXhwZWN0ZWQgR0wgZXJyb3I6IElOVkFMSURfRU5VTS4KK1Rlc3QgY2xlYXIoKQorUEFT UyBjb250ZXh0LmNsZWFyKGRlc2t0b3BHTFsnQUNDVU1fQlVGRkVSX0JJVCddKSBnZW5lcmF0ZWQg ZXhwZWN0ZWQgR0wgZXJyb3I6IElOVkFMSURfVkFMVUUuCitQQVNTIGNvbnRleHQuY2xlYXIoZGVz a3RvcEdMWydBQ0NVTV9CVUZGRVJfQklUJ10gfCBjb250ZXh0LkNPTE9SX0JVRkZFUl9CSVQpIGdl bmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjogSU5WQUxJRF9WQUxVRS4KK1BBU1MgY29udGV4dC5j bGVhcihkZXNrdG9wR0xbJ0FDQ1VNX0JVRkZFUl9CSVQnXSB8IGNvbnRleHQuQ09MT1JfQlVGRkVS X0JJVCB8IGNvbnRleHQuREVQVEhfQlVGRkVSX0JJVCB8IGNvbnRleHQuU1RFTkNJTF9CVUZGRVJf QklUKSBnZW5lcmF0ZWQgZXhwZWN0ZWQgR0wgZXJyb3I6IElOVkFMSURfVkFMVUUuCitQQVNTIGNv bnRleHQuY2xlYXIoY29udGV4dC5DT0xPUl9CVUZGRVJfQklUIHwgY29udGV4dC5ERVBUSF9CVUZG RVJfQklUIHwgY29udGV4dC5TVEVOQ0lMX0JVRkZFUl9CSVQpIGdlbmVyYXRlZCBleHBlY3RlZCBH TCBlcnJvcjogTk9fRVJST1IuCitUZXN0IGJ1ZmZlckRhdGEoKQorUEFTUyBjb250ZXh0LmJpbmRC dWZmZXIoY29udGV4dC5BUlJBWV9CVUZGRVIsIGJ1ZmZlcikgZ2VuZXJhdGVkIGV4cGVjdGVkIEdM IGVycm9yOiBOT19FUlJPUi4KK1BBU1MgY29udGV4dC5idWZmZXJEYXRhKGNvbnRleHQuQVJSQVlf QlVGRkVSLCAxNiwgY29udGV4dC5TVFJFQU1fRFJBVykgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVy cm9yOiBOT19FUlJPUi4KK1BBU1MgY29udGV4dC5idWZmZXJEYXRhKGNvbnRleHQuQVJSQVlfQlVG RkVSLCAxNiwgY29udGV4dC5TVEFUSUNfRFJBVykgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9y OiBOT19FUlJPUi4KK1BBU1MgY29udGV4dC5idWZmZXJEYXRhKGNvbnRleHQuQVJSQVlfQlVGRkVS LCAxNiwgY29udGV4dC5EWU5BTUlDX0RSQVcpIGdlbmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjog Tk9fRVJST1IuCitQQVNTIGNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwg MTYsIGRlc2t0b3BHTFsnU1RSRUFNX1JFQUQnXSkgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9y OiBJTlZBTElEX0VOVU0uCitQQVNTIGNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JV RkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RSRUFNX0NPUFknXSkgZ2VuZXJhdGVkIGV4cGVjdGVkIEdM IGVycm9yOiBJTlZBTElEX0VOVU0uCitQQVNTIGNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFS UkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RBVElDX1JFQUQnXSkgZ2VuZXJhdGVkIGV4cGVj dGVkIEdMIGVycm9yOiBJTlZBTElEX0VOVU0uCitQQVNTIGNvbnRleHQuYnVmZmVyRGF0YShjb250 ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RBVElDX0NPUFknXSkgZ2VuZXJhdGVk IGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElEX0VOVU0uCitQQVNTIGNvbnRleHQuYnVmZmVyRGF0 YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnRFlOQU1JQ19SRUFEJ10pIGdl bmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjogSU5WQUxJRF9FTlVNLgorUEFTUyBjb250ZXh0LmJ1 ZmZlckRhdGEoY29udGV4dC5BUlJBWV9CVUZGRVIsIDE2LCBkZXNrdG9wR0xbJ0RZTkFNSUNfQ09Q WSddKSBnZW5lcmF0ZWQgZXhwZWN0ZWQgR0wgZXJyb3I6IElOVkFMSURfRU5VTS4KIAogUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZh cy93ZWJnbC9pbnZhbGlkUGFzc2VkUGFyYW1zLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxpZFBhc3NlZFBhcmFtcy5odG1sCShyZXZpc2lvbiA2 MjQ1MikKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2ludmFsaWRQYXNzZWRQYXJh bXMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMyw2ICszLDcgQEAKIDxsaW5rIHJlbD0ic3R5bGVz aGVldCIgaHJlZj0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIi8+CiA8c2Ny aXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KIDxz Y3JpcHQgc3JjPSJyZXNvdXJjZXMvd2ViZ2wtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNy Yz0icmVzb3VyY2VzL2Rlc2t0b3AtZ2wtY29uc3RhbnRzLmpzIj48L3NjcmlwdD4KIDwvaGVhZD4K IDxib2R5PgogPGRpdiBpZD0iZGVzY3JpcHRpb24iPjwvZGl2PgpAQCAtMTEsMTQgKzEyLDMyIEBA CiA8c2NyaXB0PgogZGVzY3JpcHRpb24oIlRlc3QgZm9yIGludmFsaWQgcGFzc2VkIHBhcmFtZXRl cnMiKTsKIAotdmFyIGNvbnRleHQgPSBjcmVhdGUzRERlYnVnQ29udGV4dCgpOwordmFyIGNvbnRl eHQgPSBjcmVhdGUzRENvbnRleHQoKTsKIAotZGVidWcoIlRlc3Qgc2hhZGVycyIpOwotdmFyIHNo YWRlcjsKLXNob3VsZEJlKCJzaGFkZXIgPSBjb250ZXh0LmNyZWF0ZVNoYWRlcihjb250ZXh0LkZS QUdNRU5UX1NIQURFUikiLCAic2hhZGVyIik7Ci1zaG91bGRCZSgic2hhZGVyID0gY29udGV4dC5j cmVhdGVTaGFkZXIoY29udGV4dC5WRVJURVhfU0hBREVSKSIsICJzaGFkZXIiKTsKLXNob3VsZFRo cm93KCJjb250ZXh0LmNyZWF0ZVNoYWRlcigwKSIpOwotc2hvdWxkVGhyb3coImNvbnRleHQuY3Jl YXRlU2hhZGVyKGNvbnRleHQuVFJJQU5HTEVTKSIpOworZGVidWcoIlRlc3QgY3JlYXRlU2hhZGVy KCkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0Lk5PX0VSUk9SLCAi Y29udGV4dC5jcmVhdGVTaGFkZXIoY29udGV4dC5GUkFHTUVOVF9TSEFERVIpIik7CitzaG91bGRH ZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwgY29udGV4dC5OT19FUlJPUiwgImNvbnRleHQuY3JlYXRl U2hhZGVyKGNvbnRleHQuVkVSVEVYX1NIQURFUikiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihj b250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQuY3JlYXRlU2hhZGVyKDApIik7 CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwgY29udGV4dC5JTlZBTElEX0VOVU0sICJj b250ZXh0LmNyZWF0ZVNoYWRlcihjb250ZXh0LlRSSUFOR0xFUykiKTsKKworZGVidWcoIlRlc3Qg Y2xlYXIoKSIpOworc2hvdWxkR2VuZXJhdGVHTEVycm9yKGNvbnRleHQsIGNvbnRleHQuSU5WQUxJ RF9WQUxVRSwgImNvbnRleHQuY2xlYXIoZGVza3RvcEdMWydBQ0NVTV9CVUZGRVJfQklUJ10pIik7 CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwgY29udGV4dC5JTlZBTElEX1ZBTFVFLCAi Y29udGV4dC5jbGVhcihkZXNrdG9wR0xbJ0FDQ1VNX0JVRkZFUl9CSVQnXSB8IGNvbnRleHQuQ09M T1JfQlVGRkVSX0JJVCkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0 LklOVkFMSURfVkFMVUUsICJjb250ZXh0LmNsZWFyKGRlc2t0b3BHTFsnQUNDVU1fQlVGRkVSX0JJ VCddIHwgY29udGV4dC5DT0xPUl9CVUZGRVJfQklUIHwgY29udGV4dC5ERVBUSF9CVUZGRVJfQklU IHwgY29udGV4dC5TVEVOQ0lMX0JVRkZFUl9CSVQpIik7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3Io Y29udGV4dCwgY29udGV4dC5OT19FUlJPUiwgImNvbnRleHQuY2xlYXIoY29udGV4dC5DT0xPUl9C VUZGRVJfQklUIHwgY29udGV4dC5ERVBUSF9CVUZGRVJfQklUIHwgY29udGV4dC5TVEVOQ0lMX0JV RkZFUl9CSVQpIik7CisKK2RlYnVnKCJUZXN0IGJ1ZmZlckRhdGEoKSIpOwordmFyIGJ1ZmZlciA9 IGNvbnRleHQuY3JlYXRlQnVmZmVyKCk7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwg Y29udGV4dC5OT19FUlJPUiwgImNvbnRleHQuYmluZEJ1ZmZlcihjb250ZXh0LkFSUkFZX0JVRkZF UiwgYnVmZmVyKSIpOworc2hvdWxkR2VuZXJhdGVHTEVycm9yKGNvbnRleHQsIGNvbnRleHQuTk9f RVJST1IsICJjb250ZXh0LmJ1ZmZlckRhdGEoY29udGV4dC5BUlJBWV9CVUZGRVIsIDE2LCBjb250 ZXh0LlNUUkVBTV9EUkFXKSIpOworc2hvdWxkR2VuZXJhdGVHTEVycm9yKGNvbnRleHQsIGNvbnRl eHQuTk9fRVJST1IsICJjb250ZXh0LmJ1ZmZlckRhdGEoY29udGV4dC5BUlJBWV9CVUZGRVIsIDE2 LCBjb250ZXh0LlNUQVRJQ19EUkFXKSIpOworc2hvdWxkR2VuZXJhdGVHTEVycm9yKGNvbnRleHQs IGNvbnRleHQuTk9fRVJST1IsICJjb250ZXh0LmJ1ZmZlckRhdGEoY29udGV4dC5BUlJBWV9CVUZG RVIsIDE2LCBjb250ZXh0LkRZTkFNSUNfRFJBVykiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihj b250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0 LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RSRUFNX1JFQUQnXSkiKTsKK3Nob3VsZEdl bmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQuYnVm ZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RSRUFNX0NPUFkn XSkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5V TSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BH TFsnU1RBVElDX1JFQUQnXSkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250 ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZF UiwgMTYsIGRlc2t0b3BHTFsnU1RBVElDX0NPUFknXSkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJv cihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250 ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnRFlOQU1JQ19SRUFEJ10pIik7CitzaG91 bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwgY29udGV4dC5JTlZBTElEX0VOVU0sICJjb250ZXh0 LmJ1ZmZlckRhdGEoY29udGV4dC5BUlJBWV9CVUZGRVIsIDE2LCBkZXNrdG9wR0xbJ0RZTkFNSUNf Q09QWSddKSIpOwogCiBkZWJ1ZygiIikKIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9yZXNvdXJjZXMvZGVza3RvcC1nbC1jb25z dGFudHMuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvcmVz b3VyY2VzL2Rlc2t0b3AtZ2wtY29uc3RhbnRzLmpzCShyZXZpc2lvbiA2MjQ1MikKKysrIExheW91 dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3Jlc291cmNlcy9kZXNrdG9wLWdsLWNvbnN0YW50cy5q cwkod29ya2luZyBjb3B5KQpAQCAtMTgsNiArMTgsNyBAQCB2YXIgZGVza3RvcEdMID0gewogICAn U1RBVElDX1JFQUQnOiAnMHg4OEU1JywKICAgJ0NMSVBfUExBTkUwJzogJzB4MzAwMCcsCiAgICdQ RVJTUEVDVElWRV9DT1JSRUNUSU9OX0hJTlQnOiAnMHgwQzUwJywKKyAgJ0FDQ1VNX0JVRkZFUl9C SVQnOiAnMHgwMjAwJywKICAgJ1JHQjQnOiAnMHg4MDRGJywKICAgJ1JHQjUnOiAnMHg4MDUwJywK ICAgJ1JHQjgnOiAnMHg4MDUxJywK 60483 2010-07-04 15:17:21 -0700 2010-07-12 16:13:31 -0700 revised patch: resolving svn merge conflicts param.patch text/plain 11736 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MjQ2OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDctMDMgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCcmluZyBi dWZmZXJEYXRhIGFuZCBjbGVhciB0byBHTEVTMiBjb21wbGlhbnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNTc0CisKKyAgICAgICAgKiBodG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpidWZmZXJEYXRhKTogQ2FsbCB2YWxpZGF0ZUJ1ZmZlckRhdGFVc2Fn ZSgpLgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVhcik6IENo ZWNrIG1hc2suCisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlk YXRlQnVmZmVyRGF0YVVzYWdlKTogQ2hlY2sgdXNhZ2UuCisgICAgICAgICogaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0Lmg6IERlY2xhcmUgdmFsaWRhdGVCdWZmZXJEYXRhVXNhZ2Uu CisKIDIwMTAtMDctMDQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9X ZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiA2MjQ3MCkKKysrIFdlYkNvcmUvaHRt bC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ5 LDYgKzM0OSwxMCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6YmxlbmRGdW5jU2VwCiB2 b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6YnVmZmVyRGF0YSh1bnNpZ25lZCBsb25nIHRhcmdl dCwgaW50IHNpemUsIHVuc2lnbmVkIGxvbmcgdXNhZ2UsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewog ICAgIFVOVVNFRF9QQVJBTShlYyk7CisgICAgaWYgKCFpc0dMRVMyQ29tcGxpYW50KCkpIHsKKyAg ICAgICAgaWYgKCF2YWxpZGF0ZUJ1ZmZlckRhdGFVc2FnZSh1c2FnZSkpCisgICAgICAgICAgICBy ZXR1cm47CisgICAgfQogICAgIGlmICh0YXJnZXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkVMRU1F TlRfQVJSQVlfQlVGRkVSICYmIG1fYm91bmRFbGVtZW50QXJyYXlCdWZmZXIpIHsKICAgICAgICAg aWYgKCFtX2JvdW5kRWxlbWVudEFycmF5QnVmZmVyLT5hc3NvY2lhdGVCdWZmZXJEYXRhKHNpemUp KSB7CiAgICAgICAgICAgICBtX2NvbnRleHQtPnN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29u dGV4dDNEOjpJTlZBTElEX1ZBTFVFKTsKQEAgLTM3MSw2ICszNzUsMTAgQEAgdm9pZCBXZWJHTFJl bmRlcmluZ0NvbnRleHQ6OmJ1ZmZlckRhdGEodQogdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmJ1ZmZlckRhdGEodW5zaWduZWQgbG9uZyB0YXJnZXQsIEFycmF5QnVmZmVyVmlldyogZGF0YSwg dW5zaWduZWQgbG9uZyB1c2FnZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgVU5VU0VEX1BB UkFNKGVjKTsKKyAgICBpZiAoIWlzR0xFUzJDb21wbGlhbnQoKSkgeworICAgICAgICBpZiAoIXZh bGlkYXRlQnVmZmVyRGF0YVVzYWdlKHVzYWdlKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9 CiAgICAgaWYgKHRhcmdldCA9PSBHcmFwaGljc0NvbnRleHQzRDo6RUxFTUVOVF9BUlJBWV9CVUZG RVIgJiYgbV9ib3VuZEVsZW1lbnRBcnJheUJ1ZmZlcikgewogICAgICAgICBpZiAoIW1fYm91bmRF bGVtZW50QXJyYXlCdWZmZXItPmFzc29jaWF0ZUJ1ZmZlckRhdGEoZGF0YSkpIHsKICAgICAgICAg ICAgIG1fY29udGV4dC0+c3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFM SURfVkFMVUUpOwpAQCAtNDI4LDYgKzQzNiwxMiBAQCB1bnNpZ25lZCBsb25nIFdlYkdMUmVuZGVy aW5nQ29udGV4dDo6Y2hlCiAKIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVhcih1bnNp Z25lZCBsb25nIG1hc2spCiB7CisgICAgaWYgKCFpc0dMRVMyQ29tcGxpYW50KCkpIHsKKyAgICAg ICAgaWYgKG1hc2sgJiB+KEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUIHwgR3Jh cGhpY3NDb250ZXh0M0Q6OkRFUFRIX0JVRkZFUl9CSVQgfCBHcmFwaGljc0NvbnRleHQzRDo6U1RF TkNJTF9CVUZGRVJfQklUKSkgeworICAgICAgICAgICAgbV9jb250ZXh0LT5zeW50aGVzaXplR0xF cnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9WQUxVRSk7CisgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKyAgICB9CiAgICAgbV9jb250ZXh0LT5jbGVhcihtYXNrKTsKICAgICBj bGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwodHJ1ZSk7CiB9CkBAIC0zNTc0LDYgKzM1ODgsMTggQEAg Ym9vbCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlkYXRlVW5pZgogICAgIHJldHVybiB0cnVl OwogfQogCitib29sIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dmFsaWRhdGVCdWZmZXJEYXRhVXNh Z2UodW5zaWduZWQgbG9uZyB1c2FnZSkKK3sKKyAgICBzd2l0Y2ggKHVzYWdlKSB7CisgICAgY2Fz ZSBHcmFwaGljc0NvbnRleHQzRDo6U1RSRUFNX0RSQVc6CisgICAgY2FzZSBHcmFwaGljc0NvbnRl eHQzRDo6U1RBVElDX0RSQVc6CisgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6RFlOQU1JQ19E UkFXOgorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgbV9jb250ZXh0LT5zeW50aGVz aXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9FTlVNKTsKKyAgICByZXR1cm4g ZmFsc2U7Cit9CisKIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp2ZXJ0ZXhBdHRyaWJmSW1w bCh1bnNpZ25lZCBsb25nIGluZGV4LCBpbnQgZXhwZWN0ZWRTaXplLCBmbG9hdCB2MCwgZmxvYXQg djEsIGZsb2F0IHYyLCBmbG9hdCB2MykKIHsKICAgICBpZiAoaW5kZXggPj0gbV9tYXhWZXJ0ZXhB dHRyaWJzKSB7CkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4 dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmgJKHJldmlzaW9uIDYyNDcwKQorKysgV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRl cmluZ0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtNTAxLDYgKzUwMSw5IEBAIGNsYXNzIFdl YktpdENTU01hdHJpeDsKICAgICAgICAgYm9vbCB2YWxpZGF0ZVVuaWZvcm1NYXRyaXhQYXJhbWV0 ZXJzKGNvbnN0IFdlYkdMVW5pZm9ybUxvY2F0aW9uKiBsb2NhdGlvbiwgYm9vbCB0cmFuc3Bvc2Us IEZsb2F0MzJBcnJheSogdiwgaW50IG1vZCk7CiAgICAgICAgIGJvb2wgdmFsaWRhdGVVbmlmb3Jt TWF0cml4UGFyYW1ldGVycyhjb25zdCBXZWJHTFVuaWZvcm1Mb2NhdGlvbiogbG9jYXRpb24sIGJv b2wgdHJhbnNwb3NlLCB2b2lkKiB2LCBpbnQgc2l6ZSwgaW50IG1vZCk7CiAKKyAgICAgICAgLy8g SGVscGVyIGZ1bmN0aW9uIHRvIHZhbGlkYXRlIHVzYWdlIGZvciBidWZmZXJEYXRhLgorICAgICAg ICBib29sIHZhbGlkYXRlQnVmZmVyRGF0YVVzYWdlKHVuc2lnbmVkIGxvbmcpOworCiAgICAgICAg IC8vIEhlbHBlciBmdW5jdGlvbnMgZm9yIHZlcnRleEF0dHJpYk5me3Z9LgogICAgICAgICB2b2lk IHZlcnRleEF0dHJpYmZJbXBsKHVuc2lnbmVkIGxvbmcgaW5kZXgsIGludCBleHBlY3RlZFNpemUs IGZsb2F0IHYwLCBmbG9hdCB2MSwgZmxvYXQgdjIsIGZsb2F0IHYzKTsKICAgICAgICAgdm9pZCB2 ZXJ0ZXhBdHRyaWJmdkltcGwodW5zaWduZWQgbG9uZyBpbmRleCwgRmxvYXQzMkFycmF5KiB2LCBp bnQgZXhwZWN0ZWRTaXplKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYyNDY5KQorKysgTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDctMDMg IFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBCcmluZyBidWZmZXJEYXRhIGFuZCBjbGVhciB0byBHTEVT MiBjb21wbGlhbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQxNTc0CisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJnbC9pbnZhbGlkUGFzc2VkUGFy YW1zLWV4cGVjdGVkLnR4dDogQWRkIHdyb25nIHBhcmFtIHRlc3QgY2FzZXMgZm9yIGJ1ZmZlckRh dGEgYW5kIGNsZWFyLgorICAgICAgICAqIGZhc3QvY2FudmFzL3dlYmdsL2ludmFsaWRQYXNzZWRQ YXJhbXMuaHRtbDogRGl0dG8uCisgICAgICAgICogZmFzdC9jYW52YXMvd2ViZ2wvcmVzb3VyY2Vz L2Rlc2t0b3AtZ2wtY29uc3RhbnRzLmpzOiBBZGQgQUNDVU1fQlVGRkVSX0JJVCBlbnVtLgorCiAy MDEwLTA3LTA0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wv aW52YWxpZFBhc3NlZFBhcmFtcy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxpZFBhc3NlZFBhcmFtcy1leHBlY3RlZC50eHQJKHJl dmlzaW9uIDYyNDY5KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxpZFBh c3NlZFBhcmFtcy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTIsMTEgKzIsMjcgQEAg VGVzdCBmb3IgaW52YWxpZCBwYXNzZWQgcGFyYW1ldGVycwogCiBPbiBzdWNjZXNzLCB5b3Ugd2ls bCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01Q TEVURSIuCiAKLVRlc3Qgc2hhZGVycwotUEFTUyBzaGFkZXIgPSBjb250ZXh0LmNyZWF0ZVNoYWRl cihjb250ZXh0LkZSQUdNRU5UX1NIQURFUikgaXMgc2hhZGVyCi1QQVNTIHNoYWRlciA9IGNvbnRl eHQuY3JlYXRlU2hhZGVyKGNvbnRleHQuVkVSVEVYX1NIQURFUikgaXMgc2hhZGVyCi1QQVNTIGNv bnRleHQuY3JlYXRlU2hhZGVyKDApIHRocmV3IGV4Y2VwdGlvbiBHTCBlcnJvciAxMjgwIGluIGNy ZWF0ZVNoYWRlci4KLVBBU1MgY29udGV4dC5jcmVhdGVTaGFkZXIoY29udGV4dC5UUklBTkdMRVMp IHRocmV3IGV4Y2VwdGlvbiBHTCBlcnJvciAxMjgwIGluIGNyZWF0ZVNoYWRlci4KK1Rlc3QgY3Jl YXRlU2hhZGVyKCkKK1BBU1MgY29udGV4dC5jcmVhdGVTaGFkZXIoY29udGV4dC5GUkFHTUVOVF9T SEFERVIpIGdlbmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjogTk9fRVJST1IuCitQQVNTIGNvbnRl eHQuY3JlYXRlU2hhZGVyKGNvbnRleHQuVkVSVEVYX1NIQURFUikgZ2VuZXJhdGVkIGV4cGVjdGVk IEdMIGVycm9yOiBOT19FUlJPUi4KK1BBU1MgY29udGV4dC5jcmVhdGVTaGFkZXIoMCkgZ2VuZXJh dGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElEX0VOVU0uCitQQVNTIGNvbnRleHQuY3JlYXRl U2hhZGVyKGNvbnRleHQuVFJJQU5HTEVTKSBnZW5lcmF0ZWQgZXhwZWN0ZWQgR0wgZXJyb3I6IElO VkFMSURfRU5VTS4KK1Rlc3QgY2xlYXIoKQorUEFTUyBjb250ZXh0LmNsZWFyKGRlc2t0b3BHTFsn QUNDVU1fQlVGRkVSX0JJVCddKSBnZW5lcmF0ZWQgZXhwZWN0ZWQgR0wgZXJyb3I6IElOVkFMSURf VkFMVUUuCitQQVNTIGNvbnRleHQuY2xlYXIoZGVza3RvcEdMWydBQ0NVTV9CVUZGRVJfQklUJ10g fCBjb250ZXh0LkNPTE9SX0JVRkZFUl9CSVQpIGdlbmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjog SU5WQUxJRF9WQUxVRS4KK1BBU1MgY29udGV4dC5jbGVhcihkZXNrdG9wR0xbJ0FDQ1VNX0JVRkZF Ul9CSVQnXSB8IGNvbnRleHQuQ09MT1JfQlVGRkVSX0JJVCB8IGNvbnRleHQuREVQVEhfQlVGRkVS X0JJVCB8IGNvbnRleHQuU1RFTkNJTF9CVUZGRVJfQklUKSBnZW5lcmF0ZWQgZXhwZWN0ZWQgR0wg ZXJyb3I6IElOVkFMSURfVkFMVUUuCitQQVNTIGNvbnRleHQuY2xlYXIoY29udGV4dC5DT0xPUl9C VUZGRVJfQklUIHwgY29udGV4dC5ERVBUSF9CVUZGRVJfQklUIHwgY29udGV4dC5TVEVOQ0lMX0JV RkZFUl9CSVQpIGdlbmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjogTk9fRVJST1IuCitUZXN0IGJ1 ZmZlckRhdGEoKQorUEFTUyBjb250ZXh0LmJpbmRCdWZmZXIoY29udGV4dC5BUlJBWV9CVUZGRVIs IGJ1ZmZlcikgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBOT19FUlJPUi4KK1BBU1MgY29u dGV4dC5idWZmZXJEYXRhKGNvbnRleHQuQVJSQVlfQlVGRkVSLCAxNiwgY29udGV4dC5TVFJFQU1f RFJBVykgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBOT19FUlJPUi4KK1BBU1MgY29udGV4 dC5idWZmZXJEYXRhKGNvbnRleHQuQVJSQVlfQlVGRkVSLCAxNiwgY29udGV4dC5TVEFUSUNfRFJB VykgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBOT19FUlJPUi4KK1BBU1MgY29udGV4dC5i dWZmZXJEYXRhKGNvbnRleHQuQVJSQVlfQlVGRkVSLCAxNiwgY29udGV4dC5EWU5BTUlDX0RSQVcp IGdlbmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjogTk9fRVJST1IuCitQQVNTIGNvbnRleHQuYnVm ZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RSRUFNX1JFQUQn XSkgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElEX0VOVU0uCitQQVNTIGNvbnRl eHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RSRUFN X0NPUFknXSkgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElEX0VOVU0uCitQQVNT IGNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsn U1RBVElDX1JFQUQnXSkgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElEX0VOVU0u CitQQVNTIGNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0 b3BHTFsnU1RBVElDX0NPUFknXSkgZ2VuZXJhdGVkIGV4cGVjdGVkIEdMIGVycm9yOiBJTlZBTElE X0VOVU0uCitQQVNTIGNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYs IGRlc2t0b3BHTFsnRFlOQU1JQ19SRUFEJ10pIGdlbmVyYXRlZCBleHBlY3RlZCBHTCBlcnJvcjog SU5WQUxJRF9FTlVNLgorUEFTUyBjb250ZXh0LmJ1ZmZlckRhdGEoY29udGV4dC5BUlJBWV9CVUZG RVIsIDE2LCBkZXNrdG9wR0xbJ0RZTkFNSUNfQ09QWSddKSBnZW5lcmF0ZWQgZXhwZWN0ZWQgR0wg ZXJyb3I6IElOVkFMSURfRU5VTS4KIAogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQog CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9pbnZhbGlkUGFzc2VkUGFyYW1z Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvaW52YWxp ZFBhc3NlZFBhcmFtcy5odG1sCShyZXZpc2lvbiA2MjQ2OSkKKysrIExheW91dFRlc3RzL2Zhc3Qv Y2FudmFzL3dlYmdsL2ludmFsaWRQYXNzZWRQYXJhbXMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAt Myw2ICszLDcgQEAKIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vanMvcmVzb3Vy Y2VzL2pzLXRlc3Qtc3R5bGUuY3NzIi8+CiA8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvd2ViZ2wt dGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2Rlc2t0b3AtZ2wtY29u c3RhbnRzLmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KIDxib2R5PgogPGRpdiBpZD0iZGVzY3JpcHRp b24iPjwvZGl2PgpAQCAtMTEsMTQgKzEyLDMyIEBACiA8c2NyaXB0PgogZGVzY3JpcHRpb24oIlRl c3QgZm9yIGludmFsaWQgcGFzc2VkIHBhcmFtZXRlcnMiKTsKIAotdmFyIGNvbnRleHQgPSBjcmVh dGUzRERlYnVnQ29udGV4dCgpOwordmFyIGNvbnRleHQgPSBjcmVhdGUzRENvbnRleHQoKTsKIAot ZGVidWcoIlRlc3Qgc2hhZGVycyIpOwotdmFyIHNoYWRlcjsKLXNob3VsZEJlKCJzaGFkZXIgPSBj b250ZXh0LmNyZWF0ZVNoYWRlcihjb250ZXh0LkZSQUdNRU5UX1NIQURFUikiLCAic2hhZGVyIik7 Ci1zaG91bGRCZSgic2hhZGVyID0gY29udGV4dC5jcmVhdGVTaGFkZXIoY29udGV4dC5WRVJURVhf U0hBREVSKSIsICJzaGFkZXIiKTsKLXNob3VsZFRocm93KCJjb250ZXh0LmNyZWF0ZVNoYWRlcigw KSIpOwotc2hvdWxkVGhyb3coImNvbnRleHQuY3JlYXRlU2hhZGVyKGNvbnRleHQuVFJJQU5HTEVT KSIpOworZGVidWcoIlRlc3QgY3JlYXRlU2hhZGVyKCkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJv cihjb250ZXh0LCBjb250ZXh0Lk5PX0VSUk9SLCAiY29udGV4dC5jcmVhdGVTaGFkZXIoY29udGV4 dC5GUkFHTUVOVF9TSEFERVIpIik7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwgY29u dGV4dC5OT19FUlJPUiwgImNvbnRleHQuY3JlYXRlU2hhZGVyKGNvbnRleHQuVkVSVEVYX1NIQURF UikiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5V TSwgImNvbnRleHQuY3JlYXRlU2hhZGVyKDApIik7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29u dGV4dCwgY29udGV4dC5JTlZBTElEX0VOVU0sICJjb250ZXh0LmNyZWF0ZVNoYWRlcihjb250ZXh0 LlRSSUFOR0xFUykiKTsKKworZGVidWcoIlRlc3QgY2xlYXIoKSIpOworc2hvdWxkR2VuZXJhdGVH TEVycm9yKGNvbnRleHQsIGNvbnRleHQuSU5WQUxJRF9WQUxVRSwgImNvbnRleHQuY2xlYXIoZGVz a3RvcEdMWydBQ0NVTV9CVUZGRVJfQklUJ10pIik7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29u dGV4dCwgY29udGV4dC5JTlZBTElEX1ZBTFVFLCAiY29udGV4dC5jbGVhcihkZXNrdG9wR0xbJ0FD Q1VNX0JVRkZFUl9CSVQnXSB8IGNvbnRleHQuQ09MT1JfQlVGRkVSX0JJVCkiKTsKK3Nob3VsZEdl bmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfVkFMVUUsICJjb250ZXh0LmNs ZWFyKGRlc2t0b3BHTFsnQUNDVU1fQlVGRkVSX0JJVCddIHwgY29udGV4dC5DT0xPUl9CVUZGRVJf QklUIHwgY29udGV4dC5ERVBUSF9CVUZGRVJfQklUIHwgY29udGV4dC5TVEVOQ0lMX0JVRkZFUl9C SVQpIik7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwgY29udGV4dC5OT19FUlJPUiwg ImNvbnRleHQuY2xlYXIoY29udGV4dC5DT0xPUl9CVUZGRVJfQklUIHwgY29udGV4dC5ERVBUSF9C VUZGRVJfQklUIHwgY29udGV4dC5TVEVOQ0lMX0JVRkZFUl9CSVQpIik7CisKK2RlYnVnKCJUZXN0 IGJ1ZmZlckRhdGEoKSIpOwordmFyIGJ1ZmZlciA9IGNvbnRleHQuY3JlYXRlQnVmZmVyKCk7Citz aG91bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwgY29udGV4dC5OT19FUlJPUiwgImNvbnRleHQu YmluZEJ1ZmZlcihjb250ZXh0LkFSUkFZX0JVRkZFUiwgYnVmZmVyKSIpOworc2hvdWxkR2VuZXJh dGVHTEVycm9yKGNvbnRleHQsIGNvbnRleHQuTk9fRVJST1IsICJjb250ZXh0LmJ1ZmZlckRhdGEo Y29udGV4dC5BUlJBWV9CVUZGRVIsIDE2LCBjb250ZXh0LlNUUkVBTV9EUkFXKSIpOworc2hvdWxk R2VuZXJhdGVHTEVycm9yKGNvbnRleHQsIGNvbnRleHQuTk9fRVJST1IsICJjb250ZXh0LmJ1ZmZl ckRhdGEoY29udGV4dC5BUlJBWV9CVUZGRVIsIDE2LCBjb250ZXh0LlNUQVRJQ19EUkFXKSIpOwor c2hvdWxkR2VuZXJhdGVHTEVycm9yKGNvbnRleHQsIGNvbnRleHQuTk9fRVJST1IsICJjb250ZXh0 LmJ1ZmZlckRhdGEoY29udGV4dC5BUlJBWV9CVUZGRVIsIDE2LCBjb250ZXh0LkRZTkFNSUNfRFJB VykiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5V TSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BH TFsnU1RSRUFNX1JFQUQnXSkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250 ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZF UiwgMTYsIGRlc2t0b3BHTFsnU1RSRUFNX0NPUFknXSkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJv cihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250 ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RBVElDX1JFQUQnXSkiKTsKK3Nob3Vs ZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0LklOVkFMSURfRU5VTSwgImNvbnRleHQu YnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0b3BHTFsnU1RBVElDX0NP UFknXSkiKTsKK3Nob3VsZEdlbmVyYXRlR0xFcnJvcihjb250ZXh0LCBjb250ZXh0LklOVkFMSURf RU5VTSwgImNvbnRleHQuYnVmZmVyRGF0YShjb250ZXh0LkFSUkFZX0JVRkZFUiwgMTYsIGRlc2t0 b3BHTFsnRFlOQU1JQ19SRUFEJ10pIik7CitzaG91bGRHZW5lcmF0ZUdMRXJyb3IoY29udGV4dCwg Y29udGV4dC5JTlZBTElEX0VOVU0sICJjb250ZXh0LmJ1ZmZlckRhdGEoY29udGV4dC5BUlJBWV9C VUZGRVIsIDE2LCBkZXNrdG9wR0xbJ0RZTkFNSUNfQ09QWSddKSIpOwogCiBkZWJ1ZygiIikKIHN1 Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93 ZWJnbC9yZXNvdXJjZXMvZGVza3RvcC1nbC1jb25zdGFudHMuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvcmVzb3VyY2VzL2Rlc2t0b3AtZ2wtY29uc3RhbnRz LmpzCShyZXZpc2lvbiA2MjQ2OSkKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3Jl c291cmNlcy9kZXNrdG9wLWdsLWNvbnN0YW50cy5qcwkod29ya2luZyBjb3B5KQpAQCAtMTgsNiAr MTgsNyBAQCB2YXIgZGVza3RvcEdMID0gewogICAnU1RBVElDX1JFQUQnOiAnMHg4OEU1JywKICAg J0NMSVBfUExBTkUwJzogJzB4MzAwMCcsCiAgICdQRVJTUEVDVElWRV9DT1JSRUNUSU9OX0hJTlQn OiAnMHgwQzUwJywKKyAgJ0FDQ1VNX0JVRkZFUl9CSVQnOiAnMHgwMjAwJywKICAgJ1JHQjQnOiAn MHg4MDRGJywKICAgJ1JHQjUnOiAnMHg4MDUwJywKICAgJ1JHQjgnOiAnMHg4MDUxJywK