24590 2009-03-13 15:25:08 -0700 Refactor InspectorDOMStorageResource to use ScriptFunctionCall 2009-03-16 09:49:47 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 24524 25063 1 dglazkov webkit-unassigned timothy oldest_to_newest 113714 0 dglazkov 2009-03-13 15:25:08 -0700 Following up on bug 24524, do the same thing for InspectorDOMStorageResource. 113717 1 28606 dglazkov 2009-03-13 15:30:51 -0700 Created attachment 28606 Use ScriptFunctionCall on InspectorDOMStorageResource, v1 WebCore/ChangeLog | 27 ++++++ WebCore/bindings/js/ScriptFunctionCall.cpp | 5 + WebCore/bindings/js/ScriptFunctionCall.h | 7 +- WebCore/bindings/js/ScriptObjectQuarantine.cpp | 22 ++++- WebCore/bindings/js/ScriptObjectQuarantine.h | 3 + WebCore/inspector/InspectorController.cpp | 89 ++------------------- WebCore/inspector/InspectorController.h | 5 - WebCore/inspector/InspectorDOMStorageResource.cpp | 54 ++++++++++--- WebCore/inspector/InspectorDOMStorageResource.h | 22 +++-- 9 files changed, 119 insertions(+), 115 deletions(-) 113887 2 dglazkov 2009-03-16 09:49:47 -0700 Landed as http://trac.webkit.org/changeset/41734. 28606 2009-03-13 15:30:51 -0700 2009-03-13 21:43:54 -0700 Use ScriptFunctionCall on InspectorDOMStorageResource, v1 Use-ScriptFunctionCall-on-InspectorDOMStorageResource-v1.patch text/plain 15107 dglazkov YzY3OTJmOTE2YTU5MmUwZWMwMDdkOThiZWVjNjk4YTAzY2E5ODkwNwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMmJmZGQyLi5mNTU0Y2E3 IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDMwIEBACisyMDA5LTAzLTEzICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NTkwCisgICAg ICAgIFJlZmFjdG9yIEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZSB0byB1c2UgU2NyaXB0RnVu Y3Rpb25DYWxsLgorCisgICAgICAgIFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hB TkdFRAorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0RnVuY3Rpb25DYWxsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNjcmlwdEZ1bmN0aW9uQ2FsbDo6YXBwZW5kQXJndW1lbnQpOiBBZGRl ZCBtZXRob2QgZm9yIGJvb2wgYXJndW1lbnQuCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0 RnVuY3Rpb25DYWxsLmg6IERpdHRvLCBhbHNvIGNsZWFuZWQgdXAuCisgICAgICAgICogYmluZGlu Z3MvanMvU2NyaXB0T2JqZWN0UXVhcmFudGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRR dWFyYW50aW5lZFNjcmlwdE9iamVjdCk6IEFkZGVkIFN0b3JhZ2UgaGVscGVyLgorICAgICAgICAq IGJpbmRpbmdzL2pzL1NjcmlwdE9iamVjdFF1YXJhbnRpbmUuaDogRGl0dG8uCisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRPYmplY3RzKTogQ2hhbmdlZCB0byB1c2Ug YmluZCBtZXRob2QuCisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpyZXNl dFNjcmlwdE9iamVjdHMpOiBDaGFuZ2VkIHRvIHVzZSB1bmJpbmQgbWV0aG9kLgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6ZGlkVXNlRE9NU3RvcmFnZSk6IENoYW5nZWQg dG8gdXNlIGlzU2FtZUhvc3RBbmRUeXBlIGFuZCBiaW5kIG1ldGhvZHMuCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaDogUmVtb3ZlZCBhZGQvcmVtb3ZlIG1ldGhvZHMg Zm9yIERPTSBzdG9yYWdlLgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdl UmVzb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291 cmNlOjpJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yRE9NU3RvcmFnZVJlc291cmNlOjppc1NhbWVIb3N0QW5kVHlwZSk6IEFkZGVkLgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlOjpiaW5kKTogQWRkZWQu CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2U6OnVuYmluZCk6 IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2Uu aDoKKwogMjAwOS0wMy0xMyAgSmlhbiBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRGdW5jdGlvbkNhbGwuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3Jp cHRGdW5jdGlvbkNhbGwuY3BwCmluZGV4IGExZjY2OTMuLjMyMjNhYTkgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RnVuY3Rpb25DYWxsLmNwcAorKysgYi9XZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdEZ1bmN0aW9uQ2FsbC5jcHAKQEAgLTYyLDYgKzYyLDExIEBAIHZvaWQg U2NyaXB0RnVuY3Rpb25DYWxsOjphcHBlbmRBcmd1bWVudChjb25zdCBTdHJpbmcmIGFyZ3VtZW50 KQogICAgIG1fYXJndW1lbnRzLmFwcGVuZChqc1N0cmluZyhtX2V4ZWMsIGFyZ3VtZW50KSk7CiB9 CiAKK3ZvaWQgU2NyaXB0RnVuY3Rpb25DYWxsOjphcHBlbmRBcmd1bWVudChib29sIGFyZ3VtZW50 KQoreworICAgIG1fYXJndW1lbnRzLmFwcGVuZChqc0Jvb2xlYW4oYXJndW1lbnQpKTsKK30KKwog U2NyaXB0VmFsdWUgU2NyaXB0RnVuY3Rpb25DYWxsOjpjYWxsKGJvb2wmIGhhZEV4Y2VwdGlvbikK IHsKICAgICBKU09iamVjdCogdGhpc09iamVjdCA9IG1fdGhpc09iamVjdC5qc09iamVjdCgpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRGdW5jdGlvbkNhbGwuaCBiL1dl YkNvcmUvYmluZGluZ3MvanMvU2NyaXB0RnVuY3Rpb25DYWxsLmgKaW5kZXggMDIwZjI2Ny4uZGQ3 N2UzNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRGdW5jdGlvbkNhbGwu aAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdEZ1bmN0aW9uQ2FsbC5oCkBAIC00NSw5 ICs0NSwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFNjcmlwdEZ1bmN0aW9uQ2Fs bChTY3JpcHRTdGF0ZSogZXhlYywgY29uc3QgU2NyaXB0T2JqZWN0JiB0aGlzT2JqZWN0LCBjb25z dCBjaGFyKiBuYW1lKTsKICAgICAgICAgdmlydHVhbCB+U2NyaXB0RnVuY3Rpb25DYWxsKCkge307 CiAKLSAgICAgICAgdm9pZCBhcHBlbmRBcmd1bWVudChjb25zdCBTY3JpcHRPYmplY3QmIHBhcmFt ZXRlcik7Ci0gICAgICAgIHZvaWQgYXBwZW5kQXJndW1lbnQoY29uc3QgU2NyaXB0VmFsdWUmIHBh cmFtZXRlcik7Ci0gICAgICAgIHZvaWQgYXBwZW5kQXJndW1lbnQoY29uc3QgU3RyaW5nJiBwYXJh bWV0ZXIpOworICAgICAgICB2b2lkIGFwcGVuZEFyZ3VtZW50KGNvbnN0IFNjcmlwdE9iamVjdCYp OworICAgICAgICB2b2lkIGFwcGVuZEFyZ3VtZW50KGNvbnN0IFNjcmlwdFZhbHVlJik7CisgICAg ICAgIHZvaWQgYXBwZW5kQXJndW1lbnQoY29uc3QgU3RyaW5nJik7CisgICAgICAgIHZvaWQgYXBw ZW5kQXJndW1lbnQoYm9vbCk7CiAgICAgICAgIFNjcmlwdFZhbHVlIGNhbGwoYm9vbCYgaGFkRXhj ZXB0aW9uKTsKICAgICAgICAgU2NyaXB0T2JqZWN0IGNvbnN0cnVjdChib29sJiBoYWRFeGNlcHRp b24pOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdE9iamVjdFF1YXJh bnRpbmUuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRPYmplY3RRdWFyYW50aW5lLmNw cAppbmRleCA0OTQyMTA5Li44Y2IzZDI1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pz L1NjcmlwdE9iamVjdFF1YXJhbnRpbmUuY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvanMvU2Ny aXB0T2JqZWN0UXVhcmFudGluZS5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJEb2N1 bWVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiSlNEYXRhYmFzZS5oIgorI2lu Y2x1ZGUgIkpTU3RvcmFnZS5oIgogI2luY2x1ZGUgIkpTRE9NQmluZGluZy5oIgogI2luY2x1ZGUg IkpTSW5zcGVjdGVkT2JqZWN0V3JhcHBlci5oIgogI2luY2x1ZGUgIlNjcmlwdE9iamVjdC5oIgpA QCAtNDgsMTYgKzQ5LDI5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGJvb2wgZ2V0UXVhcmFudGlu ZWRTY3JpcHRPYmplY3QoRGF0YWJhc2UqIGRhdGFiYXNlLCBTY3JpcHRPYmplY3QmIHF1YXJhbnRp bmVkT2JqZWN0KQogewogICAgIEFTU0VSVChkYXRhYmFzZSk7Ci0gICAgCisKICAgICBGcmFtZSog ZnJhbWUgPSBkYXRhYmFzZS0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQog ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCisKICAgICBFeGVjU3RhdGUqIGV4ZWMgPSB0b0pT RE9NV2luZG93KGZyYW1lKS0+Z2xvYmFsRXhlYygpOwotICAgIAorCiAgICAgSlNMb2NrIGxvY2so ZmFsc2UpOwogICAgIHF1YXJhbnRpbmVkT2JqZWN0ID0gU2NyaXB0T2JqZWN0KGFzT2JqZWN0KEpT SW5zcGVjdGVkT2JqZWN0V3JhcHBlcjo6d3JhcChleGVjLCB0b0pTKGV4ZWMsIGRhdGFiYXNlKSkp KTsKLSAgICAKKworICAgIHJldHVybiB0cnVlOworfQorCitib29sIGdldFF1YXJhbnRpbmVkU2Ny aXB0T2JqZWN0KEZyYW1lKiBmcmFtZSwgU3RvcmFnZSogc3RvcmFnZSwgU2NyaXB0T2JqZWN0JiBx dWFyYW50aW5lZE9iamVjdCkKK3sKKyAgICBBU1NFUlQoZnJhbWUpOworICAgIEFTU0VSVChzdG9y YWdlKTsKKworICAgIEV4ZWNTdGF0ZSogZXhlYyA9IHRvSlNET01XaW5kb3coZnJhbWUpLT5nbG9i YWxFeGVjKCk7CisKKyAgICBKU0xvY2sgbG9jayhmYWxzZSk7CisgICAgcXVhcmFudGluZWRPYmpl Y3QgPSBTY3JpcHRPYmplY3QoYXNPYmplY3QoSlNJbnNwZWN0ZWRPYmplY3RXcmFwcGVyOjp3cmFw KGV4ZWMsIHRvSlMoZXhlYywgc3RvcmFnZSkpKSk7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRPYmplY3RRdWFyYW50aW5lLmgg Yi9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdE9iamVjdFF1YXJhbnRpbmUuaAppbmRleCA1Y2Iy MjRiLi4wNjY5ZmE2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdE9iamVj dFF1YXJhbnRpbmUuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdE9iamVjdFF1YXJh bnRpbmUuaApAQCAtMzQsOSArMzQsMTIgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNs YXNzIERhdGFiYXNlOworICAgIGNsYXNzIEZyYW1lOwogICAgIGNsYXNzIFNjcmlwdE9iamVjdDsK KyAgICBjbGFzcyBTdG9yYWdlOwogCiAgICAgYm9vbCBnZXRRdWFyYW50aW5lZFNjcmlwdE9iamVj dChEYXRhYmFzZSogZGF0YWJhc2UsIFNjcmlwdE9iamVjdCYgcXVhcmFudGluZWRPYmplY3QpOwor ICAgIGJvb2wgZ2V0UXVhcmFudGluZWRTY3JpcHRPYmplY3QoRnJhbWUqIGZyYW1lLCBTdG9yYWdl KiBzdG9yYWdlLCBTY3JpcHRPYmplY3QmIHF1YXJhbnRpbmVkT2JqZWN0KTsKIAogfQogCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IGEwZWNlYmMuLmUyZDU3 ZmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xMTkw LDg0ICsxMTkwLDEyIEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6cG9wdWxhdGVTY3JpcHRP YmplY3RzKCkKICNpZiBFTkFCTEUoRE9NX1NUT1JBR0UpCiAgICAgRE9NU3RvcmFnZVJlc291cmNl c1NldDo6aXRlcmF0b3IgZG9tU3RvcmFnZUVuZCA9IG1fZG9tU3RvcmFnZVJlc291cmNlcy5lbmQo KTsKICAgICBmb3IgKERPTVN0b3JhZ2VSZXNvdXJjZXNTZXQ6Oml0ZXJhdG9yIGl0ID0gbV9kb21T dG9yYWdlUmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IGRvbVN0b3JhZ2VFbmQ7ICsraXQpCi0gICAg ICAgIGFkZERPTVN0b3JhZ2VTY3JpcHRSZXNvdXJjZShpdC0+Z2V0KCkpOworICAgICAgICAoKml0 KS0+YmluZCh0b0pTKG1fc2NyaXB0Q29udGV4dCksIFNjcmlwdE9iamVjdCh0b0pTKG1fc2NyaXB0 T2JqZWN0KSkpOwogI2VuZGlmCiAKICAgICBjYWxsU2ltcGxlRnVuY3Rpb24obV9zY3JpcHRDb250 ZXh0LCBtX3NjcmlwdE9iamVjdCwgInBvcHVsYXRlSW50ZXJmYWNlIik7CiB9CiAKLSNpZiBFTkFC TEUoRE9NX1NUT1JBR0UpCi1KU09iamVjdFJlZiBJbnNwZWN0b3JDb250cm9sbGVyOjphZGRET01T dG9yYWdlU2NyaXB0UmVzb3VyY2UoSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlKiByZXNvdXJj ZSkKLXsKLSAgICBBU1NFUlRfQVJHKHJlc291cmNlLCByZXNvdXJjZSk7Ci0KLSAgICBpZiAocmVz b3VyY2UtPnNjcmlwdE9iamVjdCkKLSAgICAgICAgcmV0dXJuIHJlc291cmNlLT5zY3JpcHRPYmpl Y3Q7Ci0KLSAgICBBU1NFUlQobV9zY3JpcHRDb250ZXh0KTsKLSAgICBBU1NFUlQobV9zY3JpcHRP YmplY3QpOwotICAgIGlmICghbV9zY3JpcHRDb250ZXh0IHx8ICFtX3NjcmlwdE9iamVjdCkKLSAg ICAgICAgcmV0dXJuIDA7Ci0KLSAgICBKU1ZhbHVlUmVmIGV4Y2VwdGlvbiA9IDA7Ci0KLSAgICBK U1ZhbHVlUmVmIGRvbVN0b3JhZ2VQcm9wZXJ0eSA9IEpTT2JqZWN0R2V0UHJvcGVydHkobV9zY3Jp cHRDb250ZXh0LCBtX3NjcmlwdE9iamVjdCwganNTdHJpbmdSZWYoIkRPTVN0b3JhZ2UiKS5nZXQo KSwgJmV4Y2VwdGlvbik7Ci0gICAgaWYgKEhBTkRMRV9FWENFUFRJT04obV9zY3JpcHRDb250ZXh0 LCBleGNlcHRpb24pKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIEpTT2JqZWN0UmVmIGRvbVN0 b3JhZ2VDb25zdHJ1Y3RvciA9IEpTVmFsdWVUb09iamVjdChtX3NjcmlwdENvbnRleHQsIGRvbVN0 b3JhZ2VQcm9wZXJ0eSwgJmV4Y2VwdGlvbik7Ci0gICAgaWYgKEhBTkRMRV9FWENFUFRJT04obV9z Y3JpcHRDb250ZXh0LCBleGNlcHRpb24pKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIEV4ZWNT dGF0ZSogZXhlYyA9IHRvSlNET01XaW5kb3cocmVzb3VyY2UtPmZyYW1lLmdldCgpKS0+Z2xvYmFs RXhlYygpOwotCi0gICAgSlNWYWx1ZVJlZiBkb21TdG9yYWdlOwotCi0gICAgewotICAgICAgICBK U0M6OkpTTG9jayBsb2NrKGZhbHNlKTsKLSAgICAgICAgZG9tU3RvcmFnZSA9IHRvUmVmKEpTSW5z cGVjdGVkT2JqZWN0V3JhcHBlcjo6d3JhcChleGVjLCB0b0pTKGV4ZWMsIHJlc291cmNlLT5kb21T dG9yYWdlLmdldCgpKSkpOwotICAgIH0KLQotICAgIEpTVmFsdWVSZWYgZG9tYWluVmFsdWUgPSBK U1ZhbHVlTWFrZVN0cmluZyhtX3NjcmlwdENvbnRleHQsIGpzU3RyaW5nUmVmKHJlc291cmNlLT5m cmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aG9zdCgpKS5nZXQoKSk7Ci0gICAg SlNWYWx1ZVJlZiBpc0xvY2FsU3RvcmFnZVZhbHVlID0gSlNWYWx1ZU1ha2VCb29sZWFuKG1fc2Ny aXB0Q29udGV4dCwgcmVzb3VyY2UtPmlzTG9jYWxTdG9yYWdlKTsKLQotICAgIEpTVmFsdWVSZWYg YXJndW1lbnRzW10gPSB7IGRvbVN0b3JhZ2UsIGRvbWFpblZhbHVlLCBpc0xvY2FsU3RvcmFnZVZh bHVlIH07Ci0gICAgSlNPYmplY3RSZWYgcmVzdWx0ID0gSlNPYmplY3RDYWxsQXNDb25zdHJ1Y3Rv cihtX3NjcmlwdENvbnRleHQsIGRvbVN0b3JhZ2VDb25zdHJ1Y3RvciwgMywgYXJndW1lbnRzLCAm ZXhjZXB0aW9uKTsKLSAgICBpZiAoSEFORExFX0VYQ0VQVElPTihtX3NjcmlwdENvbnRleHQsIGV4 Y2VwdGlvbikpCi0gICAgICAgIHJldHVybiAwOwotCi0gICAgQVNTRVJUKHJlc3VsdCk7Ci0KLSAg ICBjYWxsRnVuY3Rpb24obV9zY3JpcHRDb250ZXh0LCBtX3NjcmlwdE9iamVjdCwgImFkZERPTVN0 b3JhZ2UiLCAxLCAmcmVzdWx0LCBleGNlcHRpb24pOwotCi0gICAgaWYgKGV4Y2VwdGlvbikKLSAg ICAgICAgcmV0dXJuIDA7Ci0KLSAgICByZXNvdXJjZS0+c2V0U2NyaXB0T2JqZWN0KG1fc2NyaXB0 Q29udGV4dCwgcmVzdWx0KTsKLQotICAgIHJldHVybiByZXN1bHQ7Ci19Ci0KLXZvaWQgSW5zcGVj dG9yQ29udHJvbGxlcjo6cmVtb3ZlRE9NU3RvcmFnZVNjcmlwdFJlc291cmNlKEluc3BlY3RvckRP TVN0b3JhZ2VSZXNvdXJjZSogcmVzb3VyY2UpCi17Ci0gICAgQVNTRVJUKG1fc2NyaXB0Q29udGV4 dCk7Ci0gICAgQVNTRVJUKG1fc2NyaXB0T2JqZWN0KTsKLSAgICBpZiAoIW1fc2NyaXB0Q29udGV4 dCB8fCAhbV9zY3JpcHRPYmplY3QpCi0gICAgICAgIHJldHVybjsKLQotICAgIEFTU0VSVChyZXNv dXJjZSk7Ci0gICAgQVNTRVJUKHJlc291cmNlLT5zY3JpcHRPYmplY3QpOwotICAgIGlmICghcmVz b3VyY2UgfHwgIXJlc291cmNlLT5zY3JpcHRPYmplY3QpCi0gICAgICAgIHJldHVybjsKLQotICAg IEpTT2JqZWN0UmVmIHNjcmlwdE9iamVjdCA9IHJlc291cmNlLT5zY3JpcHRPYmplY3Q7Ci0gICAg cmVzb3VyY2UtPnNldFNjcmlwdE9iamVjdCgwLCAwKTsKLQotICAgIEpTVmFsdWVSZWYgZXhjZXB0 aW9uID0gMDsKLSAgICBjYWxsRnVuY3Rpb24obV9zY3JpcHRDb250ZXh0LCBtX3NjcmlwdE9iamVj dCwgInJlbW92ZURPTVN0b3JhZ2UiLCAxLCAmc2NyaXB0T2JqZWN0LCBleGNlcHRpb24pOwotfQot I2VuZGlmCi0KIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6YWRkU2NyaXB0Q29uc29sZU1lc3Nh Z2UoY29uc3QgQ29uc29sZU1lc3NhZ2UqIG1lc3NhZ2UpCiB7CiAgICAgQVNTRVJUX0FSRyhtZXNz YWdlLCBtZXNzYWdlKTsKQEAgLTEzNDcsMTAgKzEyNzUsOCBAQCB2b2lkIEluc3BlY3RvckNvbnRy b2xsZXI6OnJlc2V0U2NyaXB0T2JqZWN0cygpCiAjZW5kaWYKICNpZiBFTkFCTEUoRE9NX1NUT1JB R0UpCiAgICAgRE9NU3RvcmFnZVJlc291cmNlc1NldDo6aXRlcmF0b3IgZG9tU3RvcmFnZUVuZCA9 IG1fZG9tU3RvcmFnZVJlc291cmNlcy5lbmQoKTsKLSAgICBmb3IgKERPTVN0b3JhZ2VSZXNvdXJj ZXNTZXQ6Oml0ZXJhdG9yIGl0ID0gbV9kb21TdG9yYWdlUmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9 IGRvbVN0b3JhZ2VFbmQ7ICsraXQpIHsKLSAgICAgICAgSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291 cmNlKiByZXNvdXJjZSA9IGl0LT5nZXQoKTsKLSAgICAgICAgcmVzb3VyY2UtPnNldFNjcmlwdE9i amVjdCgwLCAwKTsKLSAgICB9CisgICAgZm9yIChET01TdG9yYWdlUmVzb3VyY2VzU2V0OjppdGVy YXRvciBpdCA9IG1fZG9tU3RvcmFnZVJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBkb21TdG9yYWdl RW5kOyArK2l0KQorICAgICAgICAoKml0KS0+dW5iaW5kKCk7CiAjZW5kaWYKIAogICAgIGNhbGxT aW1wbGVGdW5jdGlvbihtX3NjcmlwdENvbnRleHQsIG1fc2NyaXB0T2JqZWN0LCAicmVzZXQiKTsK QEAgLTE2NzgsMTcgKzE2MDQsMTYgQEAgdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpkaWRVc2VE T01TdG9yYWdlKFN0b3JhZ2VBcmVhKiBzdG9yYWdlQXJlYSwgYm9vbCBpc0xvY2EKICAgICAgICAg cmV0dXJuOwogCiAgICAgRE9NU3RvcmFnZVJlc291cmNlc1NldDo6aXRlcmF0b3IgZG9tU3RvcmFn ZUVuZCA9IG1fZG9tU3RvcmFnZVJlc291cmNlcy5lbmQoKTsKLSAgICBmb3IgKERPTVN0b3JhZ2VS ZXNvdXJjZXNTZXQ6Oml0ZXJhdG9yIGl0ID0gbV9kb21TdG9yYWdlUmVzb3VyY2VzLmJlZ2luKCk7 IGl0ICE9IGRvbVN0b3JhZ2VFbmQ7ICsraXQpIHsKLSAgICAgICAgSW5zcGVjdG9yRE9NU3RvcmFn ZVJlc291cmNlKiByZXNvdXJjZSA9IGl0LT5nZXQoKTsKLSAgICAgICAgaWYgKGVxdWFsSWdub3Jp bmdDYXNlKHJlc291cmNlLT5mcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aG9z dCgpLCBmcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aG9zdCgpKSAmJiByZXNv dXJjZS0+aXNMb2NhbFN0b3JhZ2UgPT0gaXNMb2NhbFN0b3JhZ2UpCisgICAgZm9yIChET01TdG9y YWdlUmVzb3VyY2VzU2V0OjppdGVyYXRvciBpdCA9IG1fZG9tU3RvcmFnZVJlc291cmNlcy5iZWdp bigpOyBpdCAhPSBkb21TdG9yYWdlRW5kOyArK2l0KQorICAgICAgICBpZiAoKCppdCktPmlzU2Ft ZUhvc3RBbmRUeXBlKGZyYW1lLCBpc0xvY2FsU3RvcmFnZSkpCiAgICAgICAgICAgICByZXR1cm47 Ci0gICAgfQorCiAgICAgUmVmUHRyPFN0b3JhZ2U+IGRvbVN0b3JhZ2UgPSBTdG9yYWdlOjpjcmVh dGUoZnJhbWUsIHN0b3JhZ2VBcmVhKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yRE9NU3RvcmFnZVJl c291cmNlPiByZXNvdXJjZSA9IEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZTo6Y3JlYXRlKGRv bVN0b3JhZ2UuZ2V0KCksIGlzTG9jYWxTdG9yYWdlLCBmcmFtZSk7CiAKICAgICBtX2RvbVN0b3Jh Z2VSZXNvdXJjZXMuYWRkKHJlc291cmNlKTsKICAgICBpZiAod2luZG93VmlzaWJsZSgpKQotICAg ICAgICBhZGRET01TdG9yYWdlU2NyaXB0UmVzb3VyY2UocmVzb3VyY2UuZ2V0KCkpOworICAgICAg ICByZXNvdXJjZS0+YmluZCh0b0pTKG1fc2NyaXB0Q29udGV4dCksIFNjcmlwdE9iamVjdCh0b0pT KG1fc2NyaXB0T2JqZWN0KSkpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuaAppbmRleCA3OTY4NTk3Li5iYTlmMTQyIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0yODYsMTEgKzI4Niw2IEBAIHByaXZhdGU6CiAgICAg dm9pZCBwcnVuZVJlc291cmNlcyhSZXNvdXJjZXNNYXAqLCBEb2N1bWVudExvYWRlciogbG9hZGVy VG9LZWVwID0gMCk7CiAgICAgdm9pZCByZW1vdmVBbGxSZXNvdXJjZXMoUmVzb3VyY2VzTWFwKiBt YXApIHsgcHJ1bmVSZXNvdXJjZXMobWFwKTsgfQogCi0jaWYgRU5BQkxFKERPTV9TVE9SQUdFKQot ICAgIEpTT2JqZWN0UmVmIGFkZERPTVN0b3JhZ2VTY3JpcHRSZXNvdXJjZShJbnNwZWN0b3JET01T dG9yYWdlUmVzb3VyY2UqKTsKLSAgICB2b2lkIHJlbW92ZURPTVN0b3JhZ2VTY3JpcHRSZXNvdXJj ZShJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UqKTsKLSNlbmRpZgotCiAgICAgSlNWYWx1ZVJl ZiBjYWxsU2ltcGxlRnVuY3Rpb24oSlNDb250ZXh0UmVmLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0 LCBjb25zdCBjaGFyKiBmdW5jdGlvbk5hbWUpIGNvbnN0OwogICAgIEpTVmFsdWVSZWYgY2FsbEZ1 bmN0aW9uKEpTQ29udGV4dFJlZiwgSlNPYmplY3RSZWYgdGhpc09iamVjdCwgY29uc3QgY2hhciog ZnVuY3Rpb25OYW1lLCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1 bWVudHNbXSwgSlNWYWx1ZVJlZiYgZXhjZXB0aW9uKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlLmNwcCBiL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZS5jcHAKaW5kZXggYjUxZWMwOS4u MzNkMDM2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFn ZVJlc291cmNlLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdl UmVzb3VyY2UuY3BwCkBAIC0zMyw3ICszMywxMSBAQAogCiAjaW5jbHVkZSAiSW5zcGVjdG9yRE9N U3RvcmFnZVJlc291cmNlLmgiCiAKKyNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkZy YW1lLmgiCisjaW5jbHVkZSAiU2NyaXB0RnVuY3Rpb25DYWxsLmgiCisjaW5jbHVkZSAiU2NyaXB0 T2JqZWN0UXVhcmFudGluZS5oIgorI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgiCiAjaW5jbHVkZSAi U3RvcmFnZS5oIgogCiB1c2luZyBuYW1lc3BhY2UgSlNDOwpAQCAtNDEsMjUgKzQ1LDQ5IEBAIHVz aW5nIG5hbWVzcGFjZSBKU0M7CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEluc3BlY3RvckRPTVN0 b3JhZ2VSZXNvdXJjZTo6SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlKFN0b3JhZ2UqIGRvbVN0 b3JhZ2UsIGJvb2wgaXNMb2NhbFN0b3JhZ2UsIEZyYW1lKiBmcmFtZSkKLSAgICA6IGRvbVN0b3Jh Z2UoZG9tU3RvcmFnZSkKLSAgICAsIGlzTG9jYWxTdG9yYWdlKGlzTG9jYWxTdG9yYWdlKQotICAg ICwgZnJhbWUoZnJhbWUpCi0gICAgLCBzY3JpcHRDb250ZXh0KDApCi0gICAgLCBzY3JpcHRPYmpl Y3QoMCkKKyAgICA6IG1fZG9tU3RvcmFnZShkb21TdG9yYWdlKQorICAgICwgbV9pc0xvY2FsU3Rv cmFnZShpc0xvY2FsU3RvcmFnZSkKKyAgICAsIG1fZnJhbWUoZnJhbWUpCiB7CiB9CiAKLXZvaWQg SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlOjpzZXRTY3JpcHRPYmplY3QoSlNDb250ZXh0UmVm IGNvbnRleHQsIEpTT2JqZWN0UmVmIG5ld1NjcmlwdE9iamVjdCkKK2Jvb2wgSW5zcGVjdG9yRE9N U3RvcmFnZVJlc291cmNlOjppc1NhbWVIb3N0QW5kVHlwZShGcmFtZSogZnJhbWUsIGJvb2wgaXNM b2NhbFN0b3JhZ2UpIGNvbnN0CiB7Ci0gICAgaWYgKHNjcmlwdENvbnRleHQgJiYgc2NyaXB0T2Jq ZWN0KQotICAgICAgICBKU1ZhbHVlVW5wcm90ZWN0KHNjcmlwdENvbnRleHQsIHNjcmlwdE9iamVj dCk7CisgICAgcmV0dXJuIGVxdWFsSWdub3JpbmdDYXNlKG1fZnJhbWUtPmRvY3VtZW50KCktPnNl Y3VyaXR5T3JpZ2luKCktPmhvc3QoKSwgZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2lu KCktPmhvc3QoKSkgJiYgbV9pc0xvY2FsU3RvcmFnZSA9PSBpc0xvY2FsU3RvcmFnZTsKK30KKwor dm9pZCBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2U6OmJpbmQoU2NyaXB0U3RhdGUqIHNjcmlw dFN0YXRlLCBjb25zdCBTY3JpcHRPYmplY3QmIHdlYkluc3BlY3RvcikKK3sKKyAgICBpZiAoIW1f c2NyaXB0T2JqZWN0Lmhhc05vVmFsdWUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgQVNTRVJU KHNjcmlwdFN0YXRlKTsKKyAgICBBU1NFUlQoIXdlYkluc3BlY3Rvci5oYXNOb1ZhbHVlKCkpOwor ICAgIGlmICghc2NyaXB0U3RhdGUgfHwgd2ViSW5zcGVjdG9yLmhhc05vVmFsdWUoKSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgU2NyaXB0RnVuY3Rpb25DYWxsIHJlc291cmNlQ29uc3RydWN0b3Io c2NyaXB0U3RhdGUsIHdlYkluc3BlY3RvciwgIkRPTVN0b3JhZ2UiKTsKKyAgICBTY3JpcHRPYmpl Y3QgZG9tU3RvcmFnZTsKKyAgICBpZiAoIWdldFF1YXJhbnRpbmVkU2NyaXB0T2JqZWN0KG1fZnJh bWUuZ2V0KCksIG1fZG9tU3RvcmFnZS5nZXQoKSwgZG9tU3RvcmFnZSkpCisgICAgICAgIHJldHVy bjsKIAotICAgIHNjcmlwdE9iamVjdCA9IG5ld1NjcmlwdE9iamVjdDsKLSAgICBzY3JpcHRDb250 ZXh0ID0gY29udGV4dDsKKyAgICByZXNvdXJjZUNvbnN0cnVjdG9yLmFwcGVuZEFyZ3VtZW50KGRv bVN0b3JhZ2UpOworICAgIHJlc291cmNlQ29uc3RydWN0b3IuYXBwZW5kQXJndW1lbnQobV9mcmFt ZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aG9zdCgpKTsKKyAgICByZXNvdXJjZUNv bnN0cnVjdG9yLmFwcGVuZEFyZ3VtZW50KG1faXNMb2NhbFN0b3JhZ2UpOwogCi0gICAgQVNTRVJU KChjb250ZXh0ICYmIG5ld1NjcmlwdE9iamVjdCkgfHwgKCFjb250ZXh0ICYmICFuZXdTY3JpcHRP YmplY3QpKTsKLSAgICBpZiAoY29udGV4dCAmJiBuZXdTY3JpcHRPYmplY3QpCi0gICAgICAgIEpT VmFsdWVQcm90ZWN0KGNvbnRleHQsIG5ld1NjcmlwdE9iamVjdCk7CisgICAgYm9vbCBoYWRFeGNl cHRpb24gPSBmYWxzZTsKKyAgICBtX3NjcmlwdE9iamVjdCA9IHJlc291cmNlQ29uc3RydWN0b3Iu Y29uc3RydWN0KGhhZEV4Y2VwdGlvbik7CisgICAgaWYgKGhhZEV4Y2VwdGlvbikKKyAgICAgICAg cmV0dXJuOworCisgICAgU2NyaXB0RnVuY3Rpb25DYWxsIGFkZERPTVN0b3JhZ2Uoc2NyaXB0U3Rh dGUsIHdlYkluc3BlY3RvciwgImFkZERPTVN0b3JhZ2UiKTsKKyAgICBhZGRET01TdG9yYWdlLmFw cGVuZEFyZ3VtZW50KG1fc2NyaXB0T2JqZWN0KTsKKyAgICBhZGRET01TdG9yYWdlLmNhbGwoaGFk RXhjZXB0aW9uKTsKK30KKwordm9pZCBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2U6OnVuYmlu ZCgpCit7CisgICAgbV9zY3JpcHRPYmplY3QgPSBTY3JpcHRPYmplY3QoKTsKIH0KIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RE9NU3RvcmFnZVJlc291cmNlLmggYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9y YWdlUmVzb3VyY2UuaAppbmRleCBjNTJlOGFhLi5hZDNlMTk2IDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UuaAorKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UuaApAQCAtMzMsMTIgKzMzLDEzIEBA CiAKICNpZiBFTkFCTEUoRE9NX1NUT1JBR0UpCiAKKyNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIK KyNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgorCiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4K ICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAot I2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0pTQ29udGV4dFJlZi5oPgotCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICAgICBjbGFzcyBTdG9yYWdlOwpAQCAtNTEsMTYgKzUyLDIxIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgSW5zcGVjdG9yRE9N U3RvcmFnZVJlc291cmNlKGRvbVN0b3JhZ2UsIGlzTG9jYWxTdG9yYWdlLCBmcmFtZSkpOwogICAg ICAgICB9CiAKLSAgICAgICAgdm9pZCBzZXRTY3JpcHRPYmplY3QoSlNDb250ZXh0UmVmLCBKU09i amVjdFJlZik7CisgICAgICAgIHZvaWQgYmluZChTY3JpcHRTdGF0ZSosIGNvbnN0IFNjcmlwdE9i amVjdCYgd2ViSW5zcGVjdG9yKTsKKyAgICAgICAgdm9pZCB1bmJpbmQoKTsKIAotICAgICAgICBS ZWZQdHI8U3RvcmFnZT4gZG9tU3RvcmFnZTsKLSAgICAgICAgYm9vbCBpc0xvY2FsU3RvcmFnZTsK LSAgICAgICAgUmVmUHRyPEZyYW1lPiBmcmFtZTsKLSAgICAgICAgSlNDb250ZXh0UmVmIHNjcmlw dENvbnRleHQ7Ci0gICAgICAgIEpTT2JqZWN0UmVmIHNjcmlwdE9iamVjdDsKKyAgICAgICAgYm9v bCBpc1NhbWVIb3N0QW5kVHlwZShGcmFtZSosIGJvb2wgaXNMb2NhbFN0b3JhZ2UpIGNvbnN0Owog CiAgICAgcHJpdmF0ZToKKwogICAgICAgICBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UoU3Rv cmFnZSosIGJvb2wgaXNMb2NhbFN0b3JhZ2UsIEZyYW1lKik7CisKKyAgICAgICAgU2NyaXB0T2Jq ZWN0IG1fc2NyaXB0T2JqZWN0OworICAgICAgICBSZWZQdHI8U3RvcmFnZT4gbV9kb21TdG9yYWdl OworICAgICAgICBib29sIG1faXNMb2NhbFN0b3JhZ2U7CisgICAgICAgIFJlZlB0cjxGcmFtZT4g bV9mcmFtZTsKKworICAgIHByaXZhdGU6CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQo=