84663 2012-04-23 18:14:33 -0700 [V8] Pass Isolate around in SerializedScriptValue.cpp (Part1) 2012-04-24 10:01:54 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 608267 0 haraken 2012-04-23 18:14:33 -0700 The objective is to pass Isolate to toV8() in SerializedScriptValue.cpp. Part1: Add an Isolate argument to SerializedScriptValue::create(), SerializedScriptValue::deserialize(), etc Part2: Add an m_isolate member to SerializedScriptValue::Writer() and SerializedScriptValue::Reader() Part3: Pass Isolate to toV8(). In this bug, we fix Part1. 608271 1 138481 haraken 2012-04-23 18:17:36 -0700 Created attachment 138481 Patch 608789 2 138481 webkit.review.bot 2012-04-24 10:01:47 -0700 Comment on attachment 138481 Patch Clearing flags on attachment: 138481 Committed r115077: <http://trac.webkit.org/changeset/115077> 608790 3 webkit.review.bot 2012-04-24 10:01:54 -0700 All reviewed patches have been landed. Closing bug. 138481 2012-04-23 18:17:36 -0700 2012-04-24 10:01:47 -0700 Patch bug-84663-20120423181735.patch text/plain 9067 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0OTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJmYmY2NTY0YzQwODYw MTU3YzgwN2Y2YWFlZjkzMjQ5MDQ0ZjYxMC4uNzc3MGU3MGJhMGE3NmQ5ZDg1ODU0NTg3MDNjZjc4 MzIyMTZjZTExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA0LTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFBhc3MgSXNv bGF0ZSBhcm91bmQgaW4gU2VyaWFsaXplZFNjcmlwdFZhbHVlLmNwcCAoUGFydDEpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDY2MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBvYmplY3RpdmUgaXMg dG8gcGFzcyBJc29sYXRlIHRvIHRvVjgoKSBpbiBTZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwLgor CisgICAgICAgIFBhcnQxOiBBZGQgYW4gSXNvbGF0ZSBhcmd1bWVudCB0byBTZXJpYWxpemVkU2Ny aXB0VmFsdWU6OmNyZWF0ZSgpLAorICAgICAgICBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2Vy aWFsaXplKCksIGV0Yy4KKyAgICAgICAgUGFydDI6IEFkZCBhbiBtX2lzb2xhdGUgbWVtYmVyIHRv IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6V3JpdGVyKCkKKyAgICAgICAgYW5kIFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZTo6UmVhZGVyKCkuCisgICAgICAgIFBhcnQzOiBQYXNzIElzb2xhdGUgdG8gdG9W OCgpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgUGFydDEuCisKKyAgICAgICAgTm8gdGVz dHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Nlcmlh bGl6ZWRTY3JpcHRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0 VmFsdWU6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWU6 OnVuZGVmaW5lZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZTo6Ym9vbGVhblZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZTo6bnVtYmVyVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZhbHVl OjpTZXJpYWxpemVkU2NyaXB0VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6U2VyaWFsaXplZFNj cmlwdFZhbHVlOjpkZXNlcmlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpTZXJpYWxpemVkU2Ny aXB0VmFsdWU6OmRlc2VyaWFsaXplRm9ySW5zcGVjdG9yKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuaDoKKyAgICAgICAgKFNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZSk6CisKIDIwMTItMDQtMjMgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5v cmc+CiAKICAgICAgICAgQ3V0IGRlcGVuZGVuY3kgb24gUmVuZGVyTGF5ZXI6OnNjcm9sbFJlY3RU b1Zpc2libGUgb3V0c2lkZSByZW5kZXJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9TZXJpYWxpemVkU2NyaXB0VmFsdWUuY3BwCmluZGV4IGY2MGQzNjZhODdmNmExZDEy YjU5NDQ4OTlmNzk2NjIxMzUyMGVhMWEuLjY0MzYyYTQzNzQxYWJmZDA0NzU0OGUwOTgzZDVkMzgy ZDNkZTk0YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NlcmlhbGl6 ZWRTY3JpcHRWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFs aXplZFNjcmlwdFZhbHVlLmNwcApAQCAtMjA3NywxNSArMjA3NywxNiBAQCB2b2lkIFNlcmlhbGl6 ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemVBbmRTZXRQcm9wZXJ0eSh2ODo6SGFuZGxlPHY4OjpP YmplY3Q+IG9iagogCiBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsaXpl ZFNjcmlwdFZhbHVlOjpjcmVhdGUodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IE1lc3NhZ2VQb3J0QXJyYXkqIG1lc3NhZ2VQb3J0cywgQXJyYXlCdWZmZXJBcnJheSogYXJyYXlC dWZmZXJzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJvb2wmIGRpZFRocm93KQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wmIGRpZFRocm93LAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHY4OjpJc29sYXRlKiBpc29sYXRlKQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcg U2VyaWFsaXplZFNjcmlwdFZhbHVlKHZhbHVlLCBtZXNzYWdlUG9ydHMsIGFycmF5QnVmZmVycywg ZGlkVGhyb3cpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IFNlcmlhbGl6ZWRTY3JpcHRWYWx1 ZSh2YWx1ZSwgbWVzc2FnZVBvcnRzLCBhcnJheUJ1ZmZlcnMsIGRpZFRocm93LCBpc29sYXRlKSk7 CiB9CiAKLVBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxpemVkU2NyaXB0 VmFsdWU6OmNyZWF0ZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCitQYXNzUmVmUHRyPFNl cmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpjcmVhdGUodjg6Okhh bmRsZTx2ODo6VmFsdWU+IHZhbHVlLCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsKICAgICBib29s IGRpZFRocm93OwotICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXplZFNjcmlwdFZhbHVl KHZhbHVlLCAwLCAwLCBkaWRUaHJvdykpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFs aXplZFNjcmlwdFZhbHVlKHZhbHVlLCAwLCAwLCBkaWRUaHJvdywgaXNvbGF0ZSkpOwogfQogCiBQ YXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpj cmVhdGVGcm9tV2lyZShjb25zdCBTdHJpbmcmIGRhdGEpCkBAIC0yMDkzLDcgKzIwOTQsNyBAQCBQ YXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpj cmVhdGVGcm9tV2lyZShjb25zdCBTdAogICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXpl ZFNjcmlwdFZhbHVlKGRhdGEpKTsKIH0KIAotUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFs dWU+IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgZGF0YSkKK1Bh c3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNy ZWF0ZShjb25zdCBTdHJpbmcmIGRhdGEsIHY4OjpJc29sYXRlKiBpc29sYXRlKQogewogICAgIFdy aXRlciB3cml0ZXI7CiAgICAgd3JpdGVyLndyaXRlV2ViQ29yZVN0cmluZyhkYXRhKTsKQEAgLTIx MjAsNyArMjEyMSw3IEBAIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogU2VyaWFsaXplZFNjcmlwdFZh bHVlOjpudWxsVmFsdWUoKQogICAgIHJldHVybiBudWxsVmFsdWUuZ2V0KCk7CiB9CiAKLVBhc3NS ZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OnVuZGVm aW5lZFZhbHVlKCkKK1Bhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxpemVk U2NyaXB0VmFsdWU6OnVuZGVmaW5lZFZhbHVlKHY4OjpJc29sYXRlKiBpc29sYXRlKQogewogICAg IFdyaXRlciB3cml0ZXI7CiAgICAgd3JpdGVyLndyaXRlVW5kZWZpbmVkKCk7CkBAIC0yMTI4LDcg KzIxMjksNyBAQCBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsaXplZFNj cmlwdFZhbHVlOjp1bmRlZmluZWRWYWx1ZSgpCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTZXJp YWxpemVkU2NyaXB0VmFsdWUod2lyZURhdGEpKTsKIH0KIAotUGFzc1JlZlB0cjxTZXJpYWxpemVk U2NyaXB0VmFsdWU+IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Ym9vbGVhblZhbHVlKGJvb2wgdmFs dWUpCitQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZh bHVlOjpib29sZWFuVmFsdWUoYm9vbCB2YWx1ZSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7CiAg ICAgV3JpdGVyIHdyaXRlcjsKICAgICBpZiAodmFsdWUpCkBAIC0yMTM5LDcgKzIxNDAsNyBAQCBQ YXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gU2VyaWFsaXplZFNjcmlwdFZhbHVlOjpi b29sZWFuVmFsdWUoYm9vbCB2YWx1ZQogICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2VyaWFsaXpl ZFNjcmlwdFZhbHVlKHdpcmVEYXRhKSk7CiB9CiAKLVBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlw dFZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6Om51bWJlclZhbHVlKGRvdWJsZSB2YWx1ZSkK K1Bhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6 Om51bWJlclZhbHVlKGRvdWJsZSB2YWx1ZSwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7CiAgICAg V3JpdGVyIHdyaXRlcjsKICAgICB3cml0ZXIud3JpdGVOdW1iZXIodmFsdWUpOwpAQCAtMjIwNCw3 ICsyMjA1LDggQEAgUGFzc093blB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU6OkFycmF5QnVmZmVy Q29udGVudHNBcnJheT4gU2VyaWFsaXplZFNjcmlwdFZhbHUKIAogU2VyaWFsaXplZFNjcmlwdFZh bHVlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWUodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlLCAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1lc3NhZ2VQb3J0 QXJyYXkqIG1lc3NhZ2VQb3J0cywgQXJyYXlCdWZmZXJBcnJheSogYXJyYXlCdWZmZXJzLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCYgZGlkVGhyb3cp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sJiBkaWRU aHJvdywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHY4OjpJ c29sYXRlKiBpc29sYXRlKQogewogICAgIGRpZFRocm93ID0gZmFsc2U7CiAgICAgV3JpdGVyIHdy aXRlcjsKQEAgLTIyNTUsNyArMjI1Nyw3IEBAIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6U2VyaWFs aXplZFNjcmlwdFZhbHVlKGNvbnN0IFN0cmluZyYgd2lyZURhdGEpCiAgICAgbV9kYXRhID0gd2ly ZURhdGEuaXNvbGF0ZWRDb3B5KCk7CiB9CiAKLXY4OjpIYW5kbGU8djg6OlZhbHVlPiBTZXJpYWxp emVkU2NyaXB0VmFsdWU6OmRlc2VyaWFsaXplKE1lc3NhZ2VQb3J0QXJyYXkqIG1lc3NhZ2VQb3J0 cykKK3Y4OjpIYW5kbGU8djg6OlZhbHVlPiBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRlc2VyaWFs aXplKE1lc3NhZ2VQb3J0QXJyYXkqIG1lc3NhZ2VQb3J0cywgdjg6Oklzb2xhdGUqIGlzb2xhdGUp CiB7CiAgICAgaWYgKCFtX2RhdGEuaW1wbCgpKQogICAgICAgICByZXR1cm4gdjg6Ok51bGwoKTsK QEAgLTIyNjYsMTIgKzIyNjgsMTIgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemUoTWVzc2FnZVBvcnRBcnJheSogbWVzc2EKIH0KIAogI2lm IEVOQUJMRShJTlNQRUNUT1IpCi1TY3JpcHRWYWx1ZSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmRl c2VyaWFsaXplRm9ySW5zcGVjdG9yKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSkKK1NjcmlwdFZh bHVlIFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6ZGVzZXJpYWxpemVGb3JJbnNwZWN0b3IoU2NyaXB0 U3RhdGUqIHNjcmlwdFN0YXRlLCB2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsKICAgICB2ODo6SGFu ZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIGNvbnRleHRTY29w ZShzY3JpcHRTdGF0ZS0+Y29udGV4dCgpKTsKIAotICAgIHJldHVybiBTY3JpcHRWYWx1ZShkZXNl cmlhbGl6ZSgpKTsKKyAgICByZXR1cm4gU2NyaXB0VmFsdWUoZGVzZXJpYWxpemUoMCwgaXNvbGF0 ZSkpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1NlcmlhbGl6ZWRTY3JpcHRWYWx1ZS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Vy aWFsaXplZFNjcmlwdFZhbHVlLmgKaW5kZXggZDYyOWFjNGY1MDc2MzdjYjUwNjNhODQ2OGU5NTcy YTM2MzE2NGE2Ny4uNDllZTU4NDU3OTE4ODBjZGFkZjcxNDQzNDU0NWIyZGVhNzRhMjc1NiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2VyaWFsaXplZFNjcmlwdFZhbHVl LmgKQEAgLTU3LDE2ICs1NywxNiBAQCBwdWJsaWM6CiAgICAgLy8gVjguIFdoZW4gc2VyaWFsaXph dGlvbiBpcyBzdWNjZXNzZnVsLCB8ZGlkVGhyb3d8IGlzIGZhbHNlLgogICAgIHN0YXRpYyBQYXNz UmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gY3JlYXRlKHY4OjpIYW5kbGU8djg6OlZhbHVl PiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBN ZXNzYWdlUG9ydEFycmF5KiwgQXJyYXlCdWZmZXJBcnJheSosCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCYgZGlkVGhyb3cpOwotICAgIHN0 YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gY3JlYXRlKHY4OjpIYW5kbGU8 djg6OlZhbHVlPik7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYm9vbCYgZGlkVGhyb3csIHY4OjpJc29sYXRlKiA9IDApOworICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gY3JlYXRlKHY4OjpIYW5kbGU8djg6OlZh bHVlPiwgdjg6Oklzb2xhdGUqID0gMCk7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2VyaWFsaXpl ZFNjcmlwdFZhbHVlPiBjcmVhdGVGcm9tV2lyZShjb25zdCBTdHJpbmcmIGRhdGEpOwotICAgIHN0 YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gY3JlYXRlKGNvbnN0IFN0cmlu ZyYgZGF0YSk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiBj cmVhdGUoY29uc3QgU3RyaW5nJiBkYXRhLCB2ODo6SXNvbGF0ZSogPSAwKTsKICAgICBzdGF0aWMg UGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IGNyZWF0ZSgpOwogCiAgICAgc3RhdGlj IFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZSogbnVsbFZhbHVlKCk7Ci0gICAgc3RhdGljIFBhc3NSZWZQ dHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiB1bmRlZmluZWRWYWx1ZSgpOwotICAgIHN0YXRpYyBQ YXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gYm9vbGVhblZhbHVlKGJvb2wgdmFsdWUp OwotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gbnVtYmVyVmFs dWUoZG91YmxlIHZhbHVlKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0 VmFsdWU+IHVuZGVmaW5lZFZhbHVlKHY4OjpJc29sYXRlKiA9IDApOworICAgIHN0YXRpYyBQYXNz UmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4gYm9vbGVhblZhbHVlKGJvb2wgdmFsdWUsIHY4 OjpJc29sYXRlKiA9IDApOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNlcmlhbGl6ZWRTY3JpcHRW YWx1ZT4gbnVtYmVyVmFsdWUoZG91YmxlIHZhbHVlLCB2ODo6SXNvbGF0ZSogPSAwKTsKIAogICAg IFBhc3NSZWZQdHI8U2VyaWFsaXplZFNjcmlwdFZhbHVlPiByZWxlYXNlKCk7CiAKQEAgLTc0LDEw ICs3NCwxMCBAQCBwdWJsaWM6CiAKICAgICAvLyBEZXNlcmlhbGl6ZXMgdGhlIHZhbHVlIChpbiB0 aGUgY3VycmVudCBjb250ZXh0KS4gUmV0dXJucyBhIG51bGwgdmFsdWUgaW4KICAgICAvLyBjYXNl IG9mIGZhaWx1cmUuCi0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGRlc2VyaWFsaXplKE1lc3Nh Z2VQb3J0QXJyYXkqID0gMCk7CisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGRlc2VyaWFsaXpl KE1lc3NhZ2VQb3J0QXJyYXkqID0gMCwgdjg6Oklzb2xhdGUqID0gMCk7CiAKICNpZiBFTkFCTEUo SU5TUEVDVE9SKQotICAgIFNjcmlwdFZhbHVlIGRlc2VyaWFsaXplRm9ySW5zcGVjdG9yKFNjcmlw dFN0YXRlKik7CisgICAgU2NyaXB0VmFsdWUgZGVzZXJpYWxpemVGb3JJbnNwZWN0b3IoU2NyaXB0 U3RhdGUqLCB2ODo6SXNvbGF0ZSogPSAwKTsKICNlbmRpZgogCiAgICAgY29uc3QgVmVjdG9yPFN0 cmluZz4mIGJsb2JVUkxzKCkgY29uc3QgeyByZXR1cm4gbV9ibG9iVVJMczsgfQpAQCAtOTAsNyAr OTAsNyBAQCBwcml2YXRlOgogICAgIHR5cGVkZWYgVmVjdG9yPFdURjo6QXJyYXlCdWZmZXJDb250 ZW50cywgMT4gQXJyYXlCdWZmZXJDb250ZW50c0FycmF5OwogCiAgICAgU2VyaWFsaXplZFNjcmlw dFZhbHVlKCk7Ci0gICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlKHY4OjpIYW5kbGU8djg6OlZhbHVl PiwgTWVzc2FnZVBvcnRBcnJheSosIEFycmF5QnVmZmVyQXJyYXkqLCBib29sJiBkaWRUaHJvdyk7 CisgICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlKHY4OjpIYW5kbGU8djg6OlZhbHVlPiwgTWVzc2Fn ZVBvcnRBcnJheSosIEFycmF5QnVmZmVyQXJyYXkqLCBib29sJiBkaWRUaHJvdywgdjg6Oklzb2xh dGUqKTsKICAgICBleHBsaWNpdCBTZXJpYWxpemVkU2NyaXB0VmFsdWUoY29uc3QgU3RyaW5nJiB3 aXJlRGF0YSk7CiAKICAgICBzdGF0aWMgUGFzc093blB0cjxBcnJheUJ1ZmZlckNvbnRlbnRzQXJy YXk+IHRyYW5zZmVyQXJyYXlCdWZmZXJzKEFycmF5QnVmZmVyQXJyYXkmLCBib29sJiBkaWRUaHJv dyk7Cg==